diff --git a/hx-ai-intelligent/src/view/monitor/deviceMonitor/table/index.vue b/hx-ai-intelligent/src/view/monitor/deviceMonitor/table/index.vue index 280a377..be0f37f 100644 --- a/hx-ai-intelligent/src/view/monitor/deviceMonitor/table/index.vue +++ b/hx-ai-intelligent/src/view/monitor/deviceMonitor/table/index.vue @@ -5,7 +5,7 @@ bordered :pagination="false" style="width: 99%; height: 75%; margin-left: 0.5%" - :scroll="{ x: 2000, y: 450 }" /> + :scroll="{ x: x, y: 450 }" /> (); // 分页后的展示数据 let data = ref([]); + + const x = ref(2000); // 原始数据 let dataList = ref([]); let columns = ref([]); @@ -97,6 +99,7 @@ { title: '序号', width: 50, + align: 'center', customRender: ({ record, index }) => { // 自定义单元格内容,这里返回序号 if (index == 0) { @@ -139,6 +142,8 @@ { title: '设备名称', dataIndex: 'deviceName', + width: 100, + align: 'center', customCell: (record, rowIndex) => { if (rowIndex == undefined) { return { @@ -161,6 +166,8 @@ { title: '设备点位', dataIndex: 'devicePositionName', + width: 100, + align: 'center', customCell: (record, rowIndex) => { if (rowIndex == undefined) { return { @@ -187,6 +194,8 @@ { title: '计量单位', dataIndex: 'devicePositionUnit', + width: 100, + align: 'center', customCell: (record, rowIndex) => { if (rowIndex == undefined) { return { @@ -217,6 +226,8 @@ { title: '日期', dataIndex: 'time', + width: 100, + align: 'center', }, ]; @@ -227,8 +238,9 @@ let columnA: any[] = [...column]; let columnB: any[] = []; pageData.tableColumns.forEach((item) => { - columnB.push({ title: item, dataIndex: item }); + columnB.push({ title: item, dataIndex: item, width: 60, align: 'center' }); }); + x.value = 450 + pageData.tableColumns.length * 60; columnA.push(...columnB); columns.value = columnA; total.value = dataList.value.length; @@ -244,9 +256,14 @@ pageData, total, onChange, + x, }; }, }); - + diff --git a/hx-ai-intelligent/src/view/monitor/energyMonitor/analysisGraph/index.vue b/hx-ai-intelligent/src/view/monitor/energyMonitor/analysisGraph/index.vue index d3a9f89..ff726b1 100644 --- a/hx-ai-intelligent/src/view/monitor/energyMonitor/analysisGraph/index.vue +++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/analysisGraph/index.vue @@ -500,7 +500,7 @@ }; onMounted(() => { - draw(); + // draw(); }); // 下载图表 diff --git a/hx-ai-intelligent/src/view/monitor/energyMonitor/graphGraph/index.vue b/hx-ai-intelligent/src/view/monitor/energyMonitor/graphGraph/index.vue index cd3ab13..2e757a2 100644 --- a/hx-ai-intelligent/src/view/monitor/energyMonitor/graphGraph/index.vue +++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/graphGraph/index.vue @@ -155,7 +155,7 @@ chartInstance.setOption(option); }; onMounted(() => { - draw(); + // draw(); }); // 下载图表 @@ -177,6 +177,7 @@ downloadChart, data, haveData, + draw, }; }, }); diff --git a/hx-ai-intelligent/src/view/monitor/energyMonitor/page.vue b/hx-ai-intelligent/src/view/monitor/energyMonitor/page.vue index ea6755c..a08ddf2 100644 --- a/hx-ai-intelligent/src/view/monitor/energyMonitor/page.vue +++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/page.vue @@ -99,6 +99,11 @@ iconName.value = 'zhexiantu'; } else { iconName.value = 'biaoge1'; + if (activeKey.value == '1') { + treeRef.value.getSelectGraph(activeKey.value); + } else { + treeRef.value.getSelectAnalyse(activeKey.value); + } } } 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 0b9d14b..b5bb1a6 100644 --- a/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue +++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue @@ -480,8 +480,8 @@ expandedKeys.value = getAllKeys(treeData2.value); if (treeData2.value?.length >= 2) { checkedKeys.value.push(treeData2.value[0].key, treeData2.value[1].key); + getSelect(null); } - getSelect(null); }) .finally(() => { treeLoading.value = false; diff --git a/hx-ai-intelligent/src/view/monitor/environmentMonitor/averageData/config.ts b/hx-ai-intelligent/src/view/monitor/environmentMonitor/averageData/config.ts index c87de1d..6205007 100644 --- a/hx-ai-intelligent/src/view/monitor/environmentMonitor/averageData/config.ts +++ b/hx-ai-intelligent/src/view/monitor/environmentMonitor/averageData/config.ts @@ -4,7 +4,7 @@ export const tableColumns = [ customRender: (text: any) => { return text.index + 1; }, - width: 150, + width: 50, align: 'center', }, { diff --git a/hx-ai-intelligent/src/view/monitor/environmentMonitor/averageData/index.vue b/hx-ai-intelligent/src/view/monitor/environmentMonitor/averageData/index.vue index e43a5da..f760d54 100644 --- a/hx-ai-intelligent/src/view/monitor/environmentMonitor/averageData/index.vue +++ b/hx-ai-intelligent/src/view/monitor/environmentMonitor/averageData/index.vue @@ -9,7 +9,7 @@ bordered :pagination="false" style="height: 75%" - :scroll="{ x: 200, y: 450 }"> + :scroll="{ x: x, y: 450 }">