Browse Source

IE11的BUG

seimin 1 year ago
parent
commit
afbc37292c

+ 4 - 0
src/app/share/hs-prompt-modal/hs-prompt-modal.component.less

@@ -52,6 +52,10 @@
52
       justify-content: space-around;
52
       justify-content: space-around;
53
       align-items: center;
53
       align-items: center;
54
 
54
 
55
+      .tips{
56
+        width: 100%;
57
+      }
58
+
55
       &.content-search {
59
       &.content-search {
56
         padding: 0;
60
         padding: 0;
57
         min-height: 147px;
61
         min-height: 147px;

+ 1 - 1
src/app/views/hushijiandan/hushijiandan.component.html

@@ -960,7 +960,7 @@
960
                                   <div class="modalBody_left_box">
960
                                   <div class="modalBody_left_box">
961
                                     <div
961
                                     <div
962
                                       style="
962
                                       style="
963
-                                        flex: 1;
963
+                                        flex:1 1 auto;
964
                                         display: flex;
964
                                         display: flex;
965
                                         flex-direction: column;
965
                                         flex-direction: column;
966
                                         justify-content: center;
966
                                         justify-content: center;

+ 5 - 4
src/app/views/hushijiandan/hushijiandan.component.ts

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