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

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

@@ -21,10 +21,10 @@
             <el-option label="分组层级" :value="1"></el-option>
             <el-option label="分组名称" :value="2"></el-option>
           </el-select>
-          <el-select v-model="form.storeGroupLevel" @change="handleSearch" v-show="selectVal == 1" class="w260">
+          <el-select v-model="form.storeGroupLevel" @change="handleSearch" v-if="selectVal == 1" class="w260">
             <el-option v-for="item in selectOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
           </el-select>
-          <vue-gic-select-tree :options="options" v-if="dimension == '分组维度'" v-show="selectVal == 2" ref="selectTree" @change="onChange"></vue-gic-select-tree>
+          <vue-gic-select-tree :options="options" v-if="selectVal == 2" ref="selectTree" @change="onChange"></vue-gic-select-tree>
         </el-form-item>
         <el-button icon="iconfont icon-cp-xiazai" class="fr" type="primary" @click="handleExport" :disabled="!total"> 查询结果导出</el-button>
       </el-form>

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

@@ -21,10 +21,10 @@
             <el-option label="分组层级" :value="1"></el-option>
             <el-option label="分组名称" :value="2"></el-option>
           </el-select>
-          <el-select v-model="form.storeGroupLevel" @change="handleSearch" v-show="selectVal == 1" class="w260">
+          <el-select v-model="form.storeGroupLevel" @change="handleSearch" v-if="selectVal == 1" class="w260">
             <el-option v-for="item in selectOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
           </el-select>
-          <vue-gic-select-tree :options="options" v-if="dimension == '分组维度'" v-show="selectVal == 2" ref="selectTree" @change="onChange"></vue-gic-select-tree>
+          <vue-gic-select-tree :options="options" v-if="selectVal == 2" @change="onChange"></vue-gic-select-tree>
         </el-form-item>
         <el-button icon="iconfont icon-cp-xiazai" class="fr" type="primary" @click="handleExport" :disabled="!total"> 查询结果导出</el-button>
       </el-form>

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

@@ -282,7 +282,7 @@ export default {
           .label('percent', val => {
             return {
               formatter: (text, item) => {
-                return item.point.label + '\n' + item.point.percent;
+                return item.point.label + ' ' + item.point.percent;
               }
             };
           })
@@ -330,7 +330,7 @@ export default {
           .label('percent', () => {
             return {
               formatter: (text, item) => {
-                return item.point.label + '\n' + item.point.percent;
+                return item.point.label + ' ' + item.point.percent;
               }
             };
           })