diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/config.ts b/hx-ai-intelligent/src/view/equipmentManage/group/config.ts index 6bbf0fb..eda0602 100644 --- a/hx-ai-intelligent/src/view/equipmentManage/group/config.ts +++ b/hx-ai-intelligent/src/view/equipmentManage/group/config.ts @@ -78,7 +78,7 @@ const tableCarbonKeyMap = [ { title: '分组名称', textNumber: 10, - dataIndex: 'pointName', + dataIndex: 'groupName', }, { textNumber: 5, @@ -659,7 +659,7 @@ export const tableConfigCal = ( }, }, { - field: 'provider', + field: 'groupName', component: 'NsInput', componentProps: { placeholder: '请输入分组名称', diff --git a/hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue b/hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue index a041059..bfe41a9 100644 --- a/hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue +++ b/hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue @@ -36,7 +36,7 @@ :style="{ top: '50px', left: `${divWidth + 55}px`, - zIndex: 9, + zIndex: 4, position: 'absolute', width: `${divWidth}px`, }" @@ -47,7 +47,7 @@ :style="{ top: '50px', left: `${divWidth * 2 + 65}px`, - zIndex: 9, + zIndex: 4, position: 'absolute', width: `${divWidth}px`, }" @@ -61,7 +61,7 @@ :style="{ top: '50px', left: `${divWidth * 3 + 75}px`, - zIndex: 9, + zIndex: 4, position: 'absolute', width: `${divWidth}px`, }" @@ -71,7 +71,7 @@ :style="{ top: '50px', left: `${divWidth * 4 + 85}px`, - zIndex: 9, + zIndex: 4, position: 'absolute', }" @click="getSelect" @@ -228,8 +228,9 @@ const getDianWeiList = () => { let deviceIds: any[] = []; if (checkedKeys.value && checkedKeys.value.length > 0) { + debugger; checkedKeys.value.forEach((element) => { - if (value.value != element) { + if (value.value != element && value.value != '999999999') { deviceIds.push(element); } }); @@ -287,7 +288,7 @@ let deviceIds: any[] = []; if (checkedKeys.value && checkedKeys.value.length > 0) { checkedKeys.value.forEach((element) => { - if (value.value != element) { + if (value.value != element && value.value != '999999999') { deviceIds.push(element); } }); diff --git a/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue b/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue index 0028946..0158075 100644 --- a/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue +++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue @@ -40,6 +40,7 @@ v-model:expandedKeys="expandedKeys" v-model:selectedKeys="selectedKeys" v-model:checkedKeys="checkedKeys" + :checkStrictly="mode == '0' ? false : true" :show-line="{ showLeafIcon: false }" checkable :height="500" @@ -71,7 +72,7 @@ :style="{ top: '100px', left: `${divWidth + 55}px`, - zIndex: 9, + zIndex: 4, position: 'absolute', width: `${divWidth}px`, }" @@ -81,7 +82,7 @@ :style="{ top: '100px', left: `${divWidth * 2 + 65}px`, - zIndex: 9, + zIndex: 4, position: 'absolute', width: `${divWidth}px`, }" @@ -94,7 +95,7 @@ :style="{ top: '100px', left: `${divWidth * 2 + 65}px`, - zIndex: 9, + zIndex: 4, position: 'absolute', width: `${divWidth}px`, }" @@ -107,7 +108,7 @@ :style="{ top: '100px', left: `${divWidth * 3 + 75}px`, - zIndex: 9, + zIndex: 4, position: 'absolute', }" @click="getSelect(null)" @@ -276,6 +277,16 @@ if (key) { keyV = key; } + + if (checkedKeys.value.length > 0) { + let keys = []; + for (let i = 0; i < checkedKeys.value.length; i++) { + if (checkedKeys.value[i] !== '999999999') { + keys.push(checkedKeys.value[i]); + } + } + checkedKeys.value = keys; + } if (activeKey.value == '1') { if (checkedKeys.value.length == 0) { message.warning(mode.value == '0' ? '请先选择设备!' : '请先选择节点!'); diff --git a/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue b/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue index f1eef6d..4c7693c 100644 --- a/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue +++ b/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue @@ -53,6 +53,7 @@