Skip to content

Administrator / project_progress

Go to a project
Commit 28c6509f by liangzhen
Options

修改采纳逻辑

1 parent 7119d3e6
Inline Side-by-side
Showing with 16 additions and 37 deletions
src/router/index.js
...@@ -289,7 +289,7 @@ export const routes = [ ...@@ -289,7 +289,7 @@ export const routes = [
name: 'maintenancePg', name: 'maintenancePg',
component: () => import('@/views/managementResult/pgReportManagement/managementPg.vue'), component: () => import('@/views/managementResult/pgReportManagement/managementPg.vue'),
meta: { meta: {
title: "后评估报告模板管理", title: "后评估模板维护",
}, },
}, },
{ {
...@@ -297,7 +297,7 @@ export const routes = [ ...@@ -297,7 +297,7 @@ export const routes = [
name: 'maintenancePg', name: 'maintenancePg',
component: () => import('@/views/managementResult/pgReportManagement/managementHg.vue'), component: () => import('@/views/managementResult/pgReportManagement/managementHg.vue'),
meta: { meta: {
title: "合规性检查报告模板管理", title: "合规性检查报告生成",
}, },
}, },
] ]
......
src/utils/http.js
...@@ -24,7 +24,6 @@ let loadingInstance ...@@ -24,7 +24,6 @@ let loadingInstance
//http 请求拦截器 //http 请求拦截器
axios.interceptors.request.use(config => { axios.interceptors.request.use(config => {
console.log(config.url.indexOf('oss/upload'),'2222222oss/uploadStr')
if(config.url.indexOf('oss/upload')!='-1'||config.url.indexOf('oss/uploadStr')!='-1'){ if(config.url.indexOf('oss/upload')!='-1'||config.url.indexOf('oss/uploadStr')!='-1'){
loadingInstance = Loading.service({ loadingInstance = Loading.service({
lock: true, lock: true,
......
src/views/assessChecks/checkCompliance.vue
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<el-input <el-input
type="textarea" type="textarea"
:autosize="{ minRows: 1, maxRows: 4 }" :autosize="{ minRows: 1, maxRows: 4 }"
v-model="itemfz.checkDesc" v-model="item.fzfxList[index]"
> >
</el-input </el-input
><el-button ><el-button
...@@ -245,7 +245,6 @@ export default { ...@@ -245,7 +245,6 @@ export default {
}; };
}, },
mounted() { mounted() {
console.log(MaterialsListKY(1), "wwwww");
this.clqparams = JSON.parse(this.$route.query.clqparams); this.clqparams = JSON.parse(this.$route.query.clqparams);
this.init(this.clqparams); this.init(this.clqparams);
}, },
...@@ -354,7 +353,6 @@ export default { ...@@ -354,7 +353,6 @@ export default {
...type, ...type,
}; };
Promise.all([selFile(params), selWtqdFZ(params)]).then(async (res) => { Promise.all([selFile(params), selWtqdFZ(params)]).then(async (res) => {
console.log(res[0], res[1], "777777");
this.urlList = res[0].data; this.urlList = res[0].data;
if (res[1].data) { if (res[1].data) {
...@@ -362,7 +360,7 @@ export default { ...@@ -362,7 +360,7 @@ export default {
let counterNum = 0; let counterNum = 0;
this.questionList.forEach(async (item) => { this.questionList.forEach(async (item) => {
if (item.isProblem == 0) { if (item.isProblem == 0) {
console.log("未发现问题");
this.$set(item, "checked", true); this.$set(item, "checked", true);
this.changeChecked(item); this.changeChecked(item);
} }
...@@ -393,7 +391,6 @@ export default { ...@@ -393,7 +391,6 @@ export default {
} }
}); });
this.$set(item, "evalList", [...respon.data.records]); this.$set(item, "evalList", [...respon.data.records]);
console.log(item, "itemitemitem");
} else { } else {
this.$set(item, "evalList", [ this.$set(item, "evalList", [
{ {
...@@ -405,14 +402,17 @@ export default { ...@@ -405,14 +402,17 @@ export default {
if (responfx.data.records && responfx.data.records.length > 0) { if (responfx.data.records && responfx.data.records.length > 0) {
let znfxList = responfx.data.records.filter((item) => { let znfxList = responfx.data.records.filter((item) => {
if (item.checkDesc) { if (item.checkDesc&&item.type==0) {
item.checkDesc = item.checkDesc.replace(/\n/g, "<br>"); item.checkDesc = item.checkDesc.replace(/\n/g, "<br>");
} }
return item.type == 0; return item.type == 0;
}); });
let fzfxList = responfx.data.records.filter((item) => { let resfxList = responfx.data.records.filter((item) => {
return item.type == 1 || item.type == 2; return item.type == 1 || item.type == 2;
}); });
console.log(resfxList,'resfxListresfxList')
let fzfxList=resfxList[0].checkDesc.split("\n");
console.log(fzfxList,'0000000')
this.$set(item, "znfxList", [...znfxList]); this.$set(item, "znfxList", [...znfxList]);
this.$set(item, "fzfxList", [...fzfxList]); this.$set(item, "fzfxList", [...fzfxList]);
} else { } else {
...@@ -422,7 +422,7 @@ export default { ...@@ -422,7 +422,7 @@ export default {
if(counterNum==this.questionList.length){ if(counterNum==this.questionList.length){
setTimeout(() => { setTimeout(() => {
this.oldQuestionList = JSON.parse(JSON.stringify(this.questionList)); this.oldQuestionList = JSON.parse(JSON.stringify(this.questionList));
console.log(this.questionList, this.oldQuestionList, "总列表");
}, 300); }, 300);
} }
}) })
...@@ -453,24 +453,14 @@ export default { ...@@ -453,24 +453,14 @@ export default {
}) })
} }
} }
// setTimeout(() => {
// this.oldQuestionList = JSON.parse(JSON.stringify(this.questionList));
// console.log(this.questionList, this.oldQuestionList, "总列表");
// }, 1000);
}); });
}, },
async handleClick(tab) { async handleClick(tab) {
console.log("切换", tab.name, this.urlList); console.log("切换", tab.name, this.urlList);
this.urlList.forEach(async (item) => { this.urlList.forEach(async (item) => {
if (item.typeCode == tab.name) { if (item.typeCode == tab.name) {
// let paramsUrl = {
// fileId: item.id,
// url: item.url,
// };
// let resUrl = await presignedUrl(paramsUrl);
let resUrl = await downloadObject({fileId:item.id}); let resUrl = await downloadObject({fileId:item.id});
this.blobType=item.fileType this.blobType=item.fileType
console.log(item.fileType,'item.fileType')
const binaryData = [] const binaryData = []
binaryData.push(resUrl) binaryData.push(resUrl)
let URL = window.URL.createObjectURL(new Blob(binaryData, { type:item.contentType})) let URL = window.URL.createObjectURL(new Blob(binaryData, { type:item.contentType}))
...@@ -542,17 +532,11 @@ export default { ...@@ -542,17 +532,11 @@ export default {
item.evalList.splice(index, 1); item.evalList.splice(index, 1);
}, },
adopt(item, index, items) { adopt(item, index, items) {
console.log(item, "item");
console.log(items, "items");
if (item.evalList.length == 1 && !item.evalList[0].evalQues) { if (item.evalList.length == 1 && !item.evalList[0].evalQues) {
item.evalList[0].evalQues = items.checkDesc; item.evalList[0].evalQues = items;
// this.$set(item,evalList,{
// evalQues: items.checkDesc,
// })
} else { } else {
item.evalList.push({ item.evalList.push({
evalQues: items.checkDesc, evalQues: items,
hideUploadEdit: false, hideUploadEdit: false,
}); });
} }
...@@ -562,14 +546,14 @@ export default { ...@@ -562,14 +546,14 @@ export default {
console.log("选择了未发现问题"); console.log("选择了未发现问题");
return; return;
} }
console.log(item, "22");
item.evalList.push({ item.evalList.push({
data: "", data: "",
evalQues: "", evalQues: "",
}); });
}, },
changeChecked(item) { changeChecked(item) {
console.log(item, "2222");
if (item.checked) { if (item.checked) {
this.$set(item, "evalList", [ this.$set(item, "evalList", [
{ {
......
src/views/layout/continerView.vue
<template> <template>
<div class="main"> <div class="main">
<TagsView></TagsView> <!-- <TagsView></TagsView> -->
<router-view></router-view> <router-view></router-view>
</div> </div>
</template> </template>
......
src/views/layout/leftBar.vue
...@@ -194,12 +194,9 @@ export default { ...@@ -194,12 +194,9 @@ export default {
methods: { methods: {
handleOpen(e, a) { handleOpen(e, a) {
this.$nextTick(() => { this.$nextTick(() => {
console.log(this.$refs.scroll, "this.$refs.scroll");
this.$refs.scroll.update(); this.$refs.scroll.update();
}); });
console.log("打开", e, a);
if (a.length == 1) { if (a.length == 1) {
console.log("一级菜单");
let treeIcon1 = document.getElementsByClassName("treeIcon1"); let treeIcon1 = document.getElementsByClassName("treeIcon1");
for (var i = 0; i < treeIcon1.length; i++) { for (var i = 0; i < treeIcon1.length; i++) {
...@@ -209,7 +206,6 @@ export default { ...@@ -209,7 +206,6 @@ export default {
treeIcon1[e].style.transform = "rotate(90deg)"; treeIcon1[e].style.transform = "rotate(90deg)";
} else if (a.length == 2) { } else if (a.length == 2) {
let opened = document.getElementsByClassName("is-opened"); let opened = document.getElementsByClassName("is-opened");
console.log("二级菜单", opened);
let treeIcon2 = opened[0].querySelectorAll(".treeIcon2"); let treeIcon2 = opened[0].querySelectorAll(".treeIcon2");
console.log(treeIcon2, "333"); console.log(treeIcon2, "333");
for (var i = 0; i < treeIcon2.length; i++) { for (var i = 0; i < treeIcon2.length; i++) {
......
vue.config.js
...@@ -13,7 +13,7 @@ module.exports = defineConfig({ ...@@ -13,7 +13,7 @@ module.exports = defineConfig({
hot: true, hot: true,
proxy: { proxy: {
'/arch-evaluation':{ '/arch-evaluation':{
target: `http://192.168.69.1:18101`, // pin target: `http://192.168.69.1:18102`, // pin
changeOrigin: true, changeOrigin: true,
pathRewrite:{ pathRewrite:{
"^/arch-evaluation":"/" "^/arch-evaluation":"/"
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!