Merge branch 'dev-yjl' into 'shenzhen-dev'

合并冲突解决

See merge request !68

src/views/projectAdmin/fourEngin/command/leftThree/index.vue

@@ -40,21 +40,21 @@ export default {
     this.getData();
   },
   methods: {
-    // getData() {
-    //   listProgressOfTheTask({
-    //     projectSn: this.$store.state.projectSn,
-    //     isNoStart: false,
-    //   }).then((res) => {
-    //     // state 0未开始, 1进行中, 2已完成
-    //     res.result.forEach((item) => {
-    //       if (item.state == 2) {
-    //         item.state = true;
-    //       }
-    //     });
-    //     console.log("进度条的返回值", res);
-    //     this.list = res.result;
-    //   });
-    // },
+    getData() {
+      // listProgressOfTheTask({
+      //   projectSn: this.$store.state.projectSn,
+      //   isNoStart: false,
+      // }).then((res) => {
+      //   // state 0未开始, 1进行中, 2已完成
+      //   res.result.forEach((item) => {
+      //     if (item.state == 2) {
+      //       item.state = true;
+      //     }
+      //   });
+      //   console.log("进度条的返回值", res);
+      //   this.list = res.result;
+      // });
+    },
   },
 };
 </script>

src/views/projectAdmin/fourEngin/command/leftTwo.vue

@@ -6,14 +6,14 @@
           <img src="../assets/images/common/num_skyblue.png" />
         </div>
         <div class="contentBtn">
-          <p class="num1">假数据1</p>
-          <p class="text">222</p>
+          <p class="num1">{{statisticsCount.workercount.lwAndGlPersonTotal}}</p>
+          <p class="text">在场总人数</p>
         </div>
         <div class="img">
           <img style=" margin-left: 25px;" src="../assets/images/common/icon_hs.png" />
         </div>
         <div class="contentBtn">
-          <p class="num2">{{statisticsCount.workercount.totalPerson}}</p>
+          <p class="num2">{{statisticsCount.workercount.manPersonTotal}}</p>
           <p class="text">实名制人数</p>
         </div>
       </div>
@@ -31,7 +31,7 @@
         </div>
         <div class="tc">
           <p>今日出勤人数</p>
-          <p class="number">222</p>
+          <p class="number">96</p>
         </div>
       </div>
     </div>

src/views/projectAdmin/fourEngin/progress/index.vue

@@ -223,7 +223,7 @@ export default {
   .left2 {
     width: 100%;
     height: 100%;
-    background-image: url(../assets/temp/tab2.png);
+    background: url(../assets/temp/tab6.png) center center;
     background-repeat: no-repeat;
     background-size: 100%;
     color: #fafbfa;