徐明浩

特种设备-定点测厚：“公称壁厚”和“名义壁厚”都统一修改为“公称壁厚”。“下次测厚日期”和“测厚周期”这两列去除。
定点测厚功能模块中点击“新增”后，弹出的页面中，“下次检验日期”修改为“下次测厚日期”，测厚清单中的“下次检测日期”修改为“下次测厚日期”。

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

@@ -102,14 +102,14 @@ public class TMeasureThickness extends BaseEntity
     private Date newMeasureDate;
 
     /** 测厚周期 */
-    @Excel(name = "测厚周期(year)")
+    //@Excel(name = "测厚周期(year)")
     private String measureCycle;
 
     /**
      * 下次检测日期
      */
     @TableField(exist = false)
-    @Excel(name = "下次测厚日期", width = 30, dateFormat = "yyyy-MM-dd")
+    //@Excel(name = "下次测厚日期", width = 30, dateFormat = "yyyy-MM-dd")
     private String nextMeasureDate;
 
     /** 预估寿命 */
@@ -118,7 +118,7 @@ public class TMeasureThickness extends BaseEntity
 
     /** 提出时间 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "下次检验日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "下次测厚日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date nextWarnDate;
 
     /** 检测方法 */

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

@@ -136,10 +136,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('名义壁厚(mm)')" prop="nominalTickness">
+      <el-form-item :label="$t('公称壁厚(mm)')" prop="nominalTickness">
         <el-input
           v-model="queryParams.nominalTickness"
-          :placeholder="$t('请输入') + $t('名义壁厚(mm)')"
+          :placeholder="$t('请输入') + $t('公称壁厚(mm)')"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -249,7 +249,7 @@
         align="center"
         :label="$t('最近测厚日期')">
       </el-table-column>
-      <el-table-column
+<!--      <el-table-column
         prop="measureCycle"
         header-align="center"
         align="center"
@@ -260,7 +260,7 @@
         header-align="center"
         align="center"
         :label="$t('下次测厚日期')">
-      </el-table-column>
+      </el-table-column>-->
       <el-table-column :label="$t('预估剩余寿命(year)')" align="center" prop="estRemain" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span v-if="scope.row.estRemain"> {{ scope.row.estRemain }}</span>
@@ -271,7 +271,7 @@
         prop="nextWarnDate"
         header-align="center"
         align="center"
-        :label="$t('下次检测日期')">
+        :label="$t('下次测厚日期')">
       </el-table-column>
       <el-table-column :label="$t('检测方法')" align="center" prop="inspectionMethod" :formatter="inspectionMethodFormat" />
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
@@ -455,7 +455,7 @@
         </el-form-item>
         <el-row>
           <el-col :span="8">
-        <el-form-item :label="$t('名义壁厚(mm)')" prop="nominalTickness">
+        <el-form-item :label="$t('公称壁厚(mm)')" prop="nominalTickness">
           <el-input v-model="form.nominalTickness" :placeholder="$t('请输入') + $t('名义壁厚(mm)')" />
         </el-form-item>
             <el-form-item :label="$t('原因分析附件')" prop="analysisUrl">
@@ -530,12 +530,12 @@
         </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item :label="$t('下次检验日期')" prop="raiserDate">
+        <el-form-item :label="$t('下次测厚日期')" prop="raiserDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.nextWarnDate"
                           type="date"
                           value-format="yyyy-MM-dd"
-                          :placeholder="$t('请选择') + $t('下次检验日期')">
+                          :placeholder="$t('请选择') + $t('下次测厚日期')">
           </el-date-picker>
         </el-form-item>
         <el-form-item :label="$t('备注')" prop="remarks">
@@ -702,7 +702,7 @@
         </el-descriptions-item>
         <el-descriptions-item span="1">
           <template slot="label">
-            {{ $t('名义壁厚(mm)') }}
+            {{ $t('公称壁厚(mm)') }}
           </template>
           {{ dataForm.nominalTickness }}
         </el-descriptions-item>
@@ -1054,7 +1054,7 @@ export default {
           { required: true, message: "原因分析不能为空", trigger: "blur" }
         ],*/
         nominalTickness: [
-          { required: true, message: this.$t('名义壁厚(mm)')+this.$t('不能为空'), trigger: "blur" }
+          { required: true, message: this.$t('公称壁厚(mm)')+this.$t('不能为空'), trigger: "blur" }
         ],
         // thicknessMin: [
         //   { required: true, message: this.$t('最小允许壁厚(mm)')+this.$t('不能为空'), trigger: "blur" }