Merge branch 'feature/3月迭代' of http://git.gicdev.com/marketing-web/marketing into feature/3月迭代

index.html

@@ -13,7 +13,8 @@
     <script src="//at.alicdn.com/t/font_3229694_vfjtu9hqyrc.js"></script> <!--GIC3.0营销-->
     <link rel="stylesheet" href="//at.alicdn.com/t/font_2996579_875h3lycepk.css"> <!-- 3.0企业 -->
     <script src="//at.alicdn.com/t/font_2996579_875h3lycepk.js"></script><!-- 3.0企业 -->
-    <script src="//at.alicdn.com/t/font_2859043_udehp133w1.css"></script><!--3.0组件库-->
+    <link src="//at.alicdn.com/t/font_2859043_udehp133w1.css"><!--3.0组件库-->
+    <script src="//at.alicdn.com/t/font_2859043_udehp133w1.js"></script><!--3.0组件库-->
     <!-- <link rel="stylesheet" href="//web-1251519181.file.myqcloud.com/components/element.2.12.0.css"> -->
     <!-- element 皮肤 -->
     <!-- <link rel="stylesheet" type="text/css" href="http://web-1251519181.file.myqcloud.com/lib/elementUI/theme.1.0.1/index.css"> -->

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

@@ -52,7 +52,7 @@ export default {
       this.filterJson = filterJson;
     },
     toDetailPage() {
-      this.$router.push(`/ai/ai-data-detail/${this.$route.params.id}?flag=${this.flags.smsFlag}analyseFlag=${this.flags.analyseFlag}`);
+      this.$router.push(`/ai/ai-data-detail/${this.$route.params.id}?flag=${this.flags.smsFlag}&analyseFlag=${this.flags.analyseFlag}`);
     }
   }
 };

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

@@ -15,7 +15,18 @@
         </div>
       </el-col>
       <el-col :span="8">
-        <div class="chart-title">话单质量分析</div>
+        <div class="chart-title">
+          话单质量分析
+          <el-tooltip placement="top">
+            <div slot="content">
+              <p>系统根据接通前识别到的语音提示关键词判定通话状态</p>
+              <p>已接听：客户接通电话；</p>
+              <p>线路问题：客户电话欠费；</p>
+              <p>被叫问题：空号、关机、拒接、未接、停机、线路盲区等；</p>
+            </div>
+            <i class="iconfont icon-QuestionCircleOutlined title-tip-icon"></i>
+          </el-tooltip>
+        </div>
         <div class="chart-box" id="chart-record">
           <svg aria-hidden="true" class="no-data-icon">
             <use xlink:href="#icon-cp-no-data"></use>
@@ -234,6 +245,7 @@ export default {
             percent: originData[el + '_proportion']
           };
         });
+        if (data.filter(el => el.count > 0).length == 0) return;
         document.getElementById('chart-tag').innerHTML = '';
         const chart = new G2.Chart({
           container: 'chart-tag',
@@ -241,7 +253,7 @@ export default {
           height: 220,
           padding: 10
         });
-        chart.source(data);
+        chart.source(data.filter(el => el.count > 0));
         chart.coord('theta');
         chart.legend(false);
         chart
@@ -285,6 +297,7 @@ export default {
           { label: '线路问题', count: originData['count_4'], percent: originData['4_proportion'] },
           { label: '被叫问题', count: originData['count_5'], percent: originData['5_proportion'] }
         ];
+        if (data.filter(el => el.count > 0).length == 0) return;
         document.getElementById('chart-record').innerHTML = '';
         const chart = new G2.Chart({
           container: 'chart-record',
@@ -292,7 +305,7 @@ export default {
           height: 220,
           padding: 10
         });
-        chart.source(data);
+        chart.source(data.filter(el => el.count > 0));
         chart.coord('theta');
         chart.legend(false);
         chart
@@ -391,6 +404,9 @@ export default {
     font-weight: 600;
     color: #303133;
     line-height: 20px;
+    .title-tip-icon {
+      font-size: 14px;
+    }
   }
   .chart-box {
     width: 100%;

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

@@ -254,6 +254,7 @@ export default {
       this.comparative.options = [];
       if (this.memberType == 0) {
         getMemberCrowd({ memberCrowdWidgetId: this.filterJson }).then(res => {
+          if (Object.prototype.toString.call(res.result) != '[object Object]') return;
           const filterFrontShow = JSON.parse(res.result.filterFrontShow || '[]');
           this.comparative.options = filterFrontShow
             .map(typeItem => {

src/views/ai/manage.vue

@@ -2,9 +2,9 @@
   <div class="message">
     <div class="search-bar">
       <el-input v-model="search.nameAndId" @change="onSearch" style="width: 260px" type="text" placeholder="请输入话术名称/ID" prefix-icon="el-icon-search" clearable></el-input>
-      <el-select v-model="search.status" @change="onSearch" style="margin-left: 10px;width: 160px" placeholder="全部状态" clearable>
+      <!-- <el-select v-model="search.status" @change="onSearch" style="margin-left: 10px;width: 160px" placeholder="全部状态" clearable>
         <el-option v-for="el in statusList" :key="el.value" :value="el.value" :label="el.label"></el-option>
-      </el-select>
+      </el-select> -->
       <el-alert title="若需要增加话术，请联系运营经理" style="margin-left: 10px; width: 264px" show-icon :closable="false"></el-alert>
     </div>
     <div class="temp-list">
@@ -21,9 +21,9 @@
           <p class="temp-info-text">发布时间：{{ formatDateTimeByType(el.publishTime) || '--' }}</p>
           <el-button class="temp-check-btn" type="text" @click="showTempDetail(el)">查看</el-button>
         </div>
-        <div :class="['temp-status', { publish: el.status == -1 || el.status == 0 || el.status == 1 || el.status == 2 || el.status == 3 }, { reject: el.status == 4 }, { published: el.status == 5 }]">
+        <!-- <div :class="['temp-status', { publish: el.status == -1 || el.status == 0 || el.status == 1 || el.status == 2 || el.status == 3 }, { reject: el.status == 4 }, { published: el.status == 5 }]">
           {{ el.status | formatStatus(statusList) }}
-        </div>
+        </div> -->
       </div>
     </div>
     <dm-pagination v-if="total > 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :total="total" :current-page="search.pageNum" :page-size="search.pageSize" :page-sizes="[20, 40, 60, 80]" layout="total, sizes, prev, pager, next"></dm-pagination>
@@ -300,7 +300,6 @@ export default {
   padding-bottom: 10px;
   + .temp-detail-item {
     padding-top: 10px;
-    border-top: 1px solid #e4e7ed;
   }
   .temp-detail-content {
     .temp-detail-title {
@@ -314,15 +313,13 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      padding: 10px 16px;
+      background: #f7f8fa;
       + .sound-record {
         margin-top: 10px;
-        .temp-detail-desc {
-          padding-top: 10px;
-          border-top: 1px solid #e4e7ed;
-        }
       }
       .temp-detail-desc {
-        width: 650px;
+        width: 630px;
         font-size: 14px;
         font-weight: 400;
         color: #303133;

src/views/recharge/components/set-rule-dialog.vue

@@ -196,15 +196,23 @@ export default {
     }
   },
   watch: {
-    data: {
-      handler: function(newVal) {
-        this.isMoreAccount = !!newVal.status;
-        this.extend(this.form, newVal);
+    visible: {
+      immediate: true,
+      handler() {
+        this.isMoreAccount = !!this.data.status;
+        this.extend(this.form, this.data);
         this.form['status'] = this.form['status'] || 0;
-      },
-      deep: true,
-      immediate: true
+      }
     }
+    // data: {
+    //   handler: function(newVal) {
+    //     this.isMoreAccount = !!newVal.status;
+    //     this.extend(this.form, newVal);
+    //     this.form['status'] = this.form['status'] || 0;
+    //   },
+    //   deep: true,
+    //   immediate: true
+    // }
   }
 };
 </script>