Merge branch 'master' of http://git.wdklian.com/allen/ncs_ui

* 'master' of http://git.wdklian.com/allen/ncs_ui:
  优化TCP换班
  换班界面优化

src/views/hospitalFrame/nurse_watch_frame.vue

@@ -4,13 +4,13 @@
       <el-form ref="editform" label-width="80px">
         <fieldset class="margin-top-sm">
           <legend>移动设备管辖空间</legend>
-          <el-row :gutter="20" type="flex">
-            <el-col v-for="(item,index) in rooms" :key="index" :xs="8" :sm="6" :md="4" :lg="4" :xl="4">
+          <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">
                   <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>
-<!--                  <svg-icon icon-class="sickroom" style="color: #9aaabf;margin-right: 5px" /><span>{{ item.name }}房</span>-->
-                  <el-checkbox v-model="item.allCkeck" :style="uiVersion === 1 ? 'float: right;' : ''" :indeterminate="item.indeterminate" @change="(checked)=>{handleCheckAll(checked,item)}">全选</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" />
@@ -21,12 +21,34 @@
               </el-card>
             </el-col>
           </el-row>
+          <el-row v-if="rooms.length === 1" :gutter="20" type="flex">
+            <el-col :span="24">
+              <div class="text item">
+                <div 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>
+                  </el-col>
+                </el-row>
+              </div>
+            </el-col>
+          </el-row>
         </fieldset>
         <el-form-item v-if="roleName !== '护士组长'" align="center" class="margin-top-sm">
           <el-button type="success" @click="onSubmit">保存设置</el-button>
           <el-button type="primary" @click="onQK">清空设置</el-button>
           <el-button @click="back">返回</el-button>
         </el-form-item>
+        <el-form-item v-else>
+          <div style="text-align:center;color: #13ce66">护士组长管理空间是其管辖护士的管理空间</div>
+        </el-form-item>
       </el-form>
     </el-card>
   </div>

src/views/ncs-device/nurse_watch.vue

@@ -248,6 +248,7 @@ export default {
     websocketonmessage: function(e) {
       console.log('收到消息：', e.data)
       if (e.data) {
+        this.activeName = 'huan-ban'
         this.formshow = true
         this.deviceInfo = JSON.parse(e.data)
         this.role_id = this.deviceInfo.role_id