From 6cdeaf1c31dacc8a636a6a3ad91f11dacdf70384 Mon Sep 17 00:00:00 2001
From: wu <2468489804@qq.com>
Date: Sat, 20 Aug 2022 14:48:50 +0800
Subject: [PATCH] =?UTF-8?q?SCADA=E5=89=8D=E7=AB=AF=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=88=AB=E5=BD=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../edgeServer/edgeServerConfigure/device.vue |  1 -
 src/views/scada/scadaConfigure/index.vue      | 53 +++++++++++++------
 2 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/views/edgeServer/edgeServerConfigure/device.vue b/src/views/edgeServer/edgeServerConfigure/device.vue
index 8623ae6..e155d7b 100644
--- a/src/views/edgeServer/edgeServerConfigure/device.vue
+++ b/src/views/edgeServer/edgeServerConfigure/device.vue
@@ -567,7 +567,6 @@ export default {
     },
  
     async getDeviceStatus () {
-      console.log(process.env.VUE_APP_VUE_APP_HSLSERVER_PASSWORD)
       const res = await this.$api.GET_SERVER_DEVICE_STATUS('http://' + this.serverData.url + ':' + this.serverData.port, 'admin', process.env.VUE_APP_HSLSERVER_PASSWORD)
       if (res) {
         this.$emit('changeStatus', 'online')
diff --git a/src/views/scada/scadaConfigure/index.vue b/src/views/scada/scadaConfigure/index.vue
index fab3746..a3a00cf 100644
--- a/src/views/scada/scadaConfigure/index.vue
+++ b/src/views/scada/scadaConfigure/index.vue
@@ -65,17 +65,13 @@ export default {
           key: 'type'
         },
         {
-          title: '流程',
-          key: 'flow_code'
+          title: '数据类别',
+          key: 'category'
         },
         {
           title: '工序单元',
           key: 'working_subclass'
         },
-        {
-          title: '工作站',
-          key: 'workstation'
-        },
         {
           title: '创建时间',
           key: 'create_date'
@@ -145,15 +141,43 @@ export default {
             span: 12
           }
         },
-        flow_code: {
-          title: '流程'
+        category: {
+          title: '数据类别',
+          value: '',
+          component: {
+            name: 'el-select',
+            options: [
+              {
+                value: 'DEVICE_STATUS',
+                label: '设备状态'
+              },
+              {
+                value: 'ITEM_ID_ITEM',
+                label: '编号'
+              },
+              {
+                value: 'DEVICE_DATA',
+                label: '运行数据'
+              },
+              {
+                value: 'PROCESS_DATA',
+                label: '过程数据'
+              },
+              {
+                value: 'RESULT_DATA',
+                label: '结果数据'
+              },
+              {
+                value: 'STATISTICAL_DATA',
+                label: '统计数据'
+              }
+            ],
+            span: 12
+          }
         },
         working_subclass: {
           title: '工序单元'
         },
-        workstation: {
-          title: '工作站'
-        },
         note: {
           title: '备注'
         }
@@ -162,12 +186,6 @@ export default {
         name: {
           title: '节点名称'
         },
-        flow_code: {
-          title: '流程'
-        },
-        workstation: {
-          title: '工作站'
-        },
         note: {
           title: '备注'
         }
@@ -181,6 +199,7 @@ export default {
         code: [{ required: true, type: 'string', message: '节点编码必须填写', trigger: 'blur' }],
         name: [{ required: true, type: 'string', message: '节点名称必须填写', trigger: 'blur' }],
         type: [{ required: true, message: '必须指定节点类型', trigger: 'blur' }],
+        category: [{ required: true, message: '必须指定数据类别', trigger: 'blur' }],
         working_subclass: [{
           required: true,
           type: 'string',