{{ title }}
@@ -40,7 +40,7 @@ export default {
// 解决数据初始渲染不出来的问题
setTimeout(() => {
this.initChart()
- }, 1000)
+ }, 2000)
}
}
},
@@ -51,7 +51,7 @@ export default {
mounted() {
setTimeout(() => {
this.initChart()
- }, 1000)
+ }, 2000)
},
methods: {
initChart() {
@@ -60,11 +60,8 @@ export default {
this.myChart.dispose()
}
this.myChart = chartDom && echarts.init(chartDom);
- console.log('this.myChart------------>', this.myChart);
-
let lengendArr = this.dataListCopy.filter(v => v.name);
-
let colorArray = [
'#fe845e', '#ff3e55', '#d5c438', '#ff9999', '#9c78ed', '#48c760', '#48c6c7', '#0058e1',
]
@@ -113,8 +110,8 @@ export default {
},
"icon": "circle",
"right": "0",
- "bottom": "0",
- "padding": [10, 60],
+ "bottom": "30",
+ // "padding": [10, 60],
"itemGap": 10,
"data": lengendArr
},
@@ -188,6 +185,12 @@ export default {
}
\ No newline at end of file
diff --git a/back/src/views/modules/workBench/components/risk-view.vue b/back/src/views/modules/workBench/components/risk-view.vue
index 879d05e9..8df8f573 100644
--- a/back/src/views/modules/workBench/components/risk-view.vue
+++ b/back/src/views/modules/workBench/components/risk-view.vue
@@ -1,17 +1,32 @@
\ No newline at end of file
diff --git a/back/src/views/modules/workBench/workBench.vue b/back/src/views/modules/workBench/workBench.vue
index 7f80c24f..da4f3d82 100644
--- a/back/src/views/modules/workBench/workBench.vue
+++ b/back/src/views/modules/workBench/workBench.vue
@@ -3,13 +3,17 @@
-
-
+
+
-
-
-
+
+
+
+
+
+
@@ -67,6 +71,11 @@ export default {
applyData: [],
// 上架
requireData: [],
+ loadingToDo: false,
+ loadingHasToDo: false,
+ loadingResource: false,
+ loadingApply: false,
+ loadingRequire: false,
}
},
mounted() {
@@ -84,11 +93,13 @@ export default {
methods: {
// 待办
getToDo() {
+ this.loadingToDo = true;
let data = {
limit: 5,
page: 1,
}
Apis.getToDoTask(data, res => {
+ this.loadingToDo = false;
if (res.data.code !== 0) {
return this.$message.error(res.data.msg)
}
@@ -96,7 +107,8 @@ export default {
this.toToData.list = res.data.data.records || []
this.toToData.num = res.data.data.records.length || 0
}, err => {
- this.$message.error(err)
+ this.$message.error(err);
+ this.loadingToDo = false;
})
},
// 已办
@@ -105,7 +117,9 @@ export default {
limit: 5,
page: 1,
}
+ this.loadingHasToDo = true;
Apis.getHasToDoTask(data, res => {
+ this.loadingHasToDo = false;
if (res.data.code !== 0) {
return this.$message.error(res.data.msg)
}
@@ -114,12 +128,15 @@ export default {
this.hasToDodoData.num = res.data.data.records.length || 0
}, err => {
this.$message.error(err)
+ this.loadingHasToDo = false;
console.log('err-----已办------->', err);
})
},
// 部门上架
getShelvesTotal() {
+ this.loadingResource = true;
Apis.getTotalByDept({}, res => {
+ this.loadingResource = false;
if (res.data.code !== 0) {
return this.$message.error(res.data.msg)
}
@@ -127,11 +144,14 @@ export default {
this.resourceData = this.formatList(res.data.data.total || [])
}, err => {
this.$message.error(err)
+ this.loadingResource = false;
})
},
// 部门申请
getApplyTotal() {
+ this.loadingApply = true;
Apis.getApply({}, res => {
+ this.loadingApply = false;
if (res.data.code !== 0) {
return this.$message.error(res.data.msg)
}
@@ -139,6 +159,7 @@ export default {
this.applyData = this.formatList(res.data.data.total || [])
}, err => {
this.$message.error(err)
+ this.loadingApply = false;
})
},
formatList(list = [], nameStr = 'type') {
@@ -153,14 +174,18 @@ export default {
},
// 部门需求
getRequireTotal() {
+ this.loadingRequire = true;
Apis.getRequire({}, res => {
+ this.loadingRequire = false;
if (res.data.code !== 0) {
return this.$message.error(res.data.msg)
}
console.log('res----部门需求-------->', res.data);
this.requireData = this.formatList(res.data.data.total || [], 'flag')
+
}, err => {
this.$message.error(err)
+ this.loadingRequire = false;
})
},