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

View File

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

View File

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

View File

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

View File

@ -494,11 +494,11 @@ export default {
idx=p.seriesIndex; idx=p.seriesIndex;
} }
if(idx==1||idx==2){ if(idx==1||idx==2){
this.$refs.prjSummary.showDetailDialog(this.pushNav,idx); this.$refs.prjSummary.showDetailDialog(this.pushNav,idx,this.dept);
} }
}, },
showPrjSummary(){ 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(){ loadPlan(){
this.$api.plan.listAllTop3().then(d=>{ this.$api.plan.listAllTop3().then(d=>{

View File

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