Merge branch 'dev-jack' into shenzhen-dev

src/views/projectAdmin/dataBoard/projectHuScreen/digitalSite/centerTop.vue

@@ -2,7 +2,7 @@
   <Card :title="title">
     <div class="pane"></div>
     <div class="tabs">
-      <div class="tab" v-for="tab in tabs" :key="tab">{{ tab }}</div>
+      <div class="tab" :class="{ checked: tab === '全部' }" v-for="tab in tabs" :key="tab">{{ tab }}</div>
     </div>
   </Card>
 </template>
@@ -28,7 +28,10 @@ export default {
 
 <style lang="less" scoped>
 .pane {
+  margin: 0 20px;
   height: 80%;
+  background: url('~@/views/projectAdmin/dataBoard/projectHuScreen/assets/images/digitalSite/bg-all.png') no-repeat;
+  background-size: 100%;
 }
 .tabs {
   height: 20%;
@@ -38,12 +41,15 @@ export default {
   align-items: flex-end;
   .tab {
     margin-bottom: 20px;
-    width: 100px;
+    width: 114px;
-    height: 42px;
+    height: 38px;
-    line-height: 42px;
+    line-height: 38px;
     text-align: center;
-    border: 1px solid pink;
+    background: url('~@/views/projectAdmin/dataBoard/projectHuScreen/assets/images/digitalSite/bg-btn.png') no-repeat;
     cursor: pointer;
+    &.checked {
+      background-image: url('~@/views/projectAdmin/dataBoard/projectHuScreen/assets/images/digitalSite/bg-btn-checked.png');
+    }
   }
 }
 </style>

src/views/projectAdmin/dataBoard/projectHuScreen/safeManage/leftBottom.vue

@@ -1,39 +1,37 @@
 <template>
-  <div class="check-hidden">
+  <Card :title="title">
-    <div class="title">{{ title }}</div>
+    <div class="rates">
-    <div class="content">
+      <div class="rate">
-      <div class="rates">
+        <div class="chart">
-        <div class="rate">
+          <JRingChart :title="{ text: '89%', y: '40%' }" :data="[{ value: 89 }, { value: 11 }]" :color="['#557DEE', '#182B53']" />
-          <div class="chart">
-            <JRingChart :title="{ text: '89%', y: '40%' }" :data="[{ value: 89 }, { value: 11 }]" :color="['#557DEE', '#182B53']" />
-          </div>
-          <div class="label">项目整改率</div>
         </div>
-        <div class="rate">
+        <div class="label">项目整改率</div>
-          <div class="chart">
+      </div>
-            <JRingChart :title="{ text: '89%', y: '40%' }" :data="[{ value: 89 }, { value: 11 }]" :color="['#5BE2F6', '#193F54']" />
+      <div class="rate">
-          </div>
+        <div class="chart">
-          <div class="label">项目及时整改率</div>
+          <JRingChart :title="{ text: '89%', y: '40%' }" :data="[{ value: 89 }, { value: 11 }]" :color="['#5BE2F6', '#193F54']" />
         </div>
-        <div class="rate">
+        <div class="label">项目及时整改率</div>
-          <div class="chart">
+      </div>
-            <JRingChart :title="{ text: '89%', y: '40%' }" :data="[{ value: 89 }, { value: 11 }]" :color="['#FF6C7F', '#39273D']" />
+      <div class="rate">
-          </div>
+        <div class="chart">
-          <div class="label">项目及时复查率</div>
+          <JRingChart :title="{ text: '89%', y: '40%' }" :data="[{ value: 89 }, { value: 11 }]" :color="['#FF6C7F', '#39273D']" />
         </div>
+        <div class="label">项目及时复查率</div>
       </div>
     </div>
-  </div>
+  </Card>
 </template>
 
 <script>
+import Card from '../components/Card.vue'
 import JRingChart from '../jChart/pie/JRingChart.vue'
 export default {
-  components: { JRingChart },
+  components: { Card, JRingChart },
   props: {
     title: {
       type: String,
-      default: 'default title'
+      default: ''
     }
   },
   data() {
@@ -43,32 +41,17 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.check-hidden {
+.rates {
-  width: 100%;
   height: 100%;
-  border: 1px solid #0081c3;
+  display: flex;
-  .title {
+  .rate {
-    padding-left: 6px;
+    width: 33%;
-    height: 30px;
+    height: 70%;
-    line-height: 30px;
+    .chart {
-    font-size: 18px;
-    color: #6ee4f0;
-  }
-  .content {
-    height: calc(100% - 30px);
-    .rates {
       height: 100%;
-      display: flex;
+    }
-      .rate {
+    .label {
-        width: 33%;
+      text-align: center;
-        height: 70%;
-        .chart {
-          height: 100%;
-        }
-        .label {
-          text-align: center;
-        }
-      }
     }
   }
 }