Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 52f48d45 authored by dahai's avatar dahai
Browse files
Options

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

# Conflicts:
#	src/main/java/com/yxproject/start/api/ImportXmlApi.java
parents 56575181 6d711bfa
Hide whitespace changes
Inline Side-by-side
Showing with 478 additions and 19 deletions
src/main/java/com/yxproject/start/api/FilesAnalysisApi.java
View file @ 52f48d45
...@@ -11,6 +11,13 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -11,6 +11,13 @@ import org.springframework.web.bind.annotation.RestController;
public class FilesAnalysisApi { public class FilesAnalysisApi {
@Autowired @Autowired
private PersonPostService personPostService; private PersonPostService personPostService;
/**
* 文件解析
* @param fileId
* @param creatTime
* @return
*/
@RequestMapping("anailsis") @RequestMapping("anailsis")
public boolean filesAnailsis(@RequestParam(value = "fileId") String fileId,@RequestParam(value = "creatTime") String creatTime){ public boolean filesAnailsis(@RequestParam(value = "fileId") String fileId,@RequestParam(value = "creatTime") String creatTime){
personPostService.updateIsPost(fileId,creatTime); personPostService.updateIsPost(fileId,creatTime);
......
src/main/java/com/yxproject/start/mapper/PreproPersonMapper.java
View file @ 52f48d45
...@@ -37,4 +37,8 @@ public interface PreproPersonMapper { ...@@ -37,4 +37,8 @@ public interface PreproPersonMapper {
" <when test='state!=null'> and PREPRO_PERSON.state = #{state} </when> " + " <when test='state!=null'> and PREPRO_PERSON.state = #{state} </when> " +
" <when test='uploadDate!=null'> and files.CREAT_TIME = #{uploadDate} </when> ") " <when test='uploadDate!=null'> and files.CREAT_TIME = #{uploadDate} </when> ")
public List<PreproPersonEntity> selectPreproPerson(@Param("uploadNo")String uploadNo, @Param("IDCard")String IDCard, @Param("oldFile")String oldFile, @Param("newFile")String newFile, @Param("SSXQDM")String SSXQDM, @Param("cardType")String cardType, @Param("state")String state, @Param("uploadDate")String uploadDate); public List<PreproPersonEntity> selectPreproPerson(@Param("uploadNo")String uploadNo, @Param("IDCard")String IDCard, @Param("oldFile")String oldFile, @Param("newFile")String newFile, @Param("SSXQDM")String SSXQDM, @Param("cardType")String cardType, @Param("state")String state, @Param("uploadDate")String uploadDate);
}
/*修改标记制证数据状态*/
@Update("UPDATE PREPRO_PERSON SET STATE = #{state} WHERE JMSFZSLH=#{acceptNo}")
public boolean updateState (@Param("state")String state, @Param("acceptNo") String acceptNo);
}
\ No newline at end of file
src/main/resources/application.yml
View file @ 52f48d45
server: server:
port: 8082 port: 8083
#spring相关 #spring相关
spring: spring:
datasource: datasource:
......
src/main/resources/static/dialogs/policeList.html 0 → 100644
View file @ 52f48d45
<div class="ui-dialog-title">
派出所数量详情
</div>
<div class="ui-dialog-content">
<table class="table table-responsive" style="border-color: black;">
<thead>
<tr>
<th>派出所名称</th>
<th>数据核验数量</th>
<th>打印卸载数量</th>
<th>质检数量</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.policeName}}</td>
<td>{{item.dataCheckCount}}</td>
<td>{{item.printCount}}</td>
<td>{{item.qualityCheckCount}}</td>
</tr>
</tbody>
</table>
</div>
\ No newline at end of file
src/main/resources/static/index.html
View file @ 52f48d45
...@@ -170,40 +170,35 @@ ...@@ -170,40 +170,35 @@
</a> </a>
</li> </li>
<li ng-class="{true: 'active', false: ''}[tab =='/taskListDataCheck']" ng-click="getFocus('/taskListDataCheck')">
<a href="#!/taskListDataCheck">
<i class="fa fa-dashboard"></i>
<span>任务单</span>
</a>
</li>
<li ng-class="{true: 'active', false: ''}[tab =='/taskListPrint']" ng-click="getFocus('/taskListPrint')"> <li ng-class="{true: 'active', false: ''}[tab =='/taskListPrint']" ng-click="getFocus('/taskListPrint')">
<a href="#!/taskListPrint"> <a href="#!/taskListPrint">
<i class="fa fa-dashboard"></i> <i class="fa fa-dashboard"></i>
<span>任务单</span> <span>膜打印任务单</span>
</a> </a>
</li> </li>
<li ng-class="{true: 'active', false: ''}[tab =='/taskListPreLocating']" ng-click="getFocus('/taskListPreLocating')"> <li ng-class="{true: 'active', false: ''}[tab =='/taskListPreLocating']" ng-click="getFocus('/taskListPreLocating')">
<a href="#!/taskListPreLocating"> <a href="#!/taskListPreLocating">
<i class="fa fa-dashboard"></i> <i class="fa fa-dashboard"></i>
<span>任务单</span> <span>预定位任务单</span>
</a> </a>
</li> </li>
<li ng-class="{true: 'active', false: ''}[tab =='/taskListQualityCheck']" ng-click="getFocus('/taskListQualityCheck')"> <li ng-class="{true: 'active', false: ''}[tab =='/taskListQualityCheck']" ng-click="getFocus('/taskListQualityCheck')">
<a href="#!/taskListQualityCheck"> <a href="#!/taskListQualityCheck">
<i class="fa fa-dashboard"></i> <i class="fa fa-dashboard"></i>
<span>任务单</span> <span>质检任务单</span>
</a> </a>
</li> </li>
<li ng-class="{true: 'active', false: ''}[tab =='/taskListSorting']" ng-click="getFocus('/taskListSorting')"> <li ng-class="{true: 'active', false: ''}[tab =='/taskListSorting']" ng-click="getFocus('/taskListSorting')">
<a href="#!/taskListSorting"> <a href="#!/taskListSorting">
<i class="fa fa-dashboard"></i> <i class="fa fa-dashboard"></i>
<span>任务单</span> <span>分拣任务单</span>
</a> </a>
</li> </li>
<li ng-class="{true: 'active', false: ''}[tab =='/taskListStorage']" ng-click="getFocus('/taskListStorage')"> <li ng-class="{true: 'active', false: ''}[tab =='/taskListStorage']" ng-click="getFocus('/taskListStorage')">
<a href="#!/taskListStorage"> <a href="#!/taskListStorage">
<i class="fa fa-dashboard"></i> <i class="fa fa-dashboard"></i>
<span>任务单</span> <span>仓库任务单</span>
</a> </a>
</li> </li>
<li ng-class="{true: 'active', false: ''}[tab =='/receitp']" ng-click="getFocus('/receitp')"> <li ng-class="{true: 'active', false: ''}[tab =='/receitp']" ng-click="getFocus('/receitp')">
...@@ -218,6 +213,12 @@ ...@@ -218,6 +213,12 @@
<span>添加废证</span> <span>添加废证</span>
</a> </a>
</li> </li>
<li ng-class="{true: 'active', false: ''}[tab =='/addRest']" ng-click="getFocus('/addRest')">
<a href="#!/addRest">
<i class="fa fa-plus"></i>
<span>添加余证</span>
</a>
</li>
</ul> </ul>
</section> </section>
<!-- /.sidebar --> <!-- /.sidebar -->
...@@ -248,6 +249,6 @@ ...@@ -248,6 +249,6 @@
<script src="views/searchCard/searchCard.js"></script> <script src="views/searchCard/searchCard.js"></script>
<script src="views/createTaskList/createTaskList.js"></script> <script src="views/createTaskList/createTaskList.js"></script>
<script src="views/dispatchTask/dispatchTask.js"></script> <script src="views/dispatchTask/dispatchTask.js"></script>
<script src="views/addRest/addRest.js"></script>
</body> </body>
</html> </html>
\ No newline at end of file
src/main/resources/static/js/app.js
View file @ 52f48d45
...@@ -13,6 +13,7 @@ angular.module('AvatarCheck', [ ...@@ -13,6 +13,7 @@ angular.module('AvatarCheck', [
'AvatarCheck.searchCardMsg', 'AvatarCheck.searchCardMsg',
'AvatarCheck.receitp', 'AvatarCheck.receitp',
'AvatarCheck.addFailed', 'AvatarCheck.addFailed',
'AvatarCheck.addRest',
'AvatarCheck.searchCard', 'AvatarCheck.searchCard',
'AvatarCheck.task', 'AvatarCheck.task',
'AvatarCheck.createTaskList', 'AvatarCheck.createTaskList',
...@@ -82,6 +83,9 @@ angular.module('AvatarCheck', [ ...@@ -82,6 +83,9 @@ angular.module('AvatarCheck', [
if ($location.path() == "/addFailed") { if ($location.path() == "/addFailed") {
$rootScope.tab = '/addFailed'; $rootScope.tab = '/addFailed';
} }
if ($location.path() == "/addRest") {
$rootScope.tab = '/addRest';
}
if ($location.path() == "/cardProdUpdate") { if ($location.path() == "/cardProdUpdate") {
$rootScope.tab = '/cardProdUpdate'; $rootScope.tab = '/cardProdUpdate';
} }
......
src/main/resources/static/js/service.js
View file @ 52f48d45
...@@ -141,6 +141,20 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -141,6 +141,20 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
}) })
} },
uploadPackage:function(fd,func){
$http({
method: 'POST',
url: "../importXML/getXMLToCheck",
data: fd,
headers: {'Content-Type': 'application/xml'},
transformRequest: angular.identity
}).then(function successCallback(resp) {
return func(resp.data)
}, function errorCallback(error) {
var err = {data: error, success: false, dur: 0}
return func(err)
})
},
} }
}); });
\ No newline at end of file
src/main/resources/static/views/addRest/addRest.html 0 → 100644
View file @ 52f48d45
<section class="content-header" style="padding-top: 1px;">
<h4>
添加余证
</h4>
</section>
\ No newline at end of file
src/main/resources/static/views/addRest/addRest.js 0 → 100644
View file @ 52f48d45
'use strict';
angular.module('AvatarCheck.addRest', ['ngRoute', 'AvatarCheck.http'])
.config(['$routeProvider', function ($routeProvider) {
$routeProvider.when('/addRest', {
templateUrl: 'views/addRest/addRest.html' + urlTimeStamp(),
controller: 'addRestCtrl',
cache: false
});
}])
.controller('addRestCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
});
\ No newline at end of file
src/main/resources/static/views/createTaskList/createTaskList.html
View file @ 52f48d45
...@@ -2,4 +2,74 @@ ...@@ -2,4 +2,74 @@
<h4> <h4>
创建任务单 创建任务单
</h4> </h4>
</section>
<section class="content" style="padding: 15px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary">
<div class="box-header with-border">
<strong>可创建的任务单</strong>
<div class="box-tools pull-right">
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-right: 10px;" ng-click="searchCurrent()">查询</button>
</div>
<!-- /.box-tools -->
</div>
<!-- /.box-header -->
<div class="box-body">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs">
<li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]"
ng-repeat="tab in cycleSheetData track by $index">
<a ng-click="func($index,tab.typeCode)">
<ul style="margin: 0;padding: 0;">
<li style="font-size: 16px;">{{tab.typeName}}</li>
<li style="text-align: center;">{{tab.typeSum}}</li>
</ul>
</a>
</li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
<table class="table table-hover table-striped">
<thead>
<tr>
<th><input type="checkbox"></th>
<th>任务单编号</th>
<th>地区</th>
<th>组号</th>
<th>合格数</th>
<th>不合格数</th>
<th></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="task in type.countyList">
<td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-name"><a>{{task.county}}</a></td>
<td class="mailbox-subject">{{task.groupNo}}</td>
<td class="mailbox-attachment">{{task.valid}}</td>
<td class="mailbox-date">{{task.invalid}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">派出所列表</a></td>
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body -->
<div class="box-footer" style="text-align: right;">
<button class="btn btn-primary">创建任务单</button>
<button class="btn btn-primary">创建并下发任务单</button>
</div>
</div>
<!-- /. box -->
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</section> </section>
\ No newline at end of file
src/main/resources/static/views/createTaskList/createTaskList.js
View file @ 52f48d45
...@@ -11,7 +11,106 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -11,7 +11,106 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
.controller('createTaskListCtrl', function ($scope, $rootScope, HttpService, $interval, MessageService, $timeout, $filter, ngDialog) { .controller('createTaskListCtrl', function ($scope, $rootScope, HttpService, $interval, MessageService, $timeout, $filter, ngDialog) {
//Date picker
$('#datepicker').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.cycleSheetData = [
{
typeCode: '1',
typeName: '普通证',
typeSum: 300,
isActive: 'true',
countyList: [
{
taskId: '20190228001',
county: '西城区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
},
{
taskId: '20190228001',
county: '东城区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
},
{
taskId: '20190228001',
county: '海淀区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
}
]
},
{
typeCode: '9',
typeName: '邮寄证',
typeSum: 500,
isActive: 'false',
countyList: [
{
taskId: '20190228001',
county: '朝阳区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
},
{
taskId: '20190228001',
county: '昌平区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
}
]
}
]
$scope.currentTab = 0;
$scope.func = function (index) {
for (var idx in $scope.cycleSheetData) {
if (index == idx) {
$scope.cycleSheetData[idx].isActive = true;
} else {
$scope.cycleSheetData[idx].isActive = false;
}
}
$scope.currentTab = index;
}
$scope.getPoliceList = function(taskId){
ngDialog.open({
template: 'dialogs/policeList.html' + urlTimeStamp(),
width: 600,
cache: false,
closeByDocument:false,
controller: ['$scope', function ($scope) {
$scope.policeList = [
{
policeName:'东城派出所',
dataCheckCount:100,
printCount:0,
qualityCheckCount:0
},
{
policeName:'西城派出所',
dataCheckCount:200,
printCount:0,
qualityCheckCount:0
},
]
}]
});
}
}); });
src/main/resources/static/views/dispatchTask/dispatchTask.html
View file @ 52f48d45
...@@ -2,4 +2,73 @@ ...@@ -2,4 +2,73 @@
<h4> <h4>
下发任务单 下发任务单
</h4> </h4>
</section>
<section class="content" style="padding: 15px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary">
<div class="box-header with-border">
<strong>可下发的任务单</strong>
<div class="box-tools pull-right">
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-right: 10px;" ng-click="searchCurrent()">查询</button>
</div>
<!-- /.box-tools -->
</div>
<!-- /.box-header -->
<div class="box-body">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs">
<li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]"
ng-repeat="tab in cycleSheetData track by $index">
<a ng-click="func($index,tab.typeCode)">
<ul style="margin: 0;padding: 0;">
<li style="font-size: 16px;">{{tab.typeName}}</li>
<li style="text-align: center;">{{tab.typeSum}}</li>
</ul>
</a>
</li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
<table class="table table-hover table-striped">
<thead>
<tr>
<th><input type="checkbox"></th>
<th>任务单编号</th>
<th>地区</th>
<th>组号</th>
<th>合格数</th>
<th>不合格数</th>
<th></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="task in type.countyList">
<td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-name"><a>{{task.county}}</a></td>
<td class="mailbox-subject">{{task.groupNo}}</td>
<td class="mailbox-attachment">{{task.valid}}</td>
<td class="mailbox-date">{{task.invalid}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">派出所列表</a></td>
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body -->
<div class="box-footer" style="text-align: right;">
<button class="btn btn-primary">下发任务单</button>
</div>
</div>
<!-- /. box -->
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</section> </section>
\ No newline at end of file
src/main/resources/static/views/dispatchTask/dispatchTask.js
View file @ 52f48d45
...@@ -9,9 +9,108 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -9,9 +9,108 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
}); });
}]) }])
.controller('createTaskListCtrl', function ($scope, $rootScope, HttpService, $interval, MessageService, $timeout, $filter, ngDialog) { .controller('dispatchTaskCtrl', function ($scope, $rootScope, HttpService, $interval, MessageService, $timeout, $filter, ngDialog) {
//Date picker
$('#datepicker').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.cycleSheetData = [
{
typeCode: '1',
typeName: '普通证',
typeSum: 300,
isActive: 'true',
countyList: [
{
taskId: '20190228001',
county: '西城区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
},
{
taskId: '20190228001',
county: '东城区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
},
{
taskId: '20190228001',
county: '海淀区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
}
]
},
{
typeCode: '9',
typeName: '邮寄证',
typeSum: 500,
isActive: 'false',
countyList: [
{
taskId: '20190228001',
county: '朝阳区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
},
{
taskId: '20190228001',
county: '昌平区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
}
]
}
]
$scope.currentTab = 0;
$scope.func = function (index) {
for (var idx in $scope.cycleSheetData) {
if (index == idx) {
$scope.cycleSheetData[idx].isActive = true;
} else {
$scope.cycleSheetData[idx].isActive = false;
}
}
$scope.currentTab = index;
}
$scope.getPoliceList = function(taskId){
ngDialog.open({
template: 'dialogs/policeList.html' + urlTimeStamp(),
width: 600,
cache: false,
closeByDocument:false,
controller: ['$scope', function ($scope) {
$scope.policeList = [
{
policeName:'东城派出所',
dataCheckCount:100,
printCount:0,
qualityCheckCount:0
},
{
policeName:'西城派出所',
dataCheckCount:200,
printCount:0,
qualityCheckCount:0
}
]
}]
});
}
}); });
src/main/resources/static/views/task/task.js
View file @ 52f48d45
...@@ -205,6 +205,31 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -205,6 +205,31 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
$scope.currentTab = index; $scope.currentTab = index;
} }
$scope.getPoliceList = function(taskId){
ngDialog.open({
template: 'dialogs/policeList.html' + urlTimeStamp(),
width: 600,
cache: false,
closeByDocument:false,
controller: ['$scope', function ($scope) {
$scope.policeList = [
{
policeName:'东城派出所',
dataCheckCount:100,
printCount:0,
qualityCheckCount:0
},
{
policeName:'西城派出所',
dataCheckCount:200,
printCount:0,
qualityCheckCount:0
}
]
}]
});
}
}) })
.controller('taskListPreLocatingCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) { .controller('taskListPreLocatingCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
......
src/main/resources/static/views/task/taskListPrint.html
View file @ 52f48d45
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/> <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-right: 10px;" ng-click="searchCurrent()">查询</button>
</div> </div>
<!-- /.box-tools --> <!-- /.box-tools -->
</div> </div>
...@@ -53,7 +52,7 @@ ...@@ -53,7 +52,7 @@
<td class="mailbox-subject">{{task.groupNo}}</td> <td class="mailbox-subject">{{task.groupNo}}</td>
<td class="mailbox-attachment">{{task.valid}}</td> <td class="mailbox-attachment">{{task.valid}}</td>
<td class="mailbox-date">{{task.invalid}}</td> <td class="mailbox-date">{{task.invalid}}</td>
<td class="mailbox-date"><a href="#">组号列表</a></td> <td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">派出所列表</a></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -62,6 +61,9 @@ ...@@ -62,6 +61,9 @@
<!-- /.mail-box-messages --> <!-- /.mail-box-messages -->
</div> </div>
<!-- /.box-body --> <!-- /.box-body -->
<div class="box-footer" style="text-align: right;">
<button class="btn btn-primary">下发任务单</button>
</div>
</div> </div>
<!-- /. box --> <!-- /. box -->
</div> </div>
......
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.html
View file @ 52f48d45
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<div class="box-primary" style="padding: 15px;padding-top: 0;"> <div class="box-primary" style="padding: 15px;padding-top: 0;">
<table class="table table-bordered" style="margin-bottom: 0;"> <table class="table table-bordered" style="margin-bottom: 0;">
<tr> <tr>
<td>Excel导入时间:</td> <td>Xml导入时间:</td>
<td> <td>
<div class="input-group date" style="width: 65%"> <div class="input-group date" style="width: 65%">
<div class="input-group-addon"> <div class="input-group-addon">
......
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.js
View file @ 52f48d45
...@@ -48,5 +48,18 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -48,5 +48,18 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
}); });
} }
$scope.uploadFile = function () {
var fd = new FormData();
var files = document.querySelector('input#id_file_photo_for_check').files[0];
if(angular.isUndefined(files)){
MessageService.showAlert("请选择上传的文件...")
}else{
fd.append('file', files);
HttpService.uploadPackage(fd.get("file"),function (data) {
console.log("导入项目的返回结果：",data)
})
}
}
}); });
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