diff --git a/src/api/flow/index.js b/src/api/flow/index.js
new file mode 100644
index 0000000..8fd5802
--- /dev/null
+++ b/src/api/flow/index.js
@@ -0,0 +1,20 @@
+import request from '@/utils/request'
+
+const groupByCategory=(projectId,deptId)=> {
+ return request({
+ url: `bgscreen/flow/groupByCategory?projectId=${projectId}&deptId=${deptId}`,
+ method: 'get'
+ })
+}
+
+const groupByUnit=(projectId,deptId)=> {
+ return request({
+ url: `bgscreen/flow/groupByUnit?projectId=${projectId}&deptId=${deptId}`,
+ method: 'get'
+ })
+ }
+
+export default{
+ groupByCategory,
+ groupByUnit
+}
diff --git a/src/api/index.js b/src/api/index.js
index 1694fc4..7e93b4e 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -17,6 +17,7 @@ import materialSeal from './materialSeal/index'
import costOut from './costOut/index'
import checkDetection from './checkDetection/index'
import standard from './standard/index'
+import flow from './flow/index'
import video from './video/index'
import plan from './plan/index'
import {axios,download} from '@/utils/request'
@@ -42,6 +43,7 @@ export default {
http:axios,
video,
standard,
+ flow,
plan,
downFile:download
}
\ No newline at end of file
diff --git a/src/pages/engin/enginImageItems.vue b/src/pages/engin/enginImageItems.vue
index bd8f6dc..1ee8047 100644
--- a/src/pages/engin/enginImageItems.vue
+++ b/src/pages/engin/enginImageItems.vue
@@ -16,7 +16,7 @@
- {{ getTitle() }} {{ images.length }}
+ {{ getTitle() }}
diff --git a/src/pages/projectEngin.vue b/src/pages/projectEngin.vue
index 28e7a88..f18364d 100644
--- a/src/pages/projectEngin.vue
+++ b/src/pages/projectEngin.vue
@@ -96,6 +96,8 @@ export default {
list4:[],
list5:[],
list6:[],
+ chart1Data:[],
+ chart2Data:[]
};
},
@@ -131,7 +133,13 @@ export default {
},
loadData(){
this.getProjectId(id => {
- this.$api.standard.getList(id,this.dept.id).then(d=>{
+ let ajaxs=[
+ this.$api.standard.getList(id,this.dept.id),
+ this.$api.flow.groupByCategory(this.project.id,this.dept.id),
+ this.$api.flow.groupByUnit(this.project.id,this.dept.id),
+ ];
+ this.$api.http.all(ajaxs).then(res=>{
+ let d=res[0];
let tmps=d.data||[];
this.list1=tmps.filter(it=>it.standardType==1);
this.list2=tmps.filter(it=>it.standardType==2);
@@ -140,6 +148,32 @@ export default {
this.list5=tmps.filter(it=>it.standardType==5);
this.list6=tmps.filter(it=>it.standardType==6);
this.loading=false;
+ this.chart1Data=(res[1].data||[]).map(it=>{
+ let o= {
+ title:it.taskName,
+ comp:it.assigneeId||0,
+ uncomp:it.procDefVersion||0,
+ total:0
+ }
+ o.total=o.comp+o.uncomp;
+ return o;
+ })
+ console.log("-1->",this.chart1Data);
+ let tmps2=[{title:'总包单位',count:0},
+ {title:'监理单位',count:0},
+ {title:'设计单位',count:0},
+ {title:'甲方代表',count:0},
+ {title:'子公司',count:0},
+ ];
+ let objs=res[2].data||[];
+ tmps2.forEach(it=>{
+ let o=objs.find(item=>it.title==item.taskName);
+ if(o){
+ it.count=o.assigneeId
+ }
+ });
+ this.chart2Data=tmps2;
+ console.log("-2->",this.chart2Data);
});
});
},
@@ -156,7 +190,7 @@ export default {