seimin 1 year ago
parent
commit
5ab4fb4f9b

+ 1 - 1
proxy.conf.json

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

+ 1 - 1
src/app/share/businessData-detail-modal/businessData-detail-modal.component.ts

@@ -191,7 +191,7 @@ export class BusinessDataDetailModalComponent implements OnInit {
191
       idx: this.pageIndex - 1,
191
       idx: this.pageIndex - 1,
192
       sum: this.pageSize,
192
       sum: this.pageSize,
193
       canceled: this.dataInfo.canceled ? true : undefined,
193
       canceled: this.dataInfo.canceled ? true : undefined,
194
-      priority: this.dataInfo.priority ? 0 : 1,
194
+      priority: this.dataInfo.priority ? 0 : undefined,
195
     }
195
     }
196
     switch(this.dataInfo.type){
196
     switch(this.dataInfo.type){
197
       case 'total':
197
       case 'total':

+ 2 - 2
src/app/views/building-inspection-rate-statistics/building-inspection-rate-statistics.component.ts

@@ -136,7 +136,7 @@ export class BuildingInspectionRateStatisticsComponent implements OnInit {
136
       startTime: this.searchDto.dateRange[0] ? format(startOfDay(this.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined,
136
       startTime: this.searchDto.dateRange[0] ? format(startOfDay(this.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined,
137
       endTime: this.searchDto.dateRange[1] ? format(endOfDay(this.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined,
137
       endTime: this.searchDto.dateRange[1] ? format(endOfDay(this.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined,
138
       canceled: this.checkOptionsOne[0].checked ? true : undefined,
138
       canceled: this.checkOptionsOne[0].checked ? true : undefined,
139
-      priority: this.checkOptionsOne[1].checked ? 0 : 1,
139
+      priority: this.checkOptionsOne[1].checked ? 0 : undefined,
140
       deptIds: this.searchDto.department.length ? this.searchDto.department.toString() : undefined,
140
       deptIds: this.searchDto.department.length ? this.searchDto.department.toString() : undefined,
141
       buildingId: this.searchDto.building|| undefined,
141
       buildingId: this.searchDto.building|| undefined,
142
     };
142
     };
@@ -162,7 +162,7 @@ export class BuildingInspectionRateStatisticsComponent implements OnInit {
162
       startTime: this.searchDto.dateRange[0] ? format(startOfDay(this.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined,
162
       startTime: this.searchDto.dateRange[0] ? format(startOfDay(this.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined,
163
       endTime: this.searchDto.dateRange[1] ? format(endOfDay(this.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined,
163
       endTime: this.searchDto.dateRange[1] ? format(endOfDay(this.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined,
164
       canceled: this.checkOptionsOne[0].checked ? true : undefined,
164
       canceled: this.checkOptionsOne[0].checked ? true : undefined,
165
-      priority: this.checkOptionsOne[1].checked ? 0 : 1,
165
+      priority: this.checkOptionsOne[1].checked ? 0 : undefined,
166
       deptIds: this.searchDto.department.length ? this.searchDto.department.toString() : undefined,
166
       deptIds: this.searchDto.department.length ? this.searchDto.department.toString() : undefined,
167
       buildingId: this.searchDto.building|| undefined,
167
       buildingId: this.searchDto.building|| undefined,
168
     };
168
     };

+ 2 - 2
src/app/views/dept-inspection-rate-statistics/dept-inspection-rate-statistics.component.ts

@@ -136,7 +136,7 @@ export class DeptInspectionRateStatisticsComponent implements OnInit {
136
       startTime: this.searchDto.dateRange[0] ? format(startOfDay(this.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined,
136
       startTime: this.searchDto.dateRange[0] ? format(startOfDay(this.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined,
137
       endTime: this.searchDto.dateRange[1] ? format(endOfDay(this.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined,
137
       endTime: this.searchDto.dateRange[1] ? format(endOfDay(this.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined,
138
       canceled: this.checkOptionsOne[0].checked ? true : undefined,
138
       canceled: this.checkOptionsOne[0].checked ? true : undefined,
139
-      priority: this.checkOptionsOne[1].checked ? 0 : 1,
139
+      priority: this.checkOptionsOne[1].checked ? 0 : undefined,
140
       deptIds: this.searchDto.department.length ? this.searchDto.department.toString() : undefined,
140
       deptIds: this.searchDto.department.length ? this.searchDto.department.toString() : undefined,
141
       buildingId: this.searchDto.building|| undefined,
141
       buildingId: this.searchDto.building|| undefined,
142
     };
142
     };
@@ -176,7 +176,7 @@ export class DeptInspectionRateStatisticsComponent implements OnInit {
176
       startTime: this.searchDto.dateRange[0] ? format(startOfDay(this.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined,
176
       startTime: this.searchDto.dateRange[0] ? format(startOfDay(this.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined,
177
       endTime: this.searchDto.dateRange[1] ? format(endOfDay(this.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined,
177
       endTime: this.searchDto.dateRange[1] ? format(endOfDay(this.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined,
178
       canceled: this.checkOptionsOne[0].checked ? true : undefined,
178
       canceled: this.checkOptionsOne[0].checked ? true : undefined,
179
-      priority: this.checkOptionsOne[1].checked ? 0 : 1,
179
+      priority: this.checkOptionsOne[1].checked ? 0 : undefined,
180
       deptIds: this.searchDto.department.length ? this.searchDto.department.toString() : undefined,
180
       deptIds: this.searchDto.department.length ? this.searchDto.department.toString() : undefined,
181
       buildingId: this.searchDto.building|| undefined,
181
       buildingId: this.searchDto.building|| undefined,
182
     };
182
     };