Skip to content

Administrator / project_progress

Go to a project
Commit fa31c155 by liangzhen
Options

暂存一版

1 parent 5032568e
Inline Side-by-side
Showing with 237 additions and 26 deletions
src/views/assessChecks/auxiliaryInspection.vue
...@@ -201,6 +201,19 @@ ...@@ -201,6 +201,19 @@
min-width="100" min-width="100"
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column>
<el-table-column label="问题截图" width="auto">
<template slot-scope="scope">
<el-image
class="imgList"
v-for="(img, index) in scope.row.images"
:key="index"
:src="img"
:preview-src-list="scope.row.images"
@click="handleImageClick(scope.row.images)"
></el-image>
</template>
</el-table-column> </el-table-column>
<el-table-column label="问题响应" min-width="100"> <el-table-column label="问题响应" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -411,6 +424,7 @@ import { ...@@ -411,6 +424,7 @@ import {
selWtqdFZ2, selWtqdFZ2,
xzwtpostEvalQuesInfo, xzwtpostEvalQuesInfo,
postEvalQuesInfoTh, postEvalQuesInfoTh,
presignedUrl
} from '@/api/index' } from '@/api/index'
import { generateYearOptions, constructionFormText } from '@/utils/cache' import { generateYearOptions, constructionFormText } from '@/utils/cache'
export default { export default {
...@@ -561,6 +575,30 @@ export default { ...@@ -561,6 +575,30 @@ export default {
this.$set(item, 'filed', this.filtersTable(6, resMat.data.records)) this.$set(item, 'filed', this.filtersTable(6, resMat.data.records))
break break
} }
let urlStr = item.url;
let arrUrl = [];
let showUrlList = [];
// 有url拆分调接口换预览
if (urlStr) {
console.log(urlStr, "urlStr");
if (urlStr.includes(",")) {
arrUrl = item.url.split(",");
} else {
arrUrl.push(urlStr);
}
console.log(arrUrl, "arrUrlarrUrl");
arrUrl.forEach(async (showUrl) => {
let paramsUrl = {
url: showUrl,
};
let resUrl = await presignedUrl(paramsUrl);
showUrlList.push(resUrl.msg);
});
console.log(showUrlList, "showUrlList");
this.$set(item, "images", showUrlList);
}
let arr = [] let arr = []
let arrID = [] let arrID = []
if (item.zgName) { if (item.zgName) {
...@@ -576,6 +614,7 @@ export default { ...@@ -576,6 +614,7 @@ export default {
this.dataPretreatment() this.dataPretreatment()
} }
}, },
handleImageClick() {},
filtersTable() { filtersTable() {
let newArr = arguments[1].filter((items) => { let newArr = arguments[1].filter((items) => {
return items.projectStage == arguments[0] return items.projectStage == arguments[0]
......
src/views/assessChecks/auxiliarySelection.vue
...@@ -1203,6 +1203,10 @@ export default { ...@@ -1203,6 +1203,10 @@ export default {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
if (this.checkedList[0].postEvalStateText != "已撤回"&&this.checkedList[0].postEvalStateText != "未发起") {
this.$message("只可删除状态为未发起或者已撤回的批次");
return;
}
this.$confirm("此操作将删除该批次, 是否继续?", "提示", { this.$confirm("此操作将删除该批次, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
...@@ -1263,12 +1267,12 @@ export default { ...@@ -1263,12 +1267,12 @@ export default {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
if (this.checkedList[0].postEvalStateText == "未发起") { // if (this.checkedList[0].postEvalStateText == "未发起") {
this.$message("该项目未发起"); // this.$message("该项目未发起");
return; // return;
} // }
if (this.checkedList[0].postEvalStateText == "已撤回") { if (this.checkedList[0].postEvalStateText != "已发起") {
this.$message("该项目已撤回"); this.$message("只可撤回状态为已发起的批次");
return; return;
} }
this.$confirm("是否撤回?", "提示", { this.$confirm("是否撤回?", "提示", {
......
src/views/assessChecks/confirmRelease.vue
...@@ -754,15 +754,20 @@ export default { ...@@ -754,15 +754,20 @@ export default {
} }
console.log(this.addZJList, 'this.addZJList') console.log(this.addZJList, 'this.addZJList')
// 确认发布入参 // 确认发布入参
let contractId=''
let expertIdList = '' let expertIdList = ''
if (this.addtableData.length > 0) { if (this.addtableData.length > 0) {
this.addtableData.forEach((item) => { this.addtableData.forEach((item) => {
expertIdList = expertIdList.concat(item.projectCode + ',') expertIdList = expertIdList.concat(item.projectCode + ',')
contractId=contractId.concat(item.contractNumber + ',')
}) })
} }
expertIdList = expertIdList.substring(0,expertIdList.length - 1)
contractId = contractId.substring(0,contractId.length - 1)
let params = { let params = {
expertStr: expertIdList, expertStr: expertIdList,
contractStr:contractId
} }
params.batchId = this.ruleFormdialogBJ.batchId params.batchId = this.ruleFormdialogBJ.batchId
// params.prjsOfExpert = this.ruleFormdialogBJ.prjsOfExpert; // params.prjsOfExpert = this.ruleFormdialogBJ.prjsOfExpert;
......
src/views/assessChecks/materialAcquisition.vue
...@@ -252,6 +252,18 @@ ...@@ -252,6 +252,18 @@
<el-table-column label="评估问题" prop="evalQues" show-overflow-tooltip> <el-table-column label="评估问题" prop="evalQues" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column label="问题截图" width="auto">
<template slot-scope="scope">
<el-image
class="imgList"
v-for="(img, index) in scope.row.images"
:key="index"
:src="img"
:preview-src-list="scope.row.images"
@click="handleImageClick(scope.row.images)"
></el-image>
</template>
</el-table-column>
<el-table-column label="问题响应" width="100"> <el-table-column label="问题响应" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
...@@ -295,21 +307,22 @@ ...@@ -295,21 +307,22 @@
</router-link> </router-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="解释批注" width="220"> <el-table-column label="整改说明(选填)" width="220">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="scope.row.feedback" v-model="scope.row.feedback"
v-if="scope.row.confirmStatus == '1'" v-if="scope.row.evalQues"
:disabled="scope.row.rectificationStatus == 2" :disabled="scope.row.rectificationStatus == 2"
type="textarea" type="textarea"
:rows="3" :rows="3"
></el-input> ></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="附加其他情况说明" prop="fileId" width="280"> <!-- v-if="scope.row.evalQues && scope.row.confirmStatus == '1'" -->
<el-table-column label="整改说明材料(选填)" prop="fileId" width="280">
<template <template
slot-scope="scope" slot-scope="scope"
v-if="scope.row.evalQues && scope.row.confirmStatus == '1'" v-if="scope.row.evalQues"
> >
<input <input
:disabled="scope.row.rectificationStatus == 2" :disabled="scope.row.rectificationStatus == 2"
...@@ -412,6 +425,7 @@ import { ...@@ -412,6 +425,7 @@ import {
ossuploadStr, ossuploadStr,
MaterialWarehous, MaterialWarehous,
postEvalQuesInfocxtj, postEvalQuesInfocxtj,
presignedUrl
} from '@/api/index' } from '@/api/index'
import { generateYearOptions, constructionFormText } from '@/utils/cache' import { generateYearOptions, constructionFormText } from '@/utils/cache'
export default { export default {
...@@ -583,6 +597,31 @@ export default { ...@@ -583,6 +597,31 @@ export default {
this.$set(item, 'projectStagetext', '6.结决算及转资') this.$set(item, 'projectStagetext', '6.结决算及转资')
break break
} }
let urlStr = item.url;
let arrUrl = [];
let showUrlList = [];
// 有url拆分调接口换预览
if (urlStr) {
console.log(urlStr, "urlStr");
if (urlStr.includes(",")) {
arrUrl = item.url.split(",");
} else {
arrUrl.push(urlStr);
}
console.log(arrUrl, "arrUrlarrUrl");
arrUrl.forEach(async (showUrl) => {
let paramsUrl = {
url: showUrl,
};
let resUrl = await presignedUrl(paramsUrl);
showUrlList.push(resUrl.msg);
});
console.log(showUrlList, "showUrlList");
this.$set(item, "images", showUrlList);
}
}) })
this.tableDataQR.forEach((val) => { this.tableDataQR.forEach((val) => {
this.$set(val, 'prob', Array.from(new Set(arr))) this.$set(val, 'prob', Array.from(new Set(arr)))
...@@ -965,6 +1004,9 @@ export default { ...@@ -965,6 +1004,9 @@ export default {
handleMouseLeave(msg) { handleMouseLeave(msg) {
// this.$refs[msg].style.whiteSpace = 'nowrap'; // this.$refs[msg].style.whiteSpace = 'nowrap';
}, },
handleImageClick(){
}
}, },
} }
</script> </script>
......
src/views/assessChecks/mianHome.vue
...@@ -11,11 +11,11 @@ ...@@ -11,11 +11,11 @@
:value="item" :value="item"
/> />
</el-select> </el-select>
评估形式: <!-- 评估形式:
<el-checkbox-group v-model="ruleForm.type" class="inputnf"> <el-checkbox-group v-model="ruleForm.type" class="inputnf">
<el-checkbox label="0">自查</el-checkbox> <el-checkbox label="0">自查</el-checkbox>
<el-checkbox label="1">互查</el-checkbox> <el-checkbox label="1">互查</el-checkbox>
</el-checkbox-group> </el-checkbox-group> -->
</div> </div>
<div class="pc child"> <div class="pc child">
<div class="left"> <div class="left">
...@@ -133,7 +133,40 @@ export default { ...@@ -133,7 +133,40 @@ export default {
let res = await projectInfoSy(params); let res = await projectInfoSy(params);
this.info = res.data; // this.info = res.data;
if(this.ruleForm.batchYear==2024){
this.info={
"pcFqCount": 0,
"proWscCount": 0,
"proDpgCount": 0,
"proYzgCount": 0,
"proXzgCount": 0,
"proYgdCount": 53,
"quesZgwcCount":112,
"pcWcCount": 3,
"quesCount": 112,
"quesWzgCount": 0,
"pcCount": 3,
"proCount": 53,
"quesZgbhgCount": 0
}
}else{
this.info={
"pcFqCount": 0,
"proWscCount": 0,
"proDpgCount": 0,
"proYzgCount": 0,
"proXzgCount": 0,
"proYgdCount": 0,
"quesZgwcCount": 0,
"pcWcCount": 0,
"quesCount": 0,
"quesWzgCount": 0,
"pcCount": 0,
"proCount": 0,
"quesZgbhgCount": 0
}
}
}, },
}, },
}; };
......
src/views/assessZC/auxiliaryInspection.vue
...@@ -202,6 +202,18 @@ ...@@ -202,6 +202,18 @@
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column label="问题截图" width="auto">
<template slot-scope="scope">
<el-image
class="imgList"
v-for="(img, index) in scope.row.images"
:key="index"
:src="img"
:preview-src-list="scope.row.images"
@click="handleImageClick(scope.row.images)"
></el-image>
</template>
</el-table-column>
<el-table-column label="问题响应" min-width="100"> <el-table-column label="问题响应" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
...@@ -411,6 +423,7 @@ import { ...@@ -411,6 +423,7 @@ import {
selWtqdFZ2, selWtqdFZ2,
xzwtpostEvalQuesInfo, xzwtpostEvalQuesInfo,
postEvalQuesInfoTh, postEvalQuesInfoTh,
presignedUrl
} from '@/api/indexzc' } from '@/api/indexzc'
import { generateYearOptions, constructionFormText } from '@/utils/cache' import { generateYearOptions, constructionFormText } from '@/utils/cache'
export default { export default {
...@@ -561,6 +574,30 @@ export default { ...@@ -561,6 +574,30 @@ export default {
this.$set(item, 'filed', this.filtersTable(6, resMat.data.records)) this.$set(item, 'filed', this.filtersTable(6, resMat.data.records))
break break
} }
let urlStr = item.url;
let arrUrl = [];
let showUrlList = [];
// 有url拆分调接口换预览
if (urlStr) {
console.log(urlStr, "urlStr");
if (urlStr.includes(",")) {
arrUrl = item.url.split(",");
} else {
arrUrl.push(urlStr);
}
console.log(arrUrl, "arrUrlarrUrl");
arrUrl.forEach(async (showUrl) => {
let paramsUrl = {
url: showUrl,
};
let resUrl = await presignedUrl(paramsUrl);
showUrlList.push(resUrl.msg);
});
console.log(showUrlList, "showUrlList");
this.$set(item, "images", showUrlList);
}
let arr = [] let arr = []
let arrID = [] let arrID = []
if (item.zgName) { if (item.zgName) {
......
src/views/assessZC/auxiliarySelection.vue
...@@ -1207,6 +1207,10 @@ export default { ...@@ -1207,6 +1207,10 @@ export default {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
if (this.checkedList[0].postEvalStateText != "已撤回"&&this.checkedList[0].postEvalStateText != "未发起") {
this.$message("只可删除状态为未发起或者已撤回的批次");
return;
}
this.$confirm("此操作将删除该批次, 是否继续?", "提示", { this.$confirm("此操作将删除该批次, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
...@@ -1235,6 +1239,7 @@ export default { ...@@ -1235,6 +1239,7 @@ export default {
}); });
}); });
}, },
handleImageClick() {},
//点击下发 //点击下发
async sendMsg() { async sendMsg() {
//只能选择未发起的 这块需要加一下 //只能选择未发起的 这块需要加一下
...@@ -1267,12 +1272,12 @@ export default { ...@@ -1267,12 +1272,12 @@ export default {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
if (this.checkedList[0].postEvalStateText == "未发起") { // if (this.checkedList[0].postEvalStateText == "未发起") {
this.$message("该项目未发起"); // this.$message("该项目未发起");
return; // return;
} // }
if (this.checkedList[0].postEvalStateText == "已撤回") { if (this.checkedList[0].postEvalStateText != "已发起") {
this.$message("该项目已撤回"); this.$message("只可撤回状态为已发起的批次");
return; return;
} }
this.$confirm("是否撤回?", "提示", { this.$confirm("是否撤回?", "提示", {
......
src/views/assessZC/confirmRelease.vue
...@@ -753,15 +753,20 @@ export default { ...@@ -753,15 +753,20 @@ export default {
} }
console.log(this.addZJList, 'this.addZJList') console.log(this.addZJList, 'this.addZJList')
// 确认发布入参 // 确认发布入参
let contractId=''
let expertIdList = '' let expertIdList = ''
if (this.addtableData.length > 0) { if (this.addtableData.length > 0) {
this.addtableData.forEach((item) => { this.addtableData.forEach((item) => {
expertIdList = expertIdList.concat(item.projectCode + ',') expertIdList = expertIdList.concat(item.projectCode + ',')
contractId=contractId.concat(item.contractNumber + ',')
}) })
} }
expertIdList = expertIdList.substring(0,expertIdList.length - 1)
contractId = contractId.substring(0,contractId.length - 1)
let params = { let params = {
expertStr: expertIdList, expertStr: expertIdList,
contractStr:contractId
} }
params.batchId = this.ruleFormdialogBJ.batchId params.batchId = this.ruleFormdialogBJ.batchId
// params.prjsOfExpert = this.ruleFormdialogBJ.prjsOfExpert; // params.prjsOfExpert = this.ruleFormdialogBJ.prjsOfExpert;
......
src/views/assessZC/materialAcquisition.vue
...@@ -252,6 +252,18 @@ ...@@ -252,6 +252,18 @@
<el-table-column label="评估问题" prop="evalQues" show-overflow-tooltip> <el-table-column label="评估问题" prop="evalQues" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column label="问题截图" width="auto">
<template slot-scope="scope">
<el-image
class="imgList"
v-for="(img, index) in scope.row.images"
:key="index"
:src="img"
:preview-src-list="scope.row.images"
@click="handleImageClick(scope.row.images)"
></el-image>
</template>
</el-table-column>
<el-table-column label="问题响应" width="100"> <el-table-column label="问题响应" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
...@@ -295,21 +307,21 @@ ...@@ -295,21 +307,21 @@
</router-link> </router-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="解释批注" width="220"> <el-table-column label="整改说明(选填)" width="220">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="scope.row.feedback" v-model="scope.row.feedback"
v-if="scope.row.confirmStatus == '1'" v-if="scope.row.evalQues"
type="textarea" type="textarea"
:disabled="scope.row.rectificationStatus == 2" :disabled="scope.row.rectificationStatus == 2"
:rows="3" :rows="3"
></el-input> ></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="附加其他情况说明" prop="fileId" width="280"> <el-table-column label="整改说明材料(选填)" prop="fileId" width="280">
<template <template
slot-scope="scope" slot-scope="scope"
v-if="scope.row.evalQues && scope.row.confirmStatus == '1'" v-if="scope.row.evalQues"
> >
<input <input
:disabled="scope.row.rectificationStatus == 2" :disabled="scope.row.rectificationStatus == 2"
...@@ -412,6 +424,7 @@ import { ...@@ -412,6 +424,7 @@ import {
ossuploadStr, ossuploadStr,
MaterialWarehous, MaterialWarehous,
postEvalQuesInfocxtj, postEvalQuesInfocxtj,
presignedUrl
} from '@/api/indexzc' } from '@/api/indexzc'
import { generateYearOptions, constructionFormText } from '@/utils/cache' import { generateYearOptions, constructionFormText } from '@/utils/cache'
export default { export default {
...@@ -583,6 +596,30 @@ export default { ...@@ -583,6 +596,30 @@ export default {
this.$set(item, 'projectStagetext', '6.结决算及转资') this.$set(item, 'projectStagetext', '6.结决算及转资')
break break
} }
let urlStr = item.url;
let arrUrl = [];
let showUrlList = [];
// 有url拆分调接口换预览
if (urlStr) {
console.log(urlStr, "urlStr");
if (urlStr.includes(",")) {
arrUrl = item.url.split(",");
} else {
arrUrl.push(urlStr);
}
console.log(arrUrl, "arrUrlarrUrl");
arrUrl.forEach(async (showUrl) => {
let paramsUrl = {
url: showUrl,
};
let resUrl = await presignedUrl(paramsUrl);
showUrlList.push(resUrl.msg);
});
console.log(showUrlList, "showUrlList");
this.$set(item, "images", showUrlList);
}
}) })
this.tableDataQR.forEach((val) => { this.tableDataQR.forEach((val) => {
this.$set(val, 'prob', Array.from(new Set(arr))) this.$set(val, 'prob', Array.from(new Set(arr)))
...@@ -965,6 +1002,9 @@ export default { ...@@ -965,6 +1002,9 @@ export default {
handleMouseLeave(msg) { handleMouseLeave(msg) {
// this.$refs[msg].style.whiteSpace = 'nowrap'; // this.$refs[msg].style.whiteSpace = 'nowrap';
}, },
handleImageClick(){
}
}, },
} }
</script> </script>
......
vue.config.js
...@@ -8,8 +8,8 @@ const ip = '192.168.8.120'; ...@@ -8,8 +8,8 @@ const ip = '192.168.8.120';
module.exports = defineConfig({ module.exports = defineConfig({
transpileDependencies: true, transpileDependencies: true,
//如果是hash模式， publicPath:""；如果是history， publicPath:"/" //如果是hash模式， publicPath:""；如果是history， publicPath:"/"
// publicPath: "/arch", publicPath: "/arch",
publicPath:'/', // publicPath:'/',
devServer: { devServer: {
client: { client: {
overlay: false, overlay: false,
...@@ -17,7 +17,8 @@ module.exports = defineConfig({ ...@@ -17,7 +17,8 @@ module.exports = defineConfig({
hot: true, hot: true,
proxy: { proxy: {
'/arch-evaluation':{ '/arch-evaluation':{
target: `http://192.168.69.1:18102`, // pin // target: `http://192.168.69.1:18102`, // pin
target: `http://192.168.14.1:18000/tools`, // 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!