seimin %!s(int64=3) %!d(string=hai) anos
pai
achega
800e786605

+ 1 - 1
proxy.conf.json

@@ -1,6 +1,6 @@
1 1
 {
2 2
   "/service": {
3
-    "target": "http://192.168.3.96",
3
+    "target": "http://192.168.3.108",
4 4
     "logLevel": "debug",
5 5
     "changeOrigin": true,
6 6
     "pathRewrite": {

+ 26 - 26
src/app/views/fuwutai/fuwutai.component.html

@@ -154,7 +154,7 @@
154 154
                       <i *ngIf="data.patient.careLevel.value === '3'" class="icon_transport transport-3_round_solid"
155 155
                         nz-tooltip nzTooltipTitle="三级护理"></i>
156 156
                     </ng-container>
157
-                    <span>总时长{{formatTime(data.expectTimeNum/1000)}}</span>
157
+                    <!-- <span>总时长{{formatTime(data.expectTimeNum/1000)}}</span> -->
158 158
                   </span>
159 159
                   <span class="left" *ngIf="data.timeOutLength&&data.timeOut==true">
160 160
                     <i class="colorRed icon_transport transport-daojishi" nz-tooltip nzTooltipTitle="超时"></i>
@@ -176,9 +176,9 @@
176 176
                       <i *ngIf="data.patient.careLevel.value === '3'" class="icon_transport transport-3_round_solid"
177 177
                         nz-tooltip nzTooltipTitle="三级护理"></i>
178 178
                     </ng-container>
179
-                    <span>已超时{{formatTime(data.timeOutLength/1000)}}</span>
179
+                    <!-- <span>已超时{{formatTime(data.timeOutLength/1000)}}</span> -->
180 180
                   </span>
181
-                  <span class="right">
181
+                  <span class="right" nz-tooltip [nzTooltipTitle]="'总时长'+formatTime(data.expectTimeNum/1000)">
182 182
                     {{data.showCreateTime}}
183 183
                   </span>
184 184
                 </div>
@@ -198,8 +198,8 @@
198 198
                   *ngIf="data.gdState.value==2||((data.gdState.value==3||data.gdState.value==4)&&data.worker)"
199 199
                   class="btm_bot" value="删除" (click)='openDelModal(data.id)'>
200 200
               </div>
201
-              <div *ngIf="data.timeOut!=true" class="slider green" [ngStyle]="{'width':data.percent+'%'}"></div>
202
-              <div *ngIf="data.timeOut==true" class="slider red" [ngStyle]="{'width':'100%'}"></div>
201
+              <div *ngIf="data.timeOut!=true" class="slider sgreen" [ngStyle]="{'width':data.percent+'%'}"></div>
202
+              <div *ngIf="data.timeOut==true" class="slider sred" [ngStyle]="{'width':'100%'}"></div>
203 203
             </div>
204 204
           </ng-container>
205 205
           <div class="loading display_flex col-flex justify-content_flex-center align-items_center" *ngIf="loading1">
@@ -237,8 +237,8 @@
237 237
                 <img *ngIf="data.emergencyType&&data.emergencyType.id==301" src="../../assets/images/icon_jiaji.png"
238 238
                   alt="" class="ji">
239 239
               </div>
240
-              <div *ngIf="data.timeOut!=true" class="slider green" [ngStyle]="{'width':data.percent+'%'}"></div>
241
-              <div *ngIf="data.timeOut==true" class="slider red" [ngStyle]="{'width':'100%'}"></div>
240
+              <div *ngIf="data.timeOut!=true" class="slider sgreen" [ngStyle]="{'width':data.percent+'%'}"></div>
241
+              <div *ngIf="data.timeOut==true" class="slider sred" [ngStyle]="{'width':'100%'}"></div>
242 242
             </div>
243 243
           </ng-container>
244 244
           <div class="loading  display_flex col-flex justify-content_flex-center align-items_center" *ngIf="loading1">
@@ -322,7 +322,7 @@
322 322
                       <i *ngIf="data.patient.careLevel.value === '3'" class="icon_transport transport-3_round_solid"
323 323
                         nz-tooltip nzTooltipTitle="三级护理"></i>
324 324
                     </ng-container>
325
-                    <span>总时长{{formatTime(data.expectTimeNum/1000)}}</span>
325
+                    <!-- <span>总时长{{formatTime(data.expectTimeNum/1000)}}</span> -->
326 326
                   </span>
327 327
                   <span class="left" *ngIf="data.timeOutLength&&data.timeOut==true">
328 328
                     <i class="colorRed icon_transport transport-daojishi" nz-tooltip nzTooltipTitle="超时"></i>
@@ -344,9 +344,9 @@
344 344
                       <i *ngIf="data.patient.careLevel.value === '3'" class="icon_transport transport-3_round_solid"
345 345
                         nz-tooltip nzTooltipTitle="三级护理"></i>
346 346
                     </ng-container>
347
-                    <span>已超时{{formatTime(data.timeOutLength/1000)}}</span>
347
+                    <!-- <span>已超时{{formatTime(data.timeOutLength/1000)}}</span> -->
348 348
                   </span>
349
-                  <span class="right">
349
+                  <span class="right" nz-tooltip [nzTooltipTitle]="'总时长'+formatTime(data.expectTimeNum/1000)">
350 350
                     {{data.showCreateTime}}
351 351
                   </span>
352 352
                 </div>
@@ -365,8 +365,8 @@
365 365
                 <input type="button" *ngIf="data.gdState.value==2||data.gdState.value==3||data.gdState.value==4"
366 366
                   class="btm_bot" value="删除" (click)='openDelModal(data.id)'>
367 367
               </div>
368
-              <div *ngIf="data.timeOut!=true" class="slider green" [ngStyle]="{'width':data.percent+'%'}"></div>
369
-              <div *ngIf="data.timeOut==true" class="slider red" [ngStyle]="{'width':'100%'}"></div>
368
+              <div *ngIf="data.timeOut!=true" class="slider sgreen" [ngStyle]="{'width':data.percent+'%'}"></div>
369
+              <div *ngIf="data.timeOut==true" class="slider sred" [ngStyle]="{'width':'100%'}"></div>
370 370
             </div>
371 371
           </ng-container>
372 372
           <div class="loading  display_flex col-flex justify-content_flex-center align-items_center" *ngIf="loading2">
@@ -406,8 +406,8 @@
406 406
                 <img *ngIf="data.emergencyType&&data.emergencyType.id==301" src="../../assets/images/icon_jiaji.png"
407 407
                   alt="" class="ji">
408 408
               </div>
409
-              <div *ngIf="data.timeOut!=true" class="slider green" [ngStyle]="{'width':data.percent+'%'}"></div>
410
-              <div *ngIf="data.timeOut==true" class="slider red" [ngStyle]="{'width':'100%'}"></div>
409
+              <div *ngIf="data.timeOut!=true" class="slider sgreen" [ngStyle]="{'width':data.percent+'%'}"></div>
410
+              <div *ngIf="data.timeOut==true" class="slider sred" [ngStyle]="{'width':'100%'}"></div>
411 411
             </div>
412 412
           </ng-container>
413 413
           <div class="loading display_flex col-flex justify-content_flex-center align-items_center" *ngIf="loading2">
@@ -487,7 +487,7 @@
487 487
                       <i *ngIf="data.patient.careLevel.value === '3'" class="icon_transport transport-3_round_solid"
488 488
                         nz-tooltip nzTooltipTitle="三级护理"></i>
489 489
                     </ng-container>
490
-                    <span>总时长{{formatTime(data.expectTimeNum/1000)}}</span>
490
+                    <!-- <span>总时长{{formatTime(data.expectTimeNum/1000)}}</span> -->
491 491
                   </span>
492 492
                   <span class="left" *ngIf="data.timeOutLength&&data.timeOut==true">
493 493
                     <i class="colorRed icon_transport transport-daojishi" nz-tooltip nzTooltipTitle="超时"></i>
@@ -509,9 +509,9 @@
509 509
                       <i *ngIf="data.patient.careLevel.value === '3'" class="icon_transport transport-3_round_solid"
510 510
                         nz-tooltip nzTooltipTitle="三级护理"></i>
511 511
                     </ng-container>
512
-                    <span>已超时{{formatTime(data.timeOutLength/1000)}}</span>
512
+                    <!-- <span>已超时{{formatTime(data.timeOutLength/1000)}}</span> -->
513 513
                   </span>
514
-                  <span class="right">
514
+                  <span class="right" nz-tooltip [nzTooltipTitle]="'总时长'+formatTime(data.expectTimeNum/1000)">
515 515
                     {{data.showCreateTime}}
516 516
                   </span>
517 517
                 </div>
@@ -522,8 +522,8 @@
522 522
                 <img *ngIf="data.emergencyType&&data.emergencyType.id==301" src="../../assets/images/icon_jiaji.png"
523 523
                   alt="" class="ji">
524 524
               </div>
525
-              <div *ngIf="data.timeOut!=true" class="slider green" [ngStyle]="{'width':data.percent+'%'}"></div>
526
-              <div *ngIf="data.timeOut==true" class="slider red" [ngStyle]="{'width':'100%'}"></div>
525
+              <div *ngIf="data.timeOut!=true" class="slider sgreen" [ngStyle]="{'width':data.percent+'%'}"></div>
526
+              <div *ngIf="data.timeOut==true" class="slider sred" [ngStyle]="{'width':'100%'}"></div>
527 527
             </div>
528 528
           </ng-container>
529 529
           <div class="loading display_flex col-flex justify-content_flex-center align-items_center" *ngIf="loading3">
@@ -561,8 +561,8 @@
561 561
                 <img *ngIf="data.emergencyType&&data.emergencyType.id==301" src="../../assets/images/icon_jiaji.png"
562 562
                   alt="" class="ji">
563 563
               </div>
564
-              <div *ngIf="data.timeOut!=true" class="slider green" [ngStyle]="{'width':data.percent+'%'}"></div>
565
-              <div *ngIf="data.timeOut==true" class="slider red" [ngStyle]="{'width':'100%'}"></div>
564
+              <div *ngIf="data.timeOut!=true" class="slider sgreen" [ngStyle]="{'width':data.percent+'%'}"></div>
565
+              <div *ngIf="data.timeOut==true" class="slider sred" [ngStyle]="{'width':'100%'}"></div>
566 566
             </div>
567 567
           </ng-container>
568 568
           <div class="loading display_flex col-flex justify-content_flex-center align-items_center" *ngIf="loading3">
@@ -1216,7 +1216,7 @@
1216 1216
                           <i *ngIf="data.patient.careLevel.value === '3'" class="icon_transport transport-3_round_solid"
1217 1217
                             nz-tooltip nzTooltipTitle="三级护理"></i>
1218 1218
                         </ng-container>
1219
-                        <span>总时长{{formatTime(data.expectTimeNum/1000)}}</span>
1219
+                        <!-- <span>总时长{{formatTime(data.expectTimeNum/1000)}}</span> -->
1220 1220
                       </span>
1221 1221
                       <span class="left" *ngIf="data.timeOutLength&&data.timeOut==true">
1222 1222
                         <i class="colorRed icon_transport transport-daojishi" nz-tooltip nzTooltipTitle="超时"></i>
@@ -1238,9 +1238,9 @@
1238 1238
                           <i *ngIf="data.patient.careLevel.value === '3'" class="icon_transport transport-3_round_solid"
1239 1239
                             nz-tooltip nzTooltipTitle="三级护理"></i>
1240 1240
                         </ng-container>
1241
-                        <span>已超时{{formatTime(data.timeOutLength/1000)}}</span>
1241
+                        <!-- <span>已超时{{formatTime(data.timeOutLength/1000)}}</span> -->
1242 1242
                       </span>
1243
-                      <span class="right">
1243
+                      <span class="right" nz-tooltip [nzTooltipTitle]="'总时长'+formatTime(data.expectTimeNum/1000)">
1244 1244
                         {{data.showCreateTime}}
1245 1245
                       </span>
1246 1246
                     </div>
@@ -1259,8 +1259,8 @@
1259 1259
                     <input type="button" *ngIf="data.gdState.value==2||data.gdState.value==3||data.gdState.value==4"
1260 1260
                       class="btm_bot" value="删除" (click)='openDelModal(data.id)'>
1261 1261
                   </div>
1262
-                  <div *ngIf="data.timeOut!=true" class="slider green" [ngStyle]="{'width':data.percent+'%'}"></div>
1263
-                  <div *ngIf="data.timeOut==true" class="slider red" [ngStyle]="{'width':'100%'}"></div>
1262
+                  <div *ngIf="data.timeOut!=true" class="slider sgreen" [ngStyle]="{'width':data.percent+'%'}"></div>
1263
+                  <div *ngIf="data.timeOut==true" class="slider sred" [ngStyle]="{'width':'100%'}"></div>
1264 1264
                 </div>
1265 1265
               </div>
1266 1266
               <div class="no_data" *ngIf="noArrives.length==0&&!loading4">暂无数据</div>

+ 5 - 2
src/app/views/fuwutai/fuwutai.component.less

@@ -538,13 +538,16 @@
538 538
     width: 100%;
539 539
     height: 2px;
540 540
 
541
-    &.green {
541
+    &.sgreen {
542 542
       background: rgb(86, 186, 182);
543 543
     }
544 544
 
545
-    &.yellow {
545
+    &.syellow {
546 546
       background: rgb(245, 166, 35);
547 547
     }
548
+    &.sred {
549
+      background: #d81e06;
550
+    }
548 551
   }
549 552
 
550 553
   /* 中按钮 */