diff --git a/back/src/views/modules/activiti/demo/putaway-process.vue b/back/src/views/modules/activiti/demo/putaway-process.vue index b4915c25..eb6d20c7 100644 --- a/back/src/views/modules/activiti/demo/putaway-process.vue +++ b/back/src/views/modules/activiti/demo/putaway-process.vue @@ -66,21 +66,35 @@
- + - + + + + - + + + + - + @@ -180,7 +194,9 @@ export default { dataForm: [], id: '', shifoushizujian: true, - coverageNotShow: true + coverageNotShow: true, + nameNotShow: false, + algorithmShow: true } }, watch: {}, @@ -209,13 +225,16 @@ export default { } this.dataForm = res.data.resourceDTO if (this.dataForm.type != '应用资源') { + this.shifoushizujian = false this.dataForm.infoList.forEach((val) => { if (val.attrValue === '图层服务') { this.coverageNotShow = false - console.log(this.coverageNotShow, 'wowowo') + } else if (val.attrValue === '智能算法') { + this.nameNotShow = true + this.algorithmShow = false + console.log(this.nameNotShow, 'wowowo') } }) - this.shifoushizujian = false } else { this.shifoushizujian = true } diff --git a/back/src/views/modules/workBench/components/dept-chart-view.vue b/back/src/views/modules/workBench/components/dept-chart-view.vue index 400863a4..79291918 100644 --- a/back/src/views/modules/workBench/components/dept-chart-view.vue +++ b/back/src/views/modules/workBench/components/dept-chart-view.vue @@ -30,6 +30,12 @@ export default { type: Array, default: () => [] }, + colorArray: { + type: Array, + default: () => [ + '#fe845e', '#ff3e55', '#d5c438', '#ff9999', '#9c78ed', '#48c760', '#48c6c7', '#0058e1', + ] + }, }, watch: { dataList: { @@ -62,9 +68,6 @@ export default { this.myChart = chartDom && echarts.init(chartDom); let lengendArr = this.dataListCopy.filter(v => v.name); - let colorArray = [ - '#fe845e', '#ff3e55', '#d5c438', '#ff9999', '#9c78ed', '#48c760', '#48c6c7', '#0058e1', - ] let total = 0; this.dataListCopy.map(v => { @@ -98,7 +101,17 @@ export default { }, ], tooltip: { - triagger: 'item' + triagger: 'item', + formatter: (params) => { + let str = '' + if (params.name == '线') { + str = '' + } else { + str = `${params.name}: ${params.value}` + } + return str; + } }, "legend": { type: 'scroll', @@ -119,7 +132,7 @@ export default { "type": "pie", "center": ["50%", "40%"], "radius": ["50%", "63%"], - "color": colorArray, + "color": this.colorArray, "startAngle": 135, label: { show: false @@ -163,18 +176,19 @@ export default { }, data: this.dataListCopy, }, - { "type": "pie", "center": ["50%", "40%"], - "radius": ["35%", "36%"], + "radius": ["38%", "39%"], "label": { "show": false }, + hoverAnimation: false, + showTooltip: false, color: ['#d8dde8'], "data": [{ - "value": 78, - "name": "实例1", + "value": 0, + "name": "线", }] } ] diff --git a/back/src/views/modules/workBench/components/dept-todo-view.vue b/back/src/views/modules/workBench/components/dept-todo-view.vue index 21406fa1..2ee0baca 100644 --- a/back/src/views/modules/workBench/components/dept-todo-view.vue +++ b/back/src/views/modules/workBench/components/dept-todo-view.vue @@ -12,9 +12,16 @@
-
- {{ item[dataInfo.nameStr] || '--' }} + +
+ + +
+ {{ item[dataInfo.nameStr] || '--' }} +
+
+
查看更多 >
@@ -49,6 +56,13 @@ export default { }