From 2611f43d1f294affe2309db7629767b45da41448 Mon Sep 17 00:00:00 2001
From: GYYM <704080176@qq.com>
Date: Thu, 5 Dec 2024 15:25:49 +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             | 24 +++++++++----------
 .../plan/planList/components/moreButtons.vue  |  6 ++---
 .../plan/planList/components/planPopup.vue    |  8 ++++---
 frontend/src/views/plan/planList/index.vue    | 16 ++++++-------
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/frontend/src/api/plan/planData.ts b/frontend/src/api/plan/planData.ts
index 15f63d2..f24e119 100644
--- a/frontend/src/api/plan/planData.ts
+++ b/frontend/src/api/plan/planData.ts
@@ -170,35 +170,35 @@ const testFatherPlanList: Dict[] = [
 const sourceDataList: Dict[] = [
   {
     id: "1",
-    label: '标准源-福禄克6100A-1',
+    label: '标准源-FLUKE.6100A电能功率标准源-1',
   },
   {
     id: "2",
-    label: '标准源-昂立PF2-1',
+    label: '标准源-ANGLI-FP2高性能数字信号源-1',
   }, 
    {
     id: "3",
-    label: '标准源-丹迪克DKLN1-1',
+    label: '标准源-DKLN-1电能质量测试分析仪智能检定装置-1',
   },
   {
     id: "4",
-    label: '标准源-博电PQC600A-1',
+    label: '标准源-PQC600A高精度电能功率标准源-1',
   },
   {
     id: "5",
-    label: '高精度设备-PQV520-1',
+    label: '高精度设备-PQV-520便携式电能质量监测装置-1',
   },
   {
     id: "6",
-    label: '高精度设备-PQV520-2',
+    label: '高精度设备-PQV-520便携式电能质量监测装置-2',
   },
   {
     id: "7",
-    label: '高精度设备-PQV520-3',
+    label: '高精度设备-PQV-520便携式电能质量监测装置-3',
   },
   {
     id: "8",
-    label: '高精度设备-PQV520-4',
+    label: '高精度设备-PQV-520便携式电能质量监测装置-4',
   },
 ]
 
@@ -279,7 +279,7 @@ const planData = ref<Plan.PlanAndSourceBO[]>([
     'name': '沧州110kV东光站装置送检',
     'pattern':'1',
     "source_Id" : ['1'],
-    "testSourceName":'标准源-福禄克6100A-1',
+    "testSourceName":'标准源-FLUKE.6100A电能功率标准源-1',
     'dataSource_Id':['1'],
     'dataSource_Ids':'实时数据',
     'script_Id':'1',
@@ -293,7 +293,7 @@ const planData = ref<Plan.PlanAndSourceBO[]>([
     'name': '邯郸2台安徽振兴终端送检',
     'pattern':'1',
     "source_Id" : ['5','6','7','8'],
-    "testSourceName":'高精度设备-PQV520-1',
+    "testSourceName":'高精度设备-PQV-520便携式电能质量监测装置-1',
     'father_Plan_Id':'1',
     'dataSource_Id':['1'],
     'dataSource_Ids':'实时数据',
@@ -303,7 +303,7 @@ const planData = ref<Plan.PlanAndSourceBO[]>([
     'report_State':'2',
     'result':'0',
     "testSourceList":[
-      '高精度设备-PQV520-2','高精度设备-PQV520-3','高精度设备-PQV520-4'
+      '高精度设备-PQV-520便携式电能质量监测装置-2','高精度设备-PQV-520便携式电能质量监测装置-3','高精度设备-PQV-520便携式电能质量监测装置-4'
     ]
   },
   {
@@ -311,7 +311,7 @@ const planData = ref<Plan.PlanAndSourceBO[]>([
     'name': '浙江分布式光伏电能质量试点',
     'pattern':'1',
     "source_Id" : ['3'],
-    "testSourceName":'标准源-丹迪克DKLN1-1',
+    "testSourceName":'标准源-DKLN-1电能质量测试分析仪智能检定装置-1',
     'father_Plan_Id':'1',
     'dataSource_Id':['1'],
     'dataSource_Ids':'实时数据',
diff --git a/frontend/src/views/plan/planList/components/moreButtons.vue b/frontend/src/views/plan/planList/components/moreButtons.vue
index 7141c27..be1603c 100644
--- a/frontend/src/views/plan/planList/components/moreButtons.vue
+++ b/frontend/src/views/plan/planList/components/moreButtons.vue
@@ -10,9 +10,9 @@
       </span> -->
       <template #dropdown>
         <el-dropdown-menu>
-          <el-dropdown-item command="高精度设备-PQV520-2">高精度设备-PQV520-2</el-dropdown-item>
-          <el-dropdown-item command="高精度设备-PQV520-3">高精度设备-PQV520-3</el-dropdown-item>
-          <el-dropdown-item command="高精度设备-PQV520-4">高精度设备-PQV520-4</el-dropdown-item>
+          <el-dropdown-item command="高精度设备-PQV520-2">高精度设备-PQV-520便携式电能质量监测装置-2</el-dropdown-item>
+          <el-dropdown-item command="高精度设备-PQV520-3">高精度设备-PQV-520便携式电能质量监测装置-3</el-dropdown-item>
+          <el-dropdown-item command="高精度设备-PQV520-4">高精度设备-PQV-520便携式电能质量监测装置-4</el-dropdown-item>
         </el-dropdown-menu>
       </template>
     </el-dropdown>
diff --git a/frontend/src/views/plan/planList/components/planPopup.vue b/frontend/src/views/plan/planList/components/planPopup.vue
index 85068f2..5eda45a 100644
--- a/frontend/src/views/plan/planList/components/planPopup.vue
+++ b/frontend/src/views/plan/planList/components/planPopup.vue
@@ -1,6 +1,6 @@
 <template>
    <!-- 基础信息弹出框 -->
- <el-dialog :model-value="visible" :title="dialogTitle" v-bind="dialogSmall"  @close="handleCancel"  width="500" draggable>
+ <el-dialog :model-value="visible" :title="dialogTitle" v-bind="dialogSmall"  @close="handleCancel"  draggable>
     <div>
       <el-form :model="formData" ref='formRuleRef' :rules='rules'>
         <el-form-item label="名称" prop="name" :label-width="100">
@@ -197,6 +197,8 @@ const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
   });
 </script>
 
-<style scoped>
-
+<style scoped lang="scss">
+:deep(.dialog-small .el-dialog__body){
+  max-height: 330px !important;
+}
 </style>
\ No newline at end of file
diff --git a/frontend/src/views/plan/planList/index.vue b/frontend/src/views/plan/planList/index.vue
index c60ab0e..aae16a7 100644
--- a/frontend/src/views/plan/planList/index.vue
+++ b/frontend/src/views/plan/planList/index.vue
@@ -167,30 +167,28 @@ const columns = reactive<ColumnProps<Plan.PlanAndSourceBO>[]>([
   {
     prop: 'name',
     label: '名称',
-    width: 200,
+    width: 220,
     search: { el: 'input' },
   },
   {
     prop: 'testSourceName',
     label: '检测源',
-    width: 215,
+    width: 365,
     render: scope => {
       return (
           <div class='flx-flex-start'>
             <el-button type='primary' link onClick={() => showData(scope.row.testSourceName)}>
               {scope.row.testSourceName}
             </el-button>
-            
             <moreButtons isShow={isVisible(scope.row)} ></moreButtons>
           </div> 
-
       )
     },
   },
   {
     prop: 'script_Id',
     label: '检测脚本',
-    width: 350,
+    width: 360,
     enum: testScriptDataList,
     fieldNames: { label: 'label', value: 'id' },
     render: scope => {
@@ -219,14 +217,14 @@ const columns = reactive<ColumnProps<Plan.PlanAndSourceBO>[]>([
   {
     prop: 'dataSource_Ids',
     label: '数据源',
-    width: 200,
+    width: 120,
     // enum: testSoureDataList,
     // fieldNames: { label: 'label', value: 'id' },
   },
   {
     prop: 'test_State',
     label: '检测状态',
-    width: 100,
+    width: 120,
     enum: dictTestState,
     //  enum: dictStore.getDictData('planTestState'),
     search: { el: 'select', props: { filterable: true } },
@@ -235,7 +233,7 @@ const columns = reactive<ColumnProps<Plan.PlanAndSourceBO>[]>([
   {
     prop: 'report_State',
     label: '检测报告状态',
-    width: 150,
+    width: 120,
     enum: dictReportState,
     //  enum: dictStore.getDictData('planReportState'),
     search: { el: 'select', props: { filterable: true } },
@@ -244,7 +242,7 @@ const columns = reactive<ColumnProps<Plan.PlanAndSourceBO>[]>([
   {
     prop: 'result',
     label: '检测结果',
-    width: 100,
+    width: 120,
     enum: dictResult,
     //  enum: dictStore.getDictData('planResult'),
     search: { el: 'select', props: { filterable: true } },