From c80cbe20fbab105a1b8989d15d0ca214d8a3721e Mon Sep 17 00:00:00 2001 From: zhujiyan <17812234322@163.com> Date: Mon, 5 Aug 2024 18:07:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=90=E6=B3=A2=E7=9B=91=E6=B5=8B-?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F-=E7=BB=88=E7=AB=AF=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E7=8E=87=E9=A1=B5=E9=9D=A2=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/harmonic-boot/area.ts | 49 + src/components/UploadFile/src/UploadFile.vue | 2 +- src/components/UploadFile/src/UploadImgs.vue | 2 +- .../area/harmonicdistortionrate.vue | 672 +++++++++++ .../area/integralitytable.vue | 718 +++++++++++ .../onlinerate/components/onlineCharts.vue | 305 +++++ .../onlinerate/components/onlineratetable.vue | 377 ++++++ .../area/onlinerate/index.vue | 401 ++++++ .../area/powerassessment.vue | 414 +++++++ .../harmonicMonitoring/area/qualifiedRate.vue | 620 ++++++++++ .../harmonicMonitoring/area/qypowerment.vue | 884 ++++++++++++++ .../harmonicMonitoring/area/steadystate.vue | 671 +++++++++++ .../area/terminalonlinerate.vue | 618 ++++++++++ .../area/transienteventlist.vue | 1073 +++++++++++++++++ src/views/pqs/supervise/testRun/index.vue | 1 + 15 files changed, 6805 insertions(+), 2 deletions(-) create mode 100644 src/api/harmonic-boot/area.ts create mode 100644 src/views/pqs/harmonicMonitoring/area/harmonicdistortionrate.vue create mode 100644 src/views/pqs/harmonicMonitoring/area/integralitytable.vue create mode 100644 src/views/pqs/harmonicMonitoring/area/onlinerate/components/onlineCharts.vue create mode 100644 src/views/pqs/harmonicMonitoring/area/onlinerate/components/onlineratetable.vue create mode 100644 src/views/pqs/harmonicMonitoring/area/onlinerate/index.vue create mode 100644 src/views/pqs/harmonicMonitoring/area/powerassessment.vue create mode 100644 src/views/pqs/harmonicMonitoring/area/qualifiedRate.vue create mode 100644 src/views/pqs/harmonicMonitoring/area/qypowerment.vue create mode 100644 src/views/pqs/harmonicMonitoring/area/steadystate.vue create mode 100644 src/views/pqs/harmonicMonitoring/area/terminalonlinerate.vue create mode 100644 src/views/pqs/harmonicMonitoring/area/transienteventlist.vue diff --git a/src/api/harmonic-boot/area.ts b/src/api/harmonic-boot/area.ts new file mode 100644 index 00000000..65aa3148 --- /dev/null +++ b/src/api/harmonic-boot/area.ts @@ -0,0 +1,49 @@ +import request from '@/utils/request' + +export function getTypeIdData(data: any) { + return request({ + url: '/system-boot/dictData/getTypeIdData', + method: 'post', + data: data + }) +} +export function getOnlineRateData2(data:any) { + return request({ + url: '/harmonic-boot/onlineRateData/getOnlineRateData', + method: 'post', + data: data + }) +} +export function getAreaDept() { + return request({ + url: '/user-boot/dept/loginDeptTree', + method: 'post' + }) +} +export function getOnlineRateDataCensus(data:any) { + return request({ + url: '/device-boot/terminalOnlineRateData/getOnlineRateDataCensus', + method: 'post', + data: data + }) +} +export function IntegrityIcon(data:any) { + return request({ + url: '/harmonic-boot/integrity/getIntegrityIcon', + method: 'post', + data: data + }) +} +export function getDeptIdAreaTree() { + return request({ + url: '/system-boot/area/getDeptIdAreaTree', + method: 'post' + }) +} +export function getOnlineRateData(data:any) { + return request({ + url: '/device-boot/terminalOnlineRateData/getOnlineRateData', + method: 'post', + data: data + }) +} diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue index eb228d90..d08dca1c 100644 --- a/src/components/UploadFile/src/UploadFile.vue +++ b/src/components/UploadFile/src/UploadFile.vue @@ -61,7 +61,7 @@ import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from import { isString } from '@/utils/is' import { useUpload } from '@/components/UploadFile/src/useUpload' import { UploadFile } from 'element-plus/es/components/upload/src/upload' - +import { useMessage } from '@/hooks/web/useMessage' defineOptions({ name: 'UploadFile' }) const message = useMessage() // 消息弹窗 diff --git a/src/components/UploadFile/src/UploadImgs.vue b/src/components/UploadFile/src/UploadImgs.vue index 87d3c2c5..4ccc3411 100644 --- a/src/components/UploadFile/src/UploadImgs.vue +++ b/src/components/UploadFile/src/UploadImgs.vue @@ -53,7 +53,7 @@ import { ElNotification } from 'element-plus' import { propTypes } from '@/utils/propTypes' import { useUpload } from '@/components/UploadFile/src/useUpload' import { Plus, Edit, ZoomIn, Delete } from '@element-plus/icons-vue' - +import { useMessage } from '@/hooks/web/useMessage' defineOptions({ name: 'UploadImgs' }) const message = useMessage() // 消息弹窗 diff --git a/src/views/pqs/harmonicMonitoring/area/harmonicdistortionrate.vue b/src/views/pqs/harmonicMonitoring/area/harmonicdistortionrate.vue new file mode 100644 index 00000000..963832af --- /dev/null +++ b/src/views/pqs/harmonicMonitoring/area/harmonicdistortionrate.vue @@ -0,0 +1,672 @@ + + + diff --git a/src/views/pqs/harmonicMonitoring/area/integralitytable.vue b/src/views/pqs/harmonicMonitoring/area/integralitytable.vue new file mode 100644 index 00000000..8887530d --- /dev/null +++ b/src/views/pqs/harmonicMonitoring/area/integralitytable.vue @@ -0,0 +1,718 @@ + + + diff --git a/src/views/pqs/harmonicMonitoring/area/onlinerate/components/onlineCharts.vue b/src/views/pqs/harmonicMonitoring/area/onlinerate/components/onlineCharts.vue new file mode 100644 index 00000000..1bb34330 --- /dev/null +++ b/src/views/pqs/harmonicMonitoring/area/onlinerate/components/onlineCharts.vue @@ -0,0 +1,305 @@ + + + diff --git a/src/views/pqs/harmonicMonitoring/area/onlinerate/components/onlineratetable.vue b/src/views/pqs/harmonicMonitoring/area/onlinerate/components/onlineratetable.vue new file mode 100644 index 00000000..53dc50d6 --- /dev/null +++ b/src/views/pqs/harmonicMonitoring/area/onlinerate/components/onlineratetable.vue @@ -0,0 +1,377 @@ + + + diff --git a/src/views/pqs/harmonicMonitoring/area/onlinerate/index.vue b/src/views/pqs/harmonicMonitoring/area/onlinerate/index.vue new file mode 100644 index 00000000..f67fca6a --- /dev/null +++ b/src/views/pqs/harmonicMonitoring/area/onlinerate/index.vue @@ -0,0 +1,401 @@ + + + diff --git a/src/views/pqs/harmonicMonitoring/area/powerassessment.vue b/src/views/pqs/harmonicMonitoring/area/powerassessment.vue new file mode 100644 index 00000000..bec96e5c --- /dev/null +++ b/src/views/pqs/harmonicMonitoring/area/powerassessment.vue @@ -0,0 +1,414 @@ + + + diff --git a/src/views/pqs/harmonicMonitoring/area/qualifiedRate.vue b/src/views/pqs/harmonicMonitoring/area/qualifiedRate.vue new file mode 100644 index 00000000..68b1fab5 --- /dev/null +++ b/src/views/pqs/harmonicMonitoring/area/qualifiedRate.vue @@ -0,0 +1,620 @@ + + + diff --git a/src/views/pqs/harmonicMonitoring/area/qypowerment.vue b/src/views/pqs/harmonicMonitoring/area/qypowerment.vue new file mode 100644 index 00000000..6fa34b76 --- /dev/null +++ b/src/views/pqs/harmonicMonitoring/area/qypowerment.vue @@ -0,0 +1,884 @@ + + + + + diff --git a/src/views/pqs/harmonicMonitoring/area/steadystate.vue b/src/views/pqs/harmonicMonitoring/area/steadystate.vue new file mode 100644 index 00000000..566e7b25 --- /dev/null +++ b/src/views/pqs/harmonicMonitoring/area/steadystate.vue @@ -0,0 +1,671 @@ + + + diff --git a/src/views/pqs/harmonicMonitoring/area/terminalonlinerate.vue b/src/views/pqs/harmonicMonitoring/area/terminalonlinerate.vue new file mode 100644 index 00000000..cb84685a --- /dev/null +++ b/src/views/pqs/harmonicMonitoring/area/terminalonlinerate.vue @@ -0,0 +1,618 @@ + + + diff --git a/src/views/pqs/harmonicMonitoring/area/transienteventlist.vue b/src/views/pqs/harmonicMonitoring/area/transienteventlist.vue new file mode 100644 index 00000000..052ec010 --- /dev/null +++ b/src/views/pqs/harmonicMonitoring/area/transienteventlist.vue @@ -0,0 +1,1073 @@ + + + + diff --git a/src/views/pqs/supervise/testRun/index.vue b/src/views/pqs/supervise/testRun/index.vue index 3db864e3..33c38699 100644 --- a/src/views/pqs/supervise/testRun/index.vue +++ b/src/views/pqs/supervise/testRun/index.vue @@ -317,6 +317,7 @@ const startRunTest = () => { // 下载报告 const downloadTheReport = (url: string) => { getFileNameAndFilePath({ filePath: url }).then((res: any) => { + console.log(res.data.url,"res"); const link = document.createElement('a') link.href = res.data.url link.download = res.data.name From 7a76394c754b5d45485cd05acb2b6e396270d859 Mon Sep 17 00:00:00 2001 From: zhujiyan <17812234322@163.com> Date: Mon, 5 Aug 2024 18:07:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?echarts=E6=A0=87=E9=A2=98=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../embed/lntegruty/components/echart.vue | 23 +++++++++++++++++-- .../embed/onlinerate/components/echart.vue | 23 +++++++++++++++++-- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/echart.vue b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/echart.vue index 5cb1b700..9f57b801 100644 --- a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/echart.vue +++ b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/echart.vue @@ -97,9 +97,28 @@ const tableStore = new TableStore({ loadCallback: () => { // tableStore.table.data.type + let code = tableStore.table.params.statisticalType.code + let title = '', + titleX = '' + if (code == 'Power_Network') { + title = '区域' + titleX = '区域' + } else if (code == 'Manufacturer') { + title = '终端厂家' + titleX = '终端\n厂家' + } else if (code == 'Voltage_Level') { + title = '电压等级' + titleX = '电压\n等级' + } else if (code == 'Load_Type') { + title = '干扰源类型' + titleX = '干扰\n源类型' + } else if (code == 'Report_Type') { + title = '上报类型' + titleX = '上报\n类型' + } options.value = { title: { - text: tableStore.table.params.statisticalType.name + text: title }, tooltip: { formatter: function (params: any) { @@ -122,7 +141,7 @@ const tableStore = new TableStore({ right: '80px' }, xAxis: { - name: tableStore.table.params.statisticalType.name, + name: titleX, data: tableStore.table.data.map((item: any) => item.type) }, yAxis: { diff --git a/src/views/pqs/harmonicMonitoring/embed/onlinerate/components/echart.vue b/src/views/pqs/harmonicMonitoring/embed/onlinerate/components/echart.vue index 774dc496..d4ab82b3 100644 --- a/src/views/pqs/harmonicMonitoring/embed/onlinerate/components/echart.vue +++ b/src/views/pqs/harmonicMonitoring/embed/onlinerate/components/echart.vue @@ -97,9 +97,28 @@ const tableStore = new TableStore({ loadCallback: () => { // tableStore.table.data.type + let code = tableStore.table.params.statisticalType.code + let title = '', + titleX = '' + if (code == 'Power_Network') { + title = '区域' + titleX = '区域' + } else if (code == 'Manufacturer') { + title = '终端厂家' + titleX = '终端\n厂家' + } else if (code == 'Voltage_Level') { + title = '电压等级' + titleX = '电压\n等级' + } else if (code == 'Load_Type') { + title = '干扰源类型' + titleX = '干扰\n源类型' + } else if (code == 'Report_Type') { + title = '上报类型' + titleX = '上报\n类型' + } options.value = { title: { - text: tableStore.table.params.statisticalType.name + text: title }, tooltip: { formatter: function (params: any) { @@ -122,7 +141,7 @@ const tableStore = new TableStore({ right: '80px' }, xAxis: { - name: tableStore.table.params.statisticalType.name, + name: titleX, data: tableStore.table.data.type }, yAxis: {