From 3683005b578ec43cf62dce2cacdef1b01ba37d55 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Fri, 26 Jan 2024 22:44:47 +0800
Subject: [PATCH] update code

---
 src/pages/components/AttendanceDetailDialog.vue | 6 +++++-
 src/pages/index.vue                             | 2 +-
 src/utils/request.js                            | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/pages/components/AttendanceDetailDialog.vue b/src/pages/components/AttendanceDetailDialog.vue
index f59b0af..fab577c 100644
--- a/src/pages/components/AttendanceDetailDialog.vue
+++ b/src/pages/components/AttendanceDetailDialog.vue
@@ -6,7 +6,7 @@
                 <div :class="nav == 8 ? 'head-nav active' : 'head-nav'" @click="doNav(8)">监理人员</div>
                 <div :class="nav == 2 ? 'head-nav active' : 'head-nav'" @click="doNav(2)">劳务人员</div>
         </div>
-        <el-table :data="tableData" class="mytable" height="650" style="width: 100%;background: transparent;"  ref="fbsubordinateUnit">
+        <el-table v-loading="loading" :data="tableData" class="mytable" height="650" style="width: 100%;background: transparent;"  ref="fbsubordinateUnit">
             <el-table-column label="照片" align="center" prop="id">
         <template slot-scope="{row}">
           <el-image v-if="row.recentPhoto" :src="row.recentPhoto" :preview-src-list="[row.recentPhoto]" style="height:60px"/>
@@ -49,6 +49,7 @@ export default {
 
     data() {
         return {
+            loading:false, 
             show: false,
             tableData: [],
             projectId:0,
@@ -90,9 +91,12 @@ export default {
                 index:this.index,
                 id:this.nav
             }
+            this.tableData=[];
+            this.loading=true;
             this.$api.attendance.todayAttendance(postData).then(d=>{
                 this.total=d.total||0;
                 this.tableData=d.rows||[];
+                this.loading=false;
             })
         }
     },
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 2fe2a93..4e0e458 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -553,7 +553,7 @@ export default {
                 }
                 
                 this.laborPersonnelTotal = 0;
-                this.laborPersonnelData = [{ text: "劳务人员", value:  func(["2","3"]) }, { text: "监理人员", value: func(["8"]) }, { text: "总包人员", value: func(["1"]) }];
+                this.laborPersonnelData = [{ text: "劳务人员", value:  func(["2","3","4","5"]) }, { text: "监理人员", value: func(["8"]) }, { text: "总包人员", value: func(["1","6"]) }];
                 this.laborPersonnelData.forEach(it=>{
                     this.laborPersonnelTotal += it.value;
                 })
diff --git a/src/utils/request.js b/src/utils/request.js
index 270f1d0..fcafe24 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -16,7 +16,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 20000
+  timeout: 200000
 })
 
 // request拦截器