Browse Source

新增重置按钮
部分子页面传值无效
统计太慢

liuchanglan 4 years ago
parent
commit
d452a7ca88

+ 1 - 0
src/main/java/com/gz/service/archive/impl/ArchiveServiceImpl.java

@@ -126,6 +126,7 @@ public class ArchiveServiceImpl implements ArchiveService {
             vo.setRoleId(JwtUtils.getCurrentUserJwtPayload().getRoleId());
             vo.setRoleId(JwtUtils.getCurrentUserJwtPayload().getRoleId());
             Map<String, Object> params = vo.getParams();
             Map<String, Object> params = vo.getParams();
             String sql = "";
             String sql = "";
+            // 高级检索
             if (params != null) {
             if (params != null) {
                 if (StrUtil.isNotEmpty(String.valueOf(params.get("time")))) {
                 if (StrUtil.isNotEmpty(String.valueOf(params.get("time")))) {
                     String[] times = String.valueOf(params.get("time")).split(" - ");
                     String[] times = String.valueOf(params.get("time")).split(" - ");

+ 3 - 3
src/main/resources/application-dev.yml

@@ -121,8 +121,8 @@ upload-file:
   server-file-url-prefix: http://examdasfda.cn.utools.club
   server-file-url-prefix: http://examdasfda.cn.utools.club
   file-root-directory: E:\cache
   file-root-directory: E:\cache
   archive-file-root-directory: E:\cache\archive
   archive-file-root-directory: E:\cache\archive
-logging:
-  file:
-    path: D:\logs\guihua_archive
+#logging:
+#  file:
+#    path: D:\logs\guihua_archive
 mount-archive:
 mount-archive:
   scan-base-path: E:\cache\扫描
   scan-base-path: E:\cache\扫描

+ 1 - 1
src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
 spring:
   profiles:
   profiles:
-    active: prod
+    active: dev
   servlet:
   servlet:
     multipart:
     multipart:
       max-file-size: 5120MB
       max-file-size: 5120MB

+ 0 - 244
src/main/resources/logback-spring.xml

@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL,如果设置为WARN,则低于WARN的信息都不会输出 -->
-<!-- scan:当此属性设置为true时,配置文件如果发生改变,将会被重新加载,默认值为true -->
-<!-- scanPeriod:设置监测配置文件是否有修改的时间间隔,如果没有给出时间单位,默认单位是毫秒。当scan为true时,此属性生效。默认的时间间隔为1分钟。 -->
-<!-- debug:当此属性设置为true时,将打印出logback内部日志信息,实时查看logback运行状态。默认值为false。 -->
-<configuration scan="true" scanPeriod="10 seconds">
-
-    <!--<include resource="org/springframework/boot/logging/logback/base.xml" />-->
-
-    <contextName>logback</contextName>
-    <!-- name的值是变量的名称,value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后,可以使“${}”来使用变量。 打包后在项目的更目录生成日志文件-->
-<!--    <property name="log.path" value="${catalina.base}/webapps/ZoomSealEnt/logs"/>-->
-    <springProperty scope="context" name="log.path" source="logging.file.path"/>
-
-    <!-- 彩色日志 -->
-    <!-- 彩色日志依赖的渲染类 -->
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
-    <conversionRule conversionWord="wex"
-                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
-    <conversionRule conversionWord="wEx"
-                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
-    <!-- 彩色日志格式   [%-5p] %d{yyyy-MM-dd HH:mm:ss,SSS} method:%l%n%m%n  -->
-
-    <property name="CONSOLE_LOG_PATTERN"
-              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-
-
-    <!--输出到控制台-->
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <!--此日志appender是为开发使用,只配置最底级别,控制台输出的日志级别是大于或等于此级别的日志信息-->
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>DEBUG</level>
-        </filter>
-        <encoder>
-            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
-            <!-- 设置字符集 -->
-            <charset>UTF-8</charset>
-        </encoder>
-    </appender>
-
-
-    <!--输出到文件-->
-    <!-- 时间滚动输出 level为 DEBUG 日志 -->
-    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文件的路径及文件名 -->
-        <!--先将今天的日志保存在这个文件中-->
-        <file>${log.path}/log_debug.log</file>
-        <!--日志文件输出格式   %-d{yyyy-MM-dd HH:mm:ss}  [ %t:%r ] - [ %p ]  %m%n
-            %d{HH: mm:ss.SSS}——日志输出时间
-            %thread——输出日志的进程名字,这在Web应用以及异步任务处理中很有用
-            %-5level——日志级别,并且使用5个字符靠左对齐
-            %logger{36}——日志输出者的名字
-            %msg——日志消息
-            %n——平台的换行符
-           -->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略,按日期,按大小记录 -->
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- rollover daily -->
-            <!--如果第二天输出日志,会将当天的日志记录在<file>${log.path}/log_debug.log</file>,然后将昨天的日志归档到下面的文件中-->
-            <!--以分钟切分  %d{yyyy-MM-dd_HH-mm}-->
-            <fileNamePattern>${log.path}/debug/log-debug-%d{yyyy-MM-dd_HH-mm}.%i.log</fileNamePattern>
-            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
-            <!--单个日志文件最大100M,到了这个值,就会再创建一个日志文件,日志文件的名字最后+1-->
-            <maxFileSize>100MB</maxFileSize>
-            <!--日志文件保留天数-->
-            <maxHistory>30</maxHistory>
-            <!--所有的日志文件最大20G,超过就会删除旧的日志-->
-            <totalSizeCap>20GB</totalSizeCap>
-        </rollingPolicy>
-        <!--
-            此日志文件只记录debug级别的
-            onMatch和onMismatch都有三个属性值,分别为Accept、DENY和NEUTRAL
-            onMatch="ACCEPT" 表示匹配该级别及以上
-            onMatch="DENY" 表示不匹配该级别及以上
-            onMatch="NEUTRAL" 表示该级别及以上的,由下一个filter处理,如果当前是最后一个,则表        示匹配该级别及以上
-            onMismatch="ACCEPT" 表示匹配该级别以下
-            onMismatch="NEUTRAL" 表示该级别及以下的,由下一个filter处理,如果当前是最后一个,则不匹配该级别以下的
-            onMismatch="DENY" 表示不匹配该级别以下的
-        -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>debug</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 时间滚动输出 level为 INFO 日志 -->
-    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文件的路径及文件名 -->
-        <file>${log.path}/log_info.log</file>
-        <!--日志文件输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-        <!-- 日志记录器的滚动策略,按日期,按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- rollover daily -->
-            <!--如果第二天输出日志,会将当天的日志记录在<file>${log.path}/log_debug.log</file>,然后将昨天的日志归档到下面的文件中-->
-            <!--以分钟切分  %d{yyyy-MM-dd_HH-mm}-->
-            <fileNamePattern>${log.path}/info/log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
-            <!--单个日志文件最大100M,到了这个值,就会再创建一个日志文件,日志文件的名字最后+1-->
-            <maxFileSize>100MB</maxFileSize>
-            <!--日志文件保留天数-->
-            <maxHistory>30</maxHistory>
-            <!--所有的日志文件最大20G,超过就会删除旧的日志-->
-            <totalSizeCap>20GB</totalSizeCap>
-        </rollingPolicy>
-        <!--SizeAndTimeBasedRollingPolicy配置更灵活,所以改用SizeAndTimeBasedRollingPolicy-->
-        <!--<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            &lt;!&ndash; 每天日志归档路径以及格式 &ndash;&gt;
-            <fileNamePattern>${log.path}/info/log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            &lt;!&ndash;日志文件保留天数&ndash;&gt;
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>-->
-        <!-- 此日志文件只记录info级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>info</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 时间滚动输出 level为 WARN 日志 -->
-    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文件的路径及文件名 -->
-        <file>${log.path}/log_warn.log</file>
-        <!--日志文件输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略,按日期,按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- rollover daily -->
-            <!--如果第二天输出日志,会将当天的日志记录在<file>${log.path}/log_debug.log</file>,然后将昨天的日志归档到下面的文件中-->
-            <!--以分钟切分  %d{yyyy-MM-dd_HH-mm}-->
-            <fileNamePattern>${log.path}/warn/log-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
-            <!--单个日志文件最大100M,到了这个值,就会再创建一个日志文件,日志文件的名字最后+1-->
-            <maxFileSize>100MB</maxFileSize>
-            <!--日志文件保留天数-->
-            <maxHistory>30</maxHistory>
-            <!--所有的日志文件最大20G,超过就会删除旧的日志-->
-            <totalSizeCap>20GB</totalSizeCap>
-        </rollingPolicy>
-        <!-- 此日志文件只记录warn级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>warn</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-
-    <!-- 时间滚动输出 level为 ERROR 日志 -->
-    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文件的路径及文件名 -->
-        <file>${log.path}/log_error.log</file>
-        <!--日志文件输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略,按日期,按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- rollover daily -->
-            <!--如果第二天输出日志,会将当天的日志记录在<file>${log.path}/log_debug.log</file>,然后将昨天的日志归档到下面的文件中-->
-            <!--以分钟切分  %d{yyyy-MM-dd_HH-mm}-->
-            <fileNamePattern>${log.path}/error/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
-            <!--单个日志文件最大100M,到了这个值,就会再创建一个日志文件,日志文件的名字最后+1-->
-            <maxFileSize>100MB</maxFileSize>
-            <!--日志文件保留天数-->
-            <maxHistory>30</maxHistory>
-            <!--所有的日志文件最大20G,超过就会删除旧的日志-->
-            <totalSizeCap>20GB</totalSizeCap>
-        </rollingPolicy>
-        <!-- 此日志文件只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!--root配置必须在appender下边-->
-    <!--root节点是对所有appender的管理,添加哪个appender就会打印哪个appender的日志-->
-    <!--root节点的level是总的日志级别控制,如果appender的日志级别设定比root的高,会按照appender的日志级别打印日志,-->
-    <!--如果appender的日志级别比root的低,会按照root设定的日志级别进行打印日志-->
-    <!--也就是说root设定的日志级别是最低限制,如果root设定级别为最高ERROR,那么所有appender只能打印最高级别的日志-->
-    <root level="DEBUG">
-        <appender-ref ref="CONSOLE"/>
-        <appender-ref ref="DEBUG_FILE"/>
-        <appender-ref ref="INFO_FILE"/>
-        <appender-ref ref="WARN_FILE"/>
-        <appender-ref ref="ERROR_FILE"/>
-    </root>
-
-    <!--
-    name:用来指定受此loger约束的某一个包或者具体的某一个类。
-    addtivity:是否向上级loger传递打印信息。默认是true。
-    因为mybatis打印的sql日志是debug级别的,如果将所有的debug都打印出来会特别乱,
-    所以特意指定mybatis的日志为debug,其他的为info
--->
-    <logger name="com.gz" level="debug" additivity="false">
-        <appender-ref ref="CONSOLE"/>
-    </logger>
-
-    <!--配置多环境日志输出  可以在application.properties中配置选择哪个profiles : spring.profiles.active=dev-->
-    <!--生产环境:输出到文件-->
-    <springProfile name="test">
-        <root level="debug">
-            <appender-ref ref="DEBUG_FILE" />
-            <appender-ref ref="INFO_FILE" />
-            <appender-ref ref="ERROR_FILE" />
-            <appender-ref ref="WARN_FILE" />
-        </root>
-    </springProfile>
-    <springProfile name="prod">
-        <root level="debug">
-            <appender-ref ref="DEBUG_FILE" />
-            <appender-ref ref="INFO_FILE" />
-            <appender-ref ref="ERROR_FILE" />
-            <appender-ref ref="WARN_FILE" />
-        </root>
-    </springProfile>
-    <!--开发环境:打印控制台-->
-    <springProfile name="dev">
-        <root level="debug">
-            <appender-ref ref="CONSOLE" />
-        </root>
-    </springProfile>
-
-</configuration>

+ 1 - 1
src/main/resources/mapper/archiveMapper.xml

@@ -34,7 +34,7 @@
                 AND a.wjbh like concat(concat('%',#{wjbh}),'%')
                 AND a.wjbh like concat(concat('%',#{wjbh}),'%')
             </if>
             </if>
             <if test="ml != null and ml != ''">
             <if test="ml != null and ml != ''">
-                AND a.ml = #{ml}
+                AND a.ml = #{ml} or a.ml in (select `code` FROM tab_archives_tree where parent_id = (SELECT id FROM `tab_archives_tree` where code = #{ml}))
             </if>
             </if>
             <if test="bgqx != null and bgqx != ''">
             <if test="bgqx != null and bgqx != ''">
                 AND a.bgqx = #{bgqx}
                 AND a.bgqx = #{bgqx}

+ 41 - 14
src/main/resources/static/page/archive/list.html

@@ -28,7 +28,8 @@
                         <input type="text" id="dh" name="dh" lay-filter="dh" placeholder="请输入档号" class="layui-input">
                         <input type="text" id="dh" name="dh" lay-filter="dh" placeholder="请输入档号" class="layui-input">
                     </div>
                     </div>
                     <div class="layui-inline">
                     <div class="layui-inline">
-                        <input type="text" id="wjbh" name="wjbh" lay-filter="wjbh" placeholder="请输入文号" class="layui-input">
+                        <input type="text" id="wjbh" name="wjbh" lay-filter="wjbh" placeholder="请输入文号"
+                               class="layui-input">
                     </div>
                     </div>
                     <div class="layui-inline" style="width: 100px;">
                     <div class="layui-inline" style="width: 100px;">
                         <input type="text" id="gdnd" name="gdnd" lay-filter="gdnd" placeholder="归档年度"
                         <input type="text" id="gdnd" name="gdnd" lay-filter="gdnd" placeholder="归档年度"
@@ -59,6 +60,10 @@
                         <button id="resultSearch" lay-submit lay-filter="resultSearch" class="layui-btn icon-btn"><i
                         <button id="resultSearch" lay-submit lay-filter="resultSearch" class="layui-btn icon-btn"><i
                                 class="layui-icon"></i>结果中搜索
                                 class="layui-icon"></i>结果中搜索
                         </button>
                         </button>
+                        <button id="resetSearch" type="reset" lay-submit lay-filter="resetSearch" class="layui-btn icon-btn">
+                            <i class="layui-icon layui-icon-refresh-3"></i>
+                            重置
+                        </button>
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>
@@ -87,7 +92,7 @@
     let params;
     let params;
 
 
     function GetValue(data) {
     function GetValue(data) {
-        if (data){
+        if (data) {
             params = data
             params = data
         }
         }
     }
     }
@@ -167,11 +172,14 @@
                 maxmin: true,
                 maxmin: true,
                 shadeClose: true,
                 shadeClose: true,
                 area: ['70%', '90%'],
                 area: ['70%', '90%'],
-                content: '../borrow/reserve.html',
+                async: false,
+                content: '../borrow/reserve.html?archive_id=' + data.id + "&recordType=" + 0,
                 success: function (layero, index) {
                 success: function (layero, index) {
-                    var body = layer.getChildFrame('body', index);
-                    body.find("#archive_id").val(data.id);
-                    body.find("#recordType").val(0);
+                    // var body = layer.getChildFrame('body', index);
+                    // // console.log(data.id)
+                    // // body.find("#archive_id").val(data.id);
+                    // // body.find("#recordType").val(0);
+                    // layui.form.render();
                 },
                 },
                 end: function () {
                 end: function () {
                     renderTable()
                     renderTable()
@@ -246,8 +254,7 @@
 
 
         //数据加载方法
         //数据加载方法
         let renderTable = function () {
         let renderTable = function () {
-            debugger
-            if (params && params != {}){
+            if (params && params != {}) {
                 searchParam.params = params
                 searchParam.params = params
             }
             }
             // 加载表格数据
             // 加载表格数据
@@ -340,6 +347,11 @@
                 },
                 },
                 end: function () {
                 end: function () {
                     renderTable()
                     renderTable()
+                    if (searchParam.allDocument !== "on") {
+                        $("#resultSearch").show()
+                    } else {
+                        $("#resultSearch").hide()
+                    }
                 }
                 }
             });
             });
         }
         }
@@ -396,11 +408,11 @@
                 maxmin: true,
                 maxmin: true,
                 shadeClose: true,
                 shadeClose: true,
                 area: ['100%', '100%'],
                 area: ['100%', '100%'],
-                content: './secondaryList.html',
+                content: './secondaryList.html?archive_id=' + data.id + "&dh=" + data.dh,
                 success: function (layero, index) {
                 success: function (layero, index) {
-                    var body = layer.getChildFrame('body', index);
-                    body.find("#archive_id").val(data.id);
-                    body.find("#dh").val(data.dh);
+                    // var body = layer.getChildFrame('body', index);
+                    // body.find("#archive_id").val(data.id);
+                    // body.find("#dh").val(data.dh);
                 },
                 },
                 end: function () {
                 end: function () {
                     renderTable()
                     renderTable()
@@ -627,6 +639,21 @@
                     break;
                     break;
             }
             }
         })
         })
+        form.on('submit(resetSearch)', function (data) {
+            // searchParam.reset = true
+            $("#ztc").val('')
+            $("#dh").val('')
+            $("#wjbh").val('')
+            $("#mj").val('')
+            $("#gdnd").val('')
+            $("#bgqx").val('')
+            const ml = searchParam.ml
+            searchParam = {}
+            searchParam.ml = ml
+            curr = 1
+            $("#resultSearch").hide()
+            renderTable()
+        })
 
 
         form.on('submit(resultSearch)', function (data) {
         form.on('submit(resultSearch)', function (data) {
             searchParam.dh = data.field.dh
             searchParam.dh = data.field.dh
@@ -651,9 +678,9 @@
             searchParam.wjbh = data.field.wjbh
             searchParam.wjbh = data.field.wjbh
             searchParam.allDocument = data.field.allDocument
             searchParam.allDocument = data.field.allDocument
             searchParam.again = false
             searchParam.again = false
-            if (searchParam.allDocument !== "on"){
+            if (searchParam.allDocument !== "on") {
                 $("#resultSearch").show()
                 $("#resultSearch").show()
-            }else {
+            } else {
                 $("#resultSearch").hide()
                 $("#resultSearch").hide()
             }
             }
             renderTable()
             renderTable()

+ 5 - 4
src/main/resources/static/page/archive/secondaryList.html

@@ -35,16 +35,17 @@
 <script src="../../lib/layui-v2.5.5/layui.js" charset="utf-8"></script>
 <script src="../../lib/layui-v2.5.5/layui.js" charset="utf-8"></script>
 <script src="../../js/lay-config.js?v=1.0.4" charset="utf-8"></script>
 <script src="../../js/lay-config.js?v=1.0.4" charset="utf-8"></script>
 <script>
 <script>
-    layui.use(['table', 'http', 'form', 'upload'], function () {
+    layui.use(['table', 'http', 'form', 'upload','url'], function () {
         /**变-------------------------------量-------------------------------定-------------------------------义*/
         /**变-------------------------------量-------------------------------定-------------------------------义*/
 
 
         var table = layui.table,
         var table = layui.table,
             http = layui.http,
             http = layui.http,
             form = layui.form,
             form = layui.form,
             upload = layui.upload,
             upload = layui.upload,
+            url = layui.url,
             $ = layui.jquery;
             $ = layui.jquery;
 
 
-        let archive_id = $("#archive_id").val()
+        let archive_id = url().archive_id
         let curr = 1
         let curr = 1
         /**方-------------------------------法-------------------------------定-------------------------------义*/
         /**方-------------------------------法-------------------------------定-------------------------------义*/
             //数据加载方法
             //数据加载方法
@@ -89,13 +90,13 @@
                         // {field: 'originalFileName', title: '原文件名'},
                         // {field: 'originalFileName', title: '原文件名'},
                         {
                         {
                             field: 'dh', title: '档号', width: 250, templet: function (rv) {
                             field: 'dh', title: '档号', width: 250, templet: function (rv) {
-                                return $('#dh').val()
+                                return url().dh
                             }
                             }
                         },
                         },
                         {field: 'sxh', title: '顺序'},
                         {field: 'sxh', title: '顺序'},
+                        {field: 'tm', title: '题名'},
                         {field: 'wh', title: '文号'},
                         {field: 'wh', title: '文号'},
                         {field: 'zrz', title: '责任者'},
                         {field: 'zrz', title: '责任者'},
-                        {field: 'tm', title: '题名'},
                         {field: 'yh', title: '页号'},
                         {field: 'yh', title: '页号'},
                         {field: 'bz', title: '备注'},
                         {field: 'bz', title: '备注'},
                         {templet: '#operating', width: 240, align: 'center', title: '操作'}
                         {templet: '#operating', width: 240, align: 'center', title: '操作'}

+ 5 - 21
src/main/resources/static/page/borrow/reserve.html

@@ -17,9 +17,6 @@
 </head>
 </head>
 <body>
 <body>
 <div class="layui-form layuimini-form" lay-filter="addDict">
 <div class="layui-form layuimini-form" lay-filter="addDict">
-
-    <input type="hidden" name="recordType" id="recordType" class="layui-input">
-
     <div class="layui-form-item" id="ryA">
     <div class="layui-form-item" id="ryA">
         <label class="layui-form-label required">人员类型:</label>
         <label class="layui-form-label required">人员类型:</label>
         <div class="layui-input-block">
         <div class="layui-input-block">
@@ -71,7 +68,6 @@
     <div class="layui-form-item">
     <div class="layui-form-item">
         <label class="layui-form-label required">档号:</label>
         <label class="layui-form-label required">档号:</label>
         <div class="layui-input-block">
         <div class="layui-input-block">
-            <input type="hidden" name="archiveId" id="archive_id" class="layui-input">
             <input type="text" name="dh" placeholder="请输入档号" value="" lay-verify="required" lay-reqtext="档号不能为空"
             <input type="text" name="dh" placeholder="请输入档号" value="" lay-verify="required" lay-reqtext="档号不能为空"
                    class="layui-input" readonly>
                    class="layui-input" readonly>
         </div>
         </div>
@@ -132,19 +128,19 @@
 <script src="../../lib/layui-v2.5.5/layui.js" charset="utf-8"></script>
 <script src="../../lib/layui-v2.5.5/layui.js" charset="utf-8"></script>
 <script src="../../js/lay-config.js?v=1.0.4" charset="utf-8"></script>
 <script src="../../js/lay-config.js?v=1.0.4" charset="utf-8"></script>
 <script>
 <script>
-    layui.use(['form', 'http', 'laydate', 'upload'], function () {
+    layui.use(['form', 'http', 'laydate', 'upload','url'], function () {
         /**变-------------------------------量-------------------------------定-------------------------------义*/
         /**变-------------------------------量-------------------------------定-------------------------------义*/
         var form = layui.form,
         var form = layui.form,
             layer = layui.layer,
             layer = layui.layer,
             http = layui.http,
             http = layui.http,
             upload = layui.upload,
             upload = layui.upload,
             laydate = layui.laydate,
             laydate = layui.laydate,
+            url = layui.url,
             $ = layui.$;
             $ = layui.$;
-        let archiveId = $('#archive_id').val()
-        let recordType = $('#recordType').val()
+        let archiveId = url().archive_id
+        let recordType = url().recordType
+        console.log()
         /**方-------------------------------法-------------------------------定-------------------------------义*/
         /**方-------------------------------法-------------------------------定-------------------------------义*/
-
-
         if(recordType == 1){
         if(recordType == 1){
             http.get('system/auth/currLoginAdminDept', {
             http.get('system/auth/currLoginAdminDept', {
             }, true, function (res) {
             }, true, function (res) {
@@ -163,8 +159,6 @@
         }else {
         }else {
             $("#name_A").hide();
             $("#name_A").hide();
         }
         }
-
-
             // 保存方法
             // 保存方法
         let save = function (data) {
         let save = function (data) {
                 http.post('borrow/archiveBorrow/borrow', data, true, function (res) {
                 http.post('borrow/archiveBorrow/borrow', data, true, function (res) {
@@ -205,15 +199,6 @@
                 trigger: 'click',
                 trigger: 'click',
                 min: minDate()
                 min: minDate()
             });
             });
-
-
-            // // 加载当前登录用户
-            // http.get('system/auth/currLoginAdmin', {}, false, function (res) {
-            //     console.log(res.data)
-            //     form.val("addDict", res.data);
-            //     form.render();
-            // })
-
             // 加载当前文档信息
             // 加载当前文档信息
             http.get('archive/archive/selectByPrimaryKey', {
             http.get('archive/archive/selectByPrimaryKey', {
                 id: archiveId
                 id: archiveId
@@ -221,7 +206,6 @@
                 form.val("addDict", res.data);
                 form.val("addDict", res.data);
                 form.render();
                 form.render();
             })
             })
-
             $("#estimateReturnTime_A").hide()
             $("#estimateReturnTime_A").hide()
             // $("#dept_container").hide()
             // $("#dept_container").hide()
             // $("#phone_container").hide()
             // $("#phone_container").hide()

+ 21 - 5
src/main/resources/static/page/statistics/archiveStatistics.html

@@ -94,15 +94,31 @@
                     {field: 'fileCount', title: '归档文件数', totalRow: true},
                     {field: 'fileCount', title: '归档文件数', totalRow: true},
                     // {templet: '#operating', width: 120, align: 'center', title: '操作'}
                     // {templet: '#operating', width: 120, align: 'center', title: '操作'}
                 ]],
                 ]],
-                done: function () {
+                done: function (res, curr, count) {
+                    console.log(res, curr, count)
+                    let archiveCount = 0,
+                        fileCount = 0
+                    res.data.forEach(item => {
+                        if (item.pid === -1) {
+                            archiveCount += item.archiveCount
+                            fileCount += item.fileCount
+                        }
+                    })
+                    console.log(archiveCount, fileCount)
                     // $('th').css({'background-color': '#1aa094', 'color': '#fff','font-weight':'bold'})
                     // $('th').css({'background-color': '#1aa094', 'color': '#fff','font-weight':'bold'})
                     layer.closeAll('loading');
                     layer.closeAll('loading');
                     var divArr = layui.$(".layui-table-total div.layui-table-cell");
                     var divArr = layui.$(".layui-table-total div.layui-table-cell");
-                    layui.$.each(divArr,function (index,item) {
+                    layui.$.each(divArr, function (index, item) {
                         var _div = layui.$(item);
                         var _div = layui.$(item);
-                        var content = _div.html();
-                        content = content.replace(".00","");
-                        _div.html(content);
+                        if (index === 3) {
+                            _div.html(archiveCount);
+                        } else if (index === 4) {
+                            _div.html(fileCount);
+                        }
+
+                        // var content = _div.html();
+                        // content = content.replace(".00", "");
+
                     });
                     });
                 }
                 }
             });
             });