feat: 账号管理 - 粉丝激活趋势 - 曲线&汇总&列表 - 接口联调

project/src/assets/config/interface_api.js

@@ -276,6 +276,9 @@ var api = {
   dataBoard_fans_mpAccountSummary: "/api/activeFansTrend/mpAccountSummary", // 粉丝激活趋势 - mp汇总
   dataBoard_fans_adqAccountCurve: "/api/activeFansTrend/adqAccountCurve", // 粉丝激活趋势 - adq折线图
   dataBoard_fans_mpAccountCurve: "/api/activeFansTrend/mpAccountCurve", // 粉丝激活趋势 - adq折线图
+  dataBoard_fans_account: "/api/activeFansTrend/account", // 粉丝激活趋势 - 列表
+  dataBoard_fans_accountSummary: "/api/activeFansTrend/accountSummary", // 粉丝激活趋势 - 汇总
+  dataBoard_fans_accountCurve: "/api/activeFansTrend/accountCurve", // 粉丝激活趋势 - 折线图
   dataBoard_short_adqList: "/api/shortPlayDataTrend/adqShortPlayDataTrendList", // 短剧数据趋势 - adq列表
   dataBoard_short_mpList: "/api/shortPlayDataTrend/mpShortPlayDataTrendList", // 短剧数据趋势 - mp列表
   dataBoard_short_allList: "/api/shortPlayDataTrend/shortPlayDataTrendList", // 短剧数据趋势 - 总表列表

project/src/components/dataBoard/fansActiveTrends.vue

@@ -29,11 +29,11 @@
           <label class="common-screen-label">收益截止日期</label>
           <el-date-picker v-model="filter.closing_date" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" size="small" style="width:150px" @change="onChangeClosingDate" />
         </div>
-        <!-- 推广类型 -->
-        <selfChannel style="margin-right: 30px;margin-left: -30px;" :reset="reset" title="推广类型" type="promotionType" labelWidth @channelDefine="onChangePromotionType" />
         <div class="flex">
+          <!-- 推广类型 -->
+          <selfChannel style="margin-right: 30px;margin-left: -30px;" :reset="reset" title="推广类型" type="promotionType" labelWidth @channelDefine="onChangePromotionType" />
           <!-- 回本率(范围) -->
-          <inputRange style="margin-right: 10px;" v-model="filter.costCover" label="回本率" />
+          <!-- <inputRange style="margin-right: 10px;" v-model="filter.costCover" label="回本率" /> -->
           <el-button size="mini" type="primary" plain @click="onClickSearch">确定</el-button>
           <el-button size="mini" plain @click="onClickReset">重置</el-button>
         </div>
@@ -321,19 +321,27 @@ export default {
           playlet_id: this.filter.playlet_id,
           closing_date: this.filter.closing_date,
           plat_order_type: this.filter.plat_order_type,
-          cost_cover_min: this.filter.costCover[0],
-          cost_cover_max: this.filter.costCover[1],
+          // cost_cover_min: this.filter.costCover[0],
+          // cost_cover_max: this.filter.costCover[1],
         }
         let url = ''
         let tableName = ''
 
         if (this.isADQ) { // adq 参数 & api
+          // 2023.01.10 接口更换 新增ad_type参数 区分adq||mp
+          // params.account_id = this.filter.account_id_adq
+          // url = `${this.URL.BASEURL}${this.URL.dataBoard_fans_adqAccountSummary}`
           params.account_id = this.filter.account_id_adq
-          url = `${this.URL.BASEURL}${this.URL.dataBoard_fans_adqAccountSummary}`
+          params.ad_type = 1
+          url = `${this.URL.BASEURL}${this.URL.dataBoard_fans_accountSummary}`
           tableName = 'isADQ'
         } else if (this.isMP) { // mp 参数 & api
-          params.app_id = this.filter.account_id
-          url = `${this.URL.BASEURL}${this.URL.dataBoard_fans_mpAccountSummary}`
+          // 2023.01.10 接口更换 新增ad_type参数 区分adq||mp
+          // params.app_id = this.filter.account_id
+          // url = `${this.URL.BASEURL}${this.URL.dataBoard_fans_mpAccountSummary}`
+          params.account_id = this.filter.account_id
+          params.ad_type = 2
+          url = `${this.URL.BASEURL}${this.URL.dataBoard_fans_accountSummary}`
           tableName = 'isMP'
         }
 
@@ -376,8 +384,8 @@ export default {
           playlet_id: this.filter.playlet_id,
           closing_date: this.filter.closing_date,
           plat_order_type: this.filter.plat_order_type,
-          cost_cover_min: this.filter.costCover[0],
-          cost_cover_max: this.filter.costCover[1],
+          // cost_cover_min: this.filter.costCover[0],
+          // cost_cover_max: this.filter.costCover[1],
           sort_field: this.filter.sort_field,
           sort_type: this.filter.sort_type,
         }
@@ -385,12 +393,20 @@ export default {
         let tableName = ''
 
         if (this.isADQ) { // adq 参数 & api
+          // 2023.01.10 接口更换 新增ad_type参数 区分adq||mp
+          // params.account_id = this.filter.account_id_adq
+          // url = `${this.URL.BASEURL}${this.URL.dataBoard_fans_adqAccount}`
           params.account_id = this.filter.account_id_adq
-          url = `${this.URL.BASEURL}${this.URL.dataBoard_fans_adqAccount}`
+          params.ad_type = 1
+          url = `${this.URL.BASEURL}${this.URL.dataBoard_fans_account}`
           tableName = 'isADQ'
         } else if (this.isMP) { // mp 参数 & api
-          params.app_id = this.filter.account_id
-          url = `${this.URL.BASEURL}${this.URL.dataBoard_fans_mpAccount}`
+          // 2023.01.10 接口更换 新增ad_type参数 区分adq||mp
+          // params.app_id = this.filter.account_id
+          // url = `${this.URL.BASEURL}${this.URL.dataBoard_fans_mpAccount}`
+          params.account_id = this.filter.account_id
+          params.ad_type = 2
+          url = `${this.URL.BASEURL}${this.URL.dataBoard_fans_account}`
           tableName = 'isMP'
         }
 
@@ -450,17 +466,25 @@ export default {
           playlet_id: this.filter.playlet_id,
           closing_date: this.filter.closing_date,
           plat_order_type: this.filter.plat_order_type,
-          cost_cover_min: this.filter.costCover[0],
-          cost_cover_max: this.filter.costCover[1],
+          // cost_cover_min: this.filter.costCover[0],
+          // cost_cover_max: this.filter.costCover[1],
         }
         let url = ''
 
         if (this.isADQ) { // adq 参数 & api
+          // 2023.01.10 接口更换 新增ad_type参数 区分adq||mp
+          // params.account_id = this.filter.account_id_adq
+          // url = `${this.URL.BASEURL}${this.URL.dataBoard_fans_adqAccountCurve}`
           params.account_id = this.filter.account_id_adq
-          url = `${this.URL.BASEURL}${this.URL.dataBoard_fans_adqAccountCurve}`
+          params.ad_type = 1
+          url = `${this.URL.BASEURL}${this.URL.dataBoard_fans_accountCurve}`
         } else if (this.isMP) { // mp 参数 & api
-          params.app_id = this.filter.account_id
-          url = `${this.URL.BASEURL}${this.URL.dataBoard_fans_mpAccountCurve}`
+          // 2023.01.10 接口更换 新增ad_type参数 区分adq||mp
+          // params.app_id = this.filter.account_id
+          // url = `${this.URL.BASEURL}${this.URL.dataBoard_fans_mpAccountCurve}`
+          params.account_id = this.filter.account_id
+          params.ad_type = 2
+          url = `${this.URL.BASEURL}${this.URL.dataBoard_fans_accountCurve}`
         }
 
         const { data: res = {} } = await this.$axios.post(url, params)
@@ -776,18 +800,28 @@ export default {
           playlet_id: this.filter.playlet_id,
           closing_date: this.filter.closing_date,
           plat_order_type: this.filter.plat_order_type,
-          cost_cover_min: this.filter.costCover[0],
-          cost_cover_max: this.filter.costCover[1],
+          // cost_cover_min: this.filter.costCover[0],
+          // cost_cover_max: this.filter.costCover[1],
         }
 
         if (this.isADQ) { // adq 参数 & api
+          // 2023.01.10 接口更换 新增ad_type参数 区分adq||mp
+          // params.account_id = this.filter.account_id_adq
+          // url.summary = `${this.URL.BASEURL}${this.URL.dataBoard_fans_adqAccountSummary}`
+          // url.detail = `${this.URL.BASEURL}${this.URL.dataBoard_fans_adqAccount}`
           params.account_id = this.filter.account_id_adq
-          url.summary = `${this.URL.BASEURL}${this.URL.dataBoard_fans_adqAccountSummary}`
-          url.detail = `${this.URL.BASEURL}${this.URL.dataBoard_fans_adqAccount}`
+          params.ad_type = 1
+          url.summary = `${this.URL.BASEURL}${this.URL.dataBoard_fans_accountSummary}`
+          url.detail = `${this.URL.BASEURL}${this.URL.dataBoard_fans_account}`
         } else if (this.isMP) { // mp 参数 & api
-          params.app_id = this.filter.account_id
-          url.summary = `${this.URL.BASEURL}${this.URL.dataBoard_fans_mpAccountSummary}`
-          url.detail = `${this.URL.BASEURL}${this.URL.dataBoard_fans_mpAccount}`
+          // 2023.01.10 接口更换 新增ad_type参数 区分adq||mp
+          // params.app_id = this.filter.account_id
+          // url.summary = `${this.URL.BASEURL}${this.URL.dataBoard_fans_mpAccountSummary}`
+          // url.detail = `${this.URL.BASEURL}${this.URL.dataBoard_fans_mpAccount}`
+          params.account_id = this.filter.account_id
+          params.ad_type = 2
+          url.summary = `${this.URL.BASEURL}${this.URL.dataBoard_fans_accountSummary}`
+          url.detail = `${this.URL.BASEURL}${this.URL.dataBoard_fans_account}`
         }
 
         const [{ data: summaryRes = {} }, { data: detailRes = {} }] = await Promise.all([