diff --git a/src/api/buildNode/index.js b/src/api/buildNode/index.js index 55271ec..33d1336 100644 --- a/src/api/buildNode/index.js +++ b/src/api/buildNode/index.js @@ -274,6 +274,26 @@ const queryByProjectTypeNoTree = (type) => { }); }); }; + +const queryFinishProject=projectId=>{ + return new Promise((resolve)=>{ + request({ + url: "bgscreen/projectBuildNode/queryFinishProject?projectId=" + projectId, + method: "get", + }).then(d=>{ + let tmps = (d.data || []).map((it) => { + it.lvl = it.baseBuildNode.nodeLvl; + it.projectName = it.project?.projectName || ""; + it.parentLvl = it.lvl.substring(0, it.lvl.length - 2); + it.nodeText = it.baseBuildNode.nodeText; + return it; + }); + resolve(tmps); + }) + }); +} + + export default { selectScheduledAlerts, selectCurrent, @@ -282,5 +302,6 @@ export default { countCompletionRate, queryByProjectType, queryByProjectTypeNoTree, - toTree + toTree, + queryFinishProject }; diff --git a/src/api/costOut/index.js b/src/api/costOut/index.js index cb46563..bd7b93a 100644 --- a/src/api/costOut/index.js +++ b/src/api/costOut/index.js @@ -23,12 +23,16 @@ const selectYearAndMonth=(data)=> { let totalObjs=tmps.filter(it=>it.costType==9); let total=0; totalObjs.forEach(it=>{ - total+=(it.money?it.money:0) + if(it.money){ + total+=it.money; + } }); - totalObjs=tmps.filter(it=>it.costType==9 && it.year==y); + let yearObjs=tmps.filter(it=>it.costType==9 && it.year==y); let totalY=0; - totalObjs.forEach(it=>{ - totalY+=(it.money?it.money:0) + yearObjs.forEach(it=>{ + if(it.money){ + totalY+=it.money; + } }); let obj={ totalInv:getValue(tmps,1).money||0,//总投资 diff --git a/src/api/index.js b/src/api/index.js index 29e0774..ff0d78a 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -17,7 +17,7 @@ import materialSeal from './materialSeal/index' import costOut from './costOut/index' import checkDetection from './checkDetection/index' import video from './video/index' -import {axios} from '@/utils/request' +import {axios,download} from '@/utils/request' export default { project, dept, @@ -38,5 +38,6 @@ export default { materialSeal, checkDetection, http:axios, - video + video, + downFile:download } \ No newline at end of file diff --git a/src/components/headerV2.js b/src/components/headerV2.js index 6d4c202..ca79a11 100644 --- a/src/components/headerV2.js +++ b/src/components/headerV2.js @@ -134,7 +134,6 @@ Vue.component("screen-header", { }, //页面条状 pageJump(n,url){ - debugger if(n != this.nav){ if(url){ diff --git a/src/pages/progress/indexDlg2.vue b/src/pages/progress/indexDlg2.vue index da48c2f..0e54b92 100644 --- a/src/pages/progress/indexDlg2.vue +++ b/src/pages/progress/indexDlg2.vue @@ -31,9 +31,6 @@ - - - diff --git a/src/pages/projectDetail.vue b/src/pages/projectDetail.vue index 6e0023f..26c2a36 100644 --- a/src/pages/projectDetail.vue +++ b/src/pages/projectDetail.vue @@ -22,7 +22,8 @@
甲方代表
-
{{getPrjUser('甲方代表')||' ' }}
+
+ {{ getPrjUser('甲方代表') || ' ' }}
@@ -31,7 +32,8 @@
项目等级
-
{{ getProjectLevel()||' ' }}
+
{{ + getProjectLevel() || ' ' }}
@@ -40,7 +42,8 @@
项目经理
-
{{getPrjUser('项目经理')||' ' }}
+
+ {{ getPrjUser('项目经理') || ' ' }}
@@ -49,7 +52,8 @@
项目总监
-
{{getPrjUser('总监')||' ' }}
+
+ {{ getPrjUser('总监') || ' ' }}
@@ -58,7 +62,8 @@
总包单位
-
{{getPrjUser('总包单位','2')||' ' }}
+
+ {{ getPrjUser('总包单位', '2') || ' ' }}
@@ -67,7 +72,8 @@
监理单位
-
{{getPrjUser('监理单位','4')||' ' }}
+
+ {{ getPrjUser('监理单位', '4') || ' ' }}
@@ -77,8 +83,10 @@
-
在岗人数
-
今日出勤
+
在岗人数 +
+
今日出勤 +
@@ -104,10 +112,12 @@
@@ -116,40 +126,40 @@
-