update code

dev-login
haha 2023-09-05 22:48:57 +08:00
parent 16437a661a
commit 5fbb80eb7c
4 changed files with 39 additions and 13 deletions

View File

@ -55,24 +55,26 @@ const groupByProjectCategory=(deptId,cb)=>{
});
};
const groupByCategory=(deptId,type)=>{
const groupByCategory=(deptId,type,year)=>{
return request({
url: `bgscreen/project/groupByCategory`,
method: 'post',
data:{
deptId:deptId,
id:type
id:type,
isDel:year
}
})
}
const groupByLevel=(deptId,type)=>{
const groupByLevel=(deptId,type,year)=>{
return request({
url: `bgscreen/project/groupByLevel`,
method: 'post',
data:{
deptId:deptId,
id:type
id:type,
isDel:year
}
})
}

View File

@ -722,7 +722,8 @@ export default {
this.overviewText = "项目年投资";
this.surveyUrlSb = 'images/survey_icon_3.png'
}
this.$api.project.groupByCategory(this.deptInfo.id,n).then(d=>{
let year=this.$dt(new Date()).$y;
this.$api.project.groupByCategory(this.deptInfo.id,n,year).then(d=>{
let tmps=(d.data||[]).map(it=>{
return {
id:it.id,
@ -738,7 +739,7 @@ export default {
this.typeDistributionData=tmps;
this.elKey++;
})
this.$api.project.groupByLevel(this.deptInfo.id,n).then(d=>{
this.$api.project.groupByLevel(this.deptInfo.id,n,year).then(d=>{
let tmps=(d.data||[]).map(it=>{
return {
id:it.id,

View File

@ -116,12 +116,35 @@
</div>
</el-col>
<el-col :span="16" class="col-data">
<div class="data-label">项目进展:</div>
<div class="data-text scroll" style="max-height: 100px; overflow-y: auto;">
{{ scheduleInfo ? scheduleInfo.existingProblem || '暂无' : '暂无' }}</div>
<div class="data-label">存在的问题:</div>
<div class="data-text scroll" style="max-height: 100px; overflow-y: auto;">{{
scheduleInfo ? scheduleInfo.problemProgress || '暂无' : '暂无' }}</div>
<template v-if="getCurProject().projectType==1" >
<div class="data-label">施工进展:</div>
<div class="data-text scroll" style="max-height: 220px; overflow-y: auto;">
{{ scheduleInfo ? scheduleInfo.constructionProgress || '暂无' : '暂无' }}
</div>
</template>
<template v-if="getCurProject().projectType==2" >
<div class="data-label">报建设计进展:</div>
<div class="data-text scroll" style="max-height: 110px; overflow-y: auto;">
{{ scheduleInfo ? scheduleInfo.designProgress || '暂无' : '暂无' }}</div>
<div class="data-label">融资招采进展:</div>
<div class="data-text scroll" style="max-height: 110px; overflow-y: auto;">
{{ scheduleInfo ? scheduleInfo.purchaseProgress || '暂无' : '暂无' }}</div>
</template>
<template v-if="getCurProject().projectType==3" ></template>
<template v-if="getCurProject().projectType==4" >
<div class="data-label">验收进展:</div>
<div class="data-text scroll" style="max-height: 70px; overflow-y: auto;">
{{ scheduleInfo ? scheduleInfo.acceptanceProgress || '暂无' : '暂无' }}</div>
<div class="data-label">结算进展:</div>
<div class="data-text scroll" style="max-height: 70px; overflow-y: auto;">
{{ scheduleInfo ? scheduleInfo.purchaseProgress || '暂无' : '暂无' }}</div>
<div class="data-label">运维进展:</div>
<div class="data-text scroll" style="max-height: 70px; overflow-y: auto;">
{{ scheduleInfo ? scheduleInfo.designProgress || '暂无' : '暂无' }}</div>
</template>
</el-col>
</el-row>
</module-one-1-1>

View File

@ -510,7 +510,7 @@ export default {
this.$api.quarterlyAssess.currentListByDept(this.dept.id).then(d => {
this.assessData = (d.rows || []).map(it => {
it.prj = it.project?.projectName || '';
it.deptName = it.project?.paretProjectName || '';
it.deptName = it.project?.deptName || '';
it.comp = it.planTarget;
if (it.finishDate) {
it.finishState = 0;