seimin 1 周之前
父节点
当前提交
2a6198ee52

+ 2 - 2
src/app/services/date.service.ts

@@ -54,11 +54,11 @@ export class DateService {
54 54
 
55 55
     //获得本周的开始日期(本周一 00:00:00)
56 56
     function getThisWeekStartDate() {
57
-      return startOfWeek(new Date());
57
+      return startOfWeek(new Date(), { weekStartsOn: 1 });
58 58
     }
59 59
     //获得本周的结束日期(本周日 23:59:59)
60 60
     function getThisWeekEndDate() {
61
-      return endOfWeek(new Date());
61
+      return endOfWeek(new Date(), { weekStartsOn: 1 });
62 62
     }
63 63
 
64 64
     //获得本月开始时间(本月1号 00:00:00)

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

@@ -181,7 +181,7 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
181 181
       categoryId: this.fieldConfig.fields.categoryId || undefined,
182 182
       hierarchy: this.fieldConfig.fields.hierarchy || undefined,
183 183
       groupId: this.fieldConfig.fields.groupId || undefined,
184
-      repairDeptiD: this.fieldConfig.fields.repairDeptiD || undefined,
184
+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
185 185
     };
186 186
     if (this.sortCurrentKey && this.sortCurrentValue) {
187 187
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
@@ -216,7 +216,7 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
216 216
 		this.sortCurrent = {};
217 217
     this.dateRange = []
218 218
     this.userId = undefined;
219
-    this.fieldConfig.fields = {buildingId: undefined, floorId: undefined, categoryId: undefined, groupId: undefined, repairDeptiD: undefined};
219
+    this.fieldConfig.fields = {buildingId: undefined, floorId: undefined, categoryId: undefined, groupId: undefined, repairDeptId: undefined};
220 220
     this.customChangeDateComponent.resetByDate();
221 221
     this.search();
222 222
   }
@@ -262,7 +262,7 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
262 262
 
263 263
   // 详细搜索
264 264
   fieldConfig:any = {
265
-    fields: {buildingId: undefined, floorId: undefined, categoryId: undefined, groupId: undefined, repairDeptiD: undefined},
265
+    fields: {buildingId: undefined, floorId: undefined, categoryId: undefined, groupId: undefined, repairDeptId: undefined},
266 266
     config: {buildingAndFloor: true, category123: true, group: true, repairDept: true},
267 267
   }
268 268
   showSearchMore:boolean = false;