Home Explore Help
Sign In
guozi_sys
/
daxt
Watch 2
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

提交

liuchanglan 4 years ago
parent
91a8560f0b
commit
e3e2fdc3ce
11 changed files with 33 additions and 26 deletions
Split View Show Diff Stats
  1. 1 1
      src/main/java/com/gz/service/system/impl/AuthServiceImpl.java
  2. 1 0
      src/main/resources/mapper/archiveBorrowMapper.xml
  3. 2 2
      src/main/resources/mapper/archiveMapper.xml
  4. 2 2
      src/main/resources/static/css/public.css
  5. 1 1
      src/main/resources/static/index.html
  6. 2 2
      src/main/resources/static/login.html
  7. 9 6
      src/main/resources/static/page/archive/list.html
  8. 2 2
      src/main/resources/static/page/auditList/list.html
  9. 5 4
      src/main/resources/static/page/statistics/archiveStatistics.html
  10. 4 3
      src/main/resources/static/page/statistics/archiveYearStatistics.html
  11. 4 3
      src/main/resources/static/page/statistics/borrowStatistics.html

+ 1 - 1
src/main/java/com/gz/service/system/impl/AuthServiceImpl.java
View File 

@@ -171,7 +171,7 @@ public class AuthServiceImpl implements AuthService {
 
         initialHomeRVO.getHomeInfo().put("title", "首页");
 
         initialHomeRVO.getHomeInfo().put("href", "page/home/welcome.html?t=1");
 
         // logo信息
 
-        initialHomeRVO.getLogoInfo().put("title", "南京市规划和自然资源局-综合档案数字化信息系统");
 
+        initialHomeRVO.getLogoInfo().put("title", "南京市规划和自然资源局综合档案系统");
 
         initialHomeRVO.getLogoInfo().put("image", "images/logo.png");
 
         initialHomeRVO.getLogoInfo().put("href", "");

+ 1 - 0
src/main/resources/mapper/archiveBorrowMapper.xml
View File 

@@ -36,6 +36,7 @@
 
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
 
             and ab.create_time BETWEEN #{startTime} AND #{endTime}
 
         </if>
 
+        order by ab.create_time desc
 
     </select>
 
 
     <select id="selectBorrowInfo" resultType="com.gz.rvo.borrow.AuditInfoRVO">

+ 2 - 2
src/main/resources/mapper/archiveMapper.xml
View File 

@@ -25,7 +25,7 @@
 
             and mj in (select d.dict_code from tab_dict d left join tab_menu_role mr on d.id = mr.menu_id where
 
             mr.role_id = #{roleId} and mr.role_type = 2 )
 
             <if test="dh != null and dh != ''">
 
-                AND a.dh = #{dh}
 
+                AND a.dh like concat(concat('%',#{dh}),'%')
 
             </if>
 
             <if test="mlh != null and mlh != ''">
 
                 AND a.mlh = #{mlh}
 
@@ -60,7 +60,7 @@
 
         FROM (${searchSql}) a
 
         <where>
 
             <if test="dh != null and dh != ''">
 
-                AND a.dh = #{dh}
 
+                AND a.dh like concat(concat('%',#{dh}),'%')
 
             </if>
 
             <if test="mlh != null and mlh != ''">
 
                 AND a.mlh = #{mlh}

+ 2 - 2
src/main/resources/static/css/public.css
View File 

@@ -51,8 +51,8 @@ body {
 
 
 /**自定义滚动条样式 */
 
 ::-webkit-scrollbar {
 
-    width: 6px;
 
-    height: 6px
 
+    width: 15px;
 
+    height: 15px
 
 }
 
 
 ::-webkit-scrollbar-track {

+ 1 - 1
src/main/resources/static/index.html
View File 

@@ -2,7 +2,7 @@
 
 <html>
 
 <head>
 
     <meta charset="utf-8">
 
-    <title>南京市规划和自然资源局-综合档案数字化信息系统</title>
 
+    <title>南京市规划和自然资源局综合档案系统</title>
 
     <meta name="keywords" content="layuimini,layui,layui模板,layui后台,后台模板,admin,admin模板,layui mini">
 
     <meta name="description" content="南京市规划和自然资源局档案管理系统">
 
     <meta name="renderer" content="webkit">

+ 2 - 2
src/main/resources/static/login.html
View File 

@@ -2,7 +2,7 @@
 
 <html>
 
 <head>
 
     <meta charset="UTF-8">
 
-    <title>南京市规划和自然资源局档案管理系统-登陆</title>
 
+    <title>南京市规划和自然资源局综合档案系统-登陆</title>
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
     <meta http-equiv="Access-Control-Allow-Origin" content="*">
 
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 
@@ -122,7 +122,7 @@
 
         <div class="layui-form login-form" lay-filter="login-form">
 
             <form class="layui-form" action="">
 
                 <div class="layui-form-item logo-title">
 
-                    <h1>南京市规划和自然资源局档案管理系统</h1>
 
+                    <h1>南京市规划和自然资源局综合档案系统</h1>
 
                 </div>
 
                 <div class="layui-form-item">
 
                     <label class="layui-icon layui-icon-username"></label>

+ 9 - 6
src/main/resources/static/page/archive/list.html
View File 

@@ -21,6 +21,10 @@
 
             <div class="layui-form toolbar">
 
                 <div class="layui-form-item">
 
                     <div class="layui-inline">
 
+                        <input type="text" id="ztc" name="ztc" lay-filter="ztc" placeholder="请输入关键字"
 
+                               class="layui-input">
 
+                    </div>
 
+                    <div class="layui-inline">
 
                         <input type="text" id="dh" name="dh" lay-filter="dh" placeholder="请输入档号" class="layui-input">
 
                     </div>
 
                     <div class="layui-inline">
 
@@ -32,10 +36,6 @@
 
                             <option value="">请选择密级</option>
 
                         </select>
 
                     </div>
 
-                    <div class="layui-inline">
 
-                        <input type="text" id="ztc" name="ztc" lay-filter="ztc" placeholder="请输入关键字"
 
-                               class="layui-input">
 
-                    </div>
 
 
                     <div class="layui-inline">
 
                         <select name="bgqx" id="bgqx">
 
@@ -43,7 +43,7 @@
 
                         </select>
 
                     </div>
 
                     <div class="layui-inline">
 
-                        <input type="checkbox" name="all" lay-skin="primary" title="全文检索" checked="">
 
+                        <input type="checkbox" name="all" lay-skin="primary" title="全文检索">
 
                         <div class="layui-unselect layui-form-checkbox layui-form-checked" lay-skin="primary">
 
                             <span>全文检索</span>
 
                             <i class="layui-icon layui-icon-ok"></i>
 
@@ -107,6 +107,8 @@
 
         }
 
         /**方-------------------------------法-------------------------------定-------------------------------义*/
 
 
+        $("#resultSearch").hide()
 
+
 
         http.getRoleButton(158)
 
         let initUpload = function () {
 
             var loading;
 
@@ -157,7 +159,7 @@
 
                 shade: 0.2,
 
                 maxmin: true,
 
                 shadeClose: true,
 
-                area: ['800px', '800px'],
 
+                area: ['800px', '650px'],
 
                 content: '../borrow/reserve.html',
 
                 success: function (layero, index) {
 
                     var body = layer.getChildFrame('body', index);
 
@@ -588,6 +590,7 @@
 
             searchParam.mj = data.field.mj
 
             searchParam.ztc = data.field.ztc
 
             searchParam.again = false
 
+            $("#resultSearch").show()
 
             renderTable()
 
         })
 
     });

+ 2 - 2
src/main/resources/static/page/auditList/list.html
View File 

@@ -128,7 +128,7 @@
 
                     {field: 'dh', title: '档号', width: 240},
 
                     {field: 'tm', title: '题名'},
 
                     {
 
-                        field: 'createTime', title: '开始时间', width: 110, templet(rv) {
 
+                        field: 'createTime', title: '借阅时间', width: 110, templet(rv) {
 
                             return rv.createTime.substring(0, 11)
 
                         }
 
                     },
 
@@ -169,7 +169,7 @@
 
                                 if (rv.auditStatus == 2) {
 
                                     return rv.returnStatus == 0 ? '<span class="layui-badge layui-bg-orange">未归还</span>' : '<span class="layui-badge layui-bg-green">已归还</span>'
 
                                 } else {
 
-                                    return '<span class="layui-badge layui-bg-green">无需归还</span>'
 
+                                    return '<span class="layui-badge layui-bg-green">———</span>'
 
                                 }
 
                             } else {
 
                                 return '<span class="layui-badge layui-bg-green">无需归还</span>'

+ 5 - 4
src/main/resources/static/page/statistics/archiveStatistics.html
View File 

@@ -84,13 +84,14 @@
 
                 elem: '#table',
 
                 url: 'statistics/selectStatisticsByType',
 
                 page: false,
 
+                totalRow: true,
 
                 where: searchParam,
 
                 cols: [[
 
                     {type: 'numbers'},
 
-                    {field: 'title', title: '门类/属类'},
 
-                    {field: 'title', title: '编码'},
 
-                    {field: 'archiveCount', title: '归档案卷数'},
 
-                    {field: 'fileCount', title: '归档文件数'},
 
+                    {field: 'title', title: '门类/属类', totalRowText: '合计'},
 
+                    {field: 'code', title: '编码'},
 
+                    {field: 'archiveCount', title: '归档案卷数', totalRow: true},
 
+                    {field: 'fileCount', title: '归档文件数', totalRow: true},
 
                     // {templet: '#operating', width: 120, align: 'center', title: '操作'}
 
                 ]],
 
                 done: function () {

+ 4 - 3
src/main/resources/static/page/statistics/archiveYearStatistics.html
View File 

@@ -84,6 +84,7 @@
 
                 limits: [15, 30, 45, 60],
 
                 page: false,
 
                 where: searchParam,
 
+                totalRow: true,
 
                 request: {
 
                     pageName: 'pageNum',
 
                     limitName: 'pageSize'
 
@@ -104,9 +105,9 @@
 
                 },
 
                 cols: [[
 
                     {type: 'numbers'},
 
-                    {field: 'gdnd', title: '年份'},
 
-                    {field: 'archiveCount', title: '归档案卷数'},
 
-                    {field: 'fileCount', title: '归档文件数'},
 
+                    {field: 'gdnd', title: '年份', totalRowText: '合计'},
 
+                    {field: 'archiveCount', title: '归档案卷数', totalRow: true},
 
+                    {field: 'fileCount', title: '归档文件数', totalRow: true},
 
                     // {templet: '#operating', align: 'center', title: '操作', width: 300}
 
                 ]]
 
             });

+ 4 - 3
src/main/resources/static/page/statistics/borrowStatistics.html
View File 

@@ -87,6 +87,7 @@
 
                     pageName: 'pageNum',
 
                     limitName: 'pageSize'
 
                 },
 
+                totalRow: true,
 
                 where: searchParam,
 
                 response: {
 
                     statusCode: 200 //重新规定成功的状态码为 200，table 组件默认为 0
 
@@ -104,14 +105,14 @@
 
                 },
 
                 cols: [[
 
                     {type: 'numbers'},
 
-                    {field: 'dh', title: '档号'},
 
+                    {field: 'dh', title: '档号', totalRowText: '合计'},
 
                     {field: 'tm', title: '题名'},
 
                     {field: 'tm', title: '题名'},
 
                     {field: 'ml', title: '门类/属类'},
 
-                    {field: 'createTime', title: '最后借阅时间'},
 
+                    // {field: 'createTime', title: '最后借阅时间'},
 
                     // {field: 'estimateReturnTime',  title: '预计归还时间'},
 
                     // {field: 'returnTime',  title: '实际归还时间'},
 
-                    {field: 'borrowCount', title: '借阅次数'},
 
+                    {field: 'borrowCount', title: '借阅次数', totalRow: true},
 
                     // {templet: '#operating', align: 'center', title: '操作', width: 300}
 
                 ]]
 
             });