巡检内容改巡检项目和其他修改

src/components/module_ems/UModal/UModal.vue

@@ -277,6 +277,13 @@ export default {
           .right-btn{
             display: flex;
             align-items: center;
+            .anticon{
+              margin-right: 10px;
+              font-size: 19px;
+            }
+            .ant-btn-primary{
+              margin-right: 8px;
+            }
           }      
           // .left {
           //   width: 50%;

src/views/module_cmms/inspectContent/InspectContentList.vue

@@ -5,11 +5,11 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="巡检内容名称">
-              <a-input placeholder="请输入巡检内容名称" v-model="queryParam.contentname"></a-input>
+            <a-form-item label="巡检项目名称">
+              <a-input placeholder="请输入巡检项目名称" v-model="queryParam.contentname"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="设备id">
               <a-input placeholder="请输入设备id" v-model="queryParam.equipmentid"></a-input>
             </a-form-item>
@@ -20,7 +20,7 @@
                 <a-input placeholder="请选择状态" v-model="queryParam.status"></a-input>
               </a-form-item>
             </a-col>
-          </template>
+          </template> -->
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
@@ -39,7 +39,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('巡检内容')">导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('巡检项目')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
@@ -140,7 +140,7 @@
     },
     data () {
       return {
-        description: '巡检内容管理页面',
+        description: '巡检项目管理页面',
         // 表头
         columns: [
           {
@@ -154,17 +154,17 @@
             }
           },
           {
-            title:'巡检内容编号',
+            title:'巡检项目编号',
             align:"center",
             dataIndex: 'contentcode'
           },
           {
-            title:'巡检内容名称',
+            title:'巡检项目名称',
             align:"center",
             dataIndex: 'contentname'
           },
           {
-            title:'巡检内容名称',
+            title:'巡检项目名称',
             align:"center",
             dataIndex: 'classification_dictText'
           },
@@ -243,8 +243,8 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'contentcode',text:'巡检内容编号',dictCode:''})
-        fieldList.push({type:'string',value:'contentname',text:'巡检内容名称',dictCode:''})
+        fieldList.push({type:'string',value:'contentcode',text:'巡检项目编号',dictCode:''})
+        fieldList.push({type:'string',value:'contentname',text:'巡检项目名称',dictCode:''})
         fieldList.push({type:'string',value:'equipmentid',text:'设备id',dictCode:''})
         fieldList.push({type:'string',value:'status',text:'状态：启用：0、禁用:1',dictCode:''})
         fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})

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

@@ -2,11 +2,11 @@
   <a-spin :spinning="confirmLoading">
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <div class="cmms-dialog-item-title">巡检内容基本信息</div>
+        <div class="cmms-dialog-item-title">巡检项目基本信息</div>
         <a-row>
           <!-- <a-col :span="24">
-            <a-form-model-item label="巡检内容编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="contentcode">
-              <a-input v-model="model.contentcode" placeholder="请输入巡检内容编号"  ></a-input>
+            <a-form-model-item label="巡检项目编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="contentcode">
+              <a-input v-model="model.contentcode" placeholder="请输入巡检项目编号"  ></a-input>
             </a-form-model-item>
           </a-col> -->
           <a-col :span="24">
@@ -15,8 +15,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
-            <a-form-model-item label="巡检内容名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="contentname">
-              <a-input v-model="model.contentname" placeholder="请输入巡检内容名称"  ></a-input>
+            <a-form-model-item label="巡检项目名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="contentname">
+              <a-input v-model="model.contentname" placeholder="请输入巡检项目名称"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="12" v-if="model.classification === '1'">
@@ -102,10 +102,10 @@
         confirmLoading: false,
         validatorRules: {
           classification: [
-            { required: true, message: '请先选择巡检内容类型!'},
+            { required: true, message: '请先选择巡检项目类型!'},
           ],
           contentname: [
-            { required: true, message: '请输入巡检内容名称!'},
+            { required: true, message: '请输入巡检项目名称!'},
           ],
           equipmentid: [
             { required: true, message: '请选择设备!'},

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

@@ -195,7 +195,7 @@
         ],
         contentColumns: [
           {
-            title:'巡检内容编号',
+            title:'巡检项目编号',
             align:"center",
             dataIndex: 'contentcode',
             // customRender: (text, row, index) => {
@@ -206,7 +206,7 @@
             // }
           },
           {
-            title:'巡检内容名称',
+            title:'巡检项目名称',
             align:"center",
             dataIndex: 'contentname',
             // customRender: (text, row, index) => {
@@ -354,7 +354,7 @@
     //   border: none;
     // }
   }
-  // 巡检点下的巡检内容
+  // 巡检点下的巡检项目
   /deep/ .spot-content-container{
     background-color: #fff;
     border: 1px solid #e6ebf5;

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

@@ -219,7 +219,7 @@
         ],
         contentColumns: [
           {
-            title:'巡检内容编号',
+            title:'巡检项目编号',
             align:"center",
             dataIndex: 'contentcode',
             // customRender: (text, row, index) => {
@@ -230,7 +230,7 @@
             // }
           },
           {
-            title:'巡检内容名称',
+            title:'巡检项目名称',
             align:"center",
             dataIndex: 'contentname',
             // customRender: (text, row, index) => {
@@ -433,7 +433,7 @@
     .line-spot-container:hover{
       box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);
     }
-    // 巡检点下的巡检内容
+    // 巡检点下的巡检项目
     /deep/ .spot-content-container{
       background-color: #fff;
       border: 1px solid #e6ebf5;

src/views/module_cmms/inspectSpot/InspectSpotList.vue

@@ -186,8 +186,8 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
-        fieldList.push({type:'string',value:'contentcode',text:'巡检内容编号',dictCode:''})
-        fieldList.push({type:'string',value:'contentname',text:'巡检内容名称',dictCode:''})
+        fieldList.push({type:'string',value:'contentcode',text:'巡检项目编号',dictCode:''})
+        fieldList.push({type:'string',value:'contentname',text:'巡检项目名称',dictCode:''})
         fieldList.push({type:'string',value:'equipdefid',text:'设备类型',dictCode:''})
         this.superFieldList = fieldList
       }

src/views/module_cmms/inspectSpot/modules/InspectSpotForm.vue

@@ -5,8 +5,8 @@
         <div class="cmms-dialog-item-title">巡检点基本信息</div>
         <a-row>
           <!-- <a-col :span="24">
-            <a-form-model-item label="巡检内容编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="contentcode">
-              <a-input v-model="model.contentcode" placeholder="请输入巡检内容编号"  ></a-input>
+            <a-form-model-item label="巡检项目编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="contentcode">
+              <a-input v-model="model.contentcode" placeholder="请输入巡检项目编号"  ></a-input>
             </a-form-model-item>
           </a-col> -->
           <a-col :span="24">

src/views/module_tpm/equipment/EquipmentList.vue

@@ -191,10 +191,15 @@
             }
           },
           {
+            title:'设备编号',
+            align:"center",
+            dataIndex: 'equipmentcode',
+            customCell: this.customCellDetail
+          },
+          {
             title:'设备名称',
             align:"center",
             dataIndex: 'equipmentname',
-            customCell: this.customCellDetail
           },
           {
             title:'设备分类',
@@ -203,11 +208,6 @@
             // customRender: (text, record) => (text ? record['name'] : '')
           },
           {
-            title:'设备编号',
-            align:"center",
-            dataIndex: 'equipmentcode'
-          },
-          {
             title:'规格型号',
             align:"center",
             dataIndex: 'spec'