Kaynağa Gözat

'改智能投放'

魏志佳 4 yıl önce
ebeveyn
işleme
f07217d8c9

+ 45 - 42
src/views/modules/autoLaunch/autoLaunchReport.vue

@@ -103,13 +103,15 @@
                     </a-radio>
                 </a-radio-group>
             </div>
+            <a-spin :spinning="spinning">
             <div class="chartBody">
-                <a-spin :spinning="spinning">
+                
                 <div id="mapEchart" style='width:30%;height:300px;border:1px solid #e0e0e0;padding:10px' ref="mapEchart"></div>
                 <div id="sexEchart" style='width:30%;height:300px;border:1px solid #e0e0e0;padding:10px' ref="sexEchart"></div>
                 <div id="ageEchart" style='width:30%;height:300px;border:1px solid #e0e0e0;padding:10px' ref="ageEchart"></div>
-                </a-spin>
+               
             </div>
+            </a-spin>
             <div class="tableBox">
                 <!-- <div class="tableTop">
                     关联定向
@@ -498,64 +500,64 @@ const material = [
   },
   {
     title: '关联广告组数',
-    dataIndex: 'relativeCreate',
-    key: 'relativeCreate',
+    dataIndex: 'relativeGroup',
+    key: 'relativeGroup',
     align: 'center',
-    scopedSlots: { customRender: 'relativeCreate' },
+    scopedSlots: { customRender: 'relativeGroup' },
     width:80,
     fixed: 'left' ,
   },
   {
     title: '广告场景',
-    dataIndex: 'relativeCreate',
-    key: 'relativeCreate',
+    dataIndex: 'secen',
+    key: 'secen',
     align: 'center',
-    scopedSlots: { customRender: 'relativeCreate' },
+    scopedSlots: { customRender: 'secen' },
     width:80,
     fixed: 'left' ,
   },
   {
     title: '3s播放数',
-    dataIndex: 'relativeCreate',
-    key: 'relativeCreate',
+    dataIndex: '3',
+    key: '3',
     align: 'center',
-    scopedSlots: { customRender: 'relativeCreate' },
+    scopedSlots: { customRender: '3' },
     width:80,
     fixed: 'left' ,
   },
   {
     title: '10s播放数',
-    dataIndex: 'relativeCreate',
-    key: 'relativeCreate',
+    dataIndex: '10',
+    key: '10',
     align: 'center',
-    scopedSlots: { customRender: 'relativeCreate' },
+    scopedSlots: { customRender: '10' },
     width:80,
     fixed: 'left' ,
   },
   {
     title: '3s完播率',
-    dataIndex: 'relativeCreate',
-    key: 'relativeCreate',
+    dataIndex: 'playOver',
+    key: 'playOver',
     align: 'center',
-    scopedSlots: { customRender: 'relativeCreate' },
+    scopedSlots: { customRender: 'playOver' },
     width:80,
     fixed: 'left' ,
   },
   {
     title: '10s完播率',
-    dataIndex: 'relativeCreate',
-    key: 'relativeCreate',
+    dataIndex: '10playOver',
+    key: '10playOver',
     align: 'center',
-    scopedSlots: { customRender: 'relativeCreate' },
+    scopedSlots: { customRender: '10playOver' },
     width:80,
     fixed: 'left' ,
   },
   {
     title: '完播率',
-    dataIndex: 'relativeCreate',
-    key: 'relativeCreate',
+    dataIndex: 'playOverRate',
+    key: 'playOverRate',
     align: 'center',
-    scopedSlots: { customRender: 'relativeCreate' },
+    scopedSlots: { customRender: 'playOverRate' },
     width:80,
     fixed: 'left' ,
   },
@@ -563,42 +565,43 @@ const material = [
 const directional = [
     {
         title: '定向包名称',
-        dataIndex: 'url',
-        key: 'url',
+        dataIndex: 'name',
+        key: 'name',
         align: 'center',
-        scopedSlots: { customRender: 'url' },
-      
+        scopedSlots: { customRender: 'name' },
+        width:200,
+        flex:'left'
     },
     {
         title: '关联广告组数',
-        dataIndex: 'url',
-        key: 'url',
+        dataIndex: 'group',
+        key: 'group',
         align: 'center',
-        scopedSlots: { customRender: 'url' },
+        scopedSlots: { customRender: 'group' },
        
     },
     {
         title: '覆盖人群',
-        dataIndex: 'url',
-        key: 'url',
+        dataIndex: 'coverPoepele',
+        key: 'coverPoepele',
         align: 'center',
-        scopedSlots: { customRender: 'url' },
+        scopedSlots: { customRender: 'coverPoepele' },
         
     },
     {
         title: '地域分布',
-        dataIndex: 'url',
-        key: 'url',
+        dataIndex: 'region',
+        key: 'region',
         align: 'center',
-        scopedSlots: { customRender: 'url' },
+        scopedSlots: { customRender: 'region' },
        
     },
     {
         title: '年龄分布',
-        dataIndex: 'url',
-        key: 'url',
+        dataIndex: 'age',
+        key: 'age',
         align: 'center',
-        scopedSlots: { customRender: 'url' },
+        scopedSlots: { customRender: 'age' },
        
     },
     {
@@ -611,10 +614,10 @@ const directional = [
     },
     {
         title: '性别分布',
-        dataIndex: 'url',
-        key: 'url',
+        dataIndex: 'sex',
+        key: 'sex',
         align: 'center',
-        scopedSlots: { customRender: 'url' },
+        scopedSlots: { customRender: 'sex' },
         
     },
 ]

+ 4 - 2
src/views/modules/autoLaunch/createStrategy.vue

@@ -194,7 +194,9 @@ export default {
         //推广目的改变
         marketingGoalChange(e){
             console.log(e.target)
-            this.marketingGoalHandle(e.target.value)
+            let strategyNamepart=this.marketingGoalHandle(e.target.value);
+            this.strategyName ='[策略]_'+ strategyNamepart+'_' + moment().format('MM_DD_hh:mm') ;
+
         },
     
         // 验证网址
@@ -317,7 +319,7 @@ export default {
                     str='推广品牌'
                     break;
                 case '5':
-                    str='营销线'
+                    str='营销线'
                     break;
                 case '7':
                     str='应用活跃'

+ 112 - 21
src/views/modules/autoLaunch/groupList.vue

@@ -48,12 +48,12 @@
         </div>
         <div class="tableArea">
             <div class="tableOption">
-                <span class="OptinItem">
+                <!-- <span class="OptinItem">
                     <a-tooltip>
                         <template slot="title" >
                             这里可以批量启动、暂停、删除你的选择哦~
                         </template>
-                        <!-- <a-button type="link" @click="changeSelectStatus">批量操作</a-button> -->
+                       
                         <span >批量操作:</span>
                     </a-tooltip>
                 </span>
@@ -65,9 +65,7 @@
                         <a-select-option value="pause">
                             暂停
                         </a-select-option>
-                        <a-select-option value="delete">
-                            删除
-                        </a-select-option>
+                        
                     </a-select>
                 </span>
                  <span class="OptinItem">
@@ -84,13 +82,14 @@
                     <a-button type='primary' @click="isOkHandle" class="ok" v-else>确定</a-button>
 
                  </span>
-                
+                 -->
             </div>
             <div class="table">
+                <!-- :rowSelection="{selectedRowKeys: selectedRowKeys,...rowSelection}" -->
                 <a-table
                     :columns="columns"
                     :data-source="data"
-                    :rowSelection="{selectedRowKeys: selectedRowKeys,...rowSelection}"
+                    
                     bordered
                     :pagination="ipagination"
                     :loading="loading"
@@ -153,6 +152,98 @@
                     <span slot="status" slot-scope="text">
                       {{text | handlerStatus}}
                     </span>
+
+                    <span slot="ctr" slot-scope="ctr">{{ ctr | toPercentage }}</span>
+                        <span slot="cost" slot-scope="cost">{{ cost | decimalsHandle }}</span>
+                        <span slot="clickMaterial" slot-scope="clickMaterial">{{ clickMaterial | formatCurrency }}</span>
+                        <span slot="showMaterial" slot-scope="showMaterial">{{ showMaterial | formatCurrency }}</span>
+                        <span slot="convertMaterial" slot-scope="convertMaterial">{{ convertMaterial | formatCurrency }}</span>
+                        <span slot="play25FeedBreak" slot-scope="play25FeedBreak">{{ play25FeedBreak | formatCurrency }}</span>
+                        <span slot="play50FeedBreak" slot-scope="play50FeedBreak">{{ play50FeedBreak | formatCurrency }}</span>
+                        <span slot="play75FeedBreak" slot-scope="play75FeedBreak">{{ play75FeedBreak | formatCurrency }}</span>
+                        <span slot="play100FeedBreak" slot-scope="play100FeedBreak">{{ play100FeedBreak | formatCurrency }}</span>
+                        <span slot="nextDayOpen" slot-scope="nextDayOpen">{{ nextDayOpen | formatCurrency }}</span>
+                        <span slot="downloadFinish" slot-scope="downloadFinish">{{ downloadFinish | formatCurrency }}</span>
+                        <span slot="downloadStart" slot-scope="downloadStart">{{ downloadStart | formatCurrency }}</span>
+                        <span slot="likeMaterial" slot-scope="likeMaterial">{{ likeMaterial | formatCurrency }}</span>
+                        <span slot="shareMaterial" slot-scope="shareMaterial">{{ shareMaterial | formatCurrency }}</span>
+                        <span slot="register" slot-scope="register">{{ register | formatCurrency }}</span>
+                        <span slot="follow" slot-scope="follow">{{ follow | formatCurrency }}</span>
+                        <span slot="formCount" slot-scope="formCount">{{ formCount | formatCurrency }}</span>
+                        <span slot="formCountCost" slot-scope="formCountCost">{{ formCountCost | decimalsHandle }}</span>
+                        <span slot="aClick" slot-scope="aClick">{{ aClick | formatCurrency }}</span>
+                        <span slot="photoShow" slot-scope="photoShow">{{ photoShow | formatCurrency }}</span>
+                        <span slot="photoClick" slot-scope="photoClick">{{ photoClick | formatCurrency }}</span>
+                        <span slot="bClick" slot-scope="bClick">{{ bClick | formatCurrency }}</span>
+                        <span slot="active" slot-scope="active">{{ active | formatCurrency }}</span>
+                        <span slot="submit" slot-scope="submit">{{ submit | formatCurrency }}</span>
+                        <span slot="nextDayOpen" slot-scope="nextDayOpen">{{ nextDayOpen | formatCurrency }}</span>
+                        <span slot="eventCreditGrantLandingPage" slot-scope="eventCreditGrantLandingPage">{{ eventCreditGrantLandingPage | formatCurrency }}</span>
+                        <span slot="submitCost" slot-scope="submitCost">{{ submitCost | decimalsHandle }}</span>
+                        <span slot="eventCreditGrantLandingPageCost" slot-scope="eventCreditGrantLandingPageCost">{{ eventCreditGrantLandingPageCost | decimalsHandle }}</span>
+                        <span slot="submitRate" slot-scope="submitRate">{{ submitRate | toPercentage }}</span>
+                        <span slot="eventCreditGrantLandingPageRate" slot-scope="eventCreditGrantLandingPageRate">{{ eventCreditGrantLandingPageRate | toPercentage }}</span>
+                        <span
+                        slot="play25FeedBreakRate"
+                        slot-scope="play25FeedBreakRate"
+                        >{{ play25FeedBreakRate | toPercentage }}</span>
+                        <span slot="playOverRate" slot-scope="playOverRate">{{ playOverRate | toPercentage }}</span>
+                        <!-- 新加数据 -->
+
+                        <span slot="convertRate" slot-scope="convertRate">{{ convertRate | toPercentage }}</span>
+                        <span slot="nextDayOpenRate" slot-scope="nextDayOpenRate">{{ nextDayOpenRate | toPercentage }}</span>
+                        <span slot="ctr" slot-scope="ctr">{{ ctr | toPercentage }}</span>
+                        <span slot="cpc" slot-scope="cpc">{{ cpc | decimalsHandle }}</span>
+                        <span slot="cpm" slot-scope="cpm">{{ cpm | decimalsHandle }}</span>
+                        <span slot="activeRate" slot-scope="activeRate">{{ activeRate | toPercentage }}</span>
+                        <span
+                        slot="installFinishRate"
+                        slot-scope="installFinishRate"
+                        >{{ installFinishRate | toPercentage }}</span>
+                        <span slot="validPlayRate" slot-scope="validPlayRate">{{ validPlayRate | toPercentage }}</span>
+                        <span slot="activePayCost" slot-scope="activePayCost">{{ activePayCost | decimalsHandle }}</span>
+                        <span slot="nextDayOpenCost" slot-scope="nextDayOpenCost">{{ nextDayOpenCost | decimalsHandle }}</span>
+                        <span slot="validPlayCost" slot-scope="validPlayCost">{{ validPlayCost | decimalsHandle }}</span>
+                        <span slot="activeCost" slot-scope="activeCost">{{ activeCost | decimalsHandle }}</span>
+                        <span slot="nextDayOpenCost" slot-scope="nextDayOpenCost">{{ nextDayOpenCost | decimalsHandle }}</span>
+                        <span
+                        slot="gameAddictionCost"
+                        slot-scope="gameAddictionCost"
+                        >{{ gameAddictionCost | decimalsHandle }}</span>
+                        <span
+                        slot="downloadFinishCost"
+                        slot-scope="downloadFinishCost"
+                        >{{ downloadFinishCost | decimalsHandle }}</span>
+                        <span
+                        slot="downloadStartCost"
+                        slot-scope="downloadStartCost"
+                        >{{ downloadStartCost | decimalsHandle }}</span>
+                        <span
+                        slot="installFinishCost"
+                        slot-scope="installFinishCost"
+                        >{{ installFinishCost | decimalsHandle }}</span>
+                        <span slot="convertCost" slot-scope="convertCost">{{ convertCost | decimalsHandle }}</span>
+
+                        <!--  -->
+                        <span
+                        slot="downloadStartRate"
+                        slot-scope="downloadStartRate"
+                        >{{ downloadStartRate | toPercentage }}</span>
+                        <span
+                        slot="downloadFinishRate"
+                        slot-scope="downloadFinishRate"
+                        >{{ downloadFinishRate | toPercentage }}</span>
+                        <span slot="activeRate" slot-scope="activeRate">{{ activeRate | toPercentage }}</span>
+                        <span
+                        slot="activeRegisterRate"
+                        slot-scope="activeRegisterRate"
+                        >{{ activeRegisterRate | toPercentage }}</span>
+                        <span
+                        slot="gameAddictionRate"
+                        slot-scope="gameAddictionRate"
+                        >{{ gameAddictionRate | toPercentage }}</span>
+                        <span slot="nextDayOpenRate" slot-scope="nextDayOpenRate">{{ nextDayOpenRate | toPercentage }}</span>
+                        <!-- <span slot="nextDayOpenRate" slot-scope="nextDayOpenRate">{{ nextDayOpenRate | toPercentage }}</span> -->
                 </a-table>
             </div>
         </div>
@@ -175,15 +266,15 @@ let typeValue='预算'
 
 
 const groupColumns = [
-  {
-    title: '开关',
-    dataIndex: 'switchStatus',
-    key: 'switchStatus',
-    align: 'center',
-    scopedSlots: { customRender: 'switchStatus' },
-    fixed: 'left' ,
-    width:80,
-  },
+//   {
+//     title: '开关',
+//     dataIndex: 'switchStatus',
+//     key: 'switchStatus',
+//     align: 'center',
+//     scopedSlots: { customRender: 'switchStatus' },
+//     fixed: 'left' ,
+//     width:80,
+//   },
   {
     title: '广告组名称',
     dataIndex: 'unitName',
@@ -520,13 +611,13 @@ export default {
             let ids=record.id;
             let putStatus=text?2:1;
             postAction('/kuaishou/batch/batchUpdateUnitStatus',{
-                    accountId:record.accountId,
-                    putStatus,
-                    unitIds:[record.id],
-                    userId:this.$parent.userId
+                accountId:record.accountId,
+                putStatus,
+                unitIds:[record.id],
+                userId:this.$parent.userId
             }).then((res)=>{
                     
-                    record.spin=false;
+                record.spin=false;
                 if(res.success){
                     this.getplanList()
                     this.$message.success(res.message)

+ 107 - 16
src/views/modules/autoLaunch/planList.vue

@@ -47,12 +47,12 @@
         </div>
         <div class="tableArea">
             <div class="tableOption">
-                <span class="OptinItem">
+                <!-- <span class="OptinItem">
                     <a-tooltip>
                         <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>
@@ -64,9 +64,7 @@
                         <a-select-option value="pause">
                             暂停
                         </a-select-option>
-                        <a-select-option value="delete">
-                            删除
-                        </a-select-option>
+                        
                     </a-select>
                 </span>
                  <span class="OptinItem">
@@ -83,13 +81,14 @@
                     <a-button type='primary' @click="isOkHandle" class="ok" v-else>确定</a-button>
 
                  </span>
-                
+                 -->
             </div>
             <div class="table">
+                <!--  :rowSelection="{selectedRowKeys: selectedRowKeys,...rowSelection}" -->
                 <a-table
                     :columns="columns"
                     :data-source="data"
-                    :rowSelection="{selectedRowKeys: selectedRowKeys,...rowSelection}"
+                   
                     bordered
                     :pagination="ipagination"
                     :loading="loading"
@@ -155,6 +154,98 @@
                     <span slot="status" slot-scope="text">
                       {{text | handlerStatus}}
                     </span>
+
+                    <span slot="ctr" slot-scope="ctr">{{ ctr | toPercentage }}</span>
+                        <span slot="cost" slot-scope="cost">{{ cost | decimalsHandle }}</span>
+                        <span slot="clickMaterial" slot-scope="clickMaterial">{{ clickMaterial | formatCurrency }}</span>
+                        <span slot="showMaterial" slot-scope="showMaterial">{{ showMaterial | formatCurrency }}</span>
+                        <span slot="convertMaterial" slot-scope="convertMaterial">{{ convertMaterial | formatCurrency }}</span>
+                        <span slot="play25FeedBreak" slot-scope="play25FeedBreak">{{ play25FeedBreak | formatCurrency }}</span>
+                        <span slot="play50FeedBreak" slot-scope="play50FeedBreak">{{ play50FeedBreak | formatCurrency }}</span>
+                        <span slot="play75FeedBreak" slot-scope="play75FeedBreak">{{ play75FeedBreak | formatCurrency }}</span>
+                        <span slot="play100FeedBreak" slot-scope="play100FeedBreak">{{ play100FeedBreak | formatCurrency }}</span>
+                        <span slot="nextDayOpen" slot-scope="nextDayOpen">{{ nextDayOpen | formatCurrency }}</span>
+                        <span slot="downloadFinish" slot-scope="downloadFinish">{{ downloadFinish | formatCurrency }}</span>
+                        <span slot="downloadStart" slot-scope="downloadStart">{{ downloadStart | formatCurrency }}</span>
+                        <span slot="likeMaterial" slot-scope="likeMaterial">{{ likeMaterial | formatCurrency }}</span>
+                        <span slot="shareMaterial" slot-scope="shareMaterial">{{ shareMaterial | formatCurrency }}</span>
+                        <span slot="register" slot-scope="register">{{ register | formatCurrency }}</span>
+                        <span slot="follow" slot-scope="follow">{{ follow | formatCurrency }}</span>
+                        <span slot="formCount" slot-scope="formCount">{{ formCount | formatCurrency }}</span>
+                        <span slot="formCountCost" slot-scope="formCountCost">{{ formCountCost | decimalsHandle }}</span>
+                        <span slot="aClick" slot-scope="aClick">{{ aClick | formatCurrency }}</span>
+                        <span slot="photoShow" slot-scope="photoShow">{{ photoShow | formatCurrency }}</span>
+                        <span slot="photoClick" slot-scope="photoClick">{{ photoClick | formatCurrency }}</span>
+                        <span slot="bClick" slot-scope="bClick">{{ bClick | formatCurrency }}</span>
+                        <span slot="active" slot-scope="active">{{ active | formatCurrency }}</span>
+                        <span slot="submit" slot-scope="submit">{{ submit | formatCurrency }}</span>
+                        <span slot="nextDayOpen" slot-scope="nextDayOpen">{{ nextDayOpen | formatCurrency }}</span>
+                        <span slot="eventCreditGrantLandingPage" slot-scope="eventCreditGrantLandingPage">{{ eventCreditGrantLandingPage | formatCurrency }}</span>
+                        <span slot="submitCost" slot-scope="submitCost">{{ submitCost | decimalsHandle }}</span>
+                        <span slot="eventCreditGrantLandingPageCost" slot-scope="eventCreditGrantLandingPageCost">{{ eventCreditGrantLandingPageCost | decimalsHandle }}</span>
+                        <span slot="submitRate" slot-scope="submitRate">{{ submitRate | toPercentage }}</span>
+                        <span slot="eventCreditGrantLandingPageRate" slot-scope="eventCreditGrantLandingPageRate">{{ eventCreditGrantLandingPageRate | toPercentage }}</span>
+                        <span
+                        slot="play25FeedBreakRate"
+                        slot-scope="play25FeedBreakRate"
+                        >{{ play25FeedBreakRate | toPercentage }}</span>
+                        <span slot="playOverRate" slot-scope="playOverRate">{{ playOverRate | toPercentage }}</span>
+                        <!-- 新加数据 -->
+
+                        <span slot="convertRate" slot-scope="convertRate">{{ convertRate | toPercentage }}</span>
+                        <span slot="nextDayOpenRate" slot-scope="nextDayOpenRate">{{ nextDayOpenRate | toPercentage }}</span>
+                        <span slot="ctr" slot-scope="ctr">{{ ctr | toPercentage }}</span>
+                        <span slot="cpc" slot-scope="cpc">{{ cpc | decimalsHandle }}</span>
+                        <span slot="cpm" slot-scope="cpm">{{ cpm | decimalsHandle }}</span>
+                        <span slot="activeRate" slot-scope="activeRate">{{ activeRate | toPercentage }}</span>
+                        <span
+                        slot="installFinishRate"
+                        slot-scope="installFinishRate"
+                        >{{ installFinishRate | toPercentage }}</span>
+                        <span slot="validPlayRate" slot-scope="validPlayRate">{{ validPlayRate | toPercentage }}</span>
+                        <span slot="activePayCost" slot-scope="activePayCost">{{ activePayCost | decimalsHandle }}</span>
+                        <span slot="nextDayOpenCost" slot-scope="nextDayOpenCost">{{ nextDayOpenCost | decimalsHandle }}</span>
+                        <span slot="validPlayCost" slot-scope="validPlayCost">{{ validPlayCost | decimalsHandle }}</span>
+                        <span slot="activeCost" slot-scope="activeCost">{{ activeCost | decimalsHandle }}</span>
+                        <span slot="nextDayOpenCost" slot-scope="nextDayOpenCost">{{ nextDayOpenCost | decimalsHandle }}</span>
+                        <span
+                        slot="gameAddictionCost"
+                        slot-scope="gameAddictionCost"
+                        >{{ gameAddictionCost | decimalsHandle }}</span>
+                        <span
+                        slot="downloadFinishCost"
+                        slot-scope="downloadFinishCost"
+                        >{{ downloadFinishCost | decimalsHandle }}</span>
+                        <span
+                        slot="downloadStartCost"
+                        slot-scope="downloadStartCost"
+                        >{{ downloadStartCost | decimalsHandle }}</span>
+                        <span
+                        slot="installFinishCost"
+                        slot-scope="installFinishCost"
+                        >{{ installFinishCost | decimalsHandle }}</span>
+                        <span slot="convertCost" slot-scope="convertCost">{{ convertCost | decimalsHandle }}</span>
+
+                        <!--  -->
+                        <span
+                        slot="downloadStartRate"
+                        slot-scope="downloadStartRate"
+                        >{{ downloadStartRate | toPercentage }}</span>
+                        <span
+                        slot="downloadFinishRate"
+                        slot-scope="downloadFinishRate"
+                        >{{ downloadFinishRate | toPercentage }}</span>
+                        <span slot="activeRate" slot-scope="activeRate">{{ activeRate | toPercentage }}</span>
+                        <span
+                        slot="activeRegisterRate"
+                        slot-scope="activeRegisterRate"
+                        >{{ activeRegisterRate | toPercentage }}</span>
+                        <span
+                        slot="gameAddictionRate"
+                        slot-scope="gameAddictionRate"
+                        >{{ gameAddictionRate | toPercentage }}</span>
+                        <span slot="nextDayOpenRate" slot-scope="nextDayOpenRate">{{ nextDayOpenRate | toPercentage }}</span>
+                        <!-- <span slot="nextDayOpenRate" slot-scope="nextDayOpenRate">{{ nextDayOpenRate | toPercentage }}</span> -->
                 </a-table>
             </div>
         </div>
@@ -177,15 +268,15 @@ let typeValue='预算'
 
 
 const planColumns = [
-  {
-    title: '开关',
-    dataIndex: 'switchStatus',
-    key: 'switchStatus',
-    align: 'center',
-    scopedSlots: { customRender: 'switchStatus' },
-    fixed: 'left' ,
-    width:80,
-  },
+//   {
+//     title: '开关',
+//     dataIndex: 'switchStatus',
+//     key: 'switchStatus',
+//     align: 'center',
+//     scopedSlots: { customRender: 'switchStatus' },
+//     fixed: 'left' ,
+//     width:80,
+//   },
   {
     title: '广告计划名称',
     dataIndex: 'campaignName',

+ 39 - 11
src/views/modules/autoLaunch/setDirectional.vue

@@ -549,6 +549,30 @@
                         </div>    
                     </div>
                     
+                    <!-- <div class="row-item" >
+                        <div class="hint-item">
+                        </div>
+                        <div class="label-item">
+                            <div class="text-item">出价范围</div>
+                            <div class="required-item"></div>
+                        </div>
+                        <div class="input-item">
+                            <a-form-item>
+                                <a-input-number
+                                    style="width:200px"
+                                    :max="10000"
+                                    :step="0.1"
+                                    v-decorator="['bid', {rules:validationRules.bid} ]"
+                                />
+                                <span style="margin-left:5px">元</span>
+                                <span    style="margin-left:20px">请填入必填字段,获取建议出价</span>
+                            </a-form-item>
+                                <span
+                                class="tip"
+                                v-if="getFormData('bid')<0.1"
+                                >请输入点击出价,不少于0.1元,不超过10000元</span>
+                        </div>    
+                    </div> -->
   
             </div>
         </div>
@@ -672,7 +696,7 @@
                     <div class="row-item">
                         <div class="hint-item"></div>
                         <div class="label-item">
-                        <div class="text-item">创意分类</div>
+                        <div class="text-item">创意标签</div>
                         <!-- <div class="required-item"></div> -->
                         </div>
                         <div class="input-item">
@@ -695,6 +719,7 @@
         </div>
         
 
+
         </a-form>    
             
             <!-- 操作 -->
@@ -702,8 +727,8 @@
                 <!-- <div class="moduler-title">计划名称</div> -->
                 <div class="opt">
                 <a-button type="default" style="margin-right:15px" @click="goBack">上一步</a-button>
-                
-                <a-button type="primary" @click="goNext"  :loading="goNextloading">前往预览</a-button>
+                <!--  -->
+                <a-button type="primary" @click="goNext"  :loading="goNextloading">确定</a-button>
                 </div>
             </div>
         
@@ -978,10 +1003,10 @@ export default {
             autoExtendTargetsChecked:[],
 
             radioStyle: {
-            display: 'block',
-            height: '30px',
-            lineHeight: '30px',
-            padding: '0 15px'
+                display: 'block',
+                height: '30px',
+                lineHeight: '30px',
+                padding: '0 15px'
             },
             
 
@@ -1413,7 +1438,9 @@ export default {
                         values.bid=parseInt(values.bid*1000)
                     }
                     if(values.creativeCategory&&values.creativeCategory.length>0){
-                        values.creativeCategory=values.creativeCategory[2]
+                        values.creativeCategory=values.creativeCategory[values.creativeCategory.length-1]
+                    }else{
+                         values.creativeCategory=null
                     }
                     // this.$parent.currentTabComponent='previewStrategy'
                     // this.$parent.strategyInfo={
@@ -1428,9 +1455,10 @@ export default {
                         console.log(res)
                         this.goNextloading=false
                         if(res.success){
-                            // this.$router.replace('/autoLaunch/autoLaunchList')
-                            // this.$bus.$emit('remove', '/autoLaunch/newStrategy')
+                            
                             this.$parent.strategyInfo={}
+                            this.$router.replace('/autoLaunch/autoLaunchList')
+                            this.$bus.$emit('remove', '/autoLaunch/newStrategy')
                             
                         }
                     })
@@ -1448,7 +1476,7 @@ export default {
         // 获取applist
         getAppList() {
             let params = {}
-            params.accountId = localStorage.getItem('accountId')
+            params.accountId = this.accountInfo.value
             getAction('/kuaishou/batch/getAppList', params).then(res => {
             if (res.success) {
                 this.appListAll = res.result.map((item, index) => {

+ 100 - 5
src/views/modules/autoLaunch/strategyList.vue

@@ -141,6 +141,9 @@
                     <span slot="parentGroup" slot-scope="text">
                         <a href="javascript:;" >{{text}}</a>
                     </span>
+                    <span slot="budget" slot-scope="text">
+                        {{text || '不限'}}
+                    </span>
                     <span slot="parentPlan" slot-scope="text">
                         <a href="javascript:;" >{{text}}</a>
                     </span>
@@ -154,6 +157,98 @@
                         <span>{{text|scensFilter}}</span>
                     </span>
                     
+                        <span slot="ctr" slot-scope="ctr">{{ ctr | toPercentage }}</span>
+                        <span slot="cost" slot-scope="cost">{{ cost | decimalsHandle }}</span>
+                        <span slot="clickMaterial" slot-scope="clickMaterial">{{ clickMaterial | formatCurrency }}</span>
+                        <span slot="showMaterial" slot-scope="showMaterial">{{ showMaterial | formatCurrency }}</span>
+                        <span slot="convertMaterial" slot-scope="convertMaterial">{{ convertMaterial | formatCurrency }}</span>
+                        <span slot="play25FeedBreak" slot-scope="play25FeedBreak">{{ play25FeedBreak | formatCurrency }}</span>
+                        <span slot="play50FeedBreak" slot-scope="play50FeedBreak">{{ play50FeedBreak | formatCurrency }}</span>
+                        <span slot="play75FeedBreak" slot-scope="play75FeedBreak">{{ play75FeedBreak | formatCurrency }}</span>
+                        <span slot="play100FeedBreak" slot-scope="play100FeedBreak">{{ play100FeedBreak | formatCurrency }}</span>
+                        <span slot="nextDayOpen" slot-scope="nextDayOpen">{{ nextDayOpen | formatCurrency }}</span>
+                        <span slot="downloadFinish" slot-scope="downloadFinish">{{ downloadFinish | formatCurrency }}</span>
+                        <span slot="downloadStart" slot-scope="downloadStart">{{ downloadStart | formatCurrency }}</span>
+                        <span slot="likeMaterial" slot-scope="likeMaterial">{{ likeMaterial | formatCurrency }}</span>
+                        <span slot="shareMaterial" slot-scope="shareMaterial">{{ shareMaterial | formatCurrency }}</span>
+                        <span slot="register" slot-scope="register">{{ register | formatCurrency }}</span>
+                        <span slot="follow" slot-scope="follow">{{ follow | formatCurrency }}</span>
+                        <span slot="formCount" slot-scope="formCount">{{ formCount | formatCurrency }}</span>
+                        <span slot="formCountCost" slot-scope="formCountCost">{{ formCountCost | decimalsHandle }}</span>
+                        <span slot="aClick" slot-scope="aClick">{{ aClick | formatCurrency }}</span>
+                        <span slot="photoShow" slot-scope="photoShow">{{ photoShow | formatCurrency }}</span>
+                        <span slot="photoClick" slot-scope="photoClick">{{ photoClick | formatCurrency }}</span>
+                        <span slot="bClick" slot-scope="bClick">{{ bClick | formatCurrency }}</span>
+                        <span slot="active" slot-scope="active">{{ active | formatCurrency }}</span>
+                        <span slot="submit" slot-scope="submit">{{ submit | formatCurrency }}</span>
+                        <span slot="nextDayOpen" slot-scope="nextDayOpen">{{ nextDayOpen | formatCurrency }}</span>
+                        <span slot="eventCreditGrantLandingPage" slot-scope="eventCreditGrantLandingPage">{{ eventCreditGrantLandingPage | formatCurrency }}</span>
+                        <span slot="submitCost" slot-scope="submitCost">{{ submitCost | decimalsHandle }}</span>
+                        <span slot="eventCreditGrantLandingPageCost" slot-scope="eventCreditGrantLandingPageCost">{{ eventCreditGrantLandingPageCost | decimalsHandle }}</span>
+                        <span slot="submitRate" slot-scope="submitRate">{{ submitRate | toPercentage }}</span>
+                        <span slot="eventCreditGrantLandingPageRate" slot-scope="eventCreditGrantLandingPageRate">{{ eventCreditGrantLandingPageRate | toPercentage }}</span>
+                        <span
+                        slot="play25FeedBreakRate"
+                        slot-scope="play25FeedBreakRate"
+                        >{{ play25FeedBreakRate | toPercentage }}</span>
+                        <span slot="playOverRate" slot-scope="playOverRate">{{ playOverRate | toPercentage }}</span>
+                        <!-- 新加数据 -->
+
+                        <span slot="convertRate" slot-scope="convertRate">{{ convertRate | toPercentage }}</span>
+                        <span slot="nextDayOpenRate" slot-scope="nextDayOpenRate">{{ nextDayOpenRate | toPercentage }}</span>
+                        <span slot="ctr" slot-scope="ctr">{{ ctr | toPercentage }}</span>
+                        <span slot="cpc" slot-scope="cpc">{{ cpc | decimalsHandle }}</span>
+                        <span slot="cpm" slot-scope="cpm">{{ cpm | decimalsHandle }}</span>
+                        <span slot="activeRate" slot-scope="activeRate">{{ activeRate | toPercentage }}</span>
+                        <span
+                        slot="installFinishRate"
+                        slot-scope="installFinishRate"
+                        >{{ installFinishRate | toPercentage }}</span>
+                        <span slot="validPlayRate" slot-scope="validPlayRate">{{ validPlayRate | toPercentage }}</span>
+                        <span slot="activePayCost" slot-scope="activePayCost">{{ activePayCost | decimalsHandle }}</span>
+                        <span slot="nextDayOpenCost" slot-scope="nextDayOpenCost">{{ nextDayOpenCost | decimalsHandle }}</span>
+                        <span slot="validPlayCost" slot-scope="validPlayCost">{{ validPlayCost | decimalsHandle }}</span>
+                        <span slot="activeCost" slot-scope="activeCost">{{ activeCost | decimalsHandle }}</span>
+                        <span slot="nextDayOpenCost" slot-scope="nextDayOpenCost">{{ nextDayOpenCost | decimalsHandle }}</span>
+                        <span
+                        slot="gameAddictionCost"
+                        slot-scope="gameAddictionCost"
+                        >{{ gameAddictionCost | decimalsHandle }}</span>
+                        <span
+                        slot="downloadFinishCost"
+                        slot-scope="downloadFinishCost"
+                        >{{ downloadFinishCost | decimalsHandle }}</span>
+                        <span
+                        slot="downloadStartCost"
+                        slot-scope="downloadStartCost"
+                        >{{ downloadStartCost | decimalsHandle }}</span>
+                        <span
+                        slot="installFinishCost"
+                        slot-scope="installFinishCost"
+                        >{{ installFinishCost | decimalsHandle }}</span>
+                        <span slot="convertCost" slot-scope="convertCost">{{ convertCost | decimalsHandle }}</span>
+
+                        <!--  -->
+                        <span
+                        slot="downloadStartRate"
+                        slot-scope="downloadStartRate"
+                        >{{ downloadStartRate | toPercentage }}</span>
+                        <span
+                        slot="downloadFinishRate"
+                        slot-scope="downloadFinishRate"
+                        >{{ downloadFinishRate | toPercentage }}</span>
+                        <span slot="activeRate" slot-scope="activeRate">{{ activeRate | toPercentage }}</span>
+                        <span
+                        slot="activeRegisterRate"
+                        slot-scope="activeRegisterRate"
+                        >{{ activeRegisterRate | toPercentage }}</span>
+                        <span
+                        slot="gameAddictionRate"
+                        slot-scope="gameAddictionRate"
+                        >{{ gameAddictionRate | toPercentage }}</span>
+                        <span slot="nextDayOpenRate" slot-scope="nextDayOpenRate">{{ nextDayOpenRate | toPercentage }}</span>
+                        <!-- <span slot="nextDayOpenRate" slot-scope="nextDayOpenRate">{{ nextDayOpenRate | toPercentage }}</span> -->
+
                 </a-table>
             </div>
         </div>
@@ -213,11 +308,11 @@ const strategyColumns = [
     fixed: 'left' ,
   },
   {
-        title: '创建时间',
-        dataIndex: 'createTime',
-        key: 'createTime',
-        align: 'center',
-        scopedSlots: { customRender: 'createTime' },
+    title: '创建时间',
+    dataIndex: 'createTime',
+    key: 'createTime',
+    align: 'center',
+    scopedSlots: { customRender: 'createTime' },
         
   },
   

+ 2 - 2
vue.config.js

@@ -70,14 +70,14 @@ module.exports = {
       '/jeecg-boot': {
         //  target: 'http://192.168.1.8:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
         // target: 'http://192.168.0.59:8088', //请求本地 需要jeecg-boot后台项目  英豪
-        // target: 'http://192.168.1.188:8088', //请求本地 需要jeecg-boot后台项目  英豪
+        target: 'http://192.168.1.188:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
         // target: 'http://192.168.1.43:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.43:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.43:8888', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.0.252:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.219:8080', //请求本地 需要jeecg-boot后台项目  赵西安
-         target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
+        //  target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // 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后台项目