魏志佳 %!s(int64=4) %!d(string=hai) anos
pai
achega
5bc174be93

+ 6 - 2
src/views/modules/BatchCreate/TouTiaoBatch.vue

@@ -69,10 +69,11 @@
             <div class="tableOption">
                 <span class="OptinItem">
                     <a-tooltip>
-                        <template slot="title" :getPopupContainer='getPopupContainer'>
+                        <template slot="title" >
                             这里可以批量启动、暂停、删除你的选择哦~
                         </template>
-                        <a-button type="link" @click="changeSelectStatus">批量操作</a-button>
+                        <!-- <a-button type="link" @click="changeSelectStatus">批量操作</a-button> -->
+                        <span >批量操作:</span>
                     </a-tooltip>
                 </span>
                 <span class="OptinItem">
@@ -1440,6 +1441,9 @@ export default {
             margin-right: 15px;
         }
     }
+    .OptinItem:first-child{
+        margin-right: 10px;
+    }
     .topOptions{
         padding: 15px 0;
         .topOpt{

+ 3 - 2
src/views/modules/BatchCreate/newCreate.vue

@@ -356,7 +356,7 @@
         <!-- <div class="moduler-title">计划名称</div> -->
         <div class="opt">
           <a-button type="default" style="margin-right:15px" @click="goBack">取消</a-button>
-          <a-button type="danger" style="margin-right:15px" @click="goSave" :loading="loading">保存并关闭</a-button>
+          <a-button type="danger" style="margin-right:15px" @click="goSave" :loading="loading">立即创建</a-button>
         </div>
       </div>
     </a-form>
@@ -475,7 +475,8 @@
         console.log(this.createTipList)
       },
       handleOk(e) {
-          this.$router.replace('/modules/BatchCreate/TouTiaoBatch')
+          this.visible=false;
+          this.$router.push('/modules/BatchCreate/TouTiaoBatch')
           this.$bus.$emit('remove', '/modules/BatchCreate/newCreate')
           localStorage.removeItem('groupInfo')
           localStorage.removeItem('planInfo')

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

@@ -845,7 +845,7 @@
                         </a-button>
                     </a-form-item>       
                     <a-form-item :wrapper-col="{ span: 14, offset: 10 }" :label-col="labelCol" v-show="isNewPlan">                         
-                        <a-button style="margin-right: 30px;" @click="tijiaozhi" type='danger'>
+                        <a-button style="margin-right: 30px;" @click="tijiaozhi" type='primary'>
                            {{showDirectedPackage ?' 选择完毕,收起':'展开'}}定向包
                         </a-button>                        
                     </a-form-item>       

+ 7 - 5
src/views/modules/BatchCreate/newGroup.vue

@@ -246,9 +246,11 @@ export default {
                 this.form.validateFields((err, values) => {
                     if (!err) {
                         this.nextLoading=true;
-                        // console.log('Received values of form: ', values);
-                        if(values.budgetMode== "BUDGET_MODE_INFINITE" ){
-                            postAction('/ctop/byteDanceCampaign/add',qs.stringify({
+                        console.log('Received values of form: ', values);
+                       if(values.budgetMode== "BUDGET_MODE_DAY" && (values.budget<1000||values.budget>9999999.99 )){
+                            this.$message.error('日预算不少于1000.00元,不超过9999999.99元,请正确输入')
+                        }else{
+                             postAction('/ctop/byteDanceCampaign/add',qs.stringify({
                                 accountId:this.accountID,
                                 ...values
                             })).then(res=>{
@@ -267,9 +269,9 @@ export default {
                                     this.$message.error(res.message) 
                                 }
                             })
-                        }else if(values.budgetMode== "BUDGET_MODE_DAY" && (values.budget<1000||values.budget>9999999.99 )){
-                            this.$message.error('日预算不少于1000.00元,不超过9999999.99元,请正确输入')
                         }
+                    }else{
+                        console.log(err)
                     }
                 });
            }else{

+ 11 - 4
src/views/modules/BatchCreate/newPlan.vue

@@ -255,7 +255,7 @@
               <a-form-item>
                 <a-radio-group v-model="convertType"   @change="convertTypeChange">
                   <a-radio-button v-for="item in convertList" :key="item.convert_type" v-show="item.external_actions.length>0" :value='item.convert_type' >
-                    {{item.convert_name}}</a-radio-button>
+                    {{item.name}}</a-radio-button>
                 </a-radio-group>                     
               </a-form-item>
             </div>
@@ -592,13 +592,13 @@
  
                 <span style="margin-left:5px">元</span>
                 <!-- <span style="margin-left:20px">请填入必填字段,获取建议出价</span> -->
-                <a-tooltip>
+                <!-- <a-tooltip>
                   <template slot="title">
                     <span style="font-weight:600">建议出价获取方式:</span>
                     <span>请填入本页面所有必填信息(除出价外),即可查看建议出价</span>
                   </template>
                   <a-icon type="question-circle" />
-                </a-tooltip>
+                </a-tooltip> -->
               </a-form-item>
               <span
                 class="tip"
@@ -1127,7 +1127,14 @@ export default {
               if(this.getFormData('scheduleTime')!=''){
                   values.scheduleTime=this.scheduleTimeData
               }
-
+              if(this.getFormData('launchTarget')=='CLICK_AMOUNT'){
+                 
+                    values.pricing='PRICING_CPC'
+              }else if(val.target.value=='SHOW_AMOUNT'){               
+                    values.pricing='PRICING_CPM'
+              }else if(val.target.value=='CONVERT_AMOUNT'){             
+                    values.pricing='PRICING_OCPM'                 
+              }
               postAction('/ctop/byteDanceAdvertisePlan/add', {
                 names: this.names,
                 landingType: this.groupInfo.landingType,

+ 13 - 10
src/views/modules/Statistics/accountReport.vue

@@ -794,17 +794,20 @@ export default {
                             this.tabconvertNum.huanbi.y.push(0)  
                         }
                      }else{
-                        this.tabClick.yesterday.y.push(item.click)
-                        this.tabCost.yesterday.y.push(item.cost) 
-                        this.tabShowNum.yesterday.y.push(item.showNum)   
-                        this.tabDiscountCost.yesterday.y.push(item.discountCost)   
-                        this.tabconvertNum.yesterday.y.push(item.convertNum);
+                       if(item.afterData){
+                          this.tabClick.yesterday.y.push(item.afterData.click)
+                          this.tabCost.yesterday.y.push(item.afterData.cost) 
+                          this.tabShowNum.yesterday.y.push(item.afterData.showNum)   
+                          this.tabDiscountCost.yesterday.y.push(item.afterData.discountCost)   
+                          this.tabconvertNum.yesterday.y.push(item.afterData.convertNum);
+                          
+                          this.tabClick.x.push(item.afterData.statHour)
+                          this.tabCost.x.push(item.afterData.statHour) 
+                          this.tabShowNum.x.push(item.afterData.statHour)   
+                          this.tabDiscountCost.x.push(item.afterData.statHour)   
+                          this.tabconvertNum.x.push(item.afterData.statHour);
+                       }
                         
-                        this.tabClick.x.push(item.statHour)
-                        this.tabCost.x.push(item.statHour) 
-                        this.tabShowNum.x.push(item.statHour)   
-                        this.tabDiscountCost.x.push(item.statHour)   
-                        this.tabconvertNum.x.push(item.statHour);
                      } 
                   }else if(item.statDate){
                     //  console.log('date')

+ 58 - 44
src/views/modules/Statistics/effectReport.vue

@@ -40,10 +40,21 @@
                 <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" >
-                  <img :src="text" alt="" style="width:100px" @click="openVideo(records)">
+                  <img :src="text" alt="" style="width:90px" @click="openVideo(records)">
+                  <a-popover placement="right">
+                      <template slot="content">
+                          <!-- {{record.videoId_dictText}}  -->
+                          <video :src="records.url" style="width:250px" controls autoplay muted ></video>
+                      </template>
+                      <template slot="title">
+                      <!-- <span>Title</span> -->
+                      </template>
+                      <!-- <a-button>Right</a-button> -->
+                      <img :src="text" alt="" style="width:100px">
+                  </a-popover>
                 </a>
 
                 <span slot="charge" slot-scope="charge"> {{charge|decimalsHandle}}</span>
@@ -292,13 +303,13 @@ const projectColumns = [
     scopedSlots: { customRender: 'designResponsibleName' },
     align:'center',
   },
-  {
-    title: '时间',
-    dataIndex: 'statDate',
-    // width:200,
-    scopedSlots: { customRender: 'statDate' },
-    align:'center',
-  },
+  // {
+  //   title: '时间',
+  //   dataIndex: 'statDate',
+  //   // width:200,
+  //   scopedSlots: { customRender: 'statDate' },
+  //   align:'center',
+  // },
 ]
 
 const accountColumns = [
@@ -327,13 +338,13 @@ const accountColumns = [
     fixed: 'left'
   },
   
-  {
-    title: '时间',
-    dataIndex: 'statDate',
-    // width:200,
-    scopedSlots: { customRender: 'statDate' },
-    align:'center',
-  },
+  // {
+  //   title: '时间',
+  //   dataIndex: 'statDate',
+  //   // width:200,
+  //   scopedSlots: { customRender: 'statDate' },
+  //   align:'center',
+  // },
   
 ]
 
@@ -341,7 +352,7 @@ const campaignColumns = [
   {
     title: '广告计划名称',
     dataIndex: 'campaignName',
-    width: 130,
+    width: 180,
     align:'center',
     scopedSlots: { customRender: 'campaignName' },
     fixed: 'left'
@@ -357,19 +368,19 @@ const campaignColumns = [
   {
     title: '账户名称',
     dataIndex: 'authName',
-    width: 120,
+    width: 150,
     align:'center',
     scopedSlots: { customRender: 'authName' },
     fixed: 'left'
   },
   
-  {
-    title: '时间',
-    dataIndex: 'statDate',
-    // width:200,
-    scopedSlots: { customRender: 'statDate' },
-    align:'center',
-  },
+  // {
+  //   title: '时间',
+  //   dataIndex: 'statDate',
+  //   // width:200,
+  //   scopedSlots: { customRender: 'statDate' },
+  //   align:'center',
+  // },
 
   
 ]
@@ -381,7 +392,7 @@ const unitColumns = [
     align:'center',
     scopedSlots: { customRender: 'unitName' },
     fixed: 'left',
-    width:130,
+    width:180,
   },
   {
     title: '广告组id',
@@ -394,19 +405,19 @@ const unitColumns = [
   {
     title: '计划名称',
     dataIndex: 'campaignName',
-    width: 130,
+    width: 180,
     align:'center',
     scopedSlots: { customRender: 'campaignName' },
     fixed: 'left'
   },
 
-  {
-    title: '时间',
-    dataIndex: 'statDate',
-    // width:200,
-    scopedSlots: { customRender: 'statDate' },
-    align:'center',
-  },
+  // {
+  //   title: '时间',
+  //   dataIndex: 'statDate',
+  //   // width:200,
+  //   scopedSlots: { customRender: 'statDate' },
+  //   align:'center',
+  // },
 
   
 ]
@@ -418,7 +429,7 @@ const ideaColumns = [
       align:'center',
       scopedSlots: { customRender: 'coverUrl' },
       fixed: 'left',
-      width:120,
+      width:100,
     },
    {
     title: '创意名称',
@@ -438,13 +449,13 @@ const ideaColumns = [
     width:130,
   },
 
-  {
-    title: '时间',
-    dataIndex: 'statDate',
-    // width:200,
-    scopedSlots: { customRender: 'statDate' },
-    align:'center',
-  },
+  // {
+  //   title: '时间',
+  //   dataIndex: 'statDate',
+  //   // width:200,
+  //   scopedSlots: { customRender: 'statDate' },
+  //   align:'center',
+  // },
  
 ]
 
@@ -532,23 +543,26 @@ export default {
       },
       // 从项目跳转到账户,并获取账户的table值
       goAccount(records){
-        console.log(records);
-        this.projectId=records.projectId
+        console.log(records,'--account');
+        this.projectId=records.projectId 
         this.getTableAccountList()
 
       },
       // 从账户到计划
       goCampaign(records){
+        console.log(records,'--Campaign');
         this.accountId=records.accountId;
         this.getTableCampaignList()
       },
       // 从计划到组
       goUnit(records){
+        console.log(records,'--unit');
         this.campaignId=records.campaignId;
         this.getTableUnitList()
       },
       // 从组到创意
       goCreative(records){
+          console.log(records,'--creat');
           this.unitId=records.unitId;
           this.getTableCreativeList()
       },