Skip to content

Administrator / project_progress

Go to a project
Commit d8b6f8bf by liangzhen
Options

暂存一版

1 parent 7a7b3680
Expand all
Inline Side-by-side
Showing with 126 additions and 85 deletions
public/static/js/app.a1ce5541.js
This diff could not be displayed because it is too large.
public/static/js/app.a1ce5541.js.map
This diff could not be displayed because it is too large.
src/utils/leftBarRules.js
...@@ -16,21 +16,21 @@ export function trendsRules(type) { ...@@ -16,21 +16,21 @@ export function trendsRules(type) {
url: "/mainLayout/auxiliarySelection", url: "/mainLayout/auxiliarySelection",
children: [], children: [],
}, },
{ // {
name: "项目评估结果确认更改", // name: "项目评估结果确认更改",
url: "/mainLayout/confirmChanges", // url: "/mainLayout/confirmChanges",
children: [], // children: [],
}, // },
{ {
name: "评估结果查看", name: "评估结果查看",
url: "/mainLayout/assistedViewing", url: "/mainLayout/assistedViewing",
children: [], children: [],
}, },
{ // {
name: "问题查询", // name: "问题查询",
url: "/mainLayout/auxiliaryQuery", // url: "/mainLayout/auxiliaryQuery",
children: [], // children: [],
}, // },
], ],
}, },
], ],
...@@ -108,17 +108,17 @@ export function trendsRules(type) { ...@@ -108,17 +108,17 @@ export function trendsRules(type) {
url: "/mainLayout/confirmRelease", url: "/mainLayout/confirmRelease",
children: [], children: [],
}, },
// { name: "评估材料自动解析", url: "/mainLayout/materialAnalysis", children: [] },
{ {
name: "项目检查", name: "项目检查",
url: "/mainLayout/auxiliaryInspection", url: "/mainLayout/auxiliaryInspection",
children: [], children: [],
}, },
{ // {
name: "问题下发", // name: "问题下发",
url: "/mainLayout/assitedDistribution", // url: "/mainLayout/assitedDistribution",
children: [], // children: [],
}, // },
{ {
name: "申诉确认", name: "申诉确认",
...@@ -158,11 +158,11 @@ export function trendsRules(type) { ...@@ -158,11 +158,11 @@ export function trendsRules(type) {
url: "/mainLayout/assistedFeedback", url: "/mainLayout/assistedFeedback",
children: [], children: [],
}, },
{ // {
name: "问题整改", // name: "问题整改",
url: "/mainLayout/assistedRect", // url: "/mainLayout/assistedRect",
children: [], // children: [],
}, // },
{ {
name: "专家同步归档", name: "专家同步归档",
url: "/mainLayout/attachSynchronousArchiving", url: "/mainLayout/attachSynchronousArchiving",
...@@ -230,11 +230,11 @@ export function trendsRules(type) { ...@@ -230,11 +230,11 @@ export function trendsRules(type) {
children: [], children: [],
}, },
{ // {
name: "自查问题下发", // name: "自查问题下发",
url: "/assesszc/assitedDistribution", // url: "/assesszc/assitedDistribution",
children: [], // children: [],
}, // },
{ {
name: "自查问题反馈", name: "自查问题反馈",
url: "/assesszc/assistedFeedback", url: "/assesszc/assistedFeedback",
...@@ -287,26 +287,26 @@ export function trendsRules(type) { ...@@ -287,26 +287,26 @@ export function trendsRules(type) {
url: "/mainLayout/auxiliaryInspection", url: "/mainLayout/auxiliaryInspection",
children: [], children: [],
}, },
{ // {
name: "项目评估结果确认更改", // name: "项目评估结果确认更改",
url: "/mainLayout/confirmChanges", // url: "/mainLayout/confirmChanges",
children: [], // children: [],
}, // },
{ {
name: "评估结果查看", name: "评估结果查看",
url: "/mainLayout/assistedViewing", url: "/mainLayout/assistedViewing",
children: [], children: [],
}, },
{ // {
name: "问题下发", // name: "问题下发",
url: "/mainLayout/assitedDistribution", // url: "/mainLayout/assitedDistribution",
children: [], // children: [],
}, // },
{ // {
name: "问题查询", // name: "问题查询",
url: "/mainLayout/auxiliaryQuery", // url: "/mainLayout/auxiliaryQuery",
children: [], // children: [],
}, // },
{ {
name: "问题反馈", name: "问题反馈",
url: "/mainLayout/assistedFeedback", url: "/mainLayout/assistedFeedback",
...@@ -317,11 +317,11 @@ export function trendsRules(type) { ...@@ -317,11 +317,11 @@ export function trendsRules(type) {
url: "/mainLayout/assistedConfirm", url: "/mainLayout/assistedConfirm",
children: [], children: [],
}, },
{ // {
name: "问题整改", // name: "问题整改",
url: "/mainLayout/assistedRect", // url: "/mainLayout/assistedRect",
children: [], // children: [],
}, // },
{ {
name: "整改核验", name: "整改核验",
url: "/mainLayout/correctiveAssistanceVerification", url: "/mainLayout/correctiveAssistanceVerification",
......
src/views/assessChecks/assistedVerif.vue
...@@ -414,7 +414,7 @@ ...@@ -414,7 +414,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="字段待确认" label="承建单位" width="200"> <el-table-column prop="字段待确认" label="承建单位" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="字段待确认" label="项目经理" width="200"> <el-table-column prop="personCharge" label="负责人" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="projectInfo" label="项目内容" width="200" show-overflow-tooltip> <el-table-column prop="projectInfo" label="项目内容" width="200" show-overflow-tooltip>
</el-table-column> </el-table-column>
......
src/views/assessChecks/attachSynchronousArchiving.vue
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="字段待确认" label="承建单位" width="200"> <el-table-column prop="字段待确认" label="承建单位" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="字段待确认" label="项目经理" width="200"> <el-table-column prop="personCharge" label="负责人" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="projectInfo" label="项目内容" show-overflow-tooltip> <el-table-column prop="projectInfo" label="项目内容" show-overflow-tooltip>
</el-table-column> </el-table-column>
......
src/views/assessChecks/checkCompliance.vue
...@@ -68,15 +68,15 @@ ...@@ -68,15 +68,15 @@
type="textarea" type="textarea"
:autosize="{ minRows: 1, maxRows: 4 }" :autosize="{ minRows: 1, maxRows: 4 }"
v-model="itemfz.checkDesc" v-model="itemfz.checkDesc"
> >
</el-input </el-input
><el-button @click="adopt(item, index, itemfz)" type="primary" ><el-button
v-if="itemfz.type!='1'">采纳</el-button @click="adopt(item, index, itemfz)"
> type="primary"
<el-button type="info" v-if="itemfz.type != '1'"
v-else>采纳</el-button >采纳</el-button
> >
<el-button type="info" v-else>采纳</el-button>
</div> </div>
</div> </div>
<div class="question"> <div class="question">
...@@ -313,6 +313,10 @@ export default { ...@@ -313,6 +313,10 @@ export default {
if (res[1].data) { if (res[1].data) {
this.questionList = res[1].data.records; this.questionList = res[1].data.records;
this.questionList.forEach(async (item) => { this.questionList.forEach(async (item) => {
// let promiseArray = []
// let p = new Promise((resolve, reject) => {
// })
let respon = await selWtmx({ qid: item.qid }); let respon = await selWtmx({ qid: item.qid });
let paramsFX = { let paramsFX = {
...@@ -329,9 +333,6 @@ export default { ...@@ -329,9 +333,6 @@ export default {
url: itemImg.url, url: itemImg.url,
}; };
let resUrl = await presignedUrl(paramsImg); let resUrl = await presignedUrl(paramsImg);
// itemImg.fileList=[{
// url:resUrl.msg
// }]
this.$set(itemImg, "fileList", [ this.$set(itemImg, "fileList", [
{ {
url: resUrl.msg, url: resUrl.msg,
...@@ -342,7 +343,6 @@ export default { ...@@ -342,7 +343,6 @@ export default {
itemImg.hideUploadEdit = false; itemImg.hideUploadEdit = false;
} }
}); });
this.$set(item, "evalList", [...respon.data.records]); this.$set(item, "evalList", [...respon.data.records]);
console.log(item, "itemitemitem"); console.log(item, "itemitemitem");
} else { } else {
...@@ -375,13 +375,12 @@ export default { ...@@ -375,13 +375,12 @@ export default {
this.$set(item, "znfxList", []); this.$set(item, "znfxList", []);
this.$set(item, "fzfxList", []); this.$set(item, "fzfxList", []);
} }
// this.$set(item, "Id", 0);
}); });
} }
if (this.urlList.length <= 0) { if (this.urlList.length <= 0) {
this.iframeUrl = "/nopdf.png"; this.iframeUrl = "/nopdf.png";
return; } else {
}
let paramsUrl = { let paramsUrl = {
fileId: this.urlList[0].id, fileId: this.urlList[0].id,
url: this.urlList[0].url, url: this.urlList[0].url,
...@@ -389,15 +388,12 @@ export default { ...@@ -389,15 +388,12 @@ export default {
let resUrl = await presignedUrl(paramsUrl); let resUrl = await presignedUrl(paramsUrl);
this.iframeUrl = '/pdf/web/viewer.html?file='+resUrl.msg; this.iframeUrl = "/pdf/web/viewer.html?file=" + resUrl.msg;
// this.iframeUrl='/pdf/web/viewer.html?file=http://arch-file.oss-cn-beijing.aliyuncs.com/arch-file/665994f479f6157c744951bd.pdf?Expires=1718011134&OSSAccessKeyId=LTAI5tGjidtvVSCvwGxTp8FH&Signature=blOuzxUwnotgqo7mxM9rShOEJ1I%3D' }
// console.log(this.questionList, "总列表");
setTimeout(() => { setTimeout(() => {
this.oldQuestionList = JSON.parse(JSON.stringify(this.questionList)); this.oldQuestionList = JSON.parse(JSON.stringify(this.questionList));
console.log(this.questionList,this.oldQuestionList, "总列表"); console.log(this.questionList, this.oldQuestionList, "总列表");
}, 300); }, 1000);
}); });
}, },
async handleClick(tab) { async handleClick(tab) {
...@@ -409,7 +405,7 @@ export default { ...@@ -409,7 +405,7 @@ export default {
url: item.url, url: item.url,
}; };
let resUrl = await presignedUrl(paramsUrl); let resUrl = await presignedUrl(paramsUrl);
this.iframeUrl = '/pdf/web/viewer.html?file='+resUrl.msg; this.iframeUrl = "/pdf/web/viewer.html?file=" + resUrl.msg;
} else { } else {
// this.iframeUrl ="" // this.iframeUrl =""
this.iframeUrl = "/nopdf.png"; this.iframeUrl = "/nopdf.png";
...@@ -418,14 +414,21 @@ export default { ...@@ -418,14 +414,21 @@ export default {
console.log(this.iframeUrl, "this.iframeUrl"); console.log(this.iframeUrl, "this.iframeUrl");
}, },
change(id) { change(id) {
console.log(this.questionList,this.oldQuestionList,'相同么') console.log(this.questionList, this.oldQuestionList, "相同么");
console.log(JSON.stringify(this.questionList)==JSON.stringify(this.oldQuestionList),'完全相同么') console.log(
JSON.stringify(this.questionList) ==
JSON.stringify(this.oldQuestionList),
"完全相同么"
);
if(JSON.stringify(this.questionList)==JSON.stringify(this.oldQuestionList)){ if (
JSON.stringify(this.questionList) ==
JSON.stringify(this.oldQuestionList)
) {
this.active = id * 1; this.active = id * 1;
this.tabListKY = MaterialsListKY(id * 1 + 1); this.tabListKY = MaterialsListKY(id * 1 + 1);
this.init(this.clqparams); this.init(this.clqparams);
return return;
} }
this.$confirm("是否保存?", "提示", { this.$confirm("是否保存?", "提示", {
confirmButtonText: "是", confirmButtonText: "是",
...@@ -523,7 +526,7 @@ export default { ...@@ -523,7 +526,7 @@ export default {
item.evalList.forEach((childItem) => { item.evalList.forEach((childItem) => {
evals = evals.concat(childItem.evalQues + ","); evals = evals.concat(childItem.evalQues + ",");
}); });
evals=evals.slice(0, -1) evals = evals.slice(0, -1);
item.evalQues = evals; item.evalQues = evals;
}); });
console.log(this.questionList, "questionList"); console.log(this.questionList, "questionList");
...@@ -580,6 +583,35 @@ export default { ...@@ -580,6 +583,35 @@ export default {
// console.log("来了么222222", this.fileList); // console.log("来了么222222", this.fileList);
// }, // },
}, },
beforeRouteLeave(to,from,next){
if(JSON.stringify(this.questionList) ==JSON.stringify(this.oldQuestionList)){
console.log('相同么')
next({replace: true,redirect: '/mainLayout/auxiliaryInspection'})
}else{
console.log('不同么')
setTimeout(() => {
this.$confirm("是否保存?", "提示", {
confirmButtonText: "是",
cancelButtonText: "否",
distinguishCancelAndClose: true,
type: "warning",
}).then(() => {
this.save('leave');
next({replace: true,redirect: '/mainLayout/auxiliaryInspection'})
})
.catch((action) => {
console.log(action, "actionaction");
if (action === "cancel") {
next({replace: true,redirect: '/mainLayout/auxiliaryInspection'})
} else {
// next()
}
});
},16)
}
}
}; };
</script> </script>
......
src/views/assessChecks/checkComplianceFZ.vue
...@@ -32,10 +32,10 @@ ...@@ -32,10 +32,10 @@
width="auto" width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column label="评估问题" width="auto"> <el-table-column label="评估问题" width="auto" prop="evalQues" >
<template slot-scope="scope"> <!-- <template slot-scope="scope">
<el-input v-model="scope.row.evalQues" :disabled="ishow"></el-input> <el-input v-model="scope.row.evalQues" :disabled="ishow"></el-input>
</template> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="问题截图" width="auto"> <el-table-column label="问题截图" width="auto">
<template slot-scope="scope"> <template slot-scope="scope">
......
src/views/assessChecks/confirmRelease.vue
...@@ -539,7 +539,7 @@ ...@@ -539,7 +539,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="department" label="承建单位" width="200"> <el-table-column prop="department" label="承建单位" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="personCharge" label="项目经理" width="200"> <el-table-column prop="personCharge" label="负责人" width="200">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="projectInfo" prop="projectInfo"
...@@ -584,7 +584,7 @@ import { ...@@ -584,7 +584,7 @@ import {
getProjectInfo, getProjectInfo,
chProjectInfo, chProjectInfo,
} from "@/api/index"; } from "@/api/index";
import { generateYearOptions } from "@/utils/cache"; import { generateYearOptions ,projectCategoryText} from "@/utils/cache";
export default { export default {
data() { data() {
return { return {
...@@ -729,6 +729,9 @@ export default { ...@@ -729,6 +729,9 @@ export default {
let res = await joinProjectInfo(params); let res = await joinProjectInfo(params);
if (res.code == "200") { if (res.code == "200") {
this.addtableData = res.data.records; this.addtableData = res.data.records;
this.addtableData.forEach((item) => {
this.$set(item, "projectCategory",projectCategoryText(item.projectCategory));
});
this.addtotal = res.data.total * 1; this.addtotal = res.data.total * 1;
} }
}, },
...@@ -755,6 +758,9 @@ export default { ...@@ -755,6 +758,9 @@ export default {
let res = await joinProjectInfo(params); let res = await joinProjectInfo(params);
if (res.code == "200") { if (res.code == "200") {
this.addtableData = res.data.records; this.addtableData = res.data.records;
this.addtableData.forEach((item) => {
this.$set(item, "projectCategory",projectCategoryText(item.projectCategory));
});
this.addtotal = res.data.total * 1; this.addtotal = res.data.total * 1;
this.oldid = ""; this.oldid = "";
if (this.addtableData.length > 0) { if (this.addtableData.length > 0) {
...@@ -844,6 +850,9 @@ export default { ...@@ -844,6 +850,9 @@ export default {
let res = await getProjectInfo(params); let res = await getProjectInfo(params);
console.log(res.data.records, "res.data.recordsres.data.records"); console.log(res.data.records, "res.data.recordsres.data.records");
this.zjtableData = res.data.records; this.zjtableData = res.data.records;
this.zjtableData.forEach((item) => {
this.$set(item, "projectCategory",projectCategoryText(item.projectCategory));
});
this.zjtotal = res.data.total * 1; this.zjtotal = res.data.total * 1;
console.log(res, "xxx"); console.log(res, "xxx");
}, },
......
src/views/assessZC/assistedVerif.vue
...@@ -414,7 +414,7 @@ ...@@ -414,7 +414,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="字段待确认" label="承建单位" width="200"> <el-table-column prop="字段待确认" label="承建单位" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="字段待确认" label="项目经理" width="200"> <el-table-column prop="personCharge" label="负责人" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="projectInfo" label="项目内容" width="200" show-overflow-tooltip> <el-table-column prop="projectInfo" label="项目内容" width="200" show-overflow-tooltip>
</el-table-column> </el-table-column>
......
src/views/assessZC/attachSynchronousArchiving.vue
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="字段待确认" label="承建单位" width="200"> <el-table-column prop="字段待确认" label="承建单位" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="字段待确认" label="项目经理" width="200"> <el-table-column prop="字段待确认" label="负责人" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="projectInfo" label="项目内容" show-overflow-tooltip> <el-table-column prop="projectInfo" label="项目内容" show-overflow-tooltip>
</el-table-column> </el-table-column>
......
src/views/assessZC/confirmRelease.vue
...@@ -539,7 +539,7 @@ ...@@ -539,7 +539,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="department" label="承建单位" width="200"> <el-table-column prop="department" label="承建单位" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="personCharge" label="项目经理" width="200"> <el-table-column prop="personCharge" label="负责人" width="200">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="projectInfo" prop="projectInfo"
......
src/views/compliance/taskConfigure.vue
...@@ -605,7 +605,7 @@ ...@@ -605,7 +605,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="department" label="承建单位" width="200"> <el-table-column prop="department" label="承建单位" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="personCharge" label="项目经理" width="200"> <el-table-column prop="personCharge" label="负责人" width="200">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="projectInfo" prop="projectInfo"
......
src/views/projectCheck/problemRectify.vue
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</el-table-column> </el-table-column>
<el-table-column type="selection"> </el-table-column> <el-table-column type="selection"> </el-table-column>
<el-table-column label="项目名称" prop="projectName"> </el-table-column> <el-table-column label="项目名称" prop="projectName"> </el-table-column>
<el-table-column prop="personCharge" label="项目经理"> <el-table-column prop="personCharge" label="负责人">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
......
src/views/projectCheck/verificationRectify.vue
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</el-table-column> </el-table-column>
<el-table-column type="selection"> </el-table-column> <el-table-column type="selection"> </el-table-column>
<el-table-column label="项目名称" prop="projectName"> </el-table-column> <el-table-column label="项目名称" prop="projectName"> </el-table-column>
<el-table-column prop="personCharge" label="项目经理"> <el-table-column prop="personCharge" label="负责人">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!