设备档案优化

src/views/module_ems/tpmEquipment/TpmEquipmentList.vue

@@ -42,7 +42,17 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="区域">
-                <a-input placeholder="请输入区域" v-model="queryParam.spaceid"></a-input>
+                <!-- <a-input placeholder="请输入区域" v-model="queryParam.spaceid"></a-input> -->
+                <j-tree-select
+                  ref="treeSelect"
+                  placeholder="请选择区域"
+                  v-model="queryParam.spaceid"
+                  dict="ems_space,name,id"
+                  pidField="parentid"
+                  pidValue="0"
+                  hasChildField="has_child"
+                  >
+                </j-tree-select>
               </a-form-item>
             </a-col>
           </template>
@@ -69,13 +79,13 @@
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload> -->
       <!-- 高级查询区域 -->
-      <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query> -->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown> -->
+      </a-dropdown>
     </div>
 
     <!-- table区域-begin -->
@@ -203,7 +213,7 @@
           {
             title:'区域',
             align:"center",
-            dataIndex: 'spaceid'
+            dataIndex: 'spaceid_dictText'
           },
           {
             title: '操作',

src/views/module_ems/tpmEquipment/modules/TpmEquipmentForm.vue

@@ -40,7 +40,17 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="区域" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="spaceid">
-              <a-input v-model="model.spaceid" placeholder="请输入区域"  ></a-input>
+              <!-- <a-input v-model="model.spaceid" placeholder="请输入区域"  ></a-input> -->
+              <j-tree-select
+                ref="treeSelect"
+                placeholder="请选择区域"
+                v-model="model.spaceid"
+                dict="ems_space,name,id"
+                pidField="parentid"
+                pidValue="0"
+                hasChildField="has_child"
+                >
+              </j-tree-select>
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -80,6 +90,12 @@
         },
         confirmLoading: false,
         validatorRules: {
+          equipmentname: [
+            { required: true, message: '请输入设备名称!'},
+          ],
+          equipdefid: [
+            { required: true, message: '请选择设备分类!'},
+          ],
         },
         url: {
           add: "/tpmEquipment/tpmEquipment/add",