diff --git a/src/components/cockpit/dataCleaning/index.vue b/src/components/cockpit/dataCleaning/index.vue index 24d6087a..3a14c82e 100644 --- a/src/components/cockpit/dataCleaning/index.vue +++ b/src/components/cockpit/dataCleaning/index.vue @@ -42,7 +42,8 @@ {{ isNaN((monitoringPoints.abnormalNum / monitoringPoints.runNum) * 100) ? 0 - : ((monitoringPoints.abnormalNum / monitoringPoints.runNum) * 100).toFixed(2) + : Math.floor((monitoringPoints.abnormalNum / monitoringPoints.runNum) * 10000) / + 100 }}% diff --git a/src/components/cockpit/terminalEvaluation/index.vue b/src/components/cockpit/terminalEvaluation/index.vue index 71617a26..3dfcd265 100644 --- a/src/components/cockpit/terminalEvaluation/index.vue +++ b/src/components/cockpit/terminalEvaluation/index.vue @@ -31,7 +31,7 @@
{{ statisticsList.checkNum }}
-
检修
+
调试
{{ statisticsList.stopRunNum }}
@@ -201,9 +201,9 @@ const tableStore: any = new TableStore({ // tableStore.table.data statisticsList.value.allNum = totalData.value.length - statisticsList.value.runNum = tableStore.table.data.allNum - statisticsList.value.checkNum = tableStore.table.data.allNum - statisticsList.value.stopRunNum = tableStore.table.data.allNum + statisticsList.value.runNum = totalData.value.filter(item => item.runFlag === '运行').length + statisticsList.value.checkNum = totalData.value.filter(item => item.runFlag === '调试').length + statisticsList.value.stopRunNum = totalData.value.filter(item => item.runFlag === '停运').length abnormal.value = tableStore.table.data } diff --git a/src/views/pqs/harmonicMonitoring/embed/lntegruty/index_JB.vue b/src/views/pqs/harmonicMonitoring/embed/lntegruty/index_JB.vue index 60b73b08..68b5ab17 100644 --- a/src/views/pqs/harmonicMonitoring/embed/lntegruty/index_JB.vue +++ b/src/views/pqs/harmonicMonitoring/embed/lntegruty/index_JB.vue @@ -346,7 +346,7 @@ const echart = () => { name: '异常占比', type: 'bar', barWidth: 13, - data: [monitoringPoints.value.totalOnlineRate - 0], + data: [monitoringPoints.value.totalOnlineRate ==0?'':monitoringPoints.value.totalOnlineRate], z: 0, zlevel: 0, itemStyle: { diff --git a/src/views/pqs/harmonicMonitoring/embed/onlinerate/index_JB.vue b/src/views/pqs/harmonicMonitoring/embed/onlinerate/index_JB.vue index 4de29186..14af25b6 100644 --- a/src/views/pqs/harmonicMonitoring/embed/onlinerate/index_JB.vue +++ b/src/views/pqs/harmonicMonitoring/embed/onlinerate/index_JB.vue @@ -345,7 +345,7 @@ const echart = () => { name: '异常占比', type: 'bar', barWidth: 13, - data: [monitoringPoints.value.totalOnlineRate - 0], + data: [monitoringPoints.value.totalOnlineRate == 0 ? '' : monitoringPoints.value.totalOnlineRate], z: 0, zlevel: 0, itemStyle: { diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue index ea3158b4..5e08ab70 100644 --- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue +++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue @@ -44,6 +44,9 @@ + + + + + + + + + + + + + + + + + + + +
+
+
+ +
+ + + diff --git a/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue b/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue index d5d84de0..5879189c 100644 --- a/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue +++ b/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue @@ -165,14 +165,7 @@ const exportEvent = () => { exportExcel(luckysheet.getAllSheets(), '统计报表下载') } const exportReport = () => { - if (!line) { - ElMessage({ - type: 'warning', - - message: '请选择要导出的数据' - }) - return - } + loading.value = true let form = new FormData() form.append('isUrl', false) diff --git a/src/views/pqs/runManage/alarmCleaning/components/alarm.vue b/src/views/pqs/runManage/alarmCleaning/components/alarm.vue index 94bb1b15..183922b7 100644 --- a/src/views/pqs/runManage/alarmCleaning/components/alarm.vue +++ b/src/views/pqs/runManage/alarmCleaning/components/alarm.vue @@ -1,614 +1,615 @@ - - - - + + + + diff --git a/src/views/pqs/runManage/cleaning/components/abnormal.vue b/src/views/pqs/runManage/cleaning/components/abnormal.vue index 63993a99..91b4107f 100644 --- a/src/views/pqs/runManage/cleaning/components/abnormal.vue +++ b/src/views/pqs/runManage/cleaning/components/abnormal.vue @@ -60,7 +60,8 @@ {{ isNaN((monitoringPoints.abnormalNum / monitoringPoints.runNum) * 100) ? 0 - : ((monitoringPoints.abnormalNum / monitoringPoints.runNum) * 100).toFixed(2) + : Math.floor((monitoringPoints.abnormalNum / monitoringPoints.runNum) * 10000) / + 100 }}%
diff --git a/src/views/pqs/runManage/runEvaluate/components/statistics.vue b/src/views/pqs/runManage/runEvaluate/components/statistics.vue index fb1210c2..9c133ab8 100644 --- a/src/views/pqs/runManage/runEvaluate/components/statistics.vue +++ b/src/views/pqs/runManage/runEvaluate/components/statistics.vue @@ -1,22 +1,22 @@
- - - +
@@ -82,7 +80,7 @@ {{ o.count }} @@ -197,7 +195,7 @@ import statistics from './components/statistics.vue' import MyEchart from '@/components/echarts/MyEchart.vue' import { getMonitorVerifyDay } from '@/api/device-boot/dataVerify' defineOptions({ - name: 'harmonic-boot/harmonic/getIntegrityData' + name: 'runManage/runEvaluate' }) const dictData = useDictData() @@ -267,9 +265,9 @@ const tableStore = new TableStore({ // tableStore.table.data statisticsList.value.allNum = totalData.value.length - statisticsList.value.runNum = tableStore.table.data.allNum - statisticsList.value.checkNum = tableStore.table.data.allNum - statisticsList.value.stopRunNum = tableStore.table.data.allNum + statisticsList.value.runNum = totalData.value.filter(item => item.runFlag === '运行').length + statisticsList.value.checkNum = totalData.value.filter(item => item.runFlag === '调试').length + statisticsList.value.stopRunNum = totalData.value.filter(item => item.runFlag === '停运').length abnormal.value = tableStore.table.data // 合并子集数据 并去重 @@ -423,6 +421,16 @@ const totalTable = (num: number, t: string) => { loading.value = false } + +const change = (e: string) => { + title.value = e==''?'' : e+'_' + loading.value = true + pageNum.value = 1 + dataList.value = [] + dataList.value = totalData.value.filter(item => item.runFlag == e) + loading.value = false +} + // 渲染表格 const renderTable = (list: any, t: string) => { title.value = t diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/index.vue index 948b46fb..6bc0f459 100644 --- a/src/views/pqs/voltageSags/monitoringPoint/online/index.vue +++ b/src/views/pqs/voltageSags/monitoringPoint/online/index.vue @@ -13,7 +13,7 @@ - + @@ -31,7 +31,7 @@ import TransientReport from './transientReport/index.vue' import { mainHeight } from '@/utils/layout' import router from '@/router' import { useMonitoringPoint } from '@/stores/monitoringPoint' - +const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei' defineOptions({ name: 'Descentsystem/monitoringpoint' }) diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/transientReport/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/transientReport/index.vue index c627fe29..23175faa 100644 --- a/src/views/pqs/voltageSags/monitoringPoint/online/transientReport/index.vue +++ b/src/views/pqs/voltageSags/monitoringPoint/online/transientReport/index.vue @@ -155,8 +155,8 @@ const dotList: any = ref({ }) const formd: any = ref({ - xq: false, - lb: false, + xq: true, + lb: true, mdbg: false, mdtx: false, sjdITIC: false,