From 9b952f20166bd93c415b6a837d36a5b37f6a2bdc Mon Sep 17 00:00:00 2001 From: GGJ <357021191@qq.com> Date: Mon, 9 Dec 2024 09:22:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC=E5=BA=8F?= =?UTF-8?q?=E5=8F=B7=E4=BB=A5=E5=8F=8A=E5=88=86=E9=A1=B5=E5=BA=8F=E5=8F=B7?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../penal/listeners/ElementListeners.vue | 4 +- .../penal/listeners/UserTaskListeners.vue | 4 +- .../package/penal/listeners/template.js | 4 +- .../penal/properties/ElementProperties.vue | 2 +- .../penal/signal-message/SignalAndMessage.vue | 4 +- .../LN/newEnergy/newEnergyLedger/index.vue | 1 - .../bearingCapacity/evaluationList/index.vue | 4 +- .../bearingCapacity/userManagement/index.vue | 3 +- .../area/TransientEventList/index.vue | 2 +- .../detailed/alarmStatistics/index.vue | 2 +- .../detailed/overLabelDetails/index.vue | 2 +- .../detailed/regionalStatistics/index.vue | 2 +- .../reportForms/passing/index.vue | 2 +- .../runManage/monitoringPoints/index.vue | 2 +- .../runManage/terminalLedger/index.vue | 2 +- src/views/pqs/process/definition/index.vue | 2 +- .../electricalEnergy/components/audit.vue | 2 +- .../components/maintenance.vue | 2 +- .../components1/complaints.vue | 4 +- .../electricalEnergy/components1/online.vue | 4 +- .../components1/testQuestions.vue | 4 +- .../electricalEnergy/components1/testRun.vue | 5 + .../harmonicSurvey/components/planManage.vue | 2 +- .../harmonicSurvey/components/testManage.vue | 2 +- .../interferenceUserTable.vue | 126 ++++++++---------- .../normalizationManager/programReview.vue | 85 ++++++------ .../components/undocumented/index.vue | 4 +- .../plan/components/effectProblem/index.vue | 4 +- src/views/pqs/supervise/plan/index.vue | 4 +- src/views/pqs/supervise/retire/monitor.vue | 4 +- src/views/pqs/supervise/retire/terminal.vue | 2 +- .../supervise/technology/components/alarm.vue | 4 +- .../technology/components/earlyWarn.vue | 4 +- .../terminal/components/deviceLedgerTable.vue | 6 +- .../components/interferenceUserTable.vue | 43 +++--- .../components/monitorLedgerTable.vue | 28 ++-- .../terminal/components/substationLedger.vue | 5 + .../components/cycleDetection/index.vue | 4 +- .../components/jointDebugList/index.vue | 4 +- .../components/monitorpoint/index.vue | 4 +- .../components/terminainal/index.vue | 4 +- src/views/pqs/supervise/testRun/testRun.vue | 5 + .../electricalEnergy/components/audit.vue | 2 +- .../components/maintenance.vue | 2 +- .../components1/complaints.vue | 4 +- .../electricalEnergy/components1/online.vue | 4 +- .../components1/testQuestions.vue | 4 +- .../electricalEnergy/components1/testRun.vue | 5 + .../harmonicSurvey/components/planManage.vue | 2 +- .../harmonicSurvey/components/testManage.vue | 2 +- .../interferenceUserTable.vue | 4 +- .../normalizationManager/programReview.vue | 4 +- .../components/undocumented/index.vue | 4 +- .../plan/components/effectProblem/index.vue | 4 +- src/views/pqs/supervise_jb/plan/index.vue | 4 +- src/views/pqs/supervise_jb/retire/monitor.vue | 2 +- .../pqs/supervise_jb/retire/terminal.vue | 2 +- .../technology/components/alarm.vue | 4 +- .../technology/components/earlyWarn.vue | 5 +- .../terminal/components/deviceLedgerTable.vue | 4 +- .../components/interferenceUserTable.vue | 4 +- .../components/monitorLedgerTable.vue | 4 +- .../components/cycleDetection/index.vue | 4 +- .../components/jointDebugList/index.vue | 4 +- .../components/monitorpoint/index.vue | 4 +- .../components/terminainal/index.vue | 4 +- src/views/pqs/task/done/index.vue | 4 +- src/views/pqs/task/myTask/index.vue | 4 +- .../Region/transientList/index.vue | 2 +- .../analyse/eventCorrelation/index.vue | 2 +- .../analyse/eventwaveform/index.vue | 4 +- .../voltageSags/analyse/impactscope/index.vue | 4 +- .../online/eventStudy/index.vue | 4 +- .../TerminalOperation/index.vue | 4 +- .../pqs/voltageSags/overview/popupEvent.vue | 2 +- src/views/pqs/voltageSags/overview/right.vue | 4 +- .../voltageSags/report/eventReports/index.vue | 4 +- .../pqs/voltageSags/report/weekly/index.vue | 10 +- .../sagGovern/businessUser/IncomingTable.vue | 4 +- .../businessUser/event/eventView.vue | 4 +- .../sagGovern/businessUser/index.vue | 4 +- .../sagGovern/businessUser/machine/index.vue | 4 +- .../businessUser/productLine/index.vue | 4 +- .../voltageSags/sagGovern/scheme/index.vue | 4 +- src/views/setting/dictionary/list/index.vue | 4 +- src/views/system/bpm/category/index.vue | 4 +- src/views/system/bpm/form/index.vue | 4 +- src/views/system/bpm/model/index.vue | 4 +- src/views/system/bpm/sign/index.vue | 4 +- src/views/system/bpm/task/alarmTask/index.vue | 4 +- src/views/system/bpm/task/done/index.vue | 2 +- .../system/bpm/task/myInstance/index.vue | 2 +- src/views/system/bpm/task/todo/index.vue | 2 +- src/views/system/subject/index.vue | 2 +- 94 files changed, 336 insertions(+), 261 deletions(-) diff --git a/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue b/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue index 6820eb6b..2d129673 100644 --- a/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue +++ b/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue @@ -1,7 +1,7 @@ diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue index ae01b908..d345ccef 100644 --- a/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue +++ b/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue @@ -16,37 +16,26 @@ - @@ -55,20 +44,20 @@ defineOptions({ name: 'ProgramReview' }) -import {ref, onMounted, provide, nextTick, onUnmounted} from 'vue' +import { ref, onMounted, provide, nextTick, onUnmounted } from 'vue' import TableStore from '@/utils/tableStore' import Table from '@/components/table/index.vue' -import {cancel, userReportGoNetById} from '@/api/supervision-boot/interfere/index' -import {useDictData} from '@/stores/dictData' +import { cancel, userReportGoNetById } from '@/api/supervision-boot/interfere/index' +import { useDictData } from '@/stores/dictData' import addForm from './addForm.vue' -import {useRouter, useRoute} from 'vue-router' -import {Back} from '@element-plus/icons-vue' -import {useAdminInfo} from '@/stores/adminInfo' +import { useRouter, useRoute } from 'vue-router' +import { Back } from '@element-plus/icons-vue' +import { useAdminInfo } from '@/stores/adminInfo' -const {go, currentRoute, push} = useRouter() -const {query} = useRoute() // 查询参数 -import {ElMessage} from 'element-plus' -import {ElMessageBox} from 'element-plus/es' +const { go, currentRoute, push } = useRouter() +const { query } = useRoute() // 查询参数 +import { ElMessage } from 'element-plus' +import { ElMessageBox } from 'element-plus/es' const needGovernance = query.needGovernance as unknown as string // 从 URL 传递过来的 是否需要治理 const dictData = useDictData() @@ -77,24 +66,28 @@ const adminInfo = useAdminInfo() const jb_pl = ref(false) const jb_dky = ref(false) jb_pl.value = - adminInfo.$state.roleCode.filter(item => { - return item == 'jb_pl' - }).length != 0 - ? true - : false + adminInfo.$state.roleCode.filter(item => { + return item == 'jb_pl' + }).length != 0 + ? true + : false jb_dky.value = - adminInfo.$state.roleCode.filter(item => { - return item == 'jb_dky' - }).length != 0 - ? true - : false + adminInfo.$state.roleCode.filter(item => { + return item == 'jb_dky' + }).length != 0 + ? true + : false const tableStore = new TableStore({ url: '/supervision-boot/userReportNormal/userReportGoNetPage', method: 'POST', column: [ - {title: '序号', type: 'seq', width: 80}, - {field: 'projectName', title: '用户名称', minWidth: 170}, + { + title: '序号', width: 80, formatter: (row: any) => { + return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1 + } + }, + { field: 'projectName', title: '用户名称', minWidth: 170 }, { field: 'userType', title: '用户性质', @@ -104,8 +97,8 @@ const tableStore = new TableStore({ return getUserTypeName(userType) } }, - {field: 'city', title: '所在地市', minWidth: 80}, - {field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130}, + { field: 'city', title: '所在地市', minWidth: 80 }, + { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 }, { field: 'userStatus', title: '用户状态', @@ -124,7 +117,7 @@ const tableStore = new TableStore({ 3: '退运' } }, - {field: 'substation', title: '厂站名称', minWidth: 100}, + { field: 'substation', title: '厂站名称', minWidth: 100 }, { field: 'status', title: '流程状态', @@ -153,7 +146,7 @@ const tableStore = new TableStore({ return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name } }, - {field: 'createTime', title: '创建时间', minWidth: 100}, + { field: 'createTime', title: '创建时间', minWidth: 100 }, { title: '操作', minWidth: 180, @@ -261,7 +254,7 @@ onMounted(async () => { document.addEventListener('visibilitychange', handleVisibilityChange) if (query.fangAnId) { //根据id查询待编辑的数据 - await userReportGoNetById({id: query.fangAnId}).then(res => { + await userReportGoNetById({ id: query.fangAnId }).then(res => { if (res && res.code == 'A0000') { dialogVisible.value = true titleButton1.value = '重新发起' @@ -281,7 +274,7 @@ onUnmounted(() => { /**取消流程操作*/ const cancelLeave = async (row: any) => { // 二次确认 - const {value} = await ElMessageBox.prompt('请输入取消原因', '取消流程', { + const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', { confirmButtonText: '确定', cancelButtonText: '取消', inputType: 'textarea', diff --git a/src/views/pqs/supervise/interfere/components/undocumented/index.vue b/src/views/pqs/supervise/interfere/components/undocumented/index.vue index 00a4914b..3ac5c4e6 100644 --- a/src/views/pqs/supervise/interfere/components/undocumented/index.vue +++ b/src/views/pqs/supervise/interfere/components/undocumented/index.vue @@ -71,7 +71,9 @@ const tableStore = new TableStore({ width: '60', type: 'checkbox' }, - { title: '序号', type: 'seq', width: 80 }, + { title: '序号', width: 80,formatter: (row: any) => { + return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1 + } }, // { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 }, { field: 'city', diff --git a/src/views/pqs/supervise/plan/components/effectProblem/index.vue b/src/views/pqs/supervise/plan/components/effectProblem/index.vue index 1a3883eb..ec711a87 100644 --- a/src/views/pqs/supervise/plan/components/effectProblem/index.vue +++ b/src/views/pqs/supervise/plan/components/effectProblem/index.vue @@ -76,7 +76,9 @@ const effectTableStore = new TableStore({ // publicHeight: 65, method: 'POST', column: [ - { title: '序号', type: 'seq', width: 80 }, + { title: '序号', width: 80,formatter: (row: any) => { + return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1 + } }, { field: 'problemDesc', title: '问题描述', diff --git a/src/views/pqs/supervise/plan/index.vue b/src/views/pqs/supervise/plan/index.vue index d6644e8e..347ea60f 100644 --- a/src/views/pqs/supervise/plan/index.vue +++ b/src/views/pqs/supervise/plan/index.vue @@ -71,7 +71,9 @@ const tableStore = new TableStore({ // publicHeight: 65, method: 'POST', column: [ - { title: '序号', type: 'seq', width: 80 }, + { title: '序号', width: 80,formatter: (row: any) => { + return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1 + } }, { field: 'province', title: '所属省份', diff --git a/src/views/pqs/supervise/retire/monitor.vue b/src/views/pqs/supervise/retire/monitor.vue index 1c5fcdae..3148e222 100644 --- a/src/views/pqs/supervise/retire/monitor.vue +++ b/src/views/pqs/supervise/retire/monitor.vue @@ -60,9 +60,9 @@ const tableStore = new TableStore({ type: 'checkbox' }, { - field: 'index', + title: '序号', - width: '60', + width: '80', formatter: (row: any) => { return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1 } diff --git a/src/views/pqs/supervise/retire/terminal.vue b/src/views/pqs/supervise/retire/terminal.vue index 27c6afcb..0b05ffe1 100644 --- a/src/views/pqs/supervise/retire/terminal.vue +++ b/src/views/pqs/supervise/retire/terminal.vue @@ -61,7 +61,7 @@ const tableStore = new TableStore({ { field: 'index', title: '序号', - width: '60', + width: '80', formatter: (row: any) => { return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1 } diff --git a/src/views/pqs/supervise/technology/components/alarm.vue b/src/views/pqs/supervise/technology/components/alarm.vue index 1f36a535..b49089e1 100644 --- a/src/views/pqs/supervise/technology/components/alarm.vue +++ b/src/views/pqs/supervise/technology/components/alarm.vue @@ -65,9 +65,9 @@ const tableStore = new TableStore({ }, { title: '序号', - type: 'seq', + align: 'center', - width: 60, + width: 80, formatter: (row: any) => { return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1 } diff --git a/src/views/pqs/supervise/technology/components/earlyWarn.vue b/src/views/pqs/supervise/technology/components/earlyWarn.vue index 323f9cfb..f9ddca53 100644 --- a/src/views/pqs/supervise/technology/components/earlyWarn.vue +++ b/src/views/pqs/supervise/technology/components/earlyWarn.vue @@ -38,9 +38,9 @@ const tableStore = new TableStore({ }, { title: '序号', - type: 'seq', + align: 'center', - width: 60, + width: 80, formatter: (row: any) => { return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1 } diff --git a/src/views/pqs/supervise/terminal/components/deviceLedgerTable.vue b/src/views/pqs/supervise/terminal/components/deviceLedgerTable.vue index c4fef4ac..60eb88f1 100644 --- a/src/views/pqs/supervise/terminal/components/deviceLedgerTable.vue +++ b/src/views/pqs/supervise/terminal/components/deviceLedgerTable.vue @@ -45,7 +45,11 @@ const tableStore = new TableStore({ publicHeight: 65, method: 'POST', column: [ - /* { title: '序号', type: 'seq', width: 80 },*/ + { + title: '序号', width: 80, formatter: (row: any) => { + return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1 + } + }, { field: 'areaName', title: '省公司', diff --git a/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue b/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue index 3e4dd6cd..dd2a4d4c 100644 --- a/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue +++ b/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue @@ -4,7 +4,7 @@