湖里大屏(劳务管理):在场人员接口对接

src/views/projectAdmin/dataBoard/laborManage.vue

@@ -538,6 +538,7 @@ export default {
       selectProjectPresentWorkerListApi({
         projectSn: this.$store.state.projectSn,
       }).then((res) => {
+        console.log('在场人员',res)
         this.inSecenList = res.result;
         this.timer=window.setTimeout(() => {
           this.selectProjectPresentWorkerList();

src/views/projectAdmin/jlw/components/Card.vue

@@ -33,6 +33,12 @@ export default {
   }
   .content {
     height: calc(100% - 30px);
+    overflow: auto;
+  }
+  ::-webkit-scrollbar {
+    width: 3px;
+    color: #636364;
+    height: 3px;
   }
 }
 </style>

src/views/projectAdmin/jlw/jChart/bar/JBarChart.vue

@@ -53,7 +53,6 @@ export default {
          }
        },
        deep:true,
-       immediate:true,
     },
     yData:{
       handler(newVal,oldVal){
@@ -62,7 +61,6 @@ export default {
          }
        },
        deep:true,
-       immediate:true,
     }
   },
   methods: {

src/views/projectAdmin/jlw/jChart/bar/JProgressChart.vue

@@ -36,7 +36,6 @@ export default {
          }
        },
        deep:true,
-       immediate:true,
     }
   },
   methods: {

src/views/projectAdmin/jlw/laborManage/centerBottom.vue

@@ -2,21 +2,40 @@
 <!-- 施工进度 -->
 <Card :title="title">
   <div class="contents">
-    <div class="smallBox" v-for="(item,index) in inforData" :key="index">
+    <div class="smallBox" v-for="(item,index) in inSecenList" :key="index">
       <div class="left">
         <!-- <img :src="item.image" alt=""/> -->
       </div>
-      <p class="name">{{item.name}}</p>
+      
-      <p class="type">{{item.type}}</p>
+      <p class="name">{{item.workerName}}</p>
-      <p class="type">{{item.time}}</p>
-    </div>
 
+      <p class="type" v-if="item.personType == 2">
+      <!-- 管理人员 -->
+      {{$t('message.dataBoard.managePeople')}}
+      </p>
+      <p v-else>{{ item.teamName }}</p>
+      <!-- <p class="type">{{item.type}}</p> -->
+      <p class="type">{{item.enterDate}}</p>
+    </div>
+     <div
+            class="noData"
+            v-if="inSecenList.length == 0"
+          >
+            <img src="@/assets/images/noData3.png" alt="" srcset="" />
+            <p class="noDataText">
+            <!-- 暂无人员 -->
+            {{$t('message.dataBoard.noPersonnel')}}
+            </p>
+          </div>
   </div>
 </Card>
 </template>
 
 <script>
 import Card from '../components/Card.vue'
+import {
+  selectProjectPresentWorkerListApi,
+} from "@/assets/js/api/dataBoard.js";
 export default {
 components: { Card },
   props: {
@@ -27,6 +46,7 @@ components: { Card },
   },
   data() {
     return {
+      inSecenList: [],
       inforData:[
         {iamge:'',name:'苏华',type:'特种设备驾驶员',time:"15:32:24"},
         {iamge:'',name:'苏华',type:'特种设备驾驶员',time:"15:32:24"},
@@ -41,6 +61,23 @@ components: { Card },
         ]
     };
   },
+  mounted(){
+    this.getWorkerList()
+  },
+  methods:{
+     //查询在场人员信息
+    getWorkerList() {
+      selectProjectPresentWorkerListApi({
+        projectSn: this.$store.state.projectSn,
+      }).then((res) => {
+        this.inSecenList = res.result;
+        // console.log('在场人员',res)
+        // this.timer=window.setTimeout(() => {
+        //   this.getWorkerList();
+        // }, 5000);
+      });
+    },
+  }
 
 
 }
@@ -74,6 +111,16 @@ components: { Card },
       font-size: 12px;
     }
   }
+  .noData{
+    margin-top:5%;
+  }
+  .noDataText{
+    text-align: center;
+  }
+  ::-webkit-scrollbar {
+  width: 3px;
+  color: #636364;
+}
 }
 </style>
 

src/views/projectAdmin/jlw/laborManage/index.vue

@@ -16,7 +16,7 @@
             <centerTop title="出勤统计"></centerTop>
       </div>
       <div class="centerBottom">
-            <centerBottom title="施工进度"></centerBottom>
+            <centerBottom title="在场人员"></centerBottom>
       </div>
     </div>
     <div class="rightBox">
@@ -27,7 +27,7 @@
             <rightCenter title="安全培训"></rightCenter>
       </div>
       <div class="rightBottom">
-            <rightBottom title="证书统计"></rightBottom>
+            <rightBottom title="班组统计"></rightBottom>
       </div>
     </div>
   </div>