diff --git a/src/api/modules/edgeServer.api.js b/src/api/modules/edgeServer.api.js
index c1e5f79..a2c055b 100644
--- a/src/api/modules/edgeServer.api.js
+++ b/src/api/modules/edgeServer.api.js
@@ -8,7 +8,7 @@ export default ({ service, request, serviceForMock, requestForMock, mock, faker,
   VERIFY_SERVER (url) {
     return request({
       auth: {
-        username: 'admin', 
+        username: 'admin',
         password: process.env.VUE_APP_HSLSERVER_PASSWORD
       },
       method: 'post',
@@ -19,7 +19,7 @@ export default ({ service, request, serviceForMock, requestForMock, mock, faker,
   MODIFY_SERVER (url, data) {
     return request({
       auth: {
-        username: 'admin', 
+        username: 'admin',
         password: process.env.VUE_APP_HSLSERVER_PASSWORD
       },
       data: data,
@@ -50,7 +50,7 @@ export default ({ service, request, serviceForMock, requestForMock, mock, faker,
   GET_HSLSERVER_CONFIGURE (url) {
     return request({
       auth: {
-        username: 'admin', 
+        username: 'admin',
         password: process.env.VUE_APP_HSLSERVER_PASSWORD
       },
       method: 'post',
@@ -60,7 +60,7 @@ export default ({ service, request, serviceForMock, requestForMock, mock, faker,
   SET_HSLSERVER_CONFIGURE (url, data) {
     return request({
       auth: {
-        username: 'admin', 
+        username: 'admin',
         password: process.env.VUE_APP_HSLSERVER_PASSWORD
       },
       data: data,
@@ -75,7 +75,7 @@ export default ({ service, request, serviceForMock, requestForMock, mock, faker,
   GET_SERVE_DEVICE_MONITORING (url) {
     return request({
       auth: {
-        username: 'admin', 
+        username: 'admin',
         password: process.env.VUE_APP_HSLSERVER_PASSWORD
       },
       url: url + '/Edge/DeviceData?data=/'
@@ -88,37 +88,40 @@ export default ({ service, request, serviceForMock, requestForMock, mock, faker,
   GET_SERVER_DEVICE_STATUS (url) {
     return request({
       auth: {
-        username: 'admin', 
+        username: 'admin',
         password: process.env.VUE_APP_HSLSERVER_PASSWORD
       },
       url: url + '/Edge/DeviceData?data=__status'
     })
   },
-  GET_DEVICE_POINT_VALUE(url, deviceName, data, type){
+  GET_DEVICE_POINT_VALUE (url, deviceName, data, type) {
     return request({
+      validateStatus: (status) => {
+        return status === 404 ? 200 : status
+      },
       auth: {
-        username: 'admin', 
+        username: 'admin',
         password: process.env.VUE_APP_HSLSERVER_PASSWORD
       },
       data: {
-        'address':data
+        address: data
       },
       method: 'post',
-      url: url + '/'+ deviceName +'/Read'+ type +'32'
+      url: url + '/' + deviceName + '/Read' + type + '32'
     })
   },
-  SET_DEVICE_POINT_VALUE(url, deviceName, data, type, value){
+  SET_DEVICE_POINT_VALUE (url, deviceName, data, type, value) {
     return request({
       auth: {
-        username: 'admin', 
+        username: 'admin',
         password: process.env.VUE_APP_HSLSERVER_PASSWORD
       },
       data: {
-        address:data,
-        value:value
+        address: data,
+        value: value
       },
       method: 'post',
-      url: url + '/'+ deviceName +'/Write'+ type +'32'
+      url: url + '/' + deviceName + '/Write' + type + '32'
     })
   }
 })
diff --git a/src/views/edgeServer/edgeServerConfigure/device.vue b/src/views/edgeServer/edgeServerConfigure/device.vue
index 83f3a96..506766c 100644
--- a/src/views/edgeServer/edgeServerConfigure/device.vue
+++ b/src/views/edgeServer/edgeServerConfigure/device.vue
@@ -5,17 +5,10 @@
         <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>
@@ -27,27 +20,15 @@
             </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 + ''"
-            >
+          <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>
+                <div :class="{
+                  'device-status': true,
+                  'device-status-online': item.status,
+                  'device-status-offline': !item.status,
+                }"></div>
               </div>
             </el-menu-item>
           </el-menu>
@@ -58,41 +39,18 @@
       <el-card class="box-card">
         <div slot="header" style="position: relative">
           <div class="header-title">设备配置</div>
-          <el-button
-            class="header-button"
-            type="primary"
-            @click="setDeviceConfigureConfirm"
-            >应用</el-button
-          >
+          <el-button class="header-button" type="primary" @click="setDeviceConfigureConfirm">应用</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
-          >
+        <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>
@@ -100,485 +58,423 @@
 </template>
 
 <script>
-import {
-  each,
-  assign,
-  unset,
-  filter,
-  isArray,
-  map,
-  capitalize,
-  split,
-  toUpper,
-} from "lodash";
+import { each, assign, unset, filter, isArray, map, capitalize, split, toUpper, replace } from 'lodash'
+const DataTypeCodeOptions = [
+  {
+    value: 'string',
+    label: 'string (字符串)'
+  },
+  {
+    value: 'int',
+    label: 'int (整数)'
+  },
+  {
+    value: 'float',
+    label: 'float (浮点数)'
+  },
+  {
+    value: 'bool',
+    label: 'bool (逻辑值)'
+  },
+  {
+    value: 'uint',
+    label: 'uint'
+  },
+  {
+    value: 'short',
+    label: 'short'
+  },
+  {
+    value: 'ushort',
+    label: 'ushort'
+  },
+  {
+    value: 'long',
+    label: 'long'
+  },
+  {
+    value: 'ulong',
+    label: 'ulong'
+  },
+  {
+    value: 'double',
+    label: 'double'
+  },
+  {
+    value: 'byte',
+    label: 'byte'
+  },
+  {
+    value: 'sbyte',
+    label: 'sbyte'
+  }
+]
 
 export default {
   props: {
     server: {
       default: {
         id: 0,
-        url: "",
-        port: "",
-      },
-    },
+        url: '',
+        port: ''
+      }
+    }
   },
   components: {
-    DeviceConfigure: () => import("./deviceConfigure"),
+    DeviceConfigure: () => import('./deviceConfigure')
   },
-  data() {
+  data () {
     return {
-      active: "",
-      timing:null,
+      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",
-            options: [
-              {
-                value: "string",
-                label: "string (字符串)",
-              },
-              {
-                value: "int",
-                label: "int (整数)",
-              },
-              {
-                value: "float",
-                label: "float (浮点数)",
-              },
-              {
-                value: "bool",
-                label: "bool (逻辑值)",
-              },
-              {
-                value: "uint",
-                label: "uint",
-              },
-              {
-                value: "short",
-                label: "short",
-              },
-              {
-                value: "ushort",
-                label: "ushort",
-              },
-              {
-                value: "long",
-                label: "long",
-              },
-              {
-                value: "ulong",
-                label: "ulong",
-              },
-              {
-                value: "double",
-                label: "double",
-              },
-              {
-                value: "byte",
-                label: "byte",
-              },
-              {
-                value: "sbyte",
-                label: "sbyte",
-              },
-            ],
-          },
+            name: 'el-select',
+            size: 'small',
+            options: DataTypeCodeOptions
+          }
         },
         {
-          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",
-            options: [
-              {
-                value: "string",
-                label: "string (字符串)",
-              },
-              {
-                value: "int",
-                label: "int (整数)",
-              },
-              {
-                value: "float",
-                label: "float (浮点数)",
-              },
-              {
-                value: "bool",
-                label: "bool (逻辑值)",
-              },
-              {
-                value: "uint",
-                label: "uint",
-              },
-              {
-                value: "short",
-                label: "short",
-              },
-              {
-                value: "ushort",
-                label: "ushort",
-              },
-              {
-                value: "long",
-                label: "long",
-              },
-              {
-                value: "ulong",
-                label: "ulong",
-              },
-              {
-                value: "double",
-                label: "double",
-              },
-              {
-                value: "byte",
-                label: "byte",
-              },
-              {
-                value: "sbyte",
-                label: "sbyte",
-              },
-            ],
-            span: 12,
-          },
+            name: 'el-select',
+            options: DataTypeCodeOptions,
+            span: 12
+          }
         },
-        "@RequestInterval": {
-          title: "采集周期(ms)",
+        '@RequestInterval': {
+          title: '采集周期(ms)'
         },
-        "@Length": {
-          title: "长度",
-        },
-        "@Description": {
-          title: "说明",
+        '@Length': {
+          title: '长度'
         },
+        '@Description': {
+          title: '说明'
+        }
       },
       addRules: {
-        "@Name": [
+        '@Name': [
           {
             required: true,
-            type: "string",
-            message: "请输入名称",
-            trigger: "blur",
-          },
+            type: 'string',
+            message: '请输入名称',
+            trigger: 'blur'
+          }
         ],
-        "@Address": [
+        '@Address': [
           {
             required: true,
-            type: "string",
-            message: "请输入地址",
-            trigger: "blur",
-          },
+            type: 'string',
+            message: '请输入地址',
+            trigger: 'blur'
+          }
         ],
-        "@DisplayName": [
+        '@DisplayName': [
           {
             required: true,
-            type: "string",
-            message: "请输入显示名称",
-            trigger: "blur",
-          },
+            type: 'string',
+            message: '请输入显示名称',
+            trigger: 'blur'
+          }
         ],
-        "@RequestType": [
+        '@RequestType': [
           {
             required: true,
-            type: "string",
-            message: "请输入请求类型",
-            trigger: "blur",
-          },
+            type: 'string',
+            message: '请输入请求类型',
+            trigger: 'blur'
+          }
         ],
-        "@DataTypeCode": [
+        '@DataTypeCode': [
           {
             required: true,
-            type: "string",
-            message: "请选择类型",
-            trigger: "blur",
-          },
-        ],
-        "@RequestInterval": [
-          { required: true, message: "请输入采集周期(ms)", trigger: "blur" },
+            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();
-        if (val.id) {
-          this.getDeviceStatus();
-        }
+      handler (val) {
+        this.serverData = val
+        this.getDevice()
+        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, key, value }) {
-      let type = undefined;
-      if (row["@DataTypeCode"][0] === "u") {
-        type = split(row["@DataTypeCode"], "")
+    handleCellDataChange ({ rowIndex, row, key, value }) {
+      let type
+      if (row['@DataTypeCode'][0] === 'u') {
+        type = split(row['@DataTypeCode'], '')
         type[1] = toUpper(type[0] + type[1])
-        type = type.join("")
+        type = type.join('')
       } else {
-        type = capitalize(row["@DataTypeCode"])
+        type = capitalize(row['@DataTypeCode'])
       }
-      if (key === "@Value") { 
+      if (key === '@Value') {
         this.$api.SET_DEVICE_POINT_VALUE(
-          "http://" + this.serverData.url + ":" + this.serverData.port,
+          'http://' + this.serverData.url + ':' + this.serverData.port,
           this.deviceData[this.deviceActiveStatus].name,
-          row["@Address"],
+          row['@Address'],
           type,
           value
-        ).then(res=>{
-          if(!res.IsSuccess){
+        ).then(res => {
+          if (!res.IsSuccess) {
             this.$message({
               message: res.Message,
-              type: "error",
-            });
+              type: 'error'
+            })
           }
         })
       }
-      this.devicePointData[rowIndex] = row;
+      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)
-        let nodeCodeData = []
+        const nodeCodeData = []
         each(nodeCode, (o) => {
           nodeCodeData.push({ value: o, label: o })
-        });
+        })
         this.nodeCodeData = nodeCodeData
         this.$nextTick(() => {
           this.$refs.d2Crud.handleFormTemplateMode(
-            "nodeCode"
+            '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
       this.devicePointData = [] // 当切换设备时把保存configure、point的数据清空
-      this.defaultDeviceName = ""
-      clearInterval(this.timing) //当切换设备时先关闭定时器，防止一直执行上一设备的定时器
+      this.defaultDeviceName = ''
       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) {
@@ -586,272 +482,263 @@ export default {
           this.defaultFormData = conf
         }
         // 获取point信息
-        let devicePointAddress = []
+        const 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"], "")
+            let type
+            if (o['@DataTypeCode'][0] === 'u') {
+              type = split(o['@DataTypeCode'], '')
               type[1] = toUpper(type[0] + type[1])
-              type = type.join("")
+              type = type.join('')
             } else {
-              type = capitalize(o["@DataTypeCode"])
+              type = capitalize(o['@DataTypeCode'])
             }
             devicePointAddress.push({
               key: i,
-              value: o["@Address"],
+              value: o['@Address'],
               type:
-                o["@DataTypeCode"][0] === "u"
-                  ? replace(o["@DataTypeCode"])
-                  : capitalize(o["@DataTypeCode"]),
+                o['@DataTypeCode'][0] === 'u'
+                  ? replace(o['@DataTypeCode'])
+                  : capitalize(o['@DataTypeCode'])
             })
             assign(o, {
               id: i + 1,
               showBindButton: true,
               showSendButton: true,
               showCopyButton: true,
-              showRemoveButton: true,
-            });
-          });
+              showRemoveButton: true
+            })
+          })
           if (devicePointAddress.length > 0) {
-            this.getDevicePoint(devicePointAddress);
+            this.getDevicePoint(devicePointAddress)
           }
         }
       }
     },
-    addDevice() {
-      const that = this;
-      this.$prompt("输入设备名称", "新加设备", {
-        confirmButtonText: "确定",
+    addDevice () {
+      this.$prompt('输入设备名称', '新加设备', {
+        confirmButtonText: '确定',
         inputPattern: /^[\s\S]*.*[^\s][\s\S]*$/,
-        inputErrorMessage: "请输入设备名称",
-      }).then(({ value }) => {
-        this.$api.ADD_DEVICE({
-          action: "add_device",
+        inputErrorMessage: '请输入设备名称'
+      }).then(async ({ value }) => {
+        await this.$api.ADD_DEVICE({
+          action: 'add_device',
           name: value,
-          server_id: this.serverData.id,
-        });
-        that.getDevice();
+          server_id: this.serverData.id
+        })
+        this.getDevice()
         this.$message({
-          message: "新加设备成功",
-          type: "success",
-        });
-      });
+          message: '新加设备成功',
+          type: 'success'
+        })
+      })
     },
-    async delDevice() {
+    async delDevice () {
       const deviceConfigure = await this.$api.GET_HSLSERVER_CONFIGURE(
-        "http://" + this.serverData.url + ":" + this.serverData.port,
-      );
-      let deviceNode = deviceConfigure.Content.Settings.GroupNode[0].DeviceNode;
+        'http://' + this.serverData.url + ':' + this.serverData.port
+      )
+      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
+          return item['@Name'] === this.deviceData[this.deviceActiveStatus].name
             ? null
-            : item;
-        });
-        deviceConfigure.Content.Settings.GroupNode[0].DeviceNode = deviceNode;
+            : 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,
+          'http://' + this.serverData.url + ':' + this.serverData.port,
           { data: deviceConfigure.Content }
-        );
+        )
         await this.$api.DEL_DEVICE({
-          action: "remove_device",
-          id: this.deviceData[this.deviceActiveStatus].id,
-        });
+          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();
+          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()
     },
-    getDevicePoint(devicePointAddress) {
-      clearInterval(this.timing)
+    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,
-                this.deviceData[this.deviceActiveStatus].name,
-                item.value,
-                item.type
+          this.$api
+            .GET_DEVICE_POINT_VALUE(
+              'http://' + this.serverData.url + ':' + this.serverData.port,
+              this.deviceData[this.deviceActiveStatus].name,
+              item.value,
+              item.type
+            )
+            .then((res) => {
+              this.$set(
+                this.devicePointData[item.key],
+                '@Value',
+                res.Content
               )
-              .then((res) => {
-                this.$set(
-                  this.devicePointData[item.key],
-                  "@Value",
-                  res.Content
-                );
-              });
-          } catch (e) {
-            console.log(e);
-          }
-        });
-      }, 10000);
+            })
+        })
+      }, 10000)
     },
-    async devicePointBandingNode({ index, row }, done) {
-      this.$delete(this.devicePointData[index], "@Binding") 
-      this.$set(this.devicePointData[index], "@Binding", row.nodeCode)
-      done();
+    async devicePointBandingNode ({ index, row }, done) {
+      this.$delete(this.devicePointData[index], '@Binding')
+      this.$set(this.devicePointData[index], '@Binding', row.nodeCode)
+      done()
     },
-    setDeviceConfigureConfirm(){
-      this.$confirm('是否要应用该配置信息，更改配置后需要重启改服务才能使服务生效?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.setDeviceConfigure()
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消应用服务配置'
-          });          
-        });
+    setDeviceConfigureConfirm () {
+      this.$confirm('是否要应用该配置信息，更改配置后需要重启改服务才能使配置生效?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.setDeviceConfigure()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消应用设备配置'
+        })
+      })
     },
-    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
-        );
+          'http://' + this.serverData.url + ':' + this.serverData.port
+        )
         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");
-            unset(item, "@Value");
-            item["@Binding"] = item["@Binding"] || ""
-          });
-          deviceConfigureModelValue.RequestNode = devicePointData;
+            unset(item, 'id')
+            unset(item, 'showBindButton')
+            unset(item, 'showCopyButton')
+            unset(item, 'showRemoveButton')
+            unset(item, 'showSendButton')
+            unset(item, '@Value')
+            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
+              item['@Name'] === this.deviceData[this.deviceActiveStatus].name
             ) {
-              isExist = true;
-              item = deviceConfigureModelValue;
+              isExist = true
+              item = deviceConfigureModelValue
             }
-            return item;
-          });
+            return item
+          })
         }
 
         if (!isExist) {
-          deviceNode.push(deviceConfigureModelValue);
+          deviceNode.push(deviceConfigureModelValue)
         }
-        deviceConfigure.Content.Settings.GroupNode[0].DeviceNode = deviceNode;
+        deviceConfigure.Content.Settings.GroupNode[0].DeviceNode = deviceNode
         await this.$api.SET_HSLSERVER_CONFIGURE(
-          "http://" + this.serverData.url + ":" + this.serverData.port,
+          'http://' + this.serverData.url + ':' + this.serverData.port,
           { data: deviceConfigure.Content }
-        );
+        )
         deviceConfigureModelValue.DeviceTypeName =
-          this.$refs.deviceConfigure.defaultDeviceTypeNameValue;
+          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() {
+    async getDeviceStatus () {
       const res = await this.$api.GET_SERVER_DEVICE_STATUS(
-        "http://" + this.serverData.url + ":" + this.serverData.port
-      );
+        'http://' + this.serverData.url + ':' + this.serverData.port
+      )
       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(){
+    clearTime () {
       clearInterval(this.timing)
       this.timing = null
     }
   },
-  mounted() {
-    this.getDevice();
-    this.getworkingSubclasses();
-    this.getDeviceStatus();
+  mounted () {
+    this.getworkingSubclasses()
   }
-};
+}
 </script>
 
 <style scoped>
@@ -865,7 +752,7 @@ export default {
   vertical-align: top;
 }
 
-.el-dropdown + .el-dropdown {
+.el-dropdown+.el-dropdown {
   margin-left: 15px;
 }
 
diff --git a/src/views/edgeServer/edgeServerConfigure/deviceConfigure.vue b/src/views/edgeServer/edgeServerConfigure/deviceConfigure.vue
index a5b3e27..8e6cf84 100644
--- a/src/views/edgeServer/edgeServerConfigure/deviceConfigure.vue
+++ b/src/views/edgeServer/edgeServerConfigure/deviceConfigure.vue
@@ -3,7 +3,7 @@
     <el-form :inline="true" size="mini" :model="deviceConfigureModelValue" ref="form" :rules="rules"
       label-position="right" class="demo-form-inline">
       <el-form-item label="设备">
-        <el-select @change="deviceChange" v-model="defaultDeviceTypeNameValue" placeholder="请选择">
+        <el-select @change="deviceChange" filterable  v-model="defaultDeviceTypeNameValue" placeholder="请选择">
           <el-option v-for="item in deviceTypeData" :key="item" :label="item" :value="item">
           </el-option>
         </el-select>
@@ -116,7 +116,7 @@ export default {
       })
       this.rules = rules
       this.deviceConfigureModelValue = assign(deviceConfigureModelValue, { '@ParentDeviceCode': '' })
-      //this.deviceConfigureModelValue = this.choosable === 'true' ? assign(deviceConfigureModelValue, { parent_device_code: '' }) : deviceConfigureModelValue
+      // this.deviceConfigureModelValue = this.choosable === 'true' ? assign(deviceConfigureModelValue, { parent_device_code: '' }) : deviceConfigureModelValue
       this.deviceConfigureFormItem = deviceConfigureFormItemData[e]
     },
     setDeviceDefaultFormItemValue (val) {
@@ -124,7 +124,7 @@ export default {
       // if (this.choosable === 'true') {
       //   deviceConfigureModelValue["@ParentDeviceCode"] = val["@ParentDeviceCode"]
       // }
-      deviceConfigureModelValue["@ParentDeviceCode"] = val["@ParentDeviceCode"] || ''
+      deviceConfigureModelValue['@ParentDeviceCode'] = val['@ParentDeviceCode'] || ''
       each(deviceConfigureFormItemData[this.defaultDeviceTypeNameValue], (item) => {
         if (item.type === 'time') {
           deviceConfigureModelValue[item.key] = val[item.key] ? val[item.key] : new Date()
diff --git a/src/views/edgeServer/edgeServerConfigure/index.vue b/src/views/edgeServer/edgeServerConfigure/index.vue
index 83c439e..fd20873 100644
--- a/src/views/edgeServer/edgeServerConfigure/index.vue
+++ b/src/views/edgeServer/edgeServerConfigure/index.vue
@@ -195,7 +195,7 @@ export default {
         labelPosition: 'left',
         saveLoading: false,
         saveButtonText: '测试',
-        saveButtonType: 'text',
+        saveButtonType: 'text'
       },
       addRules: {
         deviceName: [{ required: true, type: 'string', message: '服务名称不可为空', trigger: 'blur' }],
@@ -222,10 +222,10 @@ export default {
       }
     },
     handleDialogOpen ({ mode }) {
-     if(mode === 'edit'){
+      if (mode === 'edit') {
         this.formOptions.saveButtonText = '确定'
         this.formOptions.saveButtonType = 'text'
-     }
+      }
     },
     // 普通的新增
     addRow () {
@@ -239,7 +239,7 @@ export default {
         // 定义测试动作
         if (this.formOptions.saveButtonText === '测试') {
           this.serverSettings = await this.$api.VERIFY_SERVER(
-            'http://' + row.url + ':' + row.port,
+            'http://' + row.url + ':' + row.port
           )
           if (this.serverSettings) {
             this.$message({
@@ -289,8 +289,8 @@ export default {
     },
     async handleRowEdit ({ index, row }, done) {
       this.formOptions.saveLoading = true
-      let serverSettings = await this.$api.VERIFY_SERVER(
-          'http://' + row.url + ':' + row.port
+      const serverSettings = await this.$api.VERIFY_SERVER(
+        'http://' + row.url + ':' + row.port
       )
       serverSettings.Content.ServerInfoConfig.CaptureURL = row.address
       this.$api.MODIFY_SERVER(
@@ -321,33 +321,31 @@ export default {
       done()
     },
     setServerExec ({ row }) {
-
       this.$confirm('是否要重启动该服务', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(async () => {
-          try {
-            await this.$api.SET_SERVER_EXEC({
-              action: 'exec',
-              server_id: row.id,
-              command: 'server_restart'
-            })
-            this.$message({
-              message: '服务应用请求成功，请求动作已添加至请求队列中，请从服务监控页面查看结果',
-              type: 'success'
-            })
-            this.getServers()
-          } catch (e) {
-            console.log(e)
-          }
-        }).catch(() => {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        try {
+          await this.$api.SET_SERVER_EXEC({
+            action: 'exec',
+            server_id: row.id,
+            command: 'server_restart'
+          })
           this.$message({
-            type: 'info',
-            message: '已重启动该服务'
-          });          
-        });
-      
+            message: '服务应用请求成功，请求动作已添加至请求队列中，请从服务监控页面查看结果',
+            type: 'success'
+          })
+          this.getServers()
+        } catch (e) {
+          console.log(e)
+        }
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已重启动该服务'
+        })
+      })
     },
     handleDialogCancel (done) {
       this.$message({
@@ -369,7 +367,7 @@ export default {
     },
     closeDrawer () {
       this.server = { id: 0, url: '', port: '' }
-      if(this.$refs.deviceTemplate.timing){
+      if (this.$refs.deviceTemplate.timing) {
         this.$refs.deviceTemplate.clearTime()
       }
     },
diff --git a/src/views/edgeServer/edgeServerMonitor/index.vue b/src/views/edgeServer/edgeServerMonitor/index.vue
index e5f8868..b9ccca7 100644
--- a/src/views/edgeServer/edgeServerMonitor/index.vue
+++ b/src/views/edgeServer/edgeServerMonitor/index.vue
@@ -211,7 +211,7 @@ export default {
   },
   mounted () {
     this.getServe()
-    setInterval(()=>{
+    setInterval(() => {
       this.getServe()
     }, 30000)
   }