From 3c19b05f4bd169b63f9d119f476a29ec5ae16e88 Mon Sep 17 00:00:00 2001
From: sjl <1716605279@qq.com>
Date: Thu, 29 May 2025 10:15:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=B4=E8=B0=90=E6=B3=A2=E6=AC=A1=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8CIP=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../machine/device/components/devicePopup.vue | 25 +++++++++++--------
 .../components/testScriptDetail.vue           |  4 +--
 .../components/testScriptInHarmTab.vue        |  4 +--
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/frontend/src/views/machine/device/components/devicePopup.vue b/frontend/src/views/machine/device/components/devicePopup.vue
index 284b076..3bb3d4f 100644
--- a/frontend/src/views/machine/device/components/devicePopup.vue
+++ b/frontend/src/views/machine/device/components/devicePopup.vue
@@ -85,8 +85,11 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="IP地址" prop="ip">
+            <!-- <el-form-item label="IP地址" prop="ip">
               <IPAddress v-model:value="formContent.ip"/>
+            </el-form-item> -->
+            <el-form-item label="IP地址" prop="ip" placeholder="请输入IP地址">
+              <el-input v-model="formContent.ip"/>
             </el-form-item>
             <el-form-item label="端口号" prop="port" placeholder="请输入端口号">
               <el-input v-model="formContent.port"/>
@@ -201,7 +204,7 @@ function useMetaInfo() {
     hardwareVersion: '',
     softwareVersion: '',
     protocol: 'MMS',
-    ip: '172.17.102.200',
+    ip: '',
     port: 102,
     encryptionFlag: 0,
     reCheckNum: 0,
@@ -232,7 +235,7 @@ const resetFormContent = () => {
     hardwareVersion: '',
     softwareVersion: '',
     protocol: 'MMS',
-    ip: '172.17.102.200',
+    ip: '',
     port: 102,
     encryptionFlag: 0,
     reCheckNum: 0,
@@ -443,20 +446,20 @@ const handleDevTypeChange = (value: string) => {
     formContent.value.devVolt = dev.devVolt; // 默认值为1
     formContent.value.icdId = dev.icd
     formContent.value.power = dev.power
-    if (dev.name.includes('882B')) {
-      formContent.value.ip = '172.17.102.220'
-    } else if (dev.name.includes('882A')) {
-      formContent.value.ip = '172.17.102.221'
-    } else {
-      formContent.value.ip = '172.17.102.200'
-    }
+    // if (dev.name.includes('882B')) {
+    //   formContent.value.ip = '172.17.102.220'
+    // } else if (dev.name.includes('882A')) {
+    //   formContent.value.ip = '172.17.102.221'
+    // } else {
+    //   formContent.value.ip = '172.17.102.200'
+    // }
 
 
   } else {
     formContent.value.devChns = 1; // 默认值为1
     formContent.value.devCurr = 1; // 默认值为1
     formContent.value.devVolt = 57.74; // 默认值为1
-    formContent.value.ip = '172.17.102.200'
+    //formContent.value.ip = '172.17.102.200'
   }
 
 }
diff --git a/frontend/src/views/machine/testScript/components/testScriptDetail.vue b/frontend/src/views/machine/testScript/components/testScriptDetail.vue
index 769db75..2116d8c 100644
--- a/frontend/src/views/machine/testScript/components/testScriptDetail.vue
+++ b/frontend/src/views/machine/testScript/components/testScriptDetail.vue
@@ -23,8 +23,8 @@
                                             inline-prompt
                                             :active-value="1"
                                             :inactive-value="0"
-                                            active-text="启用"
-                                            inactive-text="禁用"
+                                            active-text="禁用"
+                                            inactive-text="启用"
                                             @change="enableScript"
                                             size="large"
                                             width="80px"
diff --git a/frontend/src/views/machine/testScript/components/testScriptInHarmTab.vue b/frontend/src/views/machine/testScript/components/testScriptInHarmTab.vue
index 31b5954..6c2bcf5 100644
--- a/frontend/src/views/machine/testScript/components/testScriptInHarmTab.vue
+++ b/frontend/src/views/machine/testScript/components/testScriptInHarmTab.vue
@@ -213,7 +213,7 @@ const onSubmit = () => {
     }
     if (formInline.value.inharm.includes('0')) {
         props.childForm[0].inharmList = []
-        for (let i = 2; i < 51; i++) {
+        for (let i = 0.5; i < 50; i++) {
             props.childForm[0].inharmList.push({
                 inharm: i, //间间谐波次数
                 famp: formInline.value.famp, //间间谐波含有率
@@ -250,7 +250,7 @@ const onSubmit1 = () => {
     }
     if (formInline1.value.inharm.includes('0')) {
         props.childForm[1].inharmList = []
-        for (let i = 2; i < 51; i++) {
+        for (let i = 0.5; i < 50; i++) {
             props.childForm[1].inharmList.push({
                 inharm: i, //间间谐波次数
                 famp: formInline1.value.famp, //间间谐波含有率