李扬

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

@@ -248,6 +248,66 @@ public class SpecHomeController extends BaseController
         List<TSpecdevYlrq> list = tSpecdevYlrqService.selectTSpecdevYlrqListByYear(tSpecdevYlrq);
         return getDataTable(list);
     }
+
+    /**
+     * 导出特种设备压力容器台账列表
+     */
+    @GetMapping("/exportYlrq")
+    public AjaxResult export(TSpecdevYlrq tSpecdevYlrq)
+    {
+        List<TSpecdevYlrq> list = tSpecdevYlrqService.selectTSpecdevYlrqListByYear(tSpecdevYlrq);
+        ExcelUtil<TSpecdevYlrq> util = new ExcelUtil<TSpecdevYlrq>(TSpecdevYlrq.class);
+        return util.exportExcel(list, "specYlrq");
+    }
+    /**
+     * 导出特种设备压力管道台账列表
+     */
+    @GetMapping("/exportYlgd")
+    public AjaxResult export(TSpecdevYlgd tSpecdevYlgd) {
+        List<TSpecdevYlgd> list = tSpecdevYlgdService.selectTSpecdevYlgdListByYear(tSpecdevYlgd);
+        ExcelUtil<TSpecdevYlgd> util = new ExcelUtil<TSpecdevYlgd>(TSpecdevYlgd.class);
+        return util.exportExcel(list, "specYlgd");
+    }
+    /**
+     * 导出特种设备锅炉台账列表
+     */
+    @GetMapping("/exportGl")
+    public AjaxResult export(TSpecdevGl tSpecdevGl)
+    {
+        List<TSpecdevGl> list = tSpecdevGlService.selectTSpecdevGlListByYear(tSpecdevGl);
+        ExcelUtil<TSpecdevGl> util = new ExcelUtil<TSpecdevGl>(TSpecdevGl.class);
+        return util.exportExcel(list, "specGl");
+    }
+    /**
+     * 导出特种设备电梯台账列表
+     */
+    @GetMapping("/exportDt")
+    public AjaxResult export(TSpecdevDt tSpecdevDt)
+    {
+        List<TSpecdevDt> list = tSpecdevDtService.selectTSpecdevDtListByYear(tSpecdevDt);
+        ExcelUtil<TSpecdevDt> util = new ExcelUtil<TSpecdevDt>(TSpecdevDt.class);
+        return util.exportExcel(list, "specDt");
+    }
+    /**
+     * 导出特种设备吊装设备台账列表
+     */
+    @GetMapping("/exportDzsb")
+    public AjaxResult export(TSpecdevDzsb tSpecdevDzsb)
+    {
+        List<TSpecdevDzsb> list = tSpecdevDzsbService.selectTSpecdevDzsbListByYear(tSpecdevDzsb);
+        ExcelUtil<TSpecdevDzsb> util = new ExcelUtil<TSpecdevDzsb>(TSpecdevDzsb.class);
+        return util.exportExcel(list, "specDzsb");
+    }
+    /**
+     * 导出特种设备叉车台账列表
+     */
+    @GetMapping("/exportCc")
+    public AjaxResult export(TSpecdevCc tSpecdevCc)
+    {
+        List<TSpecdevCc> list = tSpecdevCcService.selectTSpecdevCcListByYear(tSpecdevCc);
+        ExcelUtil<TSpecdevCc> util = new ExcelUtil<TSpecdevCc>(TSpecdevCc.class);
+        return util.exportExcel(list, "specCc");
+    }
     /**
      * 锅炉数据
      */

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

@@ -82,7 +82,6 @@ public class TSpecdevYlrqController extends BaseController
         List<TSpecdevYlrq> list = tSpecdevYlrqService.selectTSpecdevYlrqList(tSpecdevYlrq);
         ExcelUtil<TSpecdevYlrq> util = new ExcelUtil<TSpecdevYlrq>(TSpecdevYlrq.class);
         return util.exportExcel(list, "specYlrq");
-
     }
 
     /**

master/src/main/java/com/ruoyi/project/sems/his/controller/TApproveSpecModifyController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.project.sems.his.controller;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 import com.ruoyi.project.approve.damain.DevTask;
@@ -180,7 +181,13 @@ public class TApproveSpecModifyController extends BaseController
     {
         Long userid = getUserId();
         tApproveSpecModify.setUserId(userid);
-        tApproveSpecModify.setApNo(tApproveSpecModify.getHisId().toString());
+//        tApproveSpecModify.setApNo(tApproveSpecModify.getHisId().toString());
+        //审批编号
+        Date dt = new Date();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddhhmmss");
+        String data = sdf.format(dt) + userid;
+        tApproveSpecModify.setApNo(data);
+        //
         Authentication.setAuthenticatedUserId(userid.toString());
         tApproveSpecModifyService.insertTApproveSpecModify(tApproveSpecModify);
         long bussniseeKey = tApproveSpecModify.getId();

master/src/main/java/com/ruoyi/project/sems/his/controller/TSpechiCcController.java

@@ -36,7 +36,7 @@ public class TSpechiCcController extends BaseController
     /**
      * 查询特种设备叉车台账历史列表
      */
-    @PreAuthorize("@ss.hasPermi('his:cc:list')")
+    @PreAuthorize("@ss.hasPermi('sems:specCc:list')")
     @GetMapping("/list")
     public TableDataInfo list(TSpechiCc tSpechiCc)
     {
@@ -48,7 +48,7 @@ public class TSpechiCcController extends BaseController
     /**
      * 获取特种设备电梯台账历史改造历史
      */
-    @PreAuthorize("@ss.hasPermi('his:cc:query')")
+    @PreAuthorize("@ss.hasPermi('sems:specCc:query')")
     @GetMapping(value = "/reform/{devId}")
     public AjaxResult getReform(@PathVariable("devId") Long devId)
     {
@@ -58,7 +58,7 @@ public class TSpechiCcController extends BaseController
     /**
      * 导出特种设备叉车台账历史列表
      */
-    @PreAuthorize("@ss.hasPermi('his:cc:export')")
+    @PreAuthorize("@ss.hasPermi('sems:specCc:export')")
     @Log(title = "特种设备叉车台账历史", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TSpechiCc tSpechiCc)
@@ -71,7 +71,7 @@ public class TSpechiCcController extends BaseController
     /**
      * 获取特种设备叉车台账历史详细信息
      */
-    @PreAuthorize("@ss.hasPermi('his:cc:query')")
+    @PreAuthorize("@ss.hasPermi('sems:specCc:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -81,7 +81,7 @@ public class TSpechiCcController extends BaseController
     /**
      * 新增特种设备叉车台账历史
      */
-    @PreAuthorize("@ss.hasPermi('his:cc:add')")
+    @PreAuthorize("@ss.hasPermi('sems:specCc:add')")
     @Log(title = "特种设备叉车台账历史", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TSpechiCc tSpechiCc)
@@ -96,7 +96,7 @@ public class TSpechiCcController extends BaseController
     /**
      * 修改特种设备叉车台账历史
      */
-    @PreAuthorize("@ss.hasPermi('his:cc:edit')")
+    @PreAuthorize("@ss.hasPermi('sems:specCc:edit')")
     @Log(title = "特种设备叉车台账历史", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TSpechiCc tSpechiCc)
@@ -107,7 +107,7 @@ public class TSpechiCcController extends BaseController
     /**
      * 删除特种设备叉车台账历史
      */
-    @PreAuthorize("@ss.hasPermi('his:cc:remove')")
+    @PreAuthorize("@ss.hasPermi('sems:specCc:remove')")
     @Log(title = "特种设备叉车台账历史", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

master/src/main/java/com/ruoyi/project/sems/his/controller/TSpechiDtController.java

@@ -36,7 +36,7 @@ public class TSpechiDtController extends BaseController
     /**
      * 查询特种设备电梯台账历史列表
      */
-    @PreAuthorize("@ss.hasPermi('his:dt:list')")
+    @PreAuthorize("@ss.hasPermi('sems:specDt:list')")
     @GetMapping("/list")
     public TableDataInfo list(TSpechiDt tSpechiDt)
     {
@@ -48,7 +48,7 @@ public class TSpechiDtController extends BaseController
     /**
      * 导出特种设备电梯台账历史列表
      */
-    @PreAuthorize("@ss.hasPermi('his:dt:export')")
+    @PreAuthorize("@ss.hasPermi('sems:specDt:export')")
     @Log(title = "特种设备电梯台账历史", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TSpechiDt tSpechiDt)
@@ -61,7 +61,7 @@ public class TSpechiDtController extends BaseController
     /**
      * 获取特种设备电梯台账历史详细信息
      */
-    @PreAuthorize("@ss.hasPermi('his:dt:query')")
+    @PreAuthorize("@ss.hasPermi('sems:specDt:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -71,7 +71,7 @@ public class TSpechiDtController extends BaseController
     /**
      * 获取特种设备电梯台账历史改造历史
      */
-    @PreAuthorize("@ss.hasPermi('his:dt:query')")
+    @PreAuthorize("@ss.hasPermi('sems:specDt:query')")
     @GetMapping(value = "/reform/{devId}")
     public AjaxResult getReform(@PathVariable("devId") Long devId)
     {
@@ -81,7 +81,7 @@ public class TSpechiDtController extends BaseController
     /**
      * 新增特种设备电梯台账历史
      */
-    @PreAuthorize("@ss.hasPermi('his:dt:add')")
+    @PreAuthorize("@ss.hasPermi('sems:specDt:add')")
     @Log(title = "特种设备电梯台账历史", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TSpechiDt tSpechiDt)
@@ -96,7 +96,7 @@ public class TSpechiDtController extends BaseController
     /**
      * 修改特种设备电梯台账历史
      */
-    @PreAuthorize("@ss.hasPermi('his:dt:edit')")
+    @PreAuthorize("@ss.hasPermi('sems:specDt:edit')")
     @Log(title = "特种设备电梯台账历史", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TSpechiDt tSpechiDt)
@@ -107,7 +107,7 @@ public class TSpechiDtController extends BaseController
     /**
      * 删除特种设备电梯台账历史
      */
-    @PreAuthorize("@ss.hasPermi('his:dt:remove')")
+    @PreAuthorize("@ss.hasPermi('sems:specDt:remove')")
     @Log(title = "特种设备电梯台账历史", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

master/src/main/java/com/ruoyi/project/sems/his/controller/TSpechiDzsbController.java

@@ -36,7 +36,7 @@ public class TSpechiDzsbController extends BaseController
     /**
      * 查询特种设备吊装设备台账历史列表
      */
-    @PreAuthorize("@ss.hasPermi('his:dzsb:list')")
+    @PreAuthorize("@ss.hasPermi('sems:specDzsb:list')")
     @GetMapping("/list")
     public TableDataInfo list(TSpechiDzsb tSpechiDzsb)
     {
@@ -48,7 +48,7 @@ public class TSpechiDzsbController extends BaseController
     /**
      * 导出特种设备吊装设备台账历史列表
      */
-    @PreAuthorize("@ss.hasPermi('his:dzsb:export')")
+    @PreAuthorize("@ss.hasPermi('sems:specDzsb:export')")
     @Log(title = "特种设备吊装设备台账历史", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TSpechiDzsb tSpechiDzsb)
@@ -61,7 +61,7 @@ public class TSpechiDzsbController extends BaseController
     /**
      * 获取特种设备吊装设备台账历史详细信息
      */
-    @PreAuthorize("@ss.hasPermi('his:dzsb:query')")
+    @PreAuthorize("@ss.hasPermi('sems:specDzsb:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -71,7 +71,7 @@ public class TSpechiDzsbController extends BaseController
     /**
      * 获取特种设备压力容器台账历史改造历史
      */
-    @PreAuthorize("@ss.hasPermi('his:dzsb:query')")
+    @PreAuthorize("@ss.hasPermi('sems:specDzsb:query')")
     @GetMapping(value = "/reform/{devId}")
     public AjaxResult getReform(@PathVariable("devId") Long devId)
     {
@@ -81,7 +81,7 @@ public class TSpechiDzsbController extends BaseController
     /**
      * 新增特种设备吊装设备台账历史
      */
-    @PreAuthorize("@ss.hasPermi('his:dzsb:add')")
+    @PreAuthorize("@ss.hasPermi('sems:specDzsb:add')")
     @Log(title = "特种设备吊装设备台账历史", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TSpechiDzsb tSpechiDzsb)
@@ -96,7 +96,7 @@ public class TSpechiDzsbController extends BaseController
     /**
      * 修改特种设备吊装设备台账历史
      */
-    @PreAuthorize("@ss.hasPermi('his:dzsb:edit')")
+    @PreAuthorize("@ss.hasPermi('sems:specDzsb:edit')")
     @Log(title = "特种设备吊装设备台账历史", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TSpechiDzsb tSpechiDzsb)
@@ -107,7 +107,7 @@ public class TSpechiDzsbController extends BaseController
     /**
      * 删除特种设备吊装设备台账历史
      */
-    @PreAuthorize("@ss.hasPermi('his:dzsb:remove')")
+    @PreAuthorize("@ss.hasPermi('sems:specDzsb:remove')")
     @Log(title = "特种设备吊装设备台账历史", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

master/src/main/java/com/ruoyi/project/sems/his/controller/TSpechiGlController.java

@@ -36,7 +36,7 @@ public class TSpechiGlController extends BaseController
     /**
      * 查询特种设备锅炉台账历史列表
      */
-    @PreAuthorize("@ss.hasPermi('his:gl:list')")
+    @PreAuthorize("@ss.hasPermi('sems:specGl:list')")
     @GetMapping("/list")
     public TableDataInfo list(TSpechiGl tSpechiGl)
     {
@@ -48,7 +48,7 @@ public class TSpechiGlController extends BaseController
     /**
      * 获取特种设备锅炉台账历史改造历史
      */
-    @PreAuthorize("@ss.hasPermi('his:gl:query')")
+    @PreAuthorize("@ss.hasPermi('sems:specGl:query')")
     @GetMapping(value = "/reform/{devId}")
     public AjaxResult getReform(@PathVariable("devId") Long devId)
     {
@@ -58,7 +58,7 @@ public class TSpechiGlController extends BaseController
     /**
      * 导出特种设备锅炉台账历史列表
      */
-    @PreAuthorize("@ss.hasPermi('his:gl:export')")
+    @PreAuthorize("@ss.hasPermi('sems:specGl:export')")
     @Log(title = "特种设备锅炉台账历史", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TSpechiGl tSpechiGl)
@@ -71,7 +71,7 @@ public class TSpechiGlController extends BaseController
     /**
      * 获取特种设备锅炉台账历史详细信息
      */
-    @PreAuthorize("@ss.hasPermi('his:gl:query')")
+    @PreAuthorize("@ss.hasPermi('sems:specGl:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -82,7 +82,7 @@ public class TSpechiGlController extends BaseController
      * 新增特种设备锅炉台账历史
      * 设置并返回历史表id
      */
-    @PreAuthorize("@ss.hasPermi('his:gl:add')")
+    @PreAuthorize("@ss.hasPermi('sems:specGl:add')")
     @Log(title = "特种设备锅炉台账历史", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TSpechiGl tSpechiGl)
@@ -97,7 +97,7 @@ public class TSpechiGlController extends BaseController
     /**
      * 修改特种设备锅炉台账历史
      */
-    @PreAuthorize("@ss.hasPermi('his:gl:edit')")
+    @PreAuthorize("@ss.hasPermi('sems:specGl:edit')")
     @Log(title = "特种设备锅炉台账历史", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TSpechiGl tSpechiGl)
@@ -108,7 +108,7 @@ public class TSpechiGlController extends BaseController
     /**
      * 删除特种设备锅炉台账历史
      */
-    @PreAuthorize("@ss.hasPermi('his:gl:remove')")
+    @PreAuthorize("@ss.hasPermi('sems:specGl:remove')")
     @Log(title = "特种设备锅炉台账历史", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

master/src/main/java/com/ruoyi/project/sems/his/controller/TSpechiYlgdController.java

@@ -36,7 +36,7 @@ public class TSpechiYlgdController extends BaseController
     /**
      * 查询特种设备压力管道台账历史列表
      */
-    @PreAuthorize("@ss.hasPermi('his:ylgd:list')")
+    @PreAuthorize("@ss.hasPermi('sems:specYlgd:list')")
     @GetMapping("/list")
     public TableDataInfo list(TSpechiYlgd tSpechiYlgd)
     {
@@ -48,7 +48,7 @@ public class TSpechiYlgdController extends BaseController
     /**
      * 获取特种设备压力容器台账历史改造历史
      */
-    @PreAuthorize("@ss.hasPermi('his:ylgd:query')")
+    @PreAuthorize("@ss.hasPermi('sems:specYlgd:query')")
     @GetMapping(value = "/reform/{devId}")
     public AjaxResult getReform(@PathVariable("devId") Long devId)
     {
@@ -58,7 +58,7 @@ public class TSpechiYlgdController extends BaseController
     /**
      * 导出特种设备压力管道台账历史列表
      */
-    @PreAuthorize("@ss.hasPermi('his:ylgd:export')")
+    @PreAuthorize("@ss.hasPermi('sems:specYlgd:export')")
     @Log(title = "特种设备压力管道台账历史", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TSpechiYlgd tSpechiYlgd)
@@ -71,7 +71,7 @@ public class TSpechiYlgdController extends BaseController
     /**
      * 获取特种设备压力管道台账历史详细信息
      */
-    @PreAuthorize("@ss.hasPermi('his:ylgd:query')")
+    @PreAuthorize("@ss.hasPermi('sems:specYlgd:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -81,7 +81,7 @@ public class TSpechiYlgdController extends BaseController
     /**
      * 新增特种设备压力管道台账历史
      */
-    @PreAuthorize("@ss.hasPermi('his:ylgd:add')")
+    @PreAuthorize("@ss.hasPermi('sems:specYlgd:add')")
     @Log(title = "特种设备压力管道台账历史", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TSpechiYlgd tSpechiYlgd)
@@ -96,7 +96,7 @@ public class TSpechiYlgdController extends BaseController
     /**
      * 修改特种设备压力管道台账历史
      */
-    @PreAuthorize("@ss.hasPermi('his:ylgd:edit')")
+    @PreAuthorize("@ss.hasPermi('sems:specYlgd:add')")
     @Log(title = "特种设备压力管道台账历史", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TSpechiYlgd tSpechiYlgd)
@@ -107,7 +107,7 @@ public class TSpechiYlgdController extends BaseController
     /**
      * 删除特种设备压力管道台账历史
      */
-    @PreAuthorize("@ss.hasPermi('his:ylgd:remove')")
+    @PreAuthorize("@ss.hasPermi('sems:specYlgd:remove')")
     @Log(title = "特种设备压力管道台账历史", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

master/src/main/java/com/ruoyi/project/sems/his/controller/TSpechiYlrqController.java

@@ -36,7 +36,7 @@ public class TSpechiYlrqController extends BaseController
     /**
      * 查询特种设备压力容器台账历史列表
      */
-    @PreAuthorize("@ss.hasPermi('his:ylrq:list')")
+    @PreAuthorize("@ss.hasPermi('sems:specYlrq:list')")
     @GetMapping("/list")
     public TableDataInfo list(TSpechiYlrq tSpechiYlrq)
     {
@@ -48,7 +48,7 @@ public class TSpechiYlrqController extends BaseController
     /**
      * 导出特种设备压力容器台账历史列表
      */
-    @PreAuthorize("@ss.hasPermi('his:ylrq:export')")
+    @PreAuthorize("@ss.hasPermi('sems:specYlrq:export')")
     @Log(title = "特种设备压力容器台账历史", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TSpechiYlrq tSpechiYlrq)
@@ -61,7 +61,7 @@ public class TSpechiYlrqController extends BaseController
     /**
      * 获取特种设备压力容器台账历史详细信息
      */
-    @PreAuthorize("@ss.hasPermi('his:ylrq:query')")
+    @PreAuthorize("@ss.hasPermi('sems:specYlrq:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -71,7 +71,7 @@ public class TSpechiYlrqController extends BaseController
     /**
      * 获取特种设备压力容器台账历史改造历史
      */
-    @PreAuthorize("@ss.hasPermi('his:ylrq:query')")
+    @PreAuthorize("@ss.hasPermi('sems:specYlrq:query')")
     @GetMapping(value = "/reform/{devId}")
     public AjaxResult getReform(@PathVariable("devId") Long devId)
     {
@@ -82,7 +82,7 @@ public class TSpechiYlrqController extends BaseController
     /**
      * 新增特种设备压力容器台账历史
      */
-    @PreAuthorize("@ss.hasPermi('his:ylrq:add')")
+    @PreAuthorize("@ss.hasPermi('sems:specYlrq:add')")
     @Log(title = "特种设备压力容器台账历史", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TSpechiYlrq tSpechiYlrq)
@@ -97,7 +97,7 @@ public class TSpechiYlrqController extends BaseController
     /**
      * 修改特种设备压力容器台账历史
      */
-    @PreAuthorize("@ss.hasPermi('his:ylrq:edit')")
+    @PreAuthorize("@ss.hasPermi('sems:specYlrq:edit')")
     @Log(title = "特种设备压力容器台账历史", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TSpechiYlrq tSpechiYlrq)
@@ -108,7 +108,7 @@ public class TSpechiYlrqController extends BaseController
     /**
      * 删除特种设备压力容器台账历史
      */
-    @PreAuthorize("@ss.hasPermi('his:ylrq:remove')")
+    @PreAuthorize("@ss.hasPermi('sems:specYlrq:remove')")
     @Log(title = "特种设备压力容器台账历史", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

master/src/main/java/com/ruoyi/project/sems/mapper/TReportPatrolMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.sems.domain.TReportPatrol;
 
 /**
  * 月度检查巡检记录Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2021-09-01
  */
-public interface TReportPatrolMapper 
+public interface TReportPatrolMapper
 {
     /**
      * 查询月度检查巡检记录
-     * 
+     *
      * @param id 月度检查巡检记录ID
      * @return 月度检查巡检记录
      */
@@ -30,16 +30,15 @@ public interface TReportPatrolMapper
 
     /**
      * 查询月度检查巡检记录列表
-     * 
+     *
      * @param tReportPatrol 月度检查巡检记录
      * @return 月度检查巡检记录集合
      */
-    @DataScope(deptAlias = "d")
     public List<TReportPatrol> selectTReportPatrolList(TReportPatrol tReportPatrol);
 
     /**
      * 新增月度检查巡检记录
-     * 
+     *
      * @param tReportPatrol 月度检查巡检记录
      * @return 结果
      */
@@ -47,7 +46,7 @@ public interface TReportPatrolMapper
 
     /**
      * 修改月度检查巡检记录
-     * 
+     *
      * @param tReportPatrol 月度检查巡检记录
      * @return 结果
      */
@@ -55,7 +54,7 @@ public interface TReportPatrolMapper
 
     /**
      * 删除月度检查巡检记录
-     * 
+     *
      * @param id 月度检查巡检记录ID
      * @return 结果
      */
@@ -63,7 +62,7 @@ public interface TReportPatrolMapper
 
     /**
      * 批量删除月度检查巡检记录
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

master/src/main/resources/freeMaker/yearYlgdFMaker.ftl

@@ -1139,226 +1139,7 @@
 					</p>
 				</td>
 			</tr>
-			<tr style="height:17pt">
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:16.2pt">
-					<p style="margin:0pt; text-align:center; text-indent:0pt">
-						<span style="font-family:SimSun; font-size:11pt">21</span>
-					</p>
-				</td>
-				<td colspan="2" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:219.6pt">
-					<p style="font-size:11pt; line-height:200%; margin:0pt">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:51.3pt">
-					<p style="margin:0pt; text-align:center">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:98.1pt">
-					<p style="font-size:11pt; line-height:200%; margin:0pt">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-			</tr>
-			<tr style="height:17pt">
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:16.2pt">
-					<p style="margin:0pt; text-align:center; text-indent:0pt">
-						<span style="font-family:SimSun; font-size:11pt">22</span>
-					</p>
-				</td>
-				<td colspan="2" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:219.6pt">
-					<p style="font-size:11pt; line-height:200%; margin:0pt">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:51.3pt">
-					<p style="margin:0pt; text-align:center">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:98.1pt">
-					<p style="font-size:11pt; line-height:200%; margin:0pt">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-			</tr>
-			<tr style="height:17pt">
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:16.2pt">
-					<p style="margin:0pt; text-align:center; text-indent:0pt">
-						<span style="font-family:SimSun; font-size:11pt">23</span>
-					</p>
-				</td>
-				<td colspan="2" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:219.6pt">
-					<p style="font-size:11pt; line-height:200%; margin:0pt">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:51.3pt">
-					<p style="margin:0pt; text-align:center">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:98.1pt">
-					<p style="font-size:11pt; line-height:200%; margin:0pt">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-			</tr>
-			<tr style="height:17pt">
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:16.2pt">
-					<p style="margin:0pt; text-align:center; text-indent:0pt">
-						<span style="font-family:SimSun; font-size:11pt">24</span>
-					</p>
-				</td>
-				<td colspan="2" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:219.6pt">
-					<p style="font-size:11pt; line-height:200%; margin:0pt">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:51.3pt">
-					<p style="margin:0pt; text-align:center">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:98.1pt">
-					<p style="font-size:11pt; line-height:200%; margin:0pt">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-			</tr>
-			<tr style="height:17pt">
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:16.2pt">
-					<p style="margin:0pt; text-align:center; text-indent:0pt">
-						<span style="font-family:SimSun; font-size:11pt">25</span>
-					</p>
-				</td>
-				<td colspan="2" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:219.6pt">
-					<p style="font-size:11pt; line-height:200%; margin:0pt">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:51.3pt">
-					<p style="margin:0pt; text-align:center">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:98.1pt">
-					<p style="font-size:11pt; line-height:200%; margin:0pt">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-			</tr>
-			<tr style="height:17pt">
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:16.2pt">
-					<p style="margin:0pt; text-align:center; text-indent:0pt">
-						<span style="font-family:SimSun; font-size:11pt">26</span>
-					</p>
-				</td>
-				<td colspan="2" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:219.6pt">
-					<p style="font-size:11pt; line-height:200%; margin:0pt">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:51.3pt">
-					<p style="margin:0pt; text-align:center">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:98.1pt">
-					<p style="font-size:11pt; line-height:200%; margin:0pt">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-			</tr>
-			<tr style="height:17pt">
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:16.2pt">
-					<p style="margin:0pt; text-align:center; text-indent:0pt">
-						<span style="font-family:SimSun; font-size:11pt">27</span>
-					</p>
-				</td>
-				<td colspan="2" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:219.6pt">
-					<p style="font-size:11pt; line-height:200%; margin:0pt">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:51.3pt">
-					<p style="margin:0pt; text-align:center">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:98.1pt">
-					<p style="font-size:11pt; line-height:200%; margin:0pt">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-			</tr>
-			<tr style="height:17pt">
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:16.2pt">
-					<p style="margin:0pt; text-align:center; text-indent:0pt">
-						<span style="font-family:SimSun; font-size:11pt">28</span>
-					</p>
-				</td>
-				<td colspan="2" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:219.6pt">
-					<p style="font-size:11pt; line-height:200%; margin:0pt">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:51.3pt">
-					<p style="margin:0pt; text-align:center">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:98.1pt">
-					<p style="font-size:11pt; line-height:200%; margin:0pt">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-			</tr>
-			<tr style="height:17pt">
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:16.2pt">
-					<p style="margin:0pt; text-align:center; text-indent:0pt">
-						<span style="font-family:SimSun; font-size:11pt">29</span>
-					</p>
-				</td>
-				<td colspan="2" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:219.6pt">
-					<p style="font-size:11pt; line-height:200%; margin:0pt">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:51.3pt">
-					<p style="margin:0pt; text-align:center">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:98.1pt">
-					<p style="font-size:11pt; line-height:200%; margin:0pt">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-			</tr>
-			<tr style="height:17pt">
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:16.2pt">
-					<p style="margin:0pt; text-align:center; text-indent:0pt">
-						<span style="font-family:SimSun; font-size:11pt">30</span>
-					</p>
-				</td>
-				<td colspan="2" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:219.6pt">
-					<p style="font-size:11pt; line-height:200%; margin:0pt">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:51.3pt">
-					<p style="margin:0pt; text-align:center">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-				<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:98.1pt">
-					<p style="font-size:11pt; line-height:200%; margin:0pt">
-						<span style="font-family:SimSun; font-size:11pt">&#xa0;</span>
-					</p>
-				</td>
-			</tr>
+
 			<tr style="height:0pt">
 				<td style="width:27pt; border:none">
 				</td>

ui/src/api/sems/home.js

@@ -44,6 +44,54 @@ export function devYlrqDataByYear(data) {
   })
 }
 
+// 导出特种设备压力容器台账
+export function exportSpecYlrq(query) {
+  return request({
+    url: '/sems/home/exportYlrq',
+    method: 'get',
+    params: query
+  })
+}
+// 导出特种设备压力管道台账
+export function exportSpecYlgd(query) {
+  return request({
+    url: '/sems/home/exportYlgd',
+    method: 'get',
+    params: query
+  })
+}
+// 导出特种设备锅炉台账
+export function exportSpecGl(query) {
+  return request({
+    url: '/sems/home/exportGl',
+    method: 'get',
+    params: query
+  })
+}
+// 导出特种设备叉车台账
+export function exportSpecCc(query) {
+  return request({
+    url: '/sems/home/exportCc',
+    method: 'get',
+    params: query
+  })
+}
+// 导出特种设备电梯台账
+export function exportSpecDt(query) {
+  return request({
+    url: '/sems/home/exportDt',
+    method: 'get',
+    params: query
+  })
+}
+// 导出特种设备吊装设备台账
+export function exportSpecDzsb(query) {
+  return request({
+    url: '/sems/home/exportDzsb',
+    method: 'get',
+    params: query
+  })
+}
 // 查询压力管道
 export function devYlgdData(data) {
   return request({

ui/src/lang/en.js

@@ -1262,7 +1262,7 @@ export default {
   燃烧种类: 'Burn Kind',
   额度出力: 'Rated Power',
   本次内部年检日期: 'Date of this internal annual inspection',
-  内部检查结论: 'Internal inspection conclusion',
+  内部检验结论: 'Internal inspection conclusion',
   测厚部位CML:'Thickness Measuring Part CML',
   '腐蚀裕度(mm)':'Corrosion allowance(mm)',
   '原始壁厚(mm)':'Original Thickness(mm)',
@@ -1326,10 +1326,10 @@ export default {
   本次内部检验日期:'This Internal Inspection Date',
   内部检验报告编号:'Internal Inspection Report No.',
   下次内部检验日期:'Next Internal Inspection Date',
-  本次外部检测日期:'This Inspection Date',
+  本次外部检验日期:'This Inspection Date',
   外部检验结论:'External inspection conclusion',
   外部检验报告编号:'External Inspection Report No.',
-  下次外部检测日期:'Next External Inspection Date',
+  下次外部检验日期:'Next External Inspection Date',
   检查结论:'Inspection Conclusion',
   添加特种设备锅炉台账:'Add Special Equipment Boiler Account',
   修改特种设备锅炉台账:'Edit Special Equipment Boiler Account',
@@ -1344,7 +1344,7 @@ export default {
   特种设备起重机械台账:'Special Equipment Lifting Machinery Account',
   '是否确认导出所有特种设备起重机械台账数据项?':'Whether to export all special equipment Lifting machinery ledger data items?',
   '设备品种(名称)':'Equipment Variety (Name)',
-  '车架（地盘）编号':'Frame (Site) No.',
+  '车架（底盘）编号':'Frame (Site) No.',
   产品编号:'Product No.',
   生产厂家:'Manufacturer',
   检验日期报告编号:'Inspection Date Report No. ',

ui/src/lang/zh.js

@@ -1262,7 +1262,7 @@ export default {
   燃烧种类: '燃烧种类',
   额度出力: '额度出力',
   本次内部年检日期: '本次内部年检日期',
-  内部检查结论: '内部检查结论',
+  内部检验结论: '内部检验结论',
   测厚部位CML:'测厚部位CML',
   '腐蚀裕度(mm)':'腐蚀裕度(mm)',
   '原始壁厚(mm)':'原始壁厚(mm)',
@@ -1326,10 +1326,10 @@ export default {
   本次内部检验日期:'本次内部检验日期',
   内部检验报告编号:'内部检验报告编号',
   下次内部检验日期:'下次内部检验日期',
-  本次外部检测日期:'本次外部检测日期',
+  本次外部检验日期:'本次外部检验日期',
   外部检验结论:'外部检验结论',
   外部检验报告编号:'外部检验报告编号',
-  下次外部检测日期:'下次外部检测日期',
+  下次外部检验日期:'下次外部检验日期',
   检查结论:'检查结论',
   添加特种设备锅炉台账:'添加特种设备锅炉台账',
   修改特种设备锅炉台账:'修改特种设备锅炉台账',

ui/src/layout/components/Sidebar/Logo.vue

@@ -14,6 +14,7 @@
 </template>
 
 <script>
+// import logoImg from '@/assets/logo/logo1.png'
 import logoImg from '@/assets/logo/logo.png'
 
 export default {

ui/src/views/login.vue

@@ -153,8 +153,8 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/image/CPMS20210107.jpg");
-  /*background-image: url("@/assets/image/CPMS20210107.jpg");*/
+  //background-image: url("../assets/image/CPMS20210107.jpg");
+  background-image: url("../assets/image/login-background.jpg");
   background-size: cover;
 }
 .title {

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

@@ -100,7 +100,7 @@
               border>
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column :label="$t('装置名称')" align="center" prop="plantCode" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('审核状态')" align="center" prop="approveStatus" :formatter="approveStatusFormat"
+      <el-table-column :label="$t('申请状态')" align="center" prop="approveStatus" :formatter="approveStatusFormat"
                        :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('检查年月')" align="center" prop="checkMonth" width="100">
 

ui/src/views/sems/month/monthapprove.vue

@@ -8,7 +8,7 @@
           border
           style="width: 100%">
           <el-table-column :label="$t('装置名称')" align="center" prop="plantCode" :show-overflow-tooltip="true"/>
-          <el-table-column :label="$t('审核状态')" align="center" prop="approveStatus" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('申请状态')" align="center" prop="approveStatus" :show-overflow-tooltip="true"/>
           <el-table-column :label="$t('检查年月')" align="center" prop="checkMonth" width="100">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.checkMonth, '{y}-{m}') }}</span>

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

@@ -82,7 +82,7 @@
       <el-table-column :label="$t('设备品种(名称)')" align="center" prop="devname" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('动力形式')" align="center" prop="engineType" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('型号')" align="center" prop="model" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('车架（地盘）编号')" align="center" prop="frameNo" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('车架（底盘）编号')" align="center" prop="frameNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('产品编号')" align="center" prop="productNo" :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="exUnit" :show-overflow-tooltip="true"/>
@@ -220,8 +220,8 @@
         </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item :label="$t('车架（地盘）编号')" prop="frameNo">
-          <el-input v-model="form.frameNo" :placeholder="$t('请输入')+ $t('车架（地盘）编号')" />
+        <el-form-item :label="$t('车架（底盘）编号')" prop="frameNo">
+          <el-input v-model="form.frameNo" :placeholder="$t('请输入')+ $t('车架（底盘）编号')" />
         </el-form-item>
           </el-col>
         </el-row>

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

@@ -128,7 +128,7 @@
       <el-table-column :label="$t('设备品种(名称)')" align="center" prop="devname" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('动力形式')" align="center" prop="engineType" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('型号')" align="center" prop="model" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('车架（地盘）编号')" align="center" prop="frameNo" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('车架（底盘）编号')" align="center" prop="frameNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('产品编号')" align="center" prop="productNo" :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="exUnit" :show-overflow-tooltip="true"/>
@@ -274,8 +274,8 @@
         </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item :label="$t('车架（地盘）编号')" prop="frameNo">
-          <el-input v-model="form.frameNo" :placeholder="$t('请输入')+ $t('车架（地盘）编号')" />
+        <el-form-item :label="$t('车架（底盘）编号')" prop="frameNo">
+          <el-input v-model="form.frameNo" :placeholder="$t('请输入')+ $t('车架（底盘）编号')" />
         </el-form-item>
           </el-col>
         </el-row>
@@ -778,16 +778,45 @@
           return
         }
       }
-      this.$confirm(this.$t('是否确认删除?'), this.$t('警告'), {
-          confirmButtonText: this.$t('确定'),
-          cancelButtonText: this.$t('取消'),
-          type: "warning"
-        }).then(function() {
-          return delSpecCc(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess(this.$t('删除成功'));
-        })
+      for (let i = 0; i < rows.length; i++) {
+        if (i == 0){
+          this.modifyForm.devId = rows[i].id
+        }else {
+          this.modifyForm.devId += ',' + rows[i].id
+        }
+      }
+      this.open = false;
+      this.getList();
+      this.modifyForm.hisId = 2
+      this.modifyForm.devType = this.devType
+      this.modifyForm.approveType = 2
+      this.modifyVisible = true
+      this.modifyTitle =this.$t('设备删除申请')
+      this.queryParams.postCode = 'wxjl'
+      listPostUser(this.queryParams).then(response => {
+        this.wxjlList = response;
+      });
+      // var rows = this.dataListSelections.map(item => {
+      //   return item
+      // })
+      // for (let i = 0; i <rows.length ; i++) {
+      //   if (rows[i].approveStatus != 0) {
+      //     this.$alert(this.$t('当前设备正在申请中，无法修改'), this.$t('提示'), {
+      //       type: 'warning'
+      //     })
+      //     return
+      //   }
+      // }
+      // this.$confirm(this.$t('是否确认删除?'), this.$t('警告'), {
+      //     confirmButtonText: this.$t('确定'),
+      //     cancelButtonText: this.$t('取消'),
+      //     type: "warning"
+      //   }).then(function() {
+      //     return delSpecCc(ids);
+      //   }).then(() => {
+      //     this.getList();
+      //     this.msgSuccess(this.$t('删除成功'));
+      //   })
     },
     /** 导出按钮操作 */
     handleExport() {

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

@@ -15,7 +15,7 @@
       <el-table-column :label="$t('设备品种(名称)')" align="center" prop="devname" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('动力形式')" align="center" prop="engineType" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('型号')" align="center" prop="model" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('车架（地盘）编号')" align="center" prop="frameNo" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('车架（底盘）编号')" align="center" prop="frameNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('产品编号')" align="center" prop="productNo" :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="exUnit" :show-overflow-tooltip="true"/>

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

@@ -127,7 +127,7 @@
       <el-table-column :label="$t('设备品种(名称)')" align="center" prop="devname" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('动力形式')" align="center" prop="engineType" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('型号')" align="center" prop="model" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('车架（地盘）编号')" align="center" prop="frameNo" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('车架（底盘）编号')" align="center" prop="frameNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('产品编号')" align="center" prop="productNo" :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="exUnit" :show-overflow-tooltip="true"/>
@@ -272,8 +272,8 @@
         </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item :label="$t('车架（地盘）编号')" prop="frameNo">
-          <el-input v-model="form.frameNo" :placeholder="$t('请输入')+ $t('车架（地盘）编号')" />
+        <el-form-item :label="$t('车架（底盘）编号')" prop="frameNo">
+          <el-input v-model="form.frameNo" :placeholder="$t('请输入')+ $t('车架（底盘）编号')" />
         </el-form-item>
           </el-col>
         </el-row>

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

@@ -82,7 +82,7 @@
       <el-table-column :label="$t('设备品种(名称)')" align="center" prop="devname" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('动力形式')" align="center" prop="engineType" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('型号')" align="center" prop="model" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('车架（地盘）编号')" align="center" prop="frameNo" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('车架（底盘）编号')" align="center" prop="frameNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('产品编号')" align="center" prop="productNo" :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="exUnit" :show-overflow-tooltip="true"/>
@@ -221,8 +221,8 @@
         </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item :label="$t('车架（地盘）编号')" prop="frameNo">
-          <el-input v-model="form.frameNo" :placeholder="$t('请输入')+ $t('车架（地盘）编号')" />
+        <el-form-item :label="$t('车架（底盘）编号')" prop="frameNo">
+          <el-input v-model="form.frameNo" :placeholder="$t('请输入')+ $t('车架（底盘）编号')" />
         </el-form-item>
           </el-col>
         </el-row>

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

@@ -687,16 +687,45 @@
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$confirm(this.$t('是否确认删除?'), this.$t('警告'), {
-        confirmButtonText: this.$t('确定'),
-        cancelButtonText: this.$t('取消'),
-        type: "warning"
-      }).then(function() {
-        return delSpecDt(ids);
-      }).then(() => {
-        this.getList();
-        this.msgSuccess(this.$t('删除成功'));
-        })
+      var rows = this.dataListSelections.map(item => {
+        return item
+      })
+      for (let i = 0; i <rows.length ; i++) {
+        if (rows[i].approveStatus != 0) {
+          this.$alert(this.$t('当前设备正在申请中，无法修改'), this.$t('提示'), {
+            type: 'warning'
+          })
+          return
+        }
+      }
+      for (let i = 0; i < rows.length; i++) {
+        if (i == 0){
+          this.modifyForm.devId = rows[i].id
+        }else {
+          this.modifyForm.devId += ',' + rows[i].id
+        }
+      }
+      this.open = false;
+      this.getList();
+      this.modifyForm.hisId = 2
+      this.modifyForm.devType = this.devType
+      this.modifyForm.approveType = 2
+      this.modifyVisible = true
+      this.modifyTitle =this.$t('设备删除申请')
+      this.queryParams.postCode = 'wxjl'
+      listPostUser(this.queryParams).then(response => {
+        this.wxjlList = response;
+      });
+      // this.$confirm(this.$t('是否确认删除?'), this.$t('警告'), {
+      //   confirmButtonText: this.$t('确定'),
+      //   cancelButtonText: this.$t('取消'),
+      //   type: "warning"
+      // }).then(function() {
+      //   return delSpecDt(ids);
+      // }).then(() => {
+      //   this.getList();
+      //   this.msgSuccess(this.$t('删除成功'));
+      //   })
     },
     /** 导出按钮操作 */
     handleExport() {

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

@@ -870,16 +870,45 @@
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$confirm(this.$t('是否确认删除?'), this.$t('警告'), {
-          confirmButtonText: this.$t('确定'),
-          cancelButtonText: this.$t('取消'),
-          type: "warning"
-        }).then(function() {
-          return delSpecDzsb(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess(this.$t('删除成功'));
-        })
+      var rows = this.dataListSelections.map(item => {
+        return item
+      })
+      for (let i = 0; i <rows.length ; i++) {
+        if (rows[i].approveStatus != 0) {
+          this.$alert(this.$t('当前设备正在申请中，无法修改'), this.$t('提示'), {
+            type: 'warning'
+          })
+          return
+        }
+      }
+      for (let i = 0; i < rows.length; i++) {
+        if (i == 0){
+          this.modifyForm.devId = rows[i].id
+        }else {
+          this.modifyForm.devId += ',' + rows[i].id
+        }
+      }
+      this.open = false;
+      this.getList();
+      this.modifyForm.hisId = 2
+      this.modifyForm.devType = this.devType
+      this.modifyForm.approveType = 2
+      this.modifyVisible = true
+      this.modifyTitle =this.$t('设备删除申请')
+      this.queryParams.postCode = 'wxjl'
+      listPostUser(this.queryParams).then(response => {
+        this.wxjlList = response;
+      });
+      // this.$confirm(this.$t('是否确认删除?'), this.$t('警告'), {
+      //     confirmButtonText: this.$t('确定'),
+      //     cancelButtonText: this.$t('取消'),
+      //     type: "warning"
+      //   }).then(function() {
+      //     return delSpecDzsb(ids);
+      //   }).then(() => {
+      //     this.getList();
+      //     this.msgSuccess(this.$t('删除成功'));
+      //   })
     },
     /** 导出按钮操作 */
     handleExport() {

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

@@ -119,14 +119,14 @@
           <span>{{ parseTime(scope.row.warnDate, '{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="checkConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('内部检验报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('下次内部检验日期')" align="center" prop="nextWarnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('本次外部检测日期')" align="center" prop="outWarnDate" width="100">
+      <el-table-column :label="$t('本次外部检验日期')" align="center" prop="outWarnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.outWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -134,7 +134,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">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.outNextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -336,8 +336,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-        <el-form-item :label="$t('内部检查结论')" prop="checkConclusion">
-          <el-input v-model="form.checkConclusion" :placeholder="$t('请输入')+ $t('内部检查结论')" />
+        <el-form-item :label="$t('内部检验结论')" prop="checkConclusion">
+          <el-input v-model="form.checkConclusion" :placeholder="$t('请输入')+ $t('内部检验结论')" />
         </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -348,22 +348,22 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-        <el-form-item :label="$t('本次外部检测日期')" prop="outWarnDate">
+        <el-form-item :label="$t('本次外部检验日期')" prop="outWarnDate">
           <el-date-picker clearable size="small" style="width: 200px"
             v-model="form.outWarnDate"
             type="date"
             value-format="yyyy-MM-dd"
-                          :placeholder="$t('请选择')+ $t('本次外部检测日期')">
+                          :placeholder="$t('请选择')+ $t('本次外部检验日期')">
           </el-date-picker>
         </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item :label="$t('下次外部检测日期')" prop="outNextWarnDate">
+        <el-form-item :label="$t('下次外部检验日期')" prop="outNextWarnDate">
           <el-date-picker clearable size="small" style="width: 200px"
             v-model="form.outNextWarnDate"
             type="date"
             value-format="yyyy-MM-dd"
-            :placeholder="$t('请选择')+ $t('下次外部检测日期')">
+            :placeholder="$t('请选择')+ $t('下次外部检验日期')">
           </el-date-picker>
         </el-form-item>
           </el-col>

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

@@ -157,14 +157,14 @@
           <span>{{ parseTime(scope.row.warnDate, '{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="checkConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('内部检验报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
       <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>
       </el-table-column>
-      <el-table-column :label="$t('本次外部检测日期')" align="center" prop="outWarnDate" width="100">
+      <el-table-column :label="$t('本次外部检验日期')" align="center" prop="outWarnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.outWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -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" sortable="custom">
+      <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>
@@ -382,8 +382,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-        <el-form-item :label="$t('内部检查结论')" prop="checkConclusion">
-          <el-input v-model="form.checkConclusion" :placeholder="$t('请输入')+ $t('内部检查结论')" />
+        <el-form-item :label="$t('内部检验结论')" prop="checkConclusion">
+          <el-input v-model="form.checkConclusion" :placeholder="$t('请输入')+ $t('内部检验结论')" />
         </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -394,22 +394,22 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-        <el-form-item :label="$t('本次外部检测日期')" prop="outWarnDate">
+        <el-form-item :label="$t('本次外部检验日期')" prop="outWarnDate">
           <el-date-picker clearable size="small" style="width: 200px"
             v-model="form.outWarnDate"
             type="date"
             value-format="yyyy-MM-dd"
-                          :placeholder="$t('请选择')+ $t('本次外部检测日期')">
+                          :placeholder="$t('请选择')+ $t('本次外部检验日期')">
           </el-date-picker>
         </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item :label="$t('下次外部检测日期')" prop="outNextWarnDate">
+        <el-form-item :label="$t('下次外部检验日期')" prop="outNextWarnDate">
           <el-date-picker clearable size="small" style="width: 200px"
             v-model="form.outNextWarnDate"
             type="date"
             value-format="yyyy-MM-dd"
-            :placeholder="$t('请选择')+ $t('下次外部检测日期')">
+            :placeholder="$t('请选择')+ $t('下次外部检验日期')">
           </el-date-picker>
         </el-form-item>
           </el-col>
@@ -850,16 +850,45 @@
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$confirm(this.$t('是否确认删除?'), this.$t('警告'), {
-          confirmButtonText: this.$t('确定'),
-          cancelButtonText: this.$t('取消'),
-          type: "warning"
-        }).then(function() {
-          return delSpecGl(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess(this.$t('删除成功'));
-        })
+      var rows = this.dataListSelections.map(item => {
+        return item
+      })
+      for (let i = 0; i <rows.length ; i++) {
+        if (rows[i].approveStatus != 0) {
+          this.$alert(this.$t('当前设备正在申请中，无法修改'), this.$t('提示'), {
+            type: 'warning'
+          })
+          return
+        }
+      }
+      for (let i = 0; i < rows.length; i++) {
+        if (i == 0){
+          this.modifyForm.devId = rows[i].id
+        }else {
+          this.modifyForm.devId += ',' + rows[i].id
+        }
+      }
+      this.open = false;
+      this.getList();
+      this.modifyForm.hisId = 2
+      this.modifyForm.devType = this.devType
+      this.modifyForm.approveType = 2
+      this.modifyVisible = true
+      this.modifyTitle =this.$t('设备删除申请')
+      this.queryParams.postCode = 'wxjl'
+      listPostUser(this.queryParams).then(response => {
+        this.wxjlList = response;
+      });
+      // this.$confirm(this.$t('是否确认删除?'), this.$t('警告'), {
+      //     confirmButtonText: this.$t('确定'),
+      //     cancelButtonText: this.$t('取消'),
+      //     type: "warning"
+      //   }).then(function() {
+      //     return delSpecGl(ids);
+      //   }).then(() => {
+      //     this.getList();
+      //     this.msgSuccess(this.$t('删除成功'));
+      //   })
     },
     /** 导出按钮操作 */
     handleExport() {

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

@@ -34,14 +34,14 @@
           <span>{{ parseTime(scope.row.warnDate, '{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="checkConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('内部检验报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('下次内部检验日期')" align="center" prop="nextWarnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('本次外部检测日期')" align="center" prop="outWarnDate" width="100">
+      <el-table-column :label="$t('本次外部检验日期')" align="center" prop="outWarnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.outWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -49,7 +49,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">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.outNextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>

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

@@ -156,14 +156,14 @@
           <span>{{ parseTime(scope.row.warnDate, '{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="checkConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('内部检验报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('下次内部检验日期')" align="center" prop="nextWarnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('本次外部检测日期')" align="center" prop="outWarnDate" width="100">
+      <el-table-column :label="$t('本次外部检验日期')" align="center" prop="outWarnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.outWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -171,7 +171,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">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.outNextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -379,8 +379,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-        <el-form-item :label="$t('内部检查结论')" prop="checkConclusion">
-          <el-input v-model="form.checkConclusion" :placeholder="$t('请输入')+ $t('内部检查结论')" />
+        <el-form-item :label="$t('内部检验结论')" prop="checkConclusion">
+          <el-input v-model="form.checkConclusion" :placeholder="$t('请输入')+ $t('内部检验结论')" />
         </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -391,22 +391,22 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-        <el-form-item :label="$t('本次外部检测日期')" prop="outWarnDate">
+        <el-form-item :label="$t('本次外部检验日期')" prop="outWarnDate">
           <el-date-picker clearable size="small" style="width: 200px"
             v-model="form.outWarnDate"
             type="date"
             value-format="yyyy-MM-dd"
-                          :placeholder="$t('请选择')+ $t('本次外部检测日期')">
+                          :placeholder="$t('请选择')+ $t('本次外部检验日期')">
           </el-date-picker>
         </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item :label="$t('下次外部检测日期')" prop="outNextWarnDate">
+        <el-form-item :label="$t('下次外部检验日期')" prop="outNextWarnDate">
           <el-date-picker clearable size="small" style="width: 200px"
             v-model="form.outNextWarnDate"
             type="date"
             value-format="yyyy-MM-dd"
-            :placeholder="$t('请选择')+ $t('下次外部检测日期')">
+            :placeholder="$t('请选择')+ $t('下次外部检验日期')">
           </el-date-picker>
         </el-form-item>
           </el-col>

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

@@ -119,14 +119,14 @@
           <span>{{ parseTime(scope.row.warnDate, '{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="checkConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('内部检验报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('下次内部检验日期')" align="center" prop="nextWarnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('本次外部检测日期')" align="center" prop="outWarnDate" width="100">
+      <el-table-column :label="$t('本次外部检验日期')" align="center" prop="outWarnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.outWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -134,7 +134,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">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.outNextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -336,8 +336,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-        <el-form-item :label="$t('内部检查结论')" prop="checkConclusion">
-          <el-input v-model="form.checkConclusion" :placeholder="$t('请输入')+ $t('内部检查结论')" />
+        <el-form-item :label="$t('内部检验结论')" prop="checkConclusion">
+          <el-input v-model="form.checkConclusion" :placeholder="$t('请输入')+ $t('内部检验结论')" />
         </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -348,12 +348,12 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-        <el-form-item :label="$t('本次外部检测日期')" prop="outWarnDate">
+        <el-form-item :label="$t('本次外部检验日期')" prop="outWarnDate">
           <el-date-picker clearable size="small" style="width: 200px"
             v-model="form.outWarnDate"
             type="date"
             value-format="yyyy-MM-dd"
-                          :placeholder="$t('请选择')+ $t('本次外部检测日期')">
+                          :placeholder="$t('请选择')+ $t('本次外部检验日期')">
           </el-date-picker>
         </el-form-item>
           </el-col>

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

@@ -1000,16 +1000,45 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$confirm(this.$t('是否确认删除?'), this.$t('警告'), {
-          confirmButtonText: this.$t('确定'),
-          cancelButtonText: this.$t('取消'),
-          type: "warning"
-        }).then(function() {
-          return delSpecYlgd(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess(this.$t('删除成功'));
-        })
+      var rows = this.dataListSelections.map(item => {
+        return item
+      })
+      for (let i = 0; i <rows.length ; i++) {
+        if (rows[i].approveStatus != 0) {
+          this.$alert(this.$t('当前设备正在申请中，无法修改'), this.$t('提示'), {
+            type: 'warning'
+          })
+          return
+        }
+      }
+      for (let i = 0; i < rows.length; i++) {
+        if (i == 0){
+          this.modifyForm.devId = rows[i].id
+        }else {
+          this.modifyForm.devId += ',' + rows[i].id
+        }
+      }
+      this.open = false;
+      this.getList();
+      this.modifyForm.hisId = 2
+      this.modifyForm.devType = this.devType
+      this.modifyForm.approveType = 2
+      this.modifyVisible = true
+      this.modifyTitle =this.$t('设备删除申请')
+      this.queryParams.postCode = 'wxjl'
+      listPostUser(this.queryParams).then(response => {
+        this.wxjlList = response;
+      });
+      // this.$confirm(this.$t('是否确认删除?'), this.$t('警告'), {
+      //     confirmButtonText: this.$t('确定'),
+      //     cancelButtonText: this.$t('取消'),
+      //     type: "warning"
+      //   }).then(function() {
+      //     return delSpecYlgd(ids);
+      //   }).then(() => {
+      //     this.getList();
+      //     this.msgSuccess(this.$t('删除成功'));
+      //   })
     },
     /** 导出按钮操作 */
     handleExport() {

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

@@ -17,13 +17,13 @@
       <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('投用日期(mm/year)')" align="center" prop="submitdate" width="100">
+      <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">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.submitdate, '{y}-{m}-{d}') }}</span>
         </template>

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

@@ -93,13 +93,13 @@
       <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('投用日期(mm/year)')" align="center" prop="submitdate" width="100">
+      <el-table-column :label="$t('材料')" align="center" prop="material" :show-overflow-tooltip="true" :render-header="renderHeader"/>
+      <el-table-column :label="$t('介质')" align="center" prop="medium" :show-overflow-tooltip="true" :render-header="renderHeader"/>
+      <el-table-column :label="$t('设计压力MPa')" align="center" prop="desPressure" :show-overflow-tooltip="true" :render-header="renderHeader"/>
+      <el-table-column :label="$t('操作压力MPa')" align="center" prop="optPressure" :show-overflow-tooltip="true" :render-header="renderHeader"/>
+      <el-table-column :label="$t('设计温度℃')" align="center" prop="desTemp" :show-overflow-tooltip="true" :render-header="renderHeader"/>
+      <el-table-column :label="$t('操作温度℃')" align="center" prop="optTemp" :show-overflow-tooltip="true" :render-header="renderHeader"/>
+      <el-table-column :label="$t('投用日期')" align="center" prop="submitdate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.submitdate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -256,43 +256,43 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-        <el-form-item :label="$t('材料(管/壳)')" prop="material">
+        <el-form-item :label="$t('材料')" prop="material">
           <el-input v-model="form.material" :placeholder="$t('请输入')+ $t('材料')" />
         </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item :label="$t('介质(管/壳)')" prop="medium">
+        <el-form-item :label="$t('介质')" prop="medium">
           <el-input v-model="form.medium" :placeholder="$t('请输入')+ $t('介质')" />
         </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-        <el-form-item :label="$t('设计压力MPa(管/壳)')" prop="desPressure">
+        <el-form-item :label="$t('设计压力MPa')" prop="desPressure">
           <el-input v-model="form.desPressure" :placeholder="$t('请输入')+ $t('设计压力')" />
         </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item :label="$t('设计压力MPa(管/壳)')" prop="optPressure">
+        <el-form-item :label="$t('设计压力MPa')" prop="optPressure">
           <el-input v-model="form.optPressure" :placeholder="$t('请输入')+ $t('操作压力')" />
         </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-        <el-form-item :label="$t('设计温度℃(管/壳)')" prop="desTemp">
+        <el-form-item :label="$t('设计温度℃')" prop="desTemp">
           <el-input v-model="form.desTemp" :placeholder="$t('请输入')+ $t('设计温度')" />
         </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item :label="$t('操作温度℃(管/壳)')" prop="optTemp">
+        <el-form-item :label="$t('操作温度℃')" prop="optTemp">
           <el-input v-model="form.optTemp" :placeholder="$t('请输入')+ $t('操作温度')" />
         </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-        <el-form-item :label="$t('投用日期(mm/year)')" prop="submitdate">
+        <el-form-item :label="$t('投用日期')" prop="submitdate">
           <el-date-picker clearable size="small" style="width: 200px"
             v-model="form.submitdate"
             type="date"
@@ -943,7 +943,32 @@ export default {
             this.modifyVisible = false
             this.getList();
           });
-    }
+    },
+    //结论备注
+    renderHeader(h, {column, $index}) {
+      return [
+        column.label,
+        h(
+          "el-tooltip",
+          {
+            props: {
+              content: (function () {
+                return `如果是多腔压力容器，应分别填写各压力腔的信息和参数，说明填写的信息和参数是哪一个压力腔的信息和参数，并用“/”分隔。`
+              })(),
+              placement: "top"
+            }
+          },
+          [
+            h("span", {
+              class: {
+                "el-icon-question": true,
+                "report-headerTips": true
+              }
+            })
+          ]
+        )
+      ]
+    },
   }
 };
 </script>

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

@@ -61,8 +61,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['sems:specYlrq:add']"
-        >{{ $t('新增') }}
-        </el-button>
+        >{{ $t('新增') }}</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -72,8 +71,7 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['sems:specYlrq:edit']"
-        >{{ $t('修改') }}
-        </el-button>
+        >{{ $t('修改') }}</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -83,8 +81,7 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['sems:specYlrq:remove']"
-        >{{ $t('删除') }}
-        </el-button>
+        >{{ $t('删除') }}</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -92,19 +89,17 @@
           size="mini"
           :disabled="multiple"
           @click="addAprrove('',devType)"
-        >{{ $t('提交申请') }}
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          icon="el-icon-upload2"
-          size="mini"
-          @click="handleImport"
-          v-hasPermi="['sems:specYlrq:edit']"
-        >{{ $t('导入') }}
-        </el-button>
+        >{{ $t('提交申请') }}</el-button>
       </el-col>
+        <el-col :span="1.5">
+            <el-button
+                    type="info"
+                    icon="el-icon-upload2"
+                    size="mini"
+                    @click="handleImport"
+                    v-hasPermi="['sems:specYlrq:edit']"
+            >{{ $t('导入') }}</el-button>
+        </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -112,8 +107,7 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['sems:specYlrq:export']"
-        >{{ $t('导出') }}
-        </el-button>
+        >{{ $t('导出') }}</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -122,29 +116,24 @@
           size="mini"
           @click="inspectionInformation = true"
           v-hasPermi="['sems:specYlrq:add']"
-        >{{ $t('检验更新') }}
-        </el-button>
+        >{{ $t('检验更新') }}</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" ref="deviceTable" :data="specYlrqList" @selection-change="handleSelectionChange"
-              :height="clientHeight"
+    <el-table v-loading="loading" ref="deviceTable" :data="specYlrqList" @selection-change="handleSelectionChange" :height="clientHeight"
               :cell-style="tableCellStyle" border @sort-change="sortList">
-      <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">
-        <!--        <template slot-scope="scope" >
-                  <a :class="tableRowClassName(scope.row)"></a>
-                </template>-->
+      <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">
+<!--        <template slot-scope="scope" >
+          <a :class="tableRowClassName(scope.row)"></a>
+        </template>-->
       </el-table-column>
 
       <el-table-column :label="$t('设备名称')" align="center" prop="devname" width="200" :show-overflow-tooltip="true"/>
@@ -175,7 +164,7 @@
         </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" sortable="custom">
+      <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>
@@ -194,41 +183,36 @@
         </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="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" fixed="right" width="140"
-                       class-name="small-padding fixed-width">
+      <el-table-column :label="$t('操作')" align="center" fixed="right" width="140" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             type="text"
             size="mini"
             @click="addAprrove(scope.row,devType)"
-          >{{ $t('提交申请') }}
-          </el-button>
+          >{{ $t('提交申请') }}</el-button>
           <el-button
             v-if="scope.row.approveTime != null"
             type="text"
             size="small"
             @click="hisApprove(scope.row,devType)">
-            {{ $t('申请记录') }}
-          </el-button>
+            {{ $t('申请记录') }}</el-button>
           <br>
           <el-button
             style="margin-left: 0px"
             type="text"
             size="mini"
             @click="checkList(scope.row,devType)"
-          >{{ $t('检验记录') }}
-          </el-button>
+          >{{ $t('检验记录') }}</el-button>
           <el-button
             v-if="scope.row.hiFlag!= 0"
             type="text"
             size="mini"
             @click="hisReform(scope.row)"
-          >{{ $t('改造记录') }}
-          </el-button>
+          >{{ $t('改造记录') }}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -246,54 +230,52 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="160px">
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('装置')" prop="plantCode">
-              <el-select v-model="form.plantCode" :placeholder="$t('请选择')+ $t('装置')" filterable clearable size="small"
-                         v-bind:disabled="dataForm==1">
-                <el-option
-                  v-for="dict in plantOptions"
-                  :key="dict.name"
-                  :label="dict.name"
-                  :value="dict.name"
-                />
-              </el-select>
-            </el-form-item>
+        <el-form-item :label="$t('装置')" prop="plantCode">
+          <el-select v-model="form.plantCode" :placeholder="$t('请选择')+ $t('装置')" filterable clearable size="small" v-bind:disabled="dataForm==1">
+            <el-option
+              v-for="dict in plantOptions"
+              :key="dict.name"
+              :label="dict.name"
+              :value="dict.name"
+            />
+          </el-select>
+        </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('单元')" prop="unit">
-              <el-input v-model="form.unit" :placeholder="$t('请输入')+ $t('单元')"/>
-            </el-form-item>
+        <el-form-item :label="$t('单元')" prop="unit">
+          <el-input v-model="form.unit" :placeholder="$t('请输入')+ $t('单元')" />
+        </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('装置维修组')" prop="plantMaint">
-              <el-select v-model="form.plantMaint" :placeholder="$t('请选择')+ $t('装置维修组')" filterable clearable
-                         size="small">
-                <el-option
-                  v-for="dict in plantMaintOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictValue"
-                  :value="dict.dictValue"
-                />
-              </el-select>
-            </el-form-item>
+        <el-form-item :label="$t('装置维修组')" prop="plantMaint">
+          <el-select v-model="form.plantMaint" :placeholder="$t('请选择')+ $t('装置维修组')" filterable clearable size="small">
+            <el-option
+              v-for="dict in plantMaintOptions"
+              :key="dict.dictValue"
+              :label="dict.dictValue"
+              :value="dict.dictValue"
+            />
+          </el-select>
+        </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('装置维修工程师')" prop="engineer">
-              <el-input v-model="form.engineer" :placeholder="$t('请输入')+ $t('装置维修工程师')"/>
-            </el-form-item>
+        <el-form-item :label="$t('装置维修工程师')" prop="engineer">
+          <el-input v-model="form.engineer" :placeholder="$t('请输入')+ $t('装置维修工程师')" />
+        </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('设备名称')" prop="devname">
-              <el-input v-model="form.devname" :placeholder="$t('请输入')+ $t('设备名称')"/>
-            </el-form-item>
+        <el-form-item :label="$t('设备名称')" prop="devname">
+          <el-input v-model="form.devname" :placeholder="$t('请输入')+ $t('设备名称')" />
+        </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('位号')" prop="devno">
-              <el-input v-model="form.devno" :placeholder="$t('请输入')+ $t('位号')"/>
-            </el-form-item>
+        <el-form-item :label="$t('位号')" prop="devno">
+          <el-input v-model="form.devno" :placeholder="$t('请输入')+ $t('位号')" />
+        </el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -334,153 +316,153 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('材料(管/壳)')" prop="material">
-              <el-input v-model="form.material" :placeholder="$t('请输入')+ $t('材料')"/>
-            </el-form-item>
+        <el-form-item :label="$t('材料')" prop="material">
+          <el-input v-model="form.material" :placeholder="$t('请输入')+ $t('材料')" />
+        </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('介质(管/壳)')" prop="medium">
-              <el-input v-model="form.medium" :placeholder="$t('请输入')+ $t('介质')"/>
-            </el-form-item>
+        <el-form-item :label="$t('介质')" prop="medium">
+          <el-input v-model="form.medium" :placeholder="$t('请输入')+ $t('介质')" />
+        </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('设计压力MPa(管/壳)')" prop="desPressure">
-              <el-input v-model="form.desPressure" :placeholder="$t('请输入')+ $t('设计压力')"/>
-            </el-form-item>
+        <el-form-item :label="$t('设计压力MPa')" prop="desPressure">
+          <el-input v-model="form.desPressure" :placeholder="$t('请输入')+ $t('设计压力')" />
+        </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('设计压力MPa(管/壳)')" prop="optPressure">
-              <el-input v-model="form.optPressure" :placeholder="$t('请输入')+ $t('操作压力')"/>
-            </el-form-item>
+        <el-form-item :label="$t('设计压力MPa')" prop="optPressure">
+          <el-input v-model="form.optPressure" :placeholder="$t('请输入')+ $t('操作压力')" />
+        </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('设计温度℃(管/壳)')" prop="desTemp">
-              <el-input v-model="form.desTemp" :placeholder="$t('请输入')+ $t('设计温度')"/>
-            </el-form-item>
+        <el-form-item :label="$t('设计温度℃')" prop="desTemp">
+          <el-input v-model="form.desTemp" :placeholder="$t('请输入')+ $t('设计温度')" />
+        </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('操作温度℃(管/壳)')" prop="optTemp">
-              <el-input v-model="form.optTemp" :placeholder="$t('请输入')+ $t('操作温度')"/>
-            </el-form-item>
+        <el-form-item :label="$t('操作温度℃')" prop="optTemp">
+          <el-input v-model="form.optTemp" :placeholder="$t('请输入')+ $t('操作温度')" />
+        </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('投用日期(mm/year)')" prop="submitdate">
-              <el-date-picker clearable size="small" style="width: 200px"
-                              v-model="form.submitdate"
-                              type="date"
-                              value-format="yyyy-MM-dd"
-                              :placeholder="$t('请选择')+ $t('提交日期')">
-              </el-date-picker>
-            </el-form-item>
+        <el-form-item :label="$t('投用日期')" prop="submitdate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.submitdate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            :placeholder="$t('请选择')+ $t('提交日期')">
+          </el-date-picker>
+        </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('是否涉危化品')" prop="isDanger">
-              <el-input v-model="form.isDanger" :placeholder="$t('请输入')+ $t('涉危化品')"/>
-            </el-form-item>
+        <el-form-item :label="$t('是否涉危化品')" prop="isDanger">
+          <el-input v-model="form.isDanger" :placeholder="$t('请输入')+ $t('涉危化品')" />
+        </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('设计使用年限')" prop="desYear">
-              <el-input v-model="form.desYear" :placeholder="$t('请输入')+ $t('设计使用年限')"/>
-            </el-form-item>
+        <el-form-item :label="$t('设计使用年限')" prop="desYear">
+          <el-input v-model="form.desYear" :placeholder="$t('请输入')+ $t('设计使用年限')" />
+        </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('是否超过使用寿命')" prop="isOverlife">
-              <el-input v-model="form.isOverlife" :placeholder="$t('请输入')+ $t('超过使用寿命')"/>
-            </el-form-item>
+        <el-form-item :label="$t('是否超过使用寿命')" prop="isOverlife">
+          <el-input v-model="form.isOverlife" :placeholder="$t('请输入')+ $t('超过使用寿命')" />
+        </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('检验单位')" prop="checkUnit">
-              <el-input v-model="form.checkUnit" :placeholder="$t('请输入')+ $t('检验单位')"/>
-            </el-form-item>
+        <el-form-item :label="$t('检验单位')" prop="checkUnit">
+          <el-input v-model="form.checkUnit" :placeholder="$t('请输入')+ $t('检验单位')" />
+        </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('定期检验日期')" prop="warnDate">
-              <el-date-picker clearable size="small" style="width: 200px"
-                              v-model="form.warnDate"
-                              type="date"
-                              value-format="yyyy-MM-dd"
-                              :placeholder="$t('请选择')+ $t('定期检验日期')">
-              </el-date-picker>
-            </el-form-item>
+        <el-form-item :label="$t('定期检验日期')" prop="warnDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.warnDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            :placeholder="$t('请选择')+ $t('定期检验日期')">
+          </el-date-picker>
+        </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('下次定期检验日期')" prop="nextWarnDate">
-              <el-date-picker clearable size="small" style="width: 200px"
-                              v-model="form.nextWarnDate"
-                              type="date"
-                              value-format="yyyy-MM-dd"
-                              :placeholder="$t('请选择')+ $t('下次定期检验日期')">
-              </el-date-picker>
-            </el-form-item>
+        <el-form-item :label="$t('下次定期检验日期')" prop="nextWarnDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.nextWarnDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            :placeholder="$t('请选择')+ $t('下次定期检验日期')">
+          </el-date-picker>
+        </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('定期检验报告编号')" prop="reportNo">
-              <el-input v-model="form.reportNo" :placeholder="$t('请输入')+ $t('报告编号')"/>
-            </el-form-item>
+        <el-form-item :label="$t('定期检验报告编号')" prop="reportNo">
+          <el-input v-model="form.reportNo" :placeholder="$t('请输入')+ $t('报告编号')" />
+        </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('安全状况等级')" prop="safeClass">
-              <el-input v-model="form.safeClass" :placeholder="$t('请输入')+ $t('安全状况等级')"/>
-            </el-form-item>
+        <el-form-item :label="$t('安全状况等级')" prop="safeClass">
+          <el-input v-model="form.safeClass" :placeholder="$t('请输入')+ $t('安全状况等级')" />
+        </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('年度检查日期')" prop="yearWarnDate">
-              <el-date-picker clearable size="small" style="width: 200px"
-                              v-model="form.yearWarnDate"
-                              type="date"
-                              value-format="yyyy-MM-dd"
-                              :placeholder="$t('请选择')+ $t('年度检查日期')">
-              </el-date-picker>
-            </el-form-item>
+        <el-form-item :label="$t('年度检查日期')" prop="yearWarnDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.yearWarnDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          :placeholder="$t('请选择')+ $t('年度检查日期')">
+          </el-date-picker>
+        </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('年度检查结论')" prop="checkConclusion">
-              <el-input v-model="form.checkConclusion" :placeholder="$t('请输入')+ $t('年度检查结论')"/>
-            </el-form-item>
+        <el-form-item :label="$t('年度检查结论')" prop="checkConclusion">
+          <el-input v-model="form.checkConclusion" :placeholder="$t('请输入')+ $t('年度检查结论')" />
+        </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('下次年度检查日期')" prop="yearNextWarnDate">
-              <el-date-picker clearable size="small" style="width: 200px"
-                              v-model="form.yearNextWarnDate"
-                              type="date"
-                              value-format="yyyy-MM-dd"
-                              :placeholder="$t('请选择')+ $t('下次年度检查日期')">
-              </el-date-picker>
-            </el-form-item>
+        <el-form-item :label="$t('下次年度检查日期')" prop="yearNextWarnDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.yearNextWarnDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          :placeholder="$t('请选择')+ $t('下次年度检查日期')">
+          </el-date-picker>
+        </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('年度检查报告编号')" prop="yearReportNo">
-              <el-input v-model="form.yearReportNo" :placeholder="$t('请输入')+ $t('年度检查报告编号')"/>
-            </el-form-item>
+        <el-form-item :label="$t('年度检查报告编号')" prop="yearReportNo">
+          <el-input v-model="form.yearReportNo" :placeholder="$t('请输入')+ $t('年度检查报告编号')" />
+        </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('备注')" prop="remarks">
-              <el-input v-model="form.remarks" type="textarea" :placeholder="$t('请输入')+ $t('内容')"/>
-            </el-form-item>
+          <el-form-item :label="$t('备注')" prop="remarks">
+            <el-input v-model="form.remarks" type="textarea" :placeholder="$t('请输入')+ $t('内容')" />
+          </el-form-item>
           </el-col>
-          <!--          <el-col :span="12">
-                    <el-form-item :label="$t('归属部门')" prop="deptId">
-                        <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :placeholder="$t('请选择')+ $t('归属部门')" />
-                    </el-form-item>
-                    </el-col>-->
+<!--          <el-col :span="12">
+          <el-form-item :label="$t('归属部门')" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :placeholder="$t('请选择')+ $t('归属部门')" />
+          </el-form-item>
+          </el-col>-->
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -552,12 +534,12 @@
           :action="uploadUrl(2)"
           multiple>
           <i class="el-icon-upload"></i>
-          <div class="el-upload__text">{{ $t('文件') }}<em>{{ $t('点击上传') }}</em></div>
-          <div class="el-upload__tip" slot="tip">{{ $t('仅支持excel格式') }}</div>
+          <div class="el-upload__text">{{$t('文件')}}<em>{{$t('点击上传')}}</em></div>
+          <div class="el-upload__tip" slot="tip">{{$t('仅支持excel格式')}}</div>
         </el-upload>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="inspectionInformation = false">{{ $t('返回') }}</el-button>
+        <el-button @click="inspectionInformation = false">{{$t('返回')}}</el-button>
       </div>
     </el-dialog>
     <el-dialog v-dialogDrag :title="modifyTitle" :visible.sync="modifyVisible" width="550px" append-to-body>
@@ -578,29 +560,29 @@
     <add-approve v-if="addAprroveVisible" ref="addApprove" @refreshDataList="getList"></add-approve>
     <his-approve v-if="hisAprroveVisible" ref="hisApprove" @refreshDataList="getList"></his-approve>
     <his-check v-if="hisCheckVisible" ref="hisCheck" @refreshDataList="getList"></his-check>
-    <HisReform v-if="hisReformVisible" ref="hisReformList"></HisReform>
+    <HisReform v-if="hisReformVisible" ref="hisReformList" ></HisReform>
   </div>
 </template>
 
 <script>
-import {addSpecYlrq, exportSpecYlrq, getSpecYlrq, listSpecYlrq, updateSpecYlrqPre,} from "@/api/sems/specYlrq";
-import {treeselect} from "@/api/system/dept";
-import {getToken} from "@/utils/auth";
-import {listPostUser} from "@/api/system/user";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import AddApprove from "../approve/tapprove-add"
-import {mylistPlant} from "@/api/system/plant";
-import HisApprove from "../approve/tapprove-his"
-import HisCheck from "../check/check"
-import {addModify} from "@/api/sems/his/modify";
-import HisReform from "./specYlrq-hisReform";
-import {listSpecGl} from "@/api/sems/specGl";
+  import {addSpecYlrq, exportSpecYlrq, getSpecYlrq, listSpecYlrq, updateSpecYlrqPre,} from "@/api/sems/specYlrq";
+  import {treeselect} from "@/api/system/dept";
+  import {getToken} from "@/utils/auth";
+  import {listPostUser} from "@/api/system/user";
+  import Treeselect from "@riophae/vue-treeselect";
+  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+  import AddApprove from "../approve/tapprove-add"
+  import {mylistPlant} from "@/api/system/plant";
+  import HisApprove from "../approve/tapprove-his"
+  import HisCheck from "../check/check"
+  import {addModify} from "@/api/sems/his/modify";
+  import HisReform from "./specYlrq-hisReform";
+  import {listSpecGl} from "@/api/sems/specGl";
 
 
-export default {
+  export default {
   name: "SpecYlrq",
-  components: {Treeselect, AddApprove, HisApprove, HisCheck, HisReform},
+  components: { Treeselect,AddApprove ,HisApprove,HisCheck ,HisReform},
   data() {
     return {
       waitSubmit: false,
@@ -636,7 +618,7 @@ export default {
       title: "",
       // 部门树选项
       deptOptions: undefined,
-      clientHeight: 300,
+      clientHeight:300,
       // 是否显示弹出层
       open: false,
       // 状态字典
@@ -646,29 +628,29 @@ export default {
       plantOptions: [],
       plantMaintOptions: [],
       wxjlList: [],
-      // 用户导入参数
-      upload: {
-        downloadAction: process.env.VUE_APP_BASE_API + '/common/template',
-        // 是否显示弹出层(用户导入)
-        open: false,
-        type: "specYlrq",
-        // 弹出层标题(用户导入)
-        title: "",
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 0,
-        // 设置上传的请求头部
-        headers: {Authorization: "Bearer " + getToken()},
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/sems/specYlrq/importData"
-      },
+        // 用户导入参数
+        upload: {
+            downloadAction: process.env.VUE_APP_BASE_API + '/common/template',
+            // 是否显示弹出层(用户导入)
+            open: false,
+            type: "specYlrq",
+            // 弹出层标题(用户导入)
+            title: "",
+            // 是否禁用上传
+            isUploading: false,
+            // 是否更新已经存在的用户数据
+            updateSupport: 0,
+            // 设置上传的请求头部
+            headers: { Authorization: "Bearer " + getToken() },
+            // 上传的地址
+            url: process.env.VUE_APP_BASE_API + "/sems/specYlrq/importData"
+        },
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 20,
-        orderByColumn: "id",
-        isAsc: "desc",
+        orderByColumn:"id",
+        isAsc:"desc",
         plantCode: null,
         unit: null,
         devname: null,
@@ -683,22 +665,22 @@ export default {
       // 表单校验
       rules: {
         plantCode: [
-          {required: true, message: this.$t('装置名称') + this.$t('不能为空'), trigger: "blur"}
+          { required: true, message: this.$t('装置名称')+this.$t('不能为空'), trigger: "blur" }
         ],
       }
     };
   },
   watch: {
-    // 根据名称筛选部门树
-    deptName(val) {
-      this.$refs.tree.filter(val);
-    }
-  },
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val);
+        }
+   },
   created() {
-    //设置表格高度对应屏幕高度
-    this.$nextTick(() => {
-      this.clientHeight = document.body.clientHeight - 250
-    })
+      //设置表格高度对应屏幕高度
+      this.$nextTick(() => {
+          this.clientHeight = document.body.clientHeight -250
+      })
     this.getList();
     this.getTreeselect();
     this.getDicts("spec_dev_status").then(response => {
@@ -730,12 +712,12 @@ export default {
         this.loading = false;
       });
     },
-    /** 查询部门下拉树结构 */
-    getTreeselect() {
-      treeselect().then(response => {
-        this.deptOptions = response.data;
-      });
-    },
+     /** 查询部门下拉树结构 */
+     getTreeselect() {
+          treeselect().then(response => {
+              this.deptOptions = response.data;
+          });
+     },
     // 状态字典翻译
     statusFormat(row, column) {
       return this.selectDictLabel(this.statusOptions, row.status);
@@ -805,7 +787,7 @@ export default {
         hisId: null
       }
       this.resetForm("form");
-      this.dataForm = 0;
+      this.dataForm=0;
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -820,7 +802,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
+      this.single = selection.length!==1
       this.multiple = !selection.length
       this.dataListSelections = selection
     },
@@ -837,7 +819,7 @@ export default {
       var rows = this.dataListSelections.map(item => {
         return item
       })
-      for (let i = 0; i < rows.length; i++) {
+      for (let i = 0; i <rows.length ; i++) {
         if (rows[i].approveStatus != 0) {
           this.$alert(this.$t('当前设备正在申请中，无法修改'), this.$t('提示'), {
             type: 'warning'
@@ -892,7 +874,7 @@ export default {
       var rows = this.dataListSelections.map(item => {
         return item
       })
-      for (let i = 0; i < rows.length; i++) {
+      for (let i = 0; i <rows.length ; i++) {
         if (rows[i].approveStatus != 0) {
           this.$alert(this.$t('当前设备正在申请中，无法修改'), this.$t('提示'), {
             type: 'warning'
@@ -901,9 +883,9 @@ export default {
         }
       }
       for (let i = 0; i < rows.length; i++) {
-        if (i == 0) {
+        if (i == 0){
           this.modifyForm.devId = rows[i].id
-        } else {
+        }else {
           this.modifyForm.devId += ',' + rows[i].id
         }
       }
@@ -913,7 +895,7 @@ export default {
       this.modifyForm.devType = this.devType
       this.modifyForm.approveType = 2
       this.modifyVisible = true
-      this.modifyTitle = this.$t('设备删除申请')
+      this.modifyTitle =this.$t('设备删除申请')
       this.queryParams.postCode = 'wxjl'
       listPostUser(this.queryParams).then(response => {
         this.wxjlList = response;
@@ -983,7 +965,7 @@ export default {
       var rows = row ? [row] : this.dataListSelections.map(item => {
         return item
       })
-      for (let i = 0; i < rows.length; i++) {
+      for (let i = 0; i <rows.length ; i++) {
         if (rows[i].approveStatus != 0) {
           this.$alert(this.$t('当前设备正在申请中，无法重复申请'), this.$t('提示'), {
             type: 'warning'
@@ -998,19 +980,19 @@ export default {
         this.$refs.addApprove.init(rows, type)
       })
     },
-    hisApprove(row, type) {
+    hisApprove (row, type) {
       this.hisAprroveVisible = true
       this.$nextTick(() => {
         this.$refs.hisApprove.init(row, type)
       })
     },
-    checkList(row, type) {
+    checkList (row, type) {
       this.hisCheckVisible = true
       this.$nextTick(() => {
         this.$refs.hisCheck.init(row, type)
       })
     },
-    hisReform(row) {
+    hisReform (row){
       this.hisReformVisible = true
       this.$nextTick(() => {
         this.$refs.hisReformList.init(row);
@@ -1018,29 +1000,29 @@ export default {
     },
 
     //导出excel
-    downloadDev(type) {
+    downloadDev(type){
       var rows = this.dataListSelections.map(item => {
         return item.id
       })
       this.ids = rows
-      if (type == 1) {
+      if (type == 1){
         this.downloadType = 1
-      } else if (type == 2) {
+      }else if (type == 2){
         this.downloadType = 2
       }
       this.$nextTick(() => {
         this.$refs['downloadDevForm'].submit()
       })
     },
-    uploadUrl(uploadType) {
+    uploadUrl (uploadType) {
       return process.env.VUE_APP_BASE_API + "/sems/specYlrq/updateData"
     },
-    submitModofyForm() {
-      addModify(this.modifyForm).then(response => {
-        this.msgSuccess(this.$t('提交成功'));
-        this.modifyVisible = false
-        this.getList();
-      });
+    submitModofyForm () {
+          addModify(this.modifyForm).then(response => {
+            this.msgSuccess(this.$t('提交成功'));
+            this.modifyVisible = false
+            this.getList();
+          });
     },
     /*tableRowClassName(row){
       if (row.devno != 0){
@@ -1049,28 +1031,29 @@ export default {
       return '';
     }*/
     //位号颜色变换
-    tableCellStyle({row, column, rowIndex, columnIndex}) {
-      if (columnIndex == 7 && row.isRepeat == 1) {
+    tableCellStyle({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex == 7 && row.isRepeat == 1){
         return "color:rgba(255, 26, 26, 0.98);"
       }
-      if (columnIndex == 28 && row.warnFlag == 1) {
+      if (columnIndex == 28 && row.warnFlag == 1){
         return "background-color:rgba(255, 255,153, 0.5);"
       }
-      if (columnIndex == 28 && row.warnFlag == 2) {
+      if (columnIndex == 28 && row.warnFlag == 2){
         return "background-color:rgba(255, 180, 68, 0.5);"
       }
-      if (columnIndex == 28 && row.warnFlag == 3) {
+      if (columnIndex == 28 && row.warnFlag == 3){
         return "background-color:rgba(255, 68,68, 0.5);"
       }
     },
 //element表格排序
-    sortList(val) {
+    sortList(val){
       var sort = "asc";
       let sortTip = val.order
 
-      if (sortTip === 'descending') {
+      if(sortTip === 'descending'){
         sort = 'desc' // 降序
-      } else if (sortTip === 'ascending') {
+      }
+      else if(sortTip === 'ascending'){
         sort = 'asc' // 升序
       }
       this.queryParams.isAsc = sort;
@@ -1085,7 +1068,32 @@ export default {
         });
         this.loading = false;
       });
-    }
+    },
+    //结论备注
+    renderHeader(h, {column, $index}) {
+      return [
+        column.label,
+        h(
+          "el-tooltip",
+          {
+            props: {
+              content: (function () {
+                  return `如果是多腔压力容器，应分别填写各压力腔的信息和参数，说明填写的信息和参数是哪一个压力腔的信息和参数，并用“/”分隔。`
+              })(),
+              placement: "top"
+            }
+          },
+          [
+            h("span", {
+              class: {
+                "el-icon-question": true,
+                "report-headerTips": true
+              }
+            })
+          ]
+        )
+      ]
+    },
   }
 };
 </script>

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

@@ -16,13 +16,13 @@
       <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('投用日期(mm/year)')" align="center" prop="submitdate" width="100">
+      <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">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.submitdate, '{y}-{m}-{d}') }}</span>
         </template>

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

@@ -138,13 +138,13 @@
       <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('投用日期(mm/year)')" align="center" prop="submitdate" width="100">
+      <el-table-column :label="$t('材料')" align="center" prop="material" :show-overflow-tooltip="true" :render-header="renderHeader"/>
+      <el-table-column :label="$t('介质')" align="center" prop="medium" :show-overflow-tooltip="true" :render-header="renderHeader"/>
+      <el-table-column :label="$t('设计压力MPa')" align="center" prop="desPressure" :show-overflow-tooltip="true" :render-header="renderHeader"/>
+      <el-table-column :label="$t('操作压力MPa')" align="center" prop="optPressure" :show-overflow-tooltip="true" :render-header="renderHeader"/>
+      <el-table-column :label="$t('设计温度℃')" align="center" prop="desTemp" :show-overflow-tooltip="true" :render-header="renderHeader"/>
+      <el-table-column :label="$t('操作温度℃')" align="center" prop="optTemp" :show-overflow-tooltip="true" :render-header="renderHeader"/>
+      <el-table-column :label="$t('投用日期')" align="center" prop="submitdate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.submitdate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -309,43 +309,43 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-        <el-form-item :label="$t('材料(管/壳)')" prop="material">
+        <el-form-item :label="$t('材料')" prop="material">
           <el-input v-model="form.material" :placeholder="$t('请输入')+ $t('材料')" />
         </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item :label="$t('介质(管/壳)')" prop="medium">
+        <el-form-item :label="$t('介质')" prop="medium">
           <el-input v-model="form.medium" :placeholder="$t('请输入')+ $t('介质')" />
         </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-        <el-form-item :label="$t('设计压力MPa(管/壳)')" prop="desPressure">
+        <el-form-item :label="$t('设计压力MPa')" prop="desPressure">
           <el-input v-model="form.desPressure" :placeholder="$t('请输入')+ $t('设计压力')" />
         </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item :label="$t('设计压力MPa(管/壳)')" prop="optPressure">
+        <el-form-item :label="$t('设计压力MPa')" prop="optPressure">
           <el-input v-model="form.optPressure" :placeholder="$t('请输入')+ $t('操作压力')" />
         </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-        <el-form-item :label="$t('设计温度℃(管/壳)')" prop="desTemp">
+        <el-form-item :label="$t('设计温度℃')" prop="desTemp">
           <el-input v-model="form.desTemp" :placeholder="$t('请输入')+ $t('设计温度')" />
         </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item :label="$t('操作温度℃(管/壳)')" prop="optTemp">
+        <el-form-item :label="$t('操作温度℃')" prop="optTemp">
           <el-input v-model="form.optTemp" :placeholder="$t('请输入')+ $t('操作温度')" />
         </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-        <el-form-item :label="$t('投用日期(mm/year)')" prop="submitdate">
+        <el-form-item :label="$t('投用日期')" prop="submitdate">
           <el-date-picker clearable size="small" style="width: 200px"
             v-model="form.submitdate"
             type="date"
@@ -996,7 +996,32 @@ export default {
             this.modifyVisible = false
             this.getList();
           });
-    }
+    },
+    //结论备注
+    renderHeader(h, {column, $index}) {
+      return [
+        column.label,
+        h(
+          "el-tooltip",
+          {
+            props: {
+              content: (function () {
+                return `如果是多腔压力容器，应分别填写各压力腔的信息和参数，说明填写的信息和参数是哪一个压力腔的信息和参数，并用“/”分隔。`
+              })(),
+              placement: "top"
+            }
+          },
+          [
+            h("span", {
+              class: {
+                "el-icon-question": true,
+                "report-headerTips": true
+              }
+            })
+          ]
+        )
+      ]
+    },
   }
 };
 </script>

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

@@ -94,13 +94,13 @@
       <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('投用日期(mm/year)')" align="center" prop="submitdate" width="100">
+      <el-table-column :label="$t('材料')" align="center" prop="material" :show-overflow-tooltip="true" :render-header="renderHeader"/>
+      <el-table-column :label="$t('介质')" align="center" prop="medium" :show-overflow-tooltip="true" :render-header="renderHeader" />
+      <el-table-column :label="$t('设计压力MPa')" align="center" prop="desPressure" :show-overflow-tooltip="true" :render-header="renderHeader"/>
+      <el-table-column :label="$t('操作压力MPa')" align="center" prop="optPressure" :show-overflow-tooltip="true" :render-header="renderHeader"/>
+      <el-table-column :label="$t('设计温度℃')" align="center" prop="desTemp" :show-overflow-tooltip="true" :render-header="renderHeader"/>
+      <el-table-column :label="$t('操作温度℃')" align="center" prop="optTemp" :show-overflow-tooltip="true" :render-header="renderHeader"/>
+      <el-table-column :label="$t('投用日期')" align="center" prop="submitdate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.submitdate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -257,43 +257,43 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-        <el-form-item :label="$t('材料(管/壳)')" prop="material">
+        <el-form-item :label="$t('材料')" prop="material">
           <el-input v-model="form.material" :placeholder="$t('请输入')+ $t('材料')" />
         </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item :label="$t('介质(管/壳)')" prop="medium">
+        <el-form-item :label="$t('介质')" prop="medium">
           <el-input v-model="form.medium" :placeholder="$t('请输入')+ $t('介质')" />
         </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-        <el-form-item :label="$t('设计压力MPa(管/壳)')" prop="desPressure">
+        <el-form-item :label="$t('设计压力MPa')" prop="desPressure">
           <el-input v-model="form.desPressure" :placeholder="$t('请输入')+ $t('设计压力')" />
         </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item :label="$t('设计压力MPa(管/壳)')" prop="optPressure">
+        <el-form-item :label="$t('设计压力MPa')" prop="optPressure">
           <el-input v-model="form.optPressure" :placeholder="$t('请输入')+ $t('操作压力')" />
         </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-        <el-form-item :label="$t('设计温度℃(管/壳)')" prop="desTemp">
+        <el-form-item :label="$t('设计温度℃')" prop="desTemp">
           <el-input v-model="form.desTemp" :placeholder="$t('请输入')+ $t('设计温度')" />
         </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item :label="$t('操作温度℃(管/壳)')" prop="optTemp">
+        <el-form-item :label="$t('操作温度℃')" prop="optTemp">
           <el-input v-model="form.optTemp" :placeholder="$t('请输入')+ $t('操作温度')" />
         </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-        <el-form-item :label="$t('投用日期(mm/year)')" prop="submitdate">
+        <el-form-item :label="$t('投用日期')" prop="submitdate">
           <el-date-picker clearable size="small" style="width: 200px"
             v-model="form.submitdate"
             type="date"
@@ -944,7 +944,32 @@ export default {
             this.modifyVisible = false
             this.getList();
           });
-    }
+    },
+    //结论备注
+    renderHeader(h, {column, $index}) {
+      return [
+        column.label,
+        h(
+          "el-tooltip",
+          {
+            props: {
+              content: (function () {
+                return `如果是多腔压力容器，应分别填写各压力腔的信息和参数，说明填写的信息和参数是哪一个压力腔的信息和参数，并用“/”分隔。`
+              })(),
+              placement: "top"
+            }
+          },
+          [
+            h("span", {
+              class: {
+                "el-icon-question": true,
+                "report-headerTips": true
+              }
+            })
+          ]
+        )
+      ]
+    },
   }
 };
 </script>

ui/src/views/sems/specanalysis/BoilerChart.vue

@@ -2,6 +2,12 @@
   <div class="app-container-Boiler">
     <div id="BoilerChart" :style="{height:height,width:width}"></div>
     <el-dialog :title="title" :visible.sync="open" width="1600px" >
+      <el-button
+        type="warning"
+        icon="el-icon-download"
+        size="mini"
+        @click="handleExport"
+      >{{ $t('导出') }}</el-button>
       <el-table  ref="deviceTable" :data="specGlList"
                  border >
         <el-table-column :label="$t('装置')" align="center" fixed="left"  prop="plantCode" :show-overflow-tooltip="true"/>
@@ -68,7 +74,7 @@
 </template>
 
 <script>
-import {devGlData, devGlDataByYear} from "@/api/sems/home";
+import {devGlData, devGlDataByYear,exportSpecGl} from "@/api/sems/home";
 
 export default {
   props: {
@@ -243,6 +249,19 @@ export default {
         this.loading = false;
       });
     },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm(this.$t('是否确认导出所有特种设备锅炉台账数据项?'), this.$t('警告'), {
+        confirmButtonText: this.$t('确定'),
+        cancelButtonText: this.$t('取消'),
+        type: "warning"
+      }).then(function() {
+        return exportSpecGl(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
+    },
   }
 }
 </script>

ui/src/views/sems/specanalysis/LiftChart.vue

@@ -2,6 +2,12 @@
   <div class="app-container-Lift">
     <div id="LiftChart" :style="{height:height,width:width}"></div>
     <el-dialog :title="title" :visible.sync="openDt" width="1600px" >
+      <el-button
+        type="warning"
+        icon="el-icon-download"
+        size="mini"
+        @click="handleExportDt"
+      >{{ $t('导出') }}</el-button>
       <el-table  ref="deviceTable" :data="specDtList"
                  border >
         <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
@@ -44,6 +50,12 @@
       />
     </el-dialog>
     <el-dialog :title="title" :visible.sync="openCc" width="1600px" >
+      <el-button
+        type="warning"
+        icon="el-icon-download"
+        size="mini"
+        @click="handleExportCc"
+      >{{ $t('导出') }}</el-button>
       <el-table  ref="deviceTable" :data="specCcList"
                  border >
         <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
@@ -58,7 +70,7 @@
         <el-table-column :label="$t('设备品种(名称)')" align="center" prop="devname" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('动力形式')" align="center" prop="engineType" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('型号')" align="center" prop="model" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('车架（地盘）编号')" align="center" prop="frameNo" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('车架（底盘）编号')" align="center" prop="frameNo" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('产品编号')" align="center" prop="productNo" :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="exUnit" :show-overflow-tooltip="true"/>
@@ -93,6 +105,12 @@
       />
     </el-dialog>
     <el-dialog :title="title" :visible.sync="openDzsb" width="1600px" >
+      <el-button
+        type="warning"
+        icon="el-icon-download"
+        size="mini"
+        @click="handleExportDzsb"
+      >{{ $t('导出') }}</el-button>
       <el-table  ref="deviceTable" :data="specDzsbList"
                  border >
         <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
@@ -116,7 +134,6 @@
         <el-table-column :label="$t('是否防爆')" align="center" prop="isEx" :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="checkStrategy" :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>
@@ -143,7 +160,8 @@
 </template>
 
 <script>
-import {devOtherData, devDtDataByYear,devDzsbDataByYear,devCcDataByYear} from "@/api/sems/home";
+import {devOtherData, devDtDataByYear,devDzsbDataByYear,devCcDataByYear,exportSpecCc,exportSpecDt,exportSpecDzsb} from "@/api/sems/home";
+
 
 export default {
   props: {
@@ -350,6 +368,45 @@ export default {
         this.loading = false;
       });
     },
+    /** 导出按钮操作 */
+    handleExportCc() {
+      const queryParams = this.queryParams;
+      this.$confirm(this.$t('是否确认导出所有特种设备叉车台账数据项?'), this.$t('警告'), {
+        confirmButtonText: this.$t('确定'),
+        cancelButtonText: this.$t('取消'),
+        type: "warning"
+      }).then(function() {
+        return exportSpecCc(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
+    },
+    /** 导出按钮操作 */
+    handleExportDt() {
+      const queryParams = this.queryParams;
+      this.$confirm(this.$t('是否确认导出所有特种设备电梯台账数据项?'), this.$t('警告'), {
+        confirmButtonText: this.$t('确定'),
+        cancelButtonText: this.$t('取消'),
+        type: "warning"
+      }).then(function() {
+        return exportSpecDt(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
+    },
+    /** 导出按钮操作 */
+    handleExportDzsb() {
+      const queryParams = this.queryParams;
+      this.$confirm(this.$t('是否确认导出所有特种设备起重机械台账数据项?'), this.$t('警告'), {
+        confirmButtonText: this.$t('确定'),
+        cancelButtonText: this.$t('取消'),
+        type: "warning"
+      }).then(function() {
+        return exportSpecDzsb(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
+    },
   }
 }
 </script>

ui/src/views/sems/specanalysis/PpChart.vue

@@ -2,6 +2,12 @@
   <div class="app-container-Pp">
     <div id="PpChart" :style="{height:height,width:width}"></div>
     <el-dialog :title="title" :visible.sync="open" width="1600px" >
+      <el-button
+        type="warning"
+        icon="el-icon-download"
+        size="mini"
+        @click="handleExport"
+      >{{ $t('导出') }}</el-button>
       <el-table  ref="deviceTable" :data="specYlgdList"
                  border >
         <el-table-column :label="$t('装置名称')" align="center" fixed="left"  prop="plantCode" :show-overflow-tooltip="true"/>
@@ -82,7 +88,7 @@
 </template>
 
 <script>
-import {devYlgdData, devYlgdDataByYear} from "@/api/sems/home";
+import {devYlgdData, devYlgdDataByYear,exportSpecYlgd} from "@/api/sems/home";
 
 export default {
   props: {
@@ -222,6 +228,19 @@ export default {
         this.loading = false;
       });
     },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm(this.$t('是否确认导出所有特种设备压力管道台账数据项?'), this.$t('警告'), {
+        confirmButtonText: this.$t('确定'),
+        cancelButtonText: this.$t('取消'),
+        type: "warning"
+      }).then(function() {
+        return exportSpecYlgd(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
+    },
   }
 }
 </script>

ui/src/views/sems/specanalysis/PvChart.vue

@@ -4,6 +4,12 @@
     <div id="PvChart" :style="{height:height,width:width}"></div>
   </div>
     <el-dialog :title="title" :visible.sync="open" width="1600px" >
+      <el-button
+        type="warning"
+        icon="el-icon-download"
+        size="mini"
+        @click="handleExport"
+      >{{ $t('导出') }}</el-button>
       <el-table  ref="deviceTable" :data="specYlrqList"
                  border >
         <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
@@ -19,13 +25,13 @@
         <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('投用日期(mm/year)')" align="center" prop="submitdate" width="100">
+        <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">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.submitdate, '{y}-{m}-{d}') }}</span>
           </template>
@@ -75,8 +81,7 @@
 </template>
 
 <script>
-import {devData , devYlrqData,devYlrqDataByYear} from "@/api/sems/home";
-import {listSpecYlrq} from "@/api/sems/specYlrq";
+import {exportSpecYlrq , devYlrqData,devYlrqDataByYear} from "@/api/sems/home";
 export default {
   props: {
     width: {
@@ -227,6 +232,19 @@ export default {
         this.loading = false;
       });
     },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm(this.$t('是否确认导出?'),  this.$t('警告'), {
+        confirmButtonText: this.$t('确定'),
+        cancelButtonText: this.$t('取消'),
+        type: "warning"
+      }).then(function() {
+        return exportSpecYlrq(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
+    },
   }
 }
 </script>

ui/src/views/system/notice/index.vue

@@ -10,10 +10,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('操作人员')" prop="createBy">
+      <el-form-item :label="$t('创建人')" prop="createBy">
         <el-input
           v-model="queryParams.createBy"
-          :placeholder="$t('请输入') + $t('操作人员')"
+          :placeholder="$t('请输入') + $t('创建人')"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"

ui/src/views/tool/build/index.vue

@@ -157,6 +157,7 @@ import {
 import { makeUpJs } from '@/utils/generator/js'
 import { makeUpCss } from '@/utils/generator/css'
 import drawingDefalut from '@/utils/generator/drawingDefalut'
+// import logo from '@/assets/logo/logo1.png'
 import logo from '@/assets/logo/logo.png'
 import CodeTypeDialog from './CodeTypeDialog'
 import DraggableItem from './DraggableItem'