seimin hai 4 meses
pai
achega
5442c05dcc
Modificáronse 17 ficheiros con 48 adicións e 48 borrados
  1. 1 1
      proxy.conf.json
  2. 2 2
      src/app/views/new-statistics/components/search-more/search-more.component.html
  3. 4 4
      src/app/views/new-statistics/maintenance-statistics/category-one-statistics/category-one-statistics.component.ts
  4. 4 4
      src/app/views/new-statistics/maintenance-statistics/category-source-statistics/category-source-statistics.component.ts
  5. 4 4
      src/app/views/new-statistics/maintenance-statistics/category-three-statistics/category-three-statistics.component.ts
  6. 4 4
      src/app/views/new-statistics/maintenance-statistics/category-two-statistics/category-two-statistics.component.ts
  7. 1 1
      src/app/views/new-statistics/maintenance-statistics/consumable-statistics/consumable-statistics.component.html
  8. 4 4
      src/app/views/new-statistics/maintenance-statistics/consumable-statistics/consumable-statistics.component.ts
  9. 4 4
      src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/department-evaluate-statistics.component.ts
  10. 4 4
      src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-statistics.component.ts
  11. 4 4
      src/app/views/new-statistics/maintenance-statistics/department-source-statistics/department-source-statistics.component.ts
  12. 1 1
      src/app/views/new-statistics/maintenance-statistics/floor-statistics/floor-statistics.component.html
  13. 1 1
      src/app/views/new-statistics/maintenance-statistics/incident-statistics/incident-statistics.component.html
  14. 4 4
      src/app/views/new-statistics/maintenance-statistics/incident-statistics/incident-statistics.component.ts
  15. 1 1
      src/app/views/new-statistics/maintenance-statistics/tripartite-company-statistics/tripartite-company-statistics.component.html
  16. 1 1
      src/app/views/new-statistics/maintenance-statistics/work-hour-statistics/work-hour-statistics.component.html
  17. 4 4
      src/app/views/new-statistics/maintenance-statistics/work-hour-statistics/work-hour-statistics.component.ts

+ 1 - 1
proxy.conf.json

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

+ 2 - 2
src/app/views/new-statistics/components/search-more/search-more.component.html

@@ -93,7 +93,7 @@
93
           <nz-form-control [nzSpan]="18" nzErrorTip="请选择楼栋!">
93
           <nz-form-control [nzSpan]="18" nzErrorTip="请选择楼栋!">
94
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeBuildingInp($event)" formControlName="buildingId" nzPlaceHolder="请选择楼栋" (nzOpenChange)="openChangeBuilding($event)" (ngModelChange)="changeBuilding($event)">
94
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeBuildingInp($event)" formControlName="buildingId" nzPlaceHolder="请选择楼栋" (nzOpenChange)="openChangeBuilding($event)" (ngModelChange)="changeBuilding($event)">
95
               <ng-container *ngFor="let option of buildingList">
95
               <ng-container *ngFor="let option of buildingList">
96
-                <nz-option *ngIf="!isLoading" [nzLabel]="option.buildingName" [nzValue]="option.id"></nz-option>
96
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName + '-' + option.buildingName" [nzValue]="option.id"></nz-option>
97
               </ng-container>
97
               </ng-container>
98
               <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
98
               <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
99
                 <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
99
                 <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -135,7 +135,7 @@
135
           <nz-form-control [nzSpan]="18" nzErrorTip="请选择报修科室!">
135
           <nz-form-control [nzSpan]="18" nzErrorTip="请选择报修科室!">
136
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" formControlName="repairDeptId" nzPlaceHolder="请选择报修科室" (nzOpenChange)="openChangeRepairDept($event)">
136
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" formControlName="repairDeptId" nzPlaceHolder="请选择报修科室" (nzOpenChange)="openChangeRepairDept($event)">
137
               <ng-container *ngFor="let option of repairDeptList">
137
               <ng-container *ngFor="let option of repairDeptList">
138
-                <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
138
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
139
               </ng-container>
139
               </ng-container>
140
               <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
140
               <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
141
                 <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
141
                 <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...

+ 4 - 4
src/app/views/new-statistics/maintenance-statistics/category-one-statistics/category-one-statistics.component.ts

@@ -108,8 +108,8 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
108
       hosId: this.hosId || undefined,
108
       hosId: this.hosId || undefined,
109
       dutyId: this.dutyId || undefined,
109
       dutyId: this.dutyId || undefined,
110
       parentDutyId: this.parentDutyId || undefined,
110
       parentDutyId: this.parentDutyId || undefined,
111
-      groupId: this.fieldConfig.fields.groupId || undefined,
112
-      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
111
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
112
+      userId: this.fieldConfig.fields.userId || undefined,
113
       buildingId: this.fieldConfig.fields.buildingId || undefined,
113
       buildingId: this.fieldConfig.fields.buildingId || undefined,
114
       placeId: this.fieldConfig.fields.floorId || undefined,
114
       placeId: this.fieldConfig.fields.floorId || undefined,
115
       companyId: this.fieldConfig.fields.companyId || undefined,
115
       companyId: this.fieldConfig.fields.companyId || undefined,
@@ -173,8 +173,8 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
173
       hosId: this.hosId || undefined,
173
       hosId: this.hosId || undefined,
174
       dutyId: this.dutyId || undefined,
174
       dutyId: this.dutyId || undefined,
175
       parentDutyId: this.parentDutyId || undefined,
175
       parentDutyId: this.parentDutyId || undefined,
176
-      groupId: this.fieldConfig.fields.groupId || undefined,
177
-      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
176
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
177
+      userId: this.fieldConfig.fields.userId || undefined,
178
       buildingId: this.fieldConfig.fields.buildingId || undefined,
178
       buildingId: this.fieldConfig.fields.buildingId || undefined,
179
       placeId: this.fieldConfig.fields.floorId || undefined,
179
       placeId: this.fieldConfig.fields.floorId || undefined,
180
       companyId: this.fieldConfig.fields.companyId || undefined,
180
       companyId: this.fieldConfig.fields.companyId || undefined,

+ 4 - 4
src/app/views/new-statistics/maintenance-statistics/category-source-statistics/category-source-statistics.component.ts

@@ -108,8 +108,8 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
108
       hosId: this.hosId || undefined,
108
       hosId: this.hosId || undefined,
109
       dutyId: this.dutyId || undefined,
109
       dutyId: this.dutyId || undefined,
110
       parentDutyId: this.parentDutyId || undefined,
110
       parentDutyId: this.parentDutyId || undefined,
111
-      groupId: this.fieldConfig.fields.groupId || undefined,
112
-      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
111
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
112
+      userId: this.fieldConfig.fields.userId || undefined,
113
       categoryId: this.fieldConfig.fields.categoryId || undefined,
113
       categoryId: this.fieldConfig.fields.categoryId || undefined,
114
       buildingId: this.fieldConfig.fields.buildingId || undefined,
114
       buildingId: this.fieldConfig.fields.buildingId || undefined,
115
       placeId: this.fieldConfig.fields.floorId || undefined,
115
       placeId: this.fieldConfig.fields.floorId || undefined,
@@ -171,8 +171,8 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
171
       hosId: this.hosId || undefined,
171
       hosId: this.hosId || undefined,
172
       dutyId: this.dutyId || undefined,
172
       dutyId: this.dutyId || undefined,
173
       parentDutyId: this.parentDutyId || undefined,
173
       parentDutyId: this.parentDutyId || undefined,
174
-      groupId: this.fieldConfig.fields.groupId || undefined,
175
-      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
174
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
175
+      userId: this.fieldConfig.fields.userId || undefined,
176
       categoryId: this.fieldConfig.fields.categoryId || undefined,
176
       categoryId: this.fieldConfig.fields.categoryId || undefined,
177
       buildingId: this.fieldConfig.fields.buildingId || undefined,
177
       buildingId: this.fieldConfig.fields.buildingId || undefined,
178
       placeId: this.fieldConfig.fields.floorId || undefined,
178
       placeId: this.fieldConfig.fields.floorId || undefined,

+ 4 - 4
src/app/views/new-statistics/maintenance-statistics/category-three-statistics/category-three-statistics.component.ts

@@ -121,8 +121,8 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
121
       parentDutyId: this.parentDutyId || undefined,
121
       parentDutyId: this.parentDutyId || undefined,
122
       categoryId: this.category2Id || this.category1Id || undefined,
122
       categoryId: this.category2Id || this.category1Id || undefined,
123
       hierarchy: this.category2Id ? 2 : (this.category1Id ? 1 : undefined),
123
       hierarchy: this.category2Id ? 2 : (this.category1Id ? 1 : undefined),
124
-      groupId: this.fieldConfig.fields.groupId || undefined,
125
-      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
124
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
125
+      userId: this.fieldConfig.fields.userId || undefined,
126
       buildingId: this.fieldConfig.fields.buildingId || undefined,
126
       buildingId: this.fieldConfig.fields.buildingId || undefined,
127
       placeId: this.fieldConfig.fields.floorId || undefined,
127
       placeId: this.fieldConfig.fields.floorId || undefined,
128
       companyId: this.fieldConfig.fields.companyId || undefined,
128
       companyId: this.fieldConfig.fields.companyId || undefined,
@@ -188,8 +188,8 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
188
       parentDutyId: this.parentDutyId || undefined,
188
       parentDutyId: this.parentDutyId || undefined,
189
       categoryId: this.category2Id || this.category1Id || undefined,
189
       categoryId: this.category2Id || this.category1Id || undefined,
190
       hierarchy: this.category2Id ? 2 : (this.category1Id ? 1 : undefined),
190
       hierarchy: this.category2Id ? 2 : (this.category1Id ? 1 : undefined),
191
-      groupId: this.fieldConfig.fields.groupId || undefined,
192
-      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
191
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
192
+      userId: this.fieldConfig.fields.userId || undefined,
193
       buildingId: this.fieldConfig.fields.buildingId || undefined,
193
       buildingId: this.fieldConfig.fields.buildingId || undefined,
194
       placeId: this.fieldConfig.fields.floorId || undefined,
194
       placeId: this.fieldConfig.fields.floorId || undefined,
195
       companyId: this.fieldConfig.fields.companyId || undefined,
195
       companyId: this.fieldConfig.fields.companyId || undefined,

+ 4 - 4
src/app/views/new-statistics/maintenance-statistics/category-two-statistics/category-two-statistics.component.ts

@@ -120,8 +120,8 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
120
       parentDutyId: this.parentDutyId || undefined,
120
       parentDutyId: this.parentDutyId || undefined,
121
       categoryId: this.category1Id || undefined,
121
       categoryId: this.category1Id || undefined,
122
       hierarchy: this.category1Id ? 1 : undefined,
122
       hierarchy: this.category1Id ? 1 : undefined,
123
-      groupId: this.fieldConfig.fields.groupId || undefined,
124
-      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
123
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
124
+      userId: this.fieldConfig.fields.userId || undefined,
125
       buildingId: this.fieldConfig.fields.buildingId || undefined,
125
       buildingId: this.fieldConfig.fields.buildingId || undefined,
126
       placeId: this.fieldConfig.fields.floorId || undefined,
126
       placeId: this.fieldConfig.fields.floorId || undefined,
127
       companyId: this.fieldConfig.fields.companyId || undefined,
127
       companyId: this.fieldConfig.fields.companyId || undefined,
@@ -187,8 +187,8 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
187
       parentDutyId: this.parentDutyId || undefined,
187
       parentDutyId: this.parentDutyId || undefined,
188
       categoryId: this.category1Id || undefined,
188
       categoryId: this.category1Id || undefined,
189
       hierarchy: this.category1Id ? 1 : undefined,
189
       hierarchy: this.category1Id ? 1 : undefined,
190
-      groupId: this.fieldConfig.fields.groupId || undefined,
191
-      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
190
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
191
+      userId: this.fieldConfig.fields.userId || undefined,
192
       buildingId: this.fieldConfig.fields.buildingId || undefined,
192
       buildingId: this.fieldConfig.fields.buildingId || undefined,
193
       placeId: this.fieldConfig.fields.floorId || undefined,
193
       placeId: this.fieldConfig.fields.floorId || undefined,
194
       companyId: this.fieldConfig.fields.companyId || undefined,
194
       companyId: this.fieldConfig.fields.companyId || undefined,

+ 1 - 1
src/app/views/new-statistics/maintenance-statistics/consumable-statistics/consumable-statistics.component.html

@@ -9,7 +9,7 @@
9
       <span class="label">报修科室</span>:
9
       <span class="label">报修科室</span>:
10
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
10
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
11
         <ng-container *ngFor="let option of repairDeptList">
11
         <ng-container *ngFor="let option of repairDeptList">
12
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
12
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
13
         </ng-container>
13
         </ng-container>
14
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
14
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
15
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
15
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...

+ 4 - 4
src/app/views/new-statistics/maintenance-statistics/consumable-statistics/consumable-statistics.component.ts

@@ -119,8 +119,8 @@ export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
119
       dutyId: this.dutyId || undefined,
119
       dutyId: this.dutyId || undefined,
120
       parentDutyId: this.parentDutyId || undefined,
120
       parentDutyId: this.parentDutyId || undefined,
121
       repairDeptId: this.repairDeptId || undefined,
121
       repairDeptId: this.repairDeptId || undefined,
122
-      groupId: this.fieldConfig.fields.groupId || undefined,
123
-      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
122
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
123
+      userId: this.fieldConfig.fields.userId || undefined,
124
       categoryId: this.fieldConfig.fields.categoryId || undefined,
124
       categoryId: this.fieldConfig.fields.categoryId || undefined,
125
       buildingId: this.fieldConfig.fields.buildingId || undefined,
125
       buildingId: this.fieldConfig.fields.buildingId || undefined,
126
       placeId: this.fieldConfig.fields.floorId || undefined,
126
       placeId: this.fieldConfig.fields.floorId || undefined,
@@ -184,8 +184,8 @@ export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
184
       dutyId: this.dutyId || undefined,
184
       dutyId: this.dutyId || undefined,
185
       parentDutyId: this.parentDutyId || undefined,
185
       parentDutyId: this.parentDutyId || undefined,
186
       repairDeptId: this.repairDeptId || undefined,
186
       repairDeptId: this.repairDeptId || undefined,
187
-      groupId: this.fieldConfig.fields.groupId || undefined,
188
-      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
187
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
188
+      userId: this.fieldConfig.fields.userId || undefined,
189
       categoryId: this.fieldConfig.fields.categoryId || undefined,
189
       categoryId: this.fieldConfig.fields.categoryId || undefined,
190
       buildingId: this.fieldConfig.fields.buildingId || undefined,
190
       buildingId: this.fieldConfig.fields.buildingId || undefined,
191
       placeId: this.fieldConfig.fields.floorId || undefined,
191
       placeId: this.fieldConfig.fields.floorId || undefined,

+ 4 - 4
src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/department-evaluate-statistics.component.ts

@@ -111,8 +111,8 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
111
       dutyId: this.dutyId || undefined,
111
       dutyId: this.dutyId || undefined,
112
       parentDutyId: this.parentDutyId || undefined,
112
       parentDutyId: this.parentDutyId || undefined,
113
       deptTypeId: this.deptTypeId || undefined,
113
       deptTypeId: this.deptTypeId || undefined,
114
-      groupId: this.fieldConfig.fields.groupId || undefined,
115
-      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
114
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
115
+      userId: this.fieldConfig.fields.userId || undefined,
116
       categoryId: this.fieldConfig.fields.categoryId || undefined,
116
       categoryId: this.fieldConfig.fields.categoryId || undefined,
117
       buildingId: this.fieldConfig.fields.buildingId || undefined,
117
       buildingId: this.fieldConfig.fields.buildingId || undefined,
118
       placeId: this.fieldConfig.fields.floorId || undefined,
118
       placeId: this.fieldConfig.fields.floorId || undefined,
@@ -175,8 +175,8 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
175
       dutyId: this.dutyId || undefined,
175
       dutyId: this.dutyId || undefined,
176
       parentDutyId: this.parentDutyId || undefined,
176
       parentDutyId: this.parentDutyId || undefined,
177
       deptTypeId: this.deptTypeId || undefined,
177
       deptTypeId: this.deptTypeId || undefined,
178
-      groupId: this.fieldConfig.fields.groupId || undefined,
179
-      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
178
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
179
+      userId: this.fieldConfig.fields.userId || undefined,
180
       categoryId: this.fieldConfig.fields.categoryId || undefined,
180
       categoryId: this.fieldConfig.fields.categoryId || undefined,
181
       buildingId: this.fieldConfig.fields.buildingId || undefined,
181
       buildingId: this.fieldConfig.fields.buildingId || undefined,
182
       placeId: this.fieldConfig.fields.floorId || undefined,
182
       placeId: this.fieldConfig.fields.floorId || undefined,

+ 4 - 4
src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-statistics.component.ts

@@ -111,8 +111,8 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
111
       dutyId: this.dutyId || undefined,
111
       dutyId: this.dutyId || undefined,
112
       parentDutyId: this.parentDutyId || undefined,
112
       parentDutyId: this.parentDutyId || undefined,
113
       deptTypeId: this.deptTypeId || undefined,
113
       deptTypeId: this.deptTypeId || undefined,
114
-      groupId: this.fieldConfig.fields.groupId || undefined,
115
-      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
114
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
115
+      userId: this.fieldConfig.fields.userId || undefined,
116
       categoryId: this.fieldConfig.fields.categoryId || undefined,
116
       categoryId: this.fieldConfig.fields.categoryId || undefined,
117
       buildingId: this.fieldConfig.fields.buildingId || undefined,
117
       buildingId: this.fieldConfig.fields.buildingId || undefined,
118
       placeId: this.fieldConfig.fields.floorId || undefined,
118
       placeId: this.fieldConfig.fields.floorId || undefined,
@@ -175,8 +175,8 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
175
       dutyId: this.dutyId || undefined,
175
       dutyId: this.dutyId || undefined,
176
       parentDutyId: this.parentDutyId || undefined,
176
       parentDutyId: this.parentDutyId || undefined,
177
       deptTypeId: this.deptTypeId || undefined,
177
       deptTypeId: this.deptTypeId || undefined,
178
-      groupId: this.fieldConfig.fields.groupId || undefined,
179
-      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
178
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
179
+      userId: this.fieldConfig.fields.userId || undefined,
180
       categoryId: this.fieldConfig.fields.categoryId || undefined,
180
       categoryId: this.fieldConfig.fields.categoryId || undefined,
181
       buildingId: this.fieldConfig.fields.buildingId || undefined,
181
       buildingId: this.fieldConfig.fields.buildingId || undefined,
182
       placeId: this.fieldConfig.fields.floorId || undefined,
182
       placeId: this.fieldConfig.fields.floorId || undefined,

+ 4 - 4
src/app/views/new-statistics/maintenance-statistics/department-source-statistics/department-source-statistics.component.ts

@@ -111,8 +111,8 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
111
       dutyId: this.dutyId || undefined,
111
       dutyId: this.dutyId || undefined,
112
       parentDutyId: this.parentDutyId || undefined,
112
       parentDutyId: this.parentDutyId || undefined,
113
       deptTypeId: this.deptTypeId || undefined,
113
       deptTypeId: this.deptTypeId || undefined,
114
-      groupId: this.fieldConfig.fields.groupId || undefined,
115
-      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
114
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
115
+      userId: this.fieldConfig.fields.userId || undefined,
116
       categoryId: this.fieldConfig.fields.categoryId || undefined,
116
       categoryId: this.fieldConfig.fields.categoryId || undefined,
117
       buildingId: this.fieldConfig.fields.buildingId || undefined,
117
       buildingId: this.fieldConfig.fields.buildingId || undefined,
118
       placeId: this.fieldConfig.fields.floorId || undefined,
118
       placeId: this.fieldConfig.fields.floorId || undefined,
@@ -175,8 +175,8 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
175
       dutyId: this.dutyId || undefined,
175
       dutyId: this.dutyId || undefined,
176
       parentDutyId: this.parentDutyId || undefined,
176
       parentDutyId: this.parentDutyId || undefined,
177
       deptTypeId: this.deptTypeId || undefined,
177
       deptTypeId: this.deptTypeId || undefined,
178
-      groupId: this.fieldConfig.fields.groupId || undefined,
179
-      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
178
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
179
+      userId: this.fieldConfig.fields.userId || undefined,
180
       categoryId: this.fieldConfig.fields.categoryId || undefined,
180
       categoryId: this.fieldConfig.fields.categoryId || undefined,
181
       buildingId: this.fieldConfig.fields.buildingId || undefined,
181
       buildingId: this.fieldConfig.fields.buildingId || undefined,
182
       placeId: this.fieldConfig.fields.floorId || undefined,
182
       placeId: this.fieldConfig.fields.floorId || undefined,

+ 1 - 1
src/app/views/new-statistics/maintenance-statistics/floor-statistics/floor-statistics.component.html

@@ -9,7 +9,7 @@
9
       <span class="label">楼栋</span>:
9
       <span class="label">楼栋</span>:
10
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeBuildingInp($event)" nzAllowClear nzPlaceHolder="请选择楼栋" [(ngModel)]="buildingId" (nzOpenChange)="openChangeBuilding($event)">
10
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeBuildingInp($event)" nzAllowClear nzPlaceHolder="请选择楼栋" [(ngModel)]="buildingId" (nzOpenChange)="openChangeBuilding($event)">
11
         <ng-container *ngFor="let option of buildingList">
11
         <ng-container *ngFor="let option of buildingList">
12
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.buildingName" [nzValue]="option.id"></nz-option>
12
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName + '-' + option.buildingName" [nzValue]="option.id"></nz-option>
13
         </ng-container>
13
         </ng-container>
14
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
14
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
15
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
15
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...

+ 1 - 1
src/app/views/new-statistics/maintenance-statistics/incident-statistics/incident-statistics.component.html

@@ -9,7 +9,7 @@
9
       <span class="label">报修科室</span>:
9
       <span class="label">报修科室</span>:
10
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
10
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
11
         <ng-container *ngFor="let option of repairDeptList">
11
         <ng-container *ngFor="let option of repairDeptList">
12
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
12
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
13
         </ng-container>
13
         </ng-container>
14
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
14
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
15
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
15
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...

+ 4 - 4
src/app/views/new-statistics/maintenance-statistics/incident-statistics/incident-statistics.component.ts

@@ -119,8 +119,8 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
119
       dutyId: this.dutyId || undefined,
119
       dutyId: this.dutyId || undefined,
120
       parentDutyId: this.parentDutyId || undefined,
120
       parentDutyId: this.parentDutyId || undefined,
121
       repairDeptId: this.repairDeptId || undefined,
121
       repairDeptId: this.repairDeptId || undefined,
122
-      groupId: this.fieldConfig.fields.groupId || undefined,
123
-      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
122
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
123
+      userId: this.fieldConfig.fields.userId || undefined,
124
       categoryId: this.fieldConfig.fields.categoryId || undefined,
124
       categoryId: this.fieldConfig.fields.categoryId || undefined,
125
       sourceId: this.fieldConfig.fields.sourceId || undefined,
125
       sourceId: this.fieldConfig.fields.sourceId || undefined,
126
       hierarchy: this.fieldConfig.fields.hierarchy || undefined,
126
       hierarchy: this.fieldConfig.fields.hierarchy || undefined,
@@ -183,8 +183,8 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
183
       dutyId: this.dutyId || undefined,
183
       dutyId: this.dutyId || undefined,
184
       parentDutyId: this.parentDutyId || undefined,
184
       parentDutyId: this.parentDutyId || undefined,
185
       repairDeptId: this.repairDeptId || undefined,
185
       repairDeptId: this.repairDeptId || undefined,
186
-      groupId: this.fieldConfig.fields.groupId || undefined,
187
-      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
186
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
187
+      userId: this.fieldConfig.fields.userId || undefined,
188
       categoryId: this.fieldConfig.fields.categoryId || undefined,
188
       categoryId: this.fieldConfig.fields.categoryId || undefined,
189
       sourceId: this.fieldConfig.fields.sourceId || undefined,
189
       sourceId: this.fieldConfig.fields.sourceId || undefined,
190
       hierarchy: this.fieldConfig.fields.hierarchy || undefined,
190
       hierarchy: this.fieldConfig.fields.hierarchy || undefined,

+ 1 - 1
src/app/views/new-statistics/maintenance-statistics/tripartite-company-statistics/tripartite-company-statistics.component.html

@@ -9,7 +9,7 @@
9
       <span class="label">报修科室</span>:
9
       <span class="label">报修科室</span>:
10
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
10
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
11
         <ng-container *ngFor="let option of repairDeptList">
11
         <ng-container *ngFor="let option of repairDeptList">
12
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
12
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
13
         </ng-container>
13
         </ng-container>
14
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
14
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
15
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
15
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...

+ 1 - 1
src/app/views/new-statistics/maintenance-statistics/work-hour-statistics/work-hour-statistics.component.html

@@ -9,7 +9,7 @@
9
       <span class="label">报修科室</span>:
9
       <span class="label">报修科室</span>:
10
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
10
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
11
         <ng-container *ngFor="let option of repairDeptList">
11
         <ng-container *ngFor="let option of repairDeptList">
12
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
12
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
13
         </ng-container>
13
         </ng-container>
14
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
14
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
15
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
15
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...

+ 4 - 4
src/app/views/new-statistics/maintenance-statistics/work-hour-statistics/work-hour-statistics.component.ts

@@ -119,8 +119,8 @@ export class WorkHourStatisticsComponent implements OnInit, AfterViewInit {
119
       dutyId: this.dutyId || undefined,
119
       dutyId: this.dutyId || undefined,
120
       parentDutyId: this.parentDutyId || undefined,
120
       parentDutyId: this.parentDutyId || undefined,
121
       repairDeptId: this.repairDeptId || undefined,
121
       repairDeptId: this.repairDeptId || undefined,
122
-      groupId: this.fieldConfig.fields.groupId || undefined,
123
-      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
122
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
123
+      userId: this.fieldConfig.fields.userId || undefined,
124
       categoryId: this.fieldConfig.fields.categoryId || undefined,
124
       categoryId: this.fieldConfig.fields.categoryId || undefined,
125
       buildingId: this.fieldConfig.fields.buildingId || undefined,
125
       buildingId: this.fieldConfig.fields.buildingId || undefined,
126
       placeId: this.fieldConfig.fields.floorId || undefined,
126
       placeId: this.fieldConfig.fields.floorId || undefined,
@@ -184,8 +184,8 @@ export class WorkHourStatisticsComponent implements OnInit, AfterViewInit {
184
       dutyId: this.dutyId || undefined,
184
       dutyId: this.dutyId || undefined,
185
       parentDutyId: this.parentDutyId || undefined,
185
       parentDutyId: this.parentDutyId || undefined,
186
       repairDeptId: this.repairDeptId || undefined,
186
       repairDeptId: this.repairDeptId || undefined,
187
-      groupId: this.fieldConfig.fields.groupId || undefined,
188
-      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
187
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
188
+      userId: this.fieldConfig.fields.userId || undefined,
189
       categoryId: this.fieldConfig.fields.categoryId || undefined,
189
       categoryId: this.fieldConfig.fields.categoryId || undefined,
190
       buildingId: this.fieldConfig.fields.buildingId || undefined,
190
       buildingId: this.fieldConfig.fields.buildingId || undefined,
191
       placeId: this.fieldConfig.fields.floorId || undefined,
191
       placeId: this.fieldConfig.fields.floorId || undefined,