瀏覽代碼

chrome39兼容性调整

seimin 3 年之前
父節點
當前提交
3787feaa65

+ 2 - 1
src/app/share/generate-floor/generate-floor.component.less

@@ -50,7 +50,8 @@
50 50
         width: 100%;
51 51
         display: flex;
52 52
         align-items: center;
53
-        justify-content: space-evenly;
53
+        justify-content: space-between;
54
+        padding: 0 2%;
54 55
         .w120 {
55 56
           width: 120px;
56 57
         }

File diff suppressed because it is too large
+ 2413 - 673
src/app/views/fuwutai/fuwutai.component.html


+ 12 - 13
src/app/views/fuwutai/fuwutai.component.less

@@ -15,7 +15,6 @@
15 15
   display: flex;
16 16
   flex-direction: column;
17 17
   width: 100%;
18
-  height: 100%;
19 18
   position: relative;
20 19
   background: #f9fafb;
21 20
   .transport-1_round_solid,
@@ -285,17 +284,19 @@
285 284
   /* 工单总数 */
286 285
   .lists_box {
287 286
     width: 100%;
288
-    height: 100%;
287
+    height: calc(100vh - 241px + 185px);
289 288
     margin-top: 24px;
290 289
     padding-bottom: 20px;
291 290
     min-height: 539px;
291
+    display: flex;
292
+    &.top185 {
293
+      height: calc(100vh - 241px);
294
+    }
292 295
   }
293 296
 
294 297
   .lists {
295 298
     width: 32.6%;
296
-    height: 100%;
297 299
     border: 1px rgb(225, 229, 232) solid;
298
-    float: left;
299 300
     margin-left: 1%;
300 301
     border-radius: 2px;
301 302
     overflow: hidden;
@@ -375,12 +376,12 @@
375 376
   /* 搜索 */
376 377
   .lists .searchBox {
377 378
     width: 100%;
378
-    padding: 10px 0;
379
+    padding: 10px 2%;
379 380
     background: #f9fafb;
380 381
     position: relative;
381 382
     z-index: 9;
382 383
     display: flex;
383
-    justify-content: space-evenly;
384
+    justify-content: space-between;
384 385
     align-items: center;
385 386
 
386 387
     .search {
@@ -432,15 +433,13 @@
432 433
   .lists .cots_body {
433 434
     box-sizing: border-box;
434 435
     width: 100%;
435
-    height: calc(100% - 94px);
436
+    height: calc(100vh - 355px + 185px);
437
+    min-height: 425px;
436 438
     background-color: white;
437 439
     border-top: 1px rgb(225, 229, 232) solid;
438
-    // overflow: hidden;
439
-    // overflow-y: scroll;
440
-    // position: absolute;
441
-    // padding-right: 4%;
442
-    // top: 94px;
443
-    // padding-top: 94px;
440
+    &.top185 {
441
+      height: calc(100vh - 355px);
442
+    }
444 443
   }
445 444
 
446 445
   /* loading */

+ 1 - 0
src/app/views/hushijiandan/hushijiandan.component.less

@@ -38,6 +38,7 @@
38 38
     bottom: 0;
39 39
     left: 0;
40 40
     right: 0;
41
+    height: 100%;
41 42
   }
42 43
   .modal {
43 44
     // 相对于 background 定位, 位置暂时设置为 0,0,0,0 在指令中将其位置水平垂直居中在页面中间

+ 7 - 4
src/app/views/task-type-management/task-type-management.component.less

@@ -3,9 +3,9 @@
3 3
   width: 100%;
4 4
   height: 100%;
5 5
 }
6
-.remandTypeId ::ng-deep{
7
-  .ant-select-selection{
8
-    border: 1px solid red!important;
6
+.remandTypeId ::ng-deep {
7
+  .ant-select-selection {
8
+    border: 1px solid red !important;
9 9
   }
10 10
 }
11 11
 .turnoff {
@@ -573,7 +573,10 @@
573 573
             display: flex;
574 574
             flex-wrap: wrap;
575 575
             align-items: center;
576
-            justify-content: space-evenly;
576
+            padding: 0 4px;
577
+            .top_L_item {
578
+              margin-left: 4px;
579
+            }
577 580
 
578 581
             .label {
579 582
               font-size: 14px;