李扬

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

@@ -124,10 +124,19 @@ public class SpecHomeController extends BaseController
                     String[] arr = gdList.get(i).getLength().split("\n");
                     logger.info(JSON.toJSONString(arr));
                     for (int j = 0; j < arr.length; j++) {
-                        gdLength += Double.parseDouble(arr[j]);
+                        try {
+                            gdLength += Double.parseDouble(arr[j]);
+                        }catch (NumberFormatException e) {
+                            logger.error(JSON.toJSONString(e));
+                            continue;
+                        }
                     }
                 }else {
-                    gdLength = Double.parseDouble(gdList.get(i).getLength());
+                    try {
+                        gdLength = Double.parseDouble(gdList.get(i).getLength());
+                    }catch (NumberFormatException e) {
+                        logger.error(JSON.toJSONString(e));
+                    }
                 }
             }
             allLength += gdLength;

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

@@ -196,7 +196,7 @@ public class TMeasureRecordController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMeasureRecord entity = new TMeasureRecord();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

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

@@ -171,7 +171,7 @@ public class TReportYlgdController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TReportYlgd entity = new TReportYlgd();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

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

@@ -131,7 +131,7 @@ public class TReportYlrqController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TReportYlrq entity = new TReportYlrq();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

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

@@ -159,7 +159,7 @@ public class TSpecdevCcController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TSpecdevCc entity = new TSpecdevCc();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
@@ -223,6 +223,8 @@ public class TSpecdevCcController extends BaseController
                     }else if (j == 23) {
                         entity.setAssetOwner(cellValue);//资产形式
                     } else if (j == 24) {
+                        entity.setPerTestConclusion(cellValue);
+                    }else if (j == 25) {
                         entity.setRemarks(cellValue);//备注
                     }/*else if (j == 25) {
                         for (SysDept d : dept) {
@@ -231,7 +233,6 @@ public class TSpecdevCcController extends BaseController
                             }
                         }
                     }*/
-
                 }
                 entity.setCreaterCode(userId);
                 logger.info("entity:" + entity);
@@ -292,7 +293,7 @@ public class TSpecdevCcController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TSpecdevCc entity = new TSpecdevCc();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

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

@@ -156,7 +156,7 @@ public class TSpecdevDtController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TSpecdevDt entity = new TSpecdevDt();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
@@ -271,7 +271,7 @@ public class TSpecdevDtController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TSpecdevDt entity = new TSpecdevDt();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

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

@@ -152,14 +152,16 @@ public class TSpecdevDzsbController extends BaseController
         //部门查询
         List<SysDept> dept = iSysDeptService.selectDeptList(new SysDept());
         int rowNum = sheet.getPhysicalNumberOfRows();
+        logger.info("rowNum:" + rowNum);
         int failNumber = 0;
         for (int i = 1; i < rowNum; i++) {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
+                logger.info("cellNum:" + cellNum);
                 TSpecdevDzsb entity = new TSpecdevDzsb();
-                for (int j = 0; j < cellNum; j++) {
+                for (int j = 0; j <= cellNum; j++) {
                     Cell cell = row.getCell(j);
                     if (cell == null) {
                         continue;
@@ -210,7 +212,9 @@ public class TSpecdevDzsbController extends BaseController
                         if (cellValue.length() > 3) {//下次到期日期
                             entity.setNextWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 19) {
+                    } else if (j == 19) {    //检验结论
+                        entity.setPerTestConclusion(cellValue);
+                    }else if (j == 20) {
                         entity.setRemarks(cellValue);//备注
                     }/*else if (j == 20) {
                         for (SysDept d : dept) {
@@ -222,7 +226,7 @@ public class TSpecdevDzsbController extends BaseController
 
                 }
                 entity.setCreaterCode(userId);
-                logger.info("entity:" + entity);
+                logger.info("entity:" + JSON.toJSONString(entity));
                 list.add(entity);
             }catch (Exception e){
                 failNumber++;
@@ -278,7 +282,7 @@ public class TSpecdevDzsbController extends BaseController
 //            try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TSpecdevDzsb entity = new TSpecdevDzsb();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
@@ -295,11 +299,11 @@ public class TSpecdevDzsbController extends BaseController
                         entity.setId(s);
                     } else if (j == 1) {    //装置
                         entity.setPlantCode(cellValue);
-                    } else if (j == 2) {    //设备位号
+                    } else if (j == 3) {    //设备位号
                         entity.setDevno(cellValue);
-                    } else if (j == 3) {    //档案号
+                    } else if (j == 4) {    //档案号
                         entity.setDocno(cellValue);
-                    } else if (j == 4) {    //设备名称
+                    } else if (j == 2) {    //设备名称
                         entity.setDevname(cellValue);
                     } else if (j == 5) {    //检验单位
                         entity.setCheckUnit(cellValue);

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

@@ -158,7 +158,7 @@ public class TSpecdevGlController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TSpecdevGl entity = new TSpecdevGl();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
@@ -305,7 +305,7 @@ public class TSpecdevGlController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TSpecdevGl entity = new TSpecdevGl();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

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

@@ -157,7 +157,7 @@ public class TSpecdevYlgdController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TSpecdevYlgd entity = new TSpecdevYlgd();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
@@ -329,7 +329,7 @@ public class TSpecdevYlgdController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TSpecdevYlgd entity = new TSpecdevYlgd();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

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

@@ -183,7 +183,7 @@ public class TSpecdevYlrqController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TSpecdevYlrq entity = new TSpecdevYlrq();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
@@ -345,7 +345,7 @@ public class TSpecdevYlrqController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TSpecdevYlrq entity = new TSpecdevYlrq();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

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

@@ -65,7 +65,7 @@ public class TReportYlgd extends TReportHiYlgd
     private String desPressure;
 
     /** 设计温度 */
-    @Excel(name = "设计温度(℃)'")
+    @Excel(name = "设计温度(℃)")
     private String desTemp;
 
     /** 操作压力 */
@@ -73,7 +73,7 @@ public class TReportYlgd extends TReportHiYlgd
     private String optPressure;
 
     /** 操作温度 */
-    @Excel(name = "操作温度(℃)'")
+    @Excel(name = "操作温度(℃)")
     private String optTemp;
 
     /** 安全状况等级 */
@@ -142,19 +142,19 @@ public class TReportYlgd extends TReportHiYlgd
     private String pj13;
 
     /** 14 */
-    @Excel(name = "14")
+//    @Excel(name = "14")
     private String pj14;
 
     /** 15 */
-    @Excel(name = "15")
+//    @Excel(name = "15")
     private String pj15;
 
     /** 16 */
-    @Excel(name = "16")
+//    @Excel(name = "16")
     private String pj16;
 
     /** 17 */
-    @Excel(name = "17")
+//    @Excel(name = "17")
     private String pj17;
 
     /** 备注 */

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

@@ -63,7 +63,7 @@ public class TReportYlrq extends TReportHiYlrq
     private String desPressure;
 
     /** 设计温度 */
-    @Excel(name = "设计温度(℃)'")
+    @Excel(name = "设计温度(℃)")
     private String desTemp;
 
     /** 操作压力 */
@@ -71,7 +71,7 @@ public class TReportYlrq extends TReportHiYlrq
     private String optPressure;
 
     /** 操作温度 */
-    @Excel(name = "操作温度(℃)'")
+    @Excel(name = "操作温度(℃)")
     private String optTemp;
 
     /** 安全等级 */

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

@@ -53,7 +53,7 @@ public class TSpecdevCc extends BaseEntity
     private Long approveStatus;
 
     /** 发动机编号 */
-    @Excel(name = "发动机编号")
+    @Excel(name = "发动机号")
     private String engineNo;
 
     /** 注册代码 */

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

@@ -37,7 +37,7 @@ public class TSpecdevDzsb extends BaseEntity
     private String plantMaint;
 
     /** 工程师 */
-    @Excel(name = "工程师")
+    @Excel(name = "装置维修工程师")
     private String engineer;
 
     /** 状态 */
@@ -65,7 +65,7 @@ public class TSpecdevDzsb extends BaseEntity
     private String model;
 
     /** 起吊重量 */
-    @Excel(name = "起吊重量")
+    @Excel(name = "起吊重量(Ton)")
     private String capacity;
 
     /** 设备使用地点 */
@@ -73,7 +73,7 @@ public class TSpecdevDzsb extends BaseEntity
     private String location;
 
     /** 注册代码 */
-    @Excel(name = "注册代码")
+    @Excel(name = "设备注册编号")
     private String regno;
 
     /** 提交日期 */
@@ -116,7 +116,7 @@ public class TSpecdevDzsb extends BaseEntity
     private String perTestConclusion;
 
     /** 备注 */
-    //@Excel(name = "备注")
+    @Excel(name = "备注")
     private String remarks;
 
     /** 状态 1 ：正常 ；0：删除 */

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

@@ -37,7 +37,7 @@ public class TSpecdevGl extends BaseEntity
     private Long status;
 
     /** 审核状态 */
-    @Excel(name = "审核状态", dictType = "spec_approve_status")
+//    @Excel(name = "审核状态", dictType = "spec_approve_status")
     private Long approveStatus;
 
     /** 装置维修组 */
@@ -139,14 +139,16 @@ public class TSpecdevGl extends BaseEntity
     /** 外部检验结论 */
     @Excel(name = "外部检验结论")
     private String outCheckConclusion;
-
+    /** 外部检验编号 */
+    @Excel(name = "外部检验编号")
+    private String outReportNo;
     /** 下次外部检验日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @Excel(name = "下次外部检验日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date outNextWarnDate;
 
     /** 备注 */
-    //@Excel(name = "备注")
+    @Excel(name = "备注")
     private String remarks;
 
     /** 状态 1 ：正常 ；0：删除 */
@@ -184,9 +186,7 @@ public class TSpecdevGl extends BaseEntity
     //@Excel(name = "状态修改时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date changeTime;
 
-    /** 外部检验编号 */
-    //@Excel(name = "外部检验编号")
-    private String outReportNo;
+
 
     /** 部门名称 */
     //@Excel(name = "部门名称")

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

@@ -99,7 +99,7 @@ public class TSpecdevYlgd extends BaseEntity
     private String scheduleNo;
 
     /** 长度 */
-    @Excel(name = "长度")
+    @Excel(name = "长度(m)")
     private String length;
 
     /** 焊口数量 */
@@ -131,11 +131,11 @@ public class TSpecdevYlgd extends BaseEntity
     private String optPressure;
 
     /** 设计温度 */
-    @Excel(name = "设计温度(℃)'")
+    @Excel(name = "设计温度(℃)")
     private String desTemp;
 
     /** 工作温度 */
-    @Excel(name = "工作温度(℃)'")
+    @Excel(name = "工作温度(℃)")
     private String optTemp;
 
     /** 绝热层代码 */
@@ -195,7 +195,7 @@ public class TSpecdevYlgd extends BaseEntity
     private String yearReportNo;
 
     /** 备注 */
-    //@Excel(name = "备注")
+    @Excel(name = "备注")
     private String remarks;
 
     /** 状态 1 ：正常 ；0：删除 */

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

@@ -97,11 +97,11 @@ public class TSpecdevYlrq extends BaseEntity
     private String optPressure;
 
     /** 设计温度 */
-    @Excel(name = "设计温度(℃)'")
+    @Excel(name = "设计温度(℃)")
     private String desTemp;
 
     /** 操作温度 */
-    @Excel(name = "操作温度(℃)'")
+    @Excel(name = "操作温度(℃)")
     private String optTemp;
 
     /** 提交日期 */

master/src/main/java/com/ruoyi/project/sems/his/domain/TSpechiCc.java

@@ -138,7 +138,7 @@ public class TSpechiCc extends BaseEntity
     private Date changeTime;
 
     /** 发动机编号 */
-    @Excel(name = "发动机编号")
+    @Excel(name = "发动机号")
     private String engineNo;
 
     /** 颜色 */

master/src/main/java/com/ruoyi/project/system/controller/SysPlantController.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -87,6 +88,7 @@ public class SysPlantController extends BaseController
     @RequestMapping(value = "unitList")
     public List<SysPlant> unitList(@RequestBody Map<String, Object> params) {
         List plantIds = (List) params.get("plantIds");
+        logger.info(JSON.toJSONString(plantIds));
         List<SysPlant> list = sysPlantService.selectSysPlantByPlants(plantIds);
         return list;
     }

master/src/main/resources/mybatis/system/SysPlantMapper.xml

@@ -149,9 +149,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             parent_id in
             (SELECT PLANT_ID from SYS_PLANT where
                 name in
-            <foreach collection="list" item="id" index="index" open="(" close=")" separator="," >
-                #{id}
-            </foreach>
+            <choose>
+                <when test="list != null and list.size > 0">
+                    <foreach collection="list" item="id" index="index" open="(" close=")" separator="," >
+                        #{id}
+                    </foreach>
+                </when>
+                <otherwise>
+                    null
+                </otherwise>
+            </choose>
             )
             and d.del_flag = 0
             and p_type = 2

ui/src/lang/en.js

@@ -1168,7 +1168,7 @@ export default {
   档案号: 'File No.',
   最新申请时间: 'Latest Application Time',
   状态修改时间: 'Status Modification Time',
-  发动机编号: 'Engine No.',
+  发动机号: 'Engine No.',
   颜色: 'Color',
   工作能力: 'Working Ability',
   动力形式: 'Power Type',

ui/src/lang/zh.js

@@ -1168,7 +1168,7 @@ export default {
   档案号: '档案号',
   最新申请时间: '最新申请时间',
   状态修改时间: '状态修改时间',
-  发动机编号: '发动机编号',
+  发动机号: '发动机号',
   颜色: '颜色',
   工作能力: '工作能力',
   动力形式: '动力形式',

ui/src/views/login.vue

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

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

@@ -710,6 +710,7 @@
           </template>
         </el-table-column>
         <el-table-column :label="$t('年检报告编号')" align="center" prop="yearReportNo" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('容器管理')" header-align="center">
         <el-table-column label="1" align="center" prop="pj1" :formatter="pj1Format" :render-header="renderHeader"/>
         <el-table-column label="2" align="center" prop="pj2" :formatter="pj2Format" :render-header="renderHeader"/>
         <el-table-column label="3" align="center" prop="pj3" :formatter="pj3Format" :render-header="renderHeader"/>
@@ -717,6 +718,8 @@
         <el-table-column label="5" align="center" prop="pj5" :formatter="pj5Format" :render-header="renderHeader"/>
         <el-table-column label="6" align="center" prop="pj6" :formatter="pj6Format" :render-header="renderHeader"/>
         <el-table-column label="7" align="center" prop="pj7" :formatter="pj7Format" :render-header="renderHeader"/>
+        </el-table-column>
+        <el-table-column  :label="$t('容器本体及运行情况')" header-align="center">
         <el-table-column label="8" align="center" prop="pj8" :formatter="pj8Format" :render-header="renderHeader"/>
         <el-table-column label="9" align="center" prop="pj9" :formatter="pj9Format" :render-header="renderHeader"/>
         <el-table-column label="10" align="center" prop="pj10" :formatter="pj10Format" :render-header="renderHeader"/>
@@ -734,6 +737,8 @@
         <el-table-column label="22" align="center" prop="pj22" :formatter="pj22Format" :render-header="renderHeader"/>
         <el-table-column label="23" align="center" prop="pj23" :formatter="pj23Format" :render-header="renderHeader"/>
         <el-table-column label="24" align="center" prop="pj24" :formatter="pj24Format" :render-header="renderHeader"/>
+        </el-table-column>
+        <el-table-column :label="$t('安全附件或设施')" header-align="center">
         <el-table-column label="25" align="center" prop="pj25" :formatter="pj25Format" :render-header="renderHeader"/>
         <el-table-column label="26" align="center" prop="pj26" :formatter="pj26Format" :render-header="renderHeader"/>
         <el-table-column label="27" align="center" prop="pj27" :formatter="pj27Format" :render-header="renderHeader"/>
@@ -741,7 +746,10 @@
         <el-table-column label="29" align="center" prop="pj29" :formatter="pj29Format" :render-header="renderHeader"/>
         <el-table-column label="30" align="center" prop="pj30" :formatter="pj30Format" :render-header="renderHeader"/>
         <el-table-column label="31" align="center" prop="pj31" :formatter="pj31Format" :render-header="renderHeader"/>
+        </el-table-column>
+        <el-table-column :label="$t('其他')" header-align="center">
         <el-table-column label="32" align="center" prop="pj32" :formatter="pj32Format" :render-header="renderHeader"/>
+        </el-table-column>
         <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('检查日期')" align="center" prop="checkDate" width="100">
           <template slot-scope="scope">

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

@@ -75,7 +75,7 @@
       <el-table-column :label="$t('档案号')" align="center"  fixed="left" prop="docno" :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" prop="engineNo" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('发动机号')" align="center" prop="engineNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('注册代码')" align="center" prop="regno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('颜色')" align="center" prop="color" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('工作能力')+'(Ton)'" align="center" prop="capacity" :show-overflow-tooltip="true"/>
@@ -175,8 +175,8 @@
         </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item :label="$t('发动机编号')" prop="engineNo">
-          <el-input v-model="form.engineNo" :placeholder="$t('请输入')+ $t('发动机编号')" />
+        <el-form-item :label="$t('发动机号')" prop="engineNo">
+          <el-input v-model="form.engineNo" :placeholder="$t('请输入')+ $t('发动机号')" />
         </el-form-item>
           </el-col>
         </el-row>

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

@@ -121,7 +121,7 @@
       <el-table-column :label="$t('档案号')" align="center"  fixed="left" prop="docno" :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" prop="engineNo" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('发动机号')" align="center" prop="engineNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('注册代码')" align="center" prop="regno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('颜色')" align="center" prop="color" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('工作能力')+'(Ton)'" align="center" prop="capacity" :show-overflow-tooltip="true"/>
@@ -228,8 +228,8 @@
         </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item :label="$t('发动机编号')" prop="engineNo">
-          <el-input v-model="form.engineNo" :placeholder="$t('请输入')+ $t('发动机编号')" />
+        <el-form-item :label="$t('发动机号')" prop="engineNo">
+          <el-input v-model="form.engineNo" :placeholder="$t('请输入')+ $t('发动机号')" />
         </el-form-item>
           </el-col>
         </el-row>

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

@@ -8,7 +8,7 @@
       <el-table-column :label="$t('档案号')" align="center"  fixed="left" prop="docno" :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" prop="engineNo" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('发动机号')" align="center" prop="engineNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('注册代码')" align="center" prop="regno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('颜色')" align="center" prop="color" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('工作能力')+'(Ton)'" align="center" prop="capacity" :show-overflow-tooltip="true"/>

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

@@ -120,7 +120,7 @@
       <el-table-column :label="$t('档案号')" align="center"  fixed="left" prop="docno" :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" prop="engineNo" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('发动机号')" align="center" prop="engineNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('注册代码')" align="center" prop="regno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('颜色')" align="center" prop="color" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('工作能力')+'(Ton)'" align="center" prop="capacity" :show-overflow-tooltip="true"/>
@@ -227,8 +227,8 @@
         </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item :label="$t('发动机编号')" prop="engineNo">
-          <el-input v-model="form.engineNo" :placeholder="$t('请输入')+ $t('发动机编号')" />
+        <el-form-item :label="$t('发动机号')" prop="engineNo">
+          <el-input v-model="form.engineNo" :placeholder="$t('请输入')+ $t('发动机号')" />
         </el-form-item>
           </el-col>
         </el-row>

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

@@ -75,7 +75,7 @@
       <el-table-column :label="$t('档案号')" align="center"  fixed="left" prop="docno" :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" prop="engineNo" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('发动机号')" align="center" prop="engineNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('注册代码')" align="center" prop="regno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('颜色')" align="center" prop="color" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('工作能力')+'(Ton)'" align="center" prop="capacity" :show-overflow-tooltip="true"/>
@@ -177,8 +177,8 @@
         </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item :label="$t('发动机编号')" prop="engineNo">
-          <el-input v-model="form.engineNo" :placeholder="$t('请输入')+ $t('发动机编号')" />
+        <el-form-item :label="$t('发动机号')" prop="engineNo">
+          <el-input v-model="form.engineNo" :placeholder="$t('请输入')+ $t('发动机号')" />
         </el-form-item>
           </el-col>
         </el-row>

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

@@ -643,7 +643,7 @@
       // 非多个禁用
       multiple: true,
       // 显示搜索条件
-      showSearch: true,
+      showSearch: false,
       // 总条数
       total: 0,
       // 特种设备压力容器台账表格数据

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

@@ -63,7 +63,7 @@
         <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="carNo" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('档案号')" align="center"  fixed="left" prop="docno" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('发动机编号')" align="center" prop="engineNo" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('发动机号')" align="center" prop="engineNo" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('注册代码')" align="center" prop="regno" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('颜色')" align="center" prop="color" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('工作能力')+'(Ton)'" align="center" prop="capacity" :show-overflow-tooltip="true"/>

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

@@ -144,7 +144,7 @@ export default {
           containLabel: true
         },
         legend: {
-          data: [this.$t('devTotalChart'), this.$t('usage')]
+          data: [this.$t('ppTotalChart'), this.$t('usage')]
         },
         xAxis: [
           {
@@ -158,7 +158,7 @@ export default {
         yAxis: [
           {
             type: 'value',
-            name: this.$t('devTotalChart'),
+            name: this.$t('ppTotalChart'),
             min: 0,
             minInterval: 1,// 最小单位是1
             axisLabel: {
@@ -168,7 +168,7 @@ export default {
         ],
         series: [
           {
-            name: this.$t('devTotalChart'),
+            name: this.$t('ppTotalChart'),
             type: 'bar',
             barWidth: 40,
             itemStyle: {
@@ -176,7 +176,7 @@ export default {
                 barBorderRadius: [9, 9, 0, 0],
               }
             },
-            stack: this.$t('devTotalChart'),
+            stack: this.$t('ppTotalChart'),
             data: [2.0, 4.9, 7.0, 23.2, 25.6]
           }
         ],

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

@@ -407,6 +407,9 @@ export default {
           return obj.name;
         }).join(",").split(',')
         this.unitIds = arrnew
+        if (this.plantIds.length == 0) {
+          this.plantIds = ['']
+        }
         this.devData()
         this.$refs.pvChart.devYlrqData(this.plantIds, this.unitIds);
         this.$refs.boilerChart.devGlData(this.plantIds, this.unitIds);
@@ -424,10 +427,16 @@ export default {
       this.plantIds = plantIds
       this.unitIds = []
       this.getUnitList()
+      if (this.plantIds.length == 0) {
+        this.plantIds = ['']
+      }
       this.devData()
     },
     handleCommandUnit(unitIds) {
       this.unitIds = unitIds
+      if (this.plantIds.length == 0) {
+        this.plantIds = ['']
+      }
       this.devData()
       this.$refs.pvChart.devYlrqData(this.plantIds, this.unitIds);
       this.$refs.boilerChart.devGlData(this.plantIds, this.unitIds);