Bläddra i källkod

护士段刷新时间

seimin 1 år sedan
förälder
incheckning
79f917de9d

+ 6 - 5
src/app/views/hushijiandan/hushijiandan.component.html

@@ -2187,11 +2187,7 @@
2187 2187
               <div
2188 2188
                 class="orderTit display_flex justify-content_space-between align-items_center"
2189 2189
               >
2190
-                <span
2191
-                  >工单列表<b style="font-size: 12px"
2192
-                    >({{ orderListTime }}秒)</b
2193
-                  ></span
2194
-                >
2190
+                <span>工单列表<b style="font-size: 12px">({{ orderListTime }}秒)</b></span>
2195 2191
                 <div>
2196 2192
                   <nz-select
2197 2193
                     style="width: 100px"
@@ -2290,6 +2286,11 @@
2290 2286
                             </div>
2291 2287
                           </div>
2292 2288
                           <div class="row" nz-row>
2289
+                            <div nz-col nzSpan="24" class="col txtL">
2290
+                              {{item.workOrderRemark}}
2291
+                            </div>
2292
+                          </div>
2293
+                          <div class="row" nz-row>
2293 2294
                             <!-- <div nz-col nzSpan="12" class="col txtL"></div> -->
2294 2295
                             <div nz-col nzSpan="12" class="col txtL">
2295 2296
                               <ng-container

+ 3 - 1
src/app/views/hushijiandan/hushijiandan.component.less

@@ -1465,8 +1465,10 @@
1465 1465
 
1466 1466
                       .row {
1467 1467
                         width: 100%;
1468
+                        word-break: break-all;
1469
+                        line-height: normal;
1468 1470
 
1469
-                        &:nth-child(3) {
1471
+                        &:last-child {
1470 1472
                           padding-bottom: 8px;
1471 1473
                           border-bottom: 1px solid @hs_border_color;
1472 1474
                         }

+ 28 - 11
src/app/views/hushijiandan/hushijiandan.component.ts

@@ -173,6 +173,7 @@ export class HushijiandanComponent implements OnInit {
173 173
     this.getItsmIncident();
174 174
     this.getInspectAndPatientTransportConfigTasktype();
175 175
     this.getUpdateTipsForNurses();
176
+    this.getRefreshNurseWorkOrderTime();
176 177
     this.getCloseTimeFlag();
177 178
     this.currentDept = this.tool.getCurrentUserDept();
178 179
     console.log(this.currentDept, this.tabSearchCont);
@@ -222,17 +223,7 @@ export class HushijiandanComponent implements OnInit {
222 223
       }
223 224
     }, 1000);
224 225
     // 综合日志倒计时 end
225
-    // 工单列表倒计时 start
226
-    this.orderListTime = this.orderListTimeConst;
227
-    clearInterval(this.orderListTimer);
228
-    this.orderListTimer = setInterval(() => {
229
-      this.orderListTime--;
230
-      if (this.orderListTime === 0) {
231
-        this.orderListTime = this.orderListTimeConst;
232
-        this.getOrderList();
233
-      }
234
-    }, 1000);
235
-    // 工单列表倒计时 end
226
+
236 227
   }
237 228
   ngOnDestroy() {
238 229
     clearInterval(this.moveId);
@@ -569,6 +560,32 @@ export class HushijiandanComponent implements OnInit {
569 560
         }
570 561
       });
571 562
   }
563
+  // 获取护士工单列表刷新速度
564
+  getRefreshNurseWorkOrderTime() {
565
+    let postData = {
566
+      idx: 0,
567
+      sum: 1,
568
+      systemConfiguration: { keyconfig: "refreshNurseWorkOrderTime" },
569
+    };
570
+    this.mainService
571
+      .getFetchDataList("simple/data", "systemConfiguration", postData)
572
+      .subscribe((result) => {
573
+        if (result.status == 200) {
574
+          this.orderListTimeConst = result.list[0].valueconfig;
575
+          // 工单列表倒计时 start
576
+          this.orderListTime = this.orderListTimeConst;
577
+          clearInterval(this.orderListTimer);
578
+          this.orderListTimer = setInterval(() => {
579
+            this.orderListTime--;
580
+            if (this.orderListTime === 0) {
581
+              this.orderListTime = this.orderListTimeConst;
582
+              this.getOrderList();
583
+            }
584
+          }, 1000);
585
+          // 工单列表倒计时 end
586
+        }
587
+      });
588
+  }
572 589
   // 获取标本按钮
573 590
   specimenButton = "";
574 591
   getSpecimenButton() {

+ 8 - 1
src/app/views/sys-config/sys-config.component.html

@@ -134,7 +134,7 @@
134 134
           <nz-form-label [nzSpan]="8" nzFor="workOrderSettings" nzRequired class="label">自动关闭工单设置
135 135
           </nz-form-label>
136 136
           <nz-form-control [nzSpan]="16" nzErrorTip="自动关闭工单设置是必填项!">
137
-            <nz-input-number class="w100" formControlName="workOrderSettings" [nzMin]="5" [nzStep]="1"
137
+            <nz-input-number class="w100" formControlName="workOrderSettings" [nzMin]="5" [nzStep]="1" [nzPrecision]="0"
138 138
               [nzFormatter]="formatterPercent" [nzParser]="parserPercent"></nz-input-number>
139 139
           </nz-form-control>
140 140
         </nz-form-item>
@@ -182,6 +182,13 @@
182 182
             <input nz-input formControlName="itsmIP" id="itsmIP" placeholder="请输入链接地址">
183 183
           </nz-form-control>
184 184
         </nz-form-item>
185
+        <nz-form-item class="formItem">
186
+          <nz-form-label [nzSpan]="10" nzFor="refreshNurseWorkOrderTime" nzRequired class="label">护士工单列表刷新速度
187
+          </nz-form-label>
188
+          <nz-form-control [nzSpan]="14" nzErrorTip="护士工单列表刷新速度是必填项!">
189
+            <nz-input-number class="w100" formControlName="refreshNurseWorkOrderTime" [nzMin]="15" [nzStep]="1" [nzPrecision]="0" [nzFormatter]="formatterSecond" [nzParser]="parserSecond"></nz-input-number>
190
+          </nz-form-control>
191
+        </nz-form-item>
185 192
       </div>
186 193
     </form>
187 194
   </overlay-scrollbars>

+ 1 - 0
src/app/views/sys-config/sys-config.component.less

@@ -40,6 +40,7 @@
40 40
           margin-bottom: 8px;
41 41
           .label {
42 42
             color: #333;
43
+            text-align: left;
43 44
           }
44 45
           [nz-input] {
45 46
             height: 34px;

+ 9 - 0
src/app/views/sys-config/sys-config.component.ts

@@ -26,6 +26,8 @@ export class SysConfigComponent implements OnInit {
26 26
   promptInfo: string; //操作结果提示信息
27 27
   promptModalShow: boolean; //操作提示框是否展示
28 28
   coopBtns = {};
29
+  formatterSecond = (value: number) => `${value} 秒`;
30
+  parserSecond = (value: string) => value.replace(' 秒', '');
29 31
   menu = JSON.parse(localStorage.getItem("menu")) || []; //菜单
30 32
   constructor(
31 33
     private mainService: MainService,
@@ -51,6 +53,7 @@ export class SysConfigComponent implements OnInit {
51 53
       itsmIncident: [null, [Validators.required]],
52 54
       workOrderSettings: [5, [Validators.required]],
53 55
       nurseDeptSwitchTip: [0, [Validators.required]],
56
+      refreshNurseWorkOrderTime: [60, [Validators.required]],
54 57
       updateTipsForNurses: [""],
55 58
       systemName: [""],
56 59
       largeScreenName: [""],
@@ -132,6 +135,7 @@ export class SysConfigComponent implements OnInit {
132 135
         item.keyconfig === "itsmIncident" ||
133 136
         item.keyconfig === "workOrderSettings" ||
134 137
         item.keyconfig === "nurseDeptSwitchTip" ||
138
+        item.keyconfig === "refreshNurseWorkOrderTime" ||
135 139
         item.keyconfig === "updateTipsForNurses" ||
136 140
         item.keyconfig === "systemName" ||
137 141
         item.keyconfig === "largeScreenName" ||
@@ -159,6 +163,8 @@ export class SysConfigComponent implements OnInit {
159 163
         item.valueconfig = this.validateForm.controls.workOrderSettings.value;
160 164
       } else if (item.keyconfig === "nurseDeptSwitchTip") {
161 165
         item.valueconfig = this.validateForm.controls.nurseDeptSwitchTip.value;
166
+      } else if (item.keyconfig === "refreshNurseWorkOrderTime") {
167
+        item.valueconfig = this.validateForm.controls.refreshNurseWorkOrderTime.value;
162 168
       } else if (item.keyconfig === "updateTipsForNurses") {
163 169
         item.valueconfig = this.validateForm.controls.updateTipsForNurses.value;
164 170
       } else if (item.keyconfig === "systemName") {
@@ -246,6 +252,9 @@ export class SysConfigComponent implements OnInit {
246 252
                 case "nurseDeptSwitchTip":
247 253
                   this.validateForm.controls.nurseDeptSwitchTip.setValue(c[1]);
248 254
                   break;
255
+                case "refreshNurseWorkOrderTime":
256
+                  this.validateForm.controls.refreshNurseWorkOrderTime.setValue(c[1]);
257
+                  break;
249 258
                 case "updateTipsForNurses":
250 259
                   this.validateForm.controls.updateTipsForNurses.setValue(c[1]);
251 260
                   break;