Merge branch 'feature/ai营销二期' into dev

src/views/ai/ai-data-aiCall.vue

@@ -129,6 +129,7 @@ let tableHead = [
     }
   }
 ];
+let smsFlagHead = [];
 export default {
   data() {
     return {
@@ -316,7 +317,8 @@ export default {
           return `<span>${row.storeName ? row.storeName : '- -'}</span>`;
         }
       };
-      this.tableHeader = [head, ...tableHead];
+      this.tableHeader.unshift(head);
+      this.tableHeader = this.tableHeader.concat(smsFlagHead);
       this.loading = true;
       const { activityId, search, storeGroupId, pageNum, pageSize, orderBy } = this.form;
       try {
@@ -366,7 +368,8 @@ export default {
           return `<span>${row.name ? row.name : '- -'}</span>`;
         }
       };
-      this.tableHeader = [head, ...tableHead];
+      this.tableHeader.unshift(head);
+      this.tableHeader = this.tableHeader.concat(smsFlagHead);
       this.loading = true;
       const { activityId, storeGroupLevel, storeGroupId, pageNum, pageSize, orderBy } = this.form;
       let params = {};
@@ -413,7 +416,7 @@ export default {
       const smsFlag = result.activityPlanList[0].activityEventList[0].smsFlag;
       this.activityData = { startTime: startDate, endTime: endDate, smsFlag, activityName, activityId };
       if (this.activityData.smsFlag) {
-        let arr = [
+        smsFlagHead = [
           {
             label: '短信发送总数',
             prop: 'sentMessagesNumber',
@@ -434,8 +437,8 @@ export default {
             fixed: 'right'
           }
         ];
-        tableHead = tableHead.concat(arr);
       }
+      this.tableHeader = [...tableHead];
       this.aiStoreOutboundRank();
     },
     radioChange(data) {
@@ -444,6 +447,7 @@ export default {
         pageNum: 1,
         pageSize: 20
       };
+      this.tableHeader = [...tableHead];
       if (data == '分组维度') {
         this.form.storeGroupLevel = 1;
         this.selectVal = 1;
@@ -488,7 +492,6 @@ export default {
       }
     },
     onChange(data) {
-      console.log(data);
       this.form.storeGroupId = data ? data.storeGroupId : undefined;
       this.getStaticListData();
     },

src/views/ai/ai-data-index.vue

 <template>
   <div>
     <el-tabs v-model="activeName">
-      <el-tab-pane label="AI外呼数据" name="first">
-        <aiDataAiCall v-if="activeName == 'first'" />
+      <el-tab-pane label="AI外呼数据" name="1">
+        <aiDataAiCall v-if="activeName == '1'" />
       </el-tab-pane>
-      <el-tab-pane label="活动转化数据" name="second">
-        <aiDataActiveDetail v-if="activeName == 'second'" />
+      <el-tab-pane label="活动转化数据" name="2" v-if="this.$route.query.analyseFlag == 1">
+        <aiDataActiveDetail v-if="activeName == '2'" />
       </el-tab-pane>
-      <el-tab-pane label="客户明细" name="third">
-        <aiDataDetail v-if="activeName == 'third'" />
+      <el-tab-pane label="客户明细" name="3">
+        <aiDataDetail v-if="activeName == '3'" />
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -21,7 +21,7 @@ import aiDataDetail from './ai-data-detail.vue';
 export default {
   data() {
     return {
-      activeName: 'first'
+      activeName: '1'
     };
   },
   components: {
@@ -29,7 +29,10 @@ export default {
     aiDataAiCall,
     aiDataDetail
   },
-  watch: {}
+  created() {
+    console.log(this.$route.query.name);
+    this.activeName = this.$route.query.name;
+  }
 };
 </script>
 

src/views/ai/ai-data-report.vue

@@ -8,7 +8,7 @@
       <dm-sub-title title-align="space-between">
         <div>
           AI外呼数据<span class="title-tip">(数据实时更新)</span>
-          <el-button class="check-detail" @click="toDetailPage">查看详情</el-button>
+          <el-button class="check-detail" @click="toDetailPage(1)">查看详情</el-button>
         </div>
       </dm-sub-title>
       <ai-data :ai-data-show="flags"></ai-data>
@@ -17,7 +17,7 @@
       <dm-sub-title title-align="space-between">
         <div>
           活动转化数据<span class="title-tip">(数据每天更新 1 次)</span>
-          <el-button class="check-detail" @click="toDetailPage">查看详情</el-button>
+          <el-button class="check-detail" @click="toDetailPage(2)">查看详情</el-button>
         </div>
       </dm-sub-title>
       <conversion :member-type="flags.memberType" :filter-json="filterJson"></conversion>
@@ -49,8 +49,8 @@ export default {
     getFilterJson(filterJson) {
       this.filterJson = filterJson;
     },
-    toDetailPage() {
-      this.$router.push(`/ai/ai-data-detail/${this.$route.params.id}?flag=${this.flags.smsFlag}&analyseFlag=${this.flags.analyseFlag}`);
+    toDetailPage(name) {
+      this.$router.push(`/ai/ai-data-detail/${this.$route.params.id}?flag=${this.flags.smsFlag}&analyseFlag=${this.flags.analyseFlag}&name=${name}`);
     }
   }
 };