LY bug fix

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

@@ -15,6 +15,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.framework.config.RuoYiConfig;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.project.sems.domain.*;
 import com.ruoyi.project.sems.mapper.TReportYlgdMapper;
 import com.ruoyi.project.sems.service.ITReportThirdService;
@@ -64,8 +65,9 @@ public class TReportYlgdController extends BaseController {
      * @return
      * @throws IOException
      */
-    @GetMapping("/exportSelected")
-    public AjaxResult exportSelected(ParamData params) throws IOException {
+    @PostMapping("/exportSelected")
+    @RepeatSubmit
+    public AjaxResult exportSelected(@RequestBody ParamData params) throws IOException {
         logger.info(JSON.toJSONString(params));
         String id = params.getIds();
         String[] ids = id.split(",");

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

@@ -15,6 +15,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.framework.config.RuoYiConfig;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.project.sems.domain.*;
 import com.ruoyi.project.sems.mapper.TReportYlgdMapper;
 import com.ruoyi.project.sems.mapper.TReportYlrqMapper;
@@ -50,7 +51,6 @@ public class TReportYlrqController extends BaseController {
 
     @Autowired
     private ITReportYlrqService tReportYlrqService;
-
     @Autowired
     private ITReportThirdService itReportYlrqThirdService;
     @Resource
@@ -65,8 +65,9 @@ public class TReportYlrqController extends BaseController {
      * @return
      * @throws IOException
      */
-    @GetMapping("/exportSelected")
-    public AjaxResult exportbmy(ParamData params) throws IOException {
+    @PostMapping("/exportSelected")
+    @RepeatSubmit
+    public AjaxResult exportbmy(@RequestBody ParamData params) throws IOException {
         logger.info(JSON.toJSONString(params));
         String id = params.getIds();
         String[] ids = id.split(",");

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

@@ -196,7 +196,7 @@ public class TSpecdevCcController extends BaseController {
     /**
      * 去重
      */
-    @PreAuthorize("@ss.hasPermi('system:plant:remove')")
+    @PreAuthorize("@ss.hasRole('admin')")
     @Log(title = "特种设备叉车台账去重", businessType = BusinessType.OTHER)
     @GetMapping("/duplicate")
     public AjaxResult duplicate() {

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

@@ -191,7 +191,7 @@ public class TSpecdevDtController extends BaseController {
     /**
      * 去重
      */
-    @PreAuthorize("@ss.hasPermi('system:plant:remove')")
+    @PreAuthorize("@ss.hasRole('admin')")
     @Log(title = "特种设备电梯台账去重", businessType = BusinessType.OTHER)
     @GetMapping("/duplicate")
     public AjaxResult duplicate() {
@@ -438,6 +438,7 @@ public class TSpecdevDtController extends BaseController {
         }
         int successNumber = 0;
         int failNum = 0;
+        List<String> ids = new ArrayList<>();
         for (TSpecdevDt t : list) {
             failNum++;
             try {
@@ -448,6 +449,7 @@ public class TSpecdevDtController extends BaseController {
                                         .eq("PLANT_CODE", t.getPlantCode())
                         );
                 successNumber++;
+                ids.add(t.getId().toString());
             } catch (Exception e) {
                 failNumber++;
                 logger.info("e:" + e);
@@ -466,6 +468,13 @@ public class TSpecdevDtController extends BaseController {
             tc.setCheckConclusion(t.getPerTestConclusion());
             tSpecCheckService.insertTSpecCheck(tc);
         }
+
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        String userName =loginUser != null? loginUser.getUsername(): "";
+        new Thread(() -> {
+            tSpechiDtController.addOperLog(ids.toArray(),userName,new Date() , "批量更新" );
+        },"特种设备操作日志").start();
+
         logger.info("list:" + JSON.toJSONString(list));
         logger.info("successNumber:" + String.valueOf(successNumber));
         logger.info("failNumber:" + String.valueOf(failNumber));

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

@@ -191,7 +191,7 @@ public class TSpecdevDzsbController extends BaseController {
     /**
      * 去重
      */
-    @PreAuthorize("@ss.hasPermi('system:plant:remove')")
+    @PreAuthorize("@ss.hasRole('admin')")
     @Log(title = "特种设备起重机械台账去重", businessType = BusinessType.OTHER)
     @GetMapping("/duplicate")
     public AjaxResult duplicate() {
@@ -448,6 +448,7 @@ public class TSpecdevDzsbController extends BaseController {
         }
         int successNumber = 0;
         int failNum = 0;
+        List<String> ids = new ArrayList<>();
         for (TSpecdevDzsb t : list) {
             failNum++;
             try {
@@ -458,6 +459,7 @@ public class TSpecdevDzsbController extends BaseController {
                                         .eq("PLANT_CODE", t.getPlantCode())
                         );
                 successNumber++;
+                ids.add(t.getId().toString());
             } catch (Exception e) {
                 failNumber++;
                 logger.error("e:" + e);
@@ -476,6 +478,11 @@ public class TSpecdevDzsbController extends BaseController {
             tc.setCheckConclusion(t.getPerTestConclusion());
             tSpecCheckService.insertTSpecCheck(tc);
         }
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        String userName =loginUser != null? loginUser.getUsername(): "";
+        new Thread(() -> {
+            tSpechiDzsbController.addOperLog(ids.toArray(),userName,new Date() , "批量更新" );
+        },"特种设备操作日志").start();
         logger.info("list:" + JSON.toJSONString(list));
         logger.info("successNumber:" + String.valueOf(successNumber));
         logger.info("failNumber:" + String.valueOf(failNumber));

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

@@ -200,7 +200,7 @@ public class TSpecdevGlController extends BaseController
     /**
      * 去重
      */
-    @PreAuthorize("@ss.hasPermi('system:plant:remove')")
+    @PreAuthorize("@ss.hasRole('admin')")
     @Log(title = "特种设备锅炉台账去重", businessType = BusinessType.OTHER)
     @GetMapping("/duplicate")
     public AjaxResult duplicate()
@@ -490,6 +490,7 @@ public class TSpecdevGlController extends BaseController
         }
         int successNumber = 0;
         int failNum = 0;
+        List<String> ids = new ArrayList<>();
         for (TSpecdevGl t : list) {
             failNum++;
             try {
@@ -501,6 +502,7 @@ public class TSpecdevGlController extends BaseController
                                         .eq("DEVNO" , t.getDevno())
                         );
                 successNumber++;
+                ids.add(t.getId().toString());
             }catch (Exception e){
                 failNumber++;
                 logger.info("e:" + e);
@@ -524,6 +526,11 @@ public class TSpecdevGlController extends BaseController
             tc.setOutNextWarnDate(t.getOutNextWarnDate());
             tSpecCheckService.insertTSpecCheck(tc);
         }
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        String userName =loginUser != null? loginUser.getUsername(): "";
+        new Thread(() -> {
+            tSpechiGlController.addOperLog(ids.toArray(),userName,new Date() , "批量更新" );
+        },"特种设备操作日志").start();
         logger.info("list:" + JSON.toJSONString(list));
         logger.info("successNumber:" +String.valueOf(successNumber));
         logger.info("failNumber:" +String.valueOf(failNumber));

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

@@ -74,6 +74,8 @@ public class TSpecdevYlgdController extends BaseController {
     private TApproveSpecModifyController approveSpecModifyController;
     @Autowired
     private TSpechiYlgdController tSpechiYlgdController;
+    @Autowired
+    private TReportYlgdController tReportYlgdController;
     /**
      * 查询特种设备压力管道台账列表
      */
@@ -182,6 +184,9 @@ public class TSpecdevYlgdController extends BaseController {
         new Thread(() -> {
             tSpechiYlgdController.addOperLog(String.valueOf(tSpecdevYlgd.getId()),userName,new Date() , "修改" );
         },"特种设备操作日志").start();
+        new Thread(() -> {
+            tReportYlgdController.syncData();;
+        },"同步").start();
         return AjaxResult.success();
     }
 
@@ -198,7 +203,7 @@ public class TSpecdevYlgdController extends BaseController {
     /**
      * 去重
      */
-    @PreAuthorize("@ss.hasPermi('system:plant:remove')")
+    @PreAuthorize("@ss.hasRole('admin')")
     @Log(title = "特种设备压力管道台账去重", businessType = BusinessType.OTHER)
     @GetMapping("/duplicate")
     public AjaxResult duplicate() {
@@ -522,6 +527,7 @@ public class TSpecdevYlgdController extends BaseController {
         }
         int successNumber = 0;
         int failNum = 0;
+        List<String> ids = new ArrayList<>();
         for (TSpecdevYlgd t : list) {
             failNum++;
             try {
@@ -533,6 +539,7 @@ public class TSpecdevYlgdController extends BaseController {
                                         .eq("DEVNO", t.getDevno())
                         );
                 successNumber++;
+                ids.add(t.getId().toString());
             } catch (Exception e) {
                 failNumber++;
                 logger.info("e:" + e);
@@ -554,6 +561,16 @@ public class TSpecdevYlgdController extends BaseController {
             tc.setCheckConclusion(t.getCheckConclusion());
             tSpecCheckService.insertTSpecCheck(tc);
         }
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        String userName =loginUser != null? loginUser.getUsername(): "";
+        new Thread(() -> {
+            tSpechiYlgdController.addOperLog(ids.toArray(),userName,new Date() , "批量更新" );
+        },"特种设备操作日志").start();
+
+        new Thread(() -> {
+            tReportYlgdController.syncData();;
+        },"同步年报").start();
+
         logger.info("list:" + JSON.toJSONString(list));
         logger.info("successNumber:" + String.valueOf(successNumber));
         logger.info("failNumber:" + String.valueOf(failNumber));

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

@@ -83,6 +83,9 @@ public class TSpecdevYlrqController extends BaseController {
     private TSpechiYlrqController tSpechiYlrqController;
     @Resource
     private TSpecdevYlrqMapper tSpecdevYlrqMapper;
+    @Autowired
+    private TReportYlrqController tReportYlrqController;
+
     /**
      * 查询特种设备压力容器台账列表
      */
@@ -200,7 +203,7 @@ public class TSpecdevYlrqController extends BaseController {
             tSpechiYlrqController.addOperLog(String.valueOf(tSpecdevYlrq.getId()),userName,new Date() , "修改" );
         },"特种设备操作日志").start();
         new Thread(() -> {
-            tSpecdevYlrqMapper.syncReport(tSpecdevYlrq);
+            tReportYlrqController.syncData();
         },"同步年度检查").start();
         return AjaxResult.success();
     }
@@ -228,7 +231,7 @@ public class TSpecdevYlrqController extends BaseController {
     /**
      * 去重
      */
-    @PreAuthorize("@ss.hasPermi('system:plant:remove')")
+    @PreAuthorize("@ss.hasRole('admin')")
     @Log(title = "特种设备压力容器台账去重", businessType = BusinessType.OTHER)
     @GetMapping("/duplicate")
     public AjaxResult duplicate() {
@@ -428,6 +431,10 @@ public class TSpecdevYlrqController extends BaseController {
             tSpechiYlrqController.addOperLog(ids.toArray(),userName,new Date() , "新增申请" );
         },"特种设备操作日志").start();
 
+        new Thread(() -> {
+            tReportYlrqController.syncData();
+        },"同步年度检查").start();
+
         logger.info("list:" + JSON.toJSONString(list));
         logger.info("successNumber:" + String.valueOf(successNumber));
         logger.info("failNumber:" + String.valueOf(failNumber));
@@ -458,7 +465,6 @@ public class TSpecdevYlrqController extends BaseController {
         List<SysDept> dept = iSysDeptService.selectDeptList(new SysDept());
         int rowNum = sheet.getPhysicalNumberOfRows();
         int failNumber = 0;
-        long devId = 0l;
         TSpecdevYlrq oldEntity = new TSpecdevYlrq();
         for (int i = 1; i < rowNum; i++) {
             try {
@@ -535,6 +541,7 @@ public class TSpecdevYlrqController extends BaseController {
         }
         int successNumber = 0;
         int failNum = 0;
+        List<String> ids = new ArrayList<>();
         for (TSpecdevYlrq t : list
         ) {
             failNum++;
@@ -544,6 +551,7 @@ public class TSpecdevYlrqController extends BaseController {
                                 .eq("PLANT_CODE", t.getPlantCode())
                                 .eq("DEVNO", t.getDevno()));
                 successNumber++;
+                ids.add(t.getId().toString());
             } catch (Exception e) {
                 e.printStackTrace();
                 failNumber++;
@@ -569,6 +577,11 @@ public class TSpecdevYlrqController extends BaseController {
             tSpecCheckService.insertTSpecCheck(tc);
 //            }
         }
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        String userName =loginUser != null? loginUser.getUsername(): "";
+        new Thread(() -> {
+            tSpechiYlrqController.addOperLog(ids.toArray(),userName,new Date() , "批量更新" );
+        },"特种设备操作日志").start();
         logger.info("list:" + JSON.toJSONString(list));
         logger.info("successNumber:" + String.valueOf(successNumber));
         logger.info("failNumber:" + String.valueOf(failNumber));

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

@@ -420,5 +420,4 @@
         </trim>
         where id = #{id}
     </update>
-
 </mapper>

master/src/main/resources/mybatis/sems/his/TSpechiCcMapper.xml

@@ -116,7 +116,7 @@
     <select id="selectTSpechiCcList" parameterType="TSpechiCc" resultMap="TSpechiCcResult">
         <include refid="selectTSpechiCcVo"/>
         <where>
-
+            <if test="plantCode != null  and plantCode != ''"> and plant_code like concat(concat('%',  #{plantCode}), '%')</if>
             <if test="operName != null  and operName != ''"> and oper_name like concat(concat('%', #{operName}), '%')</if>
             <if test="operTime != null "> and to_CHAR(oper_time,'YYYY-MM-DD') = to_CHAR(#{operTime} , 'YYYY-MM-DD')</if>
             <if test="operType != null  and operType != ''"> and oper_type like concat(concat('%', #{operType}), '%')</if>

master/src/main/resources/mybatis/sems/his/TSpechiDtMapper.xml

@@ -101,6 +101,8 @@
     <select id="selectTSpechiDtList" parameterType="TSpechiDt" resultMap="TSpechiDtResult">
         <include refid="selectTSpechiDtVo"/>
         <where>
+            <if test="plantCode != null  and plantCode != ''"> and plant_code like concat(concat('%',  #{plantCode}), '%')</if>
+
             <if test="operName != null  and operName != ''"> and oper_name like concat(concat('%', #{operName}), '%')</if>
             <if test="operTime != null "> and to_CHAR(oper_time,'YYYY-MM-DD') = to_CHAR(#{operTime} , 'YYYY-MM-DD')</if>
             <if test="operType != null  and operType != ''"> and oper_type like concat(concat('%', #{operType}), '%')</if>

master/src/main/resources/mybatis/sems/his/TSpechiDzsbMapper.xml

@@ -101,6 +101,8 @@
     <select id="selectTSpechiDzsbList" parameterType="TSpechiDzsb" resultMap="TSpechiDzsbResult">
         <include refid="selectTSpechiDzsbVo"/>
         <where>
+            <if test="plantCode != null  and plantCode != ''"> and plant_code like concat(concat('%',  #{plantCode}), '%')</if>
+
             <if test="operName != null  and operName != ''"> and oper_name like concat(concat('%', #{operName}), '%')</if>
             <if test="operTime != null "> and to_CHAR(oper_time,'YYYY-MM-DD') = to_CHAR(#{operTime} , 'YYYY-MM-DD')</if>
             <if test="operType != null  and operType != ''"> and oper_type like concat(concat('%', #{operType}), '%')</if>

master/src/main/resources/mybatis/sems/his/TSpechiGlMapper.xml

@@ -111,6 +111,8 @@
     <select id="selectTSpechiGlList" parameterType="TSpechiGl" resultMap="TSpechiGlResult">
         <include refid="selectTSpechiGlVo"/>
         <where>
+            <if test="plantCode != null  and plantCode != ''"> and plant_code like concat(concat('%',  #{plantCode}), '%')</if>
+
             <if test="operName != null  and operName != ''"> and oper_name like concat(concat('%', #{operName}), '%')</if>
             <if test="operTime != null "> and to_CHAR(oper_time,'YYYY-MM-DD') = to_CHAR(#{operTime} , 'YYYY-MM-DD')</if>
             <if test="operType != null  and operType != ''"> and oper_type like concat(concat('%', #{operType}), '%')</if>

master/src/main/resources/mybatis/sems/his/TSpechiYlgdMapper.xml

@@ -133,6 +133,8 @@
     <select id="selectTSpechiYlgdList" parameterType="TSpechiYlgd" resultMap="TSpechiYlgdResult">
         <include refid="selectTSpechiYlgdVo"/>
         <where>
+            <if test="plantCode != null  and plantCode != ''"> and plant_code like concat(concat('%',  #{plantCode}), '%')</if>
+
             <if test="operName != null  and operName != ''"> and oper_name like concat(concat('%', #{operName}), '%')</if>
             <if test="operTime != null "> and to_CHAR(oper_time,'YYYY-MM-DD') = to_CHAR(#{operTime} , 'YYYY-MM-DD')</if>
             <if test="operType != null  and operType != ''"> and oper_type like concat(concat('%', #{operType}), '%')</if>

master/src/main/resources/mybatis/sems/his/TSpechiYlrqMapper.xml

@@ -121,6 +121,8 @@
     <select id="selectTSpechiYlrqList" parameterType="TSpechiYlrq" resultMap="TSpechiYlrqResult">
         <include refid="selectTSpechiYlrqVo"/>
         <where>
+            <if test="plantCode != null  and plantCode != ''"> and plant_code like concat(concat('%',  #{plantCode}), '%')</if>
+
             <if test="operName != null  and operName != ''"> and oper_name like concat(concat('%', #{operName}), '%')</if>
             <if test="operTime != null "> and to_CHAR(oper_time,'YYYY-MM-DD') = to_CHAR(#{operTime} , 'YYYY-MM-DD')</if>
             <if test="operType != null  and operType != ''"> and oper_type like concat(concat('%', #{operType}), '%')</if>

ui/src/api/sems/reportYlgd.js

@@ -64,7 +64,7 @@ export function exportReportYlgd(query) {
 export function exportReportYlgdSelected(query) {
   return request({
     url: '/sems/reportYlgd/exportSelected',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: query
   })
 }

ui/src/api/sems/reportYlrq.js

@@ -64,8 +64,8 @@ export function exportReportYlrq(query) {
 export function exportReportYlrqSelected(query) {
   return request({
     url: '/sems/reportYlrq/exportSelected',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: query
   })
 }
 

ui/src/views/approve/approveDetail/specModify-detail.vue

@@ -292,19 +292,19 @@
             prop="useDept"
             header-align="center"
             align="center"
-            :label="$t('dept')">
+            :label="$t('使用部门')">
           </u-table-column>
           <u-table-column
             prop="carNo"
             header-align="center"
             align="center"
-            :label="$t('plateNo')">
+            :label="$t('车牌号')">
           </u-table-column>
           <u-table-column
             prop="docno"
             header-align="center"
             align="center"
-            :label="$t('docNo')">
+            :label="$t('档案号')">
           </u-table-column>
           <u-table-column
             prop="model"
@@ -312,7 +312,7 @@
             align="center"
             :show-overflow-tooltip="true"
             width="120"
-            :label="$t('model')">
+            :label="$t('型号')">
           </u-table-column>
         </u-table>
         <u-table

ui/src/views/sems/approve/tapprove-add.vue

@@ -6,6 +6,7 @@
       <el-table
         v-show="dataForm.approveType != 7 && dataForm.devType == 1"
         :data="devList"
+        max-height="600px"
         border
         style="width: 100%;">
         <el-table-column
@@ -60,6 +61,7 @@
       <el-table
         v-show="dataForm.approveType != 7 && dataForm.devType == 2"
         :data="devList"
+        max-height="600px"
         border
         style="width: 100%;">
         <el-table-column
@@ -130,6 +132,7 @@
       <el-table
         v-show="dataForm.devType == 3"
         :data="devList"
+        max-height="600px"
         border
         style="width: 100%;">
         <el-table-column
@@ -171,6 +174,7 @@
       <el-table
         v-show="dataForm.devType == 4"
         :data="devList"
+        max-height="600px"
         border
         style="width: 100%;">
         <el-table-column
@@ -218,6 +222,7 @@
       <el-table
         v-show="dataForm.devType == 5"
         :data="devList"
+        max-height="600px"
         border
         style="width: 100%;">
         <el-table-column
@@ -259,6 +264,7 @@
       <el-table
         v-show="dataForm.devType == 6"
         :data="devList"
+        max-height="600px"
         border
         style="width: 100%;">
         <el-table-column
@@ -297,6 +303,7 @@
       <el-table
         v-show="dataForm.devType == 7"
         :data="devList"
+        max-height="600px"
         border
         style="width: 100%;">
         <el-table-column

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

@@ -27,6 +27,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item :label="$t('装置')" prop="plantCode" label-width="50">
+        <el-input
+          v-model="queryParams.plantCode"
+          :placeholder="$t('请输入') + $t('装置')"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

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

@@ -27,6 +27,15 @@
             @keyup.enter.native="handleQuery"
           />
       </el-form-item>
+      <el-form-item :label="$t('装置')" prop="plantCode" label-width="50">
+        <el-input
+          v-model="queryParams.plantCode"
+          :placeholder="$t('请输入') + $t('装置')"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

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

@@ -28,6 +28,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item :label="$t('装置')" prop="plantCode" label-width="50">
+        <el-input
+          v-model="queryParams.plantCode"
+          :placeholder="$t('请输入') + $t('装置')"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

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

@@ -27,6 +27,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item :label="$t('装置')" prop="plantCode" label-width="50">
+        <el-input
+          v-model="queryParams.plantCode"
+          :placeholder="$t('请输入') + $t('装置')"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

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

@@ -295,7 +295,7 @@
       </u-table-column>
       <u-table-column :label="$t('年度检查报告编号')" align="center" prop="yearReportNo" :show-overflow-tooltip="true"/>
       <u-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <u-table-column :label="$t('操作')" align="center" fixed="right" width="140" class-name="small-padding fixed-width">
+      <u-table-column :label="$t('操作')" align="center" fixed="right" width="170" class-name="small-padding">
         <template slot-scope="scope">
           <el-button
             type="text"

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

@@ -27,6 +27,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item :label="$t('装置')" prop="plantCode" label-width="50">
+        <el-input
+          v-model="queryParams.plantCode"
+          :placeholder="$t('请输入') + $t('装置')"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -46,43 +55,53 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('操作类型')" align="center" fixed="left" prop="operType" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('装置维修组')" align="center"  fixed="left" prop="plantMaint" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('装置维修工程师')" align="center"  fixed="left" prop="engineer" :show-overflow-tooltip="true"/>
-      <!--      <el-table-column :label="$t('状态')" align="center"  fixed="left" prop="status" :formatter="statusFormat" />-->
-      <!--      <el-table-column :label="$t('申请状态')" align="center"  fixed="left" prop="approveStatus" :formatter="approveStatusFormat" />-->
-      <el-table-column :label="$t('位号')" align="center"  fixed="left" prop="devno" :show-overflow-tooltip="true"/>
-
-      <el-table-column :label="$t('设备名称')" align="center" prop="devname" width="200" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('使用证号码')" align="center" prop="useno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('装置名称')" align="center" fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('单元')" align="center" fixed="left" prop="unit" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('装置维修组')" align="center" fixed="left" prop="plantMaint" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('装置维修工程师')" align="center" fixed="left" prop="engineer" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('管道名称')" align="center" fixed="left" prop="devname" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('管道编号')" align="center" fixed="left" prop="devno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('工业管道代码')" align="center" prop="regno" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('容器类别')" align="center" prop="vesselType" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('制造单位')" align="center" prop="createUnit" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('国家')" align="center" prop="nation" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('外形尺寸(直径*长(高)*厚(mm))')" align="center" prop="outSize" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('材料')" align="center" prop="material" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('介质')" align="center" prop="medium" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('设计压力MPa')" align="center" prop="desPressure" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('操作压力MPa')" align="center" prop="optPressure" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('设计温度℃')" align="center" prop="desTemp" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('操作温度℃')" align="center" prop="optTemp" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('投用日期')" align="center" prop="submitdate" width="100">
+      <el-table-column :label="$t('使用登记证编号')" align="center" prop="useno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('管道级别')" align="center" prop="grade" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('设计单位')" align="center" prop="designer" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('安装单位')" align="center" prop="installer" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('安装年月')" align="center" prop="installDate" width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.submitdate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.installDate, '{y}-{m}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('投用年月')" align="center" prop="submitdate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.submitdate, '{y}-{m}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('材质')" align="center" prop="material" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('公称直径')" align="center" prop="dia" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('壁厚(mm)')" align="center" prop="scheduleNo" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('长度')+'（m）'" align="center" prop="length" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('焊口数量')" align="center" prop="weldNumber" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('起点')" align="center" prop="starting" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('终点')" align="center" prop="ending" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('敷设方式')" align="center" prop="layingMethod" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('介质')" align="center" prop="medium" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('设计压力')+'(MPa)'" align="center" prop="desPressure" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('工作压力')+'(MPa)'" align="center" prop="optPressure" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('设计温度')+'(℃)'" align="center" prop="desTemp" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('工作温度')+'(℃)'" align="center" prop="optTemp" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('绝热层代码')" align="center" prop="adiabatic" :show-overflow-tooltip="true"/>
+      <!--      <el-table-column :label="$t('防腐层代码')" align="center" prop="antiCorrosion" :show-overflow-tooltip="true"/>-->
       <el-table-column :label="$t('是否涉危化品')" align="center" prop="isDanger" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('设计使用年限')" align="center" prop="desYear" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('是否达到设计使用年限')" align="center" prop="isOverlife" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('检验单位')" align="center" prop="checkUnit" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('定期检验日期')" align="center" prop="warnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.warnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('安全状况等级')" align="center" prop="safeClass" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('下次定期检验日期')" align="center" prop="nextWarnDate" width="100">
+
+      <el-table-column :label="$t('下次定期检验日期')" align="center" prop="nextWarnDate" width="100" sortable="custom">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -93,7 +112,6 @@
           <span>{{ parseTime(scope.row.yearWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-
       <el-table-column :label="$t('年度检查结论')" align="center" prop="checkConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('下次年度检查日期')" align="center" prop="yearNextWarnDate" width="100">
         <template slot-scope="scope">
@@ -101,7 +119,6 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('年度检查报告编号')" align="center" prop="yearReportNo" :show-overflow-tooltip="true"/>
-      <!--      <el-table-column :label="$t('部门编号')" align="center" prop="deptId" :show-overflow-tooltip="true"/>-->
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
     </el-table>
 

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

@@ -2,43 +2,53 @@
   <el-dialog :title="$t('改造记录')" :visible.sync="visible" width="1200px" append-to-body>
     <el-table v-loading="loading" ref="reTable" :data="specHiYlgdList" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center"  fixed="left" />
-      <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('装置维修组')" align="center"  fixed="left" prop="plantMaint" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('装置维修工程师')" align="center"  fixed="left" prop="engineer" :show-overflow-tooltip="true"/>
-<!--      <el-table-column :label="$t('状态')" align="center"  fixed="left" prop="status" :formatter="statusFormat" />-->
-<!--      <el-table-column :label="$t('申请状态')" align="center"  fixed="left" prop="approveStatus" :formatter="approveStatusFormat" />-->
-      <el-table-column :label="$t('位号')" align="center"  fixed="left" prop="devno" :show-overflow-tooltip="true"/>
-
-      <el-table-column :label="$t('设备名称')" align="center" prop="devname" width="200" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('使用证号码')" align="center" prop="useno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('装置名称')" align="center" fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('单元')" align="center" fixed="left" prop="unit" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('装置维修组')" align="center" fixed="left" prop="plantMaint" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('装置维修工程师')" align="center" fixed="left" prop="engineer" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('管道名称')" align="center" fixed="left" prop="devname" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('管道编号')" align="center" fixed="left" prop="devno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('工业管道代码')" align="center" prop="regno" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('容器类别')" align="center" prop="vesselType" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('制造单位')" align="center" prop="createUnit" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('国家')" align="center" prop="nation" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('外形尺寸(直径*长(高)*厚(mm))')" align="center" prop="outSize" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('材料')" align="center" prop="material" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('介质')" align="center" prop="medium" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('设计压力MPa')" align="center" prop="desPressure" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('操作压力MPa')" align="center" prop="optPressure" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('设计温度℃')" align="center" prop="desTemp" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('操作温度℃')" align="center" prop="optTemp" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('投用日期')" align="center" prop="submitdate" width="100">
+      <el-table-column :label="$t('使用登记证编号')" align="center" prop="useno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('管道级别')" align="center" prop="grade" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('设计单位')" align="center" prop="designer" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('安装单位')" align="center" prop="installer" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('安装年月')" align="center" prop="installDate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.installDate, '{y}-{m}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('投用年月')" align="center" prop="submitdate" width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.submitdate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.submitdate, '{y}-{m}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('材质')" align="center" prop="material" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('公称直径')" align="center" prop="dia" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('壁厚(mm)')" align="center" prop="scheduleNo" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('长度')+'（m）'" align="center" prop="length" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('焊口数量')" align="center" prop="weldNumber" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('起点')" align="center" prop="starting" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('终点')" align="center" prop="ending" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('敷设方式')" align="center" prop="layingMethod" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('介质')" align="center" prop="medium" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('设计压力')+'(MPa)'" align="center" prop="desPressure" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('工作压力')+'(MPa)'" align="center" prop="optPressure" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('设计温度')+'(℃)'" align="center" prop="desTemp" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('工作温度')+'(℃)'" align="center" prop="optTemp" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('绝热层代码')" align="center" prop="adiabatic" :show-overflow-tooltip="true"/>
+      <!--      <el-table-column :label="$t('防腐层代码')" align="center" prop="antiCorrosion" :show-overflow-tooltip="true"/>-->
       <el-table-column :label="$t('是否涉危化品')" align="center" prop="isDanger" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('设计使用年限')" align="center" prop="desYear" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('是否达到设计使用年限')" align="center" prop="isOverlife" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('检验单位')" align="center" prop="checkUnit" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('定期检验日期')" align="center" prop="warnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.warnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('安全状况等级')" align="center" prop="safeClass" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('下次定期检验日期')" align="center" prop="nextWarnDate" width="100">
+
+      <el-table-column :label="$t('下次定期检验日期')" align="center" prop="nextWarnDate" width="100" sortable="custom">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -49,7 +59,6 @@
           <span>{{ parseTime(scope.row.yearWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-
       <el-table-column :label="$t('年度检查结论')" align="center" prop="checkConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('下次年度检查日期')" align="center" prop="yearNextWarnDate" width="100">
         <template slot-scope="scope">
@@ -57,9 +66,7 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('年度检查报告编号')" align="center" prop="yearReportNo" :show-overflow-tooltip="true"/>
-      <!--      <el-table-column :label="$t('部门编号')" align="center" prop="deptId" :show-overflow-tooltip="true"/>-->
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-
       <el-table-column :label="$t('创建时间')" align="center" prop="createdate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>

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

@@ -263,7 +263,7 @@
       </u-table-column>
       <u-table-column :label="$t('年度检查报告编号')" align="center" prop="yearReportNo" :show-overflow-tooltip="true"/>
       <u-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <u-table-column :label="$t('操作')" align="center" fixed="right" width="140" class-name="small-padding fixed-width">
+      <u-table-column :label="$t('操作')" align="center" fixed="right" width="170" class-name="small-padding">
         <template slot-scope="scope">
           <el-button
             type="text"

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

@@ -237,8 +237,8 @@
       <u-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
 
 
-      <u-table-column :label="$t('操作')" align="center" fixed="right" width="140"
-                      class-name="small-padding fixed-width">
+      <u-table-column :label="$t('操作')" align="center" fixed="right" width="170"
+                      class-name="small-padding">
         <template slot-scope="scope">
           <el-button
             type="text"

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

@@ -27,6 +27,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item :label="$t('装置')" prop="plantCode" label-width="50">
+        <el-input
+          v-model="queryParams.plantCode"
+          :placeholder="$t('请输入') + $t('装置')"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

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

@@ -207,8 +207,8 @@
       <u-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
 
 
-      <u-table-column :label="$t('操作')" align="center" fixed="right" width="140"
-                      class-name="small-padding fixed-width">
+      <u-table-column :label="$t('操作')" align="center" fixed="right" width="170"
+                      class-name="small-padding">
         <template slot-scope="scope">
           <el-button
             type="text"