Skip to content

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

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

parents 45fc9486 9d7b31e8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 246 additions and 243 deletions
src/main/java/com/yxproject/start/api/AdminApi.java
View file @ ab61c05e
......@@ -237,7 +237,6 @@ public class AdminApi {
String str = "0";
SysPermission sysPermission = new SysPermission();
sysPermission.setName(jsonObject.getString("name"));
sysPermission.setResource_type(jsonObject.getString("resourceType"));
sysPermission.setUrl(jsonObject.getString("url"));
sysPermission.setPermission(jsonObject.getString("permission"));
// sysPermission.setParent_id(Long.parseLong(jsonObject.getString("parentId")));
......@@ -335,6 +334,7 @@ public class AdminApi {
SysRole sysRole = new SysRole();
sysRole.setRole(jsonObject.getString("role"));
sysRole.setDescription(jsonObject.getString("description"));
sysRole.setProcess(Integer.parseInt(jsonObject.getString("process")));
String permissionIds = jsonObject.getString("permissionIds");
JSONArray jsonArray = JSONArray.fromObject(permissionIds);
......@@ -402,19 +402,11 @@ public class AdminApi {
JSONObject jsonObject = JSONObject.fromObject(jsonStr);
Map<String, String> map = new HashMap<>();
boolean flag = false;
// String str = "0";
SysPermission sysPermission = new SysPermission();
sysPermission.setId(Integer.parseInt(jsonObject.getString("id")));
sysPermission.setName(jsonObject.getString("name"));
sysPermission.setResource_type(jsonObject.getString("resourceType"));
sysPermission.setUrl(jsonObject.getString("url"));
sysPermission.setPermission(jsonObject.getString("permission"));
// sysPermission.setParent_id(Long.parseLong(parentId));
// if(parentId.equals(str)){
// sysPermission.setParent_ids(parentId+"/");
// }else{
// sysPermission.setParent_ids(str+"/"+parentId);
// }
System.out.println(sysPermission);
flag = sysPermissionService.updatePermission(sysPermission);
if (flag) {
......@@ -426,4 +418,4 @@ public class AdminApi {
return map;
}
}
}
src/main/java/com/yxproject/start/entity/SysPermission.java
View file @ ab61c05e
......@@ -5,7 +5,7 @@ import java.io.Serializable;
import java.util.List;
/**
* @author zhangyusheng
* @author liboyang
*/
@Entity
@Table(name="SYS_PERMISSION")
......@@ -20,10 +20,7 @@ public class SysPermission implements Serializable {
* 名称.
*/
private String name;
/**
* 资源类型
*/
private String resource_type;
/**
* 资源路径.
*/
......@@ -33,19 +30,6 @@ public class SysPermission implements Serializable {
*/
private String permission;
/**
* 父编号
*/
private Long parent_id;
/**
* 父编号列表
*/
private String parent_ids;
private byte available = 0;
@ManyToMany
@JoinTable(name="SysRolePermission",joinColumns={@JoinColumn(name="permissionId")},inverseJoinColumns={@JoinColumn(name="roleId")})
......@@ -67,22 +51,6 @@ public class SysPermission implements Serializable {
this.name = name;
}
public String getResource_type() {
return resource_type;
}
public void setResource_type(String resource_type) {
this.resource_type = resource_type;
}
public String getParent_ids() {
return parent_ids;
}
public void setParent_ids(String parent_ids) {
this.parent_ids = parent_ids;
}
public String getUrl() {
return url;
}
......@@ -99,16 +67,6 @@ public class SysPermission implements Serializable {
this.permission = permission;
}
public Long getParent_id() {
return parent_id;
}
public void setParent_id(Long parent_id) {
this.parent_id = parent_id;
}
public byte getAvailable() {
return available;
}
......
src/main/java/com/yxproject/start/entity/SysRole.java
View file @ ab61c05e
......@@ -4,7 +4,7 @@ import javax.persistence.*;
import java.util.List;
/**
* @author zhangyusheng
* @author liboyang
*/
@Entity
@Table(name="SYS_ROLE")
......@@ -17,7 +17,7 @@ public class SysRole {
private Integer id;
/**
* 角色标识程序中判断使用,如"admin",这个是唯一的:
*/
*/
private String role;
/**
* 角色描述,UI界面显示使用
......@@ -28,6 +28,8 @@ public class SysRole {
*/
private byte available = 0;
private Integer process;
/**
* 角色 -- 权限关系：多对多关系;
*/
......@@ -37,13 +39,13 @@ public class SysRole {
/**
* 用户 - 角色关系定义;
*/
*/
@ManyToMany
@JoinTable(name="SysUserRole",joinColumns={@JoinColumn(name="roleId")},inverseJoinColumns={@JoinColumn(name="userId")})
/**
* 一个角色对应多个用户
*/
*/
private List<UserInfo> userInfos;
......@@ -94,4 +96,12 @@ public class SysRole {
public void setUserInfos(List<UserInfo> userInfos) {
this.userInfos = userInfos;
}
public Integer getProcess() {
return process;
}
public void setProcess(Integer process) {
this.process = process;
}
}
\ No newline at end of file
src/main/java/com/yxproject/start/entity/UserInfo.java
View file @ ab61c05e
......@@ -5,7 +5,7 @@ import java.io.Serializable;
import java.util.List;
/**
* @author zhangyusheng
* @author liboyang
*/
@Entity
@Table(name="USER_INFO")
......@@ -19,7 +19,6 @@ public class UserInfo implements Serializable {
private String password;
private String salt;
private byte state;
private String workshop;
@ManyToMany(fetch= FetchType.EAGER)
@JoinTable(name = "SysUserRole", joinColumns = { @JoinColumn(name = "userId") }, inverseJoinColumns ={@JoinColumn(name = "roleId") })
private List<SysRole> roleList;
......@@ -80,11 +79,4 @@ public class UserInfo implements Serializable {
this.roleList = roleList;
}
public String getWorkshop() {
return workshop;
}
public void setWorkshop(String workshop) {
this.workshop = workshop;
}
}
\ No newline at end of file
src/main/java/com/yxproject/start/mapper/SysPermissionMapper.java
View file @ ab61c05e
......@@ -2,8 +2,10 @@ package com.yxproject.start.mapper;
import com.yxproject.start.entity.SysPermission;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Map;
/**
* @author Administrator
......@@ -14,8 +16,8 @@ public interface SysPermissionMapper{
* 新增权限
* @param sysPermission
*/
@Insert("INSERT INTO sys_permission (id,available,name,parent_id,parent_ids,permission,resource_type,url)\n" +
"VALUES (PERMISSION_seq.nextval,0,#{name},'0','0/',#{permission},#{resource_type},#{url})")
@Insert("INSERT INTO sys_permission (id,available,name,permission,url)\n" +
"VALUES (PERMISSION_seq.nextval,0,#{name},#{permission},#{url})")
public void addPermissionByMap(SysPermission sysPermission);
/**
......@@ -74,7 +76,7 @@ public interface SysPermissionMapper{
* 修改权限信息
* @param sysPermission
*/
@Update("update SYS_PERMISSION SET NAME=#{name},resource_type=#{resource_type},url=#{url}," +
@Update("update SYS_PERMISSION SET NAME=#{name},url=#{url}," +
"permission=#{permission} where id=#{id}")
public void updatePermission(SysPermission sysPermission);
}
src/main/java/com/yxproject/start/mapper/SysRoleMapper.java
View file @ ab61c05e
......@@ -2,6 +2,7 @@ package com.yxproject.start.mapper;
import com.yxproject.start.entity.SysRole;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
import java.util.List;
......@@ -14,8 +15,8 @@ public interface SysRoleMapper {
* 添加角色
* @param sysRole
*/
@Insert("INSERT INTO SYS_ROLE(ID,AVAILABLE,DESCRIPTION,ROLE)\n" +
"VALUES(PERMISSION_seq.nextval,0,#{description},#{role})")
@Insert("INSERT INTO SYS_ROLE(ID,AVAILABLE,DESCRIPTION,ROLE,PROCESS)\n" +
"VALUES(PERMISSION_seq.nextval,0,#{description},#{role},#{process})")
@Options(useGeneratedKeys = true, keyProperty = "id",keyColumn = "id")
public void addRoleByMap(SysRole sysRole);
......@@ -36,6 +37,7 @@ public interface SysRoleMapper {
@Result(property = "role",column = "role"),
@Result(property = "description",column = "description"),
@Result(property = "available",column = "available"),
@Result(property = "process",column = "process"),
@Result(property = "permissions",javaType = List.class,column ="id",
many = @Many(select = "com.yxproject.start.mapper.SysPermissionMapper.selectPermissionByRoleId"))})
public List<SysRole> selectAllRole();
......@@ -65,6 +67,7 @@ public interface SysRoleMapper {
@Result(property = "role",column = "role"),
@Result(property = "description",column = "description"),
@Result(property = "available",column = "available"),
@Result(property = "process",column = "process"),
@Result(property = "permissions",javaType = List.class,column ="id",
many = @Many(select = "com.yxproject.start.mapper.SysPermissionMapper.selectPermissionByRoleId"))})
List<SysRole> selectRoleAndPermissionByUserId(@Param("userId") Integer userId);
......@@ -102,6 +105,7 @@ public interface SysRoleMapper {
@Result(property = "role",column = "role"),
@Result(property = "description",column = "description"),
@Result(property = "available",column = "available"),
@Result(property = "process",column = "process"),
@Result(property = "permissions",javaType = List.class,column ="id",
many = @Many(select = "com.yxproject.start.mapper.SysPermissionMapper.selectPermissionByRoleId"))})
public SysRole selectRoleByRoleId(@Param("roleId") Integer roleId);
......
src/main/resources/static/css/app.css
View file @ ab61c05e
......@@ -299,4 +299,6 @@ p {
font-family: 'Arial Black';
color:#000;
}
.padding10{
padding: 10px;
}
src/main/resources/static/dialogs/analysisDialog.html 0 → 100644
View file @ ab61c05e
<div class="ui-dialog-title" >
请选择格口文件，解析 {{upDate}} 上传的 {{upCount}} 制证包
</div>
<div class="ui-dialog-content">
<table class="table table-hover" >
<thead>
<tr>
<th>NO.</th>
<th>上传时间</th>
<th>格口文件名</th>
<th>数量</th>
<th>订单起始日期</th>
<th>订单截至日期</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr >
<td>1</td>
<td>2019-03-04 15:08</td>
<td>格口文件.xls</td>
<td>400</td>
<td>2019-03-01</td>
<td>2019-03-03</td>
<td ng-click="">
<button class="btn">解析</button>
</td>
</tr>
<tr >
<td>2</td>
<td>2019-03-04 15:08</td>
<td>格口文件.xls</td>
<td>400</td>
<td>2019-03-01</td>
<td>2019-03-03</td>
<td ng-click="">
<button class="btn">解析</button>
</td>
</tr>
<tr >
<td>3</td>
<td>2019-03-04 15:08</td>
<td>格口文件.xls</td>
<td>400</td>
<td>2019-03-01</td>
<td>2019-03-03</td>
<td ng-click="">
<button class="btn">解析</button>
</td>
</tr>
<tr >
<td>4</td>
<td>
2019-03-04 15:08
</td>
<td>
格口文件.xls
</td>
<td>
400
</td>
<td>
2019-03-01
</td>
<td>
2019-03-03
</td>
<td ng-click="">
<button class="btn">解析</button>
</td>
</tr>
</tbody>
</table>
</div>
<div class="ui-dialog-confirm">
<div class="progress">
<div class="progress-bar progress-bar-success progress-bar-striped"
role="progressbar"
aria-valuemin="0"
aria-valuemax="100"
style="width: 90%"> 90% Complete (success)
</div>
</div>
</div>
<div style="text-align: center;">
<button class="btn btn-success" style="width: 70%" ng-click="closeThisDialog()">关闭</button>
</div>
\ No newline at end of file
src/main/resources/static/index.html
View file @ ab61c05e
This diff is collapsed.
src/main/resources/static/js/app.js
View file @ ab61c05e
......@@ -24,9 +24,9 @@ angular.module('AvatarCheck', [
'AvatarCheck.packageLog',
'AvatarCheck.tagPrint',
'tm.pagination'
]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider', function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) {
]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider',function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) {
$locationProvider.hashPrefix('!');
$routeProvider.otherwise({redirectTo: '/xmlAndSearch'});
$routeProvider.otherwise({redirectTo: '/createTaskList'});
localStorageServiceProvider.setPrefix('AvatarCheck')
$qProvider.errorOnUnhandledRejections(false)
}])
......@@ -37,15 +37,22 @@ angular.module('AvatarCheck', [
$rootScope.loginData = localStorageService.get('loginData')
$scope.id = 'id';
if($rootScope.loginData == null){
$rootScope.loginData = {userid:'用户未登录', login:false};
}
if($rootScope.loginData.login == false){
$location.path("/login");
}
if($rootScope.loginData.login == true){
$rootScope.menuList = $rootScope.loginData.roleList[0].permissions;
console.log($scope.menuList)
}
$rootScope.tab = '/xmlAndSearch';
if ($location.path() == "/excelAndSearch") {
$rootScope.tab = '/excelAndSearch';
}
......@@ -118,7 +125,6 @@ angular.module('AvatarCheck', [
}
console.log($rootScope.tab)
$scope.getFocus = function (index) {
if(index=='/tagPrint'){
......
src/main/resources/static/views/addFailed/addFailed.html
View file @ ab61c05e
......@@ -4,13 +4,9 @@
vertical-align: middle!important;
}
</style>
<section class="content-header" style="padding-top: 1px;">
<h4>
添加废证
</h4>
</section>
<div style="padding: 15px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<strong class="box-header with-border">废证添加</strong>
<div class="box-primary">
<form ng-submit="createInputs()" style="padding-left: 15px;">
<span style="font-size:20px;">废证数量:</span>
......
src/main/resources/static/views/addRest/addRest.html
View file @ ab61c05e
......@@ -7,13 +7,9 @@
.cl:after{display:block;clear:both;content:"";visibility:hidden;height:0}
.cl{zoom:1}
</style>
<section class="content-header" style="padding-top: 1px;">
<h4>
添加余证
</h4>
</section>
<div style="padding: 15px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<strong class="box-header with-border">余证添加</strong>
<div class="box-primary">
<form ng-submit="createInputs()" style="padding-left: 15px;">
<span style="font-size:20px;">余证数量:</span>
......
src/main/resources/static/views/analysisLog/analysisLog.html
View file @ ab61c05e
......@@ -24,14 +24,9 @@
zoom: 1
}
</style>
<section class="content-header" style="padding-top: 1px;">
<h4>
原始包解析日志
</h4>
</section>
<div style="padding: 15px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<strong class="box-header"></strong>
<strong class="box-header with-border">解析日志</strong>
<div class="box-primary" style="padding: 15px;padding-top: 0;">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
......
src/main/resources/static/views/cardProdPackage/cardProdPackage.html
View file @ ab61c05e
......@@ -27,12 +27,7 @@
zoom: 1
}
</style>
<section class="content-header" style="padding-top: 1px;">
<h4>
制证信息打包
</h4>
</section>
<div style="padding: 15px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<strong class="box-header">制证信息打包</strong>
<div class="box-info">
......@@ -89,7 +84,7 @@
</div>
<div class="box box-default">
<strong class="box-header">制证信息详情</strong>
<strong class="box-header with-border">制证信息详情</strong>
<div class="box-info" style="padding: 10px;">
<table class="table table-bordered table-hover" ng-if="packageData">
<thead>
......
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.html
View file @ ab61c05e
......@@ -27,12 +27,7 @@
zoom: 1
}
</style>
<section class="content-header" style="padding-top: 1px;">
<h4>
制证包删除
</h4>
</section>
<div style="padding: 15px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<strong class="box-header">制证信息打包</strong>
<div class="box-info">
......@@ -83,7 +78,7 @@
</div>
<div class="box box-default">
<strong class="box-header">查询结果</strong>
<strong class="box-header with-border">查询结果</strong>
<div class="box-info" style="padding: 10px;">
<table class="table table-bordered table-hover" ng-if="xmlDatas">
<thead>
......
src/main/resources/static/views/createTaskList/createTaskList.html
View file @ ab61c05e
<section class="content-header" style="padding-top: 1px;">
<h4>
任务单创建
</h4>
</section>
<section class="content" style="padding: 15px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
......@@ -75,4 +70,4 @@
<!-- /.col -->
</div>
<!-- /.row -->
</section>
\ No newline at end of file
</div>
\ No newline at end of file
src/main/resources/static/views/dispatchTask/dispatchTask.html
View file @ ab61c05e
<section class="content-header" style="padding-top: 1px;">
<h4>
任务单下发
</h4>
</section>
<section class="content" style="padding: 15px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
......@@ -76,4 +71,4 @@
<!-- /.col -->
</div>
<!-- /.row -->
</section>
\ No newline at end of file
</div>
\ No newline at end of file
src/main/resources/static/views/excelAndSearch/excelAndSearch.html
View file @ ab61c05e
......@@ -27,12 +27,7 @@
zoom: 1
}
</style>
<section class="content-header" style="padding-top: 1px;">
<h4>
邮寄信息导入
</h4>
</section>
<div style="padding: 15px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<strong class="box-header">格口文件上传</strong>
<div class="box-primary">
......@@ -82,7 +77,7 @@
</div>
</div>
<div class="box box-primary">
<strong class="box-header">格口文件管理</strong>
<strong class="box-header with-border">格口文件管理</strong>
<div class="box-primary" style="padding: 15px;padding-top: 0;">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
......
src/main/resources/static/views/excelAndSearch/excelAndSearch.js
View file @ ab61c05e
......@@ -24,19 +24,19 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
format: 'yyyyMMdd',
todayBtn: 1,
autoclose: 1
});
$('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
format: 'yyyyMMdd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.choseDate = $filter("date")(new Date(), "yyyyMMdd");
$scope.paginationConf = {
currentPage: 1,
......@@ -46,6 +46,7 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
$scope.paginationConf.totalItems = 50;
$scope.uploadExcel = function () {
console.log($("#datepicker1").val())
var fd = new FormData();
var files = document.querySelector('input#id_file_photo_for_check').files;
fd.append("formStartTime",$("#datepicker1").val());
......
src/main/resources/static/views/historyCards/historyBack.html
View file @ ab61c05e
......@@ -4,14 +4,9 @@
vertical-align: middle!important;
}
</style>
<section class="content-header" style="padding-top: 1px;">
<h4>
历史回迁证
</h4>
</section>
<div style="padding: 15px;">
<div class="box box-primary">
<div class="box-primary">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<strong class="box-header with-border">回迁证添加</strong>
<form style="padding-left: 15px;">
<span style="font-size:20px;">回迁证数量:</span>
<input style="margin-top:20px;height: 30px;" type="text" ng-model="historyCount">
......@@ -55,6 +50,4 @@
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/login/login.js
View file @ ab61c05e
......@@ -28,6 +28,42 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http'])
}
}
var whereToGo = function(process){
switch (process){
case 1:
$location.path("/createTaskList");
$rootScope.tab = '/createTaskList';
break;
case 2:
$location.path("/taskListPrint");
$rootScope.tab = '/taskListPrint';
break;
case 3:
$location.path("/taskListPreLocating");
$rootScope.tab = '/taskListPreLocating';
break;
case 4:
$location.path("/taskListSorting");
$rootScope.tab = '/taskListSorting';
break;
case 5:
$location.path("/taskListQualityCheck");
$rootScope.tab = '/taskListQualityCheck';
break;
case 6:
$location.path("/receitp");
$rootScope.tab = '/receitp';
break;
case 7:
$location.path("/uploadExcelAndSearch");
$rootScope.tab = '/uploadExcelAndSearch';
break;
case 8:
$location.path("/createTaskList");
$rootScope.tab = '/createTaskList';
break;
}
}
$scope.user = {};
$scope.doLogin = function(){
......@@ -41,7 +77,9 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http'])
$rootScope.loginData = resp.data.user;
$rootScope.loginData.login =true;
localStorageService.set('loginData', resp.data.user);
$location.path('/xmlAndSearch')
$rootScope.menuList = $rootScope.loginData.roleList[0].permissions;
console.log($scope.menuList)
whereToGo($rootScope.loginData.roleList[0].process)
if(userAgent.indexOf('.NET')!=-1){
window.location.reload();
}else{
......
src/main/resources/static/views/packageLog/packageLog.html
View file @ ab61c05e
......@@ -24,14 +24,9 @@
zoom: 1
}
</style>
<section class="content-header" style="padding-top: 1px;">
<h4>
数据打包日志
</h4>
</section>
<div style="padding: 15px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<strong class="box-header"></strong>
<strong class="box-header with-border">打包日志</strong>
<div class="box-primary" style="padding: 15px;padding-top: 0;">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
......
src/main/resources/static/views/receitp/receitp.html
View file @ ab61c05e
<section class="content-header" style="padding-top: 1px;">
<h4>
交接单
</h4>
</section>
\ No newline at end of file
<div class="col-md-12" style="margin-top:20px;">
交接单
</div>
src/main/resources/static/views/searchCard/searchCard.html
View file @ ab61c05e
<section class="content-header" style="padding-top: 1px;">
<h4>
<div style="text-align: left;cursor:pointer;"><a ng-click="goBack()"><i class="fa fa-backward"></i> 返回</a></div>
</h4>
</section>
<div style="padding: 15px;">
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<strong class="box-header">
查询结果
</strong>
<div class="box-info" style="padding: 10px;">
<div class="box-info" style="padding:0px 10px 7px 10px;">
<div class="panel panel-info">
<div class="panel-heading">
......@@ -95,14 +91,13 @@
<button class="btn btn-danger">退证</button>
</div>
</div>
<div class="panel panel-info">
<div class="panel-heading">
<h3 class="panel-title">
制证库
</h3>
</div>
<div class="panel-body">
<div class="panel-body" style="padding-bottom: 0;">
<table class="table table-hover table-bordered">
<thead>
<tr>
......@@ -148,4 +143,4 @@
</div>
</div>
\ No newline at end of file
</div></div>
\ No newline at end of file
src/main/resources/static/views/searchCardMsg/searchCardMsg.html
View file @ ab61c05e
......@@ -12,13 +12,9 @@
</style>
<section class="content-header" style="padding-top: 1px;">
<h4>
邮政快递单打印
</h4>
</section>
<div style="padding: 15px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<strong class="box-header with-border" style="padding-bottom:0px">居民身份证阅读信息</strong>
<div class="box-info">
<div class="row" style="padding: 15px;">
<div class="col-lg-3" style="text-align: center;padding-top: 20px;"><img style="height:148px;width:115px;" id="imgDetail" class="img-thumbnail" /></div>
......@@ -62,8 +58,8 @@
<button class="btn btn-info" ng-click="endReading()">停止读卡</button>
</div>
</div>
<div class="box box-primary">
<strong class="box-header">个人邮寄信息详情</strong>
<div class="box box-primary box-default">
<strong class="box-header with-border">个人邮寄信息详情</strong>
<div class="box-info" style="padding: 10px;">
<table class="table table-bordered table-striped postTable" ng-if="postMsgDetail.length>0">
<thead>
......@@ -241,7 +237,6 @@
</tr>
</table>
</div>
<div id="div3">
<table cellspacing="0" cellpadding="0" style="border-collapse:collapse;border:0px dashed #000;width:96mm;font-family: '黑体';">
<tr>
......
src/main/resources/static/views/task/taskListPreLocating.html
View file @ ab61c05e
<section class="content-header" style="padding-top: 1px;">
<h4>
任务单
</h4>
</section>
<section class="content" style="padding: 15px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
......@@ -81,5 +76,5 @@
<!-- /.col -->
</div>
<!-- /.row -->
</section>
</div>
src/main/resources/static/views/task/taskListPrint.html
View file @ ab61c05e
<section class="content-header" style="padding-top: 1px;">
<h4>
任务单
</h4>
</section>
<section class="content" style="padding: 15px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
......@@ -92,5 +88,5 @@
<!-- /.col -->
</div>
<!-- /.row -->
</section>
</div>
src/main/resources/static/views/task/taskListQualityCheck.html
View file @ ab61c05e
<section class="content-header" style="padding-top: 1px;">
<h4>
任务单
</h4>
</section>
<section class="content" style="padding: 15px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<div class="box-header with-border">
<strong>任务单详情</strong>
......@@ -84,7 +77,6 @@
<!-- /. box -->
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</section>
src/main/resources/static/views/task/taskListSorting.html
View file @ ab61c05e
<section class="content-header" style="padding-top: 1px;">
<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="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<div class="box-header with-border">
<strong>任务单详情</strong>
<div class="box-tools pull-right">
......@@ -78,9 +72,7 @@
</div>
</div>
<!-- /. box -->
</div>
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</section>
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.html
View file @ ab61c05e
......@@ -27,13 +27,9 @@
zoom: 1
}
</style>
<section class="content-header" style="padding-top: 1px;">
<h4>
邮政信息查询
</h4>
</section>
<div style="padding: 15px;">
<div class="box box-primary" style="padding: 15px;margin-bottom: 10px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary" >
<strong class="box-header">快递单信息管理</strong>
<div class="box-info">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
......@@ -87,7 +83,9 @@
</div>
</div>
<div class="box box-default">
<div class="box-header">邮寄单详情(<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共{{paginationConf.totalItems}}条</span>)</div>
<div class="box-header with-border"><strong>邮寄单详情</strong>
(<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共
{{paginationConf.totalItems}}条</span>)</div>
<div class="box-info" style="padding: 10px;">
<table class="table table-bordered table-hover" ng-if="postData.length>0">
<thead>
......
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.html
View file @ ab61c05e
......@@ -27,18 +27,14 @@
zoom: 1
}
</style>
<section class="content-header" style="padding-top: 1px;">
<h4>
制证包管理
</h4>
</section>
<div style="padding: 15px;">
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<strong class="box-header">制证包上传</strong>
<strong class="box-header with-border">制证包上传</strong>
<div class="box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td width="10%">选择xml文件：</td>
<td width="10%">选择XML文件：</td>
<td colspan="2" width="35%">
<input type="file"
id="id_file_photo_for_check"
......@@ -53,11 +49,11 @@
</div>
</div>
<div class="box box-primary">
<strong class="box-header">制证包管理</strong>
<strong class="box-header with-border ">制证包管理</strong>
<div class="box-primary" style="padding: 15px;padding-top: 0;">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td>Xml导入时间:</td>
<td>XML导入时间:</td>
<td>
<div class="input-group date" style="width: 65%">
<div class="input-group-addon">
......@@ -102,7 +98,7 @@
<td>{{item.commonCardCount}}</td>
<td>{{item.postCardCount}}</td>
<td>
<button class="btn btn-primary" ng-click="analysis()">解析</button>
<button class="btn btn-primary" ng-click="analysis(item.uploadDate,item.packageCount)">解析</button>
<button class="btn btn-danger">删除</button>
</td>
</tr>
......@@ -121,4 +117,4 @@
</div>
</div>
</div>
</div>
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.js
View file @ ab61c05e
......@@ -37,15 +37,18 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
};
$scope.paginationConf.totalItems = 50;
$scope.analysis = function () {
$scope.analysis = function (uploadDate,packageCount) {
ngDialog.open({
template: 'dialogs/alert.html' + urlTimeStamp(),
width: 600,
template: 'dialogs/analysisDialog.html' + urlTimeStamp(),
width: 876,
cache: false,
controller: ['$scope', function ($scope) {
$scope.msgText = "弹出框"
$scope.upDate =uploadDate;
$scope.upCount=packageCount;
}]
});
}
$scope.uploadXml = function () {
......
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