From fac32cd2e028f74f0c33e1c3103ed8965e6c8247 Mon Sep 17 00:00:00 2001 From: GGJ <357021191@qq.com> Date: Mon, 24 Jun 2024 17:41:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=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 | 8 +++ src/components/table/fieldRender/index.vue | 1 + .../panorama/components/cityMapR.vue | 5 +- .../panorama/components/details/technique.vue | 58 ++++++------------- .../panorama/components/mapR.vue | 33 +++++++---- .../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 +- types/table.d.ts | 1 + 18 files changed, 63 insertions(+), 67 deletions(-) diff --git a/src/api/device-boot/panorama.ts b/src/api/device-boot/panorama.ts index 0e0c6a50..e892ee4b 100644 --- a/src/api/device-boot/panorama.ts +++ b/src/api/device-boot/panorama.ts @@ -153,3 +153,11 @@ export function getGridDiagramStatistics(data: any) { export function getGridDiagramRunData(data: any) { return request({ url: '/harmonic-boot/gridDiagram/getGridDiagramRunData', method: 'post', data }) } +//技术监督首页数据展示 +export function getSupervisionData(data: any) { + return request({ url: '/supervision-boot/gridDiagram/getSupervisionData', method: 'post', data }) +} +//技术监督详细页面展示 +export function getSupervisionDetailsData(data: any) { + return request({ url: '/supervision-boot/gridDiagram/getSupervisionDetailsData', method: 'post', data }) +} diff --git a/src/components/table/fieldRender/index.vue b/src/components/table/fieldRender/index.vue index e2e7dcd8..7727ab7a 100644 --- a/src/components/table/fieldRender/index.vue +++ b/src/components/table/fieldRender/index.vue @@ -71,6 +71,7 @@ :class="btn.class" class="table-operate" :type="btn.type" + :disabled="btn.showDisabled" :loading="props.row.loading || false" v-bind="btn.attr" > diff --git a/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue b/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue index 7af38a9c..d2371181 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue @@ -164,10 +164,7 @@ const Voltage: any = [ label: '用户投诉', value: '2' }, - { - label: '谐波普测', - value: '3' - } + ] const active: any = ref(Voltage[0].value) diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/technique.vue b/src/views/pqs/qualityInspeection/panorama/components/details/technique.vue index 048399ff..eddc69f3 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/details/technique.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/details/technique.vue @@ -3,14 +3,14 @@
- - - + + + - - - - + + + +
@@ -22,39 +22,10 @@ import { ref } from 'vue' import MyEChart from '@/components/echarts/MyEchart.vue' import { defaultAttribute } from '@/components/table/defaultAttribute' - +import { getSupervisionDetailsData } from '@/api/device-boot/panorama' const dialogVisible: any = ref(false) -const tableData: any = ref([ - { - devName: '张家口', - num: '' - }, - { - devName: '秦皇岛', - num: '' - }, - { - devName: '承德', - num: '' - }, - { - devName: '唐山', - num: '' - }, - { - devName: '廊坊', - num: '' - }, - { - devName: '风光储', - num: '' - }, - { - devName: '超高压', - num: '' - } -]) +const tableData: any = ref([]) const picEChart = ref({ title: { @@ -62,14 +33,17 @@ const picEChart = ref({ }, xAxis: { name: '(区域)', - data: ['技术监督计划', '用户投诉', '谐波普测问题', '在线率问题'] + data: ['技术监督计划', '用户投诉', '在线率问题'] }, + yAxis: { name: '', min: 0, max: 100 }, + options: { + dataZoom: null, series: [ { name: '问题个数', @@ -87,6 +61,9 @@ const picEChart = ref({ }) const open = async (row: any) => { dialogVisible.value = true + getSupervisionDetailsData(row).then(res => { + tableData.value = res.data + }) } defineExpose({ open }) @@ -94,4 +71,5 @@ defineExpose({ open }) +} + diff --git a/src/views/pqs/qualityInspeection/panorama/components/mapR.vue b/src/views/pqs/qualityInspeection/panorama/components/mapR.vue index 4725ca93..9a0467a4 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/mapR.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/mapR.vue @@ -194,29 +194,29 @@
异常问题总数： - 0个 + {{ technology?.abnormalNum }}个
已关联工单数： - 0个 + {{ technology?.associatedNum }}个
　工单转换率： - 0% + {{ technology?.conversionNum }}%
工单总是 - 0个 + {{ technology?.workNum }}个
已处理工单数： - 0个 + {{ technology?.processedNum }}个
　工单处置率： - 0% + {{ technology?.disposalNum }}%
@@ -257,7 +257,12 @@ import Evaluate from './details/evaluate.vue' import steadyState from './details/steadyState.vue' import temporaryState from './details/temporaryState.vue' import technique from './details/technique.vue' -import { getAssessOverview, getEvaluationOverview, getEventLevelEvaluation } from '@/api/device-boot/panorama' +import { + getAssessOverview, + getEvaluationOverview, + getEventLevelEvaluation, + getSupervisionData +} from '@/api/device-boot/panorama' const dictData = useDictData() const show = ref(false) const height = mainHeight(30) @@ -295,6 +300,7 @@ const options = ref([ value: '5' } ]) +const technology: any = ref({}) const harmonicType = ref('0') const transientNum = ref([0, 0]) const options1: any = dictData.getBasicData('Event_Statis').filter(item => { @@ -338,10 +344,7 @@ const JDlist = ref([ name: '用户投诉', value: 0 }, - { - name: '谐波普测', - value: 0 - } + ]) const harmonicList: any = ref([]) const harmonicLineRatio: any = ref(0) @@ -382,6 +385,14 @@ const info = (row: any) => { assessList.value = res.data }) }, 300) + // 技术监督查询 + getSupervisionData(form).then(res => { + technology.value = res.data + JDlist.value[0].value = res.data?.surveyNum || 0 + JDlist.value[1].value = res.data?.onLineNum || 0 + JDlist.value[2].value = res.data?.userNum || 0 + + }) } const harmonicChange = () => { getEvaluationOverview({ ...formRow.value, harmonicType: harmonicType.value }).then(res => { diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue index 418af924..14599baf 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', - disabled: row => { + showDisabled: 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 19ef0364..605e1bdc 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', - disabled: row => { + showDisabled: 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 37cd3c50..83cbe237 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', - disabled: row => { + showDisabled: 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 efe60b33..9c455be9 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', - disabled: row => { + showDisabled: 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 0a5b2a6f..e165ba6b 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', - disabled: row => { + showDisabled: 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 82d30872..3fae490f 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', - disabled: row => { + showDisabled: 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 2d3729e8..6d5db630 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', - disabled: row => { + showDisabled: 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 289e9131..6b5b660e 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', - disabled: row => { + showDisabled: 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 af43b484..7e3b2ce9 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', - disabled: row => { + showDisabled: 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 fc4b427f..aca51204 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', - disabled: row => { + showDisabled: 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 f033d5ac..df8436dd 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', - disabled: row => { + showDisabled: 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 db7bc8b7..9e8ebc81 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', - disabled: row => { + showDisabled: row => { return row.createBy != adminInfo.$state.id || !(row.status == 0) }, click: row => { diff --git a/types/table.d.ts b/types/table.d.ts index 43b19cf5..905edbff 100644 --- a/types/table.d.ts +++ b/types/table.d.ts @@ -95,6 +95,7 @@ declare global { // 按钮是否禁用，请返回布尔值 disabled?: (row: TableRow, field: TableColumn) => boolean + showDisabled?: (row: TableRow, field: TableColumn) => boolean // 自定义el-button属性 attr?: Partial> }