Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

src/app/gis-management/gis-labeling/gis-labeling.component.html

@@ -8,7 +8,9 @@
     <div style="height: 36px; overflow: hidden; position: relative;">
       <input type="text" [(ngModel)]="searchText" placeholder="请输入地址">
       <!--  *ngIf="searchText || allCompany.length"  -->
-      <label class="clearIcon" title="清除" (click)='clear()'>×</label>
+      <label class="clearIcon" title="清除" (click)='clear()'>
+        <img src="../../../assets/images/close2.png" alt="">
+      </label>
       <button (click)='search()'><mat-icon>search</mat-icon></button>
     </div>
     <div class="searchDataDiv">

src/app/gis-management/gis-labeling/gis-labeling.component.scss

@@ -76,8 +76,8 @@
     right: 40px;
     width: 36px;
     height: 36px;
+    line-height: 46px;
     display: inline-block;
-    font-size: 24px;
     text-align: center;
   }
   .searchDataDiv {
@@ -227,10 +227,11 @@
 
 //右上角div
 .rightTopBox{
-  width: 480px;
+  width: 590px;
   position: absolute;
   right: 30px;
   top: 15px;
+
   .topbox{
     width: 100%;
     height: 40px;
@@ -239,6 +240,8 @@
     background: #FFFFFF;
     border-radius: 6px;
     align-items: center;
+    box-sizing: border-box;
+    padding: 0 12px;
     .titleItem{
       cursor: pointer;
       display: flex;

src/app/key-unit/key-unit-management/key-unit-management.component.scss

@@ -172,7 +172,7 @@
 //完整度
 .integrityDiv{
     width: 180px;
-    height: 30px;
+    height: 18px;
     background-color: #e2e7ee;
     margin: 0 auto;
     position: relative;
@@ -183,7 +183,7 @@
         transform: translate(-50%, -50%);
         color: black;
         font-weight: 800;
-        font-size: 15px;
+        font-size: 13px;
         cursor: default;
     }
     .integrityColorDiv{

src/app/plan-management/entry-plan/entry-plan.component.scss

@@ -165,7 +165,7 @@
 //完整度
 .integrityDiv{
     width: 70%;
-    height: 30px;
+    height: 18px;
     background-color: #e2e7ee;
     // background-image: linear-gradient(to right, #e2e7ee ,#FF4500, #FF8C00,#32cd32);
     margin: 0 auto;
@@ -177,7 +177,7 @@
         transform: translate(-50%, -50%);
         color: black;
         font-weight: 800;
-        font-size: 15px;
+        font-size: 13px;
         cursor: default;
     }
     .integrityColorDiv{

src/app/plan-management/maintain-up/maintain-up.component.scss

@@ -154,7 +154,7 @@
 //完整度
 .integrityDiv{
     width: 180px;
-    height: 30px;
+    height: 18px;
     background-color: #e2e7ee;
     // background-image: linear-gradient(to right, #e2e7ee ,#FF4500, #FF8C00,#32cd32);
     margin: 0 auto;
@@ -166,7 +166,7 @@
         transform: translate(-50%, -50%);
         color: black;
         font-weight: 800;
-        font-size: 15px;
+        font-size: 13px;
         cursor: default;
     }
     .integrityColorDiv{

src/app/plan-management/pass-plan/pass-plan.component.scss

@@ -137,7 +137,7 @@
 //完整度
 .integrityDiv{
     width: 180px;
-    height: 30px;
+    height: 18px;
     background-color: #e2e7ee;
     // background-image: linear-gradient(to right, #e2e7ee ,#FF4500, #FF8C00,#32cd32);
     margin: 0 auto;
@@ -149,7 +149,7 @@
         transform: translate(-50%, -50%);
         color: black;
         font-weight: 800;
-        font-size: 15px;
+        font-size: 13px;
         cursor: default;
     }
     .integrityColorDiv{

src/app/plan-management/reinforce-plan/reinforce-plan.component.scss

@@ -132,7 +132,7 @@
 //完整度
 .integrityDiv{
     width: 180px;
-    height: 30px;
+    height: 18px;
     background-color: #e2e7ee;
     // background-image: linear-gradient(to right, #e2e7ee ,#FF4500, #FF8C00,#32cd32);
     margin: 0 auto;
@@ -144,7 +144,7 @@
         transform: translate(-50%, -50%);
         color: black;
         font-weight: 800;
-        font-size: 15px;
+        font-size: 13px;
         cursor: default;
     }
     .integrityColorDiv{

src/app/statistic-analysis/combined-query/combined-query.component.scss

@@ -150,7 +150,7 @@
 //完整度
 .integrityDiv{
     width: 180px;
-    height: 30px;
+    height: 18px;
     background-color: #e2e7ee;
     // background-image: linear-gradient(to right, #e2e7ee ,#FF4500, #FF8C00,#32cd32);
     margin: 0 auto;
@@ -162,7 +162,7 @@
         transform: translate(-50%, -50%);
         color: black;
         font-weight: 800;
-        font-size: 15px;
+        font-size: 13px;
         cursor: default;
     }
     .integrityColorDiv{

src/app/statistic-analysis/plan-analysis-by-synthesis/plan-analysis-by-synthesis.component.scss

@@ -118,7 +118,7 @@
 //完整度
 .integrityDiv{
     width: 180px;
-    height: 30px;
+    height: 18px;
     background-color: #e2e7ee;
     // background-image: linear-gradient(to right, #e2e7ee ,#FF4500, #FF8C00,#32cd32);
     margin: 0 auto;
@@ -130,7 +130,7 @@
         transform: translate(-50%, -50%);
         color: black;
         font-weight: 800;
-        font-size: 15px;
+        font-size: 13px;
         cursor: default;
     }
     .integrityColorDiv{