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

Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhbigscreen into dev

dev-login
姜玉琦 2023-08-17 19:40:11 +08:00
parent eacaab5234 ab3b77dbac
commit 3e5ffbacf8
5 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ const groupByProjectCategory=(cb)=>{
}
let ret1= [getItems(1,1),getItems(1,2)];
let ret2= [getItems(2,1),getItems(2,2)];
let ret3= [getItems(3,1),getItems(3,2)];
let ret3= [getItems(4,1),getItems(4,2)];
let rets= [
ret1,ret2,ret3
];

22
src/pages/components/ProblemmodifyDetail.vue
View File

@ -39,6 +39,8 @@
<div :class="nav == 1 ? 'head-nav active' : 'head-nav'" @click="doNav(1)">待复检({{ count['1'] }})</div>
<div :class="nav == 3 ? 'head-nav active' : 'head-nav'" @click="doNav(3)">复检驳回({{ count['3'] }})</div>
<div :class="nav == 4 ? 'head-nav active' : 'head-nav'" @click="doNav(4)">复检通过({{ count['4'] }})</div>
<div :class="nav == 5 ? 'head-nav active' : 'head-nav'" @click="doNav(5)">整改超时({{ count['5'] }})</div>
</div>
<div class="data-list scroll" style="max-height:712px;overflow-y: auto;margin:12px 0px;overflow-x: hidden;">
<div v-for="(it, idx) in dataTable" :key="idx" class="data-item" :class="it.checkState!=4 && it.timeout?'time-out':''">
@ -71,7 +73,7 @@
</el-col>
<el-col :span="8" class="item-data">
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">提交用户:</span>
<div class="div-text">{{ it.createUser }}</div>
<div class="div-text">{{ it.createBy }}</div>
</el-col>
<el-col :span="8" class="item-data">
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">提交时间:</span>
@ -117,7 +119,8 @@ export default {
"0": 0,
"1": 0,
"3": 0,
"4": 0
"4": 0,
"5": 0
},
dataTable: [],
dicts: [],
@ -142,11 +145,16 @@ export default {
return;
}
this.nav = n;
this.$api.problemmodify.listSspProblemmodify({
let postData={
projectId: this.row.projectId,
infoType: this.infoType,
checkState: n
}).then(d => {
};
if(n==5){
postData.activeName='zgcs'
}else{
postData.checkState=n
}
this.$api.problemmodify.listSspProblemmodify(postData).then(d => {
this.dataTable = (d.data || []).map(it=>{
if(it.nickedTime){
let dt1=+this.$dt(this.$dt(it.nickedTime).format("YYYY-MM-DD"));
@ -182,12 +190,14 @@ export default {
this.show = true
this.doNav(0, true);
this.$api.problemmodify.groupByInfotypeCheckState({
projectId: this.row.projectId
projectId: this.row.projectId,
infoType:this.infoType
}).then(d => {
let tmps = (d.data || []).filter(it => it.infoType == this.infoType);
tmps.forEach(it => {
this.count["" + it.checkState] = it.id;
})
console.log("--->",this.count)
})
}
},

7
src/pages/index.vue
View File

@ -81,7 +81,7 @@
</div>
<div :class="prjProcessNav == 1 ? 'active' : ''" @click="doPrjProcess(1, '拟建项目')">拟建项目({{ getPrjCateCount(1) }})
</div>
<div :class="prjProcessNav == 2 ? 'active' : ''" @click="doPrjProcess(2, '验收项目')">前期项目({{ getPrjCateCount(2) }})
<div :class="prjProcessNav == 2 ? 'active' : ''" @click="doPrjProcess(2, '完工项目')">完工项目({{ getPrjCateCount(3) }})
</div>
</div>
<el-row>
@ -134,7 +134,7 @@
<p>{{ prjPrcessText }}</p>
</div>
</el-col>
<el-col :span="16">
<el-col :span="16" :key="elSumKey">
<staff-survey-chart :height="220" :unit="'个'" :data="prjPrcessData"
:width="140"></staff-survey-chart>
</el-col>
@ -223,6 +223,7 @@ export default {
},
data() {
return {
elSumKey:0,
elKey: 0,
prjInfo: {},
loading: true,
@ -546,7 +547,7 @@ export default {
let item=this.projectCategory.length>n?this.projectCategory[n]:null;
this.prjPrcessData[0].value=item && item.length>0?item[0].cnt:0;
this.prjPrcessData[1].value=item && item.length>1?item[1].cnt:0;
this.elKey++;
this.elSumKey++;
},
//劳务人员概况
onWarningInfoNav(n) {

2
src/pages/progress/indexDlg3.vue
View File

@ -73,7 +73,7 @@
<el-carousel height="500px" v-if="scheduleInfo && scheduleInfo.images && scheduleInfo.images.length > 0">
<el-carousel-item v-for="item in scheduleInfo.images" :key="item">
<div style="width: 100%;display: flex;align-items: center;justify-content: center;height: 500px;">
<img :src="$apiPath + item" style="width:100%">
<el-image :src="$apiPath + item" style="width:100%" :preview-src-list="[$apiPath + item]"/>
</div>
</el-carousel-item>
</el-carousel>

4
src/pages/projectProgress.vue
View File

@ -88,7 +88,7 @@
<div class="warning-info-title my-warning-info-title">
<div :class="pushNav==0?'active':''" @click="doPushNav(0,'在建项目')">在建项目({{ getPrjCateCount(0) }})</div>
<div :class="pushNav==1?'active':''" @click="doPushNav(1,'拟建项目')">拟建项目({{ getPrjCateCount(1) }})</div>
<div :class="pushNav==2?'active':''" @click="doPushNav(2,'前期项目')">前期项目({{ getPrjCateCount(2) }})</div>
<div :class="pushNav==2?'active':''" @click="doPushNav(2,'完工项目')">完工项目({{ getPrjCateCount(2) }})</div>
</div>
<el-row>
<el-col :span="8">
@ -145,7 +145,7 @@
<el-carousel height="260px" v-if="scheduleInfo && scheduleInfo.images && scheduleInfo.images.length>0">
<el-carousel-item v-for="item in scheduleInfo.images" :key="item">
<div style="width: 100%;display: flex;align-items: center;justify-content: center;height: 260px;">
<img :src="$apiPath+item" style="width:100%">
<el-image :src="$apiPath+item" style="width:100%" :preview-src-list="[$apiPath+item]"/>
</div>
</el-carousel-item>
</el-carousel>