seimin 7 달 전
부모
커밋
9a2a36cbc8
6개의 변경된 파일49개의 추가작업 그리고 49개의 파일을 삭제
  1. 27 0
      package-lock.json
  2. 1 0
      package.json
  3. 1 1
      proxy.conf.json
  4. 18 18
      src/app/views/fuwutai/fuwutai.component.html
  5. 0 30
      src/app/views/fuwutai/fuwutai.component.ts
  6. 2 0
      src/app/views/fuwutai/fuwutai.module.ts

+ 27 - 0
package-lock.json

@@ -32,6 +32,7 @@
32 32
         "ngx-echarts": "^4.2.2",
33 33
         "ngx-print": "~1.2.1",
34 34
         "ngx-sortablejs": "^3.1.3",
35
+        "ngx-virtual-scroller": "^4.0.3",
35 36
         "npm": "^6.14.15",
36 37
         "overlayscrollbars": "^1.11.0",
37 38
         "overlayscrollbars-ngx": "^0.1.1",
@@ -829,6 +830,12 @@
829 830
         "npm": ">= 6.2.0"
830 831
       }
831 832
     },
833
+    "node_modules/@tweenjs/tween.js": {
834
+      "version": "17.4.0",
835
+      "resolved": "https://registry.npmmirror.com/@tweenjs/tween.js/-/tween.js-17.4.0.tgz",
836
+      "integrity": "sha512-J3fzl1F6wvh8KXVVcIuHN12xi1ZDcPA/0Vix+ZcJYwZWVHUwfIqfvzYXXEw7ybeev6477KCTt9fKydU+ajUqcg==",
837
+      "license": "MIT"
838
+    },
832 839
     "node_modules/@types/big.js": {
833 840
       "version": "6.2.2",
834 841
       "resolved": "https://registry.npmmirror.com/@types/big.js/-/big.js-6.2.2.tgz",
@@ -947,6 +954,12 @@
947 954
       "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==",
948 955
       "dev": true
949 956
     },
957
+    "node_modules/@types/tween.js": {
958
+      "version": "17.2.0",
959
+      "resolved": "https://registry.npmmirror.com/@types/tween.js/-/tween.js-17.2.0.tgz",
960
+      "integrity": "sha512-mOsqurEtFEzwgkVc/jDVE2XrjZBYTbrmDUyCr9GXmnfc6q5otokxFtKvSY/B21zgz9LVRIvRTawKczjKi57wrA==",
961
+      "license": "MIT"
962
+    },
950 963
     "node_modules/@types/webpack-sources": {
951 964
       "version": "0.1.12",
952 965
       "resolved": "https://registry.npmmirror.com/@types/webpack-sources/-/webpack-sources-0.1.12.tgz",
@@ -7652,6 +7665,20 @@
7652 7665
         "sortablejs": ">=1.7.0"
7653 7666
       }
7654 7667
     },
7668
+    "node_modules/ngx-virtual-scroller": {
7669
+      "version": "4.0.3",
7670
+      "resolved": "https://registry.npmmirror.com/ngx-virtual-scroller/-/ngx-virtual-scroller-4.0.3.tgz",
7671
+      "integrity": "sha512-JBqUJ/f7GRCZDnI/JeiFoTmYR8rC/Hyv8L5I7ImePM6f/hwiFNRsrK8Abdd0E3TwklwgmZAK875te9XQJrgsyQ==",
7672
+      "license": "MIT",
7673
+      "dependencies": {
7674
+        "@tweenjs/tween.js": "17.4.0",
7675
+        "@types/tween.js": "17.2.0"
7676
+      },
7677
+      "peerDependencies": {
7678
+        "@angular/core": ">=6.0.0",
7679
+        "tslib": "^1.10.0"
7680
+      }
7681
+    },
7655 7682
     "node_modules/nice-try": {
7656 7683
       "version": "1.0.5",
7657 7684
       "resolved": "https://registry.npmmirror.com/nice-try/-/nice-try-1.0.5.tgz",

+ 1 - 0
package.json

@@ -40,6 +40,7 @@
40 40
     "ngx-echarts": "^4.2.2",
41 41
     "ngx-print": "~1.2.1",
42 42
     "ngx-sortablejs": "^3.1.3",
43
+    "ngx-virtual-scroller": "^4.0.3",
43 44
     "npm": "^6.14.15",
44 45
     "overlayscrollbars": "^1.11.0",
45 46
     "overlayscrollbars-ngx": "^0.1.1",

+ 1 - 1
proxy.conf.json

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

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

@@ -108,9 +108,9 @@
108 108
         </button>
109 109
       </div>
110 110
       <div class="cots_body weifenpai" *ngIf="(txtLabelCol == 1 && flagList.hsmsFlag1 && !flagList.itsmFlag1) || flagList.itsmFlag1" [ngClass]="{ top185: hurseInfoHiding != '1', top185_1: flagList.itsmFlag1 }">
111
-        <overlay-scrollbars #osComponentRef2 [ngStyle]="{ height: '100%' }">
111
+        <virtual-scroller [items]="unassignedList" #osComponentRef2 [ngStyle]="{ height: '100%' }">
112 112
           <ng-container *ngIf="unassignedList.length && !loading1">
113
-            <div class="list listsTypeColor" *ngFor="let data of unassignedList">
113
+            <div class="list listsTypeColor" *ngFor="let data of osComponentRef2.viewPortItems">
114 114
               <!-- 配送 -->
115 115
               <ng-container *ngIf="data.type === 'hsms'">
116 116
                 <div class="left_cots" (click)="openDetails(data.data)">
@@ -260,12 +260,12 @@
260 260
           <div class="no_data" *ngIf="unassignedList.length == 0 && !loading1">
261 261
             暂无数据
262 262
           </div>
263
-        </overlay-scrollbars>
263
+        </virtual-scroller>
264 264
       </div>
265 265
       <div class="cots_body weifenpai twoCol" *ngIf="txtLabelCol == 2 && flagList.hsmsFlag1 && !flagList.itsmFlag1" [ngClass]="{ top185: hurseInfoHiding != '1' }">
266
-        <overlay-scrollbars #osComponentRef1 [ngStyle]="{ height: '100%' }">
266
+        <virtual-scroller [items]="unassignedList" #osComponentRef1 [ngStyle]="{ height: '100%' }">
267 267
           <ng-container *ngIf="unassignedList.length && !loading1">
268
-            <div class="list listsTypeColor" *ngFor="let data of unassignedList">
268
+            <div class="list listsTypeColor" *ngFor="let data of osComponentRef1.viewPortItems">
269 269
               <div class="left_cots" (click)="openDetails(data.data)">
270 270
                 <!-- 工单 -->
271 271
                 <div class="gongdan">
@@ -298,7 +298,7 @@
298 298
           <div class="no_data" *ngIf="unassignedList.length == 0 && !loading1">
299 299
             暂无数据
300 300
           </div>
301
-        </overlay-scrollbars>
301
+        </virtual-scroller>
302 302
       </div>
303 303
     </div>
304 304
     <!-- 待到达/待接单 -->
@@ -321,9 +321,9 @@
321 321
         </button>
322 322
       </div>
323 323
       <div class="cots_body daidaoda" *ngIf="(txtLabelCol == 1 && flagList.hsmsFlag2 && !flagList.itsmFlag2) || flagList.itsmFlag2" [ngClass]="{ top185: hurseInfoHiding != '1', top185_1: flagList.itsmFlag2 }">
324
-        <overlay-scrollbars #osComponentRef3 [ngStyle]="{ height: '100%' }">
324
+        <virtual-scroller [items]="arriveList" #osComponentRef3 [ngStyle]="{ height: '100%' }">
325 325
           <ng-container *ngIf="arriveList.length && !loading2">
326
-            <div class="list listsTypeColor" *ngFor="let data of arriveList">
326
+            <div class="list listsTypeColor" *ngFor="let data of osComponentRef3.viewPortItems">
327 327
               <!-- 配送 -->
328 328
               <ng-container *ngIf="data.type === 'hsms'">
329 329
                 <div class="left_cots" (click)="openDetails(data.data)">
@@ -469,12 +469,12 @@
469 469
           <div class="no_data" *ngIf="arriveList.length == 0 && !loading2">
470 470
             暂无数据
471 471
           </div>
472
-        </overlay-scrollbars>
472
+        </virtual-scroller>
473 473
       </div>
474 474
       <div class="cots_body daidaoda twoCol" *ngIf="txtLabelCol == 2 && flagList.hsmsFlag2 && !flagList.itsmFlag2" [ngClass]="{ top185: hurseInfoHiding != '1' }">
475
-        <overlay-scrollbars #osComponentRef4 [ngStyle]="{ height: '100%' }">
475
+        <virtual-scroller [items]="arriveList" #osComponentRef4 [ngStyle]="{ height: '100%' }">
476 476
           <ng-container *ngIf="arriveList.length && !loading2">
477
-            <div class="list listsTypeColor" *ngFor="let data of arriveList">
477
+            <div class="list listsTypeColor" *ngFor="let data of osComponentRef4.viewPortItems">
478 478
               <div class="left_cots" (click)="openDetails(data)">
479 479
                 <!-- 工单 -->
480 480
                 <div class="gongdan">
@@ -506,7 +506,7 @@
506 506
           <div class="no_data" *ngIf="arriveList.length == 0 && !loading2">
507 507
             暂无数据
508 508
           </div>
509
-        </overlay-scrollbars>
509
+        </virtual-scroller>
510 510
       </div>
511 511
     </div>
512 512
     <!-- 执行中 -->
@@ -525,9 +525,9 @@
525 525
         </div>
526 526
       </div>
527 527
       <div class="cots_body zhixingzhong" *ngIf="(txtLabelCol == 1 && flagList.hsmsFlag3 && !flagList.itsmFlag3) || flagList.itsmFlag3" [ngClass]="{ top185: hurseInfoHiding != '1', top185_1: flagList.itsmFlag3 }">
528
-        <overlay-scrollbars #osComponentRef5 [ngStyle]="{ height: '100%' }">
528
+        <virtual-scroller [items]="executionList" #osComponentRef5 [ngStyle]="{ height: '100%' }">
529 529
           <ng-container *ngIf="executionList.length && !loading3">
530
-            <div class="list" *ngFor="let data of executionList">
530
+            <div class="list" *ngFor="let data of osComponentRef5.viewPortItems">
531 531
               <!-- 配送 -->
532 532
               <ng-container *ngIf="data.type === 'hsms'">
533 533
                 <div class="left_cots" (click)="openDetails(data.data)">
@@ -673,12 +673,12 @@
673 673
           <div class="no_data" *ngIf="executionList.length == 0 && !loading3">
674 674
             暂无数据
675 675
           </div>
676
-        </overlay-scrollbars>
676
+        </virtual-scroller>
677 677
       </div>
678 678
       <div class="cots_body zhixingzhong twoCol" *ngIf="txtLabelCol == 2 && flagList.hsmsFlag3 && !flagList.itsmFlag3" [ngClass]="{ top185: hurseInfoHiding != '1' }">
679
-        <overlay-scrollbars #osComponentRef6 [ngStyle]="{ height: '100%' }">
679
+        <virtual-scroller [items]="executionList" #osComponentRef6 [ngStyle]="{ height: '100%' }">
680 680
           <ng-container *ngIf="executionList.length && !loading3">
681
-            <div class="list" *ngFor="let data of executionList">
681
+            <div class="list" *ngFor="let data of osComponentRef6.viewPortItems">
682 682
               <div class="left_cots" (click)="openDetails(data)">
683 683
                 <!-- 工单 -->
684 684
                 <div class="gongdan">
@@ -709,7 +709,7 @@
709 709
           <div class="no_data" *ngIf="executionList.length == 0 && !loading3">
710 710
             暂无数据
711 711
           </div>
712
-        </overlay-scrollbars>
712
+        </virtual-scroller>
713 713
       </div>
714 714
     </div>
715 715
   </div>

+ 0 - 30
src/app/views/fuwutai/fuwutai.component.ts

@@ -44,36 +44,6 @@ export class FuwutaiComponent implements OnInit {
44 44
   @ViewChild("remarksEle", { static: false }) remarksEle: ElementRef;
45 45
   @ViewChild("tabs", { static: false }) tabs: ElementRef;
46 46
   @ViewChild("tab", { static: false }) elementView: ElementRef;
47
-  @ViewChild("osComponentRef1", {
48
-    read: OverlayScrollbarsComponent,
49
-    static: false,
50
-  })
51
-  osComponentRef1: OverlayScrollbarsComponent;
52
-  @ViewChild("osComponentRef2", {
53
-    read: OverlayScrollbarsComponent,
54
-    static: false,
55
-  })
56
-  osComponentRef2: OverlayScrollbarsComponent;
57
-  @ViewChild("osComponentRef3", {
58
-    read: OverlayScrollbarsComponent,
59
-    static: false,
60
-  })
61
-  osComponentRef3: OverlayScrollbarsComponent;
62
-  @ViewChild("osComponentRef4", {
63
-    read: OverlayScrollbarsComponent,
64
-    static: false,
65
-  })
66
-  osComponentRef4: OverlayScrollbarsComponent;
67
-  @ViewChild("osComponentRef5", {
68
-    read: OverlayScrollbarsComponent,
69
-    static: false,
70
-  })
71
-  osComponentRef5: OverlayScrollbarsComponent;
72
-  @ViewChild("osComponentRef6", {
73
-    read: OverlayScrollbarsComponent,
74
-    static: false,
75
-  })
76
-  osComponentRef6: OverlayScrollbarsComponent;
77 47
   @ViewChild("osComponentRef7", {
78 48
     read: OverlayScrollbarsComponent,
79 49
     static: false,

+ 2 - 0
src/app/views/fuwutai/fuwutai.module.ts

@@ -15,6 +15,7 @@ import { IncidentSubstitutionModule } from 'src/app/components/incidentManagemen
15 15
 import { IncidentHandleModule } from 'src/app/components/incidentManagement/incident-handle/incident-handle.module';
16 16
 import { IncidentSerVisitModule } from 'src/app/components/incidentManagement/incident-ser-visit/incident-ser-visit.module';
17 17
 import { IncidentSerMessageModule } from 'src/app/components/incidentManagement/incident-ser-message/incident-ser-message.module';
18
+import { VirtualScrollerModule } from 'ngx-virtual-scroller';
18 19
 
19 20
 
20 21
 @NgModule({
@@ -35,6 +36,7 @@ import { IncidentSerMessageModule } from 'src/app/components/incidentManagement/
35 36
     IncidentHandleModule,
36 37
     IncidentSerVisitModule,
37 38
     IncidentSerMessageModule,
39
+    VirtualScrollerModule,
38 40
   ]
39 41
 })
40 42
 export class FuwutaiModule { }