|
@@ -6,7 +6,7 @@
|
|
<div class="accountBodyLeftCost">
|
|
<div class="accountBodyLeftCost">
|
|
<div class="accountBodyLeftCostLeft">
|
|
<div class="accountBodyLeftCostLeft">
|
|
<div class="top">
|
|
<div class="top">
|
|
- <p class="title" style="margin-bottom:15px">花费</p>
|
|
|
|
|
|
+ <p class="title" >花费</p>
|
|
<a-range-picker
|
|
<a-range-picker
|
|
v-model="dateValue"
|
|
v-model="dateValue"
|
|
style="width:170px;"
|
|
style="width:170px;"
|
|
@@ -39,7 +39,7 @@
|
|
</div>
|
|
</div>
|
|
<div class="accountBodyLeftCostRight">
|
|
<div class="accountBodyLeftCostRight">
|
|
<div class="gaugeEchart" id="gaugeEchart" style='width:100%;height:200px;margin:0 auto' ref="gaugeEchart">
|
|
<div class="gaugeEchart" id="gaugeEchart" style='width:100%;height:200px;margin:0 auto' ref="gaugeEchart">
|
|
-
|
|
|
|
|
|
+ <a-empty />
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -57,13 +57,22 @@
|
|
<div class="yesterdayCost">
|
|
<div class="yesterdayCost">
|
|
/<a-tooltip >
|
|
/<a-tooltip >
|
|
<template slot="title">
|
|
<template slot="title">
|
|
- <span>{{dateValue}}的{{item.title}}</span>
|
|
|
|
|
|
+ <span>
|
|
|
|
+ {{dateValue[0].format('YYYY-MM-DD')==dateValue[1].format('YYYY-MM-DD')?dateValue[0].format('YYYY-MM-DD'):''}}
|
|
|
|
+ 的{{item.title}}
|
|
|
|
+ </span>
|
|
</template>
|
|
</template>
|
|
<a-icon type="question-circle" />
|
|
<a-icon type="question-circle" />
|
|
</a-tooltip>:{{item.yesterday | decimalsHandle}}
|
|
</a-tooltip>:{{item.yesterday | decimalsHandle}}
|
|
</div>
|
|
</div>
|
|
- <span class="IndexName" :class="{'IndexNameActive':isActive==item.dataIndex}" @click="getActiveIndexName(item)">
|
|
|
|
- {{item.title}}
|
|
|
|
|
|
+ <span class="IndexName" :class="{'IndexNameActive':isActive==item.dataIndex}" @click="getActiveIndexName(item)">
|
|
|
|
+ <a-tooltip >
|
|
|
|
+ <template slot="title">
|
|
|
|
+ <span>{{item.title}}</span>
|
|
|
|
+ </template>
|
|
|
|
+ <span style="display:inline-block;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;max-width:105px">{{item.title}}</span>
|
|
|
|
+ </a-tooltip>
|
|
|
|
+
|
|
</span>
|
|
</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -78,7 +87,7 @@
|
|
</div>
|
|
</div>
|
|
<div class="accountBodyRight">
|
|
<div class="accountBodyRight">
|
|
<div class="accountBodyRighTitle" @click="changeAccount">
|
|
<div class="accountBodyRighTitle" @click="changeAccount">
|
|
- <h1>{{currentAccount.accountName}}</h1>
|
|
|
|
|
|
+ <h1>{{currentAccount.accountName}}<a-icon type="down" style="font-size:14px" /></h1>
|
|
<p class="accountBodyRighTitleID">账户ID:{{currentAccount.accountId || 9647490}}</p>
|
|
<p class="accountBodyRighTitleID">账户ID:{{currentAccount.accountId || 9647490}}</p>
|
|
</div>
|
|
</div>
|
|
<div class="accountBodyRightInfo">
|
|
<div class="accountBodyRightInfo">
|
|
@@ -166,7 +175,7 @@
|
|
<a-popover v-model="record.visible" trigger="click" placement="topLeft" @visibleChange='visibleChange'>
|
|
<a-popover v-model="record.visible" trigger="click" placement="topLeft" @visibleChange='visibleChange'>
|
|
<span slot="title">修改出价</span>
|
|
<span slot="title">修改出价</span>
|
|
<template slot="content" style="width:300px;">
|
|
<template slot="content" style="width:300px;">
|
|
- <div style="margin:5px 0 0">
|
|
|
|
|
|
+ <div style="margin:5px 0 0;padding: 0 0 15px;">
|
|
<span ><a-input-number :min="0" v-model="newBid" :step="0.1" placeholder="请输入出价" size="small" style='margin-right:20px;width:120px' /></span>
|
|
<span ><a-input-number :min="0" v-model="newBid" :step="0.1" placeholder="请输入出价" size="small" style='margin-right:20px;width:120px' /></span>
|
|
<p style="color:red;font-size:12px;height:16px;padding:5px 0">{{bidErrorMessage}}</p>
|
|
<p style="color:red;font-size:12px;height:16px;padding:5px 0">{{bidErrorMessage}}</p>
|
|
</div>
|
|
</div>
|
|
@@ -508,7 +517,7 @@ const materialColumns = [
|
|
title: '素材ID',
|
|
title: '素材ID',
|
|
dataIndex: 'signature',
|
|
dataIndex: 'signature',
|
|
key: 'signature',
|
|
key: 'signature',
|
|
- width:150,
|
|
|
|
|
|
+ width:170,
|
|
align: 'center',
|
|
align: 'center',
|
|
scopedSlots: { customRender: 'signature' },
|
|
scopedSlots: { customRender: 'signature' },
|
|
},
|
|
},
|
|
@@ -627,8 +636,8 @@ const columnsFixd = [
|
|
const columns=[
|
|
const columns=[
|
|
{
|
|
{
|
|
title: '激活成本',
|
|
title: '激活成本',
|
|
- dataIndex: 'activeCost',
|
|
|
|
- key:'activeCost',
|
|
|
|
|
|
+ dataIndex: 'activationCost',
|
|
|
|
+ key:'activationCost',
|
|
today:0,
|
|
today:0,
|
|
yesterday:0
|
|
yesterday:0
|
|
},
|
|
},
|
|
@@ -690,7 +699,7 @@ const columns=[
|
|
newLink:'',
|
|
newLink:'',
|
|
linkVisible:false,
|
|
linkVisible:false,
|
|
targetVisible:false,
|
|
targetVisible:false,
|
|
- isActive:'activeCost',
|
|
|
|
|
|
+ isActive:'activationCost',
|
|
moment,
|
|
moment,
|
|
materialDate:[moment().subtract(1,'days'),moment().subtract(1,'days')],
|
|
materialDate:[moment().subtract(1,'days'),moment().subtract(1,'days')],
|
|
currentAccount:{},
|
|
currentAccount:{},
|
|
@@ -769,18 +778,20 @@ const columns=[
|
|
watch:{
|
|
watch:{
|
|
accountId(n,o){
|
|
accountId(n,o){
|
|
if(n){
|
|
if(n){
|
|
-
|
|
|
|
|
|
+ this.echartIndex='charge';
|
|
|
|
+ this.getColumnsByAccountId();
|
|
|
|
+
|
|
this.getAllIndex();
|
|
this.getAllIndex();
|
|
this.getAgeData();
|
|
this.getAgeData();
|
|
this.getNewlyCounts();
|
|
this.getNewlyCounts();
|
|
- this.getAccountIndexData();
|
|
|
|
|
|
+ // this.getAccountIndexData();
|
|
this.getLaunchData();
|
|
this.getLaunchData();
|
|
this.getMaterialOverview();
|
|
this.getMaterialOverview();
|
|
this.getSceneData();
|
|
this.getSceneData();
|
|
this.getGenderData()
|
|
this.getGenderData()
|
|
this.getMaterialData()
|
|
this.getMaterialData()
|
|
- this.getColumnsByAccountId();
|
|
|
|
- this.echartIndex='charge'
|
|
|
|
|
|
+
|
|
|
|
+ this.getCurrentAccountInfo()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -827,7 +838,7 @@ const columns=[
|
|
accounthandleOk(){
|
|
accounthandleOk(){
|
|
this.accountVisible=false;
|
|
this.accountVisible=false;
|
|
this.accountId=this.selectaccountId
|
|
this.accountId=this.selectaccountId
|
|
- this.getCurrentAccountInfo();
|
|
|
|
|
|
+ // this.getCurrentAccountInfo();
|
|
},
|
|
},
|
|
accountCancel(){
|
|
accountCancel(){
|
|
this.accountVisible=false;
|
|
this.accountVisible=false;
|
|
@@ -851,15 +862,32 @@ const columns=[
|
|
}).then(res => {
|
|
}).then(res => {
|
|
// // console.log(res);(res)
|
|
// // console.log(res);(res)
|
|
})
|
|
})
|
|
|
|
+
|
|
|
|
+ this.isActive=this.columns[1].dataIndex
|
|
|
|
+
|
|
|
|
+ this.getAccountIndexData()
|
|
|
|
+
|
|
}else{
|
|
}else{
|
|
- this.$message.error('暂无数据')
|
|
|
|
|
|
+ // this.$message.error('暂无数据,不支持修改自定义列')
|
|
|
|
+ this.columns=[...val];
|
|
|
|
+ let arr = JSON.stringify(this.columns)
|
|
|
|
+ postAction('/toutiao/videoReportDaily/saveOrUpdateColumnJsonByAccountId', {
|
|
|
|
+ json: arr,
|
|
|
|
+ columnType: 10,
|
|
|
|
+ accountId:this.accountId
|
|
|
|
+ }).then(res => {
|
|
|
|
+ // // console.log(res);(res)
|
|
|
|
+ })
|
|
|
|
+ this.isActive=this.columns[1].dataIndex
|
|
|
|
+
|
|
|
|
+ this.getAccountIndexData()
|
|
}
|
|
}
|
|
|
|
|
|
},
|
|
},
|
|
getColumnsByAccountId(){
|
|
getColumnsByAccountId(){
|
|
postAction('/toutiao/videoReportDaily/getColumnJsonByAccountId', {
|
|
postAction('/toutiao/videoReportDaily/getColumnJsonByAccountId', {
|
|
- columnType: 10,
|
|
|
|
- accountId:this.accountId
|
|
|
|
|
|
+ columnType: 10,
|
|
|
|
+ accountId:this.accountId
|
|
}).then(res => {
|
|
}).then(res => {
|
|
// // console.log(res);(res)
|
|
// // console.log(res);(res)
|
|
if (res.success) {
|
|
if (res.success) {
|
|
@@ -877,8 +905,11 @@ const columns=[
|
|
|
|
|
|
// // console.log(res);(this.columns)
|
|
// // console.log(res);(this.columns)
|
|
}
|
|
}
|
|
|
|
+ this.isActive=this.columns[1].dataIndex
|
|
}
|
|
}
|
|
- this.changeColumn(this.columns)
|
|
|
|
|
|
+ this.changeColumn(this.columns);
|
|
|
|
+ this.getAccountIndexData()
|
|
|
|
+
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
@@ -1831,12 +1862,16 @@ const columns=[
|
|
this.accountPageSpinning=true
|
|
this.accountPageSpinning=true
|
|
getAction('/etl/reportAccountHourly/getMaxChargeAccountId',{
|
|
getAction('/etl/reportAccountHourly/getMaxChargeAccountId',{
|
|
accountId:val || this.accountId ||undefined,
|
|
accountId:val || this.accountId ||undefined,
|
|
- userId:this.userInfo().id,
|
|
|
|
|
|
+
|
|
}).then(res=>{
|
|
}).then(res=>{
|
|
if(res.success){
|
|
if(res.success){
|
|
this.currentAccount=res.result;
|
|
this.currentAccount=res.result;
|
|
// this.accountId=res.result.accountId
|
|
// this.accountId=res.result.accountId
|
|
this.accountPageSpinning=false
|
|
this.accountPageSpinning=false
|
|
|
|
+ }else{
|
|
|
|
+ this.accountPageSpinning=false;
|
|
|
|
+ this.$message.error(res.message)
|
|
|
|
+ this.currentAccount={};
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
@@ -1857,6 +1892,7 @@ const columns=[
|
|
value:this.isActive,
|
|
value:this.isActive,
|
|
}).then(res=>{
|
|
}).then(res=>{
|
|
// console.log(res);(res);
|
|
// console.log(res);(res);
|
|
|
|
+ this.accountIndexEchartSpinning=false;
|
|
if(res.success){
|
|
if(res.success){
|
|
let data={
|
|
let data={
|
|
xData:null,
|
|
xData:null,
|
|
@@ -1874,10 +1910,12 @@ const columns=[
|
|
|
|
|
|
|
|
|
|
// 单天的数据
|
|
// 单天的数据
|
|
- if(res.result.yesterday.length&&res.result.yesterday[0].statHour){
|
|
|
|
|
|
+
|
|
|
|
+ if(res.result.yesterday.length&&res.result.yesterday[0].statHour==0){
|
|
|
|
+
|
|
data.xData=[];
|
|
data.xData=[];
|
|
data.xData= Array.apply(null, Array(24)).map((item, i)=> {return i<10?`0${i}:00`:`${i}:00`});
|
|
data.xData= Array.apply(null, Array(24)).map((item, i)=> {return i<10?`0${i}:00`:`${i}:00`});
|
|
- data.yData.yesterday.name=this.dateValue[0].subtract(1,'days').format('YYYY-MM-DD');
|
|
|
|
|
|
+ data.yData.yesterday.name=moment(this.dateValue[0]).subtract(1,'days').format('YYYY-MM-DD');
|
|
data.yData.today.name=this.dateValue[0].format('YYYY-MM-DD')
|
|
data.yData.today.name=this.dateValue[0].format('YYYY-MM-DD')
|
|
data.yData.yesterday.data=res.result.yesterday.map((item,index)=>{
|
|
data.yData.yesterday.data=res.result.yesterday.map((item,index)=>{
|
|
return item.value?item.value:0
|
|
return item.value?item.value:0
|
|
@@ -1885,11 +1923,13 @@ const columns=[
|
|
data.yData.today.data=res.result.today.map((item,index)=>{
|
|
data.yData.today.data=res.result.today.map((item,index)=>{
|
|
return item.value?item.value:0
|
|
return item.value?item.value:0
|
|
})
|
|
})
|
|
|
|
+ // console.log(data)
|
|
this.initEchart('accountIndexEchart',this.initAccountIndexEchart(indexName,data))
|
|
this.initEchart('accountIndexEchart',this.initAccountIndexEchart(indexName,data))
|
|
|
|
|
|
}else if(res.result.yesterday.length&&!res.result.yesterday[0].statHour){
|
|
}else if(res.result.yesterday.length&&!res.result.yesterday[0].statHour){
|
|
// 时间段的
|
|
// 时间段的
|
|
- xData={};
|
|
|
|
|
|
+
|
|
|
|
+ data.xData={};
|
|
data.xData.yesterday=res.result.yesterday.map(item=>{
|
|
data.xData.yesterday=res.result.yesterday.map(item=>{
|
|
return item.statDate
|
|
return item.statDate
|
|
})
|
|
})
|
|
@@ -1900,6 +1940,7 @@ const columns=[
|
|
|
|
|
|
data.yData.yesterday.data=res.result.yesterday.map(item=>item.value)
|
|
data.yData.yesterday.data=res.result.yesterday.map(item=>item.value)
|
|
data.yData.today.data=res.result.today.map(item=>item.value)
|
|
data.yData.today.data=res.result.today.map(item=>item.value)
|
|
|
|
+ // console.log(data)
|
|
this.initEchart('accountIndexEchart',this.initAccountIndexEchart(indexName,data))
|
|
this.initEchart('accountIndexEchart',this.initAccountIndexEchart(indexName,data))
|
|
|
|
|
|
}else{
|
|
}else{
|
|
@@ -2109,22 +2150,33 @@ const columns=[
|
|
|
|
|
|
},
|
|
},
|
|
mounted() {
|
|
mounted() {
|
|
- this.$nextTick(()=>{
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- // this.echartIndexChange('charge')
|
|
|
|
-
|
|
|
|
- })
|
|
|
|
|
|
+
|
|
this.getAccountId();
|
|
this.getAccountId();
|
|
this.accountPageSpinning=true
|
|
this.accountPageSpinning=true
|
|
- getAction('/etl/reportAccountHourly/getMaxChargeAccountId',{
|
|
|
|
|
|
+ // getAction('/etl/reportAccountHourly/getMaxChargeAccountId',{
|
|
|
|
+ // userId:this.userInfo().id,
|
|
|
|
+ // }).then(res=>{
|
|
|
|
+ // if(res.success){
|
|
|
|
+ // this.currentAccount=res.result;
|
|
|
|
+ // this.accountId=res.result.accountId;
|
|
|
|
+ // this.selectaccountId=res.result.accountId;
|
|
|
|
+ // this.accountPageSpinning=false
|
|
|
|
+ // }else{
|
|
|
|
+ // this.$message.error(res.message)
|
|
|
|
+ // this.accountPageSpinning=false
|
|
|
|
+ // }
|
|
|
|
+ // })
|
|
|
|
+ getAction('/etl/reportAccountHourly/getMaxChargeAccountIdByUser',{
|
|
userId:this.userInfo().id,
|
|
userId:this.userInfo().id,
|
|
}).then(res=>{
|
|
}).then(res=>{
|
|
if(res.success){
|
|
if(res.success){
|
|
- this.currentAccount=res.result;
|
|
|
|
- this.accountId=res.result.accountId;
|
|
|
|
- this.selectaccountId=res.result.accountId;
|
|
|
|
- this.accountPageSpinning=false
|
|
|
|
|
|
+ // this.currentAccount=res.result;
|
|
|
|
+ this.accountId=res.result;
|
|
|
|
+ this.selectaccountId=res.result;
|
|
|
|
+ this.accountPageSpinning=false;
|
|
|
|
+ }else{
|
|
|
|
+ // this.$message.error(res.message)
|
|
|
|
+ this.accountPageSpinning=false;
|
|
}
|
|
}
|
|
})
|
|
})
|
|
|
|
|
|
@@ -2209,7 +2261,9 @@ const columns=[
|
|
<style lang="scss" scoped>
|
|
<style lang="scss" scoped>
|
|
// #
|
|
// #
|
|
.accountPage{
|
|
.accountPage{
|
|
-
|
|
|
|
|
|
+ p{
|
|
|
|
+ margin-bottom: 0px;
|
|
|
|
+ }
|
|
.echart{
|
|
.echart{
|
|
margin-top: 30px;
|
|
margin-top: 30px;
|
|
}
|
|
}
|
|
@@ -2262,7 +2316,7 @@ const columns=[
|
|
padding: 0;
|
|
padding: 0;
|
|
}
|
|
}
|
|
.costInfo{
|
|
.costInfo{
|
|
- margin: 24px 0 0 0;
|
|
|
|
|
|
+ margin: 20px 0 0 0;
|
|
width: 70%;
|
|
width: 70%;
|
|
display: flex;
|
|
display: flex;
|
|
justify-content: space-between;
|
|
justify-content: space-between;
|
|
@@ -2277,7 +2331,7 @@ const columns=[
|
|
text-align: center;
|
|
text-align: center;
|
|
border-radius: 10px;
|
|
border-radius: 10px;
|
|
margin: 15px 0;
|
|
margin: 15px 0;
|
|
- padding: 8px 0px;
|
|
|
|
|
|
+ padding: 3px 0px;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.accountBodyLeftCostRight{
|
|
.accountBodyLeftCostRight{
|
|
@@ -2298,13 +2352,13 @@ const columns=[
|
|
.item{
|
|
.item{
|
|
width: 25%;
|
|
width: 25%;
|
|
// min-width: 100px;
|
|
// min-width: 100px;
|
|
-
|
|
|
|
|
|
+ // font-size: 16px;
|
|
}
|
|
}
|
|
.todyCost{
|
|
.todyCost{
|
|
- font-size: 1.5em;
|
|
|
|
|
|
+ font-size: 1.2rem;
|
|
font-weight: 700;
|
|
font-weight: 700;
|
|
color:#303133;
|
|
color:#303133;
|
|
- margin-bottom: 10px;
|
|
|
|
|
|
+ margin-bottom: 3px;
|
|
width: 100%;
|
|
width: 100%;
|
|
|
|
|
|
}
|
|
}
|
|
@@ -2342,17 +2396,21 @@ const columns=[
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.yesterdayCost{
|
|
.yesterdayCost{
|
|
- font-size: 15px;
|
|
|
|
|
|
+ font-size: 0.89rem;
|
|
font-weight: 500;
|
|
font-weight: 500;
|
|
color:#303133;
|
|
color:#303133;
|
|
- margin-bottom:8px ;
|
|
|
|
|
|
+ margin-bottom:3px ;
|
|
}
|
|
}
|
|
.IndexName{
|
|
.IndexName{
|
|
|
|
+ // width: 100%;
|
|
font-size: 15px;
|
|
font-size: 15px;
|
|
font-weight: 600;
|
|
font-weight: 600;
|
|
color:#303133;
|
|
color:#303133;
|
|
display: inline-block;
|
|
display: inline-block;
|
|
cursor: pointer;
|
|
cursor: pointer;
|
|
|
|
+ // white-space:nowrap;
|
|
|
|
+ // overflow:hidden;
|
|
|
|
+ // text-overflow:ellipsis;
|
|
}
|
|
}
|
|
.IndexNameActive{
|
|
.IndexNameActive{
|
|
color:#2461F1;
|
|
color:#2461F1;
|
|
@@ -2486,8 +2544,8 @@ const columns=[
|
|
}
|
|
}
|
|
.accountBodyRightInfoItem{
|
|
.accountBodyRightInfoItem{
|
|
background: rgb(238,241,255);
|
|
background: rgb(238,241,255);
|
|
- padding: 15px;
|
|
|
|
- margin: 20px 0 0;
|
|
|
|
|
|
+ padding:10px 15px;
|
|
|
|
+ margin: 15px 0 0;
|
|
border-radius: 5px;
|
|
border-radius: 5px;
|
|
font-size: 16px;
|
|
font-size: 16px;
|
|
.name{
|
|
.name{
|