浏览代码

参数修改

seimin 1 月之前
父节点
当前提交
45aac34a2e

+ 1 - 1
proxy.conf.json

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

+ 5 - 6
src/app/views/new-statistics/components/search-more/search-more.component.ts

@@ -143,7 +143,7 @@ export class SearchMoreComponent implements OnInit {
143
       idx: 0,
143
       idx: 0,
144
       sum: 20,
144
       sum: 20,
145
       group2: {
145
       group2: {
146
-        hospitals: this.getHosId,
146
+        statisticalHosId: this.getHosId,
147
         groupName: keyword,
147
         groupName: keyword,
148
         type: 3,
148
         type: 3,
149
       },
149
       },
@@ -222,8 +222,7 @@ export class SearchMoreComponent implements OnInit {
222
       category: {
222
       category: {
223
         category: keyword,
223
         category: keyword,
224
         selectType: 'mutlQuery',
224
         selectType: 'mutlQuery',
225
-        dutyIds: this.queryType == 3 ? this.dutyId : undefined,
226
-        parentDutyId: this.queryType == 3 ? this.parentDutyId : undefined,
225
+        statisticalHosId: this.getHosId,
227
         hierarchy: 1,
226
         hierarchy: 1,
228
       },
227
       },
229
     };
228
     };
@@ -354,7 +353,7 @@ export class SearchMoreComponent implements OnInit {
354
       building: {
353
       building: {
355
         simpleQuery: true,
354
         simpleQuery: true,
356
         buildingName: keyword,
355
         buildingName: keyword,
357
-        cascadeHosId:this.getHosId,
356
+        statisticalHosId:this.getHosId,
358
       },
357
       },
359
     };
358
     };
360
     this.isLoading = true;
359
     this.isLoading = true;
@@ -430,7 +429,7 @@ export class SearchMoreComponent implements OnInit {
430
       company: {
429
       company: {
431
         busiType: { key: "company_busi_type", value: "2" },
430
         busiType: { key: "company_busi_type", value: "2" },
432
         name: keyword,
431
         name: keyword,
433
-        hosId: this.getHosId,
432
+        statisticalHosId: this.getHosId,
434
       },
433
       },
435
     };
434
     };
436
     this.isLoading = true;
435
     this.isLoading = true;
@@ -461,7 +460,7 @@ export class SearchMoreComponent implements OnInit {
461
       idx: 0,
460
       idx: 0,
462
       sum: 20,
461
       sum: 20,
463
       department: {
462
       department: {
464
-        cascadeHosId: this.getHosId,
463
+        statisticalHosId: this.getHosId,
465
         dept: keyword,
464
         dept: keyword,
466
         searchType: 1,
465
         searchType: 1,
467
       },
466
       },

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

@@ -265,8 +265,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
265
       category: {
265
       category: {
266
         category: keyword,
266
         category: keyword,
267
         selectType: 'mutlQuery',
267
         selectType: 'mutlQuery',
268
-        dutyIds: this.queryType == 3 ? this.dutyId : undefined,
269
-        parentDutyId: this.queryType == 3 ? this.parentDutyId : undefined,
268
+        statisticalHosId: this.getHosId,
270
         hierarchy: 1,
269
         hierarchy: 1,
271
       },
270
       },
272
     };
271
     };

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

@@ -255,8 +255,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
255
       category: {
255
       category: {
256
         category: keyword,
256
         category: keyword,
257
         selectType: 'mutlQuery',
257
         selectType: 'mutlQuery',
258
-        dutyIds: this.queryType == 3 ? this.dutyId : undefined,
259
-        parentDutyId: this.queryType == 3 ? this.parentDutyId : undefined,
258
+        statisticalHosId: this.getHosId,
260
         hierarchy: 1,
259
         hierarchy: 1,
261
       },
260
       },
262
     };
261
     };

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

@@ -249,7 +249,7 @@ export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
249
   getRepairDeptList(keyword?) {
249
   getRepairDeptList(keyword?) {
250
     let data = {
250
     let data = {
251
       department: {
251
       department: {
252
-        cascadeHosId: this.getHosId,
252
+        statisticalHosId: this.getHosId,
253
         dept: keyword,
253
         dept: keyword,
254
         searchType: 1,
254
         searchType: 1,
255
       },
255
       },

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

@@ -241,7 +241,7 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
241
       building: {
241
       building: {
242
         simpleQuery: true,
242
         simpleQuery: true,
243
         buildingName: keyword,
243
         buildingName: keyword,
244
-        cascadeHosId:this.getHosId,
244
+        statisticalHosId:this.getHosId,
245
       },
245
       },
246
       idx: 0,
246
       idx: 0,
247
       sum: 20,
247
       sum: 20,

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

@@ -247,7 +247,7 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
247
   getRepairDeptList(keyword?) {
247
   getRepairDeptList(keyword?) {
248
     let data = {
248
     let data = {
249
       department: {
249
       department: {
250
-        cascadeHosId: this.getHosId,
250
+        statisticalHosId: this.getHosId,
251
         dept: keyword,
251
         dept: keyword,
252
         searchType: 1,
252
         searchType: 1,
253
       },
253
       },

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

@@ -243,7 +243,7 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
243
   getRepairDeptList(keyword?) {
243
   getRepairDeptList(keyword?) {
244
     let data = {
244
     let data = {
245
       department: {
245
       department: {
246
-        cascadeHosId: this.getHosId,
246
+        statisticalHosId: this.getHosId,
247
         dept: keyword,
247
         dept: keyword,
248
         searchType: 1,
248
         searchType: 1,
249
       },
249
       },

+ 1 - 1
src/app/views/new-statistics/maintenance-statistics/user-statistics/user-statistics.component.ts

@@ -243,7 +243,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
243
   getGroupList(keyword?) {
243
   getGroupList(keyword?) {
244
     let data = {
244
     let data = {
245
       group2: {
245
       group2: {
246
-        hospitals: this.getHosId,
246
+        statisticalHosId: this.getHosId,
247
         groupName: keyword,
247
         groupName: keyword,
248
         type: 3,
248
         type: 3,
249
       },
249
       },

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

@@ -249,7 +249,7 @@ export class WorkHourStatisticsComponent implements OnInit, AfterViewInit {
249
   getRepairDeptList(keyword?) {
249
   getRepairDeptList(keyword?) {
250
     let data = {
250
     let data = {
251
       department: {
251
       department: {
252
-        cascadeHosId: this.getHosId,
252
+        statisticalHosId: this.getHosId,
253
         dept: keyword,
253
         dept: keyword,
254
         searchType: 1,
254
         searchType: 1,
255
       },
255
       },