From 5106149483f3178b2921dc5d110624e285288c7d Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Mon, 10 Nov 2025 14:44:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=BE=E5=BC=80=E5=AD=90=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=85=B3=E8=81=94=E4=BB=BB=E4=BD=95=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E8=AE=BE=E5=A4=87=E3=80=81=E7=9B=91=E6=B5=8B=E7=82=B9?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B=E8=BF=87=E5=90=8E=E4=B8=8D=E5=8F=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/device/interface/monitor.ts  |  2 +-
 .../device/components/monitorPopup.vue        |  4 ++--
 .../machine/device/components/monitorTab.vue  |  2 +-
 .../plan/planList/components/planPopup.vue    | 21 ++++++++++++-------
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/frontend/src/api/device/interface/monitor.ts b/frontend/src/api/device/interface/monitor.ts
index 2523db1..a35781e 100644
--- a/frontend/src/api/device/interface/monitor.ts
+++ b/frontend/src/api/device/interface/monitor.ts
@@ -18,7 +18,7 @@ export namespace Monitor {
   export interface ResPqMon {
     id: string;     //监测点ID
     devId: string; //所属设备ID
-    busbar: string;//所属母线
+    busbar: string;//母线名称
     name: string; //监测点名称
     num: number; //线路号,监测点序号
     pt: string; //PT变比
diff --git a/frontend/src/views/machine/device/components/monitorPopup.vue b/frontend/src/views/machine/device/components/monitorPopup.vue
index e3a905c..ff7d94e 100644
--- a/frontend/src/views/machine/device/components/monitorPopup.vue
+++ b/frontend/src/views/machine/device/components/monitorPopup.vue
@@ -18,10 +18,10 @@
                         <el-option v-for="item in lineNum" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="所属母线" prop="busbar">
+                <el-form-item label="母线名称" prop="busbar">
                     <el-input v-model="formContent.busbar" clearable placeholder="请输入所属母线" :disabled=" formContent.resultType!=null"/>
                 </el-form-item>
-                <!-- <el-form-item label="所属母线" prop="busbar">
+                <!-- <el-form-item label="母线名称" prop="busbar">
                     <el-select
                         v-model="formContent.busbar"
                         clearable
diff --git a/frontend/src/views/machine/device/components/monitorTab.vue b/frontend/src/views/machine/device/components/monitorTab.vue
index 19be8b2..139414f 100644
--- a/frontend/src/views/machine/device/components/monitorTab.vue
+++ b/frontend/src/views/machine/device/components/monitorTab.vue
@@ -93,7 +93,7 @@ const columns = reactive<ColumnProps<Monitor.ResPqMon>[]>([
     },
     {
         prop: 'busbar',
-        label: '所属母线',
+        label: '母线名称',
         width: 200
     },
     {
diff --git a/frontend/src/views/plan/planList/components/planPopup.vue b/frontend/src/views/plan/planList/components/planPopup.vue
index ee7527e..0f8e3d4 100644
--- a/frontend/src/views/plan/planList/components/planPopup.vue
+++ b/frontend/src/views/plan/planList/components/planPopup.vue
@@ -33,13 +33,20 @@
                             multiple
                             placeholder="请选择标准设备"
                         >
-                            <el-option
-                                v-for="option in pqStandardDevArray"
-                                :key="option.value"
-                                :disabled="subPlanBindStandardDev.includes(option.label) || option.disabled"
-                                :label="option.label"
-                                :value="option.value"
-                            />
+<!--                            <el-option-->
+<!--                                v-for="option in pqStandardDevArray"-->
+<!--                                :key="option.value"-->
+<!--                                :disabled="subPlanBindStandardDev.includes(option.label) || option.disabled"-->
+<!--                                :label="option.label"-->
+<!--                                :value="option.value"-->
+<!--                            />-->
+                          <el-option
+                              v-for="option in pqStandardDevArray"
+                              :key="option.value"
+                              :disabled="subPlanBindStandardDev.includes(option.label) || option.disabled"
+                              :label="option.label"
+                              :value="option.value"
+                          />
                         </el-select>
                     </el-form-item>
                     <el-form-item v-if="selectByMode" :label-width="110" label="检测项" prop="testItems">