
@@ -290,6 +284,7 @@ export default {
this.$refs.stateDlg.showDialog(obj);
},
changeChart1(opt) {
+ opt.xAxis.axisLabel = { interval: 0, rotate: 0, fontSize: 9, color: "#fff" }
opt.legend = {
textStyle: {
color: "#fff"
@@ -330,7 +325,7 @@ export default {
postData.id = this.dept.id;
}
this.$api.flow.listFlowBySubDeptType(postData, this.data4Page.pageIndex, this.data4Page.pageSize).then(d => {
- let data = d.rows || [];
+ let data = d.rows || [];
this.dataList4 = data;
this.data4Page.total = d.total;
});
@@ -376,6 +371,18 @@ export default {
this.chartInfo = [];
let sum = 0;
(res.data || []).forEach(it => {
+ if (it.taskName == "程序及质量类") {
+ it.taskName = "质量";
+ }
+ if (it.taskName == "项目管理制度类") {
+ it.taskName = "项目制度";
+ }
+ if (it.taskName == "特殊事项确认类") {
+ it.taskName = "特殊事项";
+ }
+ if (it.taskName == "专项验收审批") {
+ it.taskName = "专项验收";
+ }
let o = {
title: it.taskName,
comp: it.assigneeId || 0,
@@ -488,7 +495,7 @@ export default {
line-height: 40px;
}
}
- }
+ }
.data-list3 {
max-height: calc(100% - 70px);
diff --git a/src/pages/engin/flowDetailByStateDialog.vue b/src/pages/engin/flowDetailByStateDialog.vue
index 94ad80c..180aa9f 100644
--- a/src/pages/engin/flowDetailByStateDialog.vue
+++ b/src/pages/engin/flowDetailByStateDialog.vue
@@ -69,7 +69,10 @@ export default {
},
showDialog(data) {
this.deptId=data.deptId;
- this.projectId=data.projectId;
+ this.projectId=this.$root.project.id;
+ if(this.projectId==0 && this.$root.projects.length>0){
+ this.projectId=this.$root.projects[0].id;
+ }
if(data.prj){
this.prjName=data.prj.name||'';
}else{
diff --git a/src/pages/engin/flowListByCategory.vue b/src/pages/engin/flowListByCategory.vue
index 9515b59..71fa3b4 100644
--- a/src/pages/engin/flowListByCategory.vue
+++ b/src/pages/engin/flowListByCategory.vue
@@ -1,16 +1,22 @@
-
-
-
{{ it.dictLabel }}
+
+
+
质量
+
安全
+
认价类
+
图纸类
+
项目制度
+
索赔类
+
特殊事项
+
专项验收
-
-
+
-
+
已完成
进行中
@@ -24,7 +30,7 @@
-
@@ -33,31 +39,21 @@