From d6b32f7211aa80e9f288d5f366703d5df9b4cbed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Tue, 6 Sep 2022 13:56:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA=E5=9B=9B=E5=B1=80=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F=E9=A1=B5=E9=9D=A2=E7=BB=86=E8=8A=82=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/jChart/pie/JRingChart.vue          |  2 --
 src/views/projectAdmin/zjsj/govComp/Col3.vue  | 24 +++++++++++++------
 .../projectAdmin/zjsj/quality/leftTop.vue     |  2 +-
 .../projectAdmin/zjsj/security/leftTop.vue    |  2 +-
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/views/projectAdmin/common/jChart/pie/JRingChart.vue b/src/views/projectAdmin/common/jChart/pie/JRingChart.vue
index 85404b0b..d15887e3 100644
--- a/src/views/projectAdmin/common/jChart/pie/JRingChart.vue
+++ b/src/views/projectAdmin/common/jChart/pie/JRingChart.vue
@@ -40,7 +40,6 @@ export default {
         }
       },
       deep: true,
-      immediate: true
     },
     title: {
       handler(newVal, oldVal) {
@@ -49,7 +48,6 @@ export default {
         }
       },
       deep: true,
-      immediate: true
     }
   },
   methods: {
diff --git a/src/views/projectAdmin/zjsj/govComp/Col3.vue b/src/views/projectAdmin/zjsj/govComp/Col3.vue
index fabf9049..a3bab911 100644
--- a/src/views/projectAdmin/zjsj/govComp/Col3.vue
+++ b/src/views/projectAdmin/zjsj/govComp/Col3.vue
@@ -37,8 +37,8 @@
         <template>
           <el-table :data="tableData" :show-header="false" style="width: 100%">
             <el-table-column prop="date" label="建材类型" width="150"></el-table-column>
-            <el-table-column prop="name" label="检测报告数" width="120"></el-table-column>
-            <el-table-column prop="address" label="合格数"></el-table-column>
+            <el-table-column prop="name" label="检测报告数" width="110"></el-table-column>
+            <el-table-column prop="address" label="合格数" width="100"></el-table-column>
             <el-table-column prop="rale" style="color:red" label="合格率">
                <template slot-scope="scope">
                 <span class="raleRow"
@@ -142,7 +142,10 @@ export default {
   color: white;
   margin-top: 2%;
   margin-left: 1%;
+  width: 100%;
+  height: 100%;
   .topBox {
+    height: 16%;
     .point {
       width: 8px;
       height: 8px;
@@ -158,7 +161,7 @@ export default {
     .top {
       display: flex;
       margin-top: 4%;
-      height: 30%;
+      height:100%;
       .left {
         width: 70%;
         .rowInfo,
@@ -182,25 +185,32 @@ export default {
         }
       }
       .right {
-        width: 25%;
+        width: 29%;
         background-image: url(../assets/images/common/bgc_bluechart.png);
         background-size: 100%;
         .row {
           font-size: 12px;
           color: #c4c7cc;
-          margin-left: 32%;
-          margin-top: 38%;
+          margin-left: 35%;
+          margin-top: 39%;
         }
       }
     }
   }
   .titleRow{
-     margin-top: 5%;
+     margin-top: 3%;
      color: #5ec2c8;
      display: flex;
      span{
       flex: 1;
       margin-left: 5%;
+      // text-align: center;
+      &:nth-child(2) {
+        margin-left: 8%;
+      }
+      &:nth-child(3) {
+        margin-left: 9%;
+      }
      }
   }
   .contentBtn {
diff --git a/src/views/projectAdmin/zjsj/quality/leftTop.vue b/src/views/projectAdmin/zjsj/quality/leftTop.vue
index 155ca85c..48b951ae 100644
--- a/src/views/projectAdmin/zjsj/quality/leftTop.vue
+++ b/src/views/projectAdmin/zjsj/quality/leftTop.vue
@@ -37,7 +37,7 @@
             :title="{ text: '质量整改', subTitle: '987条件' }"
             :color="['#6EE4F0', '#E7622A']"
             :data="[{ value: 2314 }, { value: 987 }]"
-            :radius="['55%', '80%']"
+            :radius="['60%', '85%']"
           />
         </div>
         <div class="legend">
diff --git a/src/views/projectAdmin/zjsj/security/leftTop.vue b/src/views/projectAdmin/zjsj/security/leftTop.vue
index 782e4af3..51ebe782 100644
--- a/src/views/projectAdmin/zjsj/security/leftTop.vue
+++ b/src/views/projectAdmin/zjsj/security/leftTop.vue
@@ -37,7 +37,7 @@
             :title="{ text: '质量整改', subTitle: '987条件', fontSize: 16 }"
             :color="['#6EE4F0', '#E7622A']"
             :data="[{ value: 2314 }, { value: 987 }]"
-            :radius="['55%', '80%']"
+            :radius="['60%', '85%']"
           />
         </div>
         <div class="legend">