From dd5440bcf273e314f6d0118d699094d54d53632c Mon Sep 17 00:00:00 2001
From: KeXuCong <13266269839@163.com>
Date: Mon, 7 Apr 2025 19:40:38 +0800
Subject: [PATCH] update
---
.../src/api/build/progressInfo.js | 9 +-
.../api/site/personnelAttendanceStatistics.js | 9 ++
.../options/progressFilling.vue | 51 ++++++++++
.../site/deviceInformation/index.vue | 50 ++++++++--
.../projectInfo/projectProcess/site/index.vue | 11 ++-
.../site/loInformation/index.vue | 4 +-
.../projectProcess/site/monitoring/index.vue | 4 +-
.../site/noiseMonitoring/index.vue | 4 +-
.../projectProcess/site/output/index.vue | 4 +-
.../personnelAttendanceStatistics/index.vue | 98 +++++++++++++++++++
.../site/qualityMonitoring/index.vue | 4 +-
.../projectProcess/site/record/index.vue | 4 +-
.../projectProcess/site/track/index.vue | 4 +-
.../site/vehicleInformation/index.vue | 4 +-
.../project/special/options/documentPage.vue | 8 +-
.../special/options/resultsManagement.vue | 11 +++
jwtech-admin-page/vue.config.js | 4 +-
17 files changed, 251 insertions(+), 32 deletions(-)
create mode 100644 jwtech-admin-page/src/api/site/personnelAttendanceStatistics.js
create mode 100644 jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/personnelAttendanceStatistics/index.vue
diff --git a/jwtech-admin-page/src/api/build/progressInfo.js b/jwtech-admin-page/src/api/build/progressInfo.js
index 79355a30..90006516 100644
--- a/jwtech-admin-page/src/api/build/progressInfo.js
+++ b/jwtech-admin-page/src/api/build/progressInfo.js
@@ -50,4 +50,11 @@ export function exportInfo(query) {
method: 'get',
params: query
})
-}
\ No newline at end of file
+}
+// 表格统计数据
+export function workEfficiencyStatistics(id) {
+ return request({
+ url: `/progress/info/workEfficiencyStatistics/${id}`,
+ method: 'get',
+ })
+}
diff --git a/jwtech-admin-page/src/api/site/personnelAttendanceStatistics.js b/jwtech-admin-page/src/api/site/personnelAttendanceStatistics.js
new file mode 100644
index 00000000..cd822320
--- /dev/null
+++ b/jwtech-admin-page/src/api/site/personnelAttendanceStatistics.js
@@ -0,0 +1,9 @@
+import request from "@/utils/request";
+
+// 查询项目人员名单信息列表
+export function personnelAttendanceStatistics(proNo) {
+ return request({
+ url: `/site/personDetails/personnelAttendanceStatistics/${proNo}`,
+ method: "get",
+ });
+}
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/scheduleManagement/options/progressFilling.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/scheduleManagement/options/progressFilling.vue
index c6e6882d..0fbc6047 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/scheduleManagement/options/progressFilling.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/scheduleManagement/options/progressFilling.vue
@@ -489,6 +489,20 @@
+
+
+
+
+
+
+
+
+
+
+
+ 万元
+
+
+
+
+ 万元
+
+
@@ -709,6 +739,7 @@ import {
addInfo,
updateInfo,
exportInfo,
+ workEfficiencyStatistics
} from "@/api/build/progressInfo";
import { getToken } from "@/utils/auth";
import { getFileStream } from "@/api/system/upload";
@@ -823,6 +854,12 @@ export default {
trigger: "blur",
},
],
+ completeWorkload:[
+ {pattern: /^[0-9]*$/, message: '工作量需为数字', trigger: 'blur'}
+ ],
+ investmentBenefits:[
+ {pattern: /^[0-9]*$/, message: '投资效益需为数字', trigger: 'blur'}
+ ]
},
// 重大项目字典
zd_projectTypeOptions: [],
@@ -841,6 +878,7 @@ export default {
detailMsg: {},
detailMsgList: [],
stageTime: "",
+ workEfficiencyStatisticsList: [],
};
},
computed: {
@@ -884,8 +922,15 @@ export default {
this.getDicts("Construction_status").then((response) => {
this.constructionStatusOptions = response.data;
});
+ this.getWorkEfficiencyStatistics()
},
methods: {
+ getWorkEfficiencyStatistics(){
+ workEfficiencyStatistics(this.proNo).then(res=>{
+ console.log('表格数据---------------',res);
+ this.workEfficiencyStatisticsList = res.data
+ })
+ },
submitUpload(response, file, fileList) {
console.log(55555, file);
this.fileList.push({
@@ -991,6 +1036,7 @@ export default {
// console.log(7777, new Date().getFullYear(), this.stageTime);
this.isDetail = true;
this.getDetailMsg();
+ this.getWorkEfficiencyStatistics()
},
getDetailMsg() {
listInfo({
@@ -1163,6 +1209,8 @@ export default {
descriptionProgress: null,
sceneImages: null,
progressPlanId: null,
+ completeWorkload: null,
+ investmentBenefits: null,
};
this.resetForm("form");
},
@@ -1173,6 +1221,7 @@ export default {
this.msgSuccess("上报成功");
this.getDetail(this.progressPlanId);
this.getDetailMsg();
+ this.getWorkEfficiencyStatistics()
}
});
},
@@ -1188,6 +1237,7 @@ export default {
this.progressForm_open = false;
this.getDetail(this.progressPlanId);
this.getDetailMsg();
+ this.getWorkEfficiencyStatistics()
}
});
} else {
@@ -1201,6 +1251,7 @@ export default {
this.progressForm_open = false;
this.getDetail(this.progressPlanId);
this.getDetailMsg();
+ this.getWorkEfficiencyStatistics()
}
});
}
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/deviceInformation/index.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/deviceInformation/index.vue
index f2beac69..1a55b294 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/deviceInformation/index.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/deviceInformation/index.vue
@@ -87,9 +87,11 @@
-
+
+
-
+
+
@@ -129,14 +131,34 @@
-
+
+
+
+
+
-
+
+
+
+
+
@@ -155,9 +177,9 @@
placeholder="选择检查合格日期">
-
+
@@ -114,11 +120,12 @@ import trackL from "./track/index.vue";
import record from "./record/index.vue";
import statistics from "./statistics/index.vue";
import qualityMonitoring from "./qualityMonitoring/index.vue";
+import personnelAttendanceStatistics from "./personnelAttendanceStatistics/index.vue";
export default {
props: ["projectName", "proNo", "proCode"],
components: { personnel, personDetails, loInformation, deviceInformation, information,monitoring,
- noiseMonitoring,vehicleInformation,outputL,trackL,record,statistics,qualityMonitoring},
+ noiseMonitoring,vehicleInformation,outputL,trackL,record,statistics,qualityMonitoring,personnelAttendanceStatistics},
data() {
return {
activeName: "personnel",
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/loInformation/index.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/loInformation/index.vue
index 55fbccb7..cb29181f 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/loInformation/index.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/loInformation/index.vue
@@ -124,9 +124,9 @@
-
+