From 117ae1a00719704d19fe8999d6011b78c91a681e Mon Sep 17 00:00:00 2001 From: GGJ <357021191@qq.com> Date: Mon, 15 Jan 2024 16:14:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A2=E5=BD=A2=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/api/common.ts | 7 + src/assets/img/dw.png | Bin 0 -> 1232 bytes src/assets/img/point.png | Bin 0 -> 3162 bytes src/components/echarts/rmsboxi.vue | 1544 +++++++++++++++++++++++++ src/components/echarts/shushiboxi.vue | 1155 ++++++++++++++++++ src/components/table/index.vue | 1 + src/styles/vxeTable.scss | 29 +- src/utils/layout.ts | 4 +- src/views/govern/alarm/Device.vue | 4 +- src/views/govern/alarm/Steady.vue | 4 +- src/views/govern/alarm/Transient.vue | 202 +++- src/views/govern/alarm/cope.vue | 135 +++ src/views/govern/alarm/index.vue | 2 +- 14 files changed, 3029 insertions(+), 59 deletions(-) create mode 100644 src/assets/img/dw.png create mode 100644 src/assets/img/point.png create mode 100644 src/components/echarts/rmsboxi.vue create mode 100644 src/components/echarts/shushiboxi.vue create mode 100644 src/views/govern/alarm/cope.vue diff --git a/package.json b/package.json index a40a24b..d542df9 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "echarts4": "npm:echarts@^4.9.0", "element-plus": "^2.4.4", "html2canvas": "^1.4.1", + "jquery": "^3.7.1", "lodash-es": "^4.17.21", "mitt": "^3.0.1", "nprogress": "^0.2.0", diff --git a/src/api/common.ts b/src/api/common.ts index d732440..df0d490 100644 --- a/src/api/common.ts +++ b/src/api/common.ts @@ -23,3 +23,10 @@ export function getDeviceTree() { method: 'POST' }) } +// 获取波形数据 +export function analyseWave(params:string) { + return createAxios({ + url: '/cs-harmonic-boot/event/analyseWave?eventId=' + params, + method: 'get' + }) +} diff --git a/src/assets/img/dw.png b/src/assets/img/dw.png new file mode 100644 index 0000000000000000000000000000000000000000..1e82f6bcc01ca050331bd58311c1c465ba2eb49e GIT binary patch literal 1232 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 +
+
+
+
+
+
+ + 下载 + +
+ + diff --git a/src/components/echarts/shushiboxi.vue b/src/components/echarts/shushiboxi.vue new file mode 100644 index 0000000..d45a47b --- /dev/null +++ b/src/components/echarts/shushiboxi.vue @@ -0,0 +1,1155 @@ + + + + diff --git a/src/components/table/index.vue b/src/components/table/index.vue index 6578b71..3c87a94 100644 --- a/src/components/table/index.vue +++ b/src/components/table/index.vue @@ -69,6 +69,7 @@ + diff --git a/src/styles/vxeTable.scss b/src/styles/vxeTable.scss index 23776b0..e6dbe9d 100644 --- a/src/styles/vxeTable.scss +++ b/src/styles/vxeTable.scss @@ -1,16 +1,25 @@ -.vxe-table--body-wrapper::-webkit-scrollbar { - width: 10px; - height: 10px; +.vxe-table--body-wrapper, +.boxbx { + &::-webkit-scrollbar { + width: 10px; + height: 10px; + } + &::-webkit-scrollbar-thumb { + border-radius: 5px; + height: 3px; + background-color: var(--el-color-primary) !important; + border-radius: 30px !important; + } } -.vxe-table--body-wrapper::-webkit-scrollbar-thumb { - border-radius: 5px; - height: 3px; - background-color: var(--el-color-primary) !important; - border-radius: 30px !important; -} +// .vxe-table--body-wrapper::-webkit-scrollbar-thumb { +// border-radius: 5px; +// height: 3px; +// background-color: var(--el-color-primary) !important; +// border-radius: 30px !important; +// } .vxe-header--row { background: var(--el-color-primary); color: var(--el-color-white); -} \ No newline at end of file +} diff --git a/src/utils/layout.ts b/src/utils/layout.ts index 31f8288..db46840 100644 --- a/src/utils/layout.ts +++ b/src/utils/layout.ts @@ -7,7 +7,7 @@ import { useConfig } from '@/stores/config' * @param extra main高度额外减去的px数,可以实现隐藏原有的滚动条 * @returns CSSProperties */ -export function mainHeight(extra = 0): CSSProperties { +export function mainHeight(extra = 0,divided =1): CSSProperties { let height = extra const adminLayoutMainExtraHeight: anyObj = { Default: 60, @@ -21,7 +21,7 @@ export function mainHeight(extra = 0): CSSProperties { } return { - height: 'calc(100vh - ' + height.toString() + 'px)' + height: 'calc((100vh - ' + height.toString() + 'px) / '+ divided+')' } } diff --git a/src/views/govern/alarm/Device.vue b/src/views/govern/alarm/Device.vue index 9982293..19edfa8 100644 --- a/src/views/govern/alarm/Device.vue +++ b/src/views/govern/alarm/Device.vue @@ -103,7 +103,9 @@ const sourceChange = (e: any) => { onMounted(() => { tableStore.index() }) - +setTimeout(() => { + tableStore.table.height = mainHeight(190).height as any +}, 0) const addMenu = () => {} diff --git a/src/views/govern/alarm/Steady.vue b/src/views/govern/alarm/Steady.vue index d41c5d3..e4e3a09 100644 --- a/src/views/govern/alarm/Steady.vue +++ b/src/views/govern/alarm/Steady.vue @@ -102,7 +102,9 @@ const sourceChange = (e: any) => { onMounted(() => { tableStore.index() }) - +setTimeout(() => { + tableStore.table.height = mainHeight(190).height as any +}, 0) const addMenu = () => {} diff --git a/src/views/govern/alarm/Transient.vue b/src/views/govern/alarm/Transient.vue index 375dba8..14d6462 100644 --- a/src/views/govern/alarm/Transient.vue +++ b/src/views/govern/alarm/Transient.vue @@ -1,56 +1,132 @@ - + diff --git a/src/views/govern/alarm/cope.vue b/src/views/govern/alarm/cope.vue new file mode 100644 index 0000000..71a2442 --- /dev/null +++ b/src/views/govern/alarm/cope.vue @@ -0,0 +1,135 @@ + + + diff --git a/src/views/govern/alarm/index.vue b/src/views/govern/alarm/index.vue index e222455..d9e4ad2 100644 --- a/src/views/govern/alarm/index.vue +++ b/src/views/govern/alarm/index.vue @@ -1,6 +1,6 @@