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

src/main/java/com/yxproject/start/api/AdminApi.java

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -299,4 +299,6 @@ p {
     font-family: 'Arial Black';
     color:#000;
 }
-
+.padding10{
+    padding: 10px;
+}

src/main/resources/static/dialogs/analysisDialog.html

+<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

@@ -44,8 +44,8 @@
 
     <link rel="stylesheet" href="components/bootstrap-3.3.7/css/bootstrap-datetimepicker.min.css">
     <!-- Select2 -->
-     <link rel="stylesheet" href="newTheme/bower_components/select2/dist/css/select2.min.css">
-     <script src="newTheme/bower_components/select2/dist/js/select2.full.min.js"></script>
+    <link rel="stylesheet" href="newTheme/bower_components/select2/dist/css/select2.min.css">
+    <script src="newTheme/bower_components/select2/dist/js/select2.full.min.js"></script>
     <!-- Theme style -->
     <link rel="stylesheet" href="newTheme/dist/css/AdminLTE.min.css">
     <!-- Font Awesome -->
@@ -71,178 +71,176 @@
     <script language="javascript" src="components/js/LodopFuncs.js"></script>
 </head>
 
-<OBJECT classid="clsid:18EE8930-6993-4ADA-B8BB-02BA5820AC94" id="aaa" width="0px" height="0px" style="float: left;" CODEBASE="plugin/Termb.cab#version=1,0,0,1" VIEWASTEXT></OBJECT>
+<OBJECT classid="clsid:18EE8930-6993-4ADA-B8BB-02BA5820AC94" id="aaa" width="0px" height="0px" style="float: left;"
+        CODEBASE="plugin/Termb.cab#version=1,0,0,1" VIEWASTEXT></OBJECT>
 <body class="hold-transition skin-blue-light sidebar-mini">
-  <div ng-if="loginData.login == true" class="wrapper">
-        <header class="main-header">
-            <!-- Logo -->
-            <a href="index.html" class="logo" style="line-height: 50px;">
-                <!-- mini logo for sidebar mini 50x50 pixels -->
-                <span class="logo-mini"><span>bhl</span></span>
-                <!-- logo for regular state and mobile devices -->
-                <span class="logo-lg"><span>数据核验</span></span>
-            </a>
-            <!-- Header Navbar: style can be found in header.less -->
-            <nav class="navbar navbar-static-top">
-                <!-- Sidebar toggle button-->
-                <a class="sidebar-toggle" data-toggle="push-menu" role="button">
-                    <span class="sr-only">Toggle navigation</span>
-                </a>
-                <div style="text-align: right;font-size:1.8em;line-height: 50px;color: #fff;font-family:'黑体';padding-right: 20px;">北京制证辅助平台</div>
-            </nav>
-        </header>
-        <aside class="main-sidebar">
-            <!-- sidebar: style can be found in sidebar.less -->
-            <section class="sidebar" >
-                  <!-- search form -->
-                  <form class="sidebar-form">
-                    <div class="input-group">
-                      <input type="text" name="q" class="form-control" ng-model="searchInput" placeholder="Search...">
-                      <span class="input-group-btn">
-                          <button type="submit" name="search" id="search-btn" class="btn btn-flat" ng-click="doSearch(searchInput)">
-                            <i class="fa fa-search"></i>
-                          </button>
-                      </span>
-                    </div>
-                  </form>
-                <!-- sidebar menu: : style can be found in sidebar.less -->
-                <ul class="sidebar-menu" data-widget="tree">
-                    <li class="header">
-                        导航
-                    </li>
-                    <li ng-class="{true: 'active', false: ''}[tab =='/xmlAndSearch']" ng-click="getFocus('/xmlAndSearch')">
-                        <a href="#!/xmlAndSearch">
-                            <i class="fa fa-file-code-o"></i>
-                            <span>制证包管理</span>
-                        </a>
-                    </li>
-                    <li ng-class="{true: 'active', false: ''}[tab =='/excelAndSearch']" ng-click="getFocus('/excelAndSearch')">
-                        <a href="#!/excelAndSearch">
-                            <i class="fa fa-file-excel-o"></i>
-                            <span>格口文件管理</span>
-                        </a>
-                    </li>
-                    <li ng-class="{true: 'active', false: ''}[tab =='/cardProdPackage']" ng-click="getFocus('/cardProdPackage')">
-                        <a href="#!/cardProdPackage">
-                            <i class="fa fa-folder"></i>
-                            <span>制证信息打包</span>
-                        </a>
-                    </li>
-                    <li class="treeview" ng-class="{true: 'active', false: ''}[tab =='/cardProdUpdate']" ng-click="getFocus('/cardProdUpdate')">
-                        <a href="#">
-                            <i class="fa fa-cog"></i> <span>系统管理</span>
-                            <span class="pull-right-container">
-                                <i class="fa fa-angle-left pull-right"></i>
+<div ng-if="loginData.login == true" class="wrapper">
+    <header class="main-header">
+        <!-- Logo -->
+        <a href="index.html" class="logo" style="line-height: 50px;">
+            <!-- mini logo for sidebar mini 50x50 pixels -->
+            <span class="logo-mini"><span>{{loginData.name}}</span></span>
+            <!-- logo for regular state and mobile devices -->
+            <span class="logo-lg"><span>{{loginData.roleList[0].role}}</span></span>
+        </a>
+        <!-- Header Navbar: style can be found in header.less -->
+        <!---导航左边-->
+        <nav class="navbar navbar-static-top">
+            <!-- Sidebar toggle button-->
+            <ul class="navbar-nav no-padding">
+                <li class="nav-item">
+                    <a class="sidebar-toggle" data-toggle="push-menu" role="button">
+                        <span class="sr-only">Toggle navigation</span>
+                    </a>
+                </li>
+                <li class="sidebar no-padding navbar-left" style="width: 377px;margin-left:27px;height: auto;">
+                    <form style="height: 37px;margin: 6px 5px;">
+                        <div class="input-group input-group-sm">
+                            <input type="text" class="form-control" ng-model="searchInput">
+                            <span class="input-group-btn">
+                                <button type="button"ng-click="doSearch(searchInput)" class="btn btn-info btn-flat"> Go </button>
                             </span>
-                        </a>
-                        <ul class="treeview-menu">
-                            <li><a href="#!/analysisLog"><i class="fa fa-circle-o"></i> 解析日志</a></li>
-                            <li><a href="#!/packageLog"><i class="fa fa-circle-o"></i> 新包日志</a></li>
-                            <li><a href="#!/cardProdUpdate"><i class="fa fa-circle-o"></i> 制证信息管理</a></li>
-                          </ul>
-                    </li>
+                        </div>
+                    </form>
 
-                    <li ng-class="{true: 'active', false: ''}[tab =='/searchCardMsg']" ng-click="getFocus('/searchCardMsg')">
-                        <a href="#!/searchCardMsg">
-                            <i class="fa fa-files-o"></i>
-                            <span>邮政快递单打印</span>
-                        </a>
-                    </li>
-                    <li ng-class="{true: 'active', false: ''}[tab =='/uploadExcelAndSearch']" ng-click="getFocus('/uploadExcelAndSearch')">
-                        <a href="#!/uploadExcelAndSearch">
-                            <i class="fa fa-table"></i>
-                            <span>邮政信息查询</span>
-                        </a>
-                    </li>
-                    <li ng-class="{true: 'active', false: ''}[tab =='/createTaskList']" ng-click="getFocus('/createTaskList')">
-                         <a href="#!/createTaskList">
-                             <i class="fa fa-dashboard"></i>
-                             <span>任务单创建</span>
-                         </a>
-                     </li>
-                     <li ng-class="{true: 'active', false: ''}[tab =='/dispatchTask']" ng-click="getFocus('/dispatchTask')">
-                          <a href="#!/dispatchTask">
-                              <i class="fa fa-dashboard"></i>
-                              <span>任务单下发</span>
-                          </a>
-                      </li>
 
+                </li>
+            </ul>
+            <div class="pull-right" style="font-size:1.8em;line-height: 50px;color: #fff;font-family:'黑体';padding:0 20px;">北京制证辅助平台</div>
+            <!--导航右边-->
+            <div class="navbar-custom-menu">
+                <ul class="nav navbar-nav">
+                    <!-- Messages: style can be found in dropdown.less-->
+                    <li class="dropdown messages-menu">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                      <i class="fa fa-envelope-o"></i>
+                      <span class="label label-success">4</span>
+                    </a>
+                    <ul class="dropdown-menu">
+                      <li class="header">You have 4 messages</li>
+                      <li>
+                        <!-- inner menu: contains the actual data -->
+                        <ul class="menu">
+                          <li><!-- start message -->
+                            <a href="#">
+                              <p>Why not buy a new awesome theme?</p>
+                            </a>
+                          </li>
+                          <li><!-- start message -->
+                            <a href="#">
+                            <p>Why not buy a new awesome theme?</p>
+                            </a>
+                          </li>
+                          <li><!-- start message -->
+                              <a href="#">
+                              <p>Why not buy a new awesome theme?</p>
+                              </a>
+                            </li>
+                          <li><!-- start message -->
+                                <a href="#">
+                                <p>Why not buy a new awesome theme?</p>
+                                </a>
+                              </li>
+                        </ul>
+                      </li>
+                      <li class="footer"><a href="#">See All Messages</a></li>
+                    </ul>
+                  </li>
+                    <!-- Notifications: style can be found in dropdown.less -->
+                    <li class="dropdown notifications-menu">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                      <i class="fa fa-bell-o"></i>
+                      <span class="label label-warning">10</span>
+                    </a>
+                    <ul class="dropdown-menu">
+                      <li class="header">You have 10 notifications</li>
+                      <li>
+                        <!-- inner menu: contains the actual data -->
+                        <ul class="menu">
+                          <li>
+                            <a href="#">
+                              <i class="fa fa-users text-aqua"></i> 5 new members joined today
+                            </a>
+                          </li>
+                          <li>
+                            <a href="#">
+                              <i class="fa fa-warning text-yellow"></i> Very long description here that may not fit into the
+                              page and may cause design problems
+                            </a>
+                          </li>
+                          <li>
+                            <a href="#">
+                              <i class="fa fa-users text-red"></i> 5 new members joined
+                            </a>
+                          </li>
+                          <li>
+                            <a href="#">
+                              <i class="fa fa-shopping-cart text-green"></i> 25 sales made
+                            </a>
+                          </li>
+                          <li>
+                            <a href="#">
+                              <i class="fa fa-user text-red"></i> You changed your username
+                            </a>
+                          </li>
+                        </ul>
+                      </li>
+                      <li class="footer"><a href="#">View all</a></li>
+                    </ul>
+                  </li>
 
-                    <li ng-class="{true: 'active', false: ''}[tab =='/taskListPrint']" ng-click="getFocus('/taskListPrint')">
-                        <a href="#!/taskListPrint">
-                            <i class="fa fa-dashboard"></i>
-                            <span>膜打印任务单</span>
-                        </a>
-                    </li>
-                    <li ng-class="{true: 'active', false: ''}[tab =='/taskListPreLocating']" ng-click="getFocus('/taskListPreLocating')">
-                        <a href="#!/taskListPreLocating">
-                            <i class="fa fa-dashboard"></i>
-                            <span>预定位任务单</span>
-                        </a>
-                    </li>
-                    <li ng-class="{true: 'active', false: ''}[tab =='/taskListQualityCheck']" ng-click="getFocus('/taskListQualityCheck')">
-                        <a href="#!/taskListQualityCheck">
-                            <i class="fa fa-dashboard"></i>
-                            <span>质检任务单</span>
+                    <li class="dropdown user">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                          <span class="hidden-xs">{{loginData.name}}</span>
                         </a>
-                    </li>
-                    <li ng-class="{true: 'active', false: ''}[tab =='/taskListSorting']" ng-click="getFocus('/taskListSorting')">
-                        <a href="#!/taskListSorting">
-                            <i class="fa fa-dashboard"></i>
-                            <span>分拣任务单</span>
-                        </a>
-                    </li>
-                    <li ng-class="{true: 'active', false: ''}[tab =='/tagPrint']" ng-click="getFocus('/tagPrint')">
-                        <a href="#!/tagPrint">
-                            <i class="fa fa-dashboard"></i>
-                            <span>打印封条</span>
-                        </a>
-                    </li>
-                    <li ng-class="{true: 'active', false: ''}[tab =='/receitp']" ng-click="getFocus('/receitp')">
-                        <a href="#!/receitp">
-                            <i class="fa fa-file-text-o"></i>
-                            <span>交接单</span>
-                        </a>
-                    </li>
-                    <li ng-class="{true: 'active', false: ''}[tab =='/addFailed']" ng-click="getFocus('/addFailed')">
-                        <a href="#!/addFailed">
-                            <i class="fa fa-plus"></i>
-                            <span>添加废证</span>
-                        </a>
-                    </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>
-                    <li ng-class="{true: 'active', false: ''}[tab =='/historyBack']" ng-click="getFocus('/historyBack')">
-                        <a href="#!/historyBack">
-                            <i class="fa fa-plus"></i>
-                            <span>历史回迁证</span>
-                        </a>
-                    </li>
-                    <li>
-                        <a ng-click="logout()">
-                            <i class="glyphicon glyphicon-user"></i>
-                            <span>退出当前用户</span>
-                        </a>
-                    </li>
+                        <ul class="dropdown-menu">
+                          <li style="padding: 5px;">
+                            <a  ng-click="logout()" class="btn btn-default btn-flat">退出当前用户</a>
+                          </li>
+                        </ul>
+                      </li>
                 </ul>
-            </section>
-            <!-- /.sidebar -->
-        </aside>
-        <div class="content-wrapper" ng-view style="min-height: 589px;"></div>
-        <footer class="main-footer">
-            <div class="pull-right hidden-xs">
-                <b>联系电话:</b>(010)88516568
             </div>
-            <strong>北京盈信信息科技版权所有</strong>
-        </footer>
-    </div>
-    <div ng-if="loginData.login == false" class="wrapper" style="background-color: #EEEEEE;">
-        <div style="min-height: 500px;" ng-view></div>
-    </div>
+
+        </nav>
+    </header>
+    <aside class="main-sidebar">
+        <!-- sidebar: style can be found in sidebar.less -->
+        <section class="sidebar">
+            <!-- search form -->
+            <!-- sidebar menu: : style can be found in sidebar.less -->
+            <ul class="sidebar-menu" data-widget="tree">
+                <li class="header">
+                    导航
+                </li>
+
+                <li ng-repeat="menu in menuList | orderBy:'id'" ng-class="{true: 'active', false: ''}[tab =='{{menu.url}}']" ng-click="getFocus(menu.url)">
+                    <a href="#!{{menu.url}}">
+                        <i class="fa fa-file-code-o"></i>
+                        <span ng-bind="menu.name"></span>
+                    </a>
+                </li>
+                <li>
+                    <a ng-click="logout()">
+                        <i class="glyphicon glyphicon-user"></i>
+                        <span>退出当前用户</span>
+                    </a>
+                </li>
+            </ul>
+        </section>
+        <!-- /.sidebar -->
+    </aside>
+    <div class="content-wrapper" ng-view style="min-height: 589px;"></div>
+    <footer class="main-footer">
+        <div class="pull-right hidden-xs">
+            <b>联系电话:</b>(010)88516568
+        </div>
+        <strong>北京盈信信息科技所有</strong>
+    </footer>
+</div>
+<div ng-if="loginData.login == false" class="wrapper" style="background-color: #EEEEEE;">
+    <div style="min-height: 500px;" ng-view></div>
+</div>
 
 <!-- iCheck -->
 <script src="js/app.js"></script>

src/main/resources/static/js/app.js

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

-<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>
+</div>
\ No newline at end of file

src/main/resources/static/views/dispatchTask/dispatchTask.html

-<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>
+</div>
\ No newline at end of file

src/main/resources/static/views/excelAndSearch/excelAndSearch.html

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

-<section class="content-header" style="padding-top: 1px;">
-    <h4>
-        交接单
-    </h4>
-</section>
+<div class="col-md-12" style="margin-top:20px;">
+交接单
+</div>
+
\ No newline at end of file

src/main/resources/static/views/searchCard/searchCard.html

-<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>
+</div></div>
\ No newline at end of file

src/main/resources/static/views/searchCardMsg/searchCardMsg.html

@@ -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/tagPrint/tagPrint.html

+<!--<style>-->
+    <!--.table th, .table td {-->
+            <!--text-align: center;-->
+            <!--vertical-align: middle!important;-->
+        <!--}-->
+    <!--.ul li{-->
+           <!--cursor: pointer;-->
+        <!--}-->
+        <!--.page-list .pagination {float:left;}-->
+        <!--.page-list .pagination span {cursor: pointer;}-->
+        <!--.page-list .pagination .separate span{cursor: default; border-top:none;border-bottom:none;}-->
+        <!--.page-list .pagination .separate span:hover {background: none;}-->
+        <!--.page-list .page-total {float:left; margin: 25px 20px;}-->
+        <!--.page-list .page-total input, .page-list .page-total select{height: 26px; border: 1px solid #ddd;}-->
+        <!--.page-list .page-total input {width: 40px; padding-left:3px;}-->
+        <!--.page-list .page-total select {width: 50px;}-->
+        <!--.page-list:after {-->
+            <!--display: block;-->
+            <!--clear: both;-->
+            <!--content: ""-->
+        <!--}-->
+
+        <!--.page-list{-->
+            <!--zoom: 1-->
+        <!--}-->
+<!--</style>-->
 <style>
-    .table th, .table td {
-            text-align: center;
-            vertical-align: middle!important;
-        }
-    .ul li{
-           cursor: pointer;
-        }
-        .page-list .pagination {float:left;}
-        .page-list .pagination span {cursor: pointer;}
-        .page-list .pagination .separate span{cursor: default; border-top:none;border-bottom:none;}
-        .page-list .pagination .separate span:hover {background: none;}
-        .page-list .page-total {float:left; margin: 25px 20px;}
-        .page-list .page-total input, .page-list .page-total select{height: 26px; border: 1px solid #ddd;}
-        .page-list .page-total input {width: 40px; padding-left:3px;}
-        .page-list .page-total select {width: 50px;}
-        .page-list:after {
-            display: block;
-            clear: both;
-            content: ""
-        }
+    form input{
+        border:0;
+        color:black;
+        font-weight: bold;
+        margin-left: 10px;
+    }
+    .postTable th, .postTable td {
+        text-align: center;
+        vertical-align: middle!important;
+    }
 
-        .page-list{
-            zoom: 1
-        }
 </style>
-<section class="content-header" style="padding-top: 1px;">
-    <h4>
-        打印封条
-    </h4>
-</section>
-<div style="padding: 15px;">
-    <div class="box box-primary">
-        <strong class="box-header"></strong>
-        <div class="box-primary" style="padding: 15px;padding-top: 0;">
+<section  class="content">
+<div class="col-md-12 no-padding" style="margin-top:20px;">
+    <div class="box box-primary ">
+        <div class="box-header with-border">
+            <strong >封条标签</strong>
+        </div>
+        <div class="box-info" style="padding: 15px;padding-top: 0;">
             <table class="table table-bordered" style="margin-bottom: 0;">
                <tr>
                    <td width="10%">身份证号:</td>
@@ -45,89 +56,116 @@
                     </td>
               </tr>
            </table>
-           <div class="row">
-                <div class="col-lg-5" >
-
-                    <div class="col-lg-12">
-                         <table class="table table-bordered table-hover postTable ">
-                           <thead>
-                           <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>
+</div>
+<div class="col-md-12 box no-padding">
+    <div class=" box-default">
+        <div class="box-header with-border">
+            <strong >详情信息</strong>
+        </div>
+        <div class="box-body no-padding col-md-12">
+            <div class="col-md-5" style="padding-right: 0px;" >
+                <table class="table table-bordered table-hover postTable ">
+                        <thead>
+                        <tr>
+                            <th>NO.</th>
+                            <th>派出所代码</th>
+                            <th>派出所名称</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>2</td>
+                            <td>0</td>
+                            <td></td>
+                        </tr>
+                        <tr ng-click="showDetail(2)">
+                            <td>2</td>
+                            <td>110021</td>
+                            <td>东城派出所</td>
+                            <td>3</td>
+                            <td>3</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>
 
-                </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>
+                        </tbody>
+                    </table>
             </div>
+            <div class="col-md-7" style="" 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"
+                                  class="glyphicon glyphicon-remove">
+                            </span>
+                            <span ng-if="item.isPrint==0"
+                                  style="size: 6px">2019-03-04 19:14</span>
+                        </td>
+                        <td>
+                            <span ng-if="item.isEwrite==1"
+                                  style="color: red"
+                                  class="glyphicon glyphicon-remove">
+                            </span>
+                            <span ng-if="item.isEwrite==0"
+                                  style="size: 6px">2019-03-04 19:14</span>
+                        </td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+        <div class="box-footer clearfix">
+            <button class="btn btn-success  pull-right "
+                    style="margin-right: 20px;">复核一致
+            </button>
+            <button class="btn btn-info  pull-right"
+                    style="margin-right: 20px;">打印标签
+            </button>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
+</section>
\ No newline at end of file

src/main/resources/static/views/task/taskListPreLocating.html

-<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

-<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

-<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

-<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

@@ -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

@@ -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

@@ -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 () {