From 7775f707b1f57b04ec87a0db1b2da520b10f2398 Mon Sep 17 00:00:00 2001
From: wu <2468489804@qq.com>
Date: Sat, 20 Aug 2022 18:17:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E7=B1=BB=E5=9E=8B=E6=98=AFstring=E6=97=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=95=BF=E5=BA=A6=EF=BC=8C=E5=85=B6=E4=BB=96=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E8=87=AA=E5=8A=A8=E5=88=A0=E9=99=A4=E9=95=BF=E5=BA=A6?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                          |  2 +-
 .../edgeServer/edgeServerConfigure/device.vue | 19 ++++++++++++-------
 .../edgeServer/edgeServerConfigure/index.vue  |  2 +-
 src/views/scada/scadaConfigure/index.vue      |  4 ++--
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.env b/.env
index 5fa6c26..2b4b17d 100644
--- a/.env
+++ b/.env
@@ -19,4 +19,4 @@ VUE_APP_HSLSERVER_PASSWORD=123456
 
 #==true出现下拉，数据来源于MES
 #==false 手动输入，以及不渲染mes的设备编码
-VUE_APP_CHOOSABLE=true
\ No newline at end of file
+VUE_APP_CHOOSABLE=false
\ No newline at end of file
diff --git a/src/views/edgeServer/edgeServerConfigure/device.vue b/src/views/edgeServer/edgeServerConfigure/device.vue
index 1fdb4a6..e178c8f 100644
--- a/src/views/edgeServer/edgeServerConfigure/device.vue
+++ b/src/views/edgeServer/edgeServerConfigure/device.vue
@@ -248,11 +248,6 @@ export default {
                 value: 'float',
                 label: 'float (浮点数)'
               },
-              {
-                value: 'short',
-                label: 'short'
-              },
-
               {
                 value: 'bool',
                 label: 'bool (逻辑值)'
@@ -280,8 +275,7 @@ export default {
         '@DisplayName': [{ required: true, type: 'string', message: '请输入显示名称', trigger: 'blur' }],
         '@RequestType': [{ required: true, type: 'string', message: '请输入请求类型', trigger: 'blur' }],
         '@DataTypeCode': [{ required: true, type: 'string', message: '请选择类型', trigger: 'blur' }],
-        '@RequestInterval': [{ required: true, message: '请输入采集周期(ms)', trigger: 'blur' }],
-        '@Length': [{ required: true, message: '请输入长度', trigger: 'blur' }]
+        '@RequestInterval': [{ required: true, message: '请输入采集周期(ms)', trigger: 'blur' }]
       },
       serverData: {},
       devicePointData: [],
@@ -481,6 +475,13 @@ export default {
         })
         done(false)
       } else {
+        if (row['@DataTypeCode'] === 'string' && !row['@Length']) {
+          this.$message({
+            message: '数据类型为string，长度不能为空',
+            type: 'error'
+          })
+          return false
+        }
         this.devicePointData.push(row)
         await this.setDeviceConfigure()
         await this.getDevice()
@@ -521,6 +522,9 @@ export default {
         if (this.devicePointData.length > 0) {
           let devicePointData = this.devicePointData
           devicePointData = each(devicePointData, (item) => {
+            if (item['@DataTypeCode'] !== 'string') {
+              unset(item, '@Length')
+            }
             unset(item, 'id')
             unset(item, 'showBindButton')
             unset(item, 'showCopyButton')
@@ -530,6 +534,7 @@ export default {
           })
           deviceConfigureModelValue.RequestNode = devicePointData
         }
+
         deviceConfigureModelValue['@Name'] = this.deviceData[this.deviceActiveStatus].name
         let deviceNode = deviceConfigure.Content.Settings.GroupNode[0].DeviceNode || []
         let isExist = false
diff --git a/src/views/edgeServer/edgeServerConfigure/index.vue b/src/views/edgeServer/edgeServerConfigure/index.vue
index 94e534d..cc66d6a 100644
--- a/src/views/edgeServer/edgeServerConfigure/index.vue
+++ b/src/views/edgeServer/edgeServerConfigure/index.vue
@@ -140,7 +140,7 @@ export default {
             emit: 'set-device'
           },
           {
-            text: '配置应用',
+            text: '重启服务',
             size: 'small',
             emit: 'exec'
           }
diff --git a/src/views/scada/scadaConfigure/index.vue b/src/views/scada/scadaConfigure/index.vue
index 7cd4ed1..90b9d9e 100644
--- a/src/views/scada/scadaConfigure/index.vue
+++ b/src/views/scada/scadaConfigure/index.vue
@@ -41,8 +41,8 @@
 <script>
 import tips from './tips.md'
 import jschardet from 'jschardet'
-import { assign, each, map, pick, pickBy, startsWith, includes, every } from 'lodash'
-//import { getWorkingsubclassAll } from '@/api/basic/device'
+import { assign, each, pick, pickBy, startsWith, includes, every } from 'lodash'
+// import { getWorkingsubclassAll } from '@/api/basic/device'
 
 export default {
   data () {