|
@@ -5,7 +5,7 @@
|
|
<div style="display: flex;justify-content:space-around;margin: 25px;">
|
|
<div style="display: flex;justify-content:space-around;margin: 25px;">
|
|
<div>
|
|
<div>
|
|
<p style="font-weight:900;font-size: 16px;">余额</p>
|
|
<p style="font-weight:900;font-size: 16px;">余额</p>
|
|
- <p>{{balance}}</p>
|
|
|
|
|
|
+ <p>{{balance | formatNum}}</p>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<p style="font-weight:900;font-size: 16px;">投放状态</p>
|
|
<p style="font-weight:900;font-size: 16px;">投放状态</p>
|
|
@@ -13,13 +13,13 @@
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<p style="font-weight:900;font-size: 16px;">今日消耗</p>
|
|
<p style="font-weight:900;font-size: 16px;">今日消耗</p>
|
|
- <p>{{totalCost}}</p>
|
|
|
|
|
|
+ <p>{{totalCost | formatNum}}</p>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :span="10" :pull="14">
|
|
<a-col :span="10" :pull="14">
|
|
- <div style="margin:20px;">
|
|
|
|
|
|
+ <div style="margin:20px;" @click="changeAccount">
|
|
<p style="font-weight:900;font-size: 18px;">{{accountName}}</p>
|
|
<p style="font-weight:900;font-size: 18px;">{{accountName}}</p>
|
|
<p>账户ID:{{accountId}}</p>
|
|
<p>账户ID:{{accountId}}</p>
|
|
</div>
|
|
</div>
|
|
@@ -47,12 +47,20 @@
|
|
</div>
|
|
</div>
|
|
<a-row>
|
|
<a-row>
|
|
<a-col :span="8">
|
|
<a-col :span="8">
|
|
- <a-checkbox-group v-model="valueBtn" name="checkboxgroup" :options="plainOptions"
|
|
|
|
- @change="checkboxonChange" />
|
|
|
|
|
|
+ <a-radio-group v-for="item in indexShowS" :key="item.key" v-model="valueBtn" @change="checkboxonChange">
|
|
|
|
+ <a-radio :value="item.dataIndex">
|
|
|
|
+ {{item.title}}
|
|
|
|
+ </a-radio>
|
|
|
|
+ </a-radio-group>
|
|
|
|
+ <!-- <a-checkbox-group v-model="valueBtn" name="checkboxgroup" :options="plainOptions"
|
|
|
|
+ @change="checkboxonChange" /> -->
|
|
|
|
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :span="8" :offset="8">
|
|
<a-col :span="8" :offset="8">
|
|
- <p style="text-align: right;color: rgb(165, 165, 165);">显示指标</p>
|
|
|
|
|
|
+ <a-button type="link" @click="indexShowClick" style="float: right;">
|
|
|
|
+ 显示指标
|
|
|
|
+ </a-button>
|
|
|
|
+
|
|
</a-col>
|
|
</a-col>
|
|
</a-row>
|
|
</a-row>
|
|
<div id="accountIndexEchart" ref="accountIndexEchart" style="width: 90%;height: 315px;margin: 0 auto;">
|
|
<div id="accountIndexEchart" ref="accountIndexEchart" style="width: 90%;height: 315px;margin: 0 auto;">
|
|
@@ -81,7 +89,7 @@
|
|
</div>
|
|
</div>
|
|
|
|
|
|
<a-table size="middle" :dataSource="echartsData" :columns="columns" bordered id="outTable"
|
|
<a-table size="middle" :dataSource="echartsData" :columns="columns" bordered id="outTable"
|
|
- :pagination="false" :loading="echartsLoading" ref="accountTable" :scroll="{ x: scrollX }"
|
|
|
|
|
|
+ :pagination="false" :loading="echartsLoadingoutTable" ref="accountTable" :scroll="{ x: scrollX }"
|
|
v-if="outTableShow">
|
|
v-if="outTableShow">
|
|
<!-- <span slot="status" slot-scope="text, record">
|
|
<!-- <span slot="status" slot-scope="text, record">
|
|
<a-switch :checked="text == 1" @change="switchChange(text,record)"/>
|
|
<a-switch :checked="text == 1" @change="switchChange(text,record)"/>
|
|
@@ -94,6 +102,19 @@
|
|
</a-spin>
|
|
</a-spin>
|
|
|
|
|
|
</span>
|
|
</span>
|
|
|
|
+ <span slot="operationAgree" slot-scope="text,record">
|
|
|
|
+ <a-popover title="" trigger="hover" v-if="text">
|
|
|
|
+ <template slot="content">
|
|
|
|
+ <div style="width: 150px;margin-top: 10px;">{{record.operationAgreeInfo}}</div>
|
|
|
|
+ </template>
|
|
|
|
+ <a href="javascript:;" type='primary'>{{text}}</a>
|
|
|
|
+ </a-popover>
|
|
|
|
+ <span v-else>-</span>
|
|
|
|
+ <p style="height: 5px;line-height: 25px;color: rgb(157 157 157);">{{record.operationAgreeContent}}</p>
|
|
|
|
+
|
|
|
|
+ </span>
|
|
|
|
+
|
|
|
|
+
|
|
<span slot="operator" slot-scope="text,record">
|
|
<span slot="operator" slot-scope="text,record">
|
|
|
|
|
|
<a href="javascript:;" type='primary' @click="modifyPriceClick(record)">调价</a>
|
|
<a href="javascript:;" type='primary' @click="modifyPriceClick(record)">调价</a>
|
|
@@ -156,11 +177,25 @@
|
|
</div>
|
|
</div>
|
|
<a-table size="middle" :dataSource="sourceMaterialData" :columns="sourceMaterial" bordered id="outTable"
|
|
<a-table size="middle" :dataSource="sourceMaterialData" :columns="sourceMaterial" bordered id="outTable"
|
|
:pagination="echartsIpagination" :loading="echartsLoading" ref="accountTable">
|
|
:pagination="echartsIpagination" :loading="echartsLoading" ref="accountTable">
|
|
- <span slot="unitvideoUrl" slot-scope="text, record">
|
|
|
|
|
|
+ <span slot="unitvideoUrl" slot-scope="text,record" >
|
|
|
|
+ <div style="background:#e8e8e8;text-align:center;border-radius:3px">
|
|
|
|
+ <a-popover placement="right">
|
|
|
|
+ <template slot="content">
|
|
|
|
+ <video :src="record.videoUrl" style="width:250px" controls ></video>
|
|
|
|
+ </template>
|
|
|
|
+ <template slot="title">
|
|
|
|
+ </template>
|
|
|
|
+ <span>图片</span>
|
|
|
|
+ </a-popover>
|
|
|
|
+ </div>
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ </span>
|
|
|
|
+ <!-- <span slot="unitvideoUrl" slot-scope="text, record">
|
|
<video class="video" :src="text" controls="controls" style="height:200px">
|
|
<video class="video" :src="text" controls="controls" style="height:200px">
|
|
您的浏览器不支持 video 标签。
|
|
您的浏览器不支持 video 标签。
|
|
</video>
|
|
</video>
|
|
- </span>
|
|
|
|
|
|
+ </span> -->
|
|
</a-table>
|
|
</a-table>
|
|
</a-card>
|
|
</a-card>
|
|
|
|
|
|
@@ -171,16 +206,16 @@
|
|
<a-card class="card-content echarts-card">
|
|
<a-card class="card-content echarts-card">
|
|
<a-row>
|
|
<a-row>
|
|
<a-col :span="12">
|
|
<a-col :span="12">
|
|
- <a-select v-model="selectValue" style="width:100px;" @change="selectValueChange">
|
|
|
|
- <a-select-option value="cost">花费</a-select-option>
|
|
|
|
- <a-select-option value="activationPrice">激活成本</a-select-option>
|
|
|
|
|
|
+ <a-select v-model="selectValue" style="width:120px;" @change="selectValueChange">
|
|
|
|
+ <a-select-option value="totalCost">花费</a-select-option>
|
|
<a-select-option value="activation">激活数</a-select-option>
|
|
<a-select-option value="activation">激活数</a-select-option>
|
|
|
|
+ <a-select-option value="activationPrice">激活成本</a-select-option>
|
|
<a-select-option value="eventPayRoi">ROI</a-select-option>
|
|
<a-select-option value="eventPayRoi">ROI</a-select-option>
|
|
<a-select-option value="eventPay">付费次数</a-select-option>
|
|
<a-select-option value="eventPay">付费次数</a-select-option>
|
|
|
|
+ <a-select-option value="">付费金额</a-select-option>
|
|
<a-select-option value="eventPayCost">付费成本</a-select-option>
|
|
<a-select-option value="eventPayCost">付费成本</a-select-option>
|
|
- <a-select-option value="eventPayPurchaseAmountFirstDay">首日付费金额</a-select-option>
|
|
|
|
- <a-select-option value="eventNextDayStay">次留数</a-select-option>
|
|
|
|
- <a-select-option value="leave">次留</a-select-option>
|
|
|
|
|
|
+ <a-select-option value="nextDayOpen">次留数</a-select-option>
|
|
|
|
+ <a-select-option value="nextDayOpenCost">次留成本</a-select-option>
|
|
</a-select>
|
|
</a-select>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :span="12">
|
|
<a-col :span="12">
|
|
@@ -190,15 +225,15 @@
|
|
</a-row>
|
|
</a-row>
|
|
|
|
|
|
<div style="display: flex;justify-content:space-around;margin-top: 20px;">
|
|
<div style="display: flex;justify-content:space-around;margin-top: 20px;">
|
|
-
|
|
|
|
|
|
+ <div id="accountIndexEchartThreePie" ref="accountIndexEchartThreePie" style="width: 35%;height: 315px;border-right: 1px solid #ccc;">
|
|
|
|
+ </div>
|
|
<div id="accountIndexEchartOnePie" ref="accountIndexEchartOnePie"
|
|
<div id="accountIndexEchartOnePie" ref="accountIndexEchartOnePie"
|
|
style="width: 35%;height: 315px;border-right: 1px solid #ccc;"> </div>
|
|
style="width: 35%;height: 315px;border-right: 1px solid #ccc;"> </div>
|
|
|
|
|
|
<div id="accountIndexEchartTwoPie" ref="accountIndexEchartTwoPie"
|
|
<div id="accountIndexEchartTwoPie" ref="accountIndexEchartTwoPie"
|
|
- style="width: 35%;height: 315px;border-right: 1px solid #ccc;"> </div>
|
|
|
|
-
|
|
|
|
- <div id="accountIndexEchartThreePie" ref="accountIndexEchartThreePie" style="width: 35%;height: 315px;">
|
|
|
|
- </div>
|
|
|
|
|
|
+ style="width: 35%;height: 315px;"> </div>
|
|
|
|
+
|
|
|
|
+
|
|
|
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
@@ -263,8 +298,17 @@
|
|
</a-row>
|
|
</a-row>
|
|
</div>
|
|
</div>
|
|
</a-modal>
|
|
</a-modal>
|
|
|
|
+ <!-- 修改账户modal -->
|
|
|
|
+ <a-modal v-model="accountVisible" title="切换账户" @ok="accounthandleOk" :width='800' @cancel='accountCancel' >
|
|
|
|
+ <div class="linkBody" style='height:100px;display:flex;'>
|
|
|
|
+ <div style="height:32px;line-height:32px">选择账户:</div>
|
|
|
|
+ <Treeselect :appId.sync="selectaccountId" :multiple="false" request="2,4" ref="treeSelect" style="margin-bottom:8px;width:600px " />
|
|
|
|
+ </div>
|
|
|
|
+ </a-modal>
|
|
<customColumnProject :visible="visible" :listNum="listNum" :fiexColumn="columnsFixd" :mediaType="1"
|
|
<customColumnProject :visible="visible" :listNum="listNum" :fiexColumn="columnsFixd" :mediaType="1"
|
|
@closeCustomColumn="closeCustomColumn" @changeColumn="changeColumn" />
|
|
@closeCustomColumn="closeCustomColumn" @changeColumn="changeColumn" />
|
|
|
|
+ <customColumnProject :visible="visibleIndex" :listNum="listNumIndex" :fiexColumn="columnsFixdIndex" :mediaType="1"
|
|
|
|
+ @closeCustomColumn="closeCustomColumnIndex" @changeColumnIndex="changeColumnIndex" />
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -284,18 +328,24 @@
|
|
require('echarts/lib/component/graphic');
|
|
require('echarts/lib/component/graphic');
|
|
require('echarts/lib/component/toolbox');
|
|
require('echarts/lib/component/toolbox');
|
|
require('echarts/lib/component/legend');
|
|
require('echarts/lib/component/legend');
|
|
|
|
+ import Treeselect from '@/views/modules/Statistics/components/Treeselect.vue'
|
|
|
|
+ import { mapGetters } from 'vuex'
|
|
export default {
|
|
export default {
|
|
- components: { customColumnProject },
|
|
|
|
|
|
+ components: { customColumnProject, Treeselect},
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
targetVisible: false,
|
|
targetVisible: false,
|
|
|
|
+ accountVisible:false,
|
|
|
|
+ visibleIndex:false,
|
|
outTableShow: true,
|
|
outTableShow: true,
|
|
modifyPriceVisible:false,
|
|
modifyPriceVisible:false,
|
|
listNum: [],
|
|
listNum: [],
|
|
|
|
+ listNumIndex:[],
|
|
visible: false,
|
|
visible: false,
|
|
scrollX: 1500,
|
|
scrollX: 1500,
|
|
columnsFixd: keepPersonData.groupDelivery(),
|
|
columnsFixd: keepPersonData.groupDelivery(),
|
|
- valueBtn: ['花费'],
|
|
|
|
|
|
+ columnsFixdIndex:keepPersonData.groupDeliveryIndexShow(),
|
|
|
|
+ valueBtn: 'cost',
|
|
plainOptions: [
|
|
plainOptions: [
|
|
{ label: '花费', value: '花费' },
|
|
{ label: '花费', value: '花费' },
|
|
{ label: '激活成本', value: '激活成本' },
|
|
{ label: '激活成本', value: '激活成本' },
|
|
@@ -307,11 +357,21 @@
|
|
dateEchart: [moment(), moment()],
|
|
dateEchart: [moment(), moment()],
|
|
dateRanges: keepPersonData.setTimeRange(),
|
|
dateRanges: keepPersonData.setTimeRange(),
|
|
dateSource: [moment(), moment()],
|
|
dateSource: [moment(), moment()],
|
|
- selectValue: 'cost',
|
|
|
|
|
|
+ selectValue: 'totalCost',
|
|
datePie: [moment(), moment()],
|
|
datePie: [moment(), moment()],
|
|
echartsData: [],
|
|
echartsData: [],
|
|
sourceMaterialData: [],
|
|
sourceMaterialData: [],
|
|
|
|
+ echartsLoadingoutTable:false,
|
|
echartsLoading: false,
|
|
echartsLoading: false,
|
|
|
|
+ indexShowS:[
|
|
|
|
+ {
|
|
|
|
+ title: '消耗(元)',
|
|
|
|
+ dataIndex: 'cost',
|
|
|
|
+ key: 'cost',
|
|
|
|
+ align: 'center',
|
|
|
|
+ scopedSlots: { customRender: 'cost' },
|
|
|
|
+ },
|
|
|
|
+ ],
|
|
columns: [
|
|
columns: [
|
|
{
|
|
{
|
|
title: '状态操作',
|
|
title: '状态操作',
|
|
@@ -355,6 +415,7 @@
|
|
dataIndex: 'operationAgree',
|
|
dataIndex: 'operationAgree',
|
|
key: 'operationAgree',
|
|
key: 'operationAgree',
|
|
align: 'center',
|
|
align: 'center',
|
|
|
|
+ scopedSlots: { customRender: 'operationAgree' },
|
|
|
|
|
|
}, {
|
|
}, {
|
|
title: '操作',
|
|
title: '操作',
|
|
@@ -382,21 +443,25 @@
|
|
dataIndex: 'showNum',
|
|
dataIndex: 'showNum',
|
|
key: 'showNum',
|
|
key: 'showNum',
|
|
align: 'center',
|
|
align: 'center',
|
|
|
|
+ sorter: (a, b) => a.showNum - b.showNum,
|
|
}, {
|
|
}, {
|
|
title: '花费',
|
|
title: '花费',
|
|
dataIndex: 'totalCost',
|
|
dataIndex: 'totalCost',
|
|
key: 'totalCost',
|
|
key: 'totalCost',
|
|
align: 'center',
|
|
align: 'center',
|
|
|
|
+ sorter: (a, b) => a.totalCost - b.totalCost,
|
|
}, {
|
|
}, {
|
|
title: '激活数',
|
|
title: '激活数',
|
|
dataIndex: 'activation',
|
|
dataIndex: 'activation',
|
|
key: 'activation',
|
|
key: 'activation',
|
|
align: 'center',
|
|
align: 'center',
|
|
|
|
+ sorter: (a, b) => a.activation - b.activation,
|
|
}, {
|
|
}, {
|
|
title: '激活成本',
|
|
title: '激活成本',
|
|
dataIndex: 'activationPrice',
|
|
dataIndex: 'activationPrice',
|
|
key: 'activationPrice',
|
|
key: 'activationPrice',
|
|
align: 'center',
|
|
align: 'center',
|
|
|
|
+ sorter: (a, b) => a.activationPrice - b.activationPrice,
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '上线时间',
|
|
title: '上线时间',
|
|
@@ -449,7 +514,10 @@
|
|
updateRelated: '',
|
|
updateRelated: '',
|
|
accountIndexEchartThreePieShow: true,
|
|
accountIndexEchartThreePieShow: true,
|
|
accountIndexEchartTwoPieShow: true,
|
|
accountIndexEchartTwoPieShow: true,
|
|
|
|
+ accountIndexEchartThreePieShowemarks:true,
|
|
accountIndexEchartOnePieShow: true,
|
|
accountIndexEchartOnePieShow: true,
|
|
|
|
+ custNmaeType:'',
|
|
|
|
+ selectaccountId:'',
|
|
}
|
|
}
|
|
},
|
|
},
|
|
filters: {
|
|
filters: {
|
|
@@ -472,10 +540,19 @@
|
|
return '-'
|
|
return '-'
|
|
}
|
|
}
|
|
|
|
|
|
- }
|
|
|
|
|
|
+ },
|
|
|
|
+ formatNum: function (value) {
|
|
|
|
+ if (!value) {
|
|
|
|
+ return '暂无数据'
|
|
|
|
+ } else if (value == '暂无数据') {
|
|
|
|
+ return '暂无数据'
|
|
|
|
+ }
|
|
|
|
+ return Number(value).toFixed(3).toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, "$1,");
|
|
|
|
+ },
|
|
},
|
|
},
|
|
mounted() {
|
|
mounted() {
|
|
this.showColumn();
|
|
this.showColumn();
|
|
|
|
+ this.showIndex();
|
|
// 获取折线图
|
|
// 获取折线图
|
|
this.getQueryNewlyData();
|
|
this.getQueryNewlyData();
|
|
// 第一个饼图
|
|
// 第一个饼图
|
|
@@ -485,13 +562,66 @@
|
|
this.getAccountNameData();
|
|
this.getAccountNameData();
|
|
this.getGroupLaunchData();
|
|
this.getGroupLaunchData();
|
|
this.getEchartOnePieData();
|
|
this.getEchartOnePieData();
|
|
-
|
|
|
|
|
|
+ console.log(localStorage.getItem('stockWatchAccountId'));
|
|
|
|
+ if(localStorage.getItem('stockWatchAccountId')) {
|
|
|
|
+ let data = JSON.parse(localStorage.getItem('stockWatchAccountId'));
|
|
|
|
+ this.accountId = data.accountId;
|
|
|
|
+ this.selectaccountId = data.accountId;
|
|
|
|
+ this.dateValue = [moment(data.timeRange[0]),moment(data.timeRange[1])];
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ else {
|
|
|
|
+ console.log(1111);
|
|
|
|
+ getAction('/etl/reportAccountHourly/getMaxChargeAccountIdByUser',{
|
|
|
|
+ userId:this.userInfo().id,
|
|
|
|
+ }).then(res=>{
|
|
|
|
+ if(res.success){
|
|
|
|
+ // this.currentAccount=res.result;
|
|
|
|
+ this.accountId=res.result;
|
|
|
|
+ this.selectaccountId=res.result;
|
|
|
|
+
|
|
|
|
+ }else{
|
|
|
|
+ // this.$message.error(res.message)
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ }
|
|
},
|
|
},
|
|
|
|
|
|
methods: {
|
|
methods: {
|
|
|
|
+ ...mapGetters([ 'userInfo']),
|
|
|
|
+ accounthandleOk(){
|
|
|
|
+ this.accountVisible=false;
|
|
|
|
+ this.dateValue=[moment(),moment()];
|
|
|
|
+ this.materialDate=[moment().subtract(1,'days'),moment().subtract(1,'days')]
|
|
|
|
+ this.accountId=this.selectaccountId;
|
|
|
|
+
|
|
|
|
+ this.getCurrentAccountInfo();
|
|
|
|
+ },
|
|
|
|
+ getCurrentAccountInfo(val){
|
|
|
|
+ getAction('/etl/reportAccountHourly/getMaxChargeAccountId',{
|
|
|
|
+ accountId:val || this.accountId ||undefined,
|
|
|
|
+
|
|
|
|
+ }).then(res=>{
|
|
|
|
+ if(res.success){
|
|
|
|
+ this.currentAccount=res.result;
|
|
|
|
+ // this.accountId=res.result.accountId
|
|
|
|
+ }else{
|
|
|
|
+ this.$message.error(res.message)
|
|
|
|
+ this.currentAccount=res.result;
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ },
|
|
|
|
+ accountCancel(){
|
|
|
|
+ this.accountVisible=false;
|
|
|
|
+
|
|
|
|
+ },
|
|
|
|
+ changeAccount(){
|
|
|
|
+ this.accountVisible=true;
|
|
|
|
+
|
|
|
|
+ },
|
|
modifyPriceClick(row){
|
|
modifyPriceClick(row){
|
|
// this.accountId = row.accountId
|
|
// this.accountId = row.accountId
|
|
-console.log(row);
|
|
|
|
this.unitId = row.unit_id
|
|
this.unitId = row.unit_id
|
|
console.log(this.unitId);
|
|
console.log(this.unitId);
|
|
this.bidType = row.bidType
|
|
this.bidType = row.bidType
|
|
@@ -508,7 +638,7 @@ console.log(row);
|
|
postAction(`/kuaishou/batch/batchUpdateUnitStatus`, {
|
|
postAction(`/kuaishou/batch/batchUpdateUnitStatus`, {
|
|
accountId: this.accountId,
|
|
accountId: this.accountId,
|
|
unitIds: [record.unit_id],
|
|
unitIds: [record.unit_id],
|
|
- id: record.id,
|
|
|
|
|
|
+ // id: record.id,
|
|
putStatus
|
|
putStatus
|
|
}).then((res) => {
|
|
}).then((res) => {
|
|
|
|
|
|
@@ -523,6 +653,11 @@ console.log(row);
|
|
|
|
|
|
|
|
|
|
},
|
|
},
|
|
|
|
+ // 显示指标
|
|
|
|
+ indexShowClick(){
|
|
|
|
+ this.visibleIndex = true;
|
|
|
|
+ this.listNumIndex = [...this.indexShowS]
|
|
|
|
+ },
|
|
// 自定义列
|
|
// 自定义列
|
|
customColumn() {
|
|
customColumn() {
|
|
this.visible = true;
|
|
this.visible = true;
|
|
@@ -532,8 +667,57 @@ console.log(row);
|
|
closeCustomColumn() {
|
|
closeCustomColumn() {
|
|
this.visible = false
|
|
this.visible = false
|
|
},
|
|
},
|
|
- showColumn() {
|
|
|
|
|
|
+ closeCustomColumnIndex(){
|
|
|
|
+ this.visibleIndex = false;
|
|
|
|
+ },
|
|
|
|
+ showIndex(){
|
|
this.postDataAction('/toutiao/videoReportDaily/getColumnJson', {
|
|
this.postDataAction('/toutiao/videoReportDaily/getColumnJson', {
|
|
|
|
+ columnType: 106,
|
|
|
|
+ }).then((res) => {
|
|
|
|
+ // console.log(res)
|
|
|
|
+ if (res.success) {
|
|
|
|
+ // console.log(JSON.parse(res.result))
|
|
|
|
+ if (res.result) {
|
|
|
|
+ let columns = JSON.parse(res.result)
|
|
|
|
+ if (columns.length) {
|
|
|
|
+ if (columns.length >= this.columnsFixdIndex.length) {
|
|
|
|
+ columns.map((item, index) => {
|
|
|
|
+ if (index > this.columnsFixdIndex.length - 1) {
|
|
|
|
+ item.sorter = function (a, b) { }
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ columns = columns.slice(this.columnsFixdIndex.length)
|
|
|
|
+ this.indexShowS = [...this.columnsFixdIndex, ...columns]
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // console.log(this.columns)
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ this.changeColumnIndex(this.indexShowS)
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ },
|
|
|
|
+ changeColumnIndex(val){
|
|
|
|
+ if (val.length > 4) {
|
|
|
|
+ return this.$message.warning('最多只可以选择4个指标');
|
|
|
|
+ }else{
|
|
|
|
+ this.indexShowS = [...val]
|
|
|
|
+ let arr = JSON.stringify(this.indexShowS)
|
|
|
|
+ this.postDataAction('/toutiao/videoReportDaily/saveOrUpdateColumnJson', {
|
|
|
|
+ json: arr,
|
|
|
|
+ columnType: 106,
|
|
|
|
+ }).then((res) => {
|
|
|
|
+ // console.log(res)
|
|
|
|
+ })
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ },
|
|
|
|
+ showColumn() {
|
|
|
|
+
|
|
|
|
+ this.postDataAction('/toutiao/videoReportDaily/getColumnJson', {
|
|
columnType: 103,
|
|
columnType: 103,
|
|
}).then((res) => {
|
|
}).then((res) => {
|
|
// console.log(res)
|
|
// console.log(res)
|
|
@@ -561,29 +745,20 @@ console.log(row);
|
|
|
|
|
|
}
|
|
}
|
|
})
|
|
})
|
|
|
|
+
|
|
|
|
+
|
|
},
|
|
},
|
|
|
|
+
|
|
changeColumn(val) {
|
|
changeColumn(val) {
|
|
- this.outTableShow = false;
|
|
|
|
- console.log(val);
|
|
|
|
- console.log(this.columns);
|
|
|
|
|
|
|
|
|
|
+ this.outTableShow = false;
|
|
val.forEach((item,index) => {
|
|
val.forEach((item,index) => {
|
|
if (item.title == '操作') {
|
|
if (item.title == '操作') {
|
|
item.fixed = 'left'
|
|
item.fixed = 'left'
|
|
item.width = 180
|
|
item.width = 180
|
|
}
|
|
}
|
|
});
|
|
});
|
|
- // this.columns = [...val]
|
|
|
|
- // this.columns.push({
|
|
|
|
- // title: '操作',
|
|
|
|
- // dataIndex: 'operator',
|
|
|
|
- // key: 'operator',
|
|
|
|
- // align: 'center',
|
|
|
|
- // scopedSlots: { customRender: 'operator' },
|
|
|
|
- // fixed:'right',
|
|
|
|
- // width:180
|
|
|
|
- // })
|
|
|
|
-
|
|
|
|
|
|
+
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
this.columns = [...val]
|
|
this.columns = [...val]
|
|
if (this.columns.length > this.columnsFixd.length && this.columns.length < 8) {
|
|
if (this.columns.length > this.columnsFixd.length && this.columns.length < 8) {
|
|
@@ -649,7 +824,6 @@ console.log(row);
|
|
}
|
|
}
|
|
this.outTableShow = true;
|
|
this.outTableShow = true;
|
|
let arr = JSON.stringify(this.columns)
|
|
let arr = JSON.stringify(this.columns)
|
|
- console.log(arr);
|
|
|
|
this.postDataAction('/toutiao/videoReportDaily/saveOrUpdateColumnJson', {
|
|
this.postDataAction('/toutiao/videoReportDaily/saveOrUpdateColumnJson', {
|
|
json: arr,
|
|
json: arr,
|
|
columnType: 103,
|
|
columnType: 103,
|
|
@@ -657,7 +831,7 @@ console.log(row);
|
|
// console.log(res)
|
|
// console.log(res)
|
|
})
|
|
})
|
|
})
|
|
})
|
|
-
|
|
|
|
|
|
+
|
|
},
|
|
},
|
|
//获取echart折线图的值
|
|
//获取echart折线图的值
|
|
initEchart(idName, optionName) {
|
|
initEchart(idName, optionName) {
|
|
@@ -759,10 +933,12 @@ console.log(row);
|
|
} else {
|
|
} else {
|
|
centerTwo = 'center'
|
|
centerTwo = 'center'
|
|
this.accountIndexEchartTwoPieShow = '暂无数据';
|
|
this.accountIndexEchartTwoPieShow = '暂无数据';
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
if (res.result.scene.length != 0) {
|
|
if (res.result.scene.length != 0) {
|
|
this.accountIndexEchartThreePieShow = '分版位数据';
|
|
this.accountIndexEchartThreePieShow = '分版位数据';
|
|
|
|
+ this.accountIndexEchartThreePieShowemarks = '数据与消耗存在一定误差';
|
|
centerthree = '';
|
|
centerthree = '';
|
|
for (var i = 0; i < res.result.scene.length; i++) {
|
|
for (var i = 0; i < res.result.scene.length; i++) {
|
|
var obj = new Object();
|
|
var obj = new Object();
|
|
@@ -792,11 +968,12 @@ console.log(row);
|
|
} else {
|
|
} else {
|
|
centerthree = 'center'
|
|
centerthree = 'center'
|
|
this.accountIndexEchartThreePieShow = '暂无数据';
|
|
this.accountIndexEchartThreePieShow = '暂无数据';
|
|
|
|
+ this.accountIndexEchartThreePieShowemarks = '';
|
|
}
|
|
}
|
|
|
|
|
|
this.initEchart('accountIndexEchartOnePie', this.initPieOneData(pieData, this.accountIndexEchartOnePieShow, center));
|
|
this.initEchart('accountIndexEchartOnePie', this.initPieOneData(pieData, this.accountIndexEchartOnePieShow, center));
|
|
this.initEchart('accountIndexEchartTwoPie', this.initPieTwoData(pie2d, this.accountIndexEchartTwoPieShow, centerTwo));
|
|
this.initEchart('accountIndexEchartTwoPie', this.initPieTwoData(pie2d, this.accountIndexEchartTwoPieShow, centerTwo));
|
|
- this.initEchart('accountIndexEchartThreePie', this.initPieThreeData(pie3p, this.accountIndexEchartThreePieShow, centerthree));
|
|
|
|
|
|
+ this.initEchart('accountIndexEchartThreePie', this.initPieThreeData(pie3p, this.accountIndexEchartThreePieShow, centerthree,this.accountIndexEchartThreePieShowemarks));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -814,6 +991,7 @@ console.log(row);
|
|
},
|
|
},
|
|
// 素材相关数据
|
|
// 素材相关数据
|
|
getGroupLaunchData() {
|
|
getGroupLaunchData() {
|
|
|
|
+ this.echartsLoading = true;
|
|
let params = {
|
|
let params = {
|
|
accountId: this.accountId,
|
|
accountId: this.accountId,
|
|
startTime: this.dateSource[0].format('YYYY-MM-DD'),
|
|
startTime: this.dateSource[0].format('YYYY-MM-DD'),
|
|
@@ -827,6 +1005,7 @@ console.log(row);
|
|
this.updateRelated = res.timestamp;
|
|
this.updateRelated = res.timestamp;
|
|
this.sourceMaterialData = res.result.list;
|
|
this.sourceMaterialData = res.result.list;
|
|
this.echartsIpagination.total = res.result.total;
|
|
this.echartsIpagination.total = res.result.total;
|
|
|
|
+ this.echartsLoading = false;
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
@@ -838,7 +1017,7 @@ console.log(row);
|
|
this.echartsIpagination.current = 1;
|
|
this.echartsIpagination.current = 1;
|
|
this.getGroupLaunchData();
|
|
this.getGroupLaunchData();
|
|
},
|
|
},
|
|
- checkboxonChange() {
|
|
|
|
|
|
+ checkboxonChange(e) {
|
|
this.getQueryNewlyData();
|
|
this.getQueryNewlyData();
|
|
},
|
|
},
|
|
dateChange() {
|
|
dateChange() {
|
|
@@ -860,6 +1039,7 @@ console.log(row);
|
|
},
|
|
},
|
|
// 获取组投放数据表格
|
|
// 获取组投放数据表格
|
|
getGroupDataList() {
|
|
getGroupDataList() {
|
|
|
|
+ this.echartsLoadingoutTable = true;
|
|
let params = {
|
|
let params = {
|
|
accountId: this.accountId,
|
|
accountId: this.accountId,
|
|
pageNum: this.tablePag.pageNum,
|
|
pageNum: this.tablePag.pageNum,
|
|
@@ -876,6 +1056,7 @@ console.log(row);
|
|
this.updateTimeGroup = res.timestamp;
|
|
this.updateTimeGroup = res.timestamp;
|
|
this.echartsData = res.result
|
|
this.echartsData = res.result
|
|
this.totalAll = res.result[0].totalCount
|
|
this.totalAll = res.result[0].totalCount
|
|
|
|
+ this.echartsLoadingoutTable = false;
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
@@ -899,7 +1080,6 @@ console.log(row);
|
|
},
|
|
},
|
|
// 修改出价
|
|
// 修改出价
|
|
bidChangeOk(record) {
|
|
bidChangeOk(record) {
|
|
- console.log(record);
|
|
|
|
if (this.newBid) {
|
|
if (this.newBid) {
|
|
this.modifyPriceVisible = false
|
|
this.modifyPriceVisible = false
|
|
// record.accountId = this.accountId;
|
|
// record.accountId = this.accountId;
|
|
@@ -918,7 +1098,7 @@ console.log(row);
|
|
|
|
|
|
})
|
|
})
|
|
} else {
|
|
} else {
|
|
- this.bidErrorMessage = '请正确填写出价'
|
|
|
|
|
|
+ this.$message.warning('请正确填写出价');
|
|
// this.$message.error('请正确填写出价')
|
|
// this.$message.error('请正确填写出价')
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1003,6 +1183,7 @@ console.log(row);
|
|
accountId: this.accountId,
|
|
accountId: this.accountId,
|
|
startTime: this.dateEchart[0].format('YYYY-MM-DD'),
|
|
startTime: this.dateEchart[0].format('YYYY-MM-DD'),
|
|
endTime: this.dateEchart[1].format('YYYY-MM-DD'),
|
|
endTime: this.dateEchart[1].format('YYYY-MM-DD'),
|
|
|
|
+ type:this.valueBtn
|
|
}
|
|
}
|
|
getAction(process.env.VUE_APP_BASE_STARE_URL + '/kuaiShouOpreate/kuaiShouMaterialStareController/getKuaiShouAccountInfoBrokenLine', params).then(res => {
|
|
getAction(process.env.VUE_APP_BASE_STARE_URL + '/kuaiShouOpreate/kuaiShouMaterialStareController/getKuaiShouAccountInfoBrokenLine', params).then(res => {
|
|
if (res.code == 0) {
|
|
if (res.code == 0) {
|
|
@@ -1015,148 +1196,28 @@ console.log(row);
|
|
return item.yHour
|
|
return item.yHour
|
|
})
|
|
})
|
|
|
|
|
|
-
|
|
|
|
- if (this.valueBtn.indexOf('花费') != -1) {
|
|
|
|
today.data = res.result.map(itemprice => {
|
|
today.data = res.result.map(itemprice => {
|
|
- return itemprice.tCost
|
|
|
|
|
|
+ return itemprice.tData
|
|
});
|
|
});
|
|
- today.name = '花费(今天)'
|
|
|
|
|
|
+ today.name = '今天'
|
|
yesterday.data = res.result.map(itemyes => {
|
|
yesterday.data = res.result.map(itemyes => {
|
|
- return itemyes.yCost
|
|
|
|
- });
|
|
|
|
- yesterday.name = '花费(昨天)'
|
|
|
|
- } else {
|
|
|
|
- today.data = [];
|
|
|
|
- today.name = '';
|
|
|
|
- yesterday.data = [];
|
|
|
|
- yesterday.name = '';
|
|
|
|
- }
|
|
|
|
- let activation = {};
|
|
|
|
- let activationyes = {};
|
|
|
|
- if (this.valueBtn.indexOf('激活成本') != -1) {
|
|
|
|
- activation.data = res.result.map(itemprice => {
|
|
|
|
- return itemprice.tActivationPrice
|
|
|
|
- });
|
|
|
|
- activation.name = '激活成本(今天)'
|
|
|
|
-
|
|
|
|
- activationyes.data = res.result.map(itemyes => {
|
|
|
|
- return itemyes.yActivationPrice
|
|
|
|
|
|
+ return itemyes.yData
|
|
});
|
|
});
|
|
- activationyes.name = '激活成本(昨天)'
|
|
|
|
- } else {
|
|
|
|
- activation.data = [];
|
|
|
|
- activation.name = '';
|
|
|
|
- activationyes.data = [];
|
|
|
|
- activationyes.name = '';
|
|
|
|
- }
|
|
|
|
- let pay = {};
|
|
|
|
- let payyes = {};
|
|
|
|
- if (this.valueBtn.indexOf('新增付费成本') != -1) {
|
|
|
|
- pay.data = res.result.map(itemprice => {
|
|
|
|
- return itemprice.tEventNewUserPayCost
|
|
|
|
- });
|
|
|
|
- pay.name = '新增付费成本(今天)'
|
|
|
|
-
|
|
|
|
- payyes.data = res.result.map(itemyes => {
|
|
|
|
- return itemyes.yEventNewUserPayCost
|
|
|
|
- });
|
|
|
|
- payyes.name = '新增付费成本(昨天)'
|
|
|
|
- } else {
|
|
|
|
- pay.data = [];
|
|
|
|
- pay.name = '';
|
|
|
|
- payyes.data = [];
|
|
|
|
- payyes.name = '';
|
|
|
|
- }
|
|
|
|
- let Secondary = {};
|
|
|
|
- let Secondaryyes = {};
|
|
|
|
- if (this.valueBtn.indexOf('次留率') != -1) {
|
|
|
|
- Secondary.data = res.result.map(itemprice => {
|
|
|
|
- return itemprice.tLeave
|
|
|
|
- });
|
|
|
|
- Secondary.name = '次留率(今天)'
|
|
|
|
-
|
|
|
|
- Secondaryyes.data = res.result.map(itemyes => {
|
|
|
|
- return itemyes.yLeave
|
|
|
|
- });
|
|
|
|
- Secondaryyes.name = '次留率(昨天)'
|
|
|
|
- } else {
|
|
|
|
- Secondary.data = [];
|
|
|
|
- Secondary.name = '';
|
|
|
|
- Secondaryyes.data = [];
|
|
|
|
- Secondaryyes.name = '';
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- this.initEchart('accountIndexEchart', this.initAccountIndexEchart(timeData, today, yesterday, activation, activationyes, pay, payyes, Secondary, Secondaryyes));
|
|
|
|
|
|
+ yesterday.name = '昨天'
|
|
|
|
+ this.initEchart('accountIndexEchart', this.initAccountIndexEchart(timeData, today, yesterday,this.valueBtn));
|
|
} else if (res.message == '账户日报折线图查询成功') {
|
|
} else if (res.message == '账户日报折线图查询成功') {
|
|
let timeData = [];
|
|
let timeData = [];
|
|
|
|
+ let today = {};
|
|
|
|
+ let yesterday = {};
|
|
|
|
|
|
timeData = res.result.map(item => {
|
|
timeData = res.result.map(item => {
|
|
return item.dateTime
|
|
return item.dateTime
|
|
})
|
|
})
|
|
- let today = {};
|
|
|
|
- let yesterday = {};
|
|
|
|
- let activation = {};
|
|
|
|
- let activationyes = {};
|
|
|
|
- if (this.valueBtn.indexOf('花费') != -1) {
|
|
|
|
- today.data = res.result.map(itemprice => {
|
|
|
|
- return itemprice.cost
|
|
|
|
- });
|
|
|
|
- today.name = '花费'
|
|
|
|
-
|
|
|
|
- } else {
|
|
|
|
- today.data = [];
|
|
|
|
- today.name = '';
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
- if (this.valueBtn.indexOf('激活成本') != -1) {
|
|
|
|
- yesterday.data = res.result.map(itemprice => {
|
|
|
|
- return itemprice.activationPrice
|
|
|
|
- });
|
|
|
|
- yesterday.name = '激活成本'
|
|
|
|
-
|
|
|
|
- } else {
|
|
|
|
- yesterday.data = [];
|
|
|
|
- yesterday.name = '';
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
- if (this.valueBtn.indexOf('新增付费成本') != -1) {
|
|
|
|
- activation.data = res.result.map(itemprice => {
|
|
|
|
- return itemprice.eventNewUserPayCost
|
|
|
|
- });
|
|
|
|
- activation.name = '新增付费成本'
|
|
|
|
-
|
|
|
|
- } else {
|
|
|
|
- activation.data = [];
|
|
|
|
- activation.name = '';
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
- if (this.valueBtn.indexOf('次留率') != -1) {
|
|
|
|
- activationyes.data = res.result.map(itemprice => {
|
|
|
|
- return itemprice.leave
|
|
|
|
- });
|
|
|
|
- activationyes.name = '次留率'
|
|
|
|
-
|
|
|
|
- } else {
|
|
|
|
- activationyes.data = [];
|
|
|
|
- activationyes.name = '';
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
- let pay = {};
|
|
|
|
- let payyes = {};
|
|
|
|
- let Secondary = {};
|
|
|
|
- let Secondaryyes = {};
|
|
|
|
- pay.name = '';
|
|
|
|
- pay.data = [];
|
|
|
|
- payyes.name = '';
|
|
|
|
- payyes.data = [];
|
|
|
|
- Secondary.name = '';
|
|
|
|
- Secondary.data = [];
|
|
|
|
- Secondaryyes.name = '';
|
|
|
|
- Secondaryyes.data = [];
|
|
|
|
- this.initEchart('accountIndexEchart', this.initAccountIndexEchart(timeData, today, yesterday, activation, activationyes, pay, payyes, Secondary, Secondaryyes));
|
|
|
|
|
|
+ today.data = res.result.map(item => {
|
|
|
|
+ return item.data
|
|
|
|
+ })
|
|
|
|
+ today.name = '汇总'
|
|
|
|
+ this.initEchart('accountIndexEchart', this.initAccountIndexEchart(timeData, today, yesterday,this.valueBtn));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
})
|
|
})
|
|
@@ -1167,11 +1228,14 @@ console.log(row);
|
|
},
|
|
},
|
|
|
|
|
|
// 折线图
|
|
// 折线图
|
|
- initAccountIndexEchart(timeData, today, yesterday, activation, activationyes, pay, payyes, Secondary, Secondaryyes) {
|
|
|
|
|
|
+ initAccountIndexEchart(timeData, today, yesterday,valueBtn) {
|
|
|
|
+ console.log(valueBtn);
|
|
let option = {
|
|
let option = {
|
|
|
|
|
|
tooltip: {
|
|
tooltip: {
|
|
- trigger: 'axis'
|
|
|
|
|
|
+ show : true,
|
|
|
|
+ trigger: 'axis',
|
|
|
|
+ formatter: valueBtn == 'eventPayRate' || valueBtn == 'leave' || valueBtn == 'eventNewUserPayRate' || valueBtn == 'keyActionRate' ?'{b}<br/>{a0}: {c0}%<br />{a1}: {c1}%<br />':''
|
|
},
|
|
},
|
|
legend: {
|
|
legend: {
|
|
bottom: '0%',
|
|
bottom: '0%',
|
|
@@ -1229,58 +1293,7 @@ console.log(row);
|
|
borderWidth: 2,
|
|
borderWidth: 2,
|
|
borderColor: '#00FF00'
|
|
borderColor: '#00FF00'
|
|
},
|
|
},
|
|
- }, {
|
|
|
|
- name: activation.name,
|
|
|
|
- type: 'line',
|
|
|
|
- smooth: true,
|
|
|
|
- symbol: 'circle',
|
|
|
|
- data: activation.data,
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- name: activationyes.name,
|
|
|
|
- type: 'line',
|
|
|
|
- smooth: true,
|
|
|
|
- symbol: 'circle',
|
|
|
|
- data: activationyes.data,
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- }, {
|
|
|
|
- name: pay.name,
|
|
|
|
- type: 'line',
|
|
|
|
- smooth: true,
|
|
|
|
- symbol: 'circle',
|
|
|
|
- data: pay.data,
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- name: payyes.name,
|
|
|
|
- type: 'line',
|
|
|
|
- smooth: true,
|
|
|
|
- symbol: 'circle',
|
|
|
|
- data: payyes.data,
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- }, {
|
|
|
|
- name: Secondary.name,
|
|
|
|
- type: 'line',
|
|
|
|
- smooth: true,
|
|
|
|
- symbol: 'circle',
|
|
|
|
- data: Secondary.data,
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- name: Secondaryyes.name,
|
|
|
|
- type: 'line',
|
|
|
|
- smooth: true,
|
|
|
|
- symbol: 'circle',
|
|
|
|
- data: Secondaryyes.data,
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- },
|
|
|
|
|
|
+ },
|
|
|
|
|
|
]
|
|
]
|
|
};
|
|
};
|
|
@@ -1290,6 +1303,7 @@ console.log(row);
|
|
// 第一个饼图
|
|
// 第一个饼图
|
|
initPieOneData(pieData, accountIndexEchartOnePieShow, center) {
|
|
initPieOneData(pieData, accountIndexEchartOnePieShow, center) {
|
|
var iconNone = require('../../../../../assets/nodata.png');
|
|
var iconNone = require('../../../../../assets/nodata.png');
|
|
|
|
+ const colorList = ['#58D5FF', '#73ACFF', '#FDD56A', '#FDB36A', '#FD866A','#9E87FF']
|
|
let option = {
|
|
let option = {
|
|
tooltip: {
|
|
tooltip: {
|
|
trigger: 'item'
|
|
trigger: 'item'
|
|
@@ -1337,6 +1351,12 @@ console.log(row);
|
|
labelLine: {
|
|
labelLine: {
|
|
show: false
|
|
show: false
|
|
},
|
|
},
|
|
|
|
+ itemStyle: {
|
|
|
|
+ borderRadius: 5,
|
|
|
|
+ color: (params) => {
|
|
|
|
+ return colorList[params.dataIndex]
|
|
|
|
+ }
|
|
|
|
+ },
|
|
data: pieData
|
|
data: pieData
|
|
}
|
|
}
|
|
]
|
|
]
|
|
@@ -1345,6 +1365,7 @@ console.log(row);
|
|
},
|
|
},
|
|
initPieTwoData(pie2d, accountIndexEchartThreePieShow, centerthree) {
|
|
initPieTwoData(pie2d, accountIndexEchartThreePieShow, centerthree) {
|
|
var iconNoneThree = require('../../../../../assets/nodata.png');
|
|
var iconNoneThree = require('../../../../../assets/nodata.png');
|
|
|
|
+ const colorList = ['#58D5FF', '#73ACFF', '#FDD56A', '#FDB36A', '#FD866A','#9E87FF']
|
|
let option = {
|
|
let option = {
|
|
tooltip: {
|
|
tooltip: {
|
|
trigger: 'item'
|
|
trigger: 'item'
|
|
@@ -1391,6 +1412,12 @@ console.log(row);
|
|
labelLine: {
|
|
labelLine: {
|
|
show: false
|
|
show: false
|
|
},
|
|
},
|
|
|
|
+ itemStyle: {
|
|
|
|
+ borderRadius: 5,
|
|
|
|
+ color: (params) => {
|
|
|
|
+ return colorList[params.dataIndex]
|
|
|
|
+ }
|
|
|
|
+ },
|
|
data: pie2d
|
|
data: pie2d
|
|
}
|
|
}
|
|
]
|
|
]
|
|
@@ -1398,8 +1425,9 @@ console.log(row);
|
|
return option
|
|
return option
|
|
},
|
|
},
|
|
|
|
|
|
- initPieThreeData(pie3p, accountIndexEchartTwoPieShow, centerTwo) {
|
|
|
|
|
|
+ initPieThreeData(pie3p, accountIndexEchartTwoPieShow, centerTwo,accountIndexEchartThreePieShowemarks) {
|
|
var iconNoneTwo = require('../../../../../assets/nodata.png');
|
|
var iconNoneTwo = require('../../../../../assets/nodata.png');
|
|
|
|
+ const colorList = ['#58D5FF', '#73ACFF', '#FDD56A', '#FDB36A', '#FD866A','#9E87FF']
|
|
let option = {
|
|
let option = {
|
|
tooltip: {
|
|
tooltip: {
|
|
trigger: 'item'
|
|
trigger: 'item'
|
|
@@ -1407,7 +1435,7 @@ console.log(row);
|
|
title: {
|
|
title: {
|
|
x: centerTwo,
|
|
x: centerTwo,
|
|
y: centerTwo,
|
|
y: centerTwo,
|
|
- text: accountIndexEchartTwoPieShow == '暂无数据' ? `{a| ${''}}` : accountIndexEchartTwoPieShow,
|
|
|
|
|
|
+ text: accountIndexEchartTwoPieShow == '暂无数据' ? `{a| ${''}}` : accountIndexEchartTwoPieShow + `{b|${' 数据与消耗存在一定误差'}}`,
|
|
textStyle: {
|
|
textStyle: {
|
|
rich: {
|
|
rich: {
|
|
a: {
|
|
a: {
|
|
@@ -1416,6 +1444,11 @@ console.log(row);
|
|
backgroundColor: {
|
|
backgroundColor: {
|
|
image: iconNoneTwo,
|
|
image: iconNoneTwo,
|
|
}
|
|
}
|
|
|
|
+ },
|
|
|
|
+ b: {
|
|
|
|
+ fontSize:12,
|
|
|
|
+ color:'#ccc'
|
|
|
|
+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1446,6 +1479,12 @@ console.log(row);
|
|
labelLine: {
|
|
labelLine: {
|
|
show: false
|
|
show: false
|
|
},
|
|
},
|
|
|
|
+ itemStyle: {
|
|
|
|
+ borderRadius: 5,
|
|
|
|
+ color: (params) => {
|
|
|
|
+ return colorList[params.dataIndex]
|
|
|
|
+ }
|
|
|
|
+ },
|
|
data: pie3p
|
|
data: pie3p
|
|
}
|
|
}
|
|
]
|
|
]
|