feat: 数据看板 - 短剧数据趋势 - 曲线&汇总&列表 - 接口联调

project/src/assets/config/interface_api.js

@@ -288,6 +288,9 @@ var api = {
   dataBoard_short_adqCurve: "/api/shortPlayDataTrend/adqShortPlayDataTrendCurve", // 短剧数据趋势 - adq折线图
   dataBoard_short_mpCurve: "/api/shortPlayDataTrend/mpShortPlayDataTrendCurve", // 短剧数据趋势 - mp折线图
   dataBoard_short_allCurve: "/api/shortPlayDataTrend/shortPlayDataTrendCurve", // 短剧数据趋势 - 总表折线图
+  dataBoard_short_list: "/api/shortPlayDataTrend/shortPlayDataTrendListByAccount", // 短剧数据趋势 - 列表
+  dataBoard_short_curve: "/api/shortPlayDataTrend/shortPlayDataTrendCurveByAccount", // 短剧数据趋势 - 折线图
+  dataBoard_short_summary: "/api/shortPlayDataTrend/summaryOfShortDramaDataTrendsByAccount", // 短剧数据趋势 - 汇总
   dataBoard_loseUser_account: "/api/customerLossTrend/account", // 用户流失数据 - 列表
   dataBoard_loseUser_summary: "/api/customerLossTrend/summary", // 用户流失数据 - 汇总
   dataBoard_loseUser_curve: "/api/customerLossTrend/curve", // 用户流失数据 - 折线图

project/src/components/dataBoard/shortDramaTrends.vue

@@ -26,11 +26,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>
@@ -313,20 +313,29 @@ 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
-          url = `${this.URL.BASEURL}${this.URL.dataBoard_short_adqSummary}`
+          // 2023.01.10 接口更换 新增ad_type参数 区分adq||mp||总表
+          // url = `${this.URL.BASEURL}${this.URL.dataBoard_short_adqSummary}`
+          params.ad_type = 1
+          url = `${this.URL.BASEURL}${this.URL.dataBoard_short_summary}`
           tableName = 'isADQ'
         } else if (this.isMP) { // mp 参数 & api
-          url = `${this.URL.BASEURL}${this.URL.dataBoard_short_mpSummary}`
+          // 2023.01.10 接口更换 新增ad_type参数 区分adq||mp||总表
+          // url = `${this.URL.BASEURL}${this.URL.dataBoard_short_mpSummary}`
+          params.ad_type = 2
+          url = `${this.URL.BASEURL}${this.URL.dataBoard_short_summary}`
           tableName = 'isMP'
         } else if (this.isSUM) { // 总表 参数 & api
-          url = `${this.URL.BASEURL}${this.URL.dataBoard_short_allSummary}`
+          // 2023.01.10 接口更换 新增ad_type参数 区分adq||mp||总表
+          // url = `${this.URL.BASEURL}${this.URL.dataBoard_short_allSummary}`
+          params.ad_type = 0
+          url = `${this.URL.BASEURL}${this.URL.dataBoard_short_summary}`
           tableName = 'isSUM'
         }
 
@@ -369,8 +378,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,
         }
@@ -378,13 +387,22 @@ export default {
         let tableName = '' // 使表头key不同 => 更新视图
 
         if (this.isADQ) { // adq 参数 & api
-          url = `${this.URL.BASEURL}${this.URL.dataBoard_short_adqList}`
+          // 2023.01.10 接口更换 新增ad_type参数 区分adq||mp||总表
+          // url = `${this.URL.BASEURL}${this.URL.dataBoard_short_adqList}`
+          params.ad_type = 1
+          url = `${this.URL.BASEURL}${this.URL.dataBoard_short_list}`
           tableName = 'isADQ'
         } else if (this.isMP) { // mp 参数 & api
-          url = `${this.URL.BASEURL}${this.URL.dataBoard_short_mpList}`
+          // 2023.01.10 接口更换 新增ad_type参数 区分adq||mp||总表
+          // url = `${this.URL.BASEURL}${this.URL.dataBoard_short_mpList}`
+          params.ad_type = 2
+          url = `${this.URL.BASEURL}${this.URL.dataBoard_short_list}`
           tableName = 'isMP'
         } else if (this.isSUM) { // 总表 参数 & api
-          url = `${this.URL.BASEURL}${this.URL.dataBoard_short_allList}`
+          // 2023.01.10 接口更换 新增ad_type参数 区分adq||mp||总表
+          // url = `${this.URL.BASEURL}${this.URL.dataBoard_short_allList}`
+          params.ad_type = 0
+          url = `${this.URL.BASEURL}${this.URL.dataBoard_short_list}`
           tableName = 'isSUM'
         }
 
@@ -440,16 +458,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
-          url = `${this.URL.BASEURL}${this.URL.dataBoard_short_adqCurve}`
+          // 2023.01.10 接口更换 新增ad_type参数 区分adq||mp||总表
+          // url = `${this.URL.BASEURL}${this.URL.dataBoard_short_adqCurve}`
+          params.ad_type = 1
+          url = `${this.URL.BASEURL}${this.URL.dataBoard_short_curve}`
         } else if (this.isMP) { // mp 参数 & api
-          url = `${this.URL.BASEURL}${this.URL.dataBoard_short_mpCurve}`
+          // 2023.01.10 接口更换 新增ad_type参数 区分adq||mp||总表
+          // url = `${this.URL.BASEURL}${this.URL.dataBoard_short_mpCurve}`
+          params.ad_type = 2
+          url = `${this.URL.BASEURL}${this.URL.dataBoard_short_curve}`
         } else if (this.isSUM) { // 总表 参数 & api
+          // 2023.01.10 接口更换 新增ad_type参数 区分adq||mp||总表
+          // url = `${this.URL.BASEURL}${this.URL.dataBoard_short_allCurve}`
+          params.ad_type = 0
           url = `${this.URL.BASEURL}${this.URL.dataBoard_short_allCurve}`
         }
 
@@ -742,19 +769,31 @@ 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
-          url.summary = `${this.URL.BASEURL}${this.URL.dataBoard_short_adqSummary}`
-          url.detail = `${this.URL.BASEURL}${this.URL.dataBoard_short_adqList}`
+          // 2023.01.10 接口更换 新增ad_type参数 区分adq||mp||总表
+          // url.summary = `${this.URL.BASEURL}${this.URL.dataBoard_short_adqSummary}`
+          // url.detail = `${this.URL.BASEURL}${this.URL.dataBoard_short_adqList}`
+          params.ad_type = 1
+          url.summary = `${this.URL.BASEURL}${this.URL.dataBoard_short_summary}`
+          url.detail = `${this.URL.BASEURL}${this.URL.dataBoard_short_list}`
         } else if (this.isMP) { // mp 参数 & api
-          url.summary = `${this.URL.BASEURL}${this.URL.dataBoard_short_mpSummary}`
-          url.detail = `${this.URL.BASEURL}${this.URL.dataBoard_short_mpList}`
+          // 2023.01.10 接口更换 新增ad_type参数 区分adq||mp||总表
+          // url.summary = `${this.URL.BASEURL}${this.URL.dataBoard_short_mpSummary}`
+          // url.detail = `${this.URL.BASEURL}${this.URL.dataBoard_short_mpList}`
+          params.ad_type = 2
+          url.summary = `${this.URL.BASEURL}${this.URL.dataBoard_short_summary}`
+          url.detail = `${this.URL.BASEURL}${this.URL.dataBoard_short_list}`
         } else if (this.isSUM) { // 总表 参数 & api
-          url.summary = `${this.URL.BASEURL}${this.URL.dataBoard_short_allSummary}`
-          url.detail = `${this.URL.BASEURL}${this.URL.dataBoard_short_allList}`
+          // 2023.01.10 接口更换 新增ad_type参数 区分adq||mp||总表
+          // url.summary = `${this.URL.BASEURL}${this.URL.dataBoard_short_allSummary}`
+          // url.detail = `${this.URL.BASEURL}${this.URL.dataBoard_short_allList}`
+          params.ad_type = 0
+          url.summary = `${this.URL.BASEURL}${this.URL.dataBoard_short_summary}`
+          url.detail = `${this.URL.BASEURL}${this.URL.dataBoard_short_list}`
         }
 
         const [{ data: summaryRes = {} }, { data: detailRes = {} }] = await Promise.all([