sxyanzhu
/
jhbigscreen
4
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/project/index.js
View File

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

5
src/pages/index.vue
View File

@ -722,7 +722,8 @@ export default {
this.overviewText = "项目年投资"; this.overviewText = "项目年投资";
this.surveyUrlSb = 'images/survey_icon_3.png' 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=>{ let tmps=(d.data||[]).map(it=>{
return { return {
id:it.id, id:it.id,
@ -738,7 +739,7 @@ export default {
this.typeDistributionData=tmps; this.typeDistributionData=tmps;
this.elKey++; 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=>{ let tmps=(d.data||[]).map(it=>{
return { return {
id:it.id, id:it.id,

35
src/pages/projectDetail.vue
View File

@ -116,12 +116,35 @@
</div> </div>
</el-col> </el-col>
<el-col :span="16" class="col-data"> <el-col :span="16" class="col-data">
<div class="data-label">项目进展:</div> <template v-if="getCurProject().projectType==1" 在建>
<div class="data-text scroll" style="max-height: 100px; overflow-y: auto;"> <div class="data-label">施工进展:</div>
{{ scheduleInfo ? scheduleInfo.existingProblem || '暂无' : '暂无' }}</div> <div class="data-text scroll" style="max-height: 220px; overflow-y: auto;">
<div class="data-label">存在的问题:</div> {{ scheduleInfo ? scheduleInfo.constructionProgress || '暂无' : '暂无' }}
<div class="data-text scroll" style="max-height: 100px; overflow-y: auto;">{{ </div>
scheduleInfo ? scheduleInfo.problemProgress || '暂无' : '暂无' }}</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-col>
</el-row> </el-row>
</module-one-1-1> </module-one-1-1>

2
src/pages/projectProgress.vue
View File

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