|
@@ -61,25 +61,22 @@ let vm = new Vue({
|
|
|
date: '',
|
|
|
refreshTime: 10,
|
|
|
type: 'store',
|
|
|
- // sales : [{
|
|
|
- storeId: '',
|
|
|
- merchSn: '',
|
|
|
- merchName: '',
|
|
|
- storeName: '',
|
|
|
- salesDate: '',
|
|
|
- totalSales: '',
|
|
|
- actualSales: '',
|
|
|
- preferentialLoss: '',
|
|
|
- totalCost: '',
|
|
|
- grossProfit: '',
|
|
|
- grossProfitRatio: '',
|
|
|
- proportion: '',
|
|
|
- guestNumber: '',
|
|
|
- guestUnitPrice: '',
|
|
|
- lastSalesTime: '',
|
|
|
- showList:false
|
|
|
- // }]
|
|
|
-,
|
|
|
+ storeId: '',
|
|
|
+ merchSn: '',
|
|
|
+ merchName: '',
|
|
|
+ storeName: '',
|
|
|
+ salesDate: '',
|
|
|
+ totalSales: '',
|
|
|
+ actualSales: '',
|
|
|
+ preferentialLoss: '',
|
|
|
+ totalCost: '',
|
|
|
+ grossProfit: '',
|
|
|
+ grossProfitRatio: '',
|
|
|
+ proportion: '',
|
|
|
+ guestNumber: '',
|
|
|
+ guestUnitPrice: '',
|
|
|
+ lastSalesTime: '',
|
|
|
+ showList:false ,
|
|
|
compareDate: '',//比较日期
|
|
|
storeId2: '',
|
|
|
merchSn2: '',
|
|
@@ -202,14 +199,6 @@ let vm = new Vue({
|
|
|
|
|
|
vm.seriesList =[];
|
|
|
vm.seriesList2 =[];
|
|
|
- vm.seriesList.push(
|
|
|
- {
|
|
|
- // name: '销售额',
|
|
|
- type: vm.seriesTypeSelect,
|
|
|
- color: ['#dd6b66','#759aa0'],
|
|
|
- data: [vm.totalSales]
|
|
|
- })
|
|
|
- ;
|
|
|
vm.seriesList2.push( vm.totalSales);
|
|
|
console.log(vm.seriesList2);
|
|
|
console.log('vm.seriesList2');
|
|
@@ -248,18 +237,20 @@ let vm = new Vue({
|
|
|
vm.guestUnitPrice2 = r.guestUnitPrice;
|
|
|
vm.lastSalesTime2 = r.lastSalesTime;
|
|
|
|
|
|
- vm.seriesList.push({
|
|
|
- // name: '销售额',
|
|
|
- type: vm.seriesTypeSelect,
|
|
|
- color: ['#dd6b66','#759aa0'],
|
|
|
- data: [vm.totalSales2]
|
|
|
- });
|
|
|
|
|
|
- vm.seriesList2.push(vm.totalSales2);
|
|
|
+ if(vm.seriesList2.length > 1){
|
|
|
+ //删除并替换
|
|
|
+ vm.seriesList2.splice(1,1,vm.totalSales2);
|
|
|
|
|
|
- vm.dataList.push(
|
|
|
- '['+vm.storeId2+']'+vm.storeName2+'总销售额('+vm.salesDate2+')'
|
|
|
- );
|
|
|
+ vm.dataList.splice(1,1,
|
|
|
+ '['+vm.storeId2+']'+vm.storeName2+'总销售额('+vm.salesDate2+')'
|
|
|
+ );
|
|
|
+ }else{
|
|
|
+ vm.seriesList2.push(vm.totalSales2);
|
|
|
+ vm.dataList.push(
|
|
|
+ '['+vm.storeId2+']'+vm.storeName2+'总销售额('+vm.salesDate2+')'
|
|
|
+ );
|
|
|
+ }
|
|
|
console.log(vm.dataList);
|
|
|
myChart.setOption({
|
|
|
xAxis: {
|
|
@@ -306,6 +297,8 @@ let vm = new Vue({
|
|
|
yAxis: {},
|
|
|
// series: seriesList
|
|
|
series:[{
|
|
|
+ barMaxWidth: '20%' ,
|
|
|
+ barWidth: '50%' ,
|
|
|
type: vm.seriesTypeSelect,
|
|
|
color: ['#dd6b66','#759aa0'],
|
|
|
data: vm.seriesList2
|