|
@@ -65,22 +65,22 @@
|
|
|
<view class="navbar-screen " v-if="info.accountType==1">
|
|
|
<!-- 个人 -->
|
|
|
<u-button text="月落" size="mini" class="headbotton1" style="border-radius: 10px 0 0 10px;"
|
|
|
- :type="current==1?'success':'info'" @click="changesub(1)">按天</u-button>
|
|
|
+ :type="current==1?'success':'info'" @click="changesub(1)">天报</u-button>
|
|
|
|
|
|
<u-button text="月落" size="mini" class="headbotton2" style="border-radius: 0 0 0 0;"
|
|
|
- :type="current==2?'success':'info'" @click="changesub(2)">按月</u-button>
|
|
|
+ :type="current==2?'success':'info'" @click="changesub(2)">月报</u-button>
|
|
|
|
|
|
<u-button text="月落" size="mini" class="headbotton3" style="border-radius: 0 10px 10px 0;"
|
|
|
- :type="current==3?'success':'info'" @click="changesub(3)">按年</u-button>
|
|
|
+ :type="current==3?'success':'info'" @click="changesub(3)">年报</u-button>
|
|
|
|
|
|
</view>
|
|
|
<view class="navbar-screen " v-else>
|
|
|
<!-- 个人 -->
|
|
|
<u-button text="月落" size="mini" class="headbotton1" style="border-radius: 10px 0 0 10px;"
|
|
|
- :type="current==1?'success':'info'" @click="changesub(1)">按天</u-button>
|
|
|
+ :type="current==1?'success':'info'" @click="changesub(1)">天报</u-button>
|
|
|
|
|
|
<u-button text="月落" size="mini" class="headbotton3" style="border-radius: 0 10px 10px 0;"
|
|
|
- :type="current==2?'success':'info'" @click="changesub(2)">按月</u-button>
|
|
|
+ :type="current==2?'success':'info'" @click="changesub(2)">月报</u-button>
|
|
|
|
|
|
</view>
|
|
|
</view>
|
|
@@ -1938,7 +1938,7 @@
|
|
|
}
|
|
|
this.myChart.clear();
|
|
|
var key = ["AmountCard", "ProfitCard", "EQAmount", "DiscountCardBuyNum", "MonthCardBuyNum"]
|
|
|
- var keyStr = ['收入', '利润', '充电量', '6折卡', '月卡']
|
|
|
+ var keyStr = ['收入', '利润', '电量', '6折卡', '月卡']
|
|
|
|
|
|
var sz1 = []
|
|
|
var sz2 = []
|
|
@@ -1972,13 +1972,13 @@
|
|
|
var name = value[0].axisValueLabel;
|
|
|
var style = "float: right;margin-left: 20px;"
|
|
|
var prefix = ["lastYear", "lastSamePeriod", "nowYear"]
|
|
|
- var prefixStr = ["去年全年数据", "去年同期数据", "本年同期数据"]
|
|
|
+ var prefixStr = ["去年全年数据", "去年同期数据", "今年同期数据"]
|
|
|
var u = ['元', '元', '度', '张', '张']
|
|
|
var keytool = ["AmountCard", "ProfitCard", "EQAmount", "DiscountCardBuyNum",
|
|
|
"MonthCardBuyNum"
|
|
|
]
|
|
|
var text1 = ""
|
|
|
- //去年全年数据、去年同期数据、本年当前数据和同期完成比。
|
|
|
+ //去年全年数据、去年同期数据、今年当前数据和同期完成比。
|
|
|
var k = null;
|
|
|
for (var j in prefix) {
|
|
|
var pre = prefix[j]
|
|
@@ -2003,7 +2003,7 @@
|
|
|
'">' + (u[dataIndex]=='张'?num:showNum) + uu.u + u[dataIndex] + '</span></p>';
|
|
|
|
|
|
}
|
|
|
- text1 += "<p>本年同期完成比" +
|
|
|
+ text1 += "<p>今年同期完成比" +
|
|
|
'<span style="' + style +
|
|
|
'">' + value[0].data + '%</span></p>';
|
|
|
|
|
@@ -2013,7 +2013,7 @@
|
|
|
}
|
|
|
},
|
|
|
legend: {
|
|
|
- data: ['去年同期数据', '本年同期完成比']
|
|
|
+ data: ['去年同期数据', '今年同期完成比']
|
|
|
},
|
|
|
grid: {
|
|
|
top: 30,
|
|
@@ -2030,7 +2030,7 @@
|
|
|
type: 'value'
|
|
|
},
|
|
|
series: [{
|
|
|
- name: '本年同期完成比',
|
|
|
+ name: '今年同期完成比',
|
|
|
type: 'bar',
|
|
|
stack: '总量', // 指定堆叠的组名
|
|
|
label: {
|