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 @@
监理人员
劳务人员
-
+
@@ -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拦截器