|
@@ -19,9 +19,9 @@
|
|
|
|
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :span="10" :pull="14">
|
|
<a-col :span="10" :pull="14">
|
|
- <div style="margin:20px;" @click="changeAccount">
|
|
|
|
|
|
+ <div style="margin:20px;cursor: pointer;" @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:{{accountDataId}}</p>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
</a-col>
|
|
</a-col>
|
|
@@ -47,11 +47,12 @@
|
|
</div>
|
|
</div>
|
|
<a-row>
|
|
<a-row>
|
|
<a-col :span="8">
|
|
<a-col :span="8">
|
|
- <a-radio-group v-for="item in indexShowS" :key="item.key" v-model="valueBtn" @change="checkboxonChange">
|
|
|
|
|
|
+ <a-radio-group v-for="item in indexShowS" :key="item.key" v-model="valueBtn"
|
|
|
|
+ @change="checkboxonChange">
|
|
<a-radio :value="item.dataIndex">
|
|
<a-radio :value="item.dataIndex">
|
|
- {{item.title}}
|
|
|
|
|
|
+ {{item.title}}
|
|
</a-radio>
|
|
</a-radio>
|
|
- </a-radio-group>
|
|
|
|
|
|
+ </a-radio-group>
|
|
<!-- <a-checkbox-group v-model="valueBtn" name="checkboxgroup" :options="plainOptions"
|
|
<!-- <a-checkbox-group v-model="valueBtn" name="checkboxgroup" :options="plainOptions"
|
|
@change="checkboxonChange" /> -->
|
|
@change="checkboxonChange" /> -->
|
|
|
|
|
|
@@ -60,7 +61,7 @@
|
|
<a-button type="link" @click="indexShowClick" style="float: right;">
|
|
<a-button type="link" @click="indexShowClick" style="float: right;">
|
|
显示指标
|
|
显示指标
|
|
</a-button>
|
|
</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;">
|
|
@@ -105,19 +106,20 @@
|
|
<span slot="operationAgree" slot-scope="text,record">
|
|
<span slot="operationAgree" slot-scope="text,record">
|
|
<a-popover title="" trigger="hover" v-if="text">
|
|
<a-popover title="" trigger="hover" v-if="text">
|
|
<template slot="content">
|
|
<template slot="content">
|
|
- <div style="width: 150px;margin-top: 10px;">{{record.operationAgreeInfo}}</div>
|
|
|
|
|
|
+ <div style="width: 150px;margin-top: 10px;">{{record.operationAgreeInfo}}</div>
|
|
</template>
|
|
</template>
|
|
<a href="javascript:;" type='primary'>{{text}}</a>
|
|
<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>
|
|
|
|
-
|
|
|
|
|
|
+ </a-popover>
|
|
|
|
+ <span v-else>-</span>
|
|
|
|
+ <p style="height: 5px;line-height: 25px;color: rgb(157 157 157);">{{record.operationAgreeContent}}
|
|
|
|
+ </p>
|
|
|
|
+
|
|
</span>
|
|
</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>
|
|
|
|
|
|
<a-divider type="vertical" />
|
|
<a-divider type="vertical" />
|
|
<a-dropdown :trigger="['click']">
|
|
<a-dropdown :trigger="['click']">
|
|
@@ -176,20 +178,20 @@
|
|
</div>
|
|
</div>
|
|
</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">
|
|
|
|
- <span slot="unitvideoUrl" slot-scope="text,record" >
|
|
|
|
|
|
+ :pagination="echartsIpagination" :loading="echartsLoading" ref="accountTable" @change="sort">
|
|
|
|
+ <span slot="coverUrl" slot-scope="text,record">
|
|
<div style="background:#e8e8e8;text-align:center;border-radius:3px">
|
|
<div style="background:#e8e8e8;text-align:center;border-radius:3px">
|
|
<a-popover placement="right">
|
|
<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>
|
|
|
|
-
|
|
|
|
-
|
|
|
|
|
|
+ <template slot="content">
|
|
|
|
+ <video :src="record.videoUrl" style="width:250px" controls></video>
|
|
|
|
+ </template>
|
|
|
|
+ <template slot="title">
|
|
|
|
+ </template>
|
|
|
|
+ <img :src="text" alt="" style="width:20px">
|
|
|
|
+ </a-popover>
|
|
|
|
+ </div>
|
|
|
|
+
|
|
|
|
+
|
|
</span>
|
|
</span>
|
|
<!-- <span slot="unitvideoUrl" slot-scope="text, record">
|
|
<!-- <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">
|
|
@@ -207,15 +209,15 @@
|
|
<a-row>
|
|
<a-row>
|
|
<a-col :span="12">
|
|
<a-col :span="12">
|
|
<a-select v-model="selectValue" style="width:120px;" @change="selectValueChange">
|
|
<a-select v-model="selectValue" style="width:120px;" @change="selectValueChange">
|
|
- <a-select-option value="totalCost">花费</a-select-option>
|
|
|
|
|
|
+ <a-select-option value="cost">花费</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="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="eventPayPurchaseAmountFirstDay">付费金额</a-select-option>
|
|
<a-select-option value="eventPayCost">付费成本</a-select-option>
|
|
<a-select-option value="eventPayCost">付费成本</a-select-option>
|
|
- <a-select-option value="nextDayOpen">次留数</a-select-option>
|
|
|
|
- <a-select-option value="nextDayOpenCost">次留成本</a-select-option>
|
|
|
|
|
|
+ <a-select-option value="eventNextDayStay">次留数</a-select-option>
|
|
|
|
+ <a-select-option value="leave">次留成本</a-select-option>
|
|
</a-select>
|
|
</a-select>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :span="12">
|
|
<a-col :span="12">
|
|
@@ -225,27 +227,28 @@
|
|
</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 id="accountIndexEchartThreePie" ref="accountIndexEchartThreePie"
|
|
|
|
+ style="width: 35%;height: 315px;border-right: 1px solid #ccc;">
|
|
</div>
|
|
</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"
|
|
|
|
- style="width: 35%;height: 315px;"> </div>
|
|
|
|
-
|
|
|
|
-
|
|
|
|
|
|
+ <div id="accountIndexEchartTwoPie" ref="accountIndexEchartTwoPie" style="width: 35%;height: 315px;">
|
|
|
|
+ </div>
|
|
|
|
+
|
|
|
|
+
|
|
|
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
</a-card>
|
|
</a-card>
|
|
|
|
|
|
|
|
|
|
- <!-- 调价 -->
|
|
|
|
|
|
+ <!-- 调价 -->
|
|
<a-modal v-model="modifyPriceVisible" title="调价" @ok="bidChangeOk" @cancel='bidChangeCancel'>
|
|
<a-modal v-model="modifyPriceVisible" title="调价" @ok="bidChangeOk" @cancel='bidChangeCancel'>
|
|
<div style="margin:5px 0 0;padding: 0 0 15px;">
|
|
<div style="margin:5px 0 0;padding: 0 0 15px;">
|
|
<span>
|
|
<span>
|
|
- <a-input-number :min="0" v-model="newBid" :step="0.1" placeholder="请输入出价"
|
|
|
|
- size="small" style='margin-right:20px;width: 300px;' />
|
|
|
|
|
|
+ <a-input-number :min="0" v-model="newBid" :step="0.1" placeholder="请输入出价" size="small"
|
|
|
|
+ style='margin-right:20px;width: 300px;' />
|
|
</span>
|
|
</span>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
@@ -298,17 +301,18 @@
|
|
</a-row>
|
|
</a-row>
|
|
</div>
|
|
</div>
|
|
</a-modal>
|
|
</a-modal>
|
|
- <!-- 修改账户modal -->
|
|
|
|
- <a-modal v-model="accountVisible" title="切换账户" @ok="accounthandleOk" :width='800' @cancel='accountCancel' >
|
|
|
|
|
|
+ <!-- 修改账户modal -->
|
|
|
|
+ <a-modal v-model="accountVisible" title="切换账户" @ok="accounthandleOk" :width='800' @cancel='accountCancel'>
|
|
<div class="linkBody" style='height:100px;display:flex;'>
|
|
<div class="linkBody" style='height:100px;display:flex;'>
|
|
<div style="height:32px;line-height:32px">选择账户:</div>
|
|
<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 " />
|
|
|
|
|
|
+ <Treeselect :appId.sync="selectaccountId" :multiple="false" request="2,4" ref="treeSelect"
|
|
|
|
+ style="margin-bottom:8px;width:600px " />
|
|
</div>
|
|
</div>
|
|
</a-modal>
|
|
</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" />
|
|
|
|
|
|
+ <customColumnProject :visible="visibleIndex" :listNum="listNumIndex" :fiexColumn="columnsFixdIndex"
|
|
|
|
+ :mediaType="3" @closeCustomColumn="closeCustomColumnIndex" @changeColumnIndex="changeColumnIndex" />
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -331,20 +335,20 @@
|
|
import Treeselect from '@/views/modules/Statistics/components/Treeselect.vue'
|
|
import Treeselect from '@/views/modules/Statistics/components/Treeselect.vue'
|
|
import { mapGetters } from 'vuex'
|
|
import { mapGetters } from 'vuex'
|
|
export default {
|
|
export default {
|
|
- components: { customColumnProject, Treeselect},
|
|
|
|
|
|
+ components: { customColumnProject, Treeselect },
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
targetVisible: false,
|
|
targetVisible: false,
|
|
- accountVisible:false,
|
|
|
|
- visibleIndex:false,
|
|
|
|
|
|
+ accountVisible: false,
|
|
|
|
+ visibleIndex: false,
|
|
outTableShow: true,
|
|
outTableShow: true,
|
|
- modifyPriceVisible:false,
|
|
|
|
|
|
+ modifyPriceVisible: false,
|
|
listNum: [],
|
|
listNum: [],
|
|
- listNumIndex:[],
|
|
|
|
|
|
+ listNumIndex: [],
|
|
visible: false,
|
|
visible: false,
|
|
scrollX: 1500,
|
|
scrollX: 1500,
|
|
columnsFixd: keepPersonData.groupDelivery(),
|
|
columnsFixd: keepPersonData.groupDelivery(),
|
|
- columnsFixdIndex:keepPersonData.groupDeliveryIndexShow(),
|
|
|
|
|
|
+ columnsFixdIndex: keepPersonData.groupDeliveryIndexShow(),
|
|
valueBtn: 'cost',
|
|
valueBtn: 'cost',
|
|
plainOptions: [
|
|
plainOptions: [
|
|
{ label: '花费', value: '花费' },
|
|
{ label: '花费', value: '花费' },
|
|
@@ -357,14 +361,15 @@
|
|
dateEchart: [moment(), moment()],
|
|
dateEchart: [moment(), moment()],
|
|
dateRanges: keepPersonData.setTimeRange(),
|
|
dateRanges: keepPersonData.setTimeRange(),
|
|
dateSource: [moment(), moment()],
|
|
dateSource: [moment(), moment()],
|
|
- selectValue: 'totalCost',
|
|
|
|
|
|
+ selectValue: 'cost',
|
|
datePie: [moment(), moment()],
|
|
datePie: [moment(), moment()],
|
|
echartsData: [],
|
|
echartsData: [],
|
|
sourceMaterialData: [],
|
|
sourceMaterialData: [],
|
|
- echartsLoadingoutTable:false,
|
|
|
|
|
|
+ echartsLoadingoutTable: false,
|
|
echartsLoading: false,
|
|
echartsLoading: false,
|
|
- indexShowS:[
|
|
|
|
- {
|
|
|
|
|
|
+ accountDataId: '',
|
|
|
|
+ indexShowS: [
|
|
|
|
+ {
|
|
title: '消耗(元)',
|
|
title: '消耗(元)',
|
|
dataIndex: 'cost',
|
|
dataIndex: 'cost',
|
|
key: 'cost',
|
|
key: 'cost',
|
|
@@ -428,11 +433,10 @@
|
|
sourceMaterial: [
|
|
sourceMaterial: [
|
|
{
|
|
{
|
|
title: '素材',
|
|
title: '素材',
|
|
- dataIndex: 'videoUrl',
|
|
|
|
- key: 'videoUrl',
|
|
|
|
|
|
+ dataIndex: 'coverUrl',
|
|
|
|
+ key: 'coverUrl',
|
|
align: 'center',
|
|
align: 'center',
|
|
- scopedSlots: { customRender: 'unitvideoUrl' },
|
|
|
|
- width: 200
|
|
|
|
|
|
+ scopedSlots: { customRender: 'coverUrl' },
|
|
}, {
|
|
}, {
|
|
title: '素材ID',
|
|
title: '素材ID',
|
|
dataIndex: 'signature',
|
|
dataIndex: 'signature',
|
|
@@ -503,8 +507,8 @@
|
|
linkVisible: false,
|
|
linkVisible: false,
|
|
newLink: '',
|
|
newLink: '',
|
|
accountId: this.$route.query.accountId,
|
|
accountId: this.$route.query.accountId,
|
|
- unitId:'',
|
|
|
|
- bidType:'',
|
|
|
|
|
|
+ unitId: '',
|
|
|
|
+ bidType: '',
|
|
accountName: '',
|
|
accountName: '',
|
|
balance: '',
|
|
balance: '',
|
|
state: '',
|
|
state: '',
|
|
@@ -514,10 +518,10 @@
|
|
updateRelated: '',
|
|
updateRelated: '',
|
|
accountIndexEchartThreePieShow: true,
|
|
accountIndexEchartThreePieShow: true,
|
|
accountIndexEchartTwoPieShow: true,
|
|
accountIndexEchartTwoPieShow: true,
|
|
- accountIndexEchartThreePieShowemarks:true,
|
|
|
|
|
|
+ accountIndexEchartThreePieShowemarks: true,
|
|
accountIndexEchartOnePieShow: true,
|
|
accountIndexEchartOnePieShow: true,
|
|
- custNmaeType:'',
|
|
|
|
- selectaccountId:'',
|
|
|
|
|
|
+ custNmaeType: '',
|
|
|
|
+ selectaccountId: '',
|
|
}
|
|
}
|
|
},
|
|
},
|
|
filters: {
|
|
filters: {
|
|
@@ -550,6 +554,14 @@
|
|
return Number(value).toFixed(3).toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, "$1,");
|
|
return Number(value).toFixed(3).toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, "$1,");
|
|
},
|
|
},
|
|
},
|
|
},
|
|
|
|
+ watch: {
|
|
|
|
+ // accountId(n,o){
|
|
|
|
+ // if(n){
|
|
|
|
+
|
|
|
|
+ // this.getCurrentAccountInfo()
|
|
|
|
+ // }
|
|
|
|
+ // }
|
|
|
|
+ },
|
|
mounted() {
|
|
mounted() {
|
|
this.showColumn();
|
|
this.showColumn();
|
|
this.showIndex();
|
|
this.showIndex();
|
|
@@ -562,70 +574,71 @@
|
|
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)
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
- }
|
|
|
|
|
|
+ // 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 {
|
|
|
|
+ // 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;
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
|
|
+ ...mapGetters(['userInfo']),
|
|
|
|
+ accounthandleOk() {
|
|
|
|
+ this.accountVisible = false;
|
|
|
|
+ this.accountId = this.selectaccountId;
|
|
|
|
+ this.getQueryNewlyData();
|
|
|
|
+ this.getGroupDataList();
|
|
|
|
+ this.getAccountNameData();
|
|
|
|
+ this.getGroupLaunchData();
|
|
|
|
+ this.getEchartOnePieData();
|
|
|
|
+
|
|
},
|
|
},
|
|
- accountCancel(){
|
|
|
|
- this.accountVisible=false;
|
|
|
|
-
|
|
|
|
|
|
+ // 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;
|
|
|
|
-
|
|
|
|
|
|
+ changeAccount() {
|
|
|
|
+ this.selectaccountId = this.accountId
|
|
|
|
+ this.accountVisible = true;
|
|
|
|
+
|
|
},
|
|
},
|
|
- modifyPriceClick(row){
|
|
|
|
|
|
+ modifyPriceClick(row) {
|
|
// this.accountId = row.accountId
|
|
// this.accountId = row.accountId
|
|
- this.unitId = row.unit_id
|
|
|
|
- console.log(this.unitId);
|
|
|
|
- this.bidType = row.bidType
|
|
|
|
- this.modifyPriceVisible= true;
|
|
|
|
|
|
+ this.unitId = row.unit_id
|
|
|
|
+ console.log(this.unitId);
|
|
|
|
+ this.bidType = row.bidType
|
|
|
|
+ this.modifyPriceVisible = true;
|
|
},
|
|
},
|
|
//状态改变
|
|
//状态改变
|
|
switchChange(text, record) {
|
|
switchChange(text, record) {
|
|
@@ -654,7 +667,7 @@
|
|
|
|
|
|
},
|
|
},
|
|
// 显示指标
|
|
// 显示指标
|
|
- indexShowClick(){
|
|
|
|
|
|
+ indexShowClick() {
|
|
this.visibleIndex = true;
|
|
this.visibleIndex = true;
|
|
this.listNumIndex = [...this.indexShowS]
|
|
this.listNumIndex = [...this.indexShowS]
|
|
},
|
|
},
|
|
@@ -667,10 +680,10 @@
|
|
closeCustomColumn() {
|
|
closeCustomColumn() {
|
|
this.visible = false
|
|
this.visible = false
|
|
},
|
|
},
|
|
- closeCustomColumnIndex(){
|
|
|
|
|
|
+ closeCustomColumnIndex() {
|
|
this.visibleIndex = false;
|
|
this.visibleIndex = false;
|
|
},
|
|
},
|
|
- showIndex(){
|
|
|
|
|
|
+ showIndex() {
|
|
this.postDataAction('/toutiao/videoReportDaily/getColumnJson', {
|
|
this.postDataAction('/toutiao/videoReportDaily/getColumnJson', {
|
|
columnType: 106,
|
|
columnType: 106,
|
|
}).then((res) => {
|
|
}).then((res) => {
|
|
@@ -700,24 +713,24 @@
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
- changeColumnIndex(val){
|
|
|
|
|
|
+ changeColumnIndex(val) {
|
|
if (val.length > 4) {
|
|
if (val.length > 4) {
|
|
- return this.$message.warning('最多只可以选择4个指标');
|
|
|
|
- }else{
|
|
|
|
|
|
+ return this.$message.warning('最多只可以选择4个指标');
|
|
|
|
+ } else {
|
|
this.indexShowS = [...val]
|
|
this.indexShowS = [...val]
|
|
- let arr = JSON.stringify(this.indexShowS)
|
|
|
|
- this.postDataAction('/toutiao/videoReportDaily/saveOrUpdateColumnJson', {
|
|
|
|
- json: arr,
|
|
|
|
- columnType: 106,
|
|
|
|
- }).then((res) => {
|
|
|
|
- // console.log(res)
|
|
|
|
- })
|
|
|
|
|
|
+ let arr = JSON.stringify(this.indexShowS)
|
|
|
|
+ this.postDataAction('/toutiao/videoReportDaily/saveOrUpdateColumnJson', {
|
|
|
|
+ json: arr,
|
|
|
|
+ columnType: 106,
|
|
|
|
+ }).then((res) => {
|
|
|
|
+ // console.log(res)
|
|
|
|
+ })
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
},
|
|
},
|
|
showColumn() {
|
|
showColumn() {
|
|
-
|
|
|
|
- this.postDataAction('/toutiao/videoReportDaily/getColumnJson', {
|
|
|
|
|
|
+
|
|
|
|
+ this.postDataAction('/toutiao/videoReportDaily/getColumnJson', {
|
|
columnType: 103,
|
|
columnType: 103,
|
|
}).then((res) => {
|
|
}).then((res) => {
|
|
// console.log(res)
|
|
// console.log(res)
|
|
@@ -745,20 +758,20 @@
|
|
|
|
|
|
}
|
|
}
|
|
})
|
|
})
|
|
-
|
|
|
|
-
|
|
|
|
|
|
+
|
|
|
|
+
|
|
},
|
|
},
|
|
-
|
|
|
|
|
|
+
|
|
changeColumn(val) {
|
|
changeColumn(val) {
|
|
|
|
|
|
this.outTableShow = false;
|
|
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.$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) {
|
|
@@ -824,14 +837,14 @@
|
|
}
|
|
}
|
|
this.outTableShow = true;
|
|
this.outTableShow = true;
|
|
let arr = JSON.stringify(this.columns)
|
|
let arr = JSON.stringify(this.columns)
|
|
- this.postDataAction('/toutiao/videoReportDaily/saveOrUpdateColumnJson', {
|
|
|
|
- json: arr,
|
|
|
|
- columnType: 103,
|
|
|
|
- }).then((res) => {
|
|
|
|
- // console.log(res)
|
|
|
|
- })
|
|
|
|
|
|
+ this.postDataAction('/toutiao/videoReportDaily/saveOrUpdateColumnJson', {
|
|
|
|
+ json: arr,
|
|
|
|
+ columnType: 103,
|
|
|
|
+ }).then((res) => {
|
|
|
|
+ // console.log(res)
|
|
|
|
+ })
|
|
})
|
|
})
|
|
-
|
|
|
|
|
|
+
|
|
},
|
|
},
|
|
//获取echart折线图的值
|
|
//获取echart折线图的值
|
|
initEchart(idName, optionName) {
|
|
initEchart(idName, optionName) {
|
|
@@ -973,7 +986,7 @@
|
|
|
|
|
|
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.accountIndexEchartThreePieShowemarks));
|
|
|
|
|
|
+ this.initEchart('accountIndexEchartThreePie', this.initPieThreeData(pie3p, this.accountIndexEchartThreePieShow, centerthree, this.accountIndexEchartThreePieShowemarks));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1009,6 +1022,12 @@
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
|
|
+ sort(pagination, filters, sorter, { currentDataSource }) {
|
|
|
|
+ // console.log(pagination, filters, sorter)
|
|
|
|
+ this.echartsIpagination.current = pagination.current
|
|
|
|
+ this.echartsIpagination.pageSize = pagination.pageSize
|
|
|
|
+ this.getGroupLaunchData()
|
|
|
|
+ },
|
|
projectAccountChange() {
|
|
projectAccountChange() {
|
|
this.echartsIpagination.current = 1;
|
|
this.echartsIpagination.current = 1;
|
|
this.getGroupLaunchData();
|
|
this.getGroupLaunchData();
|
|
@@ -1031,6 +1050,7 @@
|
|
getAction(process.env.VUE_APP_BASE_STARE_URL + '/kuaiShouOpreate/kuaiShouMaterialStareController/getKuaiShouAccountInfo', params).then(res => {
|
|
getAction(process.env.VUE_APP_BASE_STARE_URL + '/kuaiShouOpreate/kuaiShouMaterialStareController/getKuaiShouAccountInfo', params).then(res => {
|
|
if (res.code == 0) {
|
|
if (res.code == 0) {
|
|
this.accountName = res.result.accountName;
|
|
this.accountName = res.result.accountName;
|
|
|
|
+ this.accountDataId = res.result.accountId;
|
|
this.balance = res.result.balance;
|
|
this.balance = res.result.balance;
|
|
this.state = res.result.state;
|
|
this.state = res.result.state;
|
|
this.totalCost = res.result.totalCost;
|
|
this.totalCost = res.result.totalCost;
|
|
@@ -1047,7 +1067,8 @@
|
|
}
|
|
}
|
|
getAction('http://139.186.29.76:8804/jeecg-boot/kuaishou/realTime/getUnitDateInfo', params).then(res => {
|
|
getAction('http://139.186.29.76:8804/jeecg-boot/kuaishou/realTime/getUnitDateInfo', params).then(res => {
|
|
if (res.code == 200) {
|
|
if (res.code == 200) {
|
|
- res.result.forEach((item) => {
|
|
|
|
|
|
+ if (res.result.length > 0) {
|
|
|
|
+ res.result.forEach((item) => {
|
|
// item.key=item.id;
|
|
// item.key=item.id;
|
|
// item.show=false;
|
|
// item.show=false;
|
|
item.visible = false;
|
|
item.visible = false;
|
|
@@ -1056,6 +1077,11 @@
|
|
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
|
|
|
|
+ }else{
|
|
|
|
+ this.echartsData = [];
|
|
|
|
+ this.totalAll = 0;
|
|
|
|
+ this.updateTimeGroup = res.timestamp;
|
|
|
|
+ }
|
|
this.echartsLoadingoutTable = false;
|
|
this.echartsLoadingoutTable = false;
|
|
}
|
|
}
|
|
})
|
|
})
|
|
@@ -1081,7 +1107,7 @@
|
|
// 修改出价
|
|
// 修改出价
|
|
bidChangeOk(record) {
|
|
bidChangeOk(record) {
|
|
if (this.newBid) {
|
|
if (this.newBid) {
|
|
- this.modifyPriceVisible = false
|
|
|
|
|
|
+ this.modifyPriceVisible = false
|
|
// record.accountId = this.accountId;
|
|
// record.accountId = this.accountId;
|
|
getAction('/kuaishou/dingpan/updateBid', {
|
|
getAction('/kuaishou/dingpan/updateBid', {
|
|
accountId: this.accountId,
|
|
accountId: this.accountId,
|
|
@@ -1183,7 +1209,7 @@
|
|
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
|
|
|
|
|
|
+ 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) {
|
|
@@ -1196,15 +1222,15 @@
|
|
return item.yHour
|
|
return item.yHour
|
|
})
|
|
})
|
|
|
|
|
|
- today.data = res.result.map(itemprice => {
|
|
|
|
- return itemprice.tData
|
|
|
|
- });
|
|
|
|
- today.name = '今天'
|
|
|
|
- yesterday.data = res.result.map(itemyes => {
|
|
|
|
- return itemyes.yData
|
|
|
|
- });
|
|
|
|
- yesterday.name = '昨天'
|
|
|
|
- this.initEchart('accountIndexEchart', this.initAccountIndexEchart(timeData, today, yesterday,this.valueBtn));
|
|
|
|
|
|
+ today.data = res.result.map(itemprice => {
|
|
|
|
+ return itemprice.tData
|
|
|
|
+ });
|
|
|
|
+ today.name = '今天'
|
|
|
|
+ yesterday.data = res.result.map(itemyes => {
|
|
|
|
+ return itemyes.yData
|
|
|
|
+ });
|
|
|
|
+ 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 today = {};
|
|
@@ -1217,7 +1243,7 @@
|
|
return item.data
|
|
return item.data
|
|
})
|
|
})
|
|
today.name = '汇总'
|
|
today.name = '汇总'
|
|
- this.initEchart('accountIndexEchart', this.initAccountIndexEchart(timeData, today, yesterday,this.valueBtn));
|
|
|
|
|
|
+ this.initEchart('accountIndexEchart', this.initAccountIndexEchart(timeData, today, yesterday, this.valueBtn));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
})
|
|
})
|
|
@@ -1228,14 +1254,14 @@
|
|
},
|
|
},
|
|
|
|
|
|
// 折线图
|
|
// 折线图
|
|
- initAccountIndexEchart(timeData, today, yesterday,valueBtn) {
|
|
|
|
|
|
+ initAccountIndexEchart(timeData, today, yesterday, valueBtn) {
|
|
console.log(valueBtn);
|
|
console.log(valueBtn);
|
|
let option = {
|
|
let option = {
|
|
|
|
|
|
tooltip: {
|
|
tooltip: {
|
|
- show : true,
|
|
|
|
|
|
+ show: true,
|
|
trigger: 'axis',
|
|
trigger: 'axis',
|
|
- formatter: valueBtn == 'eventPayRate' || valueBtn == 'leave' || valueBtn == 'eventNewUserPayRate' || valueBtn == 'keyActionRate' ?'{b}<br/>{a0}: {c0}%<br />{a1}: {c1}%<br />':''
|
|
|
|
|
|
+ formatter: valueBtn == 'eventPayRate' || valueBtn == 'leave' || valueBtn == 'eventNewUserPayRate' || valueBtn == 'keyActionRate' ? '{b}<br/>{a0}: {c0}%<br />{a1}: {c1}%<br />' : ''
|
|
},
|
|
},
|
|
legend: {
|
|
legend: {
|
|
bottom: '0%',
|
|
bottom: '0%',
|
|
@@ -1293,7 +1319,7 @@
|
|
borderWidth: 2,
|
|
borderWidth: 2,
|
|
borderColor: '#00FF00'
|
|
borderColor: '#00FF00'
|
|
},
|
|
},
|
|
- },
|
|
|
|
|
|
+ },
|
|
|
|
|
|
]
|
|
]
|
|
};
|
|
};
|
|
@@ -1303,7 +1329,7 @@
|
|
// 第一个饼图
|
|
// 第一个饼图
|
|
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']
|
|
|
|
|
|
+ const colorList = ['#58D5FF', '#73ACFF', '#FDD56A', '#FDB36A', '#FD866A', '#9E87FF']
|
|
let option = {
|
|
let option = {
|
|
tooltip: {
|
|
tooltip: {
|
|
trigger: 'item'
|
|
trigger: 'item'
|
|
@@ -1352,11 +1378,11 @@
|
|
show: false
|
|
show: false
|
|
},
|
|
},
|
|
itemStyle: {
|
|
itemStyle: {
|
|
- borderRadius: 5,
|
|
|
|
- color: (params) => {
|
|
|
|
- return colorList[params.dataIndex]
|
|
|
|
- }
|
|
|
|
- },
|
|
|
|
|
|
+ borderRadius: 5,
|
|
|
|
+ color: (params) => {
|
|
|
|
+ return colorList[params.dataIndex]
|
|
|
|
+ }
|
|
|
|
+ },
|
|
data: pieData
|
|
data: pieData
|
|
}
|
|
}
|
|
]
|
|
]
|
|
@@ -1365,7 +1391,7 @@
|
|
},
|
|
},
|
|
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']
|
|
|
|
|
|
+ const colorList = ['#58D5FF', '#73ACFF', '#FDD56A', '#FDB36A', '#FD866A', '#9E87FF']
|
|
let option = {
|
|
let option = {
|
|
tooltip: {
|
|
tooltip: {
|
|
trigger: 'item'
|
|
trigger: 'item'
|
|
@@ -1413,11 +1439,11 @@
|
|
show: false
|
|
show: false
|
|
},
|
|
},
|
|
itemStyle: {
|
|
itemStyle: {
|
|
- borderRadius: 5,
|
|
|
|
- color: (params) => {
|
|
|
|
- return colorList[params.dataIndex]
|
|
|
|
- }
|
|
|
|
- },
|
|
|
|
|
|
+ borderRadius: 5,
|
|
|
|
+ color: (params) => {
|
|
|
|
+ return colorList[params.dataIndex]
|
|
|
|
+ }
|
|
|
|
+ },
|
|
data: pie2d
|
|
data: pie2d
|
|
}
|
|
}
|
|
]
|
|
]
|
|
@@ -1425,9 +1451,9 @@
|
|
return option
|
|
return option
|
|
},
|
|
},
|
|
|
|
|
|
- initPieThreeData(pie3p, accountIndexEchartTwoPieShow, centerTwo,accountIndexEchartThreePieShowemarks) {
|
|
|
|
|
|
+ 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']
|
|
|
|
|
|
+ const colorList = ['#58D5FF', '#73ACFF', '#FDD56A', '#FDB36A', '#FD866A', '#9E87FF']
|
|
let option = {
|
|
let option = {
|
|
tooltip: {
|
|
tooltip: {
|
|
trigger: 'item'
|
|
trigger: 'item'
|
|
@@ -1446,9 +1472,9 @@
|
|
}
|
|
}
|
|
},
|
|
},
|
|
b: {
|
|
b: {
|
|
- fontSize:12,
|
|
|
|
- color:'#ccc'
|
|
|
|
-
|
|
|
|
|
|
+ fontSize: 12,
|
|
|
|
+ color: '#ccc'
|
|
|
|
+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1480,11 +1506,11 @@
|
|
show: false
|
|
show: false
|
|
},
|
|
},
|
|
itemStyle: {
|
|
itemStyle: {
|
|
- borderRadius: 5,
|
|
|
|
- color: (params) => {
|
|
|
|
- return colorList[params.dataIndex]
|
|
|
|
- }
|
|
|
|
- },
|
|
|
|
|
|
+ borderRadius: 5,
|
|
|
|
+ color: (params) => {
|
|
|
|
+ return colorList[params.dataIndex]
|
|
|
|
+ }
|
|
|
|
+ },
|
|
data: pie3p
|
|
data: pie3p
|
|
}
|
|
}
|
|
]
|
|
]
|