Skip to content

Y
YX_IDENT_REFACTORING
Commit c6757674 authored by Administrator's avatar Administrator
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 402c306a cbe8eb1f
Show whitespace changes
Inline Side-by-side
Showing with 485 additions and 430 deletions
pom.xml
View file @ c6757674
......@@ -28,6 +28,12 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
......@@ -50,9 +56,35 @@
<!--引入log4j2作为日志组件-->
<!--<dependency>-->
<!--<groupId>org.springframework.boot</groupId>-->
<!--<artifactId>spring-boot-starter-log4j2</artifactId>-->
<!--<artifactId>spring-boot-starter-log4j</artifactId>-->
<!--<version>1.3.2.RELEASE</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>log4j</groupId>-->
<!--<artifactId>log4j</artifactId>-->
<!--<version>1.2.17</version>-->
<!--</dependency>-->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.12</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<!-- shiro相关 -->
<dependency>
<groupId>org.apache.shiro</groupId>
......@@ -77,6 +109,22 @@
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j</artifactId>
<version>1.3.8.RELEASE</version>
</dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
......
src/log4j.properties
View file @ c6757674
log4j.rootCategory=DEBUG,stdout,DebugAppender,InfoAppender,ErrorAppender
log4j.debug=true
#控制日志级别，在哪里输出Output pattern : date [thread] priority category - message FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7
log4j.rootLogger=INFO, stdout
#控制台 显示的的方式为控制台普通方式
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=[QC] %p [%t] %C.%M(%L) | %m%n
#logger input file
log4j.logger.DebugAppender.access=DEBUG
log4j.appender.DebugAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.DebugAppender.File=../logs/a.log
log4j.appender.DebugAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.DebugAppender.layout.ConversionPattern=%d-[TS] %p %t %c - %m%n
#日志输出的格式
log4j.appender.stdout.layout.ConversionPattern=%d %-5p [%c{5}] - %m%n
#打印sql部分
log4j.logger.java.sql=DEBUG
log4j.logger.java.sql.Connection = DEBUG
log4j.logger.java.sql.Statement = DEBUG
log4j.logger.java.sql.PreparedStatement = DEBUG
log4j.logger.java.sql.ResultSet = DEBUG
#logger input file
log4j.logger.InfoAppender.access=INFO
log4j.appender.InfoAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.InfoAppender.File=../logs/b.log
log4j.appender.InfoAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.InfoAppender.layout.ConversionPattern=%d-[TS] %p %t %c - %m%n
#error log input file
log4j.logger.ErrorAppender.access=ERROR
log4j.appender.ErrorAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.ErrorAppender.File=../logs/c.log
log4j.appender.ErrorAppender.Append = true
log4j.appender.ErrorAppender.threshold = ERROR
log4j.appender.ErrorAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.ErrorAppender.layout.ConversionPattern=%d{MM-dd HH:mm:ss.SSS} %c %-5p - %m%n
\ No newline at end of file
log4j.logger.com.yxproject.start.entity=DEBUG
\ No newline at end of file
src/main/resources/application.yml
View file @ c6757674
......@@ -7,6 +7,11 @@ mybatis:
#加载Mybatis配置文件
mapper-locations: classpath:mapper/*Mapper.xml
config-location: classpath:mapper/config/mybatis-config.xml
#logging.level.*=DEBUG
#logging:
# level:
# com.yx_project.start.mapper.*: debug
# logging.level.com.hz.controller=WARN #控制器层
#配置调度生产Oracle数据库
spring:
......@@ -16,6 +21,7 @@ spring:
username: dahai
password: dahai
#配置shiro
shiro:
loginUrl: http://localhost:8081
......
src/main/resources/log4j.properties
View file @ c6757674
log4j.rootCategory=DEBUG,stdout,DebugAppender,InfoAppender,ErrorAppender
log4j.debug=true
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.debug=true log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=[QC] %p [%t] %C.%M(%L) | %m%n
#logger input file
log4j.logger.DebugAppender.access=DEBUG
#logger input file log4j.logger.DebugAppender.access=DEBUG
log4j.appender.DebugAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.DebugAppender.File=../logs/a.log
log4j.appender.DebugAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.DebugAppender.layout.ConversionPattern=%d-[TS] %p %t %c - %m%n
#logger input file
log4j.logger.InfoAppender.access=INFO
#logger input file log4j.logger.InfoAppender.access=INFO
log4j.appender.InfoAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.InfoAppender.File=../logs/b.log
log4j.appender.InfoAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.InfoAppender.layout.ConversionPattern=%d-[TS] %p %t %c - %m%n
#error log input file
log4j.logger.ErrorAppender.access=ERROR
#error log input file log4j.logger.ErrorAppender.access=ERROR
log4j.appender.ErrorAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.ErrorAppender.File=../logs/c.log
log4j.appender.ErrorAppender.Append = true
......
src/main/resources/mapper/config/mybatis-config.xml
View file @ c6757674
......@@ -19,4 +19,10 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
<!--</plugin>-->
<!--</plugins>-->
<!--<settings>-->
<!--<setting name="log4jImpl" value="LOG4J"/>-->
<!--</settings>-->
</configuration>
\ No newline at end of file
src/main/resources/static/dialogs/specialCardList.html
View file @ c6757674
......@@ -12,10 +12,10 @@
</thead>
<tbody>
<tr ng-repeat="specialCard in specialCardList">
<td>{{specialCard.acceptNo}}</td>
<td ng-if="specialCard.specialType==0">余证</td>
<td ng-if="specialCard.specialType==1">快证</td>
<td ng-if="specialCard.specialType==2">退证</td>
<td>{{specialCard.accept_No}}</td>
<td ng-if="specialCard.special_Type==0">余证</td>
<td ng-if="specialCard.special_Type==1">快证</td>
<td ng-if="specialCard.special_Type==2">退证</td>
</tr>
</tbody>
</table>
......
src/main/resources/static/js/services/service.js
View file @ c6757674
......@@ -381,12 +381,13 @@ app.service('MessageService', function (ngDialog) {
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
getTypeListByTaskStateId:function(state,success){
getTypeListByTaskStateId:function(userState,success){
console.log('----测试查询代码----',userState)
$http({
method: 'GET',
url: "../user/getTypeListByTaskStateId" + urlTimeStamp(),
params:{
taskStateId:state
taskStateId:userState
}
}).then(function successCallback(response) {
success(response.data)
......@@ -398,9 +399,9 @@ app.service('MessageService', function (ngDialog) {
getCityListByCardType:function(cardType,state,success){
$http({
method: 'GET',
url: "../user/getCityListByCardType" + urlTimeStamp(),
url: "../user/getCityList" + urlTimeStamp(),
params:{
state:state,
taskStateId:state,
cardType:cardType
}
}).then(function successCallback(response) {
......@@ -413,9 +414,9 @@ app.service('MessageService', function (ngDialog) {
getGroupNoByTaskListId:function(taskStateId,success){
$http({
method: 'GET',
url: "../user/getGroupNoByTaskListId" + urlTimeStamp(),
url: "../user/getGroupListByTaskId" + urlTimeStamp(),
params:{
taskStateId:taskStateId
taskId:taskStateId
}
}).then(function successCallback(response) {
success(response.data)
......@@ -441,7 +442,7 @@ app.service('MessageService', function (ngDialog) {
updateProductionTask:function(taskId,state,success){
$http({
method: 'GET',
url: "../user/updateProductionTask" + urlTimeStamp(),
url: "../user/updateTaskState" + urlTimeStamp(),
params:{
taskId:taskId,
state:state
......@@ -471,7 +472,7 @@ app.service('MessageService', function (ngDialog) {
getReceiptData:function(startTime, endTime,success){
$http({
method: 'GET',
url: "../user/getConnectList" + urlTimeStamp(),
url: "../user/getReceiptList" + urlTimeStamp(),
params:{
startTime:startTime,
endTime:endTime
......
src/main/resources/static/tpl/layout/cycleSheet/cycleSheet.html
View file @ c6757674
......@@ -59,7 +59,7 @@
</thead>
<tbody ng-repeat="city in cityList| orderBy:citycode:desc">
<tr>
<td>{{city.task_Id}}</td>
<td>{{city.taskId}}</td>
<td><span class="city"
style="color: #337ab7;display:inline-block">{{city.cityName}}</span></td>
<td>{{city.groupCount}}</td>
......@@ -70,14 +70,14 @@
<span style="padding-left:10px;"
ng-show="city.printer_Id==null">未分配</span>
<span style="padding-left:10px;"
ng-show="city.printer_Id!=null">机器<span>{{city.printer_Id}}</span></span>
ng-show="city.printer_Id!=null">机器<span>{{city.printerId}}</span></span>
</td>
<td>{{city.state}}</td>
<td ng-if="userState<=4"><a ng-click="showTable(city.task_Id)">组号列表</a></td>
<td ng-if="userState>4"><a ng-click="showTable(city.task_Id)">区县列表</a></td>
<td><a ng-click="finishClick(city.task_Id,userState)">完成</a></td>
<td ng-if="userState<=4"><a ng-click="showTable(city.taskId)">组号列表</a></td>
<td ng-if="userState>4"><a ng-click="showTable(city.taskId)">区县列表</a></td>
<td><a ng-click="finishClick(city.taskId,userState)">完成</a></td>
</tr>
<tr ng-show="showtable==city.task_Id && userState<=4">
<tr ng-show="showtable==city.taskId && userState<=4">
<td></td>
<td colspan="4">
<table style="font-size:0.9em;color: #000;" class="table">
......@@ -90,9 +90,9 @@
</thead>
<tbody>
<tr ng-repeat="group in groupList">
<td>{{group.groupNO}}</td>
<td>{{group.vaildCount}}</td>
<td>{{group.invaildCount}}</td>
<td>{{group.groupNo}}</td>
<td>{{group.validCount}}</td>
<td>{{group.invalidCount}}</td>
<td>{{group.specialCardCount}}</td>
<td><a ng-click="showTableGroup(group.specialCardList)">特殊证件列表</a></td>
</tr>
......@@ -101,7 +101,7 @@
</td>
</tr>
<tr ng-show="showtable==city.task_Id && userState>4">
<tr ng-show="showtable==city.taskId && userState>4">
<td></td>
<td colspan="4">
<table style="font-size:0.9em;color: #000;" class="table">
......
src/main/resources/static/tpl/layout/cycleSheet/cycleSheet.js
View file @ c6757674
......@@ -5,8 +5,9 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
} else {
$state.go("layout.cycleSheet")
}
$scope.userState = $rootScope.loginData.state;
// $scope.userState=5;
// $scope.userState = $rootScope.loginData.workshop;
console.log($scope.userState,'---------$scope.userState-------')
$scope.userState=5;
var getNowFormatDate = function () {
var date = new Date();
......@@ -43,7 +44,6 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
$scope.open = function ($event) {
$event.preventDefault();
$event.stopPropagation();
$scope.opened = true;
};
......@@ -57,24 +57,32 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
$scope.formats = ['dd-MMMM-yyyy', 'yyyy/MM/dd', 'dd.MM.yyyy', 'shortDate'];
$scope.format = $scope.formats[1];
$scope.task_click = function () {
console.log($rootScope.loginData.state, "----测试-----", $scope.dt, "====");
}
$scope.cardType = 0;
$scope.check_type = function (typeCode) {
cardType = typeCode;
console.log($rootScope.loginData.state, "----测试-----", $scope.dt, "====", typeCode, "+++++++++++++");
getCityListData(cardType,$scope.userState);
}
// 查询制证类型列表
var getTypeListData = function (state) {
HttpService.getTypeListByTaskStateId(1,function (data) {
var getTypeListData = function (userState) {
HttpService.getTypeListByTaskStateId(userState,function (data) {
$scope.typeList = data.respData;
console.log("---制证类型--数据源:")
console.log(data.respData)
})
}
getTypeListData($rootScope.loginData.state);
getTypeListData($scope.userState);
$scope.currentTab = 1;
$scope.func = function (id) {
for (var i = 0; i < $scope.folds.length; i++) {
if (id == $scope.folds[i].id) {
$scope.folds[i].isActive = true;
} else {
$scope.folds[i].isActive = false;
}
}
$scope.currentTab = id;
}
// $scope.nowType == $scope.getCityListData[$scope.currentTab].typeCode? $scope.currentTab=$scope.currentTab:$scope.currentTab= -1;
// for (var i = 0; i < $scope.getCityListData.length; i++) {
......@@ -86,37 +94,40 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
// }
// }
// // 查询城市列表
// var getCityListData = function (cardType,state) {
// HttpService.getCityListByCardType(cardType,1,function (data) {
// $scope.cityList = data.respData;
// console.log("---城市列表--数据源:")
// console.log(data.respData)
//
// })
// }
// getCityListData(cardType,$rootScope.loginData.state);
// 查询城市列表
var getCityListData = function (cardType,state) {
console.log("----调用查询城市列表接口-",cardType,state)
HttpService.getCityListByCardType(cardType,state,function (data) {
$scope.cityList = data.respData;
console.log("---城市列表--数据源:")
console.log(data.respData)
// // 查询组号列表
// var getGroupListData = function (taskId) {
// HttpService.getGroupNoByTaskListId(taskId,function (data) {
// $scope.groupList = data.respData;
// console.log("---查询组号列表--数据源:")
// console.log(data.respData)
//
// })
// }
})
}
console.log("--查看card type- -",$scope.cardType)
getCityListData($scope.cardType,$scope.userState);
// 查询组号列表
var getGroupListData = function (taskId) {
console.log("---查询组号列表--数据源:",taskId);
HttpService.getGroupNoByTaskListId(taskId,function (data) {
$scope.groupList = data.respData;
console.log("---查询组号列表--数据源:")
console.log(data.respData)
// // 查询区县列表
// var getCountyListData = function (taskId) {
// HttpService.getCountyListByTaskListId(taskId,function (data) {
// $scope.countyList = data.respData;
// console.log("---查询区县列表--数据源:")
// console.log(data.respData)
//
// })
// }
})
}
// 查询区县列表
var getCountyListData = function (taskId) {
HttpService.getCountyListByTaskListId(taskId,function (data) {
$scope.countyList = data.respData;
console.log("---查询区县列表--数据源:")
console.log(data.respData)
})
}
// $scope.typeList = [
// {typeCode: 0, typeCount: 5000, typeName: '普通证'},
......@@ -124,218 +135,221 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
// {typeCode: 2, typeCount: 5000, typeName: '特殊证'},
// {typeCode: 9, typeCount: 5000, typeName: '异地证'}
// ]
$scope.cityList = [
{
"card_Type": 1,
"citycode": "410300",
cityName: "郑州",
groupCount: 10,
groupSum: 1500,
groupInvailedSum: 15,
groupNO: "1-25",
"download_Date": null,
"exception_Information": "",
"in_Storage_Date": null,
"is_Exception": 0,
"issued_Date": null,
"old_Card_Type": 1,
"out_Storage_Date": null,
"out_Workshop_Date": null,
"position_Date": null,
"print_Out_Date": null,
"print_State": 0,
"printer_Id": 0,
"quality_People_Name": "",
"quality_Test_Date": null,
"submit_Date": {
"date": 20,
"day": 2,
"hours": 11,
"minutes": 20,
"month": 10,
"seconds": 53,
"time": 1542684053000,
"timezoneOffset": -480,
"year": 118
},
"task_Id": 201811203,
"task_State_Id": 1
},
{
"card_Type": 1,
"citycode": "410400",
cityName: "驻马店",
groupCount: 10,
groupSum: 2500,
groupInvailedSum: 16,
groupNO: "26-45",
"download_Date": null,
"exception_Information": "",
"in_Storage_Date": null,
"is_Exception": 0,
"issued_Date": null,
"old_Card_Type": 1,
"out_Storage_Date": null,
"out_Workshop_Date": null,
"position_Date": null,
"print_Out_Date": null,
"print_State": 0,
"printer_Id": 0,
"quality_People_Name": "",
"quality_Test_Date": null,
"submit_Date": {
"date": 20,
"day": 2,
"hours": 11,
"minutes": 20,
"month": 10,
"seconds": 53,
"time": 1542684053000,
"timezoneOffset": -480,
"year": 118
},
"task_Id": 201811204,
"task_State_Id": 1
},
{
"card_Type": 1,
"citycode": "410500",
cityName: "新乡",
groupCount: 10,
groupSum: 3500,
groupInvailedSum: 17,
groupNO: "46",
"download_Date": null,
"exception_Information": "",
"in_Storage_Date": null,
"is_Exception": 0,
"issued_Date": null,
"old_Card_Type": 1,
"out_Storage_Date": null,
"out_Workshop_Date": null,
"position_Date": null,
"print_Out_Date": null,
"print_State": 0,
"printer_Id": 0,
"quality_People_Name": "",
"quality_Test_Date": null,
"submit_Date": {
"date": 20,
"day": 2,
"hours": 11,
"minutes": 20,
"month": 10,
"seconds": 53,
"time": 1542684053000,
"timezoneOffset": -480,
"year": 118
},
"task_Id": 201811205,
"task_State_Id": 1
},
{
"card_Type": 1,
"citycode": "410600",
cityName: "周口",
groupCount: 10,
groupSum: 3500,
groupInvailedSum: 18,
groupNO: "48-52,53-55",
"download_Date": null,
"exception_Information": "",
"in_Storage_Date": null,
"is_Exception": 0,
"issued_Date": null,
"old_Card_Type": 1,
"out_Storage_Date": null,
"out_Workshop_Date": null,
"position_Date": null,
"print_Out_Date": null,
"print_State": 0,
"printer_Id": 0,
"quality_People_Name": "",
"quality_Test_Date": null,
"submit_Date": {
"date": 20,
"day": 2,
"hours": 11,
"minutes": 20,
"month": 10,
"seconds": 53,
"time": 1542684053000,
"timezoneOffset": -480,
"year": 118
},
"task_Id": 201811206,
"task_State_Id": 1
},
]
// $scope.cityList = [
// {
// "card_Type": 1,
// "citycode": "410300",
// cityName: "郑州",
// groupCount: 10,
// groupSum: 1500,
// groupInvailedSum: 15,
// groupNO: "1-25",
// "download_Date": null,
// "exception_Information": "",
// "in_Storage_Date": null,
// "is_Exception": 0,
// "issued_Date": null,
// "old_Card_Type": 1,
// "out_Storage_Date": null,
// "out_Workshop_Date": null,
// "position_Date": null,
// "print_Out_Date": null,
// "print_State": 0,
// "printer_Id": 0,
// "quality_People_Name": "",
// "quality_Test_Date": null,
// "submit_Date": {
// "date": 20,
// "day": 2,
// "hours": 11,
// "minutes": 20,
// "month": 10,
// "seconds": 53,
// "time": 1542684053000,
// "timezoneOffset": -480,
// "year": 118
// },
// "task_Id": 201811203,
// "task_State_Id": 1
// },
// {
// "card_Type": 1,
// "citycode": "410400",
// cityName: "驻马店",
// groupCount: 10,
// groupSum: 2500,
// groupInvailedSum: 16,
// groupNO: "26-45",
// "download_Date": null,
// "exception_Information": "",
// "in_Storage_Date": null,
// "is_Exception": 0,
// "issued_Date": null,
// "old_Card_Type": 1,
// "out_Storage_Date": null,
// "out_Workshop_Date": null,
// "position_Date": null,
// "print_Out_Date": null,
// "print_State": 0,
// "printer_Id": 0,
// "quality_People_Name": "",
// "quality_Test_Date": null,
// "submit_Date": {
// "date": 20,
// "day": 2,
// "hours": 11,
// "minutes": 20,
// "month": 10,
// "seconds": 53,
// "time": 1542684053000,
// "timezoneOffset": -480,
// "year": 118
// },
// "task_Id": 201811204,
// "task_State_Id": 1
// },
// {
// "card_Type": 1,
// "citycode": "410500",
// cityName: "新乡",
// groupCount: 10,
// groupSum: 3500,
// groupInvailedSum: 17,
// groupNO: "46",
// "download_Date": null,
// "exception_Information": "",
// "in_Storage_Date": null,
// "is_Exception": 0,
// "issued_Date": null,
// "old_Card_Type": 1,
// "out_Storage_Date": null,
// "out_Workshop_Date": null,
// "position_Date": null,
// "print_Out_Date": null,
// "print_State": 0,
// "printer_Id": 0,
// "quality_People_Name": "",
// "quality_Test_Date": null,
// "submit_Date": {
// "date": 20,
// "day": 2,
// "hours": 11,
// "minutes": 20,
// "month": 10,
// "seconds": 53,
// "time": 1542684053000,
// "timezoneOffset": -480,
// "year": 118
// },
// "task_Id": 201811205,
// "task_State_Id": 1
// },
// {
// "card_Type": 1,
// "citycode": "410600",
// cityName: "周口",
// groupCount: 10,
// groupSum: 3500,
// groupInvailedSum: 18,
// groupNO: "48-52,53-55",
// "download_Date": null,
// "exception_Information": "",
// "in_Storage_Date": null,
// "is_Exception": 0,
// "issued_Date": null,
// "old_Card_Type": 1,
// "out_Storage_Date": null,
// "out_Workshop_Date": null,
// "position_Date": null,
// "print_Out_Date": null,
// "print_State": 0,
// "printer_Id": 0,
// "quality_People_Name": "",
// "quality_Test_Date": null,
// "submit_Date": {
// "date": 20,
// "day": 2,
// "hours": 11,
// "minutes": 20,
// "month": 10,
// "seconds": 53,
// "time": 1542684053000,
// "timezoneOffset": -480,
// "year": 118
// },
// "task_Id": 201811206,
// "task_State_Id": 1
// },
// ]
$scope.groupList = [
{
"groupNO": 45,
"vaildCount": 45,
invaildCount: 25,
specialCardCount: 5,
specialCardList: [{acceptNo: 20180401, specialType: 1}, {acceptNo: 20180401, specialType: 1}]
},
{
"groupNO": 45,
"vaildCount": 45,
invaildCount: 25,
specialCardCount: 5,
specialCardList: [{acceptNo: 20180401, specialType: 1}, {acceptNo: 20180401, specialType: 1}]
},
{
"groupNO": 45,
"vaildCount": 45,
invaildCount: 25,
specialCardCount: 5,
specialCardList: [{acceptNo: 20180401, specialType: 1}, {acceptNo: 20180401, specialType: 1}]
}
]
$scope.countyList = [
{
"countyName": "许昌县",
county_Code: "411023",
downloadCount: 240,
electric_writerCount: 240,
in_Storage_Count: 240,
out_Storage_Count: 240,
finish_Count: 240
},
{
"countyName": "禹州",
county_Code: "411081",
downloadCount: 210,
electric_writerCount: 210,
in_Storage_Count: 210,
out_Storage_Count: 210,
finish_Count: 210
},
{
"countyName": "长葛",
county_Code: "411082",
downloadCount: 243,
electric_writerCount: 243,
in_Storage_Count: 243,
out_Storage_Count: 243,
finish_Count: 243
}
]
// $scope.groupList = [
// {
// "groupNO": 45,
// "vaildCount": 45,
// invaildCount: 25,
// specialCardCount: 5,
// specialCardList: [{acceptNo: 20180401, specialType: 1}, {acceptNo: 20180401, specialType: 1}]
// },
// {
// "groupNO": 45,
// "vaildCount": 45,
// invaildCount: 25,
// specialCardCount: 5,
// specialCardList: [{acceptNo: 20180401, specialType: 1}, {acceptNo: 20180401, specialType: 1}]
// },
// {
// "groupNO": 45,
// "vaildCount": 45,
// invaildCount: 25,
// specialCardCount: 5,
// specialCardList: [{acceptNo: 20180401, specialType: 1}, {acceptNo: 20180401, specialType: 1}]
// }
// ]
// $scope.countyList = [
// {
// "countyName": "许昌县",
// county_Code: "411023",
// downloadCount: 240,
// electric_writerCount: 240,
// in_Storage_Count: 240,
// out_Storage_Count: 240,
// finish_Count: 240
// },
// {
// "countyName": "禹州",
// county_Code: "411081",
// downloadCount: 210,
// electric_writerCount: 210,
// in_Storage_Count: 210,
// out_Storage_Count: 210,
// finish_Count: 210
// },
// {
// "countyName": "长葛",
// county_Code: "411082",
// downloadCount: 243,
// electric_writerCount: 243,
// in_Storage_Count: 243,
// out_Storage_Count: 243,
// finish_Count: 243
// }
// ]
$scope.receiptList = [[358, 0, 0, 0, 82, 0, 0, 1, 0, 205, 646, 3, "郑州 辖区", "410101"], [721, 0, 0, 0, 20, 0, 0, 7, 1, 91, 840, 4, "郑州 中原", "410102"],]
// $scope.receiptList = [[358, 0, 0, 0, 82, 0, 0, 1, 0, 205, 646, 3, "郑州 辖区", "410101"], [721, 0, 0, 0, 20, 0, 0, 7, 1, 91, 840, 4, "郑州 中原", "410102"],]
$scope.showtable = -1;
$scope.showTable = function (taskID) {
console.log("$scope.-------$scope.showtable----",taskID);
if ($scope.showtable != taskID) {
$scope.showtable = taskID;
} else {
$scope.showtable = -1;
}
getGroupListData($scope.showtable);
}
$scope.showTableGroup = function (specialCardList) {
console.log("--specialCardList--",specialCardList);
ngDialog.open({
template: 'dialogs/specialCardList.html' + urlTimeStamp(),
width: 800,
......@@ -348,122 +362,115 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
}
$scope.finishClick = function (taskId, userState) {
HttpService.updateProductionTask(taskId, userState, function (data) {
var state =parseInt(userState);
console.log("--userState+1--",state+1);
HttpService.updateProductionTask(taskId, state+1, function (success) {
//点击确认成功后 再次查询城市列表
getCityListData(cardType, $rootScope.loginData.state);
getCityListData(cardType,state+1 );
})
}
$scope.folds = [
{
id: 1, name: '普通证', count: 10000, filter: '', isActive: true, dataTable: {
"aaData": [
{
"engine": "Trident",
"browser": "Internet Explorer 4.0",
"platform": "Win 95+",
"version": "4",
"grade": "X"
},
{
"engine": "Trident",
"browser": "Internet Explorer 5.0",
"platform": "Win 95+",
"version": "5",
"grade": "C"
}]
}
},
{
id: 2, name: '邮寄证', count: 20000, filter: 'starred', dataTable: {
"aaData": [
{
"engine": "Trident",
"browser": "Internet Explorer 5.5",
"platform": "Win 95+",
"version": "5.5",
"grade": "A"
},
{
"engine": "Trident",
"browser": "Internet Explorer 6",
"platform": "Win 98+",
"version": "6",
"grade": "A"
},
{
"engine": "Trident",
"browser": "Internet Explorer 7",
"platform": "Win XP SP2+",
"version": "7",
"grade": "A"
}]
}
},
{
id: 3, name: '军人证', count: 32000, filter: 'sent', dataTable: {
"aaData": [
{
"engine": "Trident",
"browser": "Internet Explorer 5.5",
"platform": "Win 95+",
"version": "5.5",
"grade": "A"
}]
}
},
{
id: 4, name: '快证', count: 40, filter: 'important', dataTable: {
"aaData": [
{
"engine": "Webkit",
"browser": "Safari 1.3",
"platform": "OSX.3",
"version": "312.8",
"grade": "A"
},
{
"engine": "Webkit",
"browser": "Safari 2.0",
"platform": "OSX.4+",
"version": "419.3",
"grade": "A"
},
{
"engine": "Webkit",
"browser": "Safari 3.0",
"platform": "OSX.4+",
"version": "522.1",
"grade": "A"
},
{
"engine": "Webkit",
"browser": "OmniWeb 5.5",
"platform": "OSX.4+",
"version": "420",
"grade": "A"
},
{
"engine": "Webkit",
"browser": "iPod Touch / iPhone",
"platform": "iPod",
"version": "420.1",
"grade": "A"
}]
}
}
];
// $scope.folds = [
// {
// id: 1, name: '普通证', count: 10000, filter: '', isActive: true, dataTable: {
// "aaData": [
// {
// "engine": "Trident",
// "browser": "Internet Explorer 4.0",
// "platform": "Win 95+",
// "version": "4",
// "grade": "X"
// },
// {
// "engine": "Trident",
// "browser": "Internet Explorer 5.0",
// "platform": "Win 95+",
// "version": "5",
// "grade": "C"
// }]
// }
// },
// {
// id: 2, name: '邮寄证', count: 20000, filter: 'starred', dataTable: {
// "aaData": [
// {
// "engine": "Trident",
// "browser": "Internet Explorer 5.5",
// "platform": "Win 95+",
// "version": "5.5",
// "grade": "A"
// },
// {
// "engine": "Trident",
// "browser": "Internet Explorer 6",
// "platform": "Win 98+",
// "version": "6",
// "grade": "A"
// },
// {
// "engine": "Trident",
// "browser": "Internet Explorer 7",
// "platform": "Win XP SP2+",
// "version": "7",
// "grade": "A"
// }]
// }
// },
// {
// id: 3, name: '军人证', count: 32000, filter: 'sent', dataTable: {
// "aaData": [
// {
// "engine": "Trident",
// "browser": "Internet Explorer 5.5",
// "platform": "Win 95+",
// "version": "5.5",
// "grade": "A"
// }]
// }
// },
// {
// id: 4, name: '快证', count: 40, filter: 'important', dataTable: {
// "aaData": [
// {
// "engine": "Webkit",
// "browser": "Safari 1.3",
// "platform": "OSX.3",
// "version": "312.8",
// "grade": "A"
// },
// {
// "engine": "Webkit",
// "browser": "Safari 2.0",
// "platform": "OSX.4+",
// "version": "419.3",
// "grade": "A"
// },
// {
// "engine": "Webkit",
// "browser": "Safari 3.0",
// "platform": "OSX.4+",
// "version": "522.1",
// "grade": "A"
// },
// {
// "engine": "Webkit",
// "browser": "OmniWeb 5.5",
// "platform": "OSX.4+",
// "version": "420",
// "grade": "A"
// },
// {
// "engine": "Webkit",
// "browser": "iPod Touch / iPhone",
// "platform": "iPod",
// "version": "420.1",
// "grade": "A"
// }]
// }
// }
// ];
$scope.currentTab = 1;
$scope.func = function (id) {
for (var i = 0; i < $scope.folds.length; i++) {
if (id == $scope.folds[i].id) {
$scope.folds[i].isActive = true;
} else {
$scope.folds[i].isActive = false;
}
}
$scope.currentTab = id;
}
}]);
\ No newline at end of file
src/main/resources/static/tpl/layout/receipt/receipt.js
View file @ c6757674
......@@ -30,8 +30,10 @@ app.controller('receiptCtrl', ['$scope', '$rootScope', '$http', '$state', '$filt
return currentdate;
}
$scope.currentDetailDate = getNowFormatDetailDate();
$scope.nowDataEight = new Date().format("yyyy-MM-dd 08:00")
$scope.nowDate = new Date().format("yyyy-MM-dd hh:mm");
// $scope.nowDataEight = new Date().format("yyyy-MM-dd 08:00");
var date = new Date();
$scope.nowDataEight = $filter('date')("yyyy-MM-dd 08:00");
$scope.nowDate = $filter('date')("yyyy-MM-dd hh:mm");
var changeDataFormat = function (date) {
var yyyyMMdd = date.split(" ")[0];
......
src/main/resources/static/tpl/layout/yieldReport/yieldReport.js
View file @ c6757674
......@@ -5,7 +5,7 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
} else {
$state.go("layout.yieldReport")
}
$scope.userState = $rootScope.loginData.state;
$scope.userState = $rootScope.workshop;
// $scope.userState=5;
......@@ -48,10 +48,10 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
$scope.month_last = getMonthLastDay();
var getQualityReport = function (startDate, endDate) {
HttpService.getQualityReport(startDate, endDate, function (data) {
$scope.dataCheckData = data.respData;
console.log("初始化数据核验质量报表：", $scope.dataCheckData)
})
// HttpService.getQualityReport(startDate, endDate, function (data) {
// $scope.dataCheckData = data.respData;
// console.log("初始化数据核验质量报表：", $scope.dataCheckData)
// })
}
//初始化数据核验报表
if ($rootScope.loginData.state == 1 || $rootScope.loginData.state == 0) {
......@@ -89,7 +89,7 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
})
}
if ($rootScope.loginData.state == 0) {
HttpService.getAdminPrintData(startDate, endDate, $scope.state.substring(1, 2), function (data) {
HttpService.getAdminPrintData(startDate, endDate, $scope.userState, function (data) {
$scope.printDataReport = data.respData;
console.log("初始化打印卸载报表：", $scope.printDataReport)
})
......@@ -128,23 +128,23 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
}
var getQualityCheckReport = function (month) {
if ($rootScope.loginData.state == 6) {
HttpService.getQualityCheckReportData(month, function (data) {
$scope.qulityCheckData = data.respData;
console.log("质检报表：", $scope.qulityCheckData)
})
}
if ($rootScope.loginData.state == 0) {
HttpService.getAdminQualityCheckReportData(month, $scope.state.substring(1, 2), function (data) {
$scope.qulityCheckData = data.respData;
console.log("质检报表：", $scope.qulityCheckData)
})
}
// if ($rootScope.loginData.state == 6) {
// HttpService.getQualityCheckReportData(month, function (data) {
// $scope.qulityCheckData = data.respData;
// console.log("质检报表：", $scope.qulityCheckData)
// })
// }
// if ($rootScope.loginData.state == 0) {
// HttpService.getAdminQualityCheckReportData(month, $scope.state.substring(1, 2), function (data) {
// $scope.qulityCheckData = data.respData;
// console.log("质检报表：", $scope.qulityCheckData)
// })
// }
}
if ($rootScope.loginData.state == 6 || $rootScope.loginData.state == 0) {
getQualityCheckReport($scope.nowMonth)
}
// if ($rootScope.loginData.state == 6 || $rootScope.loginData.state == 0) {
// getQualityCheckReport($scope.nowMonth)
// }
$scope.printQualityCheckReport = function () {
var month = $("#wdateZj").val()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment