Merge branch 'master' of http://git.xt.wenhq.top:8083/hs/zhny_ui

# Conflicts:
#	ems-ui-cloud/src/views/devmgr/el/index.vue

ems-ui-cloud/src/views/devmgr/el/index.vue

@@ -101,13 +101,13 @@
         <el-form-item label="记录编号" prop="recordCode">
           <el-input v-model="form.recordCode" placeholder="请输入记录编号" :disabled="isViewOnly" />
         </el-form-item>
-        <el-form-item label="对象类型">
-          <el-select v-model="form.objType" placeholder="请选择对象类型" @change="changeObjOptions" :disabled="isViewOnly">
-                     <el-option v-for="dict in dict.type.device_type" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
-          </el-select>
+        <el-form-item label="对象类型" >
+          <el-radio-group v-model="form.objType" size="medium" @change="changeObjOptions">
+            <el-radio v-for="(item, index) in dict.type.device_type" :key="value" :label="dict.label"
+                      :disabled="item.disabled">{{item.label}}</el-radio>
+          </el-radio-group>
         </el-form-item>
-        <el-form-item label=" " prop="objCode" v-if="showObjCode">
+        <el-form-item label=" " prop="objCode">
           <treeselect v-model="form.objCode" :options="objCodeOptions" :show-count="true" placeholder="请选择具体数据"  @select="handleSelect"/>
         </el-form-item>
         <el-form-item label="创建时间" prop="recordTime">
@@ -159,13 +159,13 @@
         <el-form-item label="记录编号" prop="recordCode">
           <el-input v-model="form.recordCode" placeholder="请输入记录编号" />
         </el-form-item>
-        <el-form-item label="对象类型">
-          <el-select v-model="form.objType" placeholder="请选择对象类型" @change="changeObjOptions">
-            <el-option v-for="dict in dict.type.device_type" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
-          </el-select>
+        <el-form-item label="对象类型" >
+          <el-radio-group v-model="form.objType" size="medium" @change="changeObjOptions">
+            <el-radio v-for="(item, index) in dict.type.device_type" :key="value" :label="dict.label"
+                      :disabled="item.disabled">{{item.label}}</el-radio>
+          </el-radio-group>
         </el-form-item>
-        <el-form-item label=" " prop="objCode"  v-if="showObjCode">
+        <el-form-item label=" " prop="objCode">
           <treeselect v-model="form.objCode" :options="objCodeOptions" :show-count="true" placeholder="请选择具体数据"  @select="handleSelect"/>
         </el-form-item>
         <el-form-item label="创建时间" prop="recordTime">
@@ -340,10 +340,10 @@ export default {
       if (!value) return true
       return data.label.indexOf(value) !== -1
     },
-    handleNodeClick (data, node) {
+    // 节点单击事件
+    handleNodeClick(data) {
       this.queryParams.areaCode = data.id
-      console.log('Selected areaCode:', this.queryParams.areaCode);
-      this.getList()
+      this.handleQuery()
     },
     // 取消按钮
     cancel () {
@@ -406,7 +406,7 @@ export default {
       console.log("objType",objType)
       if (objType === '1') {
         // 区域逻辑
-        areaTreeSelect(this.form.areaCode, true).then(response => {
+        areaTreeSelect('0', false).then(response => {
           this.objCodeOptions = [{
             id: this.form.areaCode,
             label: this.getAreaLabelById(this.form.areaCode),