From 6292e7ab1804b415d475e32764e8ea09e778c7b8 Mon Sep 17 00:00:00 2001 From: GGJ <357021191@qq.com> Date: Mon, 24 Jun 2024 17:53:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=A6=81=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/device-boot/panorama.ts | 4 ++ .../panorama/components/details/technique.vue | 69 ++++++++++--------- .../harmonicSurvey/components/planManage.vue | 2 +- .../harmonicSurvey/components/testManage.vue | 2 +- .../normalizationManager/programReview.vue | 2 +- .../components/undocumented/index.vue | 2 +- src/views/pqs/supervise/retire/monitor.vue | 2 +- src/views/pqs/supervise/retire/terminal.vue | 2 +- .../supervise/technology/components/alarm.vue | 2 +- .../technology/components/earlyWarn.vue | 2 +- .../components/jointDebugList/index.vue | 2 +- .../components/monitorpoint/index.vue | 2 +- .../components/terminainal/index.vue | 2 +- src/views/pqs/supervise/testRun/index.vue | 2 +- 14 files changed, 52 insertions(+), 45 deletions(-) diff --git a/src/api/device-boot/panorama.ts b/src/api/device-boot/panorama.ts index e892ee4b..e02c1530 100644 --- a/src/api/device-boot/panorama.ts +++ b/src/api/device-boot/panorama.ts @@ -161,3 +161,7 @@ export function getSupervisionData(data: any) { export function getSupervisionDetailsData(data: any) { return request({ url: '/supervision-boot/gridDiagram/getSupervisionDetailsData', method: 'post', data }) } +//技术监督市级详细页面展示 +export function getSupervisionCityDetailsData(data: any) { + return request({ url: '/supervision-boot/gridDiagram/getSupervisionCityDetailsData', method: 'post', data }) +} diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/technique.vue b/src/views/pqs/qualityInspeection/panorama/components/details/technique.vue index eddc69f3..f97bb0c8 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/details/technique.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/details/technique.vue @@ -22,48 +22,51 @@ import { ref } from 'vue' import MyEChart from '@/components/echarts/MyEchart.vue' import { defaultAttribute } from '@/components/table/defaultAttribute' -import { getSupervisionDetailsData } from '@/api/device-boot/panorama' +import { getSupervisionDetailsData, getSupervisionCityDetailsData } from '@/api/device-boot/panorama' const dialogVisible: any = ref(false) const tableData: any = ref([]) -const picEChart = ref({ - title: { - text: '' - }, - xAxis: { - name: '(区域)', - data: ['技术监督计划', '用户投诉', '在线率问题'] - }, - - yAxis: { - name: '', - min: 0, - max: 100 - }, - - options: { - dataZoom: null, - series: [ - { - name: '问题个数', - type: 'bar', - data: [12, 12, 12, 12] - }, - { - name: '已处理', - type: 'bar', - - data: [12, 12, 12, 12] - } - ] - } -}) +const picEChart = ref({}) const open = async (row: any) => { dialogVisible.value = true getSupervisionDetailsData(row).then(res => { tableData.value = res.data }) + getSupervisionCityDetailsData(row).then(res => { + picEChart.value = { + title: { + text: '' + }, + xAxis: { + name: '', + data: ['技术监督计划', '用户投诉', '在线率问题'] + }, + + yAxis: { + name: '', + min: 0, + max: 100 + }, + + options: { + dataZoom: null, + series: [ + { + name: '问题个数', + type: 'bar', + data: [res.data.survey.abnormalNum, res.data.user.abnormalNum, res.data.onLine.abnormalNum] + }, + { + name: '已处理', + type: 'bar', + + data: [res.data.survey.processedNum, res.data.user.processedNum, res.data.onLine.processedNum] + } + ] + } + } + }) } defineExpose({ open }) diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue index 14599baf..418af924 100644 --- a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue +++ b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue @@ -159,7 +159,7 @@ const tableStore = new TableStore({ type: 'primary', icon: 'el-icon-Open', render: 'basicButton', - showDisabled: row => { + disabled: row => { return row.createBy != adminInfo.$state.id || !(row.status == 0) }, click: row => { diff --git a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue index 605e1bdc..19ef0364 100644 --- a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue +++ b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue @@ -176,7 +176,7 @@ const tableStore = new TableStore({ type: 'primary', icon: 'el-icon-Open', render: 'basicButton', - showDisabled: row => { + disabled: row => { return row.createBy != adminInfo.$state.id || !(row.status == 0) }, click: row => { diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue index 83cbe237..37cd3c50 100644 --- a/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue +++ b/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue @@ -177,7 +177,7 @@ const tableStore = new TableStore({ type: 'primary', icon: 'el-icon-Open', render: 'basicButton', - showDisabled: row => { + disabled: row => { return row.createBy != adminInfo.$state.id || !(row.status == 0) }, click: row => { diff --git a/src/views/pqs/supervise/interfere/components/undocumented/index.vue b/src/views/pqs/supervise/interfere/components/undocumented/index.vue index 9c455be9..efe60b33 100644 --- a/src/views/pqs/supervise/interfere/components/undocumented/index.vue +++ b/src/views/pqs/supervise/interfere/components/undocumented/index.vue @@ -171,7 +171,7 @@ const tableStore = new TableStore({ type: 'primary', icon: 'el-icon-Open', render: 'basicButton', - showDisabled: row => { + disabled: row => { return row.createBy != adminInfo.$state.id || !(row.status == 0) }, click: row => { diff --git a/src/views/pqs/supervise/retire/monitor.vue b/src/views/pqs/supervise/retire/monitor.vue index e165ba6b..0a5b2a6f 100644 --- a/src/views/pqs/supervise/retire/monitor.vue +++ b/src/views/pqs/supervise/retire/monitor.vue @@ -175,7 +175,7 @@ const tableStore = new TableStore({ type: 'primary', icon: 'el-icon-Open', render: 'basicButton', - showDisabled: row => { + disabled: row => { return row.createBy != adminInfo.$state.id || !(row.status == 0) }, click: row => { diff --git a/src/views/pqs/supervise/retire/terminal.vue b/src/views/pqs/supervise/retire/terminal.vue index 3fae490f..82d30872 100644 --- a/src/views/pqs/supervise/retire/terminal.vue +++ b/src/views/pqs/supervise/retire/terminal.vue @@ -172,7 +172,7 @@ const tableStore = new TableStore({ type: 'primary', icon: 'el-icon-Open', render: 'basicButton', - showDisabled: row => { + disabled: row => { return row.createBy != adminInfo.$state.id || !(row.status == 0) }, click: row => { diff --git a/src/views/pqs/supervise/technology/components/alarm.vue b/src/views/pqs/supervise/technology/components/alarm.vue index 6d5db630..2d3729e8 100644 --- a/src/views/pqs/supervise/technology/components/alarm.vue +++ b/src/views/pqs/supervise/technology/components/alarm.vue @@ -170,7 +170,7 @@ const tableStore = new TableStore({ type: 'primary', icon: 'el-icon-Open', render: 'basicButton', - showDisabled: row => { + disabled: row => { return row.createBy != adminInfo.$state.id || !(row.status == 0) }, click: row => { diff --git a/src/views/pqs/supervise/technology/components/earlyWarn.vue b/src/views/pqs/supervise/technology/components/earlyWarn.vue index 6b5b660e..289e9131 100644 --- a/src/views/pqs/supervise/technology/components/earlyWarn.vue +++ b/src/views/pqs/supervise/technology/components/earlyWarn.vue @@ -152,7 +152,7 @@ const tableStore = new TableStore({ type: 'primary', icon: 'el-icon-Open', render: 'basicButton', - showDisabled: row => { + disabled: row => { return row.createBy != adminInfo.$state.id || !(row.status == 0) }, click: row => { diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue index 7e3b2ce9..af43b484 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue @@ -135,7 +135,7 @@ const tableStore = new TableStore({ type: 'primary', icon: 'el-icon-Open', render: 'basicButton', - showDisabled: row => { + disabled: row => { return row.createBy != adminInfo.$state.id || !(row.status == 0) }, click: row => { diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue index aca51204..fc4b427f 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue @@ -129,7 +129,7 @@ const tableStore = new TableStore({ type: 'primary', icon: 'el-icon-Open', render: 'basicButton', - showDisabled: row => { + disabled: row => { return row.createBy != adminInfo.$state.id || !(row.status == 0) }, click: row => { diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue index df8436dd..f033d5ac 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue @@ -172,7 +172,7 @@ const tableStore = new TableStore({ type: 'primary', icon: 'el-icon-Open', render: 'basicButton', - showDisabled: row => { + disabled: row => { return row.createBy != adminInfo.$state.id || !(row.status == 0) }, click: row => { diff --git a/src/views/pqs/supervise/testRun/index.vue b/src/views/pqs/supervise/testRun/index.vue index 9e8ebc81..db7bc8b7 100644 --- a/src/views/pqs/supervise/testRun/index.vue +++ b/src/views/pqs/supervise/testRun/index.vue @@ -157,7 +157,7 @@ const tableStore = new TableStore({ type: 'primary', icon: 'el-icon-Open', render: 'basicButton', - showDisabled: row => { + disabled: row => { return row.createBy != adminInfo.$state.id || !(row.status == 0) }, click: row => {