seimin 11 months ago
parent
commit
9a2a36cbc8

+ 27 - 0
package-lock.json

@@ -32,6 +32,7 @@
32
         "ngx-echarts": "^4.2.2",
32
         "ngx-echarts": "^4.2.2",
33
         "ngx-print": "~1.2.1",
33
         "ngx-print": "~1.2.1",
34
         "ngx-sortablejs": "^3.1.3",
34
         "ngx-sortablejs": "^3.1.3",
35
+        "ngx-virtual-scroller": "^4.0.3",
35
         "npm": "^6.14.15",
36
         "npm": "^6.14.15",
36
         "overlayscrollbars": "^1.11.0",
37
         "overlayscrollbars": "^1.11.0",
37
         "overlayscrollbars-ngx": "^0.1.1",
38
         "overlayscrollbars-ngx": "^0.1.1",
@@ -829,6 +830,12 @@
829
         "npm": ">= 6.2.0"
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
     "node_modules/@types/big.js": {
839
     "node_modules/@types/big.js": {
833
       "version": "6.2.2",
840
       "version": "6.2.2",
834
       "resolved": "https://registry.npmmirror.com/@types/big.js/-/big.js-6.2.2.tgz",
841
       "resolved": "https://registry.npmmirror.com/@types/big.js/-/big.js-6.2.2.tgz",
@@ -947,6 +954,12 @@
947
       "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==",
954
       "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==",
948
       "dev": true
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
     "node_modules/@types/webpack-sources": {
963
     "node_modules/@types/webpack-sources": {
951
       "version": "0.1.12",
964
       "version": "0.1.12",
952
       "resolved": "https://registry.npmmirror.com/@types/webpack-sources/-/webpack-sources-0.1.12.tgz",
965
       "resolved": "https://registry.npmmirror.com/@types/webpack-sources/-/webpack-sources-0.1.12.tgz",
@@ -7652,6 +7665,20 @@
7652
         "sortablejs": ">=1.7.0"
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
     "node_modules/nice-try": {
7682
     "node_modules/nice-try": {
7656
       "version": "1.0.5",
7683
       "version": "1.0.5",
7657
       "resolved": "https://registry.npmmirror.com/nice-try/-/nice-try-1.0.5.tgz",
7684
       "resolved": "https://registry.npmmirror.com/nice-try/-/nice-try-1.0.5.tgz",

+ 1 - 0
package.json

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

+ 1 - 1
proxy.conf.json

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

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

@@ -108,9 +108,9 @@
108
         </button>
108
         </button>
109
       </div>
109
       </div>
110
       <div class="cots_body weifenpai" *ngIf="(txtLabelCol == 1 && flagList.hsmsFlag1 && !flagList.itsmFlag1) || flagList.itsmFlag1" [ngClass]="{ top185: hurseInfoHiding != '1', top185_1: flagList.itsmFlag1 }">
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
           <ng-container *ngIf="unassignedList.length && !loading1">
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
               <ng-container *ngIf="data.type === 'hsms'">
115
               <ng-container *ngIf="data.type === 'hsms'">
116
                 <div class="left_cots" (click)="openDetails(data.data)">
116
                 <div class="left_cots" (click)="openDetails(data.data)">
@@ -260,12 +260,12 @@
260
           <div class="no_data" *ngIf="unassignedList.length == 0 && !loading1">
260
           <div class="no_data" *ngIf="unassignedList.length == 0 && !loading1">
261
             暂无数据
261
             暂无数据
262
           </div>
262
           </div>
263
-        </overlay-scrollbars>
263
+        </virtual-scroller>
264
       </div>
264
       </div>
265
       <div class="cots_body weifenpai twoCol" *ngIf="txtLabelCol == 2 && flagList.hsmsFlag1 && !flagList.itsmFlag1" [ngClass]="{ top185: hurseInfoHiding != '1' }">
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
           <ng-container *ngIf="unassignedList.length && !loading1">
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
               <div class="left_cots" (click)="openDetails(data.data)">
269
               <div class="left_cots" (click)="openDetails(data.data)">
270
                 <!-- 工单 -->
270
                 <!-- 工单 -->
271
                 <div class="gongdan">
271
                 <div class="gongdan">
@@ -298,7 +298,7 @@
298
           <div class="no_data" *ngIf="unassignedList.length == 0 && !loading1">
298
           <div class="no_data" *ngIf="unassignedList.length == 0 && !loading1">
299
             暂无数据
299
             暂无数据
300
           </div>
300
           </div>
301
-        </overlay-scrollbars>
301
+        </virtual-scroller>
302
       </div>
302
       </div>
303
     </div>
303
     </div>
304
     <!-- 待到达/待接单 -->
304
     <!-- 待到达/待接单 -->
@@ -321,9 +321,9 @@
321
         </button>
321
         </button>
322
       </div>
322
       </div>
323
       <div class="cots_body daidaoda" *ngIf="(txtLabelCol == 1 && flagList.hsmsFlag2 && !flagList.itsmFlag2) || flagList.itsmFlag2" [ngClass]="{ top185: hurseInfoHiding != '1', top185_1: flagList.itsmFlag2 }">
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
           <ng-container *ngIf="arriveList.length && !loading2">
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
               <ng-container *ngIf="data.type === 'hsms'">
328
               <ng-container *ngIf="data.type === 'hsms'">
329
                 <div class="left_cots" (click)="openDetails(data.data)">
329
                 <div class="left_cots" (click)="openDetails(data.data)">
@@ -469,12 +469,12 @@
469
           <div class="no_data" *ngIf="arriveList.length == 0 && !loading2">
469
           <div class="no_data" *ngIf="arriveList.length == 0 && !loading2">
470
             暂无数据
470
             暂无数据
471
           </div>
471
           </div>
472
-        </overlay-scrollbars>
472
+        </virtual-scroller>
473
       </div>
473
       </div>
474
       <div class="cots_body daidaoda twoCol" *ngIf="txtLabelCol == 2 && flagList.hsmsFlag2 && !flagList.itsmFlag2" [ngClass]="{ top185: hurseInfoHiding != '1' }">
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
           <ng-container *ngIf="arriveList.length && !loading2">
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
               <div class="left_cots" (click)="openDetails(data)">
478
               <div class="left_cots" (click)="openDetails(data)">
479
                 <!-- 工单 -->
479
                 <!-- 工单 -->
480
                 <div class="gongdan">
480
                 <div class="gongdan">
@@ -506,7 +506,7 @@
506
           <div class="no_data" *ngIf="arriveList.length == 0 && !loading2">
506
           <div class="no_data" *ngIf="arriveList.length == 0 && !loading2">
507
             暂无数据
507
             暂无数据
508
           </div>
508
           </div>
509
-        </overlay-scrollbars>
509
+        </virtual-scroller>
510
       </div>
510
       </div>
511
     </div>
511
     </div>
512
     <!-- 执行中 -->
512
     <!-- 执行中 -->
@@ -525,9 +525,9 @@
525
         </div>
525
         </div>
526
       </div>
526
       </div>
527
       <div class="cots_body zhixingzhong" *ngIf="(txtLabelCol == 1 && flagList.hsmsFlag3 && !flagList.itsmFlag3) || flagList.itsmFlag3" [ngClass]="{ top185: hurseInfoHiding != '1', top185_1: flagList.itsmFlag3 }">
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
           <ng-container *ngIf="executionList.length && !loading3">
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
               <ng-container *ngIf="data.type === 'hsms'">
532
               <ng-container *ngIf="data.type === 'hsms'">
533
                 <div class="left_cots" (click)="openDetails(data.data)">
533
                 <div class="left_cots" (click)="openDetails(data.data)">
@@ -673,12 +673,12 @@
673
           <div class="no_data" *ngIf="executionList.length == 0 && !loading3">
673
           <div class="no_data" *ngIf="executionList.length == 0 && !loading3">
674
             暂无数据
674
             暂无数据
675
           </div>
675
           </div>
676
-        </overlay-scrollbars>
676
+        </virtual-scroller>
677
       </div>
677
       </div>
678
       <div class="cots_body zhixingzhong twoCol" *ngIf="txtLabelCol == 2 && flagList.hsmsFlag3 && !flagList.itsmFlag3" [ngClass]="{ top185: hurseInfoHiding != '1' }">
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
           <ng-container *ngIf="executionList.length && !loading3">
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
               <div class="left_cots" (click)="openDetails(data)">
682
               <div class="left_cots" (click)="openDetails(data)">
683
                 <!-- 工单 -->
683
                 <!-- 工单 -->
684
                 <div class="gongdan">
684
                 <div class="gongdan">
@@ -709,7 +709,7 @@
709
           <div class="no_data" *ngIf="executionList.length == 0 && !loading3">
709
           <div class="no_data" *ngIf="executionList.length == 0 && !loading3">
710
             暂无数据
710
             暂无数据
711
           </div>
711
           </div>
712
-        </overlay-scrollbars>
712
+        </virtual-scroller>
713
       </div>
713
       </div>
714
     </div>
714
     </div>
715
   </div>
715
   </div>

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

@@ -44,36 +44,6 @@ export class FuwutaiComponent implements OnInit {
44
   @ViewChild("remarksEle", { static: false }) remarksEle: ElementRef;
44
   @ViewChild("remarksEle", { static: false }) remarksEle: ElementRef;
45
   @ViewChild("tabs", { static: false }) tabs: ElementRef;
45
   @ViewChild("tabs", { static: false }) tabs: ElementRef;
46
   @ViewChild("tab", { static: false }) elementView: ElementRef;
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
   @ViewChild("osComponentRef7", {
47
   @ViewChild("osComponentRef7", {
78
     read: OverlayScrollbarsComponent,
48
     read: OverlayScrollbarsComponent,
79
     static: false,
49
     static: false,

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

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