修复页面设备在离线显示相反问题

80_Server/90_BaseCode/orgweb/src/app/hostipal-index/list/list.component.html

@@ -79,7 +79,7 @@
           <div class="status" [ngClass]="{'red': item['bedStatus'] !== 1}" *ngIf="item['name']">
             <!-- <p>{{item['name'] | sliceNum}}</p> -->
             <p>{{item['name']}}</p>
-            <p>{{item['onlineStatus'] ? '' : item['bedStatus'] === 1 ? '在床' : '离床'}}</p>
+            <p>{{item['onlineStatus'] ? (item['bedStatus'] === 1 ? '在床' : '离床') : '设备离线' }}</p>
           </div>
         </div>
         <div class="middle" *ngIf="item['name']">
@@ -91,7 +91,7 @@
             <img src="../../../assets/img/wrestling.png" alt="">
           </div>
           <!-- 是否掉线 -->
-          <div class="img-wrap d-il" *ngIf="item['onlineStatus']">
+          <div class="img-wrap d-il" *ngIf="!item['onlineStatus']">
             <img src="../../../assets/img/disconnect.png" alt="">
           </div>
           <!-- 是否手术中 -->

80_Server/90_BaseCode/orgweb/src/app/hostipal-index/list/list.component.html.bak

@@ -0,0 +1,188 @@
+<div id="hostipal-index">
+  <div class="left-wraps d-il">
+
+    <div class="hospital-title">
+      <img src="../../../assets/img/hlogo.png" class="v-t" alt="">
+      <div class="name-wrap d-il">
+        <!-- <h2 class="d-il">湖州市中心医院</h2> -->
+        <h1 class="d-il">广州市老人院</h1>
+        <!-- <h3 class="d-il">心内科</h3> -->
+        <h1>智慧护理系统</h1>
+      </div>
+    </div>
+
+    <div class="nums-wrap">
+      <div class="num-wrap d-il t-c">
+        <p class="num">{{bedObj['total']}}</p>
+        <p class="name">总人数</p>
+      </div>
+      <div class="num-wrap d-il t-c">
+        <p class="num">{{bedObj['inBedNum']}}</p>
+        <p class="name">在床人数</p>
+      </div>
+      <div class="num-wrap d-il t-c">
+        <p class="num">{{bedObj['outBedNum']}}</p>
+        <p class="name">离床人数</p>
+      </div>
+    </div>
+    <div class="bed-wrap p-r">
+      <div class="left-wrap d-il p-a" [ngStyle]="{'width': bedObj['inBedPer']}"></div>
+      <div class="right-wrap d-il p-a" [ngStyle]="{'width': bedObj['outBedPer']}"></div>
+      <img src="../../../assets/img/in_bed.png"   class="p-a in_bed">
+      <img src="../../../assets/img/out_bed.png"  class="p-a out_bed">
+    </div>
+    <!-- <div class="bloodq8h-wrap red">
+      <div class="bloodq8h d-il v-t">血压Q8H:</div>
+      <div class="d-il bloodq8h-text">{{leftSettingObj['q8h']}}</div>
+    </div>
+    <div class="bloodq8h-wrap red">
+      <div class="bloodq8h d-il v-t">血压BID:</div>
+      <div class="d-il bloodq8h-text">{{leftSettingObj['bid']}}</div>
+    </div>
+    <div class="bloodq8h-wrap red">
+      <div class="bloodq8h d-il v-t">血压QD:</div>
+      <div class="d-il bloodq8h-text">{{leftSettingObj['qd']}}</div>
+    </div>
+
+    <div class="bloodq8h-wrap mt20 mb20 red">
+      <div class="bloodq8h d-il v-t">餐前血糖:</div>
+      <div class="d-il bloodq8h-text">{{leftSettingObj['bloodSugar']}}</div>
+    </div>
+    <div class="bloodq8h-wrap red">
+      <div class="bloodq8h d-il v-t">10PM血糖:</div>
+      <div class="d-il bloodq8h-text">{{leftSettingObj['tenpmBs']}}</div>
+    </div>
+    <div class="bloodq8h-wrap">
+      <div class="bloodq8h d-il v-t">24小时尿量:</div>
+      <div class="d-il bloodq8h-text">{{leftSettingObj['urineVolume']}}</div>
+    </div>
+
+    <div class="bloodq8h-wrap mt20 mb20 yellow">
+      <div class="bloodq8h d-il v-t">过敏史: </div>
+      <p *ngFor="let item of leftSettingObj['alleryList']">{{item}}</p>
+    </div> -->
+    <h4 class="focus green">特别关注:</h4>
+    <p *ngFor="let item of leftSettingObj['specialList']" style="font-size: 22px;">{{item}}</p>
+    
+    <div class="modify-wrap" *ngFor="let item of leftSettingObj['infos']">
+        <h4 class="focus green">{{item['label']}}:</h4>
+        <p style="font-size: 22px;" *ngFor="let sitem of item['value']">{{sitem}}</p>
+    </div>
+  </div>
+
+  <div class="right-wraps d-il v-t">
+
+    <div (mouseenter)="onMouseEnter(item)" (mouseleave)="onMouseOut(item)" (click)="onGoToAlarm(item['bgColor'])" class="p-r item-wraps d-il v-t" [ngClass]="{'normal': item['bgColor'] == 2, 'today': item['bgColor'] == 1, 'danger c-p': item['bgColor'] == 3, 'grey': !item['name']}" *ngFor="let item of list; let index=index">
+      <div class="item-wrap" *ngIf="!item['danger']" >
+        <div class="top" [ngClass]="{'center': !item['name']}">
+          <h4 [ngClass]="{'c-p': item['name']}">{{(item['bedNumber'] | num) < 10 ? '0' + (item['bedNumber'] | num) : (item['bedNumber'] | num)}}</h4>
+          <div class="status" [ngClass]="{'red': item['bedStatus'] !== 1}" *ngIf="item['name']">
+            <!-- <p>{{item['name'] | sliceNum}}</p> -->
+            <p>{{item['name']}}</p>
+            <p>{{item['onlineStatus'] ? (item['bedStatus'] === 1 ? '在床' : '离床') : '' }}</p>
+          </div>
+        </div>
+        <div class="middle" *ngIf="item['name']">
+          <div class="img-wrap d-il">
+              <img [src]="item['nersingType'] == '1' ? '../../../assets/img/bed.png' : '../../../assets/img/bed2.png'" alt="">
+          </div>
+          <!-- 是否摔倒 -->
+          <div class="img-wrap d-il" *ngIf="item['ifCareFall'] == '1'">
+            <img src="../../../assets/img/wrestling.png" alt="">
+          </div>
+          <!-- 是否掉线 -->
+          <div class="img-wrap d-il" *ngIf="!item['onlineStatus']">
+            <img src="../../../assets/img/disconnect.png" alt="">
+          </div>
+          <!-- 是否手术中 -->
+          <div class="img-wrap d-il" *ngIf="item['ifOperation'] == '1'">
+            <img src="../../../assets/img/heart.png" alt="">
+          </div>
+        </div>
+        <div class="bottom" *ngIf="item['name']">
+          <div class="heart-breath">
+            <p>心率：{{item['heartRate'] ? item['heartRate'] : '--'}}</p>
+            <p>呼吸：{{item['breathRate'] ? item['breathRate'] : '--'}}</p>
+          </div>
+          <div class="heart-breath">
+            <div>年龄：{{item['age']}}岁</div>
+            <div>性别：{{item['gender'] == 1 ? '男' : '女'}}</div>
+          </div>
+        </div>
+      </div>
+
+      <div class="special-item-wraps v-t t-c" *ngIf="item['danger']">
+        <div class="special-item-wrap">
+          <div class="special-num">{{(item['bedNumber'] | num) < 10 ? '0' + (item['bedNumber'] | num) : (item['bedNumber'] | num)}}</div>
+          <div class="special-name">{{item['name']}}</div>
+          <!-- <div class="special-name">{{item['name'] | sliceNum}}</div> -->
+        </div>
+      </div>
+
+      <!-- 遮罩层 -->
+      <div class="mask p-a c-p" *ngIf="item['editOrAdd']">
+        <div *ngIf="item['name']">
+          <a class="d-b" href="javascript:;" (click)="onGoToOldman(item)">编辑</a>
+          <a class="d-b" href="javascript:;" (click)="onLeaveHospital(item)">出院</a>
+        </div>
+        <div *ngIf="!item['name']" (click)="onGoToOldman(item)">
+          <a href="javascript:;">添加</a>
+        </div>
+      </div>
+      <!-- 音乐 -->
+      <!-- <audio *ngIf="item['bedStatus'] != 1 && item['name']" autoplay loop src="../../../assets/12025.mp3"></audio> -->
+    </div>
+  </div>
+</div>
+
+<div class="hospital-footer">
+  <div class="glogo d-il">
+    <img src="../../../assets/img/glogo.png" alt="">
+    <div class="d-il">
+      <p>教育部移动数字医院系统工程研究中心</p>
+      <p>北京大学</p>
+      <p>&nbsp;</p>
+      <!-- <p>湖州市中心医院心冲击图研究室</p> -->
+    </div>
+  </div>
+  <div class="d-il middle">
+    <!-- <div class="date d-il v-m">
+      <div>{{date}} {{week}}</div>
+      <div>{{times}}</div>
+      <div class="name">运行时间</div>
+      <div class="num">{{dpcountObj['systemRunTimes'] ? dpcountObj['systemRunTimes'] : 0}}H</div>
+    </div> -->
+    <div class="d-il total-wraps v-m">
+      <div class="total-wrap d-il">
+        <div class="name">今日服务 {{dpcountObj['todayCount'] ? dpcountObj['todayCount'] : 0}} 人次</div>
+        <!-- <div class="num">{{dpcountObj['todayCount'] ? dpcountObj['todayCount'] : 0}}</div> -->
+      </div>
+      <div class="total-wrap d-il">
+        <div class="name">累计服务 {{dpcountObj['total'] ? dpcountObj['total'] : 0}} 人次</div>
+        <!-- <div class="num">{{dpcountObj['total'] ? dpcountObj['total'] : 0}}</div> -->
+      </div>
+      <div class="total-wrap d-il">
+        <div class="name">运行时间 {{dpcountObj['systemRunTimes'] ? dpcountObj['systemRunTimes'] : 0}} 小时</div>
+        <!-- <div class="num">{{dpcountObj['systemRunTimes'] ? dpcountObj['systemRunTimes'] : 0}}H</div> -->
+      </div>
+      <div class="date d-il">
+        <!-- <div class="name">运行时间</div>
+        <div class="num">{{dpcountObj['systemRunTimes'] ? dpcountObj['systemRunTimes'] : 0}}H</div> -->
+        <div>{{date}} {{week}} {{times}}</div>
+        <!-- <div>{{times}}</div> -->
+      </div>
+    </div>
+  </div>
+  <!-- <div class="logo-wrap d-il v-m">
+    <img src="../../../assets/img/zlogo.png" alt="">
+  </div> -->
+</div>
+
+<!--删除二次确认-->
+<app-confirm #myConfirm [img]="'fail'" 
+    *ngIf="isShowConfirmFlag" [noticeTexts]="'确认出院吗？'" 
+    [title]="'出院'" (confirm)="onReConfirm($event)" 
+    [cancelText]="'取消'" [confirmText]="'确定'"
+    [cancelShow]="true" [confirmShow]="true"
+    (cancel)="onReCancel($event)">
+</app-confirm>