From 5940c505111d2089f7ec9a565b25114739a7688a Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Tue, 28 Dec 2021 08:39:30 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E4=BF=AE=E6=94=B9=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gis-labeling/gis-labeling.component.html      |   4 +++-
 .../gis-labeling/gis-labeling.component.scss      |   7 +++++--
 .../key-unit-management.component.scss            |   4 ++--
 .../entry-plan/entry-plan.component.scss          |   4 ++--
 .../maintain-up/maintain-up.component.scss        |   4 ++--
 .../pass-plan/pass-plan.component.scss            |   4 ++--
 .../reinforce-plan/reinforce-plan.component.scss  |   4 ++--
 .../combined-query/combined-query.component.scss  |   4 ++--
 .../plan-analysis-by-synthesis.component.scss     |   4 ++--
 src/assets/images/close2.png                      | Bin 0 -> 416 bytes
 10 files changed, 22 insertions(+), 17 deletions(-)
 create mode 100644 src/assets/images/close2.png

diff --git a/src/app/gis-management/gis-labeling/gis-labeling.component.html b/src/app/gis-management/gis-labeling/gis-labeling.component.html
index 4b0676e..6561c06 100644
--- a/src/app/gis-management/gis-labeling/gis-labeling.component.html
+++ b/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">
diff --git a/src/app/gis-management/gis-labeling/gis-labeling.component.scss b/src/app/gis-management/gis-labeling/gis-labeling.component.scss
index 85d5aef..2aa995a 100644
--- a/src/app/gis-management/gis-labeling/gis-labeling.component.scss
+++ b/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;
diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.scss b/src/app/key-unit/key-unit-management/key-unit-management.component.scss
index b76bbeb..91d8f73 100644
--- a/src/app/key-unit/key-unit-management/key-unit-management.component.scss
+++ b/src/app/key-unit/key-unit-management/key-unit-management.component.scss
@@ -153,7 +153,7 @@
 //完整度
 .integrityDiv{
     width: 180px;
-    height: 30px;
+    height: 18px;
     background-color: #e2e7ee;
     margin: 0 auto;
     position: relative;
@@ -164,7 +164,7 @@
         transform: translate(-50%, -50%);
         color: black;
         font-weight: 800;
-        font-size: 15px;
+        font-size: 13px;
         cursor: default;
     }
     .integrityColorDiv{
diff --git a/src/app/plan-management/entry-plan/entry-plan.component.scss b/src/app/plan-management/entry-plan/entry-plan.component.scss
index 40b974d..aea0e9b 100644
--- a/src/app/plan-management/entry-plan/entry-plan.component.scss
+++ b/src/app/plan-management/entry-plan/entry-plan.component.scss
@@ -146,7 +146,7 @@
 //完整度
 .integrityDiv{
     width: 70%;
-    height: 30px;
+    height: 18px;
     background-color: #e2e7ee;
     // background-image: linear-gradient(to right, #e2e7ee ,#FF4500, #FF8C00,#32cd32);
     margin: 0 auto;
@@ -158,7 +158,7 @@
         transform: translate(-50%, -50%);
         color: black;
         font-weight: 800;
-        font-size: 15px;
+        font-size: 13px;
         cursor: default;
     }
     .integrityColorDiv{
diff --git a/src/app/plan-management/maintain-up/maintain-up.component.scss b/src/app/plan-management/maintain-up/maintain-up.component.scss
index 1a477bb..c4056d4 100644
--- a/src/app/plan-management/maintain-up/maintain-up.component.scss
+++ b/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{
diff --git a/src/app/plan-management/pass-plan/pass-plan.component.scss b/src/app/plan-management/pass-plan/pass-plan.component.scss
index 6b834aa..4303146 100644
--- a/src/app/plan-management/pass-plan/pass-plan.component.scss
+++ b/src/app/plan-management/pass-plan/pass-plan.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{
diff --git a/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss b/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss
index cf61363..2929046 100644
--- a/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss
+++ b/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss
@@ -113,7 +113,7 @@
 //完整度
 .integrityDiv{
     width: 180px;
-    height: 30px;
+    height: 18px;
     background-color: #e2e7ee;
     // background-image: linear-gradient(to right, #e2e7ee ,#FF4500, #FF8C00,#32cd32);
     margin: 0 auto;
@@ -125,7 +125,7 @@
         transform: translate(-50%, -50%);
         color: black;
         font-weight: 800;
-        font-size: 15px;
+        font-size: 13px;
         cursor: default;
     }
     .integrityColorDiv{
diff --git a/src/app/statistic-analysis/combined-query/combined-query.component.scss b/src/app/statistic-analysis/combined-query/combined-query.component.scss
index 70a7520..abf6442 100644
--- a/src/app/statistic-analysis/combined-query/combined-query.component.scss
+++ b/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{
diff --git a/src/app/statistic-analysis/plan-analysis-by-synthesis/plan-analysis-by-synthesis.component.scss b/src/app/statistic-analysis/plan-analysis-by-synthesis/plan-analysis-by-synthesis.component.scss
index 6b834aa..4303146 100644
--- a/src/app/statistic-analysis/plan-analysis-by-synthesis/plan-analysis-by-synthesis.component.scss
+++ b/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{
diff --git a/src/assets/images/close2.png b/src/assets/images/close2.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7e44942396b005c7ee11b5d26b21e807e1dd2f5
GIT binary patch
literal 416
zcmV;R0bl-!P)<h;3K|Lk000e1NJLTq000yK000yS1^@s7`i?D|00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0X0cPK~y+Tom4Sy
z!!Qu@-mydX41o<>20C=;kpF)xA|nda;gqH!K={O?PWGMP1=zOjdk9J?Hwp;)VqMoO
zmGeA5#*`Lagckv=%|PdI9AA9_Xp2~Pep0N?Uu;)`A_OEri5EF2I6M(}p+Rp0wl&MP
zbAd-rfvE4&1`(Q@0mg3J_x*=P0N<-bYH+Bn7!(^7QIkVEoXwIS8A+oFMWeunc&^V&
zgfVLmFP9rtNtK=5C=;HltQ@+rpjU2ITnR8n0Yburk4qtVWif5KfMm8Q5}v1ps%bjK
z7x?#QRF=>zvT4AeqXvti<uR$zAde^3nHKkPd{K0I5nxux$$wauh;QWatSGN+P4<6;
zv1FV55O|<D`_vJ{<bRo7p_+K->Wo)r2Aqhgd5_z#=$gI_u`GAF7Uju(A>4QX0000<
KMNUMnLSTXfh^adO

literal 0
HcmV?d00001