Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 62750a6f authored by liboyang's avatar liboyang
Browse files
Options

新增页面

parent cc82eaf3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 63 deletions
src/main/resources/static/js/app.js
View file @ 62750a6f
...@@ -108,12 +108,16 @@ angular.module('AvatarCheck', [ ...@@ -108,12 +108,16 @@ angular.module('AvatarCheck', [
} }
if ($location.path() == "/tagPrint") { if ($location.path() == "/tagPrint") {
$rootScope.tab = '/tagPrint'; $rootScope.tab = '/tagPrint';
$("body").addClass("sidebar-collapse");
} }
console.log($rootScope.tab) console.log($rootScope.tab)
$scope.getFocus = function (index) { $scope.getFocus = function (index) {
if(index=='/tagPrint'){
$("body").addClass("sidebar-collapse");
}
$rootScope.tab = index; $rootScope.tab = index;
$rootScope.close = 0; $rootScope.close = 0;
console.log($rootScope.tab) console.log($rootScope.tab)
......
src/main/resources/static/views/createTaskList/createTaskList.html
View file @ 62750a6f
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<!-- /.box-body --> <!-- /.box-body -->
<div class="box-footer" style="text-align: right;"> <div class="box-footer" style="text-align: right;">
<button class="btn btn-primary">创建任务单</button> <button class="btn btn-primary">创建任务单</button>
<button class="btn btn-primary">创建并下发任务单</button> <button class="btn btn-primary">下发任务单</button>
</div> </div>
</div> </div>
<!-- /. box --> <!-- /. box -->
......
src/main/resources/static/views/login/login.js
View file @ 62750a6f
...@@ -38,18 +38,14 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http']) ...@@ -38,18 +38,14 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http'])
console.log(resp) console.log(resp)
var userAgent = window.navigator.userAgent; var userAgent = window.navigator.userAgent;
if(resp.data.status==200){ if(resp.data.status==200){
if(userAgent.indexOf('.NET')!=-1){
window.location.reload();
}else{
browserName(userAgent)
}
$rootScope.loginData = resp.data.user; $rootScope.loginData = resp.data.user;
$rootScope.loginData.login =true; $rootScope.loginData.login =true;
localStorageService.set('loginData', resp.data.user); localStorageService.set('loginData', resp.data.user);
if($rootScope.loginData.username=='admin'){ $location.path('/xmlAndSearch')
$location.path('/xmlAndSearch') if(userAgent.indexOf('.NET')!=-1){
window.location.reload();
}else{ }else{
$location.path('/excelAndSearch') browserName(userAgent)
} }
}else{ }else{
$scope.authError = resp.data.message; $scope.authError = resp.data.message;
......
src/main/resources/static/views/tagPrint/tagPrint.html
View file @ 62750a6f
...@@ -45,53 +45,89 @@ ...@@ -45,53 +45,89 @@
</td> </td>
</tr> </tr>
</table> </table>
<table class="table table-bordered table-hover postTable"> <div class="row">
<thead> <div class="col-lg-5" >
<tr>
<th>NO.</th>
<th>派出所代码</th>
<th>派出所名称</th>
<th>数量</th>
<th>状态</th>
</tr>
</thead>
<tbody>
<tr ng-click="showDetail(1)">
<td>1</td>
<td>110021</td>
<td>东城派出所</td>
<td>2</td>
<td></td>
</tr>
<tr ng-click="showDetail(2)">
<td>1</td>
<td>110021</td>
<td>东城派出所</td>
<td>3</td>
<td>复刻一致</td>
</tr>
<tr ng-repeat="item in postMsgDetail">
<td>
<input ng-if="$index==0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)" checked="checked">
<input ng-if="$index!=0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)">
</td>
<td>{{item.id}}</td>
<td>{{item.ddh}}</td>
<td>{{item.yjh}}</td>
<td>{{item.fxyjh}}</td>
<td>{{item.sbsll}}</td>
<td>{{item.sjrxm}}</td>
<td>{{item.sjrlxfs}}</td>
<td>{{item.sjrdz}}</td>
<td>{{item.sqrxm}}</td>
<td>{{item.printTime | date:'yyyy-MM-dd hh:mm:ss'}}</td>
</tr>
</tbody> <div class="col-lg-12">
</table> <table class="table table-bordered table-hover postTable ">
<div style="padding-left: 27%;"> <thead>
<tm-pagination conf="paginationConf" class="ul"></tm-pagination> <tr>
<th>NO.</th>
<th>派出所代码</th>
<th>派出所名称</th>
<th>数量</th>
<th>状态</th>
</tr>
</thead>
<tbody>
<tr ng-click="showDetail(1)">
<td>1</td>
<td>110021</td>
<td>东城派出所</td>
<td>2</td>
<td></td>
</tr>
<tr ng-click="showDetail(2)">
<td>2</td>
<td>110021</td>
<td>东城派出所</td>
<td>3</td>
<td>复核一致</td>
</tr>
<tr ng-repeat="item in postMsgDetail">
<td>
<input ng-if="$index==0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)" checked="checked">
<input ng-if="$index!=0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)">
</td>
<td>{{item.id}}</td>
<td>{{item.ddh}}</td>
<td>{{item.yjh}}</td>
<td>{{item.fxyjh}}</td>
<td>{{item.sbsll}}</td>
<td>{{item.sjrxm}}</td>
<td>{{item.sjrlxfs}}</td>
<td>{{item.sjrdz}}</td>
<td>{{item.sqrxm}}</td>
<td>{{item.printTime | date:'yyyy-MM-dd hh:mm:ss'}}</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="col-lg-7" style="padding-left: 0;" ng-if="policeCardsList">
<table class="table table-bordered">
<thead>
<tr>
<th>No.</th>
<th>受理号</th>
<th>姓名</th>
<th>身份证号</th>
<th>签发机关</th>
<th>打印标记</th>
<th>电写标记</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in policeCardsList">
<td>{{$index+1}}</td>
<td>{{item.acceptNo}}</td>
<td>{{item.username}}</td>
<td>{{item.idCard}}</td>
<td>{{item.qfjg}}</td>
<td>
<span ng-if="item.isPrint==1" style="color:red;size: 6px">X</span>
<span ng-if="item.isPrint==0" style="color:lightseagreen;size: 6px">√</span>
</td>
<td><span ng-if="item.isEwrite==1" style="color:red;size: 6px">X</span>
<span ng-if="item.isEwrite==0" style="color:lightseagreen;size: 6px">√</span>
</td>
</tr>
</tbody>
</table>
</div> </div>
</div>
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file
src/main/resources/static/views/task/taskListPreLocating.html
View file @ 62750a6f
...@@ -61,7 +61,8 @@ ...@@ -61,7 +61,8 @@
<td class="mailbox-subject">{{task.groupNo}}</td> <td class="mailbox-subject">{{task.groupNo}}</td>
<td class="mailbox-subject">{{task.dataCheckCount}}</td> <td class="mailbox-subject">{{task.dataCheckCount}}</td>
<td class="mailbox-attachment">{{task.electricCount}}</td> <td class="mailbox-attachment">{{task.electricCount}}</td>
<td class="mailbox-subject">{{task.failedCards}}</td> <td ng-if="task.failedCount!=0" class="mailbox-subject" style="color: red;">{{task.failedCount}}</td>
<td ng-if="task.failedCount==0" class="mailbox-subject">{{task.failedCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td> <td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td>
</tr> </tr>
</tbody> </tbody>
......
src/main/resources/static/views/task/taskListPrint.html
View file @ 62750a6f
...@@ -62,7 +62,8 @@ ...@@ -62,7 +62,8 @@
<td class="mailbox-subject">{{task.groupNo}}</td> <td class="mailbox-subject">{{task.groupNo}}</td>
<td class="mailbox-subject">{{task.dataCheckCount}}</td> <td class="mailbox-subject">{{task.dataCheckCount}}</td>
<td class="mailbox-attachment">{{task.electricCount}}</td> <td class="mailbox-attachment">{{task.electricCount}}</td>
<td class="mailbox-subject">{{task.failedCards}}</td> <td ng-if="task.failedCount!=0" class="mailbox-subject" style="color: red;">{{task.failedCount}}</td>
<td ng-if="task.failedCount==0" class="mailbox-subject">{{task.failedCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">派出所列表</a></td> <td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">派出所列表</a></td>
</tr> </tr>
</tbody> </tbody>
......
src/main/resources/static/views/task/taskListQualityCheck.html
View file @ 62750a6f
...@@ -45,9 +45,11 @@ ...@@ -45,9 +45,11 @@
<th>地区</th> <th>地区</th>
<th>组数</th> <th>组数</th>
<th>组号</th> <th>组号</th>
<th>数据核验数量</th> <th>数据核验</th>
<th>电写入数量</th>
<th>废证数量</th> <th>废证数量</th>
<th>出库数量</th>
<th>入库数量</th>
<th>操作</th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
...@@ -60,9 +62,12 @@ ...@@ -60,9 +62,12 @@
<td class="mailbox-subject">{{task.groupCount}}</td> <td class="mailbox-subject">{{task.groupCount}}</td>
<td class="mailbox-subject">{{task.groupNo}}</td> <td class="mailbox-subject">{{task.groupNo}}</td>
<td class="mailbox-subject">{{task.dataCheckCount}}</td> <td class="mailbox-subject">{{task.dataCheckCount}}</td>
<td class="mailbox-attachment">{{task.electricCount}}</td> <td ng-if="task.failedCount>0" class="mailbox-subject" style="color: red;">{{task.failedCount}}</td>
<td class="mailbox-subject">{{task.failedCards}}</td> <td ng-if="task.failedCount==0" class="mailbox-subject">{{task.failedCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td> <td class="mailbox-attachment">{{task.outStoreCount}}</td>
<td class="mailbox-subject">{{task.enterStoreCount}}</td>
<td><button class="btn btn-primary">完成</button></td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">派出所列表</a></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -72,7 +77,8 @@ ...@@ -72,7 +77,8 @@
</div> </div>
<!-- /.box-body --> <!-- /.box-body -->
<div class="box-footer" style="text-align: right;"> <div class="box-footer" style="text-align: right;">
<button class="btn btn-primary" ng-click="goes()">下发任务单</button> <button class="btn btn-primary" ng-click="outStore()">出库</button>
<button class="btn btn-primary" ng-click="enterStore()">入库</button>
</div> </div>
</div> </div>
<!-- /. box --> <!-- /. box -->
......
src/main/resources/static/views/task/taskListSorting.html
View file @ 62750a6f
...@@ -60,7 +60,8 @@ ...@@ -60,7 +60,8 @@
<td class="mailbox-subject">{{task.groupNo}}</td> <td class="mailbox-subject">{{task.groupNo}}</td>
<td class="mailbox-subject">{{task.dataCheckCount}}</td> <td class="mailbox-subject">{{task.dataCheckCount}}</td>
<td class="mailbox-attachment">{{task.electricCount}}</td> <td class="mailbox-attachment">{{task.electricCount}}</td>
<td class="mailbox-subject">{{task.failedCards}}</td> <td ng-if="task.failedCount!=0" class="mailbox-subject" style="color: red;">{{task.failedCount}}</td>
<td ng-if="task.failedCount==0" class="mailbox-subject">{{task.failedCount}}</td>
<td class="mailbox-subject">{{task.checkCount}}</td> <td class="mailbox-subject">{{task.checkCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">派出所列表</a></td> <td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">派出所列表</a></td>
<td class="mailbox-subject"><button class="btn btn-primary">打印封条</button></td> <td class="mailbox-subject"><button class="btn btn-primary">打印封条</button></td>
......
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