浏览代码

'改创意,总报表'

魏志佳 4 年之前
父节点
当前提交
8362859a60

+ 15 - 3
src/views/modules/BatchCreate/TouTiaoBatch.vue

@@ -2,7 +2,7 @@
     <div class="toutiaoBatch">
         <!-- <a-spin :spinning="spinning"> -->
 
-        <keep-alive>
+        
         <div class="tabs">
             <a-tabs v-model="tabkey" @change="callback">
                 <a-tab-pane key="group" tab="广告组">
@@ -33,7 +33,7 @@
 
             </a-tabs>
         </div>
-        </keep-alive>
+       
         <div class="topOptions">
             <span class="OptinItem topOpt">
                 <!-- <Treeselect :appId.sync="accountID" :multiple="false" request="2,4" reqUrl='/ctop/projectMember/getProjectAccountByUserId' ref="treeSelect" style="margin-bottom:8px " /> -->
@@ -228,6 +228,7 @@
                 </a-table>
             </div>
         </div>
+        
         <!-- 出价的模态框 -->
         <div class="batchModal" >
             <a-modal v-model="offerPriceVisiable" :title="'批量修改'+ModalTitle" @ok="modifyChangeOk" width='55%' id="batchModal" >
@@ -737,6 +738,14 @@ export default {
             }
             
             this.search();
+            this.treeData.forEach((item)=>{
+                item.children.forEach(ele=>{
+                    if(ele.value==this.accountID){
+                        let accountInfo=JSON.stringify(ele)
+                        localStorage.setItem('accountInfo',accountInfo)
+                    }
+                })
+            })
         },
 
         filterOption(input, option){
@@ -1497,9 +1506,12 @@ export default {
         },
     },
     mounted() {
-
         this.accountHttp()
     },
+    
+    activated() {
+        // this.accountHttp()
+    },
     beforeDestroy() {
         this.treeData.forEach((item)=>{
             item.children.forEach(ele=>{

+ 6 - 4
src/views/modules/BatchCreate/components/material.vue

@@ -344,9 +344,9 @@
         if ((this.materialType == 'CREATIVE_IMAGE_MODE_VIDEO' || this.materialType ==
           'CREATIVE_IMAGE_MODE_VIDEO_VERTICAL')&&!this.isImg) {
           if (this.materialType == 'CREATIVE_IMAGE_MODE_VIDEO') {
-            params.type = 1
-          } else {
             params.type = 2
+          } else {
+            params.type = 1
           }
           this.showVideoList('/bytedance/batch/getVideoList', params)
         } else if(this.isImg){
@@ -415,9 +415,9 @@
         if (this.materialType == 'CREATIVE_IMAGE_MODE_VIDEO' || this.materialType ==
           'CREATIVE_IMAGE_MODE_VIDEO_VERTICAL') {
           if (this.materialType == 'CREATIVE_IMAGE_MODE_VIDEO') {
-            params.type = 1
-          } else {
             params.type = 2
+          } else {
+            params.type = 1
           }
 
           this.showVideoList('/bytedance/batch/getVideoList', params)
@@ -607,7 +607,9 @@
       },
       //   创建大图横图创意
       addCreative() {
+      
         let type = this.materialType
+        console.log(type)
         this.getTags()
         if (type === 'CREATIVE_IMAGE_MODE_SMALL') {
           this.HorizontalLargeImageListSmall.push({

+ 1 - 1
src/views/modules/BatchCreate/newGroup.vue

@@ -199,7 +199,7 @@ export default {
                         }      
                         });
                         // console.log(this.treeData)
-                        this.accountID=this.accountInfo.value
+                        // this.accountID=this.accountInfo.value
                     }
             }
             })

+ 2 - 5
src/views/modules/BatchCreate/newPlan.vue

@@ -924,11 +924,7 @@ export default {
     //普通下载
     externalActionsChange(val){
       console.log(val,this.currentConvertType);
-      this.currentConvertType.external_actions.forEach(item=>{
-        if(item.external_action==val.target.value){
-          this.convertId=item.convert_id         
-        }
-      });
+      this.convertId=val.target.value 
       this.externalAction=val.target.value
 
     },
@@ -1214,6 +1210,7 @@ export default {
               // console.log(this.names)
               this.goNextloading=true;
               values.accountId = this.groupInfo.accountId
+              values.convertId = this.convertId
               values.campaignId = this.groupInfo.id;
               values.convertId = this.convertId;
               values.appType=this.getFormData('appType')

+ 74 - 39
src/views/modules/Statistics/companyDetail.vue

@@ -29,13 +29,15 @@
             bordered
             :loading="loading"
             size="middle"
-            :scroll="{ x: 2300 }"
+            :scroll="{ x: 2500 }"
             :pagination="ipagination"
             @change="pageChange"
           >
             <!-- <span slot="isHasData" slot-scope="text">{{ text == 0 ? '否' : '是' }}</span> -->
-            <span slot="fengmianClickRate" slot-scope="text">{{ text | getBo }}</span>
-            <span slot="convertClickRate" slot-scope="text">{{ text | getBo }}</span>
+            <!-- <span slot="fengmianClickRate" slot-scope="text">{{ text | getBo }}</span>
+            <span slot="convertClickRate" slot-scope="text">{{ text | getBo }}</span> -->
+            <span slot="industry" slot-scope="text">{{ text ?text:'暂无数据' }}</span>
+            <span slot="secondIndustry" slot-scope="text">{{  text ?text:'暂无数据'  }}</span>
           </a-table>
         </a-card>
       </a-col>
@@ -108,9 +110,9 @@ const columns = [
     align: 'center'
   },
   {
-    title: '广告主创建时间',
-    dataIndex: 'advertiserCreateTime',
-    key: 'advertiserCreateTime',
+    title: '账户名称',
+    dataIndex: 'accountName',
+    key: 'accountName',
     align: 'center'
   },
   {
@@ -118,84 +120,91 @@ const columns = [
     dataIndex: 'costCampaignCount',
     key: 'costCampaignCount',
     align: 'center',
-    sorter: (a, b) => a.costCampaignCount - b.costCampaignCount
+    // sorter: (a, b) => a.costCampaignCount - b.costCampaignCount
   },
   {
     title: '总余额',
     dataIndex: 'balance',
     key: 'balance',
     align: 'center',
-    sorter: (a, b) => a.balance - b.balance
+    // sorter: (a, b) => a.balance - b.balance
   },
   {
     title: '总消耗',
     dataIndex: 'cost',
     key: 'cost',
     align: 'center',
-    sorter: (a, b) => a.cost - b.cost
+    // sorter: (a, b) => a.cost - b.cost
+  },
+  {
+    title: '消耗环比',
+    dataIndex: 'chargeDayOnDayPercent',
+    key: 'chargeDayOnDayPercent',
+    align: 'center',
+    // sorter: (a, b) => a.cost - b.cost
   },
   {
     title: '现金消耗',
     dataIndex: 'xianjinCost',
     key: 'xianjinCost',
     align: 'center',
-    sorter: (a, b) => a.xianjinCost - b.xianjinCost
+    // sorter: (a, b) => a.xianjinCost - b.xianjinCost
   },
   {
-    title: '返消耗',
+    title: '返消耗',
     dataIndex: 'fandianCost',
     key: 'fandianCost',
     align: 'center',
-    sorter: (a, b) => a.fandianCost - b.fandianCost
+    // sorter: (a, b) => a.fandianCost - b.fandianCost
   },
   {
     title: '框返消耗',
     dataIndex: 'kuangfanCost',
     key: 'kuangfanCost',
     align: 'center',
-    sorter: (a, b) => a.kuangfanCost - b.kuangfanCost
+    // sorter: (a, b) => a.kuangfanCost - b.kuangfanCost
   },
   {
-    title: '激励账户消耗',
+    title: '激励消耗',
     dataIndex: 'jiliCost',
     key: 'jiliCost',
     align: 'center',
-    sorter: (a, b) => a.jiliCost - b.jiliCost
+    // sorter: (a, b) => a.jiliCost - b.jiliCost
   },
   {
-    title: '信⽤账户消耗',
+    title: '信⽤消耗',
     dataIndex: 'xinyongCost',
     key: 'xinyongCost',
     align: 'center',
-    sorter: (a, b) => a.xinyongCost - b.xinyongCostxinyongCost
+    // sorter: (a, b) => a.xinyongCost - b.xinyongCostxinyongCost
   },
   {
     title: '封⾯曝光数',
     dataIndex: 'fengmianShowCount',
     key: 'fengmianShowCount',
     align: 'center',
-    sorter: (a, b) => a.fengmianShowCount - b.fengmianShowCount
+    // sorter: (a, b) => a.fengmianShowCount - b.fengmianShowCount
   },
   {
     title: '封⾯点击数',
     dataIndex: 'fengmianClickCount',
     key: 'fengmianClickCount',
     align: 'center',
-    sorter: (a, b) => a.fengmianClickCount - b.fengmianClickCount
+    // sorter: (a, b) => a.fengmianClickCount - b.fengmianClickCount
   },
   {
     title: '素材曝光数',
     dataIndex: 'sucaiShowCount',
     key: 'sucaiShowCount',
     align: 'center',
-    sorter: (a, b) => a.sucaiShowCount - b.sucaiShowCount
+    // sorter: (a, b) => a.sucaiShowCount - b.sucaiShowCount
   },
   {
     title: '行为数',
     dataIndex: 'convertCount',
     key: 'convertCount',
     align: 'center',
-    sorter: (a, b) => a.convertCount - b.convertCount
+    // sorter: (a, b) => a.convertCount - b.convertCount
   },
   {
     title: '封⾯点击率',
@@ -203,7 +212,7 @@ const columns = [
     key: 'fengmianClickRate',
     scopedSlots: { customRender: 'fengmianClickRate' },
     align: 'center',
-    sorter: (a, b) => a.fengmianClickRate - b.fengmianClickRate
+    // sorter: (a, b) => a.fengmianClickRate - b.fengmianClickRate
   },
   {
     title: '转化点击率',
@@ -211,7 +220,23 @@ const columns = [
     key: 'convertClickRate',
     scopedSlots: { customRender: 'convertClickRate' },
     align: 'center',
-    sorter: (a, b) => a.convertClickRate - b.convertClickRate
+    // sorter: (a, b) => a.convertClickRate - b.convertClickRate
+  },
+  {
+    title: '一级行业',
+    dataIndex: 'industry',
+    key: 'industry',
+    scopedSlots: { customRender: 'industry' },
+    align: 'center',
+ 
+  },
+  {
+    title: '二级行业',
+    dataIndex: 'secondIndustry',
+    key: 'secondIndustry',
+    scopedSlots: { customRender: 'secondIndustry' },
+    align: 'center',
+    
   }
 ]
 export default {
@@ -246,13 +271,14 @@ export default {
   methods: {
     ...mapGetters(['nickname', 'avatar', 'userInfo']),
     onChageLogin(e) {
-      if (e.target.value == 1) {
-        this.dataList = this.dataListAll
-      } else {
-        this.dataList = this.dataListAll.filter(item => {
-          return item.isHasData == 1
-        })
-      }
+      // if (e.target.value == 1) {
+      //   this.dataList = this.dataListAll
+      // } else {
+      //   this.dataList = this.dataListAll.filter(item => {
+      //     return item.isHasData == 1
+      //   })
+      // }
+      this.searchQuery();
     },
     backStatistics() {
       this.$router.replace({
@@ -264,7 +290,7 @@ export default {
       var params = {}
       params.date = weekDate
       params.isExportNullData = this.isHasData
-      downFilePost('/report/kuaishouReportDailyAgentSum/companyReportAccountDetailListExportExcel', params).then(
+      downFilePost('/agent/kuaiShouDailyAgent/companyReportAccountDetailListExportExcel', params).then(
         res => {
           let blob = new Blob([res], {
             type: 'application/vnd.ms-excel'
@@ -289,19 +315,22 @@ export default {
       var weekDate = localStorage.getItem('companyDate')
       this.columns = columns
       this.loading = true
-      postAction('/report/kuaishouReportDailyAgentSum/companyReportAccountDetailList', {
+      postAction('/agent/kuaiShouDailyAgent/companyReportAccountDetailList', {
         date: weekDate,
-        advertiserName: this.advertiserName
+        advertiserName: this.advertiserName,
+        page:this.ipagination.current,
+        pageSize:10,
+        isExportNullData:this.isHasData
       }).then(res => {
         this.loading = false
         if (res.success) {
-          this.dataListAll = this.dataList = res.result.map((item, index) => {
+          this.dataListAll = this.dataList = res.result.list.map((item, index) => {
             return {
               ...item,
               key: index
             }
           });
-          this.ipagination.total=res.total
+          this.ipagination.total=res.result.total
         } else {
           this.$message.error(res.message)
         }
@@ -309,22 +338,28 @@ export default {
     },
     pageChange(pagination, filters, sorter, { currentDataSource }){            
         this.ipagination.current=pagination.current;
-        this.getCompanyReport(this.active)
+        this.searchQuery()
     },
   },
-  created() {
+  mounted() {
     var weekDate = localStorage.getItem('companyDate')
     this.columns = columns
     this.loading = true
-    postAction('/report/kuaishouReportDailyAgentSum/companyReportAccountDetailList', { date: weekDate }).then(res => {
+    postAction('/agent/kuaiShouDailyAgent/companyReportAccountDetailList', { 
+      date: weekDate, 
+      page:this.ipagination.current,
+      pageSize:10,
+      isExportNullData:this.isHasData
+    }).then(res => {
       this.loading = false
       if (res.success) {
-        this.dataListAll = this.dataList = res.result.map((item, index) => {
+        this.dataListAll = this.dataList = res.result.list.map((item, index) => {
           return {
             ...item,
             key: index
           }
         })
+         this.ipagination.total=res.result.total
       } else {
         this.$message.error(res.message)
       }

+ 6 - 6
src/views/modules/Statistics/companyStatistics.vue

@@ -196,7 +196,7 @@ const columns = [
     sorter: (a, b) => a.xianjinCost - b.xianjinCost
   },
   {
-    title: '返消耗',
+    title: '返消耗',
     dataIndex: 'fandianCost',
     key: 'fandianCost',
     align: 'center',
@@ -210,14 +210,14 @@ const columns = [
     sorter: (a, b) => a.kuangfanCost - b.kuangfanCost
   },
   {
-    title: '激励账户消耗',
+    title: '激励消耗',
     dataIndex: 'jiliCost',
     key: 'jiliCost',
     align: 'center',
     sorter: (a, b) => a.jiliCost - b.jiliCost
   },
   {
-    title: '信⽤账户消耗',
+    title: '信⽤消耗',
     dataIndex: 'xinyongCost',
     key: 'xinyongCost',
     align: 'center',
@@ -385,7 +385,7 @@ export default {
       return current && current > moment().endOf('day')
     },
     exportExcel() {
-      downFilePost('/report/kuaishouReportDailyAgentSum/companyReportExportExcel', this.params).then(res => {
+      downFilePost('/agent/kuaiShouDailyAgent/companyReportExportExcel', this.params).then(res => {
         let blob = new Blob([res], {
           type: 'application/vnd.ms-excel'
         })
@@ -448,13 +448,13 @@ export default {
       postAction('/agent/kuaiShouDailyAgent/companyReport', params).then(res => {
         this.loading = false
         if (res.success) {
-          this.dataTable = res.result.map((item, index) => {
+          this.dataTable = res.result.list.map((item, index) => {
             return {
               ...item,
               key: index
             }
           });
-          this.ipagination.total=res.total;
+          this.ipagination.total=res.result.total;
 
         } else {
           this.$message.error(res.message)

+ 1 - 1
src/views/modules/dataChecked/taskLog.vue

@@ -67,7 +67,7 @@ const columns = [
  
 
   {
-    title: '执行时间秒',
+    title: '执行时间秒',
     dataIndex: 'exeTime',
     key: 'exeTime',
     align: 'exeTime',

+ 3 - 2
vue.config.js

@@ -54,10 +54,11 @@ module.exports = {
 
   devServer: {
     hot:true,
+    // inline: true,
     port: 3000,
     proxy: {
       '/jeecg-boot': {
-        target: 'http://192.168.1.90:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
+        // target: 'http://192.168.1.90:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
         // target: 'http://192.168.0.59:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.1.72:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
@@ -72,7 +73,7 @@ module.exports = {
         // target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
         // target: 'http://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目 
         // target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目 
-        // target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目 
+        target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目 
         // target:'http://118.24.244.213:8804',