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