diff --git a/public/index.html b/public/index.html
index d6ffb57..c102b7b 100644
--- a/public/index.html
+++ b/public/index.html
@@ -9,8 +9,7 @@
-
-
+
@@ -23,7 +22,6 @@
-
diff --git a/src/api/flow/index.js b/src/api/flow/index.js
index b11f65b..25bf41d 100644
--- a/src/api/flow/index.js
+++ b/src/api/flow/index.js
@@ -13,6 +13,29 @@ const groupByUnit=(projectId,deptId)=> {
method: 'get'
})
}
+
+const groupByUnitFinish=(projectId,deptId)=> {
+ return request({
+ url: `bgscreen/flow/groupByUnitFinish?projectId=${projectId}&deptId=${deptId}`,
+ method: 'get'
+ })
+}
+
+const groupByUnitTotal=(projectId,deptId)=> {
+ return request({
+ url: `bgscreen/flow/groupByUnitTotal?projectId=${projectId}&deptId=${deptId}`,
+ method: 'get'
+ })
+}
+
+const groupByProject=()=> {
+ return request({
+ url: `bgscreen/flow/groupByProject`,
+ method: 'get'
+ })
+}
+
+
const listByUnit=(projectId,deptId,unit,pageNum,pageSize)=>{
return request({
url: `bgscreen/flow/listByUnit?pageNum=${pageNum}&pageSize=${pageSize}`,
@@ -39,6 +62,9 @@ const listByState=(projectId,deptId,state,pageNum,pageSize)=>{
export default{
groupByCategory,
groupByUnit,
+ groupByUnitFinish,
+ groupByUnitTotal,
listByUnit,
- listByState
+ listByState,
+ groupByProject
}
diff --git a/src/api/standard/index.js b/src/api/standard/index.js
index 551e5d2..b772d1a 100644
--- a/src/api/standard/index.js
+++ b/src/api/standard/index.js
@@ -7,6 +7,25 @@ const getList=(projectId,deptId)=> {
})
}
-export default{
- getList
+const groupByType=data=>{
+ return request({
+ url:'bgscreen/standard/groupByType',
+ method:'post',
+ data:data
+ })
+}
+
+
+const groupByProject=()=>{
+ return request({
+ url:'bgscreen/standard/groupByProject',
+ method:'get'
+ })
+}
+
+
+export default{
+ getList,
+ groupByType,
+ groupByProject
}
diff --git a/src/components/chart-bar.js b/src/components/chart-bar.js
index 3c15632..d49226e 100644
--- a/src/components/chart-bar.js
+++ b/src/components/chart-bar.js
@@ -54,7 +54,7 @@ Vue.component("chart-bar", {
dataset: {
source: this.optData
},
- xAxis: { type: 'category' },
+ xAxis: { type: 'category' , axisLabel: {color:"#fff"}},
yAxis: {},
series: [{ type: 'bar' }, { type: 'bar' }, { type: 'bar' }]
}
diff --git a/src/components/header.vue b/src/components/header.vue
index 3da68d9..9e778ca 100644
--- a/src/components/header.vue
+++ b/src/components/header.vue
@@ -188,7 +188,7 @@ export default {
return it;
})]
}
- this.deptChange();
+ this.deptChange((()=>{}));
});
}
this.$root.isTypeBuser = this.isTypeBuser;
@@ -268,11 +268,11 @@ export default {
this.loadProject(true);
}
},
- deptChange() {
+ deptChange(cb) {
if(!this.dept1){
if(this.depts.length>0){
this.dept1=this.depts[0].text;
- this.loadProject(true);
+ this.loadProject(true,cb);
}
}
let tmps = this.depts.filter(d => d.text == this.dept1);
@@ -331,7 +331,7 @@ export default {
this.deptChange();
this.loadProject();
},
- loadProject(init) {
+ loadProject(init,cb) {
if (this.isTypeBuser) {
return;
}
@@ -348,6 +348,9 @@ export default {
} else {
this.setScreenLiSel2(null);
}
+ if(cb){
+ cb();
+ }
});
},
setScreenLiSel2(item, init) {
diff --git a/src/pages/engin/enginChart.vue b/src/pages/engin/enginChart.vue
new file mode 100644
index 0000000..797f847
--- /dev/null
+++ b/src/pages/engin/enginChart.vue
@@ -0,0 +1,57 @@
+
+
+
+
+
diff --git a/src/pages/photography.vue b/src/pages/photography.vue
index 0268112..4834fbf 100644
--- a/src/pages/photography.vue
+++ b/src/pages/photography.vue
@@ -5,7 +5,8 @@
+
{{info.videoDate }}
@@ -35,6 +42,11 @@
您的浏览器不支持Video标签。
+
+
+

+
暂无数据
+
@@ -77,6 +89,7 @@ export default {
this.info=it;
},
loadData() {
+ this.info=null;
this.getProjectId(id => {
this.$api.project.listPhotography(id).then(d => {
this.dataList = (d.data || []).map(it => {
@@ -117,6 +130,13 @@ export default {