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

update code

dev-login
haha 2023-09-10 15:43:47 +08:00
parent 5f33fc5fc5
commit 52c3ea0a75
5 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/schedule/index.js
View File

@ -8,9 +8,9 @@ const projectConstructionProgress=(projectId)=> {
}
const selectByProjectType=type=>{
const selectByProjectType=(type,deptId)=>{
return request({
url: `bgscreen/schedule/selectByProjectType?type=${type}`,
url: `bgscreen/schedule/selectByProjectType?type=${type}&deptId=${deptId}`,
method: 'get'
})
}

4
src/pages/index.vue
View File

@ -519,7 +519,7 @@ export default {
}
if(idx==1||idx==2){
this.$refs.dlg2.showDetailDialog(this.prjProcessNav,idx);
this.$refs.dlg2.showDetailDialog(this.prjProcessNav,idx,this.deptInfo);
}
},
sumCostOutByDeptId() {
@ -606,7 +606,7 @@ export default {
this.$refs.dlg1.showDialog()
},
doShowDlg2() {
this.$refs.dlg2.showDialog(this.prjProcessNav, [this.getPrjCateCount(0), this.getPrjCateCount(1), this.getPrjCateCount(3)])
this.$refs.dlg2.showDialog(this.prjProcessNav, [this.getPrjCateCount(0), this.getPrjCateCount(1), this.getPrjCateCount(3)],this.deptInfo)
},
getPrjCateCount(n) {
if (this.projectCategory.length < n + 1) {

21
src/pages/index/indexDlg2.vue
View File

@ -134,6 +134,7 @@ export default {
},
data() {
return {
dept:null,
title:'',
dataState:0,
showType:'',
@ -179,12 +180,13 @@ export default {
this.$api.quarterlyAssess.queryByProjectType({
id:n,
year:y,
quarterly:q
quarterly:q,
deptId:this.dept?.id||0
}),
this.$api.schedule.selectByProjectType(n)
this.$api.schedule.selectByProjectType(n,this.dept?.id||0)
];
this.loading=true;
this.$api.http.all(ajaxs).then(res=>{
this.$api.http.all(ajaxs).then(res=>{debugger
this.loading=false;
let prjs=res[0].data||[];
let tmps=res[1].data||[];
@ -215,9 +217,10 @@ export default {
this.$api.quarterlyAssess.queryByProjectType({
id:n,
year:y,
quarterly:q
quarterly:q,
deptId:this.dept?.id||0
}),
this.$api.schedule.selectByProjectType(n),
this.$api.schedule.selectByProjectType(n,this.dept?.id||0),
this.$api.buildNode.queryByProjectTypeNoTree(n)
];
this.loading=true;
@ -251,7 +254,7 @@ export default {
},
loadData4(n){
this.loading=true;
this.$api.schedule.selectByProjectType(n).then(d=>{
this.$api.schedule.selectByProjectType(n,this.dept?.id||0).then(d=>{
this.loading=false;
let objs=(d.data||[]).map(it=>{
it.projectName=it.surProject?.projectName||''
@ -269,7 +272,8 @@ export default {
}
})
},
showDialog(n,cnts) {
showDialog(n,cnts,dept) {
this.dept=dept;
this.loading=true;
this.tableData=[]
this.showType="all";
@ -278,7 +282,8 @@ export default {
this.toggleNav(n);
this.show = true
},
showDetailDialog(n,type){
showDetailDialog(n,type,dept){
this.dept=dept;
this.loading=true;
this.tableData=[]
this.showType="detail";

4
src/pages/projectProgress.vue
View File

@ -494,11 +494,11 @@ export default {
idx=p.seriesIndex;
}
if(idx==1||idx==2){
this.$refs.prjSummary.showDetailDialog(this.pushNav,idx);
this.$refs.prjSummary.showDetailDialog(this.pushNav,idx,this.dept);
}
},
showPrjSummary(){
this.$refs.prjSummary.showDialog(this.pushNav,[this.getPrjCateCount(0),this.getPrjCateCount(1),this.getPrjCateCount(3)])
this.$refs.prjSummary.showDialog(this.pushNav,[this.getPrjCateCount(0),this.getPrjCateCount(1),this.getPrjCateCount(3)],this.dept)
},
loadPlan(){
this.$api.plan.listAllTop3().then(d=>{

4
vue.config.js
View File

@ -23,8 +23,8 @@ module.exports = defineConfig({
}
},
'/jhapi':{
target: `http://62.234.3.186/jhapi/`,
//target: `http://127.0.0.1:8090/jhapi/`,
//target: `http://62.234.3.186/jhapi/`,
target: `http://127.0.0.1:8090/jhapi/`,
changeOrigin: true,
pathRewrite: {
'^/jhapi':'/'