From 8aae184a8b008d4b8540630572843c1e6ca0d437 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=BE=E5=90=8C=E5=AD=A6?= <stary1993@qq.com>
Date: Thu, 30 Oct 2025 11:09:50 +0800
Subject: [PATCH] =?UTF-8?q?fix(device):=E6=B7=BB=E5=8A=A0=E8=B0=90?=
 =?UTF-8?q?=E6=B3=A2=E7=B3=BB=E7=BB=9F=E8=AE=BE=E5=A4=87ID=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../machine/device/components/devicePopup.vue | 115 ++++--------------
 .../device/components/monitorPopup.vue        |  11 +-
 2 files changed, 28 insertions(+), 98 deletions(-)

diff --git a/frontend/src/views/machine/device/components/devicePopup.vue b/frontend/src/views/machine/device/components/devicePopup.vue
index be9ff8d..35aa542 100644
--- a/frontend/src/views/machine/device/components/devicePopup.vue
+++ b/frontend/src/views/machine/device/components/devicePopup.vue
@@ -81,46 +81,12 @@
                                 :disabled="formContent.importFlag == 1"
                             />
                         </el-form-item>
-                         <el-form-item label="固件版本" prop="hardwareVersion" v-if="scene === '0'">
-                            <el-input v-model="formContent.hardwareVersion"   clearable
-                                placeholder="请输入固件版本" />
-                        </el-form-item>
-                         <el-form-item label="软件版本" prop="softwareVersion" v-if="scene === '0'">
-                            <el-input v-model="formContent.softwareVersion"   clearable
-                                placeholder="请输入软件版本"  />
-                        </el-form-item>
-                        <!-- <el-form-item label="固件版本" prop="hardwareVersion" v-if="scene === '0'">
-                            <el-select
-                                v-model="formContent.hardwareVersion"
-                                clearable
-                                placeholder="请选择固件版本"
-                                filterable
-                                allow-create
-                            >
-                                <el-option
-                                    v-for="item in selectOptions['hardwareVersion']"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                />
-                            </el-select>
+                        <el-form-item label="固件版本" prop="hardwareVersion" v-if="scene === '0'">
+                            <el-input v-model="formContent.hardwareVersion" clearable placeholder="请输入固件版本" />
                         </el-form-item>
                         <el-form-item label="软件版本" prop="softwareVersion" v-if="scene === '0'">
-                            <el-select
-                                v-model="formContent.softwareVersion"
-                                clearable
-                                placeholder="请选择软件版本"
-                                filterable
-                                allow-create
-                            >
-                                <el-option
-                                    v-for="item in selectOptions['softwareVersion']"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                />
-                            </el-select>
-                        </el-form-item> -->
+                            <el-input v-model="formContent.softwareVersion" clearable placeholder="请输入软件版本" />
+                        </el-form-item>
                         <el-form-item label="定检日期" prop="inspectDate" v-if="MonIsShow">
                             <el-date-picker
                                 v-model="formContent.inspectDate"
@@ -226,68 +192,29 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="所属地市" prop="cityName" v-if="MonIsShow">
-                            <el-input v-model="formContent.cityName"   clearable
-                                placeholder="请输入所属地市" :disabled="formContent.importFlag == 1" />
-                        </el-form-item>
-                         <el-form-item label="所属供电公司" prop="gdName" v-if="MonIsShow">
-                            <el-input v-model="formContent.gdName"   clearable
-                                placeholder="请输入所属供电公司" :disabled="formContent.importFlag == 1" />
-                        </el-form-item>
-                         <el-form-item label="所属电站" prop="subName" v-if="MonIsShow">
-                            <el-input v-model="formContent.subName"   clearable
-                                placeholder="请输入所属电站" :disabled="formContent.importFlag == 1" />
-                        </el-form-item>
-                        <!-- <el-form-item label="所属地市" prop="cityName" v-if="MonIsShow">
-                            <el-select
+                            <el-input
                                 v-model="formContent.cityName"
                                 clearable
-                                placeholder="请选择所属地市"
+                                placeholder="请输入所属地市"
                                 :disabled="formContent.importFlag == 1"
-                                filterable
-                                allow-create
-                            >
-                                <el-option
-                                    v-for="item in selectOptions['cityName']"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                />
-                            </el-select>
+                            />
                         </el-form-item>
                         <el-form-item label="所属供电公司" prop="gdName" v-if="MonIsShow">
-                            <el-select
+                            <el-input
                                 v-model="formContent.gdName"
                                 clearable
-                                placeholder="请选择所属供电公司"
+                                placeholder="请输入所属供电公司"
                                 :disabled="formContent.importFlag == 1"
-                                filterable
-                                allow-create
-                            >
-                                <el-option
-                                    v-for="item in selectOptions['gdName']"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                />
-                            </el-select>
+                            />
                         </el-form-item>
                         <el-form-item label="所属电站" prop="subName" v-if="MonIsShow">
-                            <el-select
+                            <el-input
                                 v-model="formContent.subName"
                                 clearable
-                                placeholder="请选择所属电站"
+                                placeholder="请输入所属电站"
                                 :disabled="formContent.importFlag == 1"
-                                filterable
-                                allow-create
-                            >
-                                <el-option
-                                    v-for="item in selectOptions['subName']"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                />
-                            </el-select>
-                        </el-form-item> -->
+                            />
+                        </el-form-item>
                         <el-form-item
                             v-auth.device="'factorFlag'"
                             label="是否支持系数校准"
@@ -299,6 +226,14 @@
                                 <el-radio :value="0">否</el-radio>
                             </el-radio-group>
                         </el-form-item>
+                        <el-form-item
+                            v-if="scene === '1'"
+                            label="谐波系统设备id"
+                            prop="harmSysId"
+                            placeholder="请输入谐波系统设备id"
+                        >
+                            <el-input v-model="formContent.harmSysId" :disabled="formContent.importFlag == 1" />
+                        </el-form-item>
                     </el-form>
                 </div>
             </el-tab-pane>
@@ -332,7 +267,7 @@ import dayjs from 'dayjs'
 import MonitorTable from '@/views/machine/device/components/monitorTab.vue'
 import { useAppSceneStore } from '@/stores/modules/mode'
 import { generateUUID } from '@/utils'
-import { Monitor } from '@/api/device/interface/monitor'
+import { type Monitor } from '@/api/device/interface/monitor'
 
 const AppSceneStore = useAppSceneStore()
 const MonIsShow = ref(false)
@@ -508,8 +443,8 @@ const rules = computed(() => {
         dynamicRules.name = [{ required: true, message: '设备名称必填！', trigger: 'blur' }]
         // dynamicRules.hardwareVersion = [{ required: true, message: '固件版本必选！', trigger: 'change' }]
         // dynamicRules.softwareVersion = [{ required: true, message: '软件版本必选！', trigger: 'change' }]
-         dynamicRules.hardwareVersion = [{ required: true, message: '固件版本必填！', trigger: 'blur' }]
-         dynamicRules.softwareVersion = [{ required: true, message: '软件版本必填！', trigger: 'blur' }]
+        dynamicRules.hardwareVersion = [{ required: true, message: '固件版本必填！', trigger: 'blur' }]
+        dynamicRules.softwareVersion = [{ required: true, message: '软件版本必填！', trigger: 'blur' }]
         dynamicRules.manufacturer = [{ required: true, message: '生产厂家必选！', trigger: 'change' }]
     }
 
diff --git a/frontend/src/views/machine/device/components/monitorPopup.vue b/frontend/src/views/machine/device/components/monitorPopup.vue
index 5bb2bf9..7b8c9b2 100644
--- a/frontend/src/views/machine/device/components/monitorPopup.vue
+++ b/frontend/src/views/machine/device/components/monitorPopup.vue
@@ -11,20 +11,15 @@
         <div>
             <el-form :model="formContent" ref="dialogFormRef" :rules="rules" label-width="140" class="form-two">
                 <el-form-item label="名称" prop="name">
-                    <el-input v-model="formContent.name" placeholder="请输入监测点名称" />
+                    <el-input clearable v-model="formContent.name" placeholder="请输入监测点名称" />
                 </el-form-item>
                 <el-form-item label="线路号" prop="num">
-                    <el-select
-                        v-model="formContent.num"
-                        clearable
-                        placeholder="请选择线路号"
-                        @change="handleMonNumChange"
-                    >
+                    <el-select v-model="formContent.num" placeholder="请选择线路号" @change="handleMonNumChange">
                         <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-input v-model="formContent.busbar"   clearable placeholder="请输入所属母线"  />
+                    <el-input v-model="formContent.busbar" clearable placeholder="请输入所属母线" />
                 </el-form-item>
                 <!-- <el-form-item label="所属母线" prop="busbar">
                     <el-select