ly 测厚

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

@@ -31,7 +31,8 @@ public class TMeasureThickness extends BaseEntity
     /** 单元名称 */
     @Excel(name = "单元名称")
     private String unitCode;
-
+    @Excel(name = "腐蚀回路图号")
+    private String loopNo;
     /** 设备位号 */
     @Excel(name = "单位内编号")
     private String tagno;
@@ -61,7 +62,7 @@ public class TMeasureThickness extends BaseEntity
     @Excel(name = "检测编号")
     private String measureNo;
 
-    private String loopNo;
+
     /** 设备/管线名称 */
     @Excel(name = "设备/管线名称")
     private String equipmentName;

master/src/main/resources/application-polar.yml

@@ -6,9 +6,12 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:polardb://pc-uf66d325rnp379in3.rwlb.rds.aliyuncs.com:1521?boolAsInt=true
-                username: cpms_admin
-                password: J7ousedzIEINqNKi
+#                url: jdbc:polardb://pc-uf66d325rnp379in3.rwlb.rds.aliyuncs.com:1521?boolAsInt=true
+#                username: cpms_admin
+#                password: J7ousedzIEINqNKi
+                url: jdbc:polardb://pc-uf6ct70s42z69z7o6.rwlb.rds.aliyuncs.com:1521/cpms_prod?boolAsInt=true
+                username: cpms_app
+                password: ANd7rBK7HgnX
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

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

@@ -175,6 +175,7 @@
                 or specification like concat(concat('%', #{searchValue}), '%')
                 or flow_rate like concat(concat('%', #{searchValue}), '%')
                 or temperature like concat(concat('%', #{searchValue}), '%')
+                or loop_no like concat(concat('%', #{searchValue}), '%')
                 )
             </if>
             <if test="estRemainWarn != null and estRemainWarn != '' "> and TO_NUMBER(#{estRemainWarn}) > est_remain </if>

ui/.env.production

@@ -3,4 +3,4 @@ ENV = 'production'
 
 # 管理系统/生产环境
 #VUE_APP_BASE_API = '/prod-api'
-VUE_APP_BASE_API = '/cpms'
+VUE_APP_BASE_API = '/cpmsapi'

ui/src/layout/components/Navbar.vue

@@ -172,8 +172,8 @@ export default {
         type: 'warning'
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          location.href = '/cpms/index.html';
-          // location.href = '/index';
+          // location.href = '/cpms/index.html';
+          location.href = '/cpms/';
         })
       })
     }

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

@@ -10,10 +10,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="回路图编号" prop="loopNo">
+      <el-form-item label="腐蚀回路图号" prop="loopNo">
         <el-input
           v-model="queryParams.loopNo"
-          placeholder="请输入回路图编号"
+          placeholder="请输入腐蚀回路图号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -62,7 +62,7 @@
     <el-table v-loading="loading" :data="loopList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="装置名称" align="center" prop="plantCode" :show-overflow-tooltip="true"/>
-      <el-table-column label="回路图编号" align="center" prop="loopNo" :show-overflow-tooltip="true"/>
+      <el-table-column label="腐蚀回路图号" align="center" prop="loopNo" :show-overflow-tooltip="true"/>
       <el-table-column label="回路图" align="center" prop="loopUrl" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <a style=" text-decoration: underline;" class="link-type" @click="handleSee(scope.row)">
@@ -117,7 +117,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="回路图编号" prop="loopNo">
+        <el-form-item label="腐蚀回路图号" prop="loopNo">
           <el-input v-model="form.loopNo" placeholder="请输入回路图编号" />
         </el-form-item>
 

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

@@ -59,7 +59,7 @@
           size="small"
         />
       </el-form-item>
-      <el-form-item label="寿命预警" prop="estRemainWarn">
+      <el-form-item label="预估剩余寿命" prop="estRemainWarn">
         <el-select v-model="queryParams.estRemainWarn"  :placeholder="$t('请选择') + $t('寿命预警')" filterable clearable size="small">
           <el-option
             key="1"
@@ -740,7 +740,7 @@
         </el-descriptions-item>
         <el-descriptions-item span="3">
           <template slot="label">
-            {{ $t('附件') }}
+            {{ $t('原因分析附件') }}
           </template>
           <span style="text-decoration: underline;" class="link-type" @click="handleDownload(dataForm.analysisUrl)">{{ dataForm.analysisUrl }}</span>