From 5403b4699b58eb2709c664f91c620f9bbef02981 Mon Sep 17 00:00:00 2001
From: wu <2468489804@qq.com>
Date: Tue, 23 Aug 2022 10:07:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E5=BD=93=E5=89=8D=E5=80=BC=E7=9B=91=E6=8E=A7&?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E5=80=BC=E5=86=99=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/edgeServer.api.js             |  22 +-
 .../edgeServer/edgeServerConfigure/device.vue | 907 +++++++++++-------
 .../edgeServerConfigure/deviceConfigure.vue   |   1 -
 .../edgeServer/edgeServerConfigure/index.vue  |   5 +-
 4 files changed, 572 insertions(+), 363 deletions(-)

diff --git a/src/api/modules/edgeServer.api.js b/src/api/modules/edgeServer.api.js
index dc9ea76..df8c524 100644
--- a/src/api/modules/edgeServer.api.js
+++ b/src/api/modules/edgeServer.api.js
@@ -94,13 +94,31 @@ export default ({ service, request, serviceForMock, requestForMock, mock, faker,
       url: url + '/Edge/DeviceData?data=__status'
     })
   },
-  GET_DEVICE_POINT_VALUE(url, username, password, deviceName){
+  GET_DEVICE_POINT_VALUE(url, username, password, deviceName, data, type){
     return request({
       auth: {
         username: username,
         password: password
       },
-      url: url + '/Edge/BrowseDeviceDataNodes?data=' + deviceName
+      data: {
+        'address':data
+      },
+      method: 'post',
+      url: url + '/'+ deviceName +'/Read'+ type +'32'
+    })
+  },
+  SET_DEVICE_POINT_VALUE(url, deviceName, data, type, value){
+    return request({
+      auth: {
+        username: 'admin', 
+        password: process.env.VUE_APP_HSLSERVER_PASSWORD
+      },
+      data: {
+        address:data,
+        value:value
+      },
+      method: 'post',
+      url: url + '/'+ deviceName +'/Write'+ type +'32'
     })
   }
 })
diff --git a/src/views/edgeServer/edgeServerConfigure/device.vue b/src/views/edgeServer/edgeServerConfigure/device.vue
index d726ac4..6cf0f44 100644
--- a/src/views/edgeServer/edgeServerConfigure/device.vue
+++ b/src/views/edgeServer/edgeServerConfigure/device.vue
@@ -5,10 +5,17 @@
         <el-card class="box-card">
           <div slot="header" class="menu-header">
             <div class="header-title">设备</div>
-            <el-dropdown size="small" style="vertical-align: middle;" @command="handleCommand">
+            <el-dropdown
+              size="small"
+              style="vertical-align: middle"
+              @command="handleCommand"
+            >
               <el-button type="primary" round>
-                <i class="el-icon-s-tools" style="font-size:14px;"></i><i class="el-icon-arrow-down el-icon--right"
-                  style="font-size:14px;"></i>
+                <i class="el-icon-s-tools" style="font-size: 14px"></i
+                ><i
+                  class="el-icon-arrow-down el-icon--right"
+                  style="font-size: 14px"
+                ></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="add">新加设备</el-dropdown-item>
@@ -20,36 +27,72 @@
             </el-dropdown>
           </div>
 
-          <el-menu :style="{ 'borderRight': 'none' }" :defaultActive="deviceActiveStatus" @select="getDeviceConfigure">
-            <el-menu-item class="serve-item" shadow="always" v-for="(item, i) in deviceData" :key="i" :index="i + ''">
-              <div style="position:relative;">
-                <div style="display:inline-block;">{{ item.name }}</div>
+          <el-menu
+            :style="{ borderRight: 'none' }"
+            :defaultActive="deviceActiveStatus"
+            @select="getDeviceConfigure"
+          >
+            <el-menu-item
+              class="serve-item"
+              shadow="always"
+              v-for="(item, i) in deviceData"
+              :key="i"
+              :index="i + ''"
+            >
+              <div style="position: relative">
+                <div style="display: inline-block">{{ item.name }}</div>
                 <div
-                  :class="{ 'device-status': true, 'device-status-online': item.status, 'device-status-offline': !item.status }">
-                </div>
+                  :class="{
+                    'device-status': true,
+                    'device-status-online': item.status,
+                    'device-status-offline': !item.status,
+                  }"
+                ></div>
               </div>
             </el-menu-item>
           </el-menu>
-
         </el-card>
       </div>
     </el-aside>
     <el-main :style="{ padding: '10px' }">
       <el-card class="box-card">
-        <div slot="header" style=" position: relative;">
+        <div slot="header" style="position: relative">
           <div class="header-title">设备配置</div>
-          <el-button class="header-button" type="primary" @click="setDeviceConfigure">应用</el-button>
+          <el-button
+            class="header-button"
+            type="primary"
+            @click="setDeviceConfigure"
+            >应用</el-button
+          >
         </div>
-        <device-configure ref="deviceConfigure" :defaultDeviceName="defaultDeviceName"
-          :defaultFormData="defaultFormData" />
+        <device-configure
+          ref="deviceConfigure"
+          :defaultDeviceName="defaultDeviceName"
+          :defaultFormData="defaultFormData"
+        />
       </el-card>
-      <el-card class="box-card" style="margin-top:5px;">
-        <d2-crud ref="d2Crud" :columns="columns" :data="devicePointData" :rowHandle="rowHandle" add-title="新增"
-          edit-title="绑定" :add-template="addTemplate" :add-rules="addRules" :form-options="formOptions"
-          @row-add="addDevicePoint" @row-edit="devicePointBandingNode" @row-remove="delDevicePoint"
-          @dialog-cancel="handleDialogCancel" @banding="bandingNodeTemplate" @cell-data-change="handleCellDataChange"
-          @form-data-change="handleFormDataChange">
-          <el-button slot="header" style="margin-bottom: 5px" @click="addRow">新增</el-button>
+      <el-card class="box-card" style="margin-top: 5px">
+        <d2-crud
+          ref="d2Crud"
+          :columns="columns"
+          :data="devicePointData"
+          :rowHandle="rowHandle"
+          add-title="新增"
+          edit-title="绑定"
+          :add-template="addTemplate"
+          :add-rules="addRules"
+          :form-options="formOptions"
+          @row-add="addDevicePoint"
+          @row-edit="devicePointBandingNode"
+          @row-remove="delDevicePoint"
+          @dialog-cancel="handleDialogCancel"
+          @banding="bandingNodeTemplate"
+          @cell-data-change="handleCellDataChange"
+          @form-data-change="handleFormDataChange"
+        >
+          <el-button slot="header" style="margin-bottom: 5px" @click="addRow"
+            >新增</el-button
+          >
         </d2-crud>
       </el-card>
     </el-main>
@@ -57,415 +100,485 @@
 </template>
 
 <script>
-
-import { each, assign, unset, filter, isArray, map } from 'lodash'
+import {
+  each,
+  assign,
+  unset,
+  filter,
+  isArray,
+  map,
+  capitalize,
+  split,
+  toUpper,
+} from "lodash";
 
 export default {
   props: {
     server: {
       default: {
         id: 0,
-        url: '',
-        port: ''
-      }
-    }
+        url: "",
+        port: "",
+      },
+    },
   },
   components: {
-    DeviceConfigure: () => import('./deviceConfigure')
+    DeviceConfigure: () => import("./deviceConfigure"),
   },
-  data () {
+  data() {
     return {
-      active: '',
+      active: "",
+      timing:null,
       columns: [
         {
-          title: '序号',
-          key: 'id'
+          title: "序号",
+          key: "id",
         },
         {
-          title: '名称',
-          key: '@Name',
+          title: "名称",
+          key: "@Name",
           component: {
-            size: 'small'
-          }
+            size: "small",
+          },
         },
         {
-          title: '绑定',
-          key: '@Binding'
-
+          title: "绑定",
+          key: "@Binding",
         },
         {
-          title: '地址',
-          key: '@Address',
+          title: "地址",
+          key: "@Address",
           component: {
-            name: 'el-input',
-            size: 'small'
-          }
+            name: "el-input",
+            size: "small",
+          },
         },
         {
-          title: '类型',
-          key: '@DataTypeCode',
+          title: "类型",
+          key: "@DataTypeCode",
           component: {
-            name: 'el-select',
-            size: 'small',
+            name: "el-select",
+            size: "small",
             options: [
               {
-                value: 'string',
-                label: 'string (字符串)'
+                value: "string",
+                label: "string (字符串)",
               },
               {
-                value: 'int',
-                label: 'int (整数)'
+                value: "int",
+                label: "int (整数)",
               },
               {
-                value: 'float',
-                label: 'float (浮点数)'
+                value: "float",
+                label: "float (浮点数)",
               },
               {
-                value: 'bool',
-                label: 'bool (逻辑值)'
+                value: "bool",
+                label: "bool (逻辑值)",
               },
               {
-                value: 'uint',
-                label: 'uint'
+                value: "uint",
+                label: "uint",
               },
               {
-                value: 'short',
-                label: 'short'
+                value: "short",
+                label: "short",
               },
               {
-                value: 'ushort',
-                label: 'ushort'
+                value: "ushort",
+                label: "ushort",
               },
               {
-                value: 'long',
-                label: 'long'
+                value: "long",
+                label: "long",
               },
               {
-                value: 'ulong',
-                label: 'ulong'
+                value: "ulong",
+                label: "ulong",
               },
               {
-                value: 'double',
-                label: 'double'
+                value: "double",
+                label: "double",
               },
               {
-                value: 'byte',
-                label: 'byte'
+                value: "byte",
+                label: "byte",
               },
               {
-                value: 'sbyte',
-                label: 'sbyte'
-              }
-            ]
-          }
+                value: "sbyte",
+                label: "sbyte",
+              },
+            ],
+          },
         },
         {
-          title: '采集周期',
-          key: '@RequestInterval',
+          title: "采集周期",
+          key: "@RequestInterval",
           component: {
-            name: 'el-input',
-            size: 'small'
-          }
+            name: "el-input",
+            size: "small",
+          },
         },
         {
-          title: '长度',
-          key: '@Length',
+          title: "长度",
+          key: "@Length",
           component: {
-            name: 'el-input',
-            size: 'small'
-          }
+            name: "el-input",
+            size: "small",
+          },
         },
         {
-          title: '说明',
-          key: '@Description',
+          title: "说明",
+          key: "@Description",
           component: {
-            name: 'el-input',
-            size: 'small'
-          }
+            name: "el-input",
+            size: "small",
+          },
         },
         {
-          title: '当前值',
-          key: '@Value',
+          title: "当前值",
+          key: "@Value",
           component: {
-            name: 'el-input',
-            size: 'small'
-          }
-        }
+            name: "el-input",
+            size: "small",
+          },
+        },
       ],
       rowHandle: {
-        minWidth: '200',
+        minWidth: "200",
         custom: [
           {
-            text: '绑定',
-            size: 'mini',
-            emit: 'banding',
-            show (index, row) {
+            text: "绑定",
+            size: "mini",
+            emit: "banding",
+            show(index, row) {
               if (row.showBindButton) {
-                return true
+                return true;
               }
-              return false
-            }
+              return false;
+            },
           },
           {
-            text: '发送',
-            size: 'mini',
-            show (index, row) {
+            text: "发送",
+            size: "mini",
+            show(index, row) {
               if (row.showSendButton) {
-                return true
+                return true;
               }
-              return false
-            }
+              return false;
+            },
           },
           {
-            text: '复制',
-            size: 'mini',
-            show (index, row) {
+            text: "复制",
+            size: "mini",
+            show(index, row) {
               if (row.showCopyButton) {
-                return true
+                return true;
               }
-              return false
-            }
-          }
+              return false;
+            },
+          },
         ],
         remove: {
-          size: 'mini',
+          size: "mini",
 
           confirm: true,
-          show (index, row) {
+          show(index, row) {
             if (row.showRemoveButton) {
-              return true
+              return true;
             }
-            return false
-          }
-        }
+            return false;
+          },
+        },
       },
       formOptions: {
         modal: false,
         saveLoading: false,
-        showOverflowTooltip: true
+        showOverflowTooltip: true,
       },
       addTemplate: {
-        '@Name': {
-          title: '名称'
+        "@Name": {
+          title: "名称",
         },
-        '@Address': {
-          title: '地址'
+        "@Address": {
+          title: "地址",
         },
-        '@DisplayName': {
-          title: '显示名称'
+        "@DisplayName": {
+          title: "显示名称",
         },
-        '@RequestType': {
-          title: '请求类型'
+        "@RequestType": {
+          title: "请求类型",
         },
-        '@DataTypeCode': {
-          title: '数据类型',
+        "@DataTypeCode": {
+          title: "数据类型",
           component: {
-            name: 'el-select',
+            name: "el-select",
             options: [
               {
-                value: 'string',
-                label: 'string (字符串)'
+                value: "string",
+                label: "string (字符串)",
               },
               {
-                value: 'int',
-                label: 'int (整数)'
+                value: "int",
+                label: "int (整数)",
               },
               {
-                value: 'float',
-                label: 'float (浮点数)'
+                value: "float",
+                label: "float (浮点数)",
               },
               {
-                value: 'bool',
-                label: 'bool (逻辑值)'
+                value: "bool",
+                label: "bool (逻辑值)",
               },
               {
-                value: 'uint',
-                label: 'uint'
+                value: "uint",
+                label: "uint",
               },
               {
-                value: 'short',
-                label: 'short'
+                value: "short",
+                label: "short",
               },
               {
-                value: 'ushort',
-                label: 'ushort'
+                value: "ushort",
+                label: "ushort",
               },
               {
-                value: 'long',
-                label: 'long'
+                value: "long",
+                label: "long",
               },
               {
-                value: 'ulong',
-                label: 'ulong'
+                value: "ulong",
+                label: "ulong",
               },
               {
-                value: 'double',
-                label: 'double'
+                value: "double",
+                label: "double",
               },
               {
-                value: 'byte',
-                label: 'byte'
+                value: "byte",
+                label: "byte",
               },
               {
-                value: 'sbyte',
-                label: 'sbyte'
-              }
+                value: "sbyte",
+                label: "sbyte",
+              },
             ],
-            span: 12
-          }
+            span: 12,
+          },
         },
-        '@RequestInterval': {
-          title: '采集周期(ms)'
+        "@RequestInterval": {
+          title: "采集周期(ms)",
         },
-        '@Length': {
-          title: '长度'
+        "@Length": {
+          title: "长度",
+        },
+        "@Description": {
+          title: "说明",
         },
-        '@Description': {
-          title: '说明'
-        }
       },
       addRules: {
-        '@Name': [{ required: true, type: 'string', message: '请输入名称', trigger: 'blur' }],
-        '@Address': [{ required: true, type: 'string', message: '请输入地址', trigger: 'blur' }],
-        '@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' }]
+        "@Name": [
+          {
+            required: true,
+            type: "string",
+            message: "请输入名称",
+            trigger: "blur",
+          },
+        ],
+        "@Address": [
+          {
+            required: true,
+            type: "string",
+            message: "请输入地址",
+            trigger: "blur",
+          },
+        ],
+        "@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" },
+        ],
       },
       serverData: {},
       devicePointData: [],
       nodeCodeData: [],
       workingSubclasses: [],
       dialogVisible: false,
-      deviceActiveStatus: '0',
-      defaultDeviceName: '',
+      deviceActiveStatus: "0",
+      defaultDeviceName: "",
       defaultFormData: {},
       deviceData: [],
-      deviceConfigure: {}
-    }
+      deviceConfigure: {},
+    };
   },
   watch: {
     server: {
-      handler (val) {
-        this.serverData = val
-        this.getDevice()
+      handler(val) {
+        this.serverData = val;
+        this.getDevice();
         if (val.id) {
-          this.getDeviceStatus()
+          this.getDeviceStatus();
         }
       },
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   methods: {
-    addRow () {
+    addRow() {
       this.$refs.d2Crud.showDialog({
-        mode: 'add'
-      })
+        mode: "add",
+      });
     },
-    handleFormDataChange ({ key }) {
-      if (key === 'workingSubclass') {
-        const { workingSubclass } = this.$refs.d2Crud.formData
-        this.getCodesByWorkingSubclass(workingSubclass)
-        this.$refs.d2Crud.$forceUpdate()
+    handleFormDataChange({ key }) {
+      if (key === "workingSubclass") {
+        const { workingSubclass } = this.$refs.d2Crud.formData;
+        this.getCodesByWorkingSubclass(workingSubclass);
+        this.$refs.d2Crud.$forceUpdate();
       }
     },
-    handleCellDataChange ({ rowIndex, row }) {
-      this.devicePointData[rowIndex] = row
+    handleCellDataChange({ rowIndex, row, key, value }) {
+      let type = undefined;
+      if (row["@DataTypeCode"][0] === "u") {
+        type = split(row["@DataTypeCode"], "")
+        type[1] = toUpper(type[0] + type[1])
+        type = type.join("")
+      } else {
+        type = capitalize(row["@DataTypeCode"])
+      }
+      if (key === "@Value") { 
+        this.$api.SET_DEVICE_POINT_VALUE(
+          "http://" + this.serverData.url + ":" + this.serverData.port,
+          this.deviceData[this.deviceActiveStatus].name,
+          row["@Address"],
+          type,
+          value
+        ).then(res=>{
+          if(!res.IsSuccess){
+            this.$message({
+              message: res.Message,
+              type: "error",
+            });
+          }
+        })
+      }
+      this.devicePointData[rowIndex] = row;
     },
-    bandingNodeTemplate ({ index }) {
+    bandingNodeTemplate({ index }) {
       this.$refs.d2Crud.showDialog({
-        mode: 'edit',
+        mode: "edit",
         rowIndex: index,
         template: {
           workingSubclass: {
-            title: '工序编码',
-            value: '',
+            title: "工序编码",
+            value: "",
             component: {
-              name: 'el-select',
+              name: "el-select",
               options: this.workingSubclasses,
-              span: 12
-            }
+              span: 12,
+            },
           },
           nodeCode: {
-            title: '节点名称',
-            value: '',
+            title: "节点名称",
+            value: "",
             component: {
-              name: 'el-select',
+              name: "el-select",
               options: this.nodeCodeData,
-              span: 12
-            }
-          }
-
-        }
-      })
+              span: 12,
+            },
+          },
+        },
+      });
     },
-    handleDialogCancel (done) {
+    handleDialogCancel(done) {
       this.$message({
-        message: '用户取消保存',
-        type: 'warning'
-      })
-      done()
+        message: "用户取消保存",
+        type: "warning",
+      });
+      done();
     },
-    handleCommand (command) {
+    handleCommand(command) {
       switch (command) {
-        case 'add':
+        case "add":
           this.addDevice()
-          break
-        case 'del':
+          break;
+        case "del":
           this.delDevice()
-          break
+          break;
       }
     },
-    async getCodesByWorkingSubclass (workingSubclass) {
+    async getCodesByWorkingSubclass(workingSubclass) {
       try {
         const nodeCode = await this.$api.QUERY_CODES(workingSubclass)
-        const nodeCodeData = []
+        let nodeCodeData = []
         each(nodeCode, (o) => {
           nodeCodeData.push({ value: o, label: o })
-        }
-        )
+        });
         this.nodeCodeData = nodeCodeData
         this.$nextTick(() => {
-          this.$refs.d2Crud.handleFormTemplateMode('nodeCode').component.options = this.nodeCodeData
+          this.$refs.d2Crud.handleFormTemplateMode(
+            "nodeCode"
+          ).component.options = this.nodeCodeData
           this.$refs.d2Crud.$forceUpdate()
-        })
+        });
       } catch (e) {
-        console.log(e)
+        console.log(e);
       }
     },
-    async getworkingSubclasses () {
+    async getworkingSubclasses() {
       try {
-        const workingSubclasses = await this.$api.QUERY_WORKING_SUBCLASSES()
+        const workingSubclasses = await this.$api.QUERY_WORKING_SUBCLASSES();
         const workingSubclassesData = []
         each(workingSubclasses, (o) => {
           workingSubclassesData.push({ value: o, label: o })
-        }
-        )
+        });
         this.workingSubclasses = workingSubclassesData
       } catch (e) {
-        console.log(e)
+        console.log(e);
       }
     },
-    async getDevice () {
+    async getDevice() {
       try {
         this.deviceData = await this.$api.GET_DEVICE(this.serverData.id)
         if (this.deviceData.length > 0) {
           this.getDeviceConfigure(this.deviceActiveStatus)
         } else {
-          this.devicePointData = [] // 如果没有设备，防止显示上一次打开的设备数据先清空数据
-          this.defaultDeviceName = ''
+          this.devicePointData = []; // 如果没有设备，防止显示上一次打开的设备数据先清空数据
+          this.defaultDeviceName = ""
         }
       } catch (e) {
-        console.log(e)
+        console.log(e);
       }
     },
-    async getDeviceConfigure (e) {
+    async getDeviceConfigure(e) {
       this.deviceActiveStatus = e
-      const devicePointValue = this.getDevicePoint()
       this.devicePointData = [] // 当切换设备时把保存configure、point的数据清空
-      this.defaultDeviceName = ''
-      const deviceData = await this.$api.GET_DEVICE_CONFIGURE(this.deviceData[e].id)
-
+      this.defaultDeviceName = ""
+      clearInterval(this.timing) //当切换设备时先关闭定时器，防止一直执行上一设备的定时器
+      const deviceData = await this.$api.GET_DEVICE_CONFIGURE(
+        this.deviceData[e].id
+      );
       if (deviceData[0].conf) {
         const conf = JSON.parse(deviceData[0].conf)
         if (conf.DeviceTypeName !== undefined) {
@@ -473,190 +586,268 @@ export default {
           this.defaultFormData = conf
         }
         // 获取point信息
+        let devicePointAddress = []
         if (conf.RequestNode !== undefined && conf.RequestNode.length > 0) {
           this.devicePointData = each(conf.RequestNode, (o, i) => {
+            let type = undefined;
+            if (o["@DataTypeCode"][0] === "u") {
+              type = split(o["@DataTypeCode"], "")
+              type[1] = toUpper(type[0] + type[1])
+              type = type.join("")
+            } else {
+              type = capitalize(o["@DataTypeCode"])
+            }
+            devicePointAddress.push({
+              key: i,
+              value: o["@Address"],
+              type:
+                o["@DataTypeCode"][0] === "u"
+                  ? replace(o["@DataTypeCode"])
+                  : capitalize(o["@DataTypeCode"]),
+            })
             assign(o, {
               id: i + 1,
               showBindButton: true,
               showSendButton: true,
               showCopyButton: true,
               showRemoveButton: true,
-              "@Value": devicePointValue[o['@Name']]
-            })
-        })
+            });
+          });
+          if (devicePointAddress.length > 0) {
+            this.getDevicePoint(devicePointAddress);
+          }
         }
       }
     },
-    addDevice () {
-      const that = this
-      this.$prompt('输入设备名称', '新加设备', {
-        confirmButtonText: '确定',
+    addDevice() {
+      const that = this;
+      this.$prompt("输入设备名称", "新加设备", {
+        confirmButtonText: "确定",
         inputPattern: /^[\s\S]*.*[^\s][\s\S]*$/,
-        inputErrorMessage: '请输入设备名称'
+        inputErrorMessage: "请输入设备名称",
       }).then(({ value }) => {
-        this.$api.ADD_DEVICE({ action: 'add_device', name: value, server_id: this.serverData.id })
-        that.getDevice()
+        this.$api.ADD_DEVICE({
+          action: "add_device",
+          name: value,
+          server_id: this.serverData.id,
+        });
+        that.getDevice();
         this.$message({
-          message: '新加设备成功',
-          type: 'success'
-        })
-      })
+          message: "新加设备成功",
+          type: "success",
+        });
+      });
     },
-    async delDevice () {
-      const deviceConfigure = await this.$api.GET_HSLSERVER_CONFIGURE('http://' + this.serverData.url + ':' + this.serverData.port, 'admin', process.env.VUE_APP_HSLSERVER_PASSWORD)
-      let deviceNode = deviceConfigure.Content.Settings.GroupNode[0].DeviceNode
+    async delDevice() {
+      const deviceConfigure = await this.$api.GET_HSLSERVER_CONFIGURE(
+        "http://" + this.serverData.url + ":" + this.serverData.port,
+        "admin",
+        process.env.VUE_APP_HSLSERVER_PASSWORD
+      );
+      let deviceNode = deviceConfigure.Content.Settings.GroupNode[0].DeviceNode;
       if (deviceNode !== undefined && isArray(deviceNode)) {
-        deviceNode = filter(deviceNode, item => {
-          return item['@Name'] === this.deviceData[this.deviceActiveStatus].name ? null : item
-        })
-        deviceConfigure.Content.Settings.GroupNode[0].DeviceNode = deviceNode
+        deviceNode = filter(deviceNode, (item) => {
+          return item["@Name"] === this.deviceData[this.deviceActiveStatus].name
+            ? null
+            : item;
+        });
+        deviceConfigure.Content.Settings.GroupNode[0].DeviceNode = deviceNode;
       } else {
-        unset(deviceConfigure, 'Content.Settings.GroupNode[0].DeviceNode')
+        unset(deviceConfigure, "Content.Settings.GroupNode[0].DeviceNode");
       }
 
       try {
-        await this.$api.SET_HSLSERVER_CONFIGURE('http://' + this.serverData.url + ':' + this.serverData.port, 'admin', process.env.VUE_APP_HSLSERVER_PASSWORD, { data: deviceConfigure.Content })
-        await this.$api.DEL_DEVICE({ action: 'remove_device', id: this.deviceData[this.deviceActiveStatus].id })
+        await this.$api.SET_HSLSERVER_CONFIGURE(
+          "http://" + this.serverData.url + ":" + this.serverData.port,
+          "admin",
+          process.env.VUE_APP_HSLSERVER_PASSWORD,
+          { data: deviceConfigure.Content }
+        );
+        await this.$api.DEL_DEVICE({
+          action: "remove_device",
+          id: this.deviceData[this.deviceActiveStatus].id,
+        });
         this.$message({
-          message: '删除设备成功',
-          type: 'success'
-        })
-        this.getDevice()
+          message: "删除设备成功",
+          type: "success",
+        });
+        this.getDevice();
       } catch (e) {
-        console.log(e)
+        console.log(e);
       }
     },
-    async addDevicePoint (row, done) {
-      this.formOptions.saveLoading = true
+    async addDevicePoint(row, done) {
+      this.formOptions.saveLoading = true;
       if (!this.$refs.deviceConfigure.defaultDeviceTypeNameValue) {
         this.$message({
-          message: '请先应用设备配置',
-          type: 'error'
-        })
-        done(false)
+          message: "请先应用设备配置",
+          type: "error",
+        });
+        done(false);
       } else {
-        if (row['@DataTypeCode'] === 'string' && !row['@Length']) {
+        if (row["@DataTypeCode"] === "string" && !row["@Length"]) {
           this.$message({
-            message: '数据类型为string，长度不能为空',
-            type: 'error'
-          })
-          this.formOptions.saveLoading = false
-          return false
+            message: "数据类型为string，长度不能为空",
+            type: "error",
+          });
+          this.formOptions.saveLoading = false;
+          return false;
         }
-        assign(row, { id: this.devicePointData.length + 1, showBindButton: true, showCopyButton: true, showRemoveButton: true, showSendButton: true })
-        this.devicePointData.push(row)
-        done()
+        assign(row, {
+          id: this.devicePointData.length + 1,
+          showBindButton: true,
+          showCopyButton: true,
+          showRemoveButton: true,
+          showSendButton: true,
+        });
+        this.devicePointData.push(row);
+        done();
       }
-      this.formOptions.saveLoading = false
+      this.formOptions.saveLoading = false;
     },
-    async delDevicePoint ({ index, row }, done) {
-      this.$delete(this.devicePointData, index)
-      done()
+    async delDevicePoint({ index, row }, done) {
+      this.$delete(this.devicePointData, index);
+      done();
     },
-    async getDevicePoint () {
-      try {
-        let data = {}
-        const devicePointValue = await this.$api.GET_DEVICE_POINT_VALUE('http://' + this.serverData.url + ':' + this.serverData.port, 'admin', process.env.VUE_APP_HSLSERVER_PASSWORD, this.deviceData[this.deviceActiveStatus].name)
-        each(devicePointValue.Content, o=>{
-          data[o.Name] = o.value || ''
-        })
-        return data
-      } catch (e) {
-        console.log(e)
-      }
+    getDevicePoint(devicePointAddress) {
+      clearInterval(this.timing)
+      this.timing = setInterval(() => {
+        each(devicePointAddress, async (item) => {
+          try {
+            this.$api
+              .GET_DEVICE_POINT_VALUE(
+                "http://" + this.serverData.url + ":" + this.serverData.port,
+                "admin",
+                process.env.VUE_APP_HSLSERVER_PASSWORD,
+                this.deviceData[this.deviceActiveStatus].name,
+                item.value,
+                item.type
+              )
+              .then((res) => {
+                this.$set(
+                  this.devicePointData[item.key],
+                  "@Value",
+                  res.Content
+                );
+              });
+          } catch (e) {
+            console.log(e);
+          }
+        });
+      }, 10000);
     },
-    async devicePointBandingNode ({ index, row }, done) {
-      this.$set(this.devicePointData[index], '@Binding', row.nodeCode)
-      done()
+    async devicePointBandingNode({ index, row }, done) {
+      this.$set(this.devicePointData[index], "@Binding", row.nodeCode)
+      done();
     },
-    async setDeviceConfigure () {
+    async setDeviceConfigure() {
       try {
         // 验证表单
         this.$refs.deviceConfigure.$refs.form.validate((valid) => {
           if (!valid) {
-            return false
+            return false;
           }
-        })
-        const deviceConfigure = await this.$api.GET_HSLSERVER_CONFIGURE('http://' + this.serverData.url + ':' + this.serverData.port, 'admin', process.env.VUE_APP_HSLSERVER_PASSWORD)
+        });
+        const deviceConfigure = await this.$api.GET_HSLSERVER_CONFIGURE(
+          "http://" + this.serverData.url + ":" + this.serverData.port,
+          "admin",
+          process.env.VUE_APP_HSLSERVER_PASSWORD
+        );
         const deviceConfigureModelValue = this.$refs.deviceConfigure.deviceConfigureModelValue
         if (this.devicePointData.length > 0) {
-          let devicePointData = this.devicePointData
+          let devicePointData = this.devicePointData 
           devicePointData = each(devicePointData, (item) => {
-            if (item['@DataTypeCode'] !== 'string') {
-              unset(item, '@Length')
+            if (item["@DataTypeCode"] !== "string") {
+              unset(item, "@Length");
             }
-            unset(item, 'id')
-            unset(item, 'showBindButton')
-            unset(item, 'showCopyButton')
-            unset(item, 'showRemoveButton')
-            unset(item, 'showSendButton')
-            item['@Binding'] = item['@Binding'] || ''
-          })
-          deviceConfigureModelValue.RequestNode = devicePointData
+            unset(item, "id");
+            unset(item, "showBindButton");
+            unset(item, "showCopyButton");
+            unset(item, "showRemoveButton");
+            unset(item, "showSendButton");
+            item["@Binding"] = item["@Binding"] || ""
+          });
+          deviceConfigureModelValue.RequestNode = devicePointData;
         }
 
-        deviceConfigureModelValue['@Name'] = this.deviceData[this.deviceActiveStatus].name
-        let deviceNode = deviceConfigure.Content.Settings.GroupNode[0].DeviceNode || []
-        let isExist = false
+        deviceConfigureModelValue["@Name"] = this.deviceData[this.deviceActiveStatus].name
+        let deviceNode = deviceConfigure.Content.Settings.GroupNode[0].DeviceNode || [];
+        let isExist = false;
         if (deviceNode !== undefined) {
-          deviceNode = isArray(deviceNode) ? deviceNode : [deviceNode]
+          deviceNode = isArray(deviceNode) ? deviceNode : [deviceNode];
           deviceNode = map(deviceNode, (item) => {
-            if (item['@Name'] === this.deviceData[this.deviceActiveStatus].name) {
-              isExist = true
-              item = deviceConfigureModelValue
+            if (
+              item["@Name"] === this.deviceData[this.deviceActiveStatus].name
+            ) {
+              isExist = true;
+              item = deviceConfigureModelValue;
             }
-            return item
-          })
+            return item;
+          });
         }
 
         if (!isExist) {
-          deviceNode.push(deviceConfigureModelValue)
+          deviceNode.push(deviceConfigureModelValue);
         }
-        deviceConfigure.Content.Settings.GroupNode[0].DeviceNode = deviceNode
-        await this.$api.SET_HSLSERVER_CONFIGURE('http://' + this.serverData.url + ':' + this.serverData.port, 'admin', process.env.VUE_APP_HSLSERVER_PASSWORD, { data: deviceConfigure.Content })
-        deviceConfigureModelValue.DeviceTypeName = this.$refs.deviceConfigure.defaultDeviceTypeNameValue
+        deviceConfigure.Content.Settings.GroupNode[0].DeviceNode = deviceNode;
+        await this.$api.SET_HSLSERVER_CONFIGURE(
+          "http://" + this.serverData.url + ":" + this.serverData.port,
+          "admin",
+          process.env.VUE_APP_HSLSERVER_PASSWORD,
+          { data: deviceConfigure.Content }
+        );
+        deviceConfigureModelValue.DeviceTypeName =
+          this.$refs.deviceConfigure.defaultDeviceTypeNameValue;
         const data = {
-          action: 'update_device',
+          action: "update_device",
           conf: JSON.stringify(deviceConfigureModelValue),
-          id: this.deviceData[this.deviceActiveStatus].id
-        }
-        this.$api.SET_DEVICE_CONFIGURE(data)
+          id: this.deviceData[this.deviceActiveStatus].id,
+        };
+        this.$api.SET_DEVICE_CONFIGURE(data);
         this.$message({
-          message: '操作成功',
-          type: 'success'
-        })
-        this.$emit('changeServerConfig', 't')
+          message: "操作成功",
+          type: "success",
+        });
+        this.$emit("changeServerConfig", "t");
       } catch (e) {
-        console.log(e)
+        console.log(e);
       }
     },
-    async getDeviceStatus () {
-      const res = await this.$api.GET_SERVER_DEVICE_STATUS('http://' + this.serverData.url + ':' + this.serverData.port, 'admin', process.env.VUE_APP_HSLSERVER_PASSWORD)
+    async getDeviceStatus() {
+      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')
-        const deviceStatus = {}
+        this.$emit("changeStatus", "online");
+        const deviceStatus = {};
         each(res.Content.__deviceList, (item) => {
           deviceStatus[item.__name] = {
             status: item.__requestEnable,
-            name: item.__name
-          }
-        })
+            name: item.__name,
+          };
+        });
         each(this.deviceData, (item) => {
           if (deviceStatus[item.name]) {
-            item.status = deviceStatus[item.name].status
+            item.status = deviceStatus[item.name].status;
           }
-        })
+        });
       } else {
-        this.$emit('changeStatus', false)
+        this.$emit("changeStatus", false);
       }
     },
+    clearTime(){
+      clearInterval(this.timing)
+      this.timing = null
+    }
   },
-  mounted () {
-    this.getDevice()
-    this.getworkingSubclasses()
-    this.getDeviceStatus()
+  mounted() {
+    this.getDevice();
+    this.getworkingSubclasses();
+    this.getDeviceStatus();
   }
-}
+};
 </script>
 
 <style scoped>
@@ -670,7 +861,7 @@ export default {
   vertical-align: top;
 }
 
-.el-dropdown+.el-dropdown {
+.el-dropdown + .el-dropdown {
   margin-left: 15px;
 }
 
@@ -680,7 +871,6 @@ export default {
 
 .menu-header {
   position: relative;
-
 }
 
 .header-title {
@@ -704,7 +894,6 @@ export default {
   overflow: hidden;
   outline: 0;
   border-radius: 4px;
-
 }
 
 .device-status {
diff --git a/src/views/edgeServer/edgeServerConfigure/deviceConfigure.vue b/src/views/edgeServer/edgeServerConfigure/deviceConfigure.vue
index 0fc5dd1..a5b3e27 100644
--- a/src/views/edgeServer/edgeServerConfigure/deviceConfigure.vue
+++ b/src/views/edgeServer/edgeServerConfigure/deviceConfigure.vue
@@ -117,7 +117,6 @@ export default {
       this.rules = rules
       this.deviceConfigureModelValue = assign(deviceConfigureModelValue, { '@ParentDeviceCode': '' })
       //this.deviceConfigureModelValue = this.choosable === 'true' ? assign(deviceConfigureModelValue, { parent_device_code: '' }) : deviceConfigureModelValue
-      console.log(this.deviceConfigureModelValue)
       this.deviceConfigureFormItem = deviceConfigureFormItemData[e]
     },
     setDeviceDefaultFormItemValue (val) {
diff --git a/src/views/edgeServer/edgeServerConfigure/index.vue b/src/views/edgeServer/edgeServerConfigure/index.vue
index 7961829..f587485 100644
--- a/src/views/edgeServer/edgeServerConfigure/index.vue
+++ b/src/views/edgeServer/edgeServerConfigure/index.vue
@@ -37,7 +37,7 @@
         </el-tag>
         <el-alert v-if="this.selectedServerData.updated === 't'" title="设备配置已更改，请在服务配置界面重启对应服务生效" type="warning" style="width:400px;display: inline-block;vertical-align: middle; margin-left: 5px;" :closable="false" />
       </div>
-      <device :server='server' @changeStatus='changeSelectedServerStatus' @changeServerConfig='changeSelectedServerConfig' />
+      <device ref="deviceTemplate" :server='server' @changeStatus='changeSelectedServerStatus' @changeServerConfig='changeSelectedServerConfig' />
     </el-drawer>
 
   </d2-container>
@@ -381,6 +381,9 @@ export default {
     },
     closeDrawer () {
       this.server = { id: 0, url: '', port: '' }
+      if(this.$refs.deviceTemplate.timing){
+        this.$refs.deviceTemplate.clearTime()
+      }
     },
     changeSelectedServerStatus (status) {
       this.selectedServerData.status = status || 'offline'