巡检项改成巡检标准

src/views/module_cmms/inspect/modules/InspectForm.vue

@@ -91,7 +91,7 @@ const treeData1 = [
             type: '巡检内容',
             scopedSlots:{ title:"handle" },
             ItemList: [
-              // 巡检项相关信息
+              // 巡检标准相关信息
             ]
           },
         ],
@@ -110,7 +110,7 @@ const treeData1 = [
         key: '1335633666666',
         type: '巡检内容',
         ItemList: [
-          // 巡检项相关信息
+          // 巡检标准相关信息
         ]
       },
     ],
@@ -178,17 +178,17 @@ const treeData1 = [
           //   }
           // },
           {
-            title:'巡检项编号',
+            title:'巡检标准编号',
             align:"center",
             dataIndex: 'itemcode'
           },
           {
-            title:'巡检项名称',
+            title:'巡检标准名称',
             align:"center",
             dataIndex: 'itemname'
           },
           {
-            title:'巡检项类型',
+            title:'巡检标准类型',
             align:"center",
             dataIndex: 'classification',
             customRender:function (t, r, index) {

src/views/module_cmms/inspectAbnormalItems/InspectAbnormalItemsList.vue

@@ -117,9 +117,12 @@
           <!-- <a @click="handleEdit(record)">查看</a>
           <a-divider type="vertical" /> -->
           <!-- <a @click="handleEdit(record)">确认</a> -->
-          <a-popconfirm title="是否执行异常项目确认操作？" @confirm="() => handleConfirm(record)">
+          <a-popconfirm v-if="record.unusualstatus === '0'" title="是否执行异常项目确认操作？" @confirm="() => handleConfirm(record)">
             <a>确认</a>
           </a-popconfirm>
+          <a-popconfirm v-else title="是否执行异常项目确认操作？" disabled>
+            <a style="color:#cdcdcd">确认</a>
+          </a-popconfirm>
           <a-divider type="vertical" />
           <a-popconfirm title="是否执行异常项目转报修操作？" @confirm="() => handleTransrepair(record)">
             <a>转报修</a>
@@ -312,7 +315,7 @@
           equipmentcode: record.equipmentcode,
           priority: '0',
           faultdate: record.itime,
-          faultdesc: '巡检项:' + record.itemname + '-异常',
+          faultdesc: '巡检标准:' + record.itemname + '-异常',
           relid: record.id,
           unusualstatus: '2',
         }

src/views/module_cmms/inspectContent/modules/InspectContentForm.vue

@@ -10,7 +10,7 @@
             </a-form-model-item>
           </a-col> -->
           <a-col :span="12">
-            <a-form-model-item label="巡检项类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="classification">
+            <a-form-model-item label="巡检标准类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="classification">
               <j-dict-select-tag type="radio" v-model="model.classification" dictCode="inspect_item_type"  placeholder="请选择巡检类型" @input="inspectTypeChange()" />
             </a-form-model-item>
           </a-col>
@@ -60,7 +60,7 @@
         </a-row>
         <div class="cmms-dialog-item-title u-flex-jab">
           <div>设备巡检设置</div>
-          <div @click="addInspectItem"><a-icon type="plus"/>巡检项</div>
+          <div @click="addInspectItem"><a-icon type="plus"/>巡检标准</div>
         </div>
         <a-table
           ref="table"
@@ -158,13 +158,15 @@
           //   dataIndex: 'inspectcheckitemid'
           // },
           {
-            title:'点检项编号',
+            title:'巡检标准编号',
             align:"center",
+            width: 200,
             dataIndex: 'itemcode'
           },
           {
-            title:'点检项名称',
+            title:'巡检标准名称',
             align:"center",
+            width: 300,
             dataIndex: 'itemname'
           },
           {
@@ -247,7 +249,7 @@
         } else {
           this.$refs.addItemRef.type = this.model.classification
           this.$refs.addItemRef.add();
-          this.$refs.addItemRef.title = "选择巡检项";
+          this.$refs.addItemRef.title = "选择巡检标准";
         }
       },
       add () {

src/views/module_cmms/inspectContent/modules/InspectContentModalAdd.vue

@@ -69,17 +69,17 @@
           //   }
           // },
           // {
-          //   title:'巡检项ID',
+          //   title:'巡检标准ID',
           //   align:"center",
           //   dataIndex: 'id'
           // },
           {
-            title:'巡检项编号',
+            title:'巡检标准编号',
             align:"center",
             dataIndex: 'itemcode'
           },
           {
-            title:'巡检项名称',
+            title:'巡检标准名称',
             align:"center",
             dataIndex: 'itemname'
           },

src/views/module_cmms/inspectItem/modules/InspectItemForm.vue

@@ -4,8 +4,8 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <!-- <a-col :span="24">
-            <a-form-model-item label="巡检项编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="itemcode">
-              <a-input v-model="model.itemcode" placeholder="请输入巡检项编号"  ></a-input>
+            <a-form-model-item label="巡检标准编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="itemcode">
+              <a-input v-model="model.itemcode" placeholder="请输入巡检标准编号"  ></a-input>
             </a-form-model-item>
           </a-col> -->
           <a-col :span="24">
@@ -14,8 +14,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="巡检项类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="classification">
-              <j-dict-select-tag type="list" v-model="model.classification" dictCode="inspect_item_type" placeholder="请选择巡检类型" />
+            <a-form-model-item label="巡检标准类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="classification">
+              <j-dict-select-tag type="list" v-model="model.classification" dictCode="inspect_item_type" placeholder="请选择巡检标准类型" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24" v-if="model.classification === '1'">
@@ -87,7 +87,7 @@
         confirmLoading: false,
         validatorRules: {
            itemname: [
-              { required: true, message: '请输入巡检项名称!'},
+              { required: true, message: '请输入巡检标准名称!'},
            ],
            equipdefid: [
               { required: true, message: '请选择设备!'},
@@ -96,7 +96,7 @@
               { required: true, message: '请输入巡检标准!'},
            ],
            classification: [
-              { required: true, message: '请选择巡检项类型!'},
+              { required: true, message: '请选择巡检标准类型!'},
            ],
         },
         url: {

src/views/module_cmms/inspectLine/modules/InspectLineForm.vue

@@ -242,7 +242,7 @@
         ],
         itemColumns: [
           {
-            title:'巡检项编号',
+            title:'巡检标准编号',
             align:"left",
             dataIndex: 'itemcode'
           },
@@ -262,7 +262,7 @@
             dataIndex: 'inspectionstandards'
           },
           {
-            title:'巡检项类型',
+            title:'巡检标准类型',
             align:"left",
             dataIndex: 'classification_dictText'
           },

src/views/module_cmms/inspectPlan/modules/InspectPlanFormList.vue

@@ -265,7 +265,7 @@
         ],
         itemColumns: [
           {
-            title:'巡检项编号',
+            title:'巡检标准编号',
             align:"left",
             dataIndex: 'itemcode'
           },
@@ -285,7 +285,7 @@
             dataIndex: 'inspectionstandards'
           },
           {
-            title:'巡检项类型',
+            title:'巡检标准类型',
             align:"left",
             dataIndex: 'classification_dictText'
           },

src/views/module_tpm/equipment/EquipmentList.vue

@@ -14,20 +14,20 @@
               :filterOption="filterOptions"
               @search="searchDevice"
               allowClear>
-              <a-select-option v-for="(item, index) in deviceOptions" :key="index" :value="item.id" :label="item.equipmentname">
-                <!-- <div style="display: flex; width: 100%;"> -->
-                  <!-- 换行 -->
-                  <!-- <div style="width: 72%; overflow: hidden;white-space: normal; margin-right: 3%;">{{item.equipmentname}}</div> -->
-                  <!-- <div style="width: 72%; overflow: hidden;text-overflow: ellipsis;">{{item.equipmentname}}</div>
-                  <div style="width: 20%; text-align: right; display: flex; align-items: center;">{{ item.equipmentcode }}</div>
-                </div> -->
-                <!-- <a-row>
-                  <a-col :span="12">{{item.equipmentname}}</a-col>
-                  <a-col :span="12" style="text-align: right;">{{ item.equipmentcode }}</a-col>
-                </a-row> -->
-                <span>{{item.equipmentname}}</span>
-                <span style="position: absolute;right: 2%;">{{ item.equipmentcode }}</span>
-              </a-select-option>
+                <a-select-option v-for="(item, index) in deviceOptions" :key="index" :value="item.id" :label="item.equipmentname">
+                  <!-- <div style="display: flex; width: 100%;"> -->
+                    <!-- 换行 -->
+                    <!-- <div style="width: 72%; overflow: hidden;white-space: normal; margin-right: 3%;">{{item.equipmentname}}</div> -->
+                    <!-- <div style="width: 72%; overflow: hidden;text-overflow: ellipsis;">{{item.equipmentname}}</div>
+                    <div style="width: 20%; text-align: right; display: flex; align-items: center;">{{ item.equipmentcode }}</div>
+                  </div> -->
+                  <!-- <a-row>
+                    <a-col :span="12">{{item.equipmentname}}</a-col>
+                    <a-col :span="12" style="text-align: right;">{{ item.equipmentcode }}</a-col>
+                  </a-row> -->
+                  <span>{{item.equipmentname}}</span>
+                  <span style="position: absolute;right: 2%;">{{ item.equipmentcode }}</span>
+                </a-select-option>
               </a-select>
             </a-form-item>
           </a-col>