diff --git a/package.json b/package.json index b83f1720..49cf9f6f 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "decimal.js": "^10.2.0", "driver.js": "^0.9.8", "dropzone": "5.2.0", - "echarts": "3.8.5", + "echarts": "^5.3.2", "element-ui": "^2.13.0", "file-saver": "2.0.1", "font-awesome": "4.7.0", diff --git a/src/main.js b/src/main.js index f9754266..0c00acb6 100644 --- a/src/main.js +++ b/src/main.js @@ -16,8 +16,7 @@ import './icons' // icon import './errorLog'// error log import './permission' // permission control //import './mock' // simulation data -import echarts from 'echarts' -import 'echarts/map/js/china.js' +import * as echarts from 'echarts' import * as filters from './filters' // global filters import Print from 'vue-print-nb' diff --git a/src/views/xm/rpt/product/productWorkItemDayList.vue b/src/views/xm/rpt/product/productWorkItemDayList.vue index 1d121812..b4892310 100644 --- a/src/views/xm/rpt/product/productWorkItemDayList.vue +++ b/src/views/xm/rpt/product/productWorkItemDayList.vue @@ -57,7 +57,7 @@ }, dataSetCpd(){ return [ - ['date',...this.datesCpd], + ['日期',...this.datesCpd], ['故事数',...this.menuNumCpd], ['缺陷数',...this.bugNumCpd], ['任务数',...this.taskNumCpd] @@ -118,6 +118,25 @@ }, drawCharts() { this.myChart = this.$echarts.init(document.getElementById("productWorkItemDayList")); + var that=this; + this.myChart.on('updateAxisPointer', function (event) { + const xAxisInfo = event.axesInfo[0]; + if (xAxisInfo) { + const dimension = xAxisInfo.value + 1; + that.myChart.setOption({ + series: { + id: 'pie', + label: { + formatter: '{b}: {@[' + dimension + ']} ({d}%)' + }, + encode: { + value: dimension, + tooltip: dimension + } + } + }); + } + }); this.myChart.setOption({ title: { text: '工作项分布', @@ -138,62 +157,23 @@ yAxis: { gridIndex: 0 }, grid: { top: '55%' }, series: [ - { - name: '故事数', + { type: 'line', seriesLayoutBy: 'row', smooth:true, - emphasis: { focus: 'series' }, - // stack: '剩余工作量', - itemStyle: { - normal: { - // 折点颜色样式 - color: 'green', - lineStyle: { - // 折线颜色样式 - color: 'green' - } - } - }, - // data: this.opinionData, + emphasis: { focus: 'series' }, }, - { - name: '任务数', + { type: 'line', seriesLayoutBy: 'row', smooth:true, - emphasis: { focus: 'series' }, - // stack: '剩余工作量', - itemStyle: { - normal: { - // 折点颜色样式 - color: 'blue', - lineStyle: { - // 折线颜色样式 - color: 'blue' - } - } - }, - // data: this.opinionData, + emphasis: { focus: 'series' }, }, - { - name: '缺陷数', + { type: 'line', seriesLayoutBy: 'row', smooth:true, - emphasis: { focus: 'series' }, - // stack: '剩余工作量', - itemStyle: { - normal: { - // 折点颜色样式 - color: 'orange', - lineStyle: { - // 折线颜色样式 - color: 'orange' - } - } - }, - // data: this.opinionData, + emphasis: { focus: 'series' }, }, { type: 'pie', @@ -204,35 +184,16 @@ focus: 'self' }, label: { - formatter: '{b}: {@2012} ({d}%)' + formatter: '{b}: {@日期} ({d}%)' }, encode: { - itemName: 'date', - value: '2012', - tooltip: '2012' + itemName: '日期', + value: '日期', + tooltip: '日期' } } ] - }); - - this.myChart.on('updateAxisPointer', function (event) { - const xAxisInfo = event.axesInfo[0]; - if (xAxisInfo) { - const dimension = xAxisInfo.value + 1; - this.myChart.setOption({ - series: { - id: 'pie', - label: { - formatter: '{b}: {@[' + dimension + ']} ({d}%)' - }, - encode: { - value: dimension, - tooltip: dimension - } - } - }); - } - }); + }); } },//end method mounted() {