Merge branch 'master' of http://152.136.206.27:3000/dongjh/ems_client

src/views/module_base/client/ClientList.vue

@@ -145,7 +145,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,

src/views/module_base/elecfeeAdd/ElecfeeAddList.vue

@@ -112,7 +112,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,

src/views/module_base/elecfeeBase/ElecfeeBaseList.vue

@@ -126,7 +126,7 @@ export default {
       // 表头
       columns: [
         {
-          title: '#',
+          title: '序号',
           dataIndex: '',
           key: 'rowIndex',
           width: 60,

src/views/module_base/elecfeeDegree/ElecfeeDegreeList.vue

@@ -112,7 +112,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,

src/views/module_base/elecfeeRatio/ElecfeeRatioList.vue

@@ -112,7 +112,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,

src/views/module_base/energyPlan/EnergyPlanList.vue

@@ -112,7 +112,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,

src/views/module_base/energyRate/EnergyRateList.vue

@@ -160,7 +160,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             key: 'rowIndex',
             width: 60,
             align: 'center',

src/views/module_base/energyType/EnergyTypeList.vue

@@ -112,7 +112,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,

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

@@ -151,7 +151,7 @@ const treeData = [
         },
         columns: [
           // {
-          //   title: '#',
+          //   title: '序号',
           //   dataIndex: '',
           //   key:'rowIndex',
           //   width:60,

src/views/module_cmms/inspectContent/InspectContentList.vue

@@ -13,14 +13,33 @@
             <a-form-item label="设备id">
               <a-input placeholder="请输入设备id" v-model="queryParam.equipmentid"></a-input>
             </a-form-item>
+          </a-col> -->
+          <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="设备类型">
+              <j-tree-select
+                ref="treeSelect"
+                placeholder="请选择设备类型"
+                v-model="queryParam.equipdefid"
+                dict="tpm_equipment_tree,name,id"
+                pidField="parentid"
+                pidValue="0"
+                hasChildField="has_child"
+                >
+              </j-tree-select>
+            </a-form-item>
+          </a-col> -->
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="巡检项目类型">
+              <j-dict-select-tag type="list" v-model="queryParam.classification" dictCode="inspect_item_type" placeholder="请选择巡检项目类型" />
+            </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="状态">
-                <a-input placeholder="请选择状态" v-model="queryParam.status"></a-input>
+                <j-dict-select-tag v-model="queryParam.status" dictCode="inspect_content_status" placeholder="请选择状态" />
               </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>
@@ -164,7 +183,7 @@
             dataIndex: 'contentname'
           },
           {
-            title:'巡检项目名称',
+            title:'巡检项目类型',
             align:"center",
             dataIndex: 'classification_dictText'
           },

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

@@ -121,7 +121,7 @@
         },
         columns: [
           // {
-          //   title: '#',
+          //   title: '序号',
           //   dataIndex: '',
           //   key:'rowIndex',
           //   width:60,

src/views/module_cmms/inspectItem/InspectItemList.vue

@@ -11,11 +11,21 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="设备类型">
-              <a-input placeholder="请输入设备类型" v-model="queryParam.equipdefid"></a-input>
+              <!-- <a-input placeholder="请输入设备类型" v-model="queryParam.equipdefid"></a-input> -->
+              <j-tree-select
+                ref="treeSelect"
+                placeholder="请选择设备类型"
+                v-model="queryParam.equipdefid"
+                dict="tpm_equipment_tree,name,id"
+                pidField="parentid"
+                pidValue="0"
+                hasChildField="has_child"
+                >
+              </j-tree-select>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="巡检项类型">
+            <a-form-item label="巡检标准类型">
               <j-dict-select-tag type="list" v-model="queryParam.classification" dictCode="inspect_item_type" placeholder="请选择巡检类型" />
             </a-form-item>
           </a-col>
@@ -23,10 +33,10 @@
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
+              <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              </a> -->
             </span>
           </a-col>
         </a-row>
@@ -37,7 +47,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>
@@ -141,7 +151,7 @@
     },
     data () {
       return {
-        description: '巡检项管理页面',
+        description: '巡检标准管理页面',
         // 表头
         columns: [
           {
@@ -155,7 +165,7 @@
             }
           },
           {
-            title:'巡检项编号',
+            title:'巡检标准编号',
             align:"center",
             dataIndex: 'itemcode'
           },
@@ -190,7 +200,7 @@
             dataIndex: 'inspectionstandards'
           },
           {
-            title:'巡检项类型',
+            title:'巡检标准类型',
             align:"center",
             dataIndex: 'classification_dictText'
           },
@@ -236,7 +246,7 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
-        fieldList.push({type:'string',value:'itemcode',text:'巡检项编号',dictCode:''})
+        fieldList.push({type:'string',value:'itemcode',text:'巡检标准编号',dictCode:''})
         fieldList.push({type:'string',value:'itemname',text:'名称',dictCode:''})
         fieldList.push({type:'string',value:'equipdefid',text:'设备类型ID(设备定义)',dictCode:''})
         fieldList.push({type:'string',value:'conditions',text:'条件(字典中定义)',dictCode:''})

src/views/module_cmms/inspectLine/InspectLineList.vue

@@ -5,18 +5,18 @@
       <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.planname"></a-input>
+            <a-form-item label="巡检路线名称">
+              <a-input placeholder="请输入巡检路线名称" v-model="queryParam.linename"></a-input>
             </a-form-item>
           </a-col>
           <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>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
+              <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              </a> -->
             </span>
           </a-col>
         </a-row>

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

@@ -136,7 +136,7 @@
         // ],
         // innerColumns: [
         //   // {
-        //   //   title: '#',
+        //   //   title: '序号',
         //   //   dataIndex: '',
         //   //   key:'rowIndex',
         //   //   width:60,

src/views/module_cmms/inspectSpot/InspectSpotList.vue

@@ -5,18 +5,18 @@
       <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.planname"></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">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
+              <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              </a> -->
             </span>
           </a-col>
         </a-row>

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

@@ -98,7 +98,7 @@
         },
         columns: [
           // {
-          //   title: '#',
+          //   title: '序号',
           //   dataIndex: '',
           //   key:'rowIndex',
           //   width:60,
@@ -140,7 +140,7 @@
         ],
         innerColumns: [
           // {
-          //   title: '#',
+          //   title: '序号',
           //   dataIndex: '',
           //   key:'rowIndex',
           //   width:60,

src/views/module_cmms/spotcheck/SpotcheckList.vue

@@ -151,7 +151,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,

src/views/module_cmms/spotcheck/modules/SpotcheckForm.vue

@@ -163,7 +163,7 @@
         },
         columns: [
           // {
-          //   title: '#',
+          //   title: '序号',
           //   dataIndex: '',
           //   key:'rowIndex',
           //   width:60,

src/views/module_cmms/spotcheckContent/SpotcheckContentList.vue

@@ -145,7 +145,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,

src/views/module_cmms/spotcheckContent/modules/SpotcheckContentForm.vue

@@ -110,7 +110,7 @@
         },
         columns: [
           // {
-          //   title: '#',
+          //   title: '序号',
           //   dataIndex: '',
           //   key:'rowIndex',
           //   width:60,
@@ -119,11 +119,11 @@
           //     return parseInt(index)+1;
           //   }
           // },
-          {
-            title:'点检项ID',
-            align:"center",
-            dataIndex: 'id'
-          },
+          // {
+          //   title:'点检项ID',
+          //   align:"center",
+          //   dataIndex: 'id'
+          // },
           {
             title:'点检项编号',
             align:"center",

src/views/module_cmms/spotcheckContent/modules/SpotcheckContentModalAdd.vue

@@ -57,7 +57,7 @@ import { httpAction, getAction } from '@/api/manage'
         selectionRows: [],
         columns: [
           // {
-          //   title: '#',
+          //   title: '序号',
           //   dataIndex: '',
           //   key:'rowIndex',
           //   width:60,
@@ -66,11 +66,11 @@ import { httpAction, getAction } from '@/api/manage'
           //     return parseInt(index)+1;
           //   }
           // },
-          {
-            title:'点检项ID',
-            align:"center",
-            dataIndex: 'id'
-          },
+          // {
+          //   title:'点检项ID',
+          //   align:"center",
+          //   dataIndex: 'id'
+          // },
           {
             title:'点检项编号',
             align:"center",

src/views/module_cmms/spotcheckItem/SpotcheckItemList.vue

@@ -156,7 +156,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,

src/views/module_cmms/submission/SubmissionList.vue

@@ -176,7 +176,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,

src/views/module_cmms/submissionEquipment/SubmissionEquipmentList.vue

@@ -140,7 +140,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,

src/views/module_cmms/upkeep/UpkeepList.vue

@@ -168,7 +168,7 @@
         // 表头
         // columns: [
         //   {
-        //     title: '#',
+        //     title: '序号',
         //     dataIndex: '',
         //     key:'rowIndex',
         //     width:60,

src/views/module_cmms/upkeep/index.vue

@@ -39,7 +39,7 @@ export default ({
             },
             columns1: [
                 {
-                    title: '#',
+                    title: '序号',
                     dataIndex: '',
                     key:'rowIndex',
                     width:60,
@@ -136,7 +136,7 @@ export default ({
             ],
             columns2: [
                 {
-                    title: '#',
+                    title: '序号',
                     dataIndex: '',
                     key:'rowIndex',
                     width:60,

src/views/module_cmms/upkeep/modules/UpkeepForm.vue

@@ -170,10 +170,15 @@
           ],
         },
         columns: [
+          // {
+          //   title:'保养项ID',
+          //   align:"center",
+          //   dataIndex: 'id'
+          // },
           {
-            title:'保养项ID',
+            title:'保养项编号',
             align:"center",
-            dataIndex: 'id'
+            dataIndex: 'itemcode'
           },
           {
             title:'保养项名称',
@@ -186,11 +191,6 @@
           //   dataIndex: 'equiptypeName'
           // },
           {
-            title:'保养项编号',
-            align:"center",
-            dataIndex: 'itemcode'
-          },
-          {
             title:'保养项标准',
             align:"center",
             dataIndex: 'itemcontent'

src/views/module_cmms/upkeepItem/UpkeepItemList.vue

@@ -153,7 +153,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,

src/views/module_cmms/upkeepPlan/UpkeepPlanList.vue

@@ -164,7 +164,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,

src/views/module_cmms/upkeepPlan/modules/UpkeepPlanModalAdd.vue

@@ -56,10 +56,15 @@ import { httpAction, getAction } from '@/api/manage'
         /* table选中records*/
         selectionRows: [],
         columns: [
+          // {
+          //   title:'保养项ID',
+          //   align:"center",
+          //   dataIndex: 'id'
+          // },
           {
-            title:'保养项ID',
+            title:'保养项编号',
             align:"center",
-            dataIndex: 'id'
+            dataIndex: 'itemcode'
           },
           {
             title:'保养项名称',
@@ -72,11 +77,6 @@ import { httpAction, getAction } from '@/api/manage'
           //   dataIndex: 'equiptypeName'
           // },
           {
-            title:'保养项编号',
-            align:"center",
-            dataIndex: 'itemcode'
-          },
-          {
             title:'保养项标准',
             align:"center",
             dataIndex: 'itemcontent'

src/views/module_ems/energyAnalyse/meterReadData/index.vue

@@ -103,7 +103,7 @@ export default {
       // 表头
       columns: [
         {
-          title: '#',
+          title: '序号',
           dataIndex: '',
           key: 'rowIndex',
           width: 60,

src/views/module_tpm/equipmentOnoff/EquipmentOnoffList.vue

@@ -112,7 +112,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,

src/views/module_tpm/equipmentOnoffSection/gridsection.vue

@@ -91,7 +91,7 @@ export default {
       // 表头
       columns: [
         {
-          title: '#',
+          title: '序号',
           dataIndex: '',
           key: 'rowIndex',
           width: 60,

src/views/module_tpm/equipmentRunStatis/history.vue

@@ -85,7 +85,7 @@ export default {
       // 表头
       columns: [
         {
-          title: '#',
+          title: '序号',
           dataIndex: '',
           key: 'rowIndex',
           width: 60,

src/views/module_tpm/equipmentRunStatis/realtime.vue

@@ -124,7 +124,7 @@ export default {
       // 表头
       columns: [
         {
-          title: '#',
+          title: '序号',
           dataIndex: '',
           key: 'rowIndex',
           width: 60,

src/views/module_tpm/equipmentStatus/EquipmentStatusList.vue

@@ -112,7 +112,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,

src/views/module_tpm/tag/TagList.vue

@@ -152,7 +152,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,