Procházet zdrojové kódy

徐明浩
压力容器、压力管道、电梯、叉车、起重机械、锅炉-在用,添加默认排序
压力容器、压力管道、电梯、叉车、起重机械、锅炉预警标识检查合并

徐明浩 před 3 roky
rodič
revize
7cbc2b9c51

+ 253 - 0
master/src/main/java/com/ruoyi/framework/task/TSpecdevAllTask.java

@@ -0,0 +1,253 @@
+package com.ruoyi.framework.task;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.project.sems.domain.*;
+import com.ruoyi.project.sems.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 特种设备预警标识定时任务
+ */
+
+@Component("tSpecdevAllTask")
+public class TSpecdevAllTask extends BaseController {
+
+    //注入叉车台账接口
+    @Autowired
+    private ITSpecdevCcService specdevCcService;
+
+    //注入电梯台账接口
+    @Autowired
+    private ITSpecdevDtService specdevDtService;
+
+    //注入锅炉台账接口
+    @Autowired
+    private ITSpecdevGlService specdevGlService;
+
+    //注入起重机械台账接口
+    @Autowired
+    private ITSpecdevDzsbService specdevDzsbService;
+
+    //注入压力管道台账接口
+    @Autowired
+    private ITSpecdevYlgdService specdevYlgdService;
+
+    //注入压力容器台账接口
+    @Autowired
+    private ITSpecdevYlrqService specdevYlrqService;
+
+    /**
+     * 检查叉车预警标识状态
+     * 3天检查一次
+     */
+    public void checkWarnFlag() {
+        this.checkWarnFlagForGl();
+        this.checkWarnFlagForCc();
+        this.checkWarnFlagForDt();
+        this.checkWarnFlagForDzsb();
+        this.checkWarnFlagForYlgd();
+        this.checkWarnFlagForYlrq();
+    }
+
+    private void checkWarnFlagForGl() {
+        List<TSpecdevGl> list = this.specdevGlService.list(new QueryWrapper<TSpecdevGl>()
+                .eq("del_flag", 0).eq("status", "1"));
+        for (TSpecdevGl tSpecdevGl : list) {
+            if (tSpecdevGl.getNextWarnDate() != null) {
+                long now = System.currentTimeMillis();
+                long diff = tSpecdevGl.getNextWarnDate().getTime() - now;
+                long nd = 1000 * 24 * 60 * 60;
+                long day = diff / nd;
+                // 半年内 预警标识为2级
+                if (day > 0 && day <= 180) {
+                    this.updateForGl(2L, tSpecdevGl);
+                    continue;
+                }
+                // 半年-一年 预警标识为1级
+                if (day > 180 && day <= 365) {
+                    this.updateForGl(1L, tSpecdevGl);
+                    continue;
+                }
+                // 超时 预警标识为3级
+                if (day < 0) {
+                    this.updateForGl(3L, tSpecdevGl);
+                    continue;
+                }
+            }
+        }
+    }
+
+    private void checkWarnFlagForCc() {
+        List<TSpecdevCc> list = this.specdevCcService.list(new QueryWrapper<TSpecdevCc>()
+                .eq("del_flag", 0).eq("status", "1"));
+        for (TSpecdevCc tSpecdevCc : list) {
+            if (tSpecdevCc.getNextWarnDate() != null) {
+                long now = System.currentTimeMillis();
+                long diff = tSpecdevCc.getNextWarnDate().getTime() - now;
+                long nd = 1000 * 24 * 60 * 60;
+                long day = diff / nd;
+                // 半年内 预警标识为2级
+                if (day > 0 && day <= 180) {
+                    this.updateForCc(2L, tSpecdevCc);
+                    continue;
+                }
+                // 半年-一年 预警标识为1级
+                if (day > 180 && day <= 365) {
+                    this.updateForCc(1L, tSpecdevCc);
+                    continue;
+                }
+                // 超时 预警标识为3级
+                if (day < 0) {
+                    this.updateForCc(3L, tSpecdevCc);
+                    continue;
+                }
+            }
+        }
+    }
+
+    private void checkWarnFlagForDzsb() {
+        List<TSpecdevDzsb> list = this.specdevDzsbService.list(new QueryWrapper<TSpecdevDzsb>()
+                .eq("del_flag", 0).eq("status", "1"));
+        for (TSpecdevDzsb tSpecdevDzsb : list) {
+            if (tSpecdevDzsb.getNextWarnDate() != null) {
+                long now = System.currentTimeMillis();
+                long diff = tSpecdevDzsb.getNextWarnDate().getTime() - now;
+                long nd = 1000 * 24 * 60 * 60;
+                long day = diff / nd;
+                // 半年内 预警标识为2级
+                if (day > 0 && day <= 180) {
+                    this.updateForDzsb(2L, tSpecdevDzsb);
+                    continue;
+                }
+                // 半年-一年 预警标识为1级
+                if (day > 180 && day <= 365) {
+                    this.updateForDzsb(1L, tSpecdevDzsb);
+                    continue;
+                }
+                // 超时 预警标识为3级
+                if (day < 0) {
+                    this.updateForDzsb(3L, tSpecdevDzsb);
+                    continue;
+                }
+            }
+        }
+    }
+
+    private void checkWarnFlagForYlrq() {
+        List<TSpecdevYlrq> list = this.specdevYlrqService.list(new QueryWrapper<TSpecdevYlrq>()
+                .eq("del_flag", 0).eq("status", "1"));
+        for (TSpecdevYlrq tSpecdevYlrq : list) {
+            if (tSpecdevYlrq.getNextWarnDate() != null) {
+                long now = System.currentTimeMillis();
+                long diff = tSpecdevYlrq.getNextWarnDate().getTime() - now;
+                long nd = 1000 * 24 * 60 * 60;
+                long day = diff / nd;
+                // 半年内 预警标识为2级
+                if (day > 0 && day <= 180) {
+                    this.updateForYlrq(2L, tSpecdevYlrq);
+                    continue;
+                }
+                // 半年-一年 预警标识为1级
+                if (day > 180 && day <= 365) {
+                    this.updateForYlrq(1L, tSpecdevYlrq);
+                    continue;
+                }
+                // 超时 预警标识为3级
+                if (day < 0) {
+                    this.updateForYlrq(3L, tSpecdevYlrq);
+                    continue;
+                }
+            }
+        }
+    }
+
+    private void checkWarnFlagForYlgd() {
+        List<TSpecdevYlgd> list = this.specdevYlgdService.list(new QueryWrapper<TSpecdevYlgd>()
+                .eq("del_flag", 0).eq("status", "1"));
+        for (TSpecdevYlgd tSpecdevYlgd : list) {
+            if (tSpecdevYlgd.getNextWarnDate() != null) {
+                long now = System.currentTimeMillis();
+                long diff = tSpecdevYlgd.getNextWarnDate().getTime() - now;
+                long nd = 1000 * 24 * 60 * 60;
+                long day = diff / nd;
+                // 半年内 预警标识为2级
+                if (day > 0 && day <= 180) {
+                    this.updateForYlgd(2L, tSpecdevYlgd);
+                    continue;
+                }
+                // 半年-一年 预警标识为1级
+                if (day > 180 && day <= 365) {
+                    this.updateForYlgd(1L, tSpecdevYlgd);
+                    continue;
+                }
+                // 超时 预警标识为3级
+                if (day < 0) {
+                    this.updateForYlgd(3L, tSpecdevYlgd);
+                    continue;
+                }
+            }
+        }
+    }
+
+    private void checkWarnFlagForDt() {
+        List<TSpecdevDt> list = this.specdevDtService.list(new QueryWrapper<TSpecdevDt>()
+                .eq("del_flag", 0).eq("status", "1"));
+        for (TSpecdevDt tSpecdevDt : list) {
+            if (tSpecdevDt.getNextWarnDate() != null) {
+                long now = System.currentTimeMillis();
+                long diff = tSpecdevDt.getNextWarnDate().getTime() - now;
+                long nd = 1000 * 24 * 60 * 60;
+                long day = diff / nd;
+                // 半年内 预警标识为2级
+                if (day > 0 && day <= 180) {
+                    this.updateForDt(2L, tSpecdevDt);
+                    continue;
+                }
+                // 半年-一年 预警标识为1级
+                if (day > 180 && day <= 365) {
+                    this.updateForDt(1L, tSpecdevDt);
+                    continue;
+                }
+                // 超时 预警标识为3级
+                if (day < 0) {
+                    this.updateForDt(3L, tSpecdevDt);
+                    continue;
+                }
+            }
+        }
+    }
+
+    private void updateForCc(Long flag, TSpecdevCc tSpecdevCc) {
+        tSpecdevCc.setWarnFlag(flag);
+        this.specdevCcService.updateTSpecdevCc(tSpecdevCc);
+    }
+
+    private void updateForDt(Long flag, TSpecdevDt tSpecdevDt) {
+        tSpecdevDt.setWarnFlag(flag);
+        this.specdevDtService.updateTSpecdevDt(tSpecdevDt);
+    }
+
+    private void updateForGl(Long flag, TSpecdevGl tSpecdevGl) {
+        tSpecdevGl.setWarnFlag(flag);
+        this.specdevGlService.updateTSpecdevGl(tSpecdevGl);
+    }
+
+    private void updateForDzsb(Long flag, TSpecdevDzsb tSpecdevDzsb) {
+        tSpecdevDzsb.setWarnFlag(flag);
+        this.specdevDzsbService.updateTSpecdevDzsb(tSpecdevDzsb);
+    }
+
+    private void updateForYlgd(Long flag, TSpecdevYlgd tSpecdevYlgd) {
+        tSpecdevYlgd.setWarnFlag(flag);
+        this.specdevYlgdService.updateTSpecdevYlgd(tSpecdevYlgd);
+    }
+
+    private void updateForYlrq(Long flag, TSpecdevYlrq tSpecdevYlrq) {
+        tSpecdevYlrq.setWarnFlag(flag);
+        this.specdevYlrqService.updateTSpecdevYlrq(tSpecdevYlrq);
+    }
+}

+ 0 - 61
master/src/main/java/com/ruoyi/framework/task/TSpecdevCcTask.java

@@ -1,61 +0,0 @@
-package com.ruoyi.framework.task;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.project.sems.domain.TSpecdevCc;
-import com.ruoyi.project.sems.service.ITSpecdevCcService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * 叉车预警标识定时任务
- */
-
-@Component("tSpecdevCcTask")
-public class TSpecdevCcTask extends BaseController {
-
-    /**
-     * 注入叉车台账接口
-     */
-    @Autowired
-    private ITSpecdevCcService specdevCcService;
-
-    /**
-     * 检查叉车预警标识状态
-     * 3天检查一次
-     */
-    public void checkWarnFlag() {
-        List<TSpecdevCc> list = this.specdevCcService.list(new QueryWrapper<TSpecdevCc>()
-                .eq("del_flag", 0).eq("status", "1"));
-        for (TSpecdevCc tSpecdevCc : list) {
-            if (tSpecdevCc.getNextWarnDate() != null) {
-                long now = System.currentTimeMillis();
-                long diff = tSpecdevCc.getNextWarnDate().getTime() - now;
-                long nd = 1000 * 24 * 60 * 60;
-                long day = diff / nd;
-                // 半年内 预警标识为2级
-                if (day > 0 && day <= 180) {
-                    this.update(2L, tSpecdevCc);
-                    continue;
-                }
-                // 半年-一年 预警标识为1级
-                if (day > 180 && day <= 365) {
-                    this.update(1L, tSpecdevCc);
-                    continue;
-                }
-                // 超时 预警标识为3级
-                if (day < 0) {
-                    this.update(3L, tSpecdevCc);
-                    continue;
-                }
-            }
-        }
-    }
-
-    private void update(Long flag, TSpecdevCc tSpecdevCc) {
-        tSpecdevCc.setWarnFlag(flag);
-        this.specdevCcService.updateTSpecdevCc(tSpecdevCc);
-    }
-}

+ 0 - 61
master/src/main/java/com/ruoyi/framework/task/TSpecdevDtTask.java

@@ -1,61 +0,0 @@
-package com.ruoyi.framework.task;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.project.sems.domain.TSpecdevDt;
-import com.ruoyi.project.sems.service.ITSpecdevDtService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * 电梯预警标识定时任务
- */
-
-@Component("tSpecdevDtTask")
-public class TSpecdevDtTask extends BaseController {
-
-    /**
-     * 注入电梯台账接口
-     */
-    @Autowired
-    private ITSpecdevDtService specdevDtService;
-
-    /**
-     * 检查电梯预警标识状态
-     * 3天检查一次
-     */
-    public void checkWarnFlag() {
-        List<TSpecdevDt> list = this.specdevDtService.list(new QueryWrapper<TSpecdevDt>()
-                .eq("del_flag", 0).eq("status", "1"));
-        for (TSpecdevDt tSpecdevDt : list) {
-            if (tSpecdevDt.getNextWarnDate() != null) {
-                long now = System.currentTimeMillis();
-                long diff = tSpecdevDt.getNextWarnDate().getTime() - now;
-                long nd = 1000 * 24 * 60 * 60;
-                long day = diff / nd;
-                // 半年内 预警标识为2级
-                if (day > 0 && day <= 180) {
-                    this.update(2L, tSpecdevDt);
-                    continue;
-                }
-                // 半年-一年 预警标识为1级
-                if (day > 180 && day <= 365) {
-                    this.update(1L, tSpecdevDt);
-                    continue;
-                }
-                // 超时 预警标识为3级
-                if (day < 0) {
-                    this.update(3L, tSpecdevDt);
-                    continue;
-                }
-            }
-        }
-    }
-
-    private void update(Long flag, TSpecdevDt tSpecdevDt) {
-        tSpecdevDt.setWarnFlag(flag);
-        this.specdevDtService.updateTSpecdevDt(tSpecdevDt);
-    }
-}

+ 0 - 62
master/src/main/java/com/ruoyi/framework/task/TSpecdevGlTask.java

@@ -1,62 +0,0 @@
-package com.ruoyi.framework.task;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.project.sems.domain.TSpecdevGl;
-import com.ruoyi.project.sems.domain.TSpecdevYlgd;
-import com.ruoyi.project.sems.service.ITSpecdevGlService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * 锅炉预警标识定时任务
- */
-
-@Component("tSpecdevGlTask")
-public class TSpecdevGlTask extends BaseController {
-
-    /**
-     * 注入锅炉台账接口
-     */
-    @Autowired
-    private ITSpecdevGlService specdevGlService;
-
-    /**
-     * 检查锅炉预警标识状态
-     * 3天检查一次
-     */
-    public void checkWarnFlag() {
-        List<TSpecdevGl> list = this.specdevGlService.list(new QueryWrapper<TSpecdevGl>()
-                .eq("del_flag", 0).eq("status", "1"));
-        for (TSpecdevGl tSpecdevGl : list) {
-            if (tSpecdevGl.getNextWarnDate() != null) {
-                long now = System.currentTimeMillis();
-                long diff = tSpecdevGl.getNextWarnDate().getTime() - now;
-                long nd = 1000 * 24 * 60 * 60;
-                long day = diff / nd;
-                // 半年内 预警标识为2级
-                if (day > 0 && day <= 180) {
-                    this.update(2L, tSpecdevGl);
-                    continue;
-                }
-                // 半年-一年 预警标识为1级
-                if (day > 180 && day <= 365) {
-                    this.update(1L, tSpecdevGl);
-                    continue;
-                }
-                // 超时 预警标识为3级
-                if (day < 0) {
-                    this.update(3L, tSpecdevGl);
-                    continue;
-                }
-            }
-        }
-    }
-
-    private void update(Long flag, TSpecdevGl tSpecdevGl) {
-        tSpecdevGl.setWarnFlag(flag);
-        this.specdevGlService.updateTSpecdevGl(tSpecdevGl);
-    }
-}

+ 0 - 61
master/src/main/java/com/ruoyi/framework/task/TSpecdevQzjxTask.java

@@ -1,61 +0,0 @@
-package com.ruoyi.framework.task;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.project.sems.domain.TSpecdevDzsb;
-import com.ruoyi.project.sems.service.ITSpecdevDzsbService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * 起重机械预警标识定时任务
- */
-
-@Component("tSpecdevQzjxTask")
-public class TSpecdevQzjxTask extends BaseController {
-
-    /**
-     * 注入起重机械台账接口
-     */
-    @Autowired
-    private ITSpecdevDzsbService specdevDzsbService;
-
-    /**
-     * 检查起重机械预警标识状态
-     * 3天检查一次
-     */
-    public void checkWarnFlag() {
-        List<TSpecdevDzsb> list = this.specdevDzsbService.list(new QueryWrapper<TSpecdevDzsb>()
-                .eq("del_flag", 0).eq("status", "1"));
-        for (TSpecdevDzsb tSpecdevDzsb : list) {
-            if (tSpecdevDzsb.getNextWarnDate() != null) {
-                long now = System.currentTimeMillis();
-                long diff = tSpecdevDzsb.getNextWarnDate().getTime() - now;
-                long nd = 1000 * 24 * 60 * 60;
-                long day = diff / nd;
-                // 半年内 预警标识为2级
-                if (day > 0 && day <= 180) {
-                    this.update(2L, tSpecdevDzsb);
-                    continue;
-                }
-                // 半年-一年 预警标识为1级
-                if (day > 180 && day <= 365) {
-                    this.update(1L, tSpecdevDzsb);
-                    continue;
-                }
-                // 超时 预警标识为3级
-                if (day < 0) {
-                    this.update(3L, tSpecdevDzsb);
-                    continue;
-                }
-            }
-        }
-    }
-
-    private void update(Long flag, TSpecdevDzsb tSpecdevDzsb) {
-        tSpecdevDzsb.setWarnFlag(flag);
-        this.specdevDzsbService.updateTSpecdevDzsb(tSpecdevDzsb);
-    }
-}

+ 0 - 61
master/src/main/java/com/ruoyi/framework/task/TSpecdevYlgdTask.java

@@ -1,61 +0,0 @@
-package com.ruoyi.framework.task;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.project.sems.domain.TSpecdevYlgd;
-import com.ruoyi.project.sems.service.ITSpecdevYlgdService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * 压力管道预警标识定时任务
- */
-
-@Component("tSpecdevYlgdTask")
-public class TSpecdevYlgdTask extends BaseController {
-
-    /**
-     * 注入压力管道台账接口
-     */
-    @Autowired
-    private ITSpecdevYlgdService specdevYlgdService;
-
-    /**
-     * 检查压力管道预警标识状态
-     * 3天检查一次
-     */
-    public void checkWarnFlag() {
-        List<TSpecdevYlgd> list = this.specdevYlgdService.list(new QueryWrapper<TSpecdevYlgd>()
-                .eq("del_flag", 0).eq("status", "1"));
-        for (TSpecdevYlgd tSpecdevYlgd : list) {
-            if (tSpecdevYlgd.getNextWarnDate() != null) {
-                long now = System.currentTimeMillis();
-                long diff = tSpecdevYlgd.getNextWarnDate().getTime() - now;
-                long nd = 1000 * 24 * 60 * 60;
-                long day = diff / nd;
-                // 半年内 预警标识为2级
-                if (day > 0 && day <= 180) {
-                    this.update(2L, tSpecdevYlgd);
-                    continue;
-                }
-                // 半年-一年 预警标识为1级
-                if (day > 180 && day <= 365) {
-                    this.update(1L, tSpecdevYlgd);
-                    continue;
-                }
-                // 超时 预警标识为3级
-                if (day < 0) {
-                    this.update(3L, tSpecdevYlgd);
-                    continue;
-                }
-            }
-        }
-    }
-
-    private void update(Long flag, TSpecdevYlgd tSpecdevYlgd) {
-        tSpecdevYlgd.setWarnFlag(flag);
-        this.specdevYlgdService.updateTSpecdevYlgd(tSpecdevYlgd);
-    }
-}

+ 0 - 61
master/src/main/java/com/ruoyi/framework/task/TSpecdevYlrqTask.java

@@ -1,61 +0,0 @@
-package com.ruoyi.framework.task;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.project.sems.domain.TSpecdevYlrq;
-import com.ruoyi.project.sems.service.ITSpecdevYlrqService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * 压力容器预警标识定时任务
- */
-
-@Component("tSpecdevYlrqTask")
-public class TSpecdevYlrqTask extends BaseController {
-
-    /**
-     * 注入压力容器台账接口
-     */
-    @Autowired
-    private ITSpecdevYlrqService specdevYlrqService;
-
-    /**
-     * 检查压力容器预警标识状态
-     * 3天检查一次
-     */
-    public void checkWarnFlag() {
-        List<TSpecdevYlrq> list = this.specdevYlrqService.list(new QueryWrapper<TSpecdevYlrq>()
-                .eq("del_flag", 0).eq("status", "1"));
-        for (TSpecdevYlrq tSpecdevYlrq : list) {
-            if (tSpecdevYlrq.getNextWarnDate() != null) {
-                long now = System.currentTimeMillis();
-                long diff = tSpecdevYlrq.getNextWarnDate().getTime() - now;
-                long nd = 1000 * 24 * 60 * 60;
-                long day = diff / nd;
-                // 半年内 预警标识为2级
-                if (day > 0 && day <= 180) {
-                    this.update(2L, tSpecdevYlrq);
-                    continue;
-                }
-                // 半年-一年 预警标识为1级
-                if (day > 180 && day <= 365) {
-                    this.update(1L, tSpecdevYlrq);
-                    continue;
-                }
-                // 超时 预警标识为3级
-                if (day < 0) {
-                    this.update(3L, tSpecdevYlrq);
-                    continue;
-                }
-            }
-        }
-    }
-
-    private void update(Long flag, TSpecdevYlrq tSpecdevYlrq) {
-        tSpecdevYlrq.setWarnFlag(flag);
-        this.specdevYlrqService.updateTSpecdevYlrq(tSpecdevYlrq);
-    }
-}

+ 4 - 2
ui/src/views/sems/specCc/index.vue

@@ -553,6 +553,8 @@
       queryParams: {
         pageNum: 1,
         pageSize: 20,
+        orderByColumn:"id",
+        isAsc:"desc",
         plantCode: null,
         carNo: null,
         devname: null,
@@ -923,9 +925,9 @@
       if(sortTip === 'descending'){
         sort = 'desc' // 降序
       }
-      /*else if(sortTip === 'ascending'){
+      else if(sortTip === 'ascending'){
         sort = 'asc' // 升序
-      }*/
+      }
       this.queryParams.isAsc = sort;
       this.queryParams.orderByColumn = val.prop;
 

+ 4 - 2
ui/src/views/sems/specDt/index.vue

@@ -484,6 +484,8 @@
       queryParams: {
         pageNum: 1,
         pageSize: 20,
+        orderByColumn:"id",
+        isAsc:"desc",
         plantCode: null,
         unit: null,
         devname: null,
@@ -824,9 +826,9 @@
       if(sortTip === 'descending'){
         sort = 'desc' // 降序
       }
-      /*else if(sortTip === 'ascending'){
+      else if(sortTip === 'ascending'){
         sort = 'asc' // 升序
-      }*/
+      }
       this.queryParams.isAsc = sort;
       this.queryParams.orderByColumn = val.prop;
 

+ 2 - 0
ui/src/views/sems/specDzsb/index.vue

@@ -647,6 +647,8 @@
       queryParams: {
         pageNum: 1,
         pageSize: 20,
+        orderByColumn:"id",
+        isAsc:"desc",
         plantCode: null,
         unit: null,
         devname: null,

+ 5 - 5
ui/src/views/sems/specGl/index.vue

@@ -172,7 +172,7 @@
 
       <el-table-column :label="$t('外部检验结论')" align="center" prop="outCheckConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('外部检验报告编号')" align="center" prop="outReportNo" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('下次外部检测日期')" align="center" prop="outNextWarnDate" width="100">
+      <el-table-column :label="$t('下次外部检测日期')" align="center" prop="outNextWarnDate" width="100" sortable="custom">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.outNextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -616,8 +616,8 @@
       queryParams: {
         pageNum: 1,
         pageSize: 20,
-        orderByColumn:null,
-        isAsc:null,
+        orderByColumn:"id",
+        isAsc:"desc",
         plantCode: null,
         unit: null,
         devname: null,
@@ -989,9 +989,9 @@
       if(sortTip === 'descending'){
         sort = 'desc' // 降序
       }
-      /*else if(sortTip === 'ascending'){
+      else if(sortTip === 'ascending'){
         sort = 'asc' // 升序
-      }*/
+      }
       this.queryParams.isAsc = sort;
       this.queryParams.orderByColumn = val.prop;
 

+ 4 - 4
ui/src/views/sems/specYlgd/index.vue

@@ -748,8 +748,8 @@ export default {
       queryParams: {
         dataForm: 0,
         pageNum: 1,
-        orderByColumn:null,
-        isAsc:null,
+        orderByColumn:"id",
+        isAsc:"desc",
         pageSize: 20,
         plantCode: null,
         unit: null,
@@ -1144,9 +1144,9 @@ export default {
       if(sortTip === 'descending'){
         sort = 'desc' // 降序
       }
-      /*else if(sortTip === 'ascending'){
+      else if(sortTip === 'ascending'){
         sort = 'asc' // 升序
-      }*/
+      }
       this.queryParams.isAsc = sort;
       this.queryParams.orderByColumn = val.prop;
 

+ 4 - 4
ui/src/views/sems/specYlrq/index.vue

@@ -643,8 +643,8 @@
       queryParams: {
         pageNum: 1,
         pageSize: 20,
-        orderByColumn:null,
-        isAsc:null,
+        orderByColumn:"id",
+        isAsc:"desc",
         plantCode: null,
         unit: null,
         devname: null,
@@ -1046,9 +1046,9 @@
       if(sortTip === 'descending'){
         sort = 'desc' // 降序
       }
-      /*else if(sortTip === 'ascending'){
+      else if(sortTip === 'ascending'){
         sort = 'asc' // 升序
-      }*/
+      }
       this.queryParams.isAsc = sort;
       this.queryParams.orderByColumn = val.prop;