LY

master/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -1,6 +1,5 @@
 package com.ruoyi;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -27,7 +26,7 @@ public class RuoYiApplication
     @Bean
     MultipartConfigElement multipartConfigElement() {
         MultipartConfigFactory factory = new MultipartConfigFactory();
-        factory.setLocation("/data/tmp");
+        factory.setLocation("/u03/tmp");
         return factory.createMultipartConfig();
     }
 }

master/src/main/java/com/ruoyi/project/sems/controller/SpecHomeController.java

@@ -570,7 +570,7 @@ public class SpecHomeController extends BaseController
                 .eq("del_flag" , 0)
                 .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                 .in("plant_code",plantIds)
-                .in("safe_class","1","1级","1.0")
+                .in("safe_class","1","1级","1.0","一级","Ⅰ级")
                 .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
         );
         int safe2 = tSpecdevYlrqService.count(new QueryWrapper<TSpecdevYlrq>()
@@ -578,7 +578,7 @@ public class SpecHomeController extends BaseController
                 .eq("del_flag" , 0)
                 .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                 .in("plant_code",plantIds)
-                .in("safe_class","2","2级","2.0")
+                .in("safe_class","2","2级","2.0","二级","Ⅱ级")
                 .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
         );
 
@@ -587,7 +587,7 @@ public class SpecHomeController extends BaseController
                 .eq("del_flag" , 0)
                 .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                 .in("plant_code",plantIds)
-                .in("safe_class","3","3级","3.0")
+                .in("safe_class","3","3级","3.0","三级","Ⅲ级")
                 .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
         );
 
@@ -596,7 +596,7 @@ public class SpecHomeController extends BaseController
                 .eq("del_flag" , 0)
                 .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                 .in("plant_code",plantIds)
-                .in("safe_class","4","4级","4.0")
+                .in("safe_class","4","4级","4.0","四级","Ⅳ级")
                 .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
         );
         int safe5 = tSpecdevYlrqService.count(new QueryWrapper<TSpecdevYlrq>()
@@ -604,7 +604,7 @@ public class SpecHomeController extends BaseController
                 .eq("del_flag" , 0)
                 .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                 .in("plant_code",plantIds)
-                .in("safe_class","5","5","5.0")
+                .in("safe_class","5","5级","5.0","五级","Ⅴ级")
                 .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
         );
         int safeall = tSpecdevYlrqService.count(new QueryWrapper<TSpecdevYlrq>()
@@ -640,7 +640,7 @@ public class SpecHomeController extends BaseController
                 .eq("del_flag" , 0)
                 .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                 .in("plant_code",plantIds)
-                .in("safe_class","1","1级","1.0")
+                .in("safe_class","1","1级","1.0","一级","Ⅰ级")
                 .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
         );
         int safe2 = tSpecdevYlgdService.count(new QueryWrapper<TSpecdevYlgd>()
@@ -648,7 +648,7 @@ public class SpecHomeController extends BaseController
                 .eq("del_flag" , 0)
                 .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                 .in("plant_code",plantIds)
-                .in("safe_class","2","2级","2.0")
+                .in("safe_class","2","2级","2.0","二级","Ⅱ级")
                 .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
         );
         int safe3 = tSpecdevYlgdService.count(new QueryWrapper<TSpecdevYlgd>()
@@ -656,7 +656,7 @@ public class SpecHomeController extends BaseController
                 .eq("del_flag" , 0)
                 .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                 .in("plant_code",plantIds)
-                .in("safe_class","3","3级","3.0")
+                .in("safe_class","3","3级","3.0","三级","Ⅲ级")
                 .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
         );
         int safe4 = tSpecdevYlgdService.count(new QueryWrapper<TSpecdevYlgd>()
@@ -664,7 +664,7 @@ public class SpecHomeController extends BaseController
                 .eq("del_flag" , 0)
                 .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                 .in("plant_code",plantIds)
-                .in("safe_class","4","4级","4.0")
+                .in("safe_class","4","4级","4.0","四级","Ⅳ级")
                 .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
         );
         int safeall = tSpecdevYlgdService.count(new QueryWrapper<TSpecdevYlgd>()

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevYlrqController.java

@@ -66,9 +66,9 @@ public class TSpecdevYlrqController extends BaseController
         startPage();
         List<TSpecdevYlrq> list = tSpecdevYlrqService.selectTSpecdevYlrqList(tSpecdevYlrq);
         //
-        SpecOverLifeThead specOverLifeThead = new SpecOverLifeThead(tSpecdevYlrqService);
-        Thread t = new Thread(specOverLifeThead);
-        t.start();
+//        SpecOverLifeThead specOverLifeThead = new SpecOverLifeThead(tSpecdevYlrqService);
+//        Thread t = new Thread(specOverLifeThead);
+//        t.start();
 
 //        SpecDevYlrqThread specDevYlgdThread = new SpecDevYlrqThread(tSpecdevYlrqService);
 //        Thread t2 = new Thread(specDevYlgdThread);

master/src/main/java/com/ruoyi/project/sems/domain/TSpecdevYlgd.java

@@ -77,7 +77,7 @@ public class TSpecdevYlgd extends BaseEntity
     private String installer;
 
     /** 安装年月 */
-    @JsonFormat(pattern = "yyyy-MM" , timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @Excel(name = "安装年月", width = 30, dateFormat = "yyyy-MM-dd")
     private Date installDate;
 

master/src/main/resources/application.yml

@@ -8,8 +8,8 @@ ruoyi:
   copyrightYear: 2020
   # 实例演示开关
   demoEnabled: true
-  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /data/cpmsfile/uploadPath）
-  profile: /data/cpmsfile/uploadPath
+  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /u03/cpmsfile/uploadPath）
+  profile: /u03/cpmsfile/uploadPath
   # 邮件中链接跳转路径 示例（本地：http://localhost/#，服务器：http://47.114.101.16:8080/cpms/index.html#）
   requestJumpPath: https://cpms.basf-ypc.net.cn/cpms/index.html#
   # 获取ip地址开关

master/src/main/resources/mybatis/sems/TSpecdevCcMapper.xml

@@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
-        order by d.plant_code
+        order by d.plant_code asc , d.docno
     </select>
 
     <select id="selectTSpecdevCcListByYear" parameterType="TSpecdevCc" resultMap="TSpecdevCcResult">
@@ -349,6 +349,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where rowid !=( select max(rowid)
         from T_SPECDEV_CC b
         where b.REGNO = T_SPECDEV_CC.REGNO and T_SPECDEV_CC.DEL_FLAG = 0 and b.DEL_FLAG = 0
+        and T_SPECDEV_CC.APPROVE_STATUS = 0
         )
     </update>
 

master/src/main/resources/mybatis/sems/TSpecdevDtMapper.xml

@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
-        order by d.plant_code, d.unit
+        order by d.plant_code, d.unit ,d.devno
     </select>
 
     <select id="selectTSpecdevDtListByYear" parameterType="TSpecdevDt" resultMap="TSpecdevDtResult">
@@ -311,6 +311,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where rowid !=( select max(rowid)
         from T_SPECDEV_DT b
         where b.REGNO = T_SPECDEV_DT.REGNO and T_SPECDEV_DT.DEL_FLAG = 0 and b.DEL_FLAG = 0
+        and T_SPECDEV_DT.APPROVE_STATUS = 0
         )
     </update>
 </mapper>

master/src/main/resources/mybatis/sems/TSpecdevDzsbMapper.xml

@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
-        order by d.plant_code, d.unit
+        order by d.plant_code, d.unit, d.devno
     </select>
     <select id="selectTSpecdevDzsbListByYear" parameterType="TSpecdevDzsb" resultMap="TSpecdevDzsbResult">
         <include refid="selectTSpecdevDzsbVo"/>
@@ -285,6 +285,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where rowid !=( select max(rowid)
         from T_SPECDEV_DZSB b
         where b.DEVNO = T_SPECDEV_DZSB.DEVNO and T_SPECDEV_DZSB.DEL_FLAG = 0 and b.DEL_FLAG = 0
+        and T_SPECDEV_DZSB.APPROVE_STATUS = 0
         )
     </update>
 

master/src/main/resources/mybatis/sems/TSpecdevGlMapper.xml

@@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
-        order by d.plant_code, d.unit
+        order by d.plant_code, d.unit, d.devno
     </select>
 
     <select id="selectTSpecdevGlListByYear" parameterType="TSpecdevGl" resultMap="TSpecdevGlResult">
@@ -340,6 +340,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where rowid !=( select max(rowid)
         from T_SPECDEV_GL b
         where b.DEVNO = T_SPECDEV_GL.DEVNO and T_SPECDEV_GL.DEL_FLAG = 0 and b.DEL_FLAG = 0
+            and T_SPECDEV_GL.APPROVE_STATUS = 0
         )
     </update>
 

master/src/main/resources/mybatis/sems/TSpecdevYlgdMapper.xml

@@ -164,7 +164,7 @@
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
-        order by d.plant_code, d.unit
+        order by d.plant_code, d.unit, d.devno
     </select>
 
 
@@ -476,6 +476,7 @@
         where rowid !=( select max(rowid)
         from T_SPECDEV_YLGD b
         where b.DEVNO = T_SPECDEV_YLGD.DEVNO and T_SPECDEV_YLGD.DEL_FLAG = 0 and b.DEL_FLAG = 0
+            and T_SPECDEV_YLGD.APPROVE_STATUS = 0
         )
     </update>
 

master/src/main/resources/mybatis/sems/TSpecdevYlrqMapper.xml

@@ -137,7 +137,7 @@
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
-        order by d.plant_code, d.unit
+        order by d.plant_code, d.unit, d.devno
     </select>
 
     <select id="selectTSpecdevYlrqListByYear" parameterType="TSpecdevYlrq" resultMap="TSpecdevYlrqResult">
@@ -405,6 +405,7 @@
         where rowid !=( select max(rowid)
         from T_SPECDEV_YLRQ b
         where b.DEVNO = T_SPECDEV_YLRQ.DEVNO and T_SPECDEV_YLRQ.DEL_FLAG = 0 and b.DEL_FLAG = 0
+        and T_SPECDEV_YLRQ.APPROVE_STATUS = 0
         )
     </update>
 

ui/src/views/sems/specCc/bf.vue

@@ -129,6 +129,7 @@
     <pagination
       v-show="total>0"
       :total="total"
+      :page-sizes="[20,100,300,500]"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"

ui/src/views/sems/specCc/index.vue

@@ -191,6 +191,7 @@
     <pagination
       v-show="total>0"
       :total="total"
+      :page-sizes="[20,100,300,500]"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
@@ -567,8 +568,8 @@
       queryParams: {
         pageNum: 1,
         pageSize: 20,
-        orderByColumn:"id",
-        isAsc:"desc",
+        orderByColumn: null,
+        isAsc: null,
         plantCode: null,
         carNo: null,
         devname: null,
@@ -992,16 +993,16 @@
     sortList(val){
       var sort = "asc";
       let sortTip = val.order
-
+      this.queryParams.isAsc = sort;
+      this.queryParams.orderByColumn = val.prop;
       if(sortTip === 'descending'){
         sort = 'desc' // 降序
-      }
-      else if(sortTip === 'ascending'){
+      }else if(sortTip === 'ascending'){
         sort = 'asc' // 升序
+      }else if(sortTip === null){
+        this.queryParams.isAsc = null;
+        this.queryParams.orderByColumn = null;
       }
-      this.queryParams.isAsc = sort;
-      this.queryParams.orderByColumn = val.prop;
-
       this.loading = true;
       listSpecCc(this.queryParams).then(response => {
         this.specCcList = response.rows;

ui/src/views/sems/specCc/ty.vue

@@ -181,6 +181,7 @@
     <pagination
       v-show="total>0"
       :total="total"
+      :page-sizes="[20,100,300,500]"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"

ui/src/views/sems/specCc/zx.vue

@@ -131,6 +131,7 @@
     <pagination
       v-show="total>0"
       :total="total"
+      :page-sizes="[20,100,300,500]"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"

ui/src/views/sems/specDt/bf.vue

@@ -118,7 +118,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+       :page.sync="queryParams.pageNum"
+      :page-sizes="[20,100,300,500]"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />

ui/src/views/sems/specDt/index.vue

@@ -186,7 +186,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+      :page-sizes="[20,100,300,500]"
+       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
@@ -503,8 +504,8 @@
       queryParams: {
         pageNum: 1,
         pageSize: 20,
-        orderByColumn:"id",
-        isAsc:"desc",
+        orderByColumn: null,
+        isAsc: null,
         plantCode: null,
         unit: null,
         devname: null,
@@ -898,16 +899,16 @@
     sortList(val){
       var sort = "asc";
       let sortTip = val.order
-
+      this.queryParams.isAsc = sort;
+      this.queryParams.orderByColumn = val.prop;
       if(sortTip === 'descending'){
         sort = 'desc' // 降序
-      }
-      else if(sortTip === 'ascending'){
+      }else if(sortTip === 'ascending'){
         sort = 'asc' // 升序
+      }else if(sortTip === null){
+        this.queryParams.isAsc = null;
+        this.queryParams.orderByColumn = null;
       }
-      this.queryParams.isAsc = sort;
-      this.queryParams.orderByColumn = val.prop;
-
       this.loading = true;
       listSpecDt(this.queryParams).then(response => {
         this.specDtList = response.rows;

ui/src/views/sems/specDt/ty.vue

@@ -168,7 +168,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+       :page.sync="queryParams.pageNum"
+      :page-sizes="[20,100,300,500]"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />

ui/src/views/sems/specDt/zx.vue

@@ -118,7 +118,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+       :page.sync="queryParams.pageNum"
+      :page-sizes="[20,100,300,500]"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />

ui/src/views/sems/specDzsb/bf.vue

@@ -233,7 +233,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+             :page.sync="queryParams.pageNum"
+      :page-sizes="[20,100,300,500]"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />

ui/src/views/sems/specDzsb/index.vue

@@ -295,7 +295,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+             :page.sync="queryParams.pageNum"
+      :page-sizes="[20,100,300,500]"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
@@ -644,8 +645,8 @@
       queryParams: {
         pageNum: 1,
         pageSize: 20,
-        orderByColumn:"id",
-        isAsc:"desc",
+        orderByColumn: null,
+        isAsc: null,
         plantCode: null,
         unit: null,
         devname: null,
@@ -1059,16 +1060,16 @@
     sortList(val){
       var sort = "asc";
       let sortTip = val.order
-
+      this.queryParams.isAsc = sort;
+      this.queryParams.orderByColumn = val.prop;
       if(sortTip === 'descending'){
         sort = 'desc' // 降序
-      }
-      /*else if(sortTip === 'ascending'){
+      }else if(sortTip === 'ascending'){
         sort = 'asc' // 升序
-      }*/
-      this.queryParams.isAsc = sort;
-      this.queryParams.orderByColumn = val.prop;
-
+      }else if(sortTip === null){
+        this.queryParams.isAsc = null;
+        this.queryParams.orderByColumn = null;
+      }
       this.loading = true;
       listSpecDzsb(this.queryParams).then(response => {
         this.specDzsbList = response.rows;

ui/src/views/sems/specDzsb/ty.vue

@@ -284,7 +284,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+             :page.sync="queryParams.pageNum"
+      :page-sizes="[20,100,300,500]"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />

ui/src/views/sems/specDzsb/zx.vue

@@ -235,7 +235,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+             :page.sync="queryParams.pageNum"
+      :page-sizes="[20,100,300,500]"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />

ui/src/views/sems/specGl/bf.vue

@@ -165,7 +165,7 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />

ui/src/views/sems/specGl/index.vue

@@ -220,7 +220,7 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
@@ -627,8 +627,8 @@
       queryParams: {
         pageNum: 1,
         pageSize: 20,
-        orderByColumn:"unit",
-        isAsc:"asc",
+        orderByColumn: null,
+        isAsc: null,
         plantCode: null,
         unit: null,
         devname: null,
@@ -1052,16 +1052,16 @@
     sortList(val){
       var sort = "asc";
       let sortTip = val.order
-
+      this.queryParams.isAsc = sort;
+      this.queryParams.orderByColumn = val.prop;
       if(sortTip === 'descending'){
         sort = 'desc' // 降序
-      }
-      else if(sortTip === 'ascending'){
+      }else if(sortTip === 'ascending'){
         sort = 'asc' // 升序
+      }else if(sortTip === null){
+        this.queryParams.isAsc = null;
+        this.queryParams.orderByColumn = null;
       }
-      this.queryParams.isAsc = sort;
-      this.queryParams.orderByColumn = val.prop;
-
       this.loading = true;
       listSpecGl(this.queryParams).then(response => {
         this.specGlList = response.rows;

ui/src/views/sems/specGl/ty.vue

@@ -208,7 +208,7 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />

ui/src/views/sems/specGl/zx.vue

@@ -165,7 +165,7 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />

ui/src/views/sems/specYlgd/bf.vue

@@ -222,7 +222,7 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />

ui/src/views/sems/specYlgd/index.vue

@@ -284,7 +284,7 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
@@ -757,8 +757,8 @@ export default {
       queryParams: {
         dataForm: 0,
         pageNum: 1,
-        orderByColumn:"unit",
-        isAsc:"asc",
+        orderByColumn: null,
+        isAsc: null,
         pageSize: 20,
         plantCode: null,
         unit: null,
@@ -1205,16 +1205,16 @@ export default {
     sortList(val){
       var sort = "asc";
       let sortTip = val.order
-
+      this.queryParams.isAsc = sort;
+      this.queryParams.orderByColumn = val.prop;
       if(sortTip === 'descending'){
         sort = 'desc' // 降序
-      }
-      else if(sortTip === 'ascending'){
+      }else if(sortTip === 'ascending'){
         sort = 'asc' // 升序
+      }else if(sortTip === null){
+        this.queryParams.isAsc = null;
+        this.queryParams.orderByColumn = null;
       }
-      this.queryParams.isAsc = sort;
-      this.queryParams.orderByColumn = val.prop;
-
       this.loading = true;
       listSpecYlgd(this.queryParams).then(response => {
         this.specYlgdList = response.rows;

ui/src/views/sems/specYlgd/ty.vue

@@ -272,7 +272,7 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />

ui/src/views/sems/specYlgd/zx.vue

@@ -221,7 +221,7 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />

ui/src/views/sems/specYlrq/bf.vue

@@ -160,7 +160,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+             :page.sync="queryParams.pageNum"
+      :page-sizes="[20,100,300,500]"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />

ui/src/views/sems/specYlrq/index.vue

@@ -229,7 +229,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+             :page.sync="queryParams.pageNum"
+      :page-sizes="[20,100,300,500]"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
@@ -692,8 +693,8 @@
       queryParams: {
         pageNum: 1,
         pageSize: 20,
-        orderByColumn:"unit",
-        isAsc:"asc",
+        orderByColumn: null,
+        isAsc: null,
         plantCode: null,
         unit: null,
         devname: null,
@@ -1218,16 +1219,16 @@
     sortList(val){
       var sort = "asc";
       let sortTip = val.order
-
+      this.queryParams.isAsc = sort;
+      this.queryParams.orderByColumn = val.prop;
       if(sortTip === 'descending'){
         sort = 'desc' // 降序
-      }
-      else if(sortTip === 'ascending'){
+      }else if(sortTip === 'ascending'){
         sort = 'asc' // 升序
+      }else if(sortTip === null){
+        this.queryParams.isAsc = null;
+        this.queryParams.orderByColumn = null;
       }
-      this.queryParams.isAsc = sort;
-      this.queryParams.orderByColumn = val.prop;
-
       this.loading = true;
       listSpecYlrq(this.queryParams).then(response => {
         this.specYlrqList = response.rows;

ui/src/views/sems/specYlrq/specYlrq-hisReform.vue

@@ -69,7 +69,8 @@
     <!--<pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+             :page.sync="queryParams.pageNum"
+      :page-sizes="[20,100,300,500]"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />-->

ui/src/views/sems/specYlrq/ty.vue

@@ -213,7 +213,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+             :page.sync="queryParams.pageNum"
+      :page-sizes="[20,100,300,500]"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />

ui/src/views/sems/specYlrq/zx.vue

@@ -161,7 +161,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+             :page.sync="queryParams.pageNum"
+      :page-sizes="[20,100,300,500]"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />

ui/src/views/sems/specfile/index.vue

@@ -108,7 +108,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+             :page.sync="queryParams.pageNum"
+      :page-sizes="[20,100,300,500]"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />

ui/src/views/sems/thickness/index.vue

@@ -288,7 +288,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+             :page.sync="queryParams.pageNum"
+      :page-sizes="[20,100,300,500]"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />

ui/src/views/sems/thickness/record.vue

@@ -55,7 +55,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+             :page.sync="queryParams.pageNum"
+      :page-sizes="[20,100,300,500]"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />