From cc515b627e843df2c2b3baccdc63aeed8aec6780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= Date: Fri, 1 Mar 2024 15:11:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E6=95=B0=E6=8D=AE=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/harmonic-boot/normLimit.ts | 16 + src/components/secondSheet/index.vue | 16 + .../online/gaojingshujutongji/index.vue | 559 +++++++++++++----- .../monitoringPoint/online/index.vue | 6 +- .../online/wentaishujufenxi/index.vue | 2 +- 5 files changed, 444 insertions(+), 155 deletions(-) create mode 100644 src/api/harmonic-boot/normLimit.ts create mode 100644 src/components/secondSheet/index.vue diff --git a/src/api/harmonic-boot/normLimit.ts b/src/api/harmonic-boot/normLimit.ts new file mode 100644 index 00000000..116db097 --- /dev/null +++ b/src/api/harmonic-boot/normLimit.ts @@ -0,0 +1,16 @@ +import request from '@/utils/request' + +export function getHistoryTableData(data:any) { + return request({ + url: '/harmonic-boot/normLimit/getHistoryTableData', + method: 'post', + data: data + }) +} +export function getHistoryLineData(data:any) { + return request({ + url: '/harmonic-boot/harmonic/getHistoryLineData', + method: 'post', + data: data + }) +} \ No newline at end of file diff --git a/src/components/secondSheet/index.vue b/src/components/secondSheet/index.vue new file mode 100644 index 00000000..d9bcc44e --- /dev/null +++ b/src/components/secondSheet/index.vue @@ -0,0 +1,16 @@ + + + diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/gaojingshujutongji/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/gaojingshujutongji/index.vue index 8c85bb77..2773a98f 100644 --- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/gaojingshujutongji/index.vue +++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/gaojingshujutongji/index.vue @@ -1,173 +1,430 @@ - diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue index f492147c..d33e7acf 100644 --- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue +++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue @@ -39,12 +39,12 @@ -
当前位置:{{ monitoringPoint.state.lineName }} -
+ --> @@ -75,7 +75,7 @@ const pointTree = ref() const size = ref(0) const isReload = ref(false) const height = mainHeight(40) -const activeName = ref('4') +const activeName = ref('5') onMounted(() => { const dom = document.getElementById('navigation-splitpanes') if (dom) { diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue index 2ad147f6..789c2956 100644 --- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue +++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue @@ -12,7 +12,7 @@ v-model="formData.condition" multiple collapse-tags - :multiple-limit="checked ? 3 : 1" + :multiple-limit="5" filterable placeholder="请选择指标" @change="conditionChange"