diff --git a/src/assets/images/zjsj/monitor.jpg b/src/assets/images/zjsj/monitor.jpg
index b13e9c2f..ffa80491 100644
Binary files a/src/assets/images/zjsj/monitor.jpg and b/src/assets/images/zjsj/monitor.jpg differ
diff --git a/src/views/projectFront/scheduleManage/ganttwo.vue b/src/views/projectFront/scheduleManage/ganttwo.vue
index 8e1d488e..92a7a8cb 100644
--- a/src/views/projectFront/scheduleManage/ganttwo.vue
+++ b/src/views/projectFront/scheduleManage/ganttwo.vue
@@ -254,8 +254,8 @@ export default {
gantt.form_blocks["datepicker"] = {
render(sns) { //sns - the section's configuration object
return ""+
- ""+'-'+
- ""+
+ ""+'--'+
+ ""+
"
";;
},
set_value(node, value, task, section) {
diff --git a/src/views/projectFront/scheduleManage/projectNodeManage2.vue b/src/views/projectFront/scheduleManage/projectNodeManage2.vue
index 47af5fea..0a8303b0 100644
--- a/src/views/projectFront/scheduleManage/projectNodeManage2.vue
+++ b/src/views/projectFront/scheduleManage/projectNodeManage2.vue
@@ -27,6 +27,7 @@
:action="$http.defaults.baseURL + 'xmgl/progressTask/importData'"
:data="{ projectSn: projectSn, createUserId: createUserId }"
:show-file-list="false"
+ :headers="headers"
>
导入
@@ -58,16 +59,10 @@
>
-
+
-
-
+
+
-
{
- let nowData = this.times
- nowData = new Date(nowData.setDate(nowData.getDate() - 1))
- return time > nowData
- // return time.getTime() < Date.now()- 1 * 24 * 3600 * 1000;
- }
+ pickerOptions: {
+ // 对象
+ disabledDate: (time) => {
+ let nowData = this.times;
+ nowData = new Date(nowData.setDate(nowData.getDate() - 1));
+ return time > nowData;
+ // return time.getTime() < Date.now()- 1 * 24 * 3600 * 1000;
+ },
},
};
},
computed: {
+ headers() {
+ return { Authorization: this.$store.state.userInfo.token };
+ },
dateAfter() {
// 动态起始时间
const startTimestamp = Date.now() * 1 - 24 * 60 * 60 * 1000;
@@ -419,7 +417,7 @@ export default {
} else {
return timestamp <= startTimestamp;
}
- }
+ },
};
},
dateBefore() {
@@ -432,9 +430,9 @@ export default {
return false;
}
return true;
- }
+ },
};
- }
+ },
},
created() {
this.projectSn = this.$store.state.projectSn;
@@ -444,12 +442,12 @@ export default {
this.getProgressListData();
},
methods: {
- time1(val){
- console.log('开始时间',val)
- this.times = val
+ time1(val) {
+ console.log("开始时间", val);
+ this.times = val;
},
- time2(val){
- console.log('结束时间',val)
+ time2(val) {
+ console.log("结束时间", val);
},
// 下载模板
downloadFn() {
@@ -489,7 +487,7 @@ export default {
};
getProgressListDataApi(data).then((res) => {
if (res.code == 200) {
- // console.log("获取到的列表", res);
+ // console.log("获取到的列表", res);
this.listData = res.result;
}
});
@@ -532,35 +530,41 @@ export default {
// 编辑按钮
editBefore(val) {
this.workerInfo = JSON.parse(JSON.stringify(val));
- console.log('当前点击的行',val)
+ console.log("当前点击的行", val);
this.fileList = val.fileUrl ? JSON.parse(val.fileUrl) : [];
this.dialogVisible = true;
- this.getPrincipalLsit()
+ this.getPrincipalLsit();
},
//编辑
submitBtn() {
this.$refs.addEditForm.validate((valid) => {
if (valid) {
- if (this.workerInfo.status == "1" && this.workerInfo.actualStartDate == null) {
+ if (
+ this.workerInfo.status == "1" &&
+ this.workerInfo.actualStartDate == null
+ ) {
this.$message.error("请输入实际开始时间！");
- } else if (this.workerInfo.status == "2"&& this.workerInfo.actualFinishDate == null) {
+ } else if (
+ this.workerInfo.status == "2" &&
+ this.workerInfo.actualFinishDate == null
+ ) {
// if (this.workerInfo.actualStartDate == null) {
// this.$message.error("请输入实际开始时间！");
// } else if (this.workerInfo.actualFinishDate == null) {
- this.$message.error("请输入实际完成时间！");
+ this.$message.error("请输入实际完成时间！");
// }
} else {
//赋值
let data = this.workerInfo;
data.projectSn = this.projectSn;
// console.log('编辑的参数',data)
- editProgressListDataApi(data).then((res)=>{
- if(res.code == 200){
- this.$message.success("编辑成功！");
- this.dialogVisible = false
- this.getProgressListData()
- }
- })
+ editProgressListDataApi(data).then((res) => {
+ if (res.code == 200) {
+ this.$message.success("编辑成功！");
+ this.dialogVisible = false;
+ this.getProgressListData();
+ }
+ });
}
} else {
return false;
@@ -579,9 +583,9 @@ export default {
display: inline-block !important;
margin-right: 10px;
}
-.table_wrap{
- height: 800px;
- overflow: auto;
+.table_wrap {
+ height: 800px;
+ overflow: auto;
}
\ No newline at end of file