朱鑫波 4 年之前
父節點
當前提交
f53b87e295

+ 38 - 2
src/components/formComponents/selectGroup.vue

@@ -31,6 +31,11 @@ export default {
       type: String,
       default: '',
     },
+    requestUrl: {
+      // 字典代码
+      type: String,
+      default: '',
+    },
     require: {
       type: Boolean,
       default() {
@@ -216,8 +221,11 @@ export default {
     this.$nextTick(() => {
       if (this.code && this.options.length == 0) {
         // 如果code值不为空且options.lengt==0, 则去请求字典项
-        this.getOptions()
-      } else {
+        this.getOptions(this.requestUrl)
+      } else if(this.requestUrl && this.options.length == 0){
+        this.getOptionsByURrl(this.requestUrl)
+        
+      }else {
         // 否则将外部传入的options显示到下拉框中
         this.selectOption.splice(0, this.selectOption.length)
         this.selectOption.push(...this.options)
@@ -229,6 +237,34 @@ export default {
     filterOptionAll(input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     },
+    getOptionsByURrl(url){
+      getAction(url,{}).then((res) => {
+        if (res.success && isArray(res.result)) {
+          let data = res.result
+          data = data.map((v) => {
+            return {
+              ...v,
+              label: v.tagName,
+              value: v.tagId+"",
+            }
+          })
+          if (!this.multiple && !this.require) {
+            data.unshift({ label: '不限', value: 'unlimited' })
+            if (this.value == ''|| this.value == null || this.value.length == 0 ) {
+              this.selectedVal = ['unlimited']
+            }
+          } else {
+            if (this.value == ''|| this.value == null || this.value.length == 0 ) {
+              this.selectedVal = []
+              this.$emit('clearValidate', this.selectedVal)
+            }
+          }
+          this.selectOption.splice(0, this.selectOption.length)
+          this.selectOption.push(...data)
+          this.setDefaultVal(this.selectOption)
+        }
+      })
+    },
     getOptions() {
       // 获取字典项
 

+ 1 - 0
src/utils/request.js

@@ -15,6 +15,7 @@ else if (process.env.NODE_ENV == 'debug') {
 else if (process.env.NODE_ENV == 'production') { 
   
   // axios.defaults.baseURL = 'http://192.168.1.251/jeecg-boot';
+  // axios.defaults.baseURL = 'http://139.186.151.174:8804/jeecg-boot';
   axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot';
 }
 const service = axios.create({

+ 13 - 3
src/views/modules/Statistics/components/Treeselect.vue

@@ -16,7 +16,7 @@
       :auto-load-root-options="false"
       @select="update"
       @input="emitValue"
-      :limit="2"
+      :limit="limit"
       :default-options="true"
       :limitText="
         (count) => {
@@ -82,6 +82,13 @@ export default {
         return '/ctop/projectMember/participateListByMediaId'
       },
     },
+    // 展示条数
+    limit: {
+      type: Number,
+      default() {
+        return 2
+      },
+    },
   },
   components: {
     Treeselect,
@@ -176,7 +183,8 @@ export default {
         postAction(this.reqUrl, params).then((res) => {
           if (res.success) {
             this.options = res.result.map((item) => {
-              return {
+              
+                return {
                 id: item.projectId + 'projectId',
                 label: item.projectName + '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0' + item.advertiserName,
                 children: item.accountList
@@ -196,7 +204,9 @@ export default {
                       }
                     })
                   : [],
-              }
+                }
+              
+              
             })
             if (this.oneData) {
               var data = this.options.filter((item) => {

+ 24 - 46
src/views/modules/Statistics/popularVideo.vue

@@ -181,10 +181,10 @@
       <a-col :span="24">
         
         <a-card :bordered="false" class="search-box">
-          <!-- <div style="margin-bottom:20px"> -->
+          <div style="margin-bottom:20px">
             
 
-            <!-- <span style="margin-left:20px">编导:</span>
+            <span style="margin-left:20px">编导:</span>
             <a-select
               v-model="planId"
               show-search
@@ -196,8 +196,8 @@
               :disabled='operateDisabled'
               allowClear
             >
-              <a-select-option v-for="item in designList" :key="item.user_id" :value="item.user_id">
-                {{item.user_name}}
+              <a-select-option v-for="item in designList" :key="item.user_id" :value="item.id">
+                {{item.realname+'_('+item.roleName+')'}}
               </a-select-option>
             </a-select> 
             <span style="margin-left:20px">剪辑:</span>
@@ -212,8 +212,8 @@
               :disabled='operateDisabled'
               allowClear
             >
-              <a-select-option v-for="item in designList" :key="item.user_id" :value="item.user_id">
-                {{item.user_name}}
+              <a-select-option v-for="item in designList" :key="item.user_id" :value="item.id">
+                {{item.realname+'_('+item.roleName+')'}}
               </a-select-option>
             </a-select> 
             <span style="margin-left:20px">拍摄:</span>
@@ -228,13 +228,13 @@
               :disabled='operateDisabled'
               allowClear
             >
-              <a-select-option v-for="item in designList" :key="item.user_id" :value="item.user_id">
-                {{item.user_name}}
+              <a-select-option v-for="item in designList" :key="item.user_id" :value="item.id">
+                {{item.realname+'_('+item.roleName+')'}}
               </a-select-option>
-            </a-select>  -->
+            </a-select> 
             <a-button type='primary' style="position:absolute;right:20px" @click="search">查询</a-button>
             
-          <!-- </div> -->
+          </div>
            <div style="margin-bottom:20px">
                 <span>日期选择:</span>
                 <a-range-picker
@@ -684,17 +684,7 @@ export default {
             console.log(key);
             this.treeValue=[];
             this.ipagination.current=1
-            if(key==1){
-                // toutiao
-                this.designList=this.TTdesignList
-                this.columns=[...TTcolumns]
-            }else{
-                // kuaishou
-            this.columns=[...KScolumns]
-                this.designList=this.KSdesignList
-               
-                
-            }
+           
         
             this.getNewPlan()
         },
@@ -733,29 +723,15 @@ export default {
 
         // 获取所有运营
         getAllOperator(key){
-            let url=''
+            let url='/sys/user/getAllDesigner'
             this.designList=[]
-            if(key==1){
-                // 头条
-                url='/ctop/bytedance/newPlan/report/AllOperator'
-            }else{
-                // 快手
-                url='/ctop/kuaishou/newGroup/report/AllOperator'
-            }
-            postAction(url,{}).then(res=>{
+            
+            getAction(url,{}).then(res=>{
                 console.log(res);
                 if(res.success){
-                if(key==1){
-                    this.TTdesignList=res.result;
-                }else{
-                    this.KSdesignList=res.result;
-                }
-
-                if(this.tabKey==1){
-                    this.designList=this.TTdesignList
-                }else{
-                    this.designList=this.KSdesignList
-                }
+                
+                    this.designList=res.data
+               
                 
                 }
             })
@@ -779,11 +755,11 @@ export default {
 
             getAction(url,{
                 type:this.value,
-                clipId:this.clipId,
-                shotId:this.shotId,
-                planId:this.planId,
-                startData:this.dateRange[0].format('YYYY-MM-DD'),
-                endData:this.dateRange[1].format('YYYY-MM-DD'),
+                clipId:this.clipId==''?null:this.clipId,
+                shotId:this.shotId==''?null:this.shotId,
+                planId:this.planId==''?null:this.planId,
+                startDate:this.dateRange[0].format('YYYY-MM-DD'),
+                endDate:this.dateRange[1].format('YYYY-MM-DD'),
                 pageSize:this.ipagination.pageSize,
                 pageNo:this.ipagination.current
             }).then(res=>{
@@ -811,6 +787,7 @@ export default {
             //     this.$message.error('请选择具体账户或者运营')
             // }
             this.getNewPlan()
+            
         },
     
     },
@@ -833,6 +810,7 @@ export default {
     },
     mounted() {
         this.getNewPlan()
+        this.getAllOperator()
     },
     activated: function() {
         

+ 18 - 1
src/views/modules/autoLaunch/setDirectional.vue

@@ -745,7 +745,24 @@
              
         </div>
         
-
+        <!-- 基础信息 -->
+        <!-- <div class="moduler">
+            <div class="moduler-title">请设置基本信息</div>
+            
+            <div class="row-item">
+            <div class="hint-item"> </div>
+            <div class="label-item">
+              <div class="text-item">计划命名规则</div>
+              <div class="required-item"></div>
+            </div>
+            <div class="input-item">
+              <a-form-item>                
+                <a-input v-model="strategyName"   allow-clear />
+               </a-form-item>
+            </div>
+          </div>  
+            
+        </div> -->
 
         </a-form>    
             

+ 1 - 1
src/views/modules/earlyWarningRules/configRules.vue

@@ -437,7 +437,7 @@ export default {
             
         },
         blurGroupName(item){
-            if(this.currentRuleId){
+            if(this.currentRuleId&&item.groupId){
                 if(item.groupName!=''&&item.remark!=''){
                     putAction('/ruleGroup/edit',{id:item.groupId,groupName:item.groupName,remark:item.remark}).then(res=>{
                         if(res.success){

+ 4 - 0
src/views/modules/earlyWarningRules/ruleModule.vue

@@ -78,6 +78,7 @@
                         v-model="value.threshold"
                         style="width: 300px; margin-right: 5px"
                         :code="value.dictId"
+                        :requestUrl='value.requestUrl'
                         :multiple="
                           value.dataType == 'string' ||
                           value.dataType == 'number' ||
@@ -222,10 +223,12 @@
                                     }"
                                     v-else-if="value.modelType == 'select' || value.modelType == 'checkBox'"
                                   >
+                                  <!--  -->
                                     <selectGroup
                                       :disabled="!editShow"
                                       v-model="value.threshold"
                                       :code="value.dictId"
+                                      :requestUrl='value.requestUrl'
                                       :multiple="
                                         value.dataType == 'string' ||
                                         value.dataType == 'number' ||
@@ -382,6 +385,7 @@
                                       :disabled="!editShow"
                                       v-model="value.threshold"
                                       :code="value.dictId"
+                                      :requestUrl='value.requestUrl'
                                       :multiple="
                                         value.dataType == 'string' ||
                                         value.dataType == 'number' ||

+ 31 - 20
src/views/modules/earlyWarningRules/useRuleList.vue

@@ -298,31 +298,42 @@ export default {
     },
 
     handleOk() {
-      this.confirmLoading = true
-      getAction('/ruleAccountTemplate/checkAccountTemplate', { accountId: this.accountId }).then((res) => {
-        console.log(res)
-        if (res.success) {
-          if (!res.result.isApplication) {
-            postAction('/ruleAccountTemplate/pushTemplateToAccount', {
-              templateId: this.templateId,
-              accountId: this.accountId,
-            }).then((r) => {
-              var data = { id: this.templateId, edit: true, accountId: this.accountId }
-              localStorage.setItem('getRuleDetail', JSON.stringify(data))
-              this.$router.push('/earlyWarningRules/ruleModule')
+      
+      if(this.accountId){
+        this.confirmLoading = true
+        getAction('/ruleAccountTemplate/checkAccountTemplate', { accountId: this.accountId }).then((res) => {
+          console.log(res)
+          if (res.success) {
+            if (!res.result.isApplication) {
+              postAction('/ruleAccountTemplate/pushTemplateToAccount', {
+                templateId: this.templateId,
+                accountId: this.accountId,
+              }).then((r) => {
+                if(r.success){
+                  var data = { id: this.templateId, edit: true, accountId: this.accountId }
+                  localStorage.setItem('getRuleDetail', JSON.stringify(data))
+                  this.$router.push('/earlyWarningRules/ruleModule')
+                  this.confirmLoading = false
+                }else{
+                  this.$message.error(r.message)
+                }
+                
+              })
+            } else {
+              this.accountId = ''
+              this.$message.error(`此账户下已绑定模板${res.result.templateName},请重新选择账户`)
               this.confirmLoading = false
-            })
+            }
           } else {
             this.accountId = ''
-            this.$message.error(`此账户下已绑定模板${res.result.templateName},请重新选择账户`)
+            this.$message.error(res.message)
             this.confirmLoading = false
           }
-        } else {
-          this.accountId = ''
-          this.$message.error(res.message)
-          this.confirmLoading = false
-        }
-      })
+        })
+      }else{
+        this.$message.error('请选择需要推送的账户')
+      }
+      
     },
     // recordsRule(record){
     //     console.log(record);

+ 1 - 1
src/views/modules/kuaishouapp/account/stepForm/Step2.vue

@@ -87,7 +87,7 @@
         <a-form-item label="选择转化" :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
           :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }">
           <a-select allowClear labelInValue style="width:100%" v-model="convertId" @focus="getConvertList">
-            <a-select-option :value="item.convert_id" v-for="(item,index) in convertList" :key="item.convert_id">
+            <a-select-option :value="item.convert_id" v-for="(item) in convertList" :key="item.convert_id">
               {{item.convert_name}}</a-select-option>
           </a-select>
         </a-form-item>

+ 30 - 27
src/views/modules/kuaishouapp/account/stepForm/stepModule/targetedPopulation.vue

@@ -164,14 +164,14 @@ li:hover {
     <a-form-item
       label="年龄"
       :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
-      :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }"
+      :wrapperCol="{ lg: { span: 17 }, sm: { span: 17 } }"
     >
       <a-radio-group v-model="allForm.ageType" buttonStyle="solid">
         <a-radio-button value="noLimit">不限</a-radio-button>
         <a-radio-button value="ageLimit">限定年龄段</a-radio-button>
         <a-radio-button value="ageCustom">自定义年龄段</a-radio-button>
       </a-radio-group>
-      <div v-if="allForm.ageType == 'ageLimit'">
+      <div v-if="allForm.ageType == 'ageLimit'" style="margin-top:5px">
         <a-checkbox-group v-decorator="['agesRange', { rules: [{ required: true, message: '请选择年龄段' }] }]">
           <!-- <a-checkbox :value="0">0-11岁</a-checkbox>
           <a-checkbox :value="12">12-17岁</a-checkbox> -->
@@ -201,7 +201,7 @@ li:hover {
     <a-form-item
       label="性别"
       :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
-      :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }"
+      :wrapperCol="{ lg: { span: 17 }, sm: { span: 17 } }"
     >
       <a-radio-group
         buttonStyle="solid"
@@ -211,6 +211,7 @@ li:hover {
             initialValue: 0,
           },
         ]"
+        
       >
         <a-radio-button :value="0">不限</a-radio-button>
         <a-radio-button :value="1">女性</a-radio-button>
@@ -234,6 +235,7 @@ li:hover {
       :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }"
       v-if="allForm.platform_os == 1"
       class="else-label"
+      style="margin-top:-16px"
     >
       <a-radio-group
         v-decorator="[
@@ -256,6 +258,7 @@ li:hover {
       :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }"
       v-if="allForm.platform_os == 2"
       class="else-label"
+      style="margin-top:-16px"
     >
       <a-radio-group
         v-decorator="[
@@ -282,22 +285,22 @@ li:hover {
         <a-radio-button value="0">不限</a-radio-button>
         <a-radio-button value="1">选择品牌</a-radio-button>
       </a-radio-group>
-      <div v-if="allForm.device == '1'" style="width: 120%">
+      <div v-if="allForm.device == '1'" style="width: 120%;margin-top:15px">
         <a-checkbox-group
           v-decorator="['deviceBrand', { rules: [{ required: true, message: '请选择设备品牌' }] }]"
           style="width: 120%"
         >
-          <a-checkbox :value="1">OPPO</a-checkbox>
-          <a-checkbox :value="2">VIVO</a-checkbox>
-          <a-checkbox :value="3">华为</a-checkbox>
-          <a-checkbox :value="4">小米</a-checkbox>
-          <a-checkbox :value="5">荣耀</a-checkbox>
-          <a-checkbox :value="6">三星</a-checkbox>
-          <a-checkbox :value="7">金立</a-checkbox>
-          <a-checkbox :value="8">魅族</a-checkbox>
-          <a-checkbox :value="9">乐视</a-checkbox>
-          <a-checkbox :value="10">其他</a-checkbox>
-          <a-checkbox :value="11" v-if="allForm.platform_os == 0">苹果</a-checkbox>
+          <a-checkbox :value="1" style='margin-bottom:8px'>OPPO</a-checkbox>
+          <a-checkbox :value="2" style='margin-bottom:8px'>VIVO</a-checkbox>
+          <a-checkbox :value="3" style='margin-bottom:8px'>华为</a-checkbox>
+          <a-checkbox :value="4" style='margin-bottom:8px'>小米</a-checkbox>
+          <a-checkbox :value="5" style='margin-bottom:8px'>荣耀</a-checkbox>
+          <a-checkbox :value="6" style='margin-bottom:8px'>三星</a-checkbox>
+          <a-checkbox :value="7" style='margin-bottom:8px'>金立</a-checkbox>
+          <a-checkbox :value="8" style="margin:0 0 8px 0">魅族</a-checkbox>
+          <a-checkbox :value="9" style='margin-bottom:8px'>乐视</a-checkbox>
+          <a-checkbox :value="10" style='margin-bottom:8px'>其他</a-checkbox>
+          <a-checkbox :value="11" v-if="allForm.platform_os == 0" style='margin-bottom:8px'>苹果</a-checkbox>
         </a-checkbox-group>
       </div>
     </a-form-item>
@@ -310,21 +313,21 @@ li:hover {
         <a-radio-button value="0">不限</a-radio-button>
         <a-radio-button value="1">选择价格</a-radio-button>
       </a-radio-group>
-      <div v-if="allForm.price == '1'" style="width: 120%">
+      <div v-if="allForm.price == '1'" style="width: 120%;margin-top:10px">
         <a-checkbox-group
           v-decorator="['devicePrice', { rules: [{ required: true, message: '请选择设备价格' }] }]"
           style="width: 120%"
         >
-          <a-checkbox :value="1">1500以下</a-checkbox>
-          <a-checkbox :value="2">1501~2000</a-checkbox>
-          <a-checkbox :value="3">2001~2500</a-checkbox>
-          <a-checkbox :value="4">2501~3000</a-checkbox>
-          <a-checkbox :value="5">3001~3500</a-checkbox>
-          <a-checkbox :value="6">3501~4000</a-checkbox>
-          <a-checkbox :value="7">4001~4500</a-checkbox>
-          <a-checkbox :value="8">4501~5000</a-checkbox>
-          <a-checkbox :value="9">5001~5500</a-checkbox>
-          <a-checkbox :value="10">5500以上</a-checkbox>
+          <a-checkbox :value="1" style='margin-bottom:8px'>1500以下</a-checkbox>
+          <a-checkbox :value="2" style='margin-bottom:8px'>1501~2000</a-checkbox>
+          <a-checkbox :value="3" style='margin-bottom:8px'>2001~2500</a-checkbox>
+          <a-checkbox :value="4" style='margin-bottom:8px'>2501~3000</a-checkbox>
+          <a-checkbox :value="5" style="margin-left:0;margin-bottom:8px">3001~3500</a-checkbox>
+          <a-checkbox :value="6" style='margin-bottom:8px'>3501~4000</a-checkbox>
+          <a-checkbox :value="7" style='margin-bottom:8px'>4001~4500</a-checkbox>
+          <a-checkbox :value="8" style='margin-bottom:8px'>4501~5000</a-checkbox>
+          <a-checkbox :value="9" style="margin-left:0;margin-bottom:8px">5001~5500</a-checkbox>
+          <a-checkbox :value="10" style='margin-bottom:8px'>5500以上</a-checkbox>
         </a-checkbox-group>
       </div>
     </a-form-item>
@@ -536,7 +539,7 @@ li:hover {
     <a-form-item
       label="过滤已转化用户"
       :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
-      :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }"
+      :wrapperCol="{ lg: { span: 15 }, sm: { span: 15 } }"
     >
       <!-- v-decorator="[
           'isOpen',

+ 112 - 23
src/views/modules/kuaishouapp/populationAnalysis/index.vue

@@ -1,23 +1,22 @@
 <template>
   <div class="autoLaunchReport">
+    
     <div class="topOptions">
-      <span class="OptinItem" style="position: relative; top: 12px">
-        <!-- reqUrl='/ctop/userAllocation/getAccountIdListByUserId' -->
-        <!-- <Treeselect :appId.sync="accountIds" :multiple="true" request="2,4" reqUrl='/ctop/userAllocation/getAccountIdsByUserId'  ref="treeSelect" style="margin-bottom:8px " /> -->
+      <span class="OptinItem" style="position:relative;top:12px;margin-right:20px">
         <Treeselect
           :appId.sync="accountIds"
-          :multiple="false"
+          :multiple="true"
           request="2,4"
           ref="treeSelect"
-          style="width: 400px"
-          :oneData="true"
+          style="width: 600px"
+          :limit='1'
         />
       </span>
       <span class="OptinItem">
-        <a-range-picker @change="dateChange" v-model="dateRange" :disabled-date="disabledDate" style="width: 400px" />
+        <a-range-picker @change="dateChange" v-model="dateRange" :disabled-date="disabledDate" style="width: 300px" />
       </span>
       <span>
-        <a-button type="primary" @click="search">查询</a-button>
+        <a-button type="primary" style="position:absolute;right:10px;top:45px" @click="search">查询</a-button>
         <!-- <a-button type='default' @click="reset">重置</a-button> -->
       </span>
     </div>
@@ -271,6 +270,67 @@ const regionColumns = [
   //   },
 ]
 
+const province =[
+  {
+    title: '省份',
+    dataIndex: 'province',
+    key: 'province',
+    align: 'center',
+    scopedSlots: { customRender: 'province' },
+   
+  },
+]
+const city =[
+  {
+    title: '城市',
+    dataIndex: 'city',
+    key: 'city',
+    align: 'center',
+    scopedSlots: { customRender: 'city' },
+    
+  },
+]
+const ageSegment =[
+  {
+    title: '年龄',
+    dataIndex: 'ageSegment',
+    key: 'ageSegment',
+    align: 'center',
+    scopedSlots: { customRender: 'ageSegment' },
+    
+  },
+]
+const gender =[
+  {
+    title: '性别',
+    dataIndex: 'gender',
+    key: 'gender',
+    align: 'center',
+    scopedSlots: { customRender: 'gender' },
+   
+  },
+]
+const businessInterestTags =[
+  {
+    title: '商业兴趣',
+    dataIndex: 'businessInterestTags',
+    key: 'businessInterestTags',
+    align: 'center',
+    scopedSlots: { customRender: 'businessInterestTags' },
+    
+  }
+]
+const client =[
+  {
+    title: '系统',
+    dataIndex: 'client',
+    key: 'client',
+    align: 'center',
+    scopedSlots: { customRender: 'client' },
+    
+  },
+]
+
 export default {
   components: {
     Treeselect,
@@ -307,15 +367,15 @@ export default {
       },
 
       tableValue: 'province',
-      accountIds: '',
+      accountIds: [],
       accountList: [],
       directionalId: undefined,
       value: 1,
-      columns: regionColumns,
+      columns: [...province,...regionColumns],
       tableData: [],
       dateRange: [moment().subtract(2, 'day'), moment().subtract(2, 'day')],
       topOption: JSON.parse(JSON.stringify(option)),
-      scrollX: 2500,
+      scrollX: 0,
       materialipagination: {
         current: 1,
         pageSize: 10,
@@ -362,13 +422,22 @@ export default {
     },
     tableTypeChange(e) {
       //   console.log('radio checked', e.target.value)
-      //   if (e.target.value == 2) {
-      //     this.columns = [...sexColumns, ...publicColumns]
-      //   } else if (e.target.value == 1) {
-      //     this.columns = [...regionColumns, ...publicColumns]
-      //   } else if (e.target.value == 3) {
-      //     this.columns = [...ageColumns, ...publicColumns]
-      //   }
+        if (e.target.value == 'province') {
+          this.columns = [...province, ...regionColumns]
+        } else if (e.target.value == 'city') {
+          this.columns = [...city, ...regionColumns]
+        } else if (e.target.value == 'gender') {
+          this.columns = [...gender, ...regionColumns]
+        }
+         else if (e.target.value == 'ageSegment') {
+          this.columns = [...ageSegment, ...regionColumns]
+        }
+         else if (e.target.value == 'clientId') {
+          this.columns = [...client, ...regionColumns]
+        }
+         else if (e.target.value == 'businessInterestTags') {
+          this.columns = [...businessInterestTags, ...regionColumns]
+        }
       this.ipagination.current = 1
       this.getDetailTableData()
     },
@@ -926,9 +995,11 @@ export default {
     },
 
     getRelativeData() {
-      this.spinning = true
+      
       let params = this.handlerParams()
       // params.dataType=this.tableValue
+      if(params.accountIds){
+      this.spinning = true
       getAction('/audienceReport/queryAllReportForm', params).then((res) => {
         console.log(res)
         this.spinning = false
@@ -961,10 +1032,14 @@ export default {
           this.initEchart('systemEchart', this.handlerSystemOption(this.systemData))
         }
       })
+      
+      }
     },
     getTableData() {
+      
+      let params = this.handlerParams() || {}
+      if(params.accountIds){
       this.materialloading = true
-      let params = this.handlerParams()
       params.audienceType = this.tableValue
       params.pageNo = this.ipagination.current
       params.pageSize = this.ipagination.pageSize
@@ -981,6 +1056,8 @@ export default {
           this.$message.error('出错了')
         }
       })
+      
+      }
     },
     search() {
       this.searchShow = false
@@ -990,13 +1067,23 @@ export default {
 
     handlerParams() {
       let params = {}
-      if (this.accountIds == '') {
+      if (this.accountIds.length <= 0) {
         this.$message.error('请选择账户')
         this.materialloading = false
         this.spinning = false
         return
       } else {
-        params.accountId = this.accountIds
+        params.accountIds ='';
+        this.accountIds.forEach((item,index)=>{
+          
+            if(index!=this.accountIds.length-1){
+              params.accountIds+=`${item},`
+            }else{
+              params.accountIds+=`${item}`
+            }
+          
+
+        })
       }
 
       if (this.dateRange[0] && this.dateRange.length == 2) {
@@ -1032,7 +1119,7 @@ export default {
   },
   watch: {
     accountIds: function (n, o) {
-      if (n != '' && this.searchShow) {
+      if (n.length > 0 && this.searchShow) {
         this.search()
       }
     },
@@ -1138,6 +1225,7 @@ export default {
       }
     },
   },
+  
 }
 </script>
 
@@ -1168,6 +1256,7 @@ export default {
   }
   .topOptions {
     padding: 15px 10px;
+    position: relative;
     .topOpt {
       width: 100%;
       margin-bottom: 10px;

+ 2 - 0
src/views/modules/material/videoMaterial.vue

@@ -2683,6 +2683,7 @@ export default {
                 this.visible = false
                 this.add = true
                 this.loading = false
+                this.loadingElse = false
                 for (const key in this.role) {
                   if (key == 'roleCode') {
                     this.role[key] = this.role[key].substr(0, this.role[key].length - 2)
@@ -2691,6 +2692,7 @@ export default {
               } else {
                 this.$message.error(res.message)
                 this.loading = false
+                this.loadingElse = false
               }
             })
           }

+ 1 - 0
src/views/user/Login.vue

@@ -232,6 +232,7 @@
           url = 'http://localhost:3000'
         } else if (process.env.NODE_ENV === 'production') {
           url = 'http://adsp.c-top.com.cn'
+          
         }
         console.log(url)
         window.WwLogin({

+ 2 - 0
vue.config.js

@@ -77,12 +77,14 @@ module.exports = {
         // target: 'http://192.168.1.43:8087', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.0.252:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.219:8080', //请求本地 需要jeecg-boot后台项目  赵西安
+        // target: 'http://192.168.1.193:8080', //请求本地 需要jeecg-boot后台项目  李煜一
          target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // target: 'http://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目
         //  target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目
         // target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目
         // target:'http://118.24.244.213:8804',
+        // target:'http://139.186.151.174:8804', //测试
 
 
         ws: false,