Jelajahi Sumber

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

魏志佳 4 tahun lalu
induk
melakukan
77aebe1dff

+ 11 - 11
src/views/modules/Statistics/refuseData.vue

@@ -23,11 +23,11 @@
 
           <a-table :columns="columns" :dataSource="dataList" bordered :loading="loading" size="middle"
             :pagination="ipagination" :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
-            <div slot="videoUrl" slot-scope="videoUrl">
+            <!-- <div slot="videoUrl" slot-scope="videoUrl">
               <video class="video" :src="videoUrl" controls="controls" style="height:200px;width:112.5px">
                 您的浏览器不支持 video 标签。
               </video>
-            </div>
+            </div> -->
             <div slot="coverUrl" slot-scope="coverUrl">
               <img :src="coverUrl" controls="controls" style="height:200px;width:112.5px" />
             </div>
@@ -123,15 +123,15 @@
         customRender: 'creativeName'
       }
     },
-    {
-      title: '视频',
-      dataIndex: 'videoUrl',
-      key: 'videoUrl',
-      align: 'center',
-      scopedSlots: {
-        customRender: 'videoUrl'
-      }
-    },
+    // {
+    //   title: '视频',
+    //   dataIndex: 'videoUrl',
+    //   key: 'videoUrl',
+    //   align: 'center',
+    //   scopedSlots: {
+    //     customRender: 'videoUrl'
+    //   }
+    // },
     {
       title: '封面',
       dataIndex: 'coverUrl',

+ 11 - 8
src/views/modules/Statistics/xiaoshouStatistics.vue

@@ -25,8 +25,8 @@
         <a-spin :spinning="spinning">
           <a-table :columns="columns" :data-source="tableData" :scroll="{ x: 4000 }" bordered size="middle"
             :laoding='loading' :pagination='ipagination' @change="tableChange" :customRow="click">
-
-            <a slot="projectName" slot-scope="text,records" @click="goAccount(records)">{{text}}</a>
+            <a slot="projectName" slot-scope="text,records">{{text}}</a>
+            <!-- <a slot="projectName" slot-scope="text,records" @click="goAccount(records)">{{text}}</a>
             <a slot="authName" slot-scope="text,records" @click="goCampaign(records)">{{text}}</a>
             <a slot="campaignName" slot-scope="text,records" @click="goUnit(records)">{{text}}</a>
             <a slot="unitName" slot-scope="text,records" @click="goCreative(records)">{{text}}</a>
@@ -34,7 +34,7 @@
 
             <a slot="coverUrl" slot-scope="text,records">
               <img :src="text" alt="" style="width:100px" @click="openVideo(records)">
-            </a>
+            </a> -->
 
             <span slot="charge" slot-scope="charge"> {{charge|decimalsHandle}}</span>
             <span slot="activationCost" slot-scope="activationCost"> {{activationCost|decimalsHandle}}</span>
@@ -123,15 +123,15 @@
         <a-table :columns="columnsChildren" :data-source="tableDataChild" :scroll="{ x: 3500 }" bordered size="middle"
           :laoding='loadingChild' :pagination='ipaginationCount' :customRow="click">
 
-          <a slot="projectName" slot-scope="text,records" @click="goAccount(records)">{{text}}</a>
+          <!-- <a slot="projectName" slot-scope="text,records" @click="goAccount(records)">{{text}}</a>
           <a slot="authName" slot-scope="text,records" @click="goCampaign(records)">{{text}}</a>
           <a slot="campaignName" slot-scope="text,records" @click="goUnit(records)">{{text}}</a>
           <a slot="unitName" slot-scope="text,records" @click="goCreative(records)">{{text}}</a>
-          <a slot="creativeName" slot-scope="creativeName">{{creativeName}}</a>
+          <a slot="creativeName" slot-scope="creativeName">{{creativeName}}</a> -->
 
-          <a slot="coverUrl" slot-scope="text,records">
+          <!-- <a slot="coverUrl" slot-scope="text,records">
             <img :src="text" alt="" style="width:100px" @click="openVideo(records)">
-          </a>
+          </a> -->
 
           <span slot="charge" slot-scope="charge"> {{charge|decimalsHandle}}</span>
           <span slot="activationCost" slot-scope="activationCost"> {{activationCost|decimalsHandle}}</span>
@@ -519,7 +519,7 @@
     {
       title: '时间',
       dataIndex: 'statDate',
-      width:200,
+      width: 200,
       scopedSlots: {
         customRender: 'statDate'
       },
@@ -827,6 +827,7 @@
               this.visible = true
               this.loadingChild = true
               if (this.tabKey == 1) {
+
                 this.columnsChildren = [...accountColumns, ...bytedanceColumns]
                 var params = {
                   startDate: this.dateRange[0].format('YYYY-MM-DD'),
@@ -845,6 +846,8 @@
                     this.loadingChild = false
                   }
                 })
+
+
               } else if (this.tabKey == 2) {
                 this.columnsChildren = [...accountColumns, ...publicColumns]
                 var params = {