diff --git a/src/assets/mprtgage/WarehousePlan.jpg b/src/assets/mprtgage/WarehousePlan.jpg index e6cc0ce..ef0a295 100644 Binary files a/src/assets/mprtgage/WarehousePlan.jpg and b/src/assets/mprtgage/WarehousePlan.jpg differ diff --git a/src/assets/mprtgage/WarehousePlan.png b/src/assets/mprtgage/WarehousePlan.png new file mode 100644 index 0000000..ef0a295 Binary files /dev/null and b/src/assets/mprtgage/WarehousePlan.png differ diff --git a/src/settings.js b/src/settings.js index 290227a..50e9e8a 100644 --- a/src/settings.js +++ b/src/settings.js @@ -1,6 +1,6 @@ module.exports = { - title: '门店展示', + title: '标准仓项目展示', /** * @type {boolean} true | false diff --git a/src/views/echarts/barlineEacharts.vue b/src/views/echarts/barlineEacharts.vue index 875d1c7..a34eb6d 100644 --- a/src/views/echarts/barlineEacharts.vue +++ b/src/views/echarts/barlineEacharts.vue @@ -75,14 +75,20 @@ export default { serviceData2, } = {}) { this.chart.setOption({ - color: ['#ff9900', '#10aeff'], + // color: ['#ff9900', '#10aeff','#ff9900', '#10aeff','#ff9900'], tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } }, - legend: {}, + legend: { + textStyle: { + color:'#fff', + fontSize:14, + padding:[0,10] + }, + }, grid: { left: '3%', right: '4%', @@ -92,12 +98,27 @@ export default { xAxis: [ { type: 'category', - data: this.chartData.date + data: this.chartData.date, + axisLabel: { + textStyle: { + color:'#fff', + } + } } ], yAxis: [ { - type: 'value' + type: 'value', + name: '人民币/元', + min: 10000, + max: 25000000, + interval: 2000000, + axisLabel: { + formatter: '{value} 元', + textStyle: { + color:'#fff', + } + } } ], series: [ @@ -119,7 +140,34 @@ export default { focus: 'series' }, data: this.chartData.gongyinglian - } + }, + { + name: '门店', + type: 'bar', + stack: 'Search Engine', + emphasis: { + focus: 'series' + }, + data: this.chartData.mendian + }, + { + name: '烟草门店', + type: 'bar', + stack: 'Search Engine', + emphasis: { + focus: 'series' + }, + data: this.chartData.ycMendian + }, + { + name: '残次品', + type: 'bar', + stack: 'Search Engine', + emphasis: { + focus: 'series' + }, + data: this.chartData.cancipin + } ]}); this.chart.on("click", function (param) { this.callParents(param); diff --git a/src/views/echarts/mixins/resize.js b/src/views/echarts/mixins/resize.js index bcd17bf..3e9ac33 100644 --- a/src/views/echarts/mixins/resize.js +++ b/src/views/echarts/mixins/resize.js @@ -1,4 +1,4 @@ -import { debounce } from '@/utils' +import debounce from '@/utils' export default { data() { diff --git a/src/views/echarts/pieLineEacharts.vue b/src/views/echarts/pieLineEacharts.vue index f71965b..31cb211 100644 --- a/src/views/echarts/pieLineEacharts.vue +++ b/src/views/echarts/pieLineEacharts.vue @@ -110,11 +110,11 @@ export default { orient: 'vertical', left:'70%', align:'left', - top:'0', + top:'80', itemGap:30, - padding:[20,29,40,0], + padding:[20,0,20,10], textStyle: { - color:'#333', + color:'#fff', fontSize:14, padding:[0,10] }, diff --git a/src/views/mortgage/index.vue b/src/views/mortgage/index.vue index e02e4c4..e26e058 100644 --- a/src/views/mortgage/index.vue +++ b/src/views/mortgage/index.vue @@ -1,10 +1,10 @@