From 760a7d9c5c4f86e39fbf6e6ae91b54ac0e29c237 Mon Sep 17 00:00:00 2001 From: GGJ <357021191@qq.com> Date: Wed, 21 Aug 2024 18:03:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=20=E5=8F=98=E7=94=B5?= =?UTF-8?q?=E7=AB=99=20=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/LN/newEnergy/highAndLowPressure/index.vue | 8 ++++++-- .../interfere/components/normalizationManager/addForm.vue | 4 ++-- .../normalizationManager/interferenceUserTable.vue | 2 +- .../components/normalizationManager/programReview.vue | 2 +- .../interfere/components/undocumented/addForm.vue | 4 ++-- .../interfere/components/undocumented/detail.vue | 2 +- .../supervise/interfere/components/undocumented/index.vue | 2 +- .../terminal/components/interferenceUserTable.vue | 2 +- .../supervise/terminal/components/sensitiveUserTable.vue | 2 +- .../components/terminainal/addForm.vue | 1 + .../components/terminainal/detail.vue | 8 ++++++++ 11 files changed, 25 insertions(+), 12 deletions(-) diff --git a/src/views/LN/newEnergy/highAndLowPressure/index.vue b/src/views/LN/newEnergy/highAndLowPressure/index.vue index 827ca257..efa94030 100644 --- a/src/views/LN/newEnergy/highAndLowPressure/index.vue +++ b/src/views/LN/newEnergy/highAndLowPressure/index.vue @@ -33,7 +33,7 @@ - + @@ -72,9 +72,13 @@ const header = ref() const distributionData: any = ref([]) const tableStore = new TableStore({ - url: '/event-boot/area/getAreaLineDetail', + url: '/event-boot/voltageRideThrough/view', method: 'POST', column: [], + beforeSearchFun: () => { + tableStore.table.params.areaId =tableStore.table.params.deptIndex + tableStore.table.params.type =tableStore.table.params.radio + }, loadCallback: () => { titleA.value = tableStore.table.params.statisticalType.name header.value.areaRef.change() diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue index 59b1bcd1..be9d0172 100644 --- a/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue +++ b/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue @@ -65,11 +65,11 @@ /> - + diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue index 54449fc8..e470741f 100644 --- a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue +++ b/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue @@ -146,7 +146,7 @@ const tableStore = new TableStore({ }, { field: 'substation', - title: '变电站', + title: '厂站名称', minWidth: 100, formatter: (row: any) => { row.cellValue = row.cellValue ? row.cellValue : '/' diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue index f326864c..ba603fed 100644 --- a/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue +++ b/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue @@ -122,7 +122,7 @@ const tableStore = new TableStore({ 3: '退运' } }, - { field: 'substation', title: '变电站', minWidth: 100 }, + { field: 'substation', title: '厂站名称', minWidth: 100 }, { field: 'status', title: '流程状态', diff --git a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue index 7843e613..3253c7d7 100644 --- a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue +++ b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue @@ -85,8 +85,8 @@ /> - - + + - + {{ detailData.substation }} diff --git a/src/views/pqs/supervise/interfere/components/undocumented/index.vue b/src/views/pqs/supervise/interfere/components/undocumented/index.vue index dcfbbe5d..f20aaaad 100644 --- a/src/views/pqs/supervise/interfere/components/undocumented/index.vue +++ b/src/views/pqs/supervise/interfere/components/undocumented/index.vue @@ -88,7 +88,7 @@ const tableStore = new TableStore({ }, { field: 'substation', - title: '变电站', + title: '厂站名称', minWidth: 100, formatter: (row: any) => { row.cellValue = row.cellValue ? row.cellValue : '/' diff --git a/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue b/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue index 0927d054..bd03eacd 100644 --- a/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue +++ b/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue @@ -94,7 +94,7 @@ const tableStore = new TableStore({ 3: '退运' } }, - { field: 'substation', title: '变电站', minWidth: 100 }, + { field: 'substation', title: '厂站名称', minWidth: 100 }, { field: 'createBy', title: '填报人', diff --git a/src/views/pqs/supervise/terminal/components/sensitiveUserTable.vue b/src/views/pqs/supervise/terminal/components/sensitiveUserTable.vue index 3b41e3bc..03537e91 100644 --- a/src/views/pqs/supervise/terminal/components/sensitiveUserTable.vue +++ b/src/views/pqs/supervise/terminal/components/sensitiveUserTable.vue @@ -91,7 +91,7 @@ const tableStore = new TableStore({ }, { field: 'substation', - title: '变电站', + title: '厂站名称', minWidth: 100, formatter: (row: any) => { return row.cellValue ? row.cellValue : '/' diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue index ac2466c8..7c7d9dc8 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue @@ -702,6 +702,7 @@ const terminalModelList = [ const substationList: any = ref([]) //字典获取通讯类型 const frontTypeList = dictData.getBasicData('Front_Type', ['CLD', '61850']) +console.log("🚀 ~ frontTypeList:", frontTypeList) //定义通讯状态下拉框数据 const communicationStatusList = [ { diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue index ed0129c2..11356697 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue @@ -48,6 +48,12 @@ {{ detailData.supervisionTempDeviceReport?.monitoringTerminalName }} + + {{ + frontTypeList.filter(item => item.id == detailData.supervisionTempDeviceReport?.frontType)[0]?.name || + detailData.supervisionTempDeviceReport?.frontType + }} + {{ voltageTransformerTypeList.find(item => { @@ -293,6 +299,7 @@ const { query } = useRoute() // 查询参数 const props = defineProps({ id: propTypes.string.def(undefined) }) + const detailLoading = ref(false) // 表单的加载中 const detailData = ref({}) // 详情数据 const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号 @@ -318,6 +325,7 @@ const userStateList = reactive([ ]) const dictData = useDictData() //字典获取所在地市 +const frontTypeList = dictData.getBasicData('Front_Type', ['CLD', '61850']) const areaOptionList = dictData.getBasicData('jibei_area') //定义监测终端安装位置下拉框数据 const monitoringDeviceInstallationPositionList = [