diff --git a/src/assets/js/api/selectWorkerInfoList.js b/src/assets/js/api/selectWorkerInfoList.js
new file mode 100644
index 00000000..08364408
--- /dev/null
+++ b/src/assets/js/api/selectWorkerInfoList.js
@@ -0,0 +1,3 @@
+// 工作站
+import {post, get} from '../http'
+export const selectWorkScheduleListApi = data => post('xmgl/workerInfo/selectWorkerInfoList', data);
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 0d8da065..03c3aeac 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -373,6 +373,12 @@ const routes2 = [
name: '劳务管理_人员统计分析',
component: () => import('@/views/projectFront/laborManage/personnelAnalysis.vue'),
},
+ //核酸超时人员列表
+ {
+ path: '/project/labor/nucleicAcidOvertimePersonnel',
+ name: '核酸超时人员列表',
+ component: () => import('@/views/projectFront/nucleicAcidOvertimePersonnel/index.vue'),
+ },
//人员定位--卡片管理
{
path: '/project/personnelPosition/cardManage',
diff --git a/src/views/projectFront/buildersDiary/diaryMod.vue b/src/views/projectFront/buildersDiary/diaryMod.vue
index 17a03e6b..cae4c06e 100644
--- a/src/views/projectFront/buildersDiary/diaryMod.vue
+++ b/src/views/projectFront/buildersDiary/diaryMod.vue
@@ -49,6 +49,7 @@
+
@@ -67,6 +68,7 @@
+
@@ -85,12 +87,14 @@
+
+
@@ -447,7 +451,7 @@
type="primary"
>
- {{ type == "add" ? $t('message.buildersDiary.add'):$t('message.buildersDiary.edit') }}
@@ -800,6 +804,67 @@ export default {
//提交保存
submitForm() {
+ if(!this.ruleForm.buildName){
+ this.$message.error("请输入单位工程名称")
+ return false;
+ }
+ if(!this.ruleForm.buildProjectDept){
+ this.$message.error("请输入施工项目部门")
+ return false;
+ }
+ if(!this.ruleForm.projectDirector){
+ this.$message.error("请输入项目负责人")
+ return false;
+ }
+ if(!this.ruleForm.constructionCrew){
+ this.$message.error("请输入单位工程施工员")
+ return false;
+ }
+ if(!this.ruleForm.buildTime){
+ this.$message.error("请选择施工日期")
+ return false;
+ }
+ if(!this.ruleForm.morningWeather){
+ this.$message.error("请输入上午天气")
+ return false;
+ }
+ if(!this.ruleForm.afternoonWeather){
+ this.$message.error("请输入下午天气")
+ return false;
+ }
+ if(!this.ruleForm.temperature){
+ this.$message.error("请输入气温")
+ return false;
+ }
+ if(!this.ruleForm.buildPlace){
+ this.$message.error("请输入分项工程（施工部位）")
+ return false;
+ }
+
+ if(!this.ruleForm.taskTeamType){
+ this.$message.error("请输入作业班组类型")
+ return false;
+ }
+ if(!this.ruleForm.taskTeam){
+ this.$message.error("请输入作业班组名称")
+ return false;
+ }
+ if(!this.ruleForm.morningPersonNum){
+ this.$message.error("请输入上午作业人数")
+ return false;
+ }
+ if(!this.ruleForm.afternoonPersonNum){
+ this.$message.error("请输入下午作业人数")
+ return false;
+ }
+ if(!this.ruleForm.taskCondition){
+ this.$message.error("请输入作业情况")
+ return false;
+ }
+ if(this.fileList.length==0){
+ this.$message.error("请上传附件")
+ return false;
+ }
this.$refs.ruleForm.validate((valid) => {
if (valid) {
let data = JSON.parse(JSON.stringify(this.ruleForm));
@@ -888,6 +953,13 @@ export default {
};
\ No newline at end of file
diff --git a/src/views/projectFront/panoramicView/panoramicManage.vue b/src/views/projectFront/panoramicView/panoramicManage.vue
index 9907e90b..a7d98d9f 100644
--- a/src/views/projectFront/panoramicView/panoramicManage.vue
+++ b/src/views/projectFront/panoramicView/panoramicManage.vue
@@ -323,7 +323,8 @@ export default {
if (!this.isEditType) {
addPanoramicImageApi(data).then((res) => {
if (res.code == 200) {
- this.$message.success(res.message);
+ // this.$message.success(res.message);
+ this.$message.success("操作成功");
this.addPanoramicDialog = false;
this.getPanoramaList();
} else {
@@ -333,11 +334,13 @@ export default {
} else {
editPanoramicImageApi(data).then((res) => {
if (res.code == 200) {
- this.$message.success(res.message);
+ // this.$message.success(res.message);
+ this.$message.success("上传成功");
this.addPanoramicDialog = false;
this.getPanoramaList();
} else {
- this.$message.error(res.message);
+ // this.$message.error(res.message);
+ this.$message.error("上传失败");
}
});
}
diff --git a/src/views/projectFront/towerCrane/devFilingDetail.vue b/src/views/projectFront/towerCrane/devFilingDetail.vue
index 18423e65..cb6a21f0 100644
--- a/src/views/projectFront/towerCrane/devFilingDetail.vue
+++ b/src/views/projectFront/towerCrane/devFilingDetail.vue
@@ -60,6 +60,7 @@