From 884e8918e8242ef88448b6cd3ec1ed075850b4d7 Mon Sep 17 00:00:00 2001
From: hear <70554662+Wzyyy98@users.noreply.github.com>
Date: Wed, 15 Nov 2023 14:04:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20s7=E7=82=B9=E4=BD=8D=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: s7点位死区校验

* fix: s7点位配置
---
 src/views/DataCollect/Collector/Point/Save/SaveS7.vue | 9 +++++++--
 src/views/DataCollect/Collector/Tree/Save/index.vue   | 2 +-
 vite.config.ts                                        | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/views/DataCollect/Collector/Point/Save/SaveS7.vue b/src/views/DataCollect/Collector/Point/Save/SaveS7.vue
index 4cc6cd5d..3415bc07 100644
--- a/src/views/DataCollect/Collector/Point/Save/SaveS7.vue
+++ b/src/views/DataCollect/Collector/Point/Save/SaveS7.vue
@@ -46,7 +46,7 @@
                     placeholder="请输入字符串长度" :precision="0" :controls="false" :maxlength="64" :disabled="disabled" />
             </j-form-item>
 
-            <j-form-item v-if="form.type == 'Bool'" label="位偏移量（bit）" :name="['configuration', 'bits']" :rules="{
+            <j-form-item v-if="form.configuration.type == 'Bool'" label="位偏移量（bit）" :name="['configuration', 'bits']" :rules="{
                 required: true,
                 message: '请输入0~7之间的正整数',
                 trigger: 'blur',
@@ -189,6 +189,7 @@ const form = ref<any>({
         type: undefined,
         interval: 3000,
         areaNumber: undefined,
+        bytes:undefined,
         terms: []
     },
     accessModes: [],
@@ -267,10 +268,14 @@ const handleCancelInterval = () => {
 
 
 const handleOk = async () => {
-    const res = await formRef.value?.validate();
+    const res:any = await formRef.value?.validate();
     
     const params = {
         ...res,
+        configuration:{
+            ...res.configuration,
+            bytes:res.configuration.bytes || form.value.configuration.bytes
+        },
         inheritBreaker: true,
         pointKey: props.data.pointKey || randomString(9),
         provider:props.data.provider,
diff --git a/src/views/DataCollect/Collector/Tree/Save/index.vue b/src/views/DataCollect/Collector/Tree/Save/index.vue
index 57e961a7..71ccb285 100644
--- a/src/views/DataCollect/Collector/Tree/Save/index.vue
+++ b/src/views/DataCollect/Collector/Tree/Save/index.vue
@@ -45,7 +45,7 @@
               <j-input v-model:value="formData.configuration.host" autocomplete="off" placeholder="请输入通道IP" :disabled="false"/>
             </j-form-item>
             <j-form-item v-if="provider === 'snap7'" label="端口" :name="['configuration', 'port']" :rules="LeftTreeRules.port">
-              <j-input-number style="width: 100%" v-model:value="formData.configuration.port" autocomplete="off" placeholder="请输入通道端口"/>
+              <j-input-number style="width: 100%" v-model:value="formData.configuration.port" :precision="0" autocomplete="off" placeholder="请输入通道端口"/>
             </j-form-item>
             <j-form-item v-if="provider === 'snap7'" label="机架号" :name="['configuration', 'rack']" :rules="LeftTreeRules.rack">
               <j-input-number style="width: 100%" v-model:value="formData.configuration.rack" autocomplete="off" placeholder="请输入机架号" :maxlength="64" />
diff --git a/vite.config.ts b/vite.config.ts
index 0986ae20..80ead348 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -96,8 +96,8 @@ export default defineConfig(({ mode}) => {
                   // target: 'http://192.168.32.244:8881',
                 //   target: 'http://192.168.32.163:8844', //张季本地
                 //   target: 'http://120.77.179.54:8844', // 120测试
-                // target: 'http://192.168.33.46:8844', // 本地开发环境
-                target: 'http://192.168.33.1:8845', // 社区版开发环境
+                target: 'http://192.168.33.46:8844', // 本地开发环境
+                // target: 'http://192.168.33.1:8845', // 社区版开发环境
                 //   target: 'http://192.168.32.5:8848', // 刘本地
                   ws: 'ws://192.168.33.46:8844',
                   changeOrigin: true,