xuziqiang/SaaS-lib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zhaohy
2024-08-23 17:02:50 +08:00
parent 0ef0bb57f3 d3eef2678e
commit c27b19bf1e
2 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
hx-ai-intelligent/src/router/equipmentControl.ts
View File

@@ -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', path: 'planToAdd',
name: 'planToAdd', name: 'planToAdd',

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

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