优化护士组长换班

src/views/hospitalFrame/nurse_watch_frame.vue

@@ -7,16 +7,21 @@
           <el-row v-if="rooms.length > 1" :gutter="20" type="flex">
             <el-col v-for="(item,index) in rooms" :key="index" :xs="8" :sm="8" :md="6" :lg="6" :xl="6">
               <el-card class="box-card">
-                <div slot="header" class="clearfix">
+                <div v-if="roleName !== '护士组长'" slot="header" class="clearfix">
                   <el-checkbox v-if="uiVersion === 1" v-model="item.checked" @change="handleCheckboxChanged(item)"><svg-icon icon-class="sickroom" style="color: #9aaabf;margin-right: 5px" /><span>{{ item.name }}</span></el-checkbox>
                   <span v-if="uiVersion !== 1"><svg-icon icon-class="sickroom" style="color: #9aaabf;margin-right: 5px" /><span>{{ item.name }}</span></span>
                   <el-checkbox v-model="item.allCkeck" style="float: right" :indeterminate="item.indeterminate" @change="(checked)=>{handleCheckAll(checked,item)}">全选</el-checkbox>
                 </div>
                 <div v-for="(bed,_index) in item.children" :key="_index" class="text item">
-                  <el-checkbox v-model="bed.checked" @change="handleCheckboxChanged(item)"><svg-icon icon-class="bed" style="color: #9aaabf;margin-right: 5px" />
-                    <span v-if="bed.device_id && !bed.checked" style="color: #13ce66">{{ bed.name }}床 {{ bed.clerk_name }}</span>
-                    <span v-else>{{ bed.name }}床</span>
+                  <el-checkbox  v-if="roleName !== '护士组长'" v-model="bed.checked" @change="handleCheckboxChanged(item)"><svg-icon icon-class="bed" style="color: #9aaabf;margin-right: 5px" />
+                    <span v-if="bed.device_id && !bed.checked" style="color: #13ce66">{{ bed.full_name }} {{ bed.clerk_name }}</span>
+                    <span v-else>{{ bed.full_name }}</span>
                   </el-checkbox>
+                  <div v-if="roleName === '护士组长'">
+                    <svg-icon icon-class="bed" style="color: #9aaabf;margin-right: 5px" />
+                    <span v-if="bed.device_id && !bed.checked" style="color: #13ce66">{{ bed.full_name }} {{ bed.clerk_name }}</span>
+                    <span v-else>{{ bed.full_name }}</span>
+                  </div>
                 </div>
               </el-card>
             </el-col>
@@ -24,17 +29,22 @@
           <el-row v-if="rooms.length === 1" :gutter="20" type="flex">
             <el-col :span="24">
               <div class="text item">
-                <div style="margin: 10px;">
+                <div v-if="roleName !== '护士组长'" style="margin: 10px;">
                   <el-checkbox v-if="uiVersion === 1" v-model="rooms[0].checked" @change="handleCheckboxChanged(rooms[0])"><svg-icon icon-class="sickroom" style="color: #9aaabf;margin-right: 5px" /><span>{{ rooms[0].name }}</span></el-checkbox>
                   <span v-if="uiVersion !== 1"><svg-icon icon-class="sickroom" style="color: #9aaabf;margin-right: 5px" /><span>{{ rooms[0].name }}</span></span>
                   <el-checkbox v-model="rooms[0].allCkeck" style="margin-left: 30px;" :indeterminate="rooms[0].indeterminate" @change="(checked)=>{handleCheckAll(checked,rooms[0])}">全选</el-checkbox>
                 </div>
                 <el-row>
                   <el-col v-for="(bed,_index) in rooms[0].children" :key="_index" :xs="8" :sm="8" :md="6" :lg="6" :xl="6">
-                    <el-checkbox v-model="bed.checked" @change="handleCheckboxChanged(rooms[0])"><svg-icon icon-class="bed" style="color: #9aaabf;margin-right: 5px" />
-                      <span v-if="bed.device_id && !bed.checked" style="color: #13ce66">{{ bed.name }} {{ bed.clerk_name }}</span>
-                      <span v-else>{{ bed.name }}</span>
+                    <el-checkbox v-if="roleName !== '护士组长'" v-model="bed.checked" @change="handleCheckboxChanged(rooms[0])"><svg-icon icon-class="bed" style="color: #9aaabf;margin-right: 5px" />
+                      <span v-if="bed.device_id && !bed.checked" style="color: #13ce66">{{ bed.full_name }} {{ bed.clerk_name }}</span>
+                      <span v-else>{{ bed.full_name }}</span>
                     </el-checkbox>
+                    <div v-if="roleName === '护士组长'">
+                      <svg-icon icon-class="bed" style="color: #9aaabf;margin-right: 5px" />
+                      <span v-if="bed.device_id && !bed.checked" style="color: #13ce66">{{ bed.full_name }} {{ bed.clerk_name }}</span>
+                      <span v-else>{{ bed.full_name }}</span>
+                    </div>
                   </el-col>
                 </el-row>
               </div>
@@ -98,6 +108,9 @@ export default {
   watch: {
     roleId: function(old, newval) {
       this.getFrameByType()
+    },
+    memberId: function(old, newval) {
+      this.getFrameByType()
     }
   },
   mounted() {

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

@@ -412,8 +412,8 @@ export default {
     this.gridColumnApi.applyColumnState({
       state: [
         {
-          colId: 'status',
-          sort: 'asc'
+          colId: 'id',
+          sort: 'desc'
         }
       ]
     })
@@ -436,7 +436,7 @@ export default {
         deviceData.forEach(item => {
           if (this.onlineDevice.length > 0) {
             const mac = this.onlineDevice.filter(p => p.toLowerCase() === item.eth_mac.toLowerCase())[0]
-            console.log('在线设备1', mac)
+            // console.log('在线设备1', mac)
             if (mac !== undefined && mac !== null) {
               item['online_state'] = '在线'
             } else {