From aa86c5e662f74258a7b53ac2c473a0d25ec80671 Mon Sep 17 00:00:00 2001 From: GYYM <704080176@qq.com> Date: Wed, 4 Dec 2024 10:20:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/plan/planData.ts | 64 ++++++++++++++----- frontend/src/api/plan/static.json | 2 +- .../plan/planList/components/devTransfer.vue | 32 +++++----- 3 files changed, 66 insertions(+), 32 deletions(-) diff --git a/frontend/src/api/plan/planData.ts b/frontend/src/api/plan/planData.ts index a45f093..15f63d2 100644 --- a/frontend/src/api/plan/planData.ts +++ b/frontend/src/api/plan/planData.ts @@ -170,19 +170,19 @@ const testFatherPlanList: Dict[] = [ const sourceDataList: Dict[] = [ { id: "1", - label: '标准源-福禄克-6100A', + label: '标准源-福禄克6100A-1', }, { id: "2", - label: '标准源-昂立-PF2', + label: '标准源-昂立PF2-1', }, { id: "3", - label: '标准源-丹迪克-DKLN1', + label: '标准源-丹迪克DKLN1-1', }, { id: "4", - label: '标准源-博电源-PQC600A', + label: '标准源-博电PQC600A-1', }, { id: "5", @@ -206,38 +206,72 @@ const sourceDataList: Dict[] = [ const deviceDataList: Dict[] = [ { id: "1", - label: '模拟装置1', + label: '240001', }, { id: "2", - label: '模拟装置2', + label: '240002', }, { id: "3", - label: '模拟装置3', + label: '240003', }, { id: "4", - label: '模拟装置4', + label: '240004', }, { id: "5", - label: '中电送检装置', + label: '240005', }, { id: "6", - label: '易司拓测试装置', + label: '240006', }, { id: "7", - label: '山大电力测试装置1', + label: '240007', }, { id: "8", - label: '山大电力测试装置2', + label: '240008', }, - ] +// const deviceDataList: Dict[] = [ +// { +// id: "1", +// label: '模拟装置1', +// }, +// { +// id: "2", +// label: '模拟装置2', +// }, +// { +// id: "3", +// label: '模拟装置3', +// }, +// { +// id: "4", +// label: '模拟装置4', +// }, +// { +// id: "5", +// label: '中电送检装置', +// }, +// { +// id: "6", +// label: '易司拓测试装置', +// }, +// { +// id: "7", +// label: '山大电力测试装置1', +// }, +// { +// id: "8", +// label: '山大电力测试装置2', +// }, + +// ] const planData = ref([ { @@ -274,14 +308,14 @@ const planData = ref([ }, { 'id': '3', - 'name': '保定分布式光伏电能质量试点', + 'name': '浙江分布式光伏电能质量试点', 'pattern':'1', "source_Id" : ['3'], "testSourceName":'标准源-丹迪克DKLN1-1', 'father_Plan_Id':'1', 'dataSource_Id':['1'], 'dataSource_Ids':'实时数据', - 'script_Id':'3', + 'script_Id':'4', 'error_Sys_Id':'3', 'test_State':'1', 'report_State':'1', diff --git a/frontend/src/api/plan/static.json b/frontend/src/api/plan/static.json index 0016443..f34325e 100644 --- a/frontend/src/api/plan/static.json +++ b/frontend/src/api/plan/static.json @@ -38,7 +38,7 @@ { "id": 9, "pid": 2, - "name": "保定分布式光伏电能质量试点" + "name": "浙江分布式光伏电能质量试点" } ], "id": 2 diff --git a/frontend/src/views/plan/planList/components/devTransfer.vue b/frontend/src/views/plan/planList/components/devTransfer.vue index 68945c1..668360e 100644 --- a/frontend/src/views/plan/planList/components/devTransfer.vue +++ b/frontend/src/views/plan/planList/components/devTransfer.vue @@ -47,20 +47,20 @@ const generateData = () => { const data: Option[] = [] const states = [ - '模拟装置1', - '模拟装置2', - '模拟装置3', - '模拟装置4', - '中电送检装置', - '易司拓测试装置', - '山大电力测试装置1', - '山大电力测试装置2', - '滚动条测试1', - '滚动条测试2', - '滚动条测试3', - '滚动条测试4', - '滚动条测试5', - '滚动条测试6', + '240001', + '240002', + '240003', + '240004', + '240005', + '240006', + '240007', + '240008', + '240009', + '240010', + '240011', + '240012', + '240013', + '240014', ] const initials = ['CA', 'IL', 'MD', 'TX', 'FL', 'CO', 'CT', 'GT', 'IL', 'MD', 'TX', 'FL', 'CO', 'CT', 'GT'] states.forEach((city, index) => { @@ -77,8 +77,8 @@ const generateValue = () => { const data: number[] = [] const states = [ - '山大电力测试装置1', - '山大电力测试装置2', + '240001', + '240002', ] const initials = ['AB', 'CD'] states.forEach((city, index) => {