Merge branch 'master' into develop

src/views/ncs-device/components/deviceManager.vue

@@ -1050,8 +1050,12 @@ export default {
             this.rowData[i]['online_state'] = '/'
           }
         }
-        const rowData = [...this.rowData]
-        this.$set(this, 'rowData', rowData)
+       //只刷新在线状态列数据
+          var params = {
+              columns: ['online_state']
+          }
+          this.gridApi.refreshCells(params);
+
       }
     },
     websocketclose: function(e) {

src/views/ncs-device/nurse_watch.vue

@@ -350,8 +350,11 @@ export default {
           const mac = this.onlineDevice.filter(p => p.toLowerCase() === item.eth_mac.toLowerCase())[0]
           item.online_state = (mac !== undefined && mac !== null) ? '在线' : '离线'
         })
-        const tableData = [...this.tableData]
-        this.$set(this, 'tableData', tableData)
+        //只刷新在线状态列数据
+        var params = {
+          columns: ['online_state']
+        }
+        this.gridApi.refreshCells(params);
       }
     },
     deviceOnlineWebsocketclose: function(e) {