|
@@ -32,6 +32,7 @@ import {
|
32
|
32
|
getHours,
|
33
|
33
|
startOfDay,
|
34
|
34
|
endOfDay,
|
|
35
|
+ parse,
|
35
|
36
|
} from "date-fns";
|
36
|
37
|
import { SourceId } from "src/app/type/types";
|
37
|
38
|
import cloneDeep from 'lodash-es/cloneDeep'
|
|
@@ -2546,7 +2547,7 @@ export class HushijiandanComponent implements OnInit {
|
2546
|
2547
|
//陪检
|
2547
|
2548
|
let obj = this.filterLinkCheckLis.find((item) => {
|
2548
|
2549
|
return (
|
2549
|
|
- new Date(item.yyTime).getTime() - new Date().getTime() >
|
|
2550
|
+ parse(item.yyTime, 'yyyy-MM-dd HH:mm:ss', new Date()).getTime() - new Date().getTime() >
|
2550
|
2551
|
this.leadTime * 60 * 1000
|
2551
|
2552
|
);
|
2552
|
2553
|
});
|
|
@@ -2568,7 +2569,7 @@ export class HushijiandanComponent implements OnInit {
|
2568
|
2569
|
//当前时间要大于生效时间
|
2569
|
2570
|
let isYyInspect = this.filterLinkCheckLis.every((item) => {
|
2570
|
2571
|
return (
|
2571
|
|
- new Date(item.yyTime).getTime() - new Date().getTime() >
|
|
2572
|
+ parse(item.yyTime, 'yyyy-MM-dd HH:mm:ss', new Date()).getTime() - new Date().getTime() >
|
2572
|
2573
|
this.leadTime * 60 * 1000
|
2573
|
2574
|
);
|
2574
|
2575
|
});
|
|
@@ -2576,7 +2577,7 @@ export class HushijiandanComponent implements OnInit {
|
2576
|
2577
|
if (isYyInspect) {
|
2577
|
2578
|
//筛选离当前时间最近的
|
2578
|
2579
|
let timeList = this.filterLinkCheckLis
|
2579
|
|
- .map((item) => new Date(item.yyTime).getTime())
|
|
2580
|
+ .map((item) => parse(item.yyTime, 'yyyy-MM-dd HH:mm:ss', new Date()).getTime())
|
2580
|
2581
|
.sort();
|
2581
|
2582
|
this.yyTime = new Date(timeList[0] - this.leadTime * 60 * 1000); //回显预约时间,需要减去生效时间
|
2582
|
2583
|
this.yyDate = new Date(timeList[0] - this.leadTime * 60 * 1000); //回显预约日期,需要减去生效时间
|
|
@@ -2639,7 +2640,7 @@ export class HushijiandanComponent implements OnInit {
|
2639
|
2640
|
//当前时间要大于生效时间
|
2640
|
2641
|
this.isYyInspect = this.filterLinkCheckLis.every((item) => {
|
2641
|
2642
|
return (
|
2642
|
|
- new Date(item.yyTime).getTime() - new Date().getTime() >
|
|
2643
|
+ parse(item.yyTime, 'yyyy-MM-dd HH:mm:ss', new Date()).getTime() - new Date().getTime() >
|
2643
|
2644
|
this.leadTime * 60 * 1000
|
2644
|
2645
|
);
|
2645
|
2646
|
});
|