Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp

hx-ai-intelligent/src/router/equipmentControl.ts

@@ -119,25 +119,25 @@ const equipmentControl = {
         },
       ],
     },
-    {
+    // {
-      path: 'waterSystem',
+    //   path: 'waterSystem',
-      name: 'waterSystem',
+    //   name: 'waterSystem',
-      meta: { title: '给排水系统', hideChildren: true, icon: 'shebeiqunkong' },
+    //   meta: { title: '给排水系统', hideChildren: true, icon: 'shebeiqunkong' },
-      component: Base,
+    //   component: Base,
-      redirect: { name: 'waternControlSystemIndex' },
+    //   redirect: { name: 'waternControlSystemIndex' },
-      children: [
+    //   children: [
-        {
+    //     {
-          path: 'index',
+    //       path: 'index',
-          name: 'waternControlSystemIndex',
+    //       name: 'waternControlSystemIndex',
-          component: () => import('/@/view/equipmentControl/waterSystem/index.vue'),
+    //       component: () => import('/@/view/equipmentControl/waterSystem/index.vue'),
-          meta: {
+    //       meta: {
-            title: '给排水系统',
+    //         title: '给排水系统',
-            keepAlive: false,
+    //         keepAlive: false,
-            // backApi: [],
+    //         // backApi: [],
-          },
+    //       },
-        },
+    //     },
-      ],
+    //   ],
-    },
+    // },
     {
       path: 'planToAdd',
       name: 'planToAdd',

hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue

@@ -128,7 +128,6 @@
 
       http.post(device.queryDeviceTree, { orgId: orgId.value }).then((res) => {
         treeData1.value = formatTreeData(res.data);
-        debugger;
         if (treeData1.value && treeData1.value.length > 0) {
           firstKey.value = [treeData1.value[0].value];
         }