优化

src/utils/device_type.js

@@ -14,8 +14,8 @@ export function returnDeviceType(value) {
       return 'LED点阵屏'
     case 7:
       return '移动设备'
-    case 8:
-      return '护工腕表'
+    // case 8:
+    //   return '护工腕表'
     case 9:
       return '病人腕表'
     case 10:

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

@@ -239,7 +239,7 @@ export default {
         { key: 'LCD走廊屏', value: 5 },
         { key: 'LED点阵屏', value: 6 },
         { key: '移动设备', value: 7 },
-        { key: '护工腕表', value: 8 },
+        // { key: '护工腕表', value: 8 },
         { key: '病人腕表', value: 9 },
         { key: '手机App', value: 10 },
         { key: '总线转换盒', value: 11 },

src/views/ncs-device/device-edit.vue

@@ -14,7 +14,7 @@
                 <el-option label="LCD走廊屏" :value="5" />
                 <el-option label="LED点阵屏" :value="6" />
                 <el-option label="移动设备" :value="7" />
-                <el-option label="护工腕表" :value="8" />
+<!--                <el-option label="护工腕表" :value="8" />-->
                 <el-option label="病人腕表" :value="9" />
                 <el-option label="手机App" :value="10" />
                 <el-option label="总线转换盒" :value="11" />

src/views/ncs-device/nurse_watch.vue

@@ -173,7 +173,7 @@ export default {
           listData: this.deviceStatusTransfer
         }
       },
-      { headerName: '绑定人', field: 'member_name', sortable: true, filter: 'agTextColumnFilter', minWidth: 140 },
+      { headerName: '绑定人', field: 'member_name', sortable: true, filter: 'agTextColumnFilter', minWidth: 140, valueFormatter: this.formatterName },
       { headerName: '所属位置', field: 'full_name', sortable: true, filter: 'agTextColumnFilter', minWidth: 140 },
       { headerName: '有线物理地址', field: 'eth_mac', sortable: true, filter: 'agTextColumnFilter', minWidth: 150 },
       { headerName: '有线IP地址', field: 'eth_ip', sortable: true, filter: 'agTextColumnFilter', minWidth: 150 },
@@ -340,6 +340,17 @@ export default {
     formatterDate(params) {
       return unixToDate(params.value)
     },
+    formatterName(params) {
+      if (params.value && params.data.role_name) {
+        return params.value + params.data.role_name
+      } else {
+        if (params.value) {
+          return params.value
+        } else if (params.data.role_name) {
+          return '未绑定' + params.data.role_name
+        }
+      }
+    },
     filterModifed(param) {
       const model = param.api.getFilterModel()
       this.params.filter = JSON.stringify(model)