diff --git a/src/components/Charts/lineMarker.vue b/src/components/Charts/lineMarker.vue index 80e6b7ec..e8dce6da 100644 --- a/src/components/Charts/lineMarker.vue +++ b/src/components/Charts/lineMarker.vue @@ -46,13 +46,14 @@ export default { this.chart.setOption({ backgroundColor: '#394056', title: { - text: '请求数', + top: 20, + text: 'Requests', textStyle: { fontWeight: 'normal', fontSize: 16, color: '#F1F1F3' }, - left: '6%' + left: '1%' }, tooltip: { trigger: 'axis', @@ -63,11 +64,12 @@ export default { } }, legend: { + top: 20, icon: 'rect', itemWidth: 14, itemHeight: 5, itemGap: 13, - data: ['移动', '电信', '联通'], + data: ['CMCC', 'CTCC', 'CUCC'], right: '4%', textStyle: { fontSize: 12, @@ -75,9 +77,10 @@ export default { } }, grid: { + top: 100, left: '3%', right: '4%', - bottom: '3%', + bottom: '2%', containLabel: true }, xAxis: [{ @@ -92,7 +95,7 @@ export default { }], yAxis: [{ type: 'value', - name: '单位(%)', + name: '(%)', axisTick: { show: false }, @@ -114,7 +117,7 @@ export default { } }], series: [{ - name: '移动', + name: 'CMCC', type: 'line', smooth: true, symbol: 'circle', @@ -148,7 +151,7 @@ export default { }, data: [220, 182, 191, 134, 150, 120, 110, 125, 145, 122, 165, 122] }, { - name: '电信', + name: 'CTCC', type: 'line', smooth: true, symbol: 'circle', @@ -182,7 +185,7 @@ export default { }, data: [120, 110, 125, 145, 122, 165, 122, 220, 182, 191, 134, 150] }, { - name: '联通', + name: 'CUCC', type: 'line', smooth: true, symbol: 'circle', diff --git a/src/components/Charts/mixChart.vue b/src/components/Charts/mixChart.vue index 05260b9f..6454dd36 100644 --- a/src/components/Charts/mixChart.vue +++ b/src/components/Charts/mixChart.vue @@ -46,15 +46,16 @@ export default { const xData = (function() { const data = [] for (let i = 1; i < 13; i++) { - data.push(i + '月份') + data.push(i + 'month') } return data }()) this.chart.setOption({ backgroundColor: '#344b58', title: { - text: '统计', - x: '4%', + text: 'statistics', + x: '20', + top: '20', textStyle: { color: '#fff', fontSize: '22' @@ -81,12 +82,12 @@ export default { } }, legend: { - x: '15%', + x: '5%', top: '10%', textStyle: { color: '#90979c' }, - data: ['女', '男', '平均'] + data: ['female', 'male', 'average'] }, calculable: true, xAxis: [{ @@ -158,9 +159,9 @@ export default { end: 35 }], series: [{ - name: '女', + name: 'female', type: 'bar', - stack: '总量', + stack: 'total', barMaxWidth: 35, barGap: '10%', itemStyle: { @@ -195,9 +196,9 @@ export default { }, { - name: '男', + name: 'male', type: 'bar', - stack: '总量', + stack: 'total', itemStyle: { normal: { color: 'rgba(0,191,183,1)', @@ -226,9 +227,9 @@ export default { 220 ] }, { - name: '平均', + name: 'average', type: 'line', - stack: '总量', + stack: 'total', symbolSize: 10, symbol: 'circle', itemStyle: { diff --git a/src/lang/en.js b/src/lang/en.js index 1ba7c112..9af0405d 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -20,7 +20,7 @@ export default { backToTop: 'BackToTop', charts: 'Charts', keyboardChart: 'Keyboard Chart', - lineChart: 'Line chart', + lineChart: 'Line Chart', mixChart: 'Mix Chart', example: 'Example', Table: 'Table', diff --git a/src/views/charts/keyboard.vue b/src/views/charts/keyboard.vue index 4001811e..30ed5762 100644 --- a/src/views/charts/keyboard.vue +++ b/src/views/charts/keyboard.vue @@ -1,8 +1,6 @@ @@ -18,8 +16,9 @@ export default { diff --git a/src/views/charts/line.vue b/src/views/charts/line.vue index 6d62e52f..c45c3813 100644 --- a/src/views/charts/line.vue +++ b/src/views/charts/line.vue @@ -1,8 +1,6 @@ @@ -18,8 +16,9 @@ export default { diff --git a/src/views/charts/mixChart.vue b/src/views/charts/mixChart.vue index 387e2e18..1ca476e6 100644 --- a/src/views/charts/mixChart.vue +++ b/src/views/charts/mixChart.vue @@ -1,8 +1,6 @@ @@ -18,9 +16,9 @@ export default {