Merge branch 'dev-xiaole' into shenzhen-dev

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

@@ -6,21 +6,22 @@
     </div>
     <div class="counts">
       <div class="count">
-        <div class="icon"></div>
+        <!-- <div class="icon"></div> -->
+         <img src="@/assets/images/projectImg/dig_one.png" />
         <div class="info">
           <p class="num">PM2.5</p>
           <p class="label">21μg/m3</p>
         </div>
       </div>
       <div class="count">
-        <div class="icon"></div>
+        <img src="@/assets/images/projectImg/dig_two.png" />
         <div class="info">
           <p class="num">PM2.5</p>
           <p class="label">21μg/m3</p>
         </div>
       </div>
       <div class="count">
-        <div class="icon"></div>
+        <img src="@/assets/images/projectImg/dig_three.png" />
         <div class="info">
           <p class="num">噪声</p>
           <p class="label">58dB</p>
@@ -61,19 +62,17 @@ export default {
   .count {
     display: flex;
     align-items: center;
-    .icon {
+    img{
+      width:40px;
+      height:40px;
       margin-right: 10px;
       margin-bottom: 10px;
-      width: 40px;
-      height: 40px;
-      border-radius: 5px;
-      border: 1px solid #2e9586;
     }
     .info {
       color: #fff;
+      margin-bottom: 5px;
       .num {
-        margin-bottom: 6px;
-        font-size: 1px;
+        font-size: 12px;
       }
       .label {
         font-size: 14px;

src/views/projectAdmin/dataBoard/projectHuScreen/jChart/pie/JProblemChart.vue

@@ -4,89 +4,100 @@
 </template>
 
 <script>
-import echarts from 'echarts4'
+import echarts from "echarts4";
 export default {
   props: {
     title: {
       type: Object,
       default: () => ({
-        text: '',
-        subTitle: '',
-        x: '48%',
-        y: '36%'
+        text: "",
+        subTitle: "",
+        x: "48%",
+        y: "36%"
       })
     },
     data: {
       type: Array,
-      default: () => [{ value: 1, name: '' }]
+      default: () => [{ value: 1, name: "" }]
     },
     color: {
       type: Array,
-      default: () => ['#3cabfd', '#57ec72', '#f294c6', '#f43a8d', '#6ee4f0']
+      default: () => ["#3cabfd", "#57ec72", "#f294c6", "#f43a8d", "#6ee4f0"]
     }
   },
   data() {
-    return {}
+    return {};
   },
   mounted() {
-    this.initMyChart()
+    this.initMyChart();
   },
   methods: {
     initMyChart() {
-      const myChart = echarts.init(this.$refs.myChart)
+      const myChart = echarts.init(this.$refs.myChart);
       const option = {
         title: {
-          x: this.title.x || '29%',
-          y: this.title.y || '43%',
+          x: this.title.x || "29%",
+          y: this.title.y || "43%",
           show: true,
           text: this.title.text,
           subtext: this.title.subTitle,
-          textAlign: 'center',
+          textAlign: "center",
           textStyle: {
             fontSize: 20,
-            fontWeight: 'normal',
-            color: '#fff'
+            fontWeight: "normal",
+            color: "#fff"
           },
           subtextStyle: {
             fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff'
+            fontWeight: "normal",
+            color: "#fff"
           }
         },
         tooltip: {
-          trigger: 'item'
+          trigger: "item"
         },
         legend: {
-          type: 'scroll',
-          orient: 'vertical',
+          type: "scroll",
+          orient: "vertical",
           right: 50,
-          top: 'center',
+          top: "center",
           itemWidth: 10, // 设置宽度
           itemHeight: 10, // 设置高度
           selectedMode: true,
-          icon: 'circle',
+          icon: "circle",
           textStyle: {
-            color: '#ffffff',
+            color: "#ffffff",
             fontSize: 14
           }
         },
         color: this.color,
         series: [
           {
-            type: 'pie',
-            radius: ['50%', '65%'],
-            center: ['30%', '50%'],
+            type: "pie",
+            radius: ["30%", "25%"],
+            center: ["30%", "50%"],
+            labelLine: {
+              show: false
+            },
+            // x:'-20%',
+            color: ["#07162b", "#244e92", "#07162b", "#244e92"],
+            data: [{ value: 25 }, { value: 25 }, { value: 25 }, { value: 25 }]
+          },
+          {
+            type: "pie",
+            radius: ["50%", "65%"],
+            center: ["30%", "50%"],
             avoidLabelOverlap: true,
             label: {
               show: false,
-              position: 'center'
+              position: "center"
             },
             emphasis: {
               label: {
                 show: false,
-                fontSize: '20',
-                color: '#fff',
-                fontWeight: 'bold'
+                fontSize: "20",
+                color: "#fff",
+                fontWeight: "bold"
               },
               scaleSize: 12
             },
@@ -96,12 +107,12 @@ export default {
             data: this.data
           }
         ]
-      }
+      };
 
-      myChart.setOption(option)
+      myChart.setOption(option);
     }
   }
-}
+};
 </script>
 
 <style lang="less" scoped>

src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/leftCenter.vue

@@ -4,7 +4,7 @@
   <div class="titleTxt">{{ title }}</div>
   <div class="personCount">
         <div class="countItem">
-          <img src="@/assets/images/dataBoard/numImg_purple.png" />
+          <img src="@/assets/images/projectImg/labor_shi.png" />
           <div class="info">
             <div class="num1">
               {{ '62,590' }}
@@ -16,7 +16,7 @@
           </div>
         </div>
         <div class="countItem">
-          <img src="@/assets/images/dataBoard/numImg_orange.png" />
+          <img src="@/assets/images/projectImg/labor_te.png" />
           <div class="info">
             <div class="num2">
               {{ 62590 }}
@@ -27,7 +27,7 @@
           </div>
         </div>
         <div class="countItem">
-          <img src="@/assets/images/dataBoard/numImg_orange.png" />
+          <img src="@/assets/images/projectImg/labor_men.png" />
           <div class="info">
             <div class="num3">
               {{ '89%'}}
@@ -38,7 +38,7 @@
           </div>
         </div>
         <div class="countItem">
-          <img src="@/assets/images/dataBoard/numImg_orange.png" />
+          <img src="@/assets/images/projectImg/num_purple.png" />
           <div class="info">
             <div class="num4">
               {{ 62590}}
@@ -97,24 +97,27 @@ export default {
         margin-top: 20px;
         img {
           margin-right: 8px;
+          width:50px;
+          height:50px;
         }
         .info{
           display: inline-block;
-          line-height: 28px;
+          line-height: 50px;
             .num1{
                 color:#7851f6;
             }
             .num2{
-                color:#6ee4f0;
+                color:#fe6c7f;
             }
             .num3{
-                color:#3d83f3;
+                color:#44d7b6;
             }
             .num4{
               color: #7852f7;
             }
             .label{
                 font-size: 12px;
+                line-height: 10px;
             }
             .label1{
                 width:68px;

src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/leftTop.vue

@@ -4,7 +4,7 @@
     <div class="titleTxt">{{ title }}</div>
     <div class="personCount">
       <div class="countItem">
-        <img src="@/assets/images/dataBoard/numImg_purple.png" />
+        <img src="@/assets/images/projectImg/labor_green.png" />
         <div class="info">
           <div class="num1">{{ 62590 }}</div>
           <!-- 实名制人数 -->
@@ -12,7 +12,7 @@
         </div>
       </div>
       <div class="countItem">
-        <img src="@/assets/images/dataBoard/numImg_orange.png" />
+        <img src="@/assets/images/projectImg/labor_yellow.png" />
         <div class="info">
           <div class="num2">{{ 62590 }}</div>
           <!-- 在场人数 -->
@@ -72,6 +72,8 @@ export default {
       display: flex;
       img {
         margin-right: 8px;
+        width:50px;
+        height:50px;
       }
       .info {
         margin-top: 5px;

src/views/projectAdmin/dataBoard/projectHuScreen/projectHuli/generalView.vue

@@ -5,7 +5,7 @@
     <div class="content">
       <div class="personCount">
         <div class="countItem">
-          <img src="@/assets/images/dataBoard/numImg_purple.png" />
+          <img src="@/assets/images/projectImg/num_purple.png" />
           <div class="info">
             <div class="num1">
               {{ 363 }}
@@ -17,7 +17,7 @@
           </div>
         </div>
         <div class="countItem">
-          <img src="@/assets/images/dataBoard/numImg_orange.png" />
+          <img src="@/assets/images/projectImg/num_skyblue.png" />
           <div class="info">
             <div class="num2">
               {{ 70 }}
@@ -29,7 +29,7 @@
           </div>
         </div>
         <div class="countItem">
-          <img src="@/assets/images/dataBoard/numImg_orange.png" />
+          <img src="@/assets/images/projectImg/num_blue.png" />
           <div class="info">
             <div class="num3">
               {{ 12 }}
@@ -135,6 +135,8 @@ export default {
         display: flex;
         img {
           margin-right: 8px;
+          width:50px;
+          height:50px;
         }
         .info{
             margin-top: 5px;
@@ -180,9 +182,19 @@ export default {
           width: 86px;
           height: 86px;
           margin-right: 15px;
-          background: url(~@/assets/images/dataBoard/fc857081d1aded7077e783a698bd1d6.png);
+          background: url(~@/assets/images/projectImg/num_jia.png);
+          background-size: 100%;
           &:nth-child(2) {
-            background: url(~@/assets/images/dataBoard/9f4e0bd5a0baebf3e96d512b208527b.png);
+            background: url(~@/assets/images/projectImg/num_yi.png);
+            background-size: 100%;
+          }
+          &:nth-child(3) {
+            background: url(~@/assets/images/projectImg/num_bing.png);
+            background-size: 100%;
+          }
+          &:nth-child(4) {
+            background: url(~@/assets/images/projectImg/num_ding.png);
+            background-size: 100%;
           }
           .person-info {
             transform: translate(15px);