|
@@ -47,11 +47,11 @@
|
|
<li v-for="(item,index) in listNum" :key="index">
|
|
<li v-for="(item,index) in listNum" :key="index">
|
|
<span v-if=" index <5">
|
|
<span v-if=" index <5">
|
|
<a-icon type="lock" />
|
|
<a-icon type="lock" />
|
|
- <span>{{item.title}}</span>
|
|
|
|
|
|
+ <span class="listText">{{item.title}}</span>
|
|
</span>
|
|
</span>
|
|
<span v-else-if=" index >4">
|
|
<span v-else-if=" index >4">
|
|
<a-icon type="menu" style="color:#ccc" />
|
|
<a-icon type="menu" style="color:#ccc" />
|
|
- <span>{{item.title}}</span>
|
|
|
|
|
|
+ <span class="listText">{{item.title}}</span>
|
|
<a-icon
|
|
<a-icon
|
|
type="close"
|
|
type="close"
|
|
@click="deleteCol(item,index)"
|
|
@click="deleteCol(item,index)"
|
|
@@ -370,17 +370,22 @@ export default {
|
|
//弹出框打开,自定义列
|
|
//弹出框打开,自定义列
|
|
customColumns() {
|
|
customColumns() {
|
|
this.visible = true
|
|
this.visible = true
|
|
- this.listNum = this.columns
|
|
|
|
|
|
+ this.listNum = [...this.columns]
|
|
},
|
|
},
|
|
//弹出框确定
|
|
//弹出框确定
|
|
handleOk(e) {
|
|
handleOk(e) {
|
|
this.loading = false
|
|
this.loading = false
|
|
- this.columns = this.listNum
|
|
|
|
|
|
+
|
|
this.visible = false
|
|
this.visible = false
|
|
- // setTimeout(() => {
|
|
|
|
- // this.visible = false;
|
|
|
|
- // this.loading = false;
|
|
|
|
- // }, 1000);
|
|
|
|
|
|
+
|
|
|
|
+ if(this.listNum.length>=10){
|
|
|
|
+
|
|
|
|
+ let newlist=this.listNum.slice(columnsFixd.length)
|
|
|
|
+ console.log(newlist)
|
|
|
|
+ this.columns = [...columnsFixd,...newlist]
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
if (this.listNum.length > 12 && this.listNum.length<=13 ) {
|
|
if (this.listNum.length > 12 && this.listNum.length<=13 ) {
|
|
this.scrollX =1900
|
|
this.scrollX =1900
|
|
console.log(this.$refs.vSummaryTable)
|
|
console.log(this.$refs.vSummaryTable)
|
|
@@ -471,28 +476,28 @@ export default {
|
|
console.log('activated')
|
|
console.log('activated')
|
|
// this.getParticipateList()
|
|
// this.getParticipateList()
|
|
this.statDate = moment().subtract(1, 'day')
|
|
this.statDate = moment().subtract(1, 'day')
|
|
- // moment().format('YYYY-MM-DD_HH:mm')
|
|
|
|
-
|
|
|
|
- // postAction('/toutiao/videoReportDaily/getColumnJson', {
|
|
|
|
- // columnType:2,
|
|
|
|
- // }).then((res)=>{
|
|
|
|
- // // console.log(res)
|
|
|
|
- // if(res.success){
|
|
|
|
- // // console.log(JSON.parse(res.result))
|
|
|
|
- // let columns=JSON.parse(res.result)
|
|
|
|
- // if(columns.length){
|
|
|
|
- // columns.map((item,index)=>{
|
|
|
|
- // if(index>columnsFixd.length-1){
|
|
|
|
- // item.sorter=function(a,b){ return a[item.dataIndex]-b[item.dataIndex]}
|
|
|
|
- // }
|
|
|
|
|
|
+ moment().format('YYYY-MM-DD_HH:mm')
|
|
|
|
+
|
|
|
|
+ postAction('/toutiao/videoReportDaily/getColumnJson', {
|
|
|
|
+ columnType:2,
|
|
|
|
+ }).then((res)=>{
|
|
|
|
+ // console.log(res)
|
|
|
|
+ if(res.success){
|
|
|
|
+ // console.log(JSON.parse(res.result))
|
|
|
|
+ let columns=JSON.parse(res.result)
|
|
|
|
+ if(columns.length){
|
|
|
|
+ columns.map((item,index)=>{
|
|
|
|
+ if(index>columnsFixd.length-1){
|
|
|
|
+ item.sorter=function(a,b){ return a[item.dataIndex]-b[item.dataIndex]}
|
|
|
|
+ }
|
|
|
|
|
|
- // })
|
|
|
|
- // this.columns=columns
|
|
|
|
- // // console.log(this.columns)
|
|
|
|
- // }
|
|
|
|
- // }
|
|
|
|
|
|
+ })
|
|
|
|
+ this.columns=columns
|
|
|
|
+ // console.log(this.columns)
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
|
|
- // })
|
|
|
|
|
|
+ })
|
|
},
|
|
},
|
|
deactivated() {
|
|
deactivated() {
|
|
let arr = JSON.stringify(this.columns)
|
|
let arr = JSON.stringify(this.columns)
|
|
@@ -509,6 +514,9 @@ export default {
|
|
toPercentage(val) {
|
|
toPercentage(val) {
|
|
return (val * 100).toFixed(2) + '%'
|
|
return (val * 100).toFixed(2) + '%'
|
|
// return val
|
|
// return val
|
|
|
|
+ },
|
|
|
|
+ tofixed(val){
|
|
|
|
+ return Number(val).toFixed(2)
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
|