|
@@ -70,6 +70,7 @@
|
|
<span v-else-if="item.type === 'double'">{{ Number(item.today) | decimalsHandle }}</span>
|
|
<span v-else-if="item.type === 'double'">{{ Number(item.today) | decimalsHandle }}</span>
|
|
<span v-else-if="item.type === 'string'">{{ Number(item.today) | decimalsHandle }}</span>
|
|
<span v-else-if="item.type === 'string'">{{ Number(item.today) | decimalsHandle }}</span>
|
|
<span v-else-if="item.type === 'int'">{{ item.today !== 0 ? item.today + '%' : 0 }}</span>
|
|
<span v-else-if="item.type === 'int'">{{ item.today !== 0 ? item.today + '%' : 0 }}</span>
|
|
|
|
+ <span v-else-if="item.type === 'average'">{{ Number(item.today) | decimalsHandle }}</span>
|
|
<span class="sign">
|
|
<span class="sign">
|
|
<a-icon type="rise" class="rise" v-show="item.today - item.yesterday > 0"/>
|
|
<a-icon type="rise" class="rise" v-show="item.today - item.yesterday > 0"/>
|
|
<a-icon type="fall" class="fall" v-show="item.today - item.yesterday < 0" />
|
|
<a-icon type="fall" class="fall" v-show="item.today - item.yesterday < 0" />
|
|
@@ -81,6 +82,7 @@
|
|
<span v-else-if="item.type === 'double'">{{ Number(item.yesterday) | decimalsHandle }}</span>
|
|
<span v-else-if="item.type === 'double'">{{ Number(item.yesterday) | decimalsHandle }}</span>
|
|
<span v-else-if="item.type === 'string'">{{ Number(item.yesterday) | decimalsHandle }}</span>
|
|
<span v-else-if="item.type === 'string'">{{ Number(item.yesterday) | decimalsHandle }}</span>
|
|
<span v-else-if="item.type === 'int'">{{ item.yesterday !== 0 ? item.yesterday + '%' : 0 }}</span>
|
|
<span v-else-if="item.type === 'int'">{{ item.yesterday !== 0 ? item.yesterday + '%' : 0 }}</span>
|
|
|
|
+ <span v-else-if="item.type === 'average'">{{ Number(item.yesterday) | decimalsHandle }}</span>
|
|
</div>
|
|
</div>
|
|
<span
|
|
<span
|
|
class="IndexName"
|
|
class="IndexName"
|
|
@@ -404,7 +406,7 @@ export default {
|
|
key: 'formCount',
|
|
key: 'formCount',
|
|
today: 0,
|
|
today: 0,
|
|
yesterday: 0,
|
|
yesterday: 0,
|
|
- type: 'int'
|
|
|
|
|
|
+ type: 'average'
|
|
}
|
|
}
|
|
],
|
|
],
|
|
newLink: '',
|
|
newLink: '',
|
|
@@ -803,6 +805,7 @@ export default {
|
|
this.throwColumns[3].yesterday = Number(result.result.lastMap.converRate);
|
|
this.throwColumns[3].yesterday = Number(result.result.lastMap.converRate);
|
|
this.throwColumns[4].today = Number(result.result.nowMap.averageShow);
|
|
this.throwColumns[4].today = Number(result.result.nowMap.averageShow);
|
|
this.throwColumns[4].yesterday = Number(result.result.lastMap.averageShow);
|
|
this.throwColumns[4].yesterday = Number(result.result.lastMap.averageShow);
|
|
|
|
+ this.isActive = 'spendCost';
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
this.$message.error(result.message);
|
|
this.$message.error(result.message);
|
|
@@ -1057,7 +1060,7 @@ export default {
|
|
trigger: 'axis',
|
|
trigger: 'axis',
|
|
formatter: params => {
|
|
formatter: params => {
|
|
let isType = '';
|
|
let isType = '';
|
|
- let showBai = this.isActive === 'bclick' || this.isActive === 'formCount' ? '%' : '';
|
|
|
|
|
|
+ let showBai = this.isActive === 'bclick' ? '%' : '';
|
|
this.throwColumns.forEach(item => {
|
|
this.throwColumns.forEach(item => {
|
|
if (item.dataIndex === this.isActive) {
|
|
if (item.dataIndex === this.isActive) {
|
|
isType = item.title;
|
|
isType = item.title;
|
|
@@ -1082,17 +1085,16 @@ export default {
|
|
type: 'category',
|
|
type: 'category',
|
|
show: false,
|
|
show: false,
|
|
boundaryGap: false,
|
|
boundaryGap: false,
|
|
- data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
|
|
|
|
|
|
+ data: [],
|
|
axisPointer: {
|
|
axisPointer: {
|
|
type: 'none'
|
|
type: 'none'
|
|
}
|
|
}
|
|
-
|
|
|
|
},
|
|
},
|
|
{
|
|
{
|
|
type: 'category',
|
|
type: 'category',
|
|
show: false,
|
|
show: false,
|
|
boundaryGap: false,
|
|
boundaryGap: false,
|
|
- data: ['1', '2', '3', '4', '5', '6', '7'],
|
|
|
|
|
|
+ data: [],
|
|
axisPointer: {
|
|
axisPointer: {
|
|
type: 'none'
|
|
type: 'none'
|
|
}
|
|
}
|
|
@@ -1109,7 +1111,7 @@ export default {
|
|
type: 'line',
|
|
type: 'line',
|
|
smooth: true,
|
|
smooth: true,
|
|
showSymbol: false,
|
|
showSymbol: false,
|
|
- xAxisIndex: 1,
|
|
|
|
|
|
+ xAxisIndex: 0,
|
|
symbol: 'circle',
|
|
symbol: 'circle',
|
|
lineStyle: {
|
|
lineStyle: {
|
|
color: '#2461F1',
|
|
color: '#2461F1',
|
|
@@ -1143,7 +1145,7 @@ export default {
|
|
data: [],
|
|
data: [],
|
|
type: 'line',
|
|
type: 'line',
|
|
smooth: true,
|
|
smooth: true,
|
|
- xAxisIndex: 0,
|
|
|
|
|
|
+ xAxisIndex: 1,
|
|
showSymbol: false,
|
|
showSymbol: false,
|
|
symbol: 'circle',
|
|
symbol: 'circle',
|
|
lineStyle: {
|
|
lineStyle: {
|
|
@@ -1176,6 +1178,8 @@ export default {
|
|
};
|
|
};
|
|
option.xAxis[0].data = todayX;
|
|
option.xAxis[0].data = todayX;
|
|
option.xAxis[1].data = LastX;
|
|
option.xAxis[1].data = LastX;
|
|
|
|
+ option.series[0].name = data.nowMap.costList[0].statDatetime;
|
|
|
|
+ option.series[1].name = data.lastMap.costList[0].statDatetime;
|
|
option.series[0].data = tadayShowY;
|
|
option.series[0].data = tadayShowY;
|
|
option.series[1].data = yestodayShowY;
|
|
option.series[1].data = yestodayShowY;
|
|
return option;
|
|
return option;
|
|
@@ -1221,8 +1225,7 @@ export default {
|
|
detail: {
|
|
detail: {
|
|
formatter: function(value) {
|
|
formatter: function(value) {
|
|
if (value !== 0) {
|
|
if (value !== 0) {
|
|
- let num = Math.round(value);
|
|
|
|
- return parseInt(num).toFixed(0) + '%';
|
|
|
|
|
|
+ return value + '%';
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
return 0;
|
|
return 0;
|