|
@@ -74,7 +74,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<o-empty v-if="echartsList.countUserNumVoList && echartsList.countUserNumVoList.length == 0" height="20vh" />
|
|
|
- <qiun-data-charts v-else type="area" :opts="opts1" :chartData="chartData1" />
|
|
|
+ <qiun-data-charts v-else type="area" :opts="opts1" :chartData="chartData1" />
|
|
|
|
|
|
</view>
|
|
|
<view class="body-box" v-if="type == 1">
|
|
@@ -87,9 +87,8 @@
|
|
|
</view>
|
|
|
<leverStaff @getPartnerType="getPartnerType2"></leverStaff>
|
|
|
<!-- <o-empty v-if="echartsList.countUserNumVoList && echartsList.countUserNumVoList.length==0" height="20vh" /> -->
|
|
|
- <view class="charts-box">
|
|
|
- <qiun-data-charts type="ring" :opts="{ legend: { position: 'bottom' } }" :eopts="ringOpts" :chartData="chartsDataPie2"
|
|
|
- :echartsH5="true" :echartsApp="true" />
|
|
|
+ <view class="charts-box" style="height: 200px;">
|
|
|
+ <qiun-data-charts type="ring" :eopts="ringOpts" :chartData="chartsDataPie2" />
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="body-box" style="padding-bottom: 10px;" v-if="type == 1">
|
|
@@ -150,7 +149,7 @@
|
|
|
<text :class="typeStatistics == 2 ? 'selected' : ''" @click="getStatistics(2)">代理人</text>
|
|
|
</view>
|
|
|
<o-empty v-if="echartsList.countUserNumVoList && echartsList.countUserNumVoList.length == 0" height="20vh" />
|
|
|
- <qiun-data-charts v-else type="area" :opts="opts1" :chartData="chartData1" />
|
|
|
+ <qiun-data-charts v-else type="area" :opts="opts1" :chartData="chartData1" />
|
|
|
</view>
|
|
|
|
|
|
</view>
|
|
@@ -166,14 +165,16 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
- beginTime:'',
|
|
|
- endTime:'',
|
|
|
+ beginTime: '',
|
|
|
+ endTime: '',
|
|
|
ringOpts: {
|
|
|
- color: [ '#02CDFF','#2D97FF '],
|
|
|
- legend: { show: false },
|
|
|
+ color: [ '#02CDFF ','#2D97FF'],
|
|
|
+ legend: {
|
|
|
+ show: false // 设置图例不显示
|
|
|
+ },
|
|
|
dataLabel: true,
|
|
|
- },
|
|
|
- chartsDataPie2 :{},
|
|
|
+ },
|
|
|
+ chartsDataPie2: {},
|
|
|
level: '',
|
|
|
type: null,
|
|
|
typeStatistics: 1,
|
|
@@ -219,17 +220,17 @@ export default {
|
|
|
// optsMax:10,
|
|
|
opts1: {
|
|
|
legend: {
|
|
|
- show: false // 设置图例不显示
|
|
|
+ show: false // 设置图例不显示
|
|
|
},
|
|
|
yAxis: {
|
|
|
- gridType: "dash",
|
|
|
- dashLength: 2,
|
|
|
- data: [
|
|
|
- {
|
|
|
- min: 0,
|
|
|
- max: 10
|
|
|
- }
|
|
|
- ]
|
|
|
+ gridType: "dash",
|
|
|
+ dashLength: 2,
|
|
|
+ data: [
|
|
|
+ {
|
|
|
+ min: 0,
|
|
|
+ max: 10
|
|
|
+ }
|
|
|
+ ]
|
|
|
},
|
|
|
extra: {
|
|
|
area: {
|
|
@@ -248,7 +249,7 @@ export default {
|
|
|
// }
|
|
|
}
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
chartData1: {},
|
|
|
directLsit: []
|
|
|
}
|
|
@@ -331,9 +332,9 @@ export default {
|
|
|
let day = now.getDate();
|
|
|
if (index == 0 && val.startShow) {
|
|
|
let theDay = `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
|
|
|
- this.beginTime=theDay + ' 00:00:01'
|
|
|
- this.endTime=theDay + ' 23:59:59'
|
|
|
- type == 1?this.queryData():this.analysisQueryData()
|
|
|
+ this.beginTime = theDay + ' 00:00:01'
|
|
|
+ this.endTime = theDay + ' 23:59:59'
|
|
|
+ type == 1 ? this.queryData() : this.analysisQueryData()
|
|
|
}
|
|
|
else if (index == 1 && val.startShow) {
|
|
|
let dayOfWeek = now.getDay();
|
|
@@ -341,19 +342,19 @@ export default {
|
|
|
let lastDayOfWeek = new Date(year, now.getMonth(), day + (7 - dayOfWeek));
|
|
|
let monday = this.formatDate(firstDayOfWeek);
|
|
|
let sunday = this.formatDate(lastDayOfWeek);
|
|
|
- this.beginTime=monday + ' 00:00:01'
|
|
|
- this.endTime= sunday + ' 23:59:59'
|
|
|
- type == 1?this.queryData():this.analysisQueryData()
|
|
|
+ this.beginTime = monday + ' 00:00:01'
|
|
|
+ this.endTime = sunday + ' 23:59:59'
|
|
|
+ type == 1 ? this.queryData() : this.analysisQueryData()
|
|
|
}
|
|
|
else if (index == 2 && val.startShow) {
|
|
|
- this.beginTime= this.getCurrentMonthFirst() + ' 00:00:01'
|
|
|
- this.endTime= this.getCurrentMonthLast() + ' 23:59:59'
|
|
|
- type == 1?this.queryData():this.analysisQueryData()
|
|
|
+ this.beginTime = this.getCurrentMonthFirst() + ' 00:00:01'
|
|
|
+ this.endTime = this.getCurrentMonthLast() + ' 23:59:59'
|
|
|
+ type == 1 ? this.queryData() : this.analysisQueryData()
|
|
|
}
|
|
|
else {
|
|
|
- this.beginTime= ''
|
|
|
- this.endTime= ''
|
|
|
- type == 1?this.queryData():this.analysisQueryData()
|
|
|
+ this.beginTime = ''
|
|
|
+ this.endTime = ''
|
|
|
+ type == 1 ? this.queryData() : this.analysisQueryData()
|
|
|
}
|
|
|
|
|
|
},
|
|
@@ -393,13 +394,20 @@ export default {
|
|
|
let res = await this.$http.post('/APPPartner/getPartnerProportion', params);
|
|
|
if (res.code == '200') {
|
|
|
this.chartsDataPie2 = {
|
|
|
- "series": [{
|
|
|
+ series: [{
|
|
|
+ // "data": [
|
|
|
+ // { name: `新增`, value: res.data.newProportion, labelText: `
|
|
|
+ // ${res.data.newProportion?'新增:'+res.data.newProportion+'%':false}
|
|
|
+ // ` },
|
|
|
+ // { name: "历史", value: res.data.oldProportion, labelText: `历史:${res.data.oldProportion}%` }
|
|
|
+ // ]
|
|
|
"data": [
|
|
|
- { name: `新增`,value: res.data.newProportion,labelText:`历史:${res.data.oldProportion}%` },
|
|
|
- {name: "历史", value: res.data.oldProportion, labelText:`历史:${res.data.oldProportion}%` }
|
|
|
+ { name: `新增`, value: res.data.newProportion},
|
|
|
+ { name: "历史", value: res.data.oldProportion}
|
|
|
]
|
|
|
}]
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
},
|
|
|
async rankingQueryData() {
|
|
@@ -440,16 +448,19 @@ export default {
|
|
|
categories: dateList,
|
|
|
series: [
|
|
|
{
|
|
|
- name: "人数",
|
|
|
- // type: "line",
|
|
|
- data: valueList
|
|
|
- },
|
|
|
- ]
|
|
|
+ name: "人数",
|
|
|
+ // type: "line",
|
|
|
+ data: valueList
|
|
|
+ },
|
|
|
+ ]
|
|
|
};
|
|
|
- valueList.sort((a,b) => a-b)
|
|
|
- this.opts1.yAxis.data[0].max= valueList[valueList.length - 1];
|
|
|
+ valueList.sort((a, b) => a - b)
|
|
|
+ this.opts1.yAxis.data[0].max = valueList[valueList.length - 1];
|
|
|
this.chartData1 = JSON.parse(JSON.stringify(rualit));
|
|
|
}
|
|
|
+ else {
|
|
|
+ this.echartsList.countUserNumVoList = []
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -665,8 +676,9 @@ export default {
|
|
|
}
|
|
|
|
|
|
}
|
|
|
-.charts-box{
|
|
|
+
|
|
|
+.charts-box {
|
|
|
width: 100%;
|
|
|
- height: 300px;
|
|
|
+ height: 300px;
|
|
|
}
|
|
|
</style>
|