冲突

src/components/tree/device.vue

@@ -56,7 +56,7 @@
                         </template>
                     </el-tree>
                 </el-collapse-item>
-                <el-collapse-item title="云前置设备" name="2" v-if="frontDeviceData.length != 0">
+                <el-collapse-item title="在线设备" name="2" v-if="frontDeviceData.length != 0">
                     <el-tree
                         :style="{ height: zlDeviceData.length != 0 ? 'calc(100vh - 280px)' : 'calc(100vh - 238px)' }"
                         ref="treeRef3" :props="defaultProps" highlight-current default-expand-all
@@ -129,8 +129,9 @@ watch(
                     item.children.map((vv: any) => {
                         bxsDeviceData.value.push(vv)
                     })
-                } else if (item.name == '云前置设备') {
+                }else if (item.name == '在线设备') {
                     frontDeviceData.value = []
+
                     item.children.map((vv: any) => {
                         frontDeviceData.value.push(vv)
                     })

src/components/tree/govern/cloudDeviceEntryTree.vue

@@ -38,8 +38,8 @@ const info = (selectedNodeId?: string) => {
             let rootData = null;
             if (Array.isArray(res.data)) {
                 // 旧的数据结构 - 数组
-                rootData = res.data.find((item: any) => item.name == '云前置设备');
-            } else if (res.data && res.data.name == '云前置设备') {
+                rootData = res.data.find((item: any) => item.name == '在线设备');
+            } else if (res.data && res.data.name == '在线设备') {
                 // 新的数据结构 - 单个对象
                 rootData = res.data;
             }

src/components/tree/govern/deviceTree.vue

@@ -82,7 +82,7 @@ getDeviceTree().then(res => {
                     // })
                 })
             })
-        }else if (item.name == '云前置设备') { 
+        }else if (item.name == '在线设备') { 
                 item.children.forEach((item: any) => {
                 item.icon = 'el-icon-HomeFilled'
                 item.color = config.getColorVal('elementUiPrimary')

src/components/tree/govern/pointTree.vue

@@ -71,7 +71,7 @@ const info = () => {
                         arr2.push(item2)
                     })
                 })
-            } else if (item.name == '云前置设备') {
+            } else if (item.name == '在线设备') {
                 item.children.forEach((item: any) => {
                     item.icon = 'el-icon-HomeFilled'
                     item.level = 1

src/components/tree/point.vue

@@ -53,7 +53,7 @@
                         </template>
                     </el-tree>
                 </el-collapse-item>
-                <el-collapse-item title="云前置设备" name="2" v-if="yqfDeviceData.length != 0">
+                <el-collapse-item title="在线设备" name="2" v-if="yqfDeviceData.length != 0">
                     <el-tree
                         :style="{ height: zlDeviceData.length != 0 ? 'calc(100vh - 330px)' : 'calc(100vh - 238px)' }"
                         ref="treeRef3" :props="defaultProps" highlight-current default-expand-all
@@ -111,7 +111,7 @@ const zlDeviceData = ref<any>([])
 const zlDevList = ref<any>([])
 //便携式设备数据
 const bxsDeviceData = ref<any>([])
-//云前置设备数据
+//在线设备数据
 const yqfDeviceData = ref<any>([])
 watch(
     () => props.data,
@@ -129,7 +129,7 @@ watch(
                     item.children.map((vv: any) => {
                         bxsDeviceData.value.push(vv)
                     })
-                } else if (item.name == '云前置设备') {
+                }else if (item.name == '在线设备') {
                     yqfDeviceData.value = []
                     item.children.map((vv: any) => {
                         yqfDeviceData.value.push(vv)
@@ -284,7 +284,7 @@ const chooseNode = (value: string, data: any, node: any) => {
 const treeRef1 = ref<InstanceType<typeof ElTree>>()
 //便携式
 const treeRef2 = ref<InstanceType<typeof ElTree>>()
-//云前置
+//在线
 const treeRef3 = ref<InstanceType<typeof ElTree>>()
 defineExpose({ treeRef1, treeRef2 })
 onMounted(() => {

src/views/govern/cloudDeviceEntry/index.vue

@@ -584,7 +584,7 @@ const areaTree: any = tree
 const project = ref([
     { name: '治理设备', value: '治理设备' },
     { name: '便携式设备', value: '便携式设备' },
-    { name: '云前置设备', value: '云前置设备' }
+    { name: '在线设备', value: '在线设备' }
 ])
 const wiringTypeArr = ref([
     { name: '星型接线', value: 0 },