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

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

@@ -72,7 +72,10 @@ const tableHead = [
   {
     label: '上级分组',
     prop: 'storeGroupName',
-    width: '180'
+    width: '180',
+    formatter: function(row) {
+      return `<span>${row.storeGroupName ? row.storeGroupName : '- -'}</span>`;
+    }
   },
   {
     label: '营销人数',

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

@@ -72,7 +72,10 @@ let tableHead = [
   {
     label: '上级分组',
     prop: 'storeGroupName',
-    width: '180'
+    width: '180',
+    formatter: function(row) {
+      return `<span>${row.storeGroupName ? row.storeGroupName : '- -'}</span>`;
+    }
   },
   {
     label: '营销人数',
@@ -125,7 +128,7 @@ let tableHead = [
     minWidth: '120',
     sortable: 'custom',
     formatter: function(row) {
-      return `<span>${!isNaN(row.connectionIntentionRate) ? row.connectionIntentionRate.toLocaleString() : '- -'}</span>`;
+      return `<span>${!isNaN(row.connectionIntentionRate) ? row.connectionIntentionRate + '%' : '- -'}</span>`;
     }
   }
 ];

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

@@ -261,26 +261,21 @@ export default {
         const chart = new G2.Chart({
           container: 'chart-tag',
           forceFit: true,
-          height: 220,
-          padding: 10
+          height: 260,
+          padding: 0
         });
         chart.source(data.filter(el => el.count > 0));
-        chart.coord('theta');
-        chart.legend(false);
+        chart.coord('theta', {
+          radius: 0.75,
+          innerRadius: 0.6
+        });
+        chart.legend(null);
         chart
           .intervalStack()
           .position('count')
-          .color('percent', ['#2d4dd1', '#239EFF', '#14C9C9', '#05B770', '#F69F3E', '#7D59E0'])
+          .color('label', ['#2d4dd1', '#239EFF', '#14C9C9', '#05B770', '#F69F3E', '#7D59E0'])
           .label('percent', val => {
             return {
-              offset: -40,
-              textStyle: {
-                fontSize: 10,
-                textAlign: 'center',
-                shadowBlur: 2,
-                shadowColor: 'rgba(0, 0, 0, .45)',
-                fill: '#fff'
-              },
               formatter: (text, item) => {
                 return item.point.label + '\n' + item.point.percent;
               }
@@ -313,26 +308,22 @@ export default {
         const chart = new G2.Chart({
           container: 'chart-record',
           forceFit: true,
-          height: 220,
-          padding: 10
+          height: 260,
+          padding: 0
         });
         chart.source(data.filter(el => el.count > 0));
-        chart.coord('theta');
-        chart.legend(false);
+        console.log(data);
+        chart.coord('theta', {
+          radius: 0.75,
+          innerRadius: 0.6
+        });
+        chart.legend(null);
         chart
           .intervalStack()
           .position('count')
-          .color('percent', ['#2d4dd1', '#239EFF', '#14C9C9'])
+          .color('label', ['#2d4dd1', '#239EFF', '#14C9C9'])
           .label('percent', () => {
             return {
-              offset: -40,
-              textStyle: {
-                fontSize: 10,
-                textAlign: 'center',
-                shadowBlur: 2,
-                shadowColor: 'rgba(0, 0, 0, .45)',
-                fill: '#fff'
-              },
               formatter: (text, item) => {
                 return item.point.label + '\n' + item.point.percent;
               }

src/views/ecm/form.vue

@@ -364,7 +364,7 @@
             <el-date-picker v-if="form.expireType" v-model="form.endDate" :disabled="isEdit && onlineStatus == 2" type="datetime" :picker-options="endDatePickerOptions" placeholder="结束时间" @change="checkBeginEndTime"> </el-date-picker>
           </template>
         </el-form-item>
-        <el-form-item label="固定期限" prop="endDate" :show-message="showMessage" v-else>
+        <el-form-item label="固定期限" prop="endDate" :show-message="showMessage" v-else class="mt20">
           <el-date-picker class="ml10" v-model="form.beginDate" :disabled="isEdit && onlineStatus != 0" type="datetime" placeholder="开始时间" @change="checkBeginEndTime" :picker-options="endDatePickerOptions"> </el-date-picker>
           <el-date-picker v-model="form.endDate" :disabled="isEdit && onlineStatus == 2" type="datetime" :picker-options="isEdit ? endDatePickerOptions2 : endDatePickerOptions3" placeholder="结束时间" @change="checkBeginEndTime"> </el-date-picker>
         </el-form-item>