From 3731523c6089acaafe9155fde72a32352a7cba4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Thu, 15 Sep 2022 13:38:17 +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):=E7=BB=86=E8=8A=82=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectAdmin/zjsj/carbon/centerTop.vue    |  5 +-
 .../projectAdmin/zjsj/carbon/leftTop.vue      |  2 +-
 src/views/projectAdmin/zjsj/govComp/Col2.vue  |  9 +++-
 src/views/projectAdmin/zjsj/govComp/Col3.vue  | 30 ++++++++---
 src/views/projectAdmin/zjsj/govComp/Col4.vue  | 53 ++++++++++++-------
 .../projectAdmin/zjsj/govComp/leftBottom.vue  | 30 ++++++-----
 .../projectAdmin/zjsj/govComp/leftMiddle.vue  | 12 +++--
 .../projectAdmin/zjsj/quality/leftBottom.vue  |  2 +-
 .../projectAdmin/zjsj/quality/leftMiddle.vue  |  2 +-
 .../projectAdmin/zjsj/sourse/rightTop.vue     |  2 +-
 10 files changed, 96 insertions(+), 51 deletions(-)

diff --git a/src/views/projectAdmin/zjsj/carbon/centerTop.vue b/src/views/projectAdmin/zjsj/carbon/centerTop.vue
index 98b68e12..5df4e088 100644
--- a/src/views/projectAdmin/zjsj/carbon/centerTop.vue
+++ b/src/views/projectAdmin/zjsj/carbon/centerTop.vue
@@ -2,7 +2,7 @@
   <Card title="实时数据">
     <div class="containerBox">
       <div class="dataBoardContent">
-        <el-popover style="margin-left:750px" placement="bottom" width="70" trigger="click">
+        <el-popover style="margin-left:800px" placement="bottom" width="70" trigger="click">
         <ul class="devList">
           <li
             v-for="(item, index) in devList"
@@ -288,8 +288,7 @@ export default {
     box-sizing: border-box;
     display: flex;
     flex-wrap: wrap;
-    /*justify-content:space-between;*/
-    padding: 20px;
+    padding: 15px 20px 20px 50px;
     .realTimeData_item {
       box-sizing: border-box;
       display: flex;
diff --git a/src/views/projectAdmin/zjsj/carbon/leftTop.vue b/src/views/projectAdmin/zjsj/carbon/leftTop.vue
index 858fb74e..bd1d6c91 100644
--- a/src/views/projectAdmin/zjsj/carbon/leftTop.vue
+++ b/src/views/projectAdmin/zjsj/carbon/leftTop.vue
@@ -49,7 +49,7 @@ export default {
     color: #c5c7cc;
     .num1 {
       position: absolute;
-      top: 55%;
+      top: 56%;
       left: 45%;
     }
     .text {
diff --git a/src/views/projectAdmin/zjsj/govComp/Col2.vue b/src/views/projectAdmin/zjsj/govComp/Col2.vue
index 63e890a0..66b1ad8d 100644
--- a/src/views/projectAdmin/zjsj/govComp/Col2.vue
+++ b/src/views/projectAdmin/zjsj/govComp/Col2.vue
@@ -131,7 +131,7 @@ export default {
   .mintit{
     display: inline-block;
     margin-bottom: 10px;
-    font-size: 16px;
+    font-size: 18px;
     color: #c4c7cc;
   }
   .contentBox {
@@ -147,6 +147,10 @@ export default {
     }  
   }
 }
+::v-deep .el-timeline {
+    margin: 5px !important;
+    font-size: 16px;
+}
 ::v-deep .el-timeline-item__tail {
   position: absolute;
   left: 4px;
@@ -163,4 +167,7 @@ export default {
  width: 3px;
  color: #19394d;
 }
+::v-deep .el-timeline-item__node{
+  box-shadow: 0px 0px 6px 2px #bddade;
+}
 </style>
diff --git a/src/views/projectAdmin/zjsj/govComp/Col3.vue b/src/views/projectAdmin/zjsj/govComp/Col3.vue
index 1b18c189..a608e72f 100644
--- a/src/views/projectAdmin/zjsj/govComp/Col3.vue
+++ b/src/views/projectAdmin/zjsj/govComp/Col3.vue
@@ -35,11 +35,21 @@
       </div>
       <div class="contentBtn">
         <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="110"></el-table-column>
-            <el-table-column prop="address" label="合格数" width="100"></el-table-column>
-            <el-table-column prop="rale" style="color:red" label="合格率">
+          <el-table :data="tableData" :show-header="false" style="width: 100%;font-size:16px;">
+            <el-table-column prop="date" label="建材类型" width="155"></el-table-column>
+            <el-table-column prop="name" label="检测报告数" width="110">
+              <template slot-scope="scope">
+                <span class="raleNum"
+	          >{{ scope.row.name }}</span>
+               </template>
+            </el-table-column>
+            <el-table-column prop="address" label="合格数" width="100">
+              <template slot-scope="scope">
+                <span class="raleNum"
+	          >{{ scope.row.address }}</span>
+               </template>
+            </el-table-column>
+            <el-table-column prop="rale" label="合格率">
                <template slot-scope="scope">
                 <span class="raleRow"
 	          >{{ scope.row.rale }}</span>
@@ -168,11 +178,11 @@ export default {
         .rowInfo2 {
           display: flex;
           margin-top: 3%;
-          height: 30px;
+          height: 35px;
           line-height: 30px;
           color: #c4c7cc;
           background-image: url(../assets/images/common/bg-intro.png);
-          background-size: 100%;
+          background-size: 120%;
           background-repeat: no-repeat;
           margin-bottom: 3%;
           span {
@@ -202,6 +212,7 @@ export default {
      margin-top: 3%;
      color: #5ec2c8;
      display: flex;
+     font-size: 16px;
      span{
       flex: 1;
       margin-left: 5%;
@@ -217,12 +228,15 @@ export default {
   .contentBtn {
     margin-top: 1%;
     color: white;
+    font-size: 16px;
   }
 }
+.raleNum{
+  color:#ebf1f6 !important;
+}
 .raleRow{
   color: #5ec2c8 !important;
   font-weight:bold;
-  
 }
 ::v-deep .el-table {
   color: #7f8691;
diff --git a/src/views/projectAdmin/zjsj/govComp/Col4.vue b/src/views/projectAdmin/zjsj/govComp/Col4.vue
index 1b7158a5..8c158406 100644
--- a/src/views/projectAdmin/zjsj/govComp/Col4.vue
+++ b/src/views/projectAdmin/zjsj/govComp/Col4.vue
@@ -4,7 +4,7 @@
       <div class="point"></div>
       <span class="mintit">混凝土浇筑统计</span>
       <div class="rowInfo">
-        <span class="point"></span>
+        <!-- <span class="point"></span> -->
         <span>混凝土浇筑重量</span>
         <span style="color:#5ec2c8;">58974㎡</span>
       </div>
@@ -17,29 +17,29 @@
         <el-timeline class="timeline">
         <el-timeline-item timestamp="2022-07-28" placement="top">
           <el-card>
-            <span>2022-07-28</span>
-            <p>C栋2号楼十一层</p>
+            <p>2022-07-28</p>
+            <span>C栋2号楼十一层</span>
             <span class="area">43㎡</span>
           </el-card>
         </el-timeline-item>
         <el-timeline-item timestamp="2022-07-28" placement="top">
           <el-card>
-            <span>2022-07-28</span>
-            <p>C栋2号楼十一层</p>
+            <p>2022-07-28</p>
+            <span>C栋2号楼十一层</span>
             <span class="area">56㎡</span>
           </el-card>
         </el-timeline-item>
         <el-timeline-item timestamp="2022-07-28" placement="top">
           <el-card>
-            <span>2022-07-28</span>
-            <p>C栋2号楼十一层</p>
+            <p>2022-07-28</p>
+            <span>C栋2号楼十一层</span>
             <span class="area">39㎡</span>
           </el-card>
         </el-timeline-item>
         <el-timeline-item timestamp="2022-07-28" placement="top">
           <el-card>
-            <span>2022-07-28</span>
-            <p>C栋2号楼十一层</p>
+            <p>2022-07-28</p>
+            <span>C栋2号楼十一层</span>
             <span class="area">78㎡</span>
           </el-card>
         </el-timeline-item>
@@ -129,30 +129,30 @@ export default {
   box-sizing: border-box;
   width: 100%;
   height: 100%;
-  color: #c4c7cc;
+  color: #fff;
   padding-top: 2%;
   margin-left: 1%;
   .point {
     width: 8px;
     height: 8px;
     border-radius: 50%;
-    background-color: #c4c7cc;
+    background-color: #fff;
     display: inline-block;
     margin-right: 2%;
     margin-top: 15px;
   }
   .mintit {
     font-size: 16px;
-    color: #c4c7cc;
+    color: #fff;
   }
   .rowInfo {
     margin-top: 3%;
     margin-bottom: 3%;
-    height: 40px;
-    line-height: 40px;
-    color: #c4c7cc;
+    height: 45px;
+    line-height: 45px;
+    color: #fff;
     background-image: url(../assets/images/common/bg-intro.png);
-    background-size: 100%;
+    background-size: 120%;
     background-repeat: no-repeat;
     span {
       margin-left: 5%;
@@ -175,25 +175,37 @@ export default {
     overflow: auto;
   }
 }
+::v-deep .el-timeline{
+  margin: 5px;
+}
+::v-deep .el-timeline-item__timestamp.is-top {
+    font-size: 20px;
+    color: #fff;
+}
 ::v-deep .el-timeline-item__node--normal{
   left: 0px;
 }
 ::v-deep .el-card {
   border: none;
+  font-size: 16px;
   background-color: #182337;
   background-image: url(../assets/images/common/bg_time.png);
   background-size: 100%;
   background-repeat: no-repeat;
-  span {
+  p {
     color: #63cfd4;
     font-weight: bold;
+    margin-bottom: 20px;
   }
-  p {
-    margin-top: 20px;
+  span {
+    // margin-top: 20px;
     color: white;
   }
+  
   .area {
     float: right;
+    color: #63cfd4;
+    font-weight: bold;
     margin-bottom: 20px;
   }
 }
@@ -203,4 +215,7 @@ export default {
   height: 100%;
   border-left: 3px solid #274b5f;
 }
+::v-deep .el-timeline-item__node{
+  box-shadow: 0px 0px 6px 2px #bddade;
+}
 </style>
diff --git a/src/views/projectAdmin/zjsj/govComp/leftBottom.vue b/src/views/projectAdmin/zjsj/govComp/leftBottom.vue
index c16a18bc..6d20e0b4 100644
--- a/src/views/projectAdmin/zjsj/govComp/leftBottom.vue
+++ b/src/views/projectAdmin/zjsj/govComp/leftBottom.vue
@@ -10,7 +10,7 @@
           <p class="text">在场总人数</p>
         </div>
         <div class="img">
-          <img src="../assets/images/common/icon_hs.png" />
+          <img style=" margin-left: 25px;" src="../assets/images/common/icon_hs.png" />
         </div>
         <div class="contentBtn">
           <p class="num2">5649</p>
@@ -47,21 +47,19 @@ export default {
   box-sizing: border-box;
   padding-top: 20px;
   .contentTop {
+    box-sizing: border-box;
+    // padding-top: 0px 50px 0px;
+    margin: 0px 30px;
     display: flex;
-    justify-content: center;
+    justify-content: space-between;
     align-items: center;
-    .img,
-    .contentBtn {
-      margin-right: 20px;
-    }
-    .img {
-      img {
+   img {
         height: 56px;
         width: 56px;
       }
-    }
     .contentBtn {
-      margin-right: 40px;
+      margin-right: 20px;
+      font-size: 22px;
       .num1 {
         color: #53a9b1;
       }
@@ -73,10 +71,11 @@ export default {
     .text {
       margin-top: 5px;
       color: #a4a9b0;
-      font-size: 12px;
+      font-size: 16px;
     }
   }
   .contentbut {
+    margin-top:5px;
     display: flex;
     justify-content: center;
     align-items: center;
@@ -86,17 +85,22 @@ export default {
     .tc {
       width: 88px;
       text-align: center;
-      margin-right: 55px;
-      font-size: 12px;
+      margin-right: 50px;
+      font-size: 14px;
+      margin-top: 10px;
       .number {
         height: 40px;
         line-height: 40px;
+        font-size: 19px;
         background-image: url(../assets/images/common/num_bg.png);
         background-repeat: no-repeat;
         background-size: 100%;
         color: #6ee4f0;
       }
     }
+    .lw{
+      margin-left: 40px;
+    }
   }
 }
 </style>
diff --git a/src/views/projectAdmin/zjsj/govComp/leftMiddle.vue b/src/views/projectAdmin/zjsj/govComp/leftMiddle.vue
index e1e26d1b..a24ff53f 100644
--- a/src/views/projectAdmin/zjsj/govComp/leftMiddle.vue
+++ b/src/views/projectAdmin/zjsj/govComp/leftMiddle.vue
@@ -112,6 +112,7 @@ export default {
             data: [3.5, 4.5, 3.5, 4],
             type: "line",
             smooth: true,
+            showSymbol: false,
             color: "#f56c35",
             areaStyle: {
               color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
@@ -124,6 +125,7 @@ export default {
             data: [0.5, 2.5, 1.8, 1.2],
             type: "line",
             smooth: true,
+            showSymbol: false,
             color: "#51a4ac",
             areaStyle: {
               color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
@@ -155,6 +157,7 @@ export default {
       height: 40px;
       text-align: center;
       line-height: 40px;
+      font-size: 19px;
       background-image: url(../assets/images/common/num_bg.png);
       background-repeat: no-repeat;
       background-size: 100%;
@@ -164,7 +167,7 @@ export default {
 
   .contentTop {
     display: flex;
-    justify-content: space-between;
+    justify-content: center;
     align-items: center;
     .img,
     .contentBtn {
@@ -172,15 +175,16 @@ export default {
       font-size: 14px;
       .num1 {
         color: #53a9b1;
-        font-size: 20px;
+        font-size: 22px;
       }
       .num2 {
         color: #f56c35;
-        font-size: 20px;
+        font-size: 22px;
       }
       .text {
         margin-top: 5px;
         color: #a4a9b0;
+        font-size: 16px;
       }
     }
     .img {
@@ -194,6 +198,7 @@ export default {
     color: #69717d;
     margin-top: 3%;
     span {
+      font-size: 16px;
       margin-left: 10px;
       display: inline-block;
       height: 25px;
@@ -222,6 +227,7 @@ export default {
     .point2{
       background-color: #65d3d8;
     }
+    
     .num{
       color: #d2a104;
       margin: 5px 0px 30px 25px;
diff --git a/src/views/projectAdmin/zjsj/quality/leftBottom.vue b/src/views/projectAdmin/zjsj/quality/leftBottom.vue
index ff8597db..ddabd7c6 100644
--- a/src/views/projectAdmin/zjsj/quality/leftBottom.vue
+++ b/src/views/projectAdmin/zjsj/quality/leftBottom.vue
@@ -1,5 +1,5 @@
 <template>
-  <Card title="大面积混凝土展示">
+  <Card title="大体积混凝土监测">
     <div class="checkChart" ref="checkChart"></div>
     <div class="btn">远程验收</div>
   </Card>
diff --git a/src/views/projectAdmin/zjsj/quality/leftMiddle.vue b/src/views/projectAdmin/zjsj/quality/leftMiddle.vue
index 4958ffb7..8ac9a289 100644
--- a/src/views/projectAdmin/zjsj/quality/leftMiddle.vue
+++ b/src/views/projectAdmin/zjsj/quality/leftMiddle.vue
@@ -1,5 +1,5 @@
 <template>
-  <Card title="标养室培养">
+  <Card title="标养室管理">
     <div class="environment">
       <div class="item">
         <div class="icon  temperature"></div>
diff --git a/src/views/projectAdmin/zjsj/sourse/rightTop.vue b/src/views/projectAdmin/zjsj/sourse/rightTop.vue
index 570806b0..9d120b64 100644
--- a/src/views/projectAdmin/zjsj/sourse/rightTop.vue
+++ b/src/views/projectAdmin/zjsj/sourse/rightTop.vue
@@ -93,7 +93,7 @@ export default {
   height: 100%;
   .containbox {
     margin-top: 1%;
-    margin-left: 65%;
+    margin-left: 75%;
     color:#dfe6ea;
     height: 20px;
     line-height: 25px;