魏志佳 před 4 roky
rodič
revize
bd884716e5

+ 3 - 2
src/views/modules/Statistics/popularVideo.vue

@@ -672,11 +672,11 @@ export default {
     
         
         filterOption(input, option){
-            console.log(input, option)
+            // console.log(input, option)
             return (
                 option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
                 );
-            },
+        },
      
     
         // 快手头条的切换
@@ -786,6 +786,7 @@ export default {
             // }else{
             //     this.$message.error('请选择具体账户或者运营')
             // }
+            this.ipagination.current=1;
             this.getNewPlan()
             
         },

+ 23 - 4
src/views/modules/autoLaunch/autoReportIndex.vue

@@ -2,8 +2,9 @@
 <div class="autoLaunch">
     <div class="card-container">
         <a-tabs type="card" v-model="analaysisDirection" @change="analaysisDirectionChange" :animated='true'>
-            <a-tab-pane key="1" tab="素材+定向"></a-tab-pane>
-            <a-tab-pane key="2" tab="素材+出价"></a-tab-pane>
+            <a-tab-pane key="1" tab="素材+出价"></a-tab-pane>
+            <a-tab-pane key="2" tab="素材+定向"></a-tab-pane>
+            <a-tab-pane key="3" tab="时间+出价"></a-tab-pane>
             <!-- <a-tab-pane key="3" tab="">
             </a-tab-pane> -->
         </a-tabs>
@@ -27,6 +28,7 @@ export default {
         return {
             currentTabComponent:'materialAndOrient',
             analaysisDirection:'1',
+            currentStrategy:{}
         }
     },
     components:{   
@@ -36,6 +38,16 @@ export default {
     },
     methods: {
         analaysisDirectionChange(key){
+            // console.log(key)
+            // if(key=='1'){
+            //     this.currentTabComponent='materialAndOrient' 
+            // }else if(key=='2'){
+            //     this.currentTabComponent='materialAndBid' 
+            // }
+        }
+    },
+    watch:{
+        analaysisDirection(key,oldkey){
             console.log(key)
             if(key=='1'){
                 this.currentTabComponent='materialAndOrient' 
@@ -45,10 +57,17 @@ export default {
         }
     },
     mounted(){
-       this.currentTabComponent='materialAndOrient' 
+       this.currentTabComponent='materialAndOrient' ;
+       let currentStrategy=localStorage.getItem('currentStrategy');
+        if(currentStrategy){
+            this.currentStrategy=JSON.parse(currentStrategy);
+            this.analaysisDirection=this.currentStrategy.scenes;
+            // this.analaysisDirectionChange(this.currentStrategy.scenes)
+        }
     },
     beforeDestroy() {
-        this.currentTabComponent='materialAndOrient' 
+        this.currentTabComponent='materialAndOrient' ;
+        localStorage.setItem('currentStrategy','');
     },
    
 }

+ 1 - 0
src/views/modules/autoLaunch/strategyList.vue

@@ -611,6 +611,7 @@ export default {
             console.log(record)
             localStorage.setItem('currentStrategy',JSON.stringify(record))
             this.$router.push('/autoLaunch/autoLaunchReport')
+            // this.$router.push('/autoLaunch/autoReportIndex')
         },
         filterOption(input, option) {
             return (

+ 20 - 0
src/views/modules/earlyWarningRules/pushTreeSelect.vue

@@ -51,12 +51,32 @@ export default {
         return true
       },
     },
+    appId: {
+      default() {
+        return ''
+      },
+    },
   },
   components: { Treeselect },
   watch: {
     $route(n, o) {
       console.log(n, o)
     },
+    appId: {
+      handler(n, o) {
+        console.log(n)
+        if (n.length == 0) {
+          if (this.multiple) {
+            this.value = []
+          } else {
+            this.value = undefined
+          }
+        } else {
+          this.value = this.appId
+        }
+      },
+      deep: true,
+    },
   },
   methods: {
     ...mapGetters(['nickname', 'avatar', 'userInfo']),

+ 8 - 3
src/views/modules/earlyWarningRules/useRuleList.vue

@@ -72,7 +72,7 @@
       </div>
     </div>
     <!-- pushRuleVisible -->
-    <a-modal v-model="pushRuleVisible" title="推送账户选择" @ok="handleOk" :confirmLoading="confirmLoading" width="60%">
+    <a-modal v-model="pushRuleVisible" title="推送账户选择" @ok="handleOk" @cancel='cancelPush' :confirmLoading="confirmLoading" width="60%">
       <a-form layout="inline" class="rule-tree-select">
         <a-form-item
           label="请选择账户"
@@ -321,12 +321,12 @@ export default {
                 
               })
             } else {
-              this.accountId = ''
+              // this.accountId = ''
               this.$message.error(`此账户下已绑定模板${res.result.templateName},请重新选择账户`)
               this.confirmLoading = false
             }
           } else {
-            this.accountId = ''
+            // this.accountId = ''
             this.$message.error(res.message)
             this.confirmLoading = false
           }
@@ -336,6 +336,11 @@ export default {
       }
       
     },
+    cancelPush(){
+      
+      this.accountId=''
+      
+    },
     // recordsRule(record){
     //     console.log(record);
 

+ 1 - 0
vue.config.js

@@ -87,6 +87,7 @@ module.exports = {
         // target:'http://139.186.151.174:8804', //测试
 
 
+
         ws: false,
 
         changeOrigin: true,