设备点位优化

src/views/module_ems/tpmTag/TpmTagList.vue

@@ -4,6 +4,17 @@
     <div class="table-page-search-wrapper">
       <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="设备名称">
+              <j-search-select-tag v-model="queryParam.equipmentid" placeholder="请选择设备" dict="ems_tpm_equipment,equipmentname,id"  />
+            </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>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -123,9 +134,9 @@
             }
           },
           {
-            title:'设备ID',
+            title:'设备',
             align:"center",
-            dataIndex: 'equipmentid'
+            dataIndex: 'equipmentid_dictText'
           },
           {
             title:'点位名',
@@ -143,12 +154,12 @@
             dataIndex: 'tagtype'
           },
           {
-            title:'能源分类ID',
+            title:'能源分类',
             align:"center",
             dataIndex: 'energytypeid'
           },
           {
-            title:'能源分项ID',
+            title:'能源分项',
             align:"center",
             dataIndex: 'energyitemid'
           },

src/views/module_ems/tpmTag/modules/TpmTagForm.vue

@@ -4,8 +4,9 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="设备ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentid">
-              <a-input v-model="model.equipmentid" placeholder="请输入设备ID"  ></a-input>
+            <a-form-model-item label="设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentid">
+              <!-- <a-input v-model="model.equipmentid" placeholder="请输入设备ID"  ></a-input> -->
+              <j-search-select-tag v-model="model.equipmentid" placeholder="请选择设备" dict="ems_tpm_equipment,equipmentname,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -24,13 +25,13 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="能源分类ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="energytypeid">
-              <a-input v-model="model.energytypeid" placeholder="请输入能源分类ID"  ></a-input>
+            <a-form-model-item label="能源分类" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="energytypeid">
+              <a-input v-model="model.energytypeid" placeholder="请输入能源分类"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="能源分项ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="energyitemid">
-              <a-input v-model="model.energyitemid" placeholder="请输入能源分项ID"  ></a-input>
+            <a-form-model-item label="能源分项" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="energyitemid">
+              <a-input v-model="model.energyitemid" placeholder="请输入能源分项"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">