Parcourir la source

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-vue

朱鑫波 il y a 4 ans
Parent
commit
0c51245e9c

+ 1 - 1
src/views/modules/Statistics/KSAccountReport.vue

@@ -1304,7 +1304,7 @@ export default {
                 columns.map((item, index) => {
                 if (index > columnsFixd.length - 1) {
                     item.sorter = function(a, b) {
-                      return a[item.dataIndex] - b[item.dataIndex]
+                      
                     }
                 }
                 })

+ 1 - 1
src/views/modules/Statistics/accountReport.vue

@@ -1230,7 +1230,7 @@ export default {
                 columns.map((item, index) => {
                 if (index > columnsFixd.length - 1) {
                     item.sorter = function(a, b) {
-                    return a[item.dataIndex] - b[item.dataIndex]
+                    
                     }
                 }
                 })

+ 57 - 7
src/views/modules/Statistics/newPlanStatic/newPlanStatic.vue

@@ -229,7 +229,10 @@
     <a-row >
       <div class="showNumBox">
           <a-col :sm="24" :md="10" :xl="10" :xxl="10">
-            <span class="title">新上计划数</span>
+            <span class="title">
+              新上
+              {{tabKey==1?'计划数':'推广组'}}
+            </span>
             <div>
               <countTo
                 :startVal="0"
@@ -246,7 +249,7 @@
           </a-col>
           
           <a-col :sm="24" :md="10" :xl="10" :xxl="10">
-            <span class="title">有效计划数</span>
+            <span class="title">有效{{tabKey==1?'计划数':'推广组'}}</span>
            <div>
               <countTo
                 :startVal="0"
@@ -275,9 +278,9 @@
       <a-col :span="24">
         <div class="tableBody">
           <a-tabs v-model="tableTab" @change="tableTabChange">
-            <a-tab-pane :key="1" tab="新上计划数">        
+            <a-tab-pane :key="1" :tab="tabKey==1?'新上计划数':'新上推广组'">        
             </a-tab-pane>
-            <a-tab-pane :key="2" tab="有效计划数">       
+            <a-tab-pane :key="2" :tab="tabKey==1?'有效计划数':'有效推广组'">       
             </a-tab-pane>
           </a-tabs>
           <a-table :columns="columns" :dataSource="dataTable" :pagination="false" :loading="loading" bordered>             
@@ -319,7 +322,7 @@ require('echarts/lib/component/graphic')
 require('echarts/lib/component/toolbox')
 require('echarts/lib/component/legend')
 
-let columns=[
+let TTcolumns=[
   {
     title: '项目名称',
     dataIndex: 'accountName',
@@ -361,6 +364,50 @@ let columns=[
     
   },
 ]
+let KScolumns=[
+  {
+    title: '项目名称',
+    dataIndex: 'accountName',
+    scopedSlots: { customRender: 'accountName' },
+    align: 'center',
+    key:'accountName'
+    
+  },
+  {
+    title: '账户ID',
+    dataIndex: 'accountId',
+    scopedSlots: { customRender: 'accountId' },
+    align: 'center',
+    key:'accountId'
+    
+  },
+  {
+    title: '账户所属人',
+    dataIndex: 'people',
+    scopedSlots: { customRender: 'people' },
+    align: 'center',
+    key:'people'
+    
+  },
+  {
+    title: '上新推广组',
+    dataIndex: 'newPlan',
+    scopedSlots: { customRender: 'newPlan' },
+    align: 'center',
+    key:'newPlan'
+    
+  },
+  {
+    title: '时间周期',
+    dataIndex: 'statDate',
+    scopedSlots: { customRender: 'statDate' },
+    align: 'center',
+    key:'statDate'
+    
+  },
+]
+
+
 
 let sectionOption={
     backgroundColor: '#fff',
@@ -493,7 +540,9 @@ export default {
       sectionOption,
 
       loading: false,
-      columns ,    
+      TTcolumns,
+      KScolumns,
+      columns:[...TTcolumns],    
       dataTable: [],
      
       tableTab:1,
@@ -633,9 +682,10 @@ export default {
       
       if(key==1){
         // toutiao
-
+        this.columns=[...TTcolumns]
       }else{
         // kuaishou
+        this.columns=[...KScolumns]
       }
       this.accountHttp()
     },

+ 2 - 2
src/views/modules/Statistics/videoStatics/KSvideoStatics.vue

@@ -857,7 +857,7 @@ export default {
                 columns.map((item, index) => {
                 if (index > columnsFixd.length - 1) {
                     item.sorter = function(a, b) {
-                      return a[item.dataIndex] - b[item.dataIndex]
+                      
                     }
                 }
                 })
@@ -1018,7 +1018,7 @@ filters: {
                 columns.map((item, index) => {
                 if (index > columnsFixd.length - 1) {
                     item.sorter = function(a, b) {
-                      return a[item.dataIndex] - b[item.dataIndex]
+                      
                     }
                 }
                 })

+ 2 - 2
src/views/modules/Statistics/videoStatics/TTvideoStatics.vue

@@ -755,7 +755,7 @@ export default {
                 columns.map((item, index) => {
                 if (index > columnsFixd.length - 1) {
                     item.sorter = function(a, b) {
-                    return a[item.dataIndex] - b[item.dataIndex]
+                   
                     }
                 }
                 })
@@ -916,7 +916,7 @@ export default {
                 columns.map((item, index) => {
                 if (index > columnsFixd.length - 1) {
                     item.sorter = function(a, b) {
-                    return a[item.dataIndex] - b[item.dataIndex]
+                   
                     }
                 }
                 })