修改台账

src/views/govern/cloudDeviceEntry/index.vue

@@ -405,9 +405,10 @@
                                                                 pageStatus == 2)
                                                         )
                                                     "
+                                                    @change="busItem.devModel = ''"
                                                 >
                                                     <el-option
-                                                        v-for="item in [...formDevTypeOptions, ...devTypeOptions]"
+                                                        v-for="item in formDevTypeOptions"
                                                         :key="item.value"
                                                         :label="item.label || item.name"
                                                         :value="item.value || item.id"
@@ -438,7 +439,9 @@
                                                     "
                                                 >
                                                     <el-option
-                                                        v-for="option in [...devCLD, ...devModelOptions]"
+                                                        v-for="option in  devModelOptions.filter(
+                                                            item => item.pid == busItem.devType
+                                                        )"
                                                         :key="option.id"
                                                         :label="option.name"
                                                         :value="option.id"
@@ -595,7 +598,7 @@
                                                     <el-option label="停用" :value="0"></el-option>
                                                 </el-select>
                                             </el-form-item>
-                                            <el-form-item
+                                            <!-- <el-form-item
                                                 label="接入:"
                                                 v-if="connectionMethod == 'MQTT' && busItem?.id"
                                             >
@@ -608,7 +611,7 @@
                                                 >
                                                     {{ accessLoading ? '接入中' : '接入' }}
                                                 </el-button>
-                                            </el-form-item>
+                                            </el-form-item> -->
                                             <el-form-item
                                                 class="form-item"
                                                 label="排序:"
@@ -1454,7 +1457,7 @@ import {
     updateLine,
     pushLog,
     queryPushResult,
-    onlineRegister
+    
 } from '@/api/cs-device-boot/cloudDeviceEntry'
 import { getTopoTemplate } from '@/api/cs-device-boot/topologyTemplate'
 import { getFileUrl } from '@/api/system-boot/file'
@@ -1654,7 +1657,7 @@ const cityOptions = computed(() => {
 })
 
 const formDevTypeOptions = computed(() => {
-    return [devTypeOptions2.value]
+    return devTypeOptions.value //[devTypeOptions2.value]
 })
 
 // 电压等级选项，用于显示带单位的名称
@@ -3319,12 +3322,10 @@ const area = async () => {
     queryByCode('DEV_CLD')
         .then(res => {
             devTypeOptions2.value = res.data
-            return queryCsDictTree(res.data.id).then(res => {
+            queryCsDictTree(res.data.id).then(res => {
                 devCLD.value = res.data
             })
-        })
-        .then(() => {
-            return queryByCode('Device_Type').then(res => {
+            queryByCode('Device_Type').then(res => {
                 queryByid(res.data.id).then((list: any) => {
                     devModelOptions.value = list.data.map((item: any, index: any) => {
                         return {
@@ -3340,6 +3341,9 @@ const area = async () => {
                 })
             })
         })
+        // .then(() => {
+        //     return
+        // })
         .catch(error => {
             console.error('查询过程中出现错误:', error)
         })
@@ -3353,22 +3357,6 @@ const area = async () => {
 }
 const accessLoading = ref(false)
 // 接入
-const access = (item: any) => {
-    accessLoading.value = true
-    onlineRegister({
-        projectId: formData.value.projectInfoList[0].id,
-        nDid: item.ndid
-    })
-        .then((res: any) => {
-            if (res.code == 'A0000') {
-                ElMessage.success(res)
-                accessLoading.value = false
-            }
-        })
-        .catch(() => {
-            accessLoading.value = false
-        })
-}
 
 onMounted(() => {
     nodeData.value.level = 0