Browse Source

'改盯盘'

魏志佳 4 years ago
parent
commit
4f4b605072

+ 7 - 6
src/views/modules/autoLaunch/configLaunchInfo.vue

@@ -2047,8 +2047,8 @@ export default {
                     let population=this.incluedSelectedKeys.map(item=>{
                     let population=this.incluedSelectedKeys.map(item=>{
                         return item.id
                         return item.id
                     })
                     })
-                    values.excludePopulation=excludePopulation.length>0?JSON.stringify(excludePopulation):undefined;
-                    values.population=population.length>0?JSON.stringify(population):undefined;
+                    values.excludePopulation=excludePopulation.length>0?JSON.stringify(excludePopulation):'[]';
+                    values.population=population.length>0?JSON.stringify(population):'[]';
                     
                     
                     
                     
                     values.useAppMarket=values.useAppMarket?'1':'0'
                     values.useAppMarket=values.useAppMarket?'1':'0'
@@ -2401,16 +2401,17 @@ export default {
                         this.checkedList=sceneId
                         this.checkedList=sceneId
                     }
                     }
                     
                     
-                    
-                    if(res.result.population&&res.result.excludePopulation){
+                    let population=res.result.population?JSON.parse(res.result.population):[]
+                    let excludePopulation=res.result.excludePopulation?JSON.parse(res.result.excludePopulation):[]
+                    if(population.length&&excludePopulation.length){
                         this.form.setFieldsValue({
                         this.form.setFieldsValue({
                             customCrowd:'3'
                             customCrowd:'3'
                         })
                         })
-                    }else if(res.result.population&&!res.result.excludePopulation){
+                    }else if(population.length&&!excludePopulation.length){
                         this.form.setFieldsValue({
                         this.form.setFieldsValue({
                             customCrowd:'1'
                             customCrowd:'1'
                         })
                         })
-                    }else if(!res.result.population&&!res.result.excludePopulation){
+                    }else if(!population.length&&!excludePopulation.length){
                         this.form.setFieldsValue({
                         this.form.setFieldsValue({
                             customCrowd:'0'
                             customCrowd:'0'
                         })
                         })

+ 9 - 2
src/views/modules/stockWatch/accountPage.vue

@@ -315,6 +315,7 @@
                         <div class="titleContext">
                         <div class="titleContext">
                             <span class="spot"> </span>
                             <span class="spot"> </span>
                             分版位数据
                             分版位数据
+                            <span class="titleTip" style="font-size:12px;margin-left:10px">数据与消耗存在一定误差</span>
                         </div>
                         </div>
                     </div>
                     </div>
                     <div class="eachrt">
                     <div class="eachrt">
@@ -331,6 +332,7 @@
                         <div class="titleContext">
                         <div class="titleContext">
                             <span class="spot"> </span>
                             <span class="spot"> </span>
                             分年龄数据
                             分年龄数据
+                            <!-- <span class="titleTip" style="font-size:12px;margin-left:10px">数据与消耗存在一定误差</span> -->
                         </div>
                         </div>
                     </div>
                     </div>
                     <div class="eachrt">
                     <div class="eachrt">
@@ -345,6 +347,7 @@
                         <div class="titleContext">
                         <div class="titleContext">
                             <span class="spot"> </span>
                             <span class="spot"> </span>
                             分性别数据
                             分性别数据
+                            <!-- <span class="titleTip" style="font-size:12px;margin-left:10px">数据与消耗存在一定误差</span> -->
                         </div>
                         </div>
                     </div>
                     </div>
                     <div class="eachrt">
                     <div class="eachrt">
@@ -883,8 +886,8 @@ const columns=[
             changeColumn(val){
             changeColumn(val){
                 if(this.AggregateByHourList.today && this.AggregateByHourList.yesterday){
                 if(this.AggregateByHourList.today && this.AggregateByHourList.yesterday){
                     val.forEach(item=>{
                     val.forEach(item=>{
-                        item.today=this.AggregateByHourList.today[item.dataIndex];
-                        item.yesterday=this.AggregateByHourList.yesterday[item.dataIndex]
+                        item.today=this.AggregateByHourList.today?this.AggregateByHourList.today[item.dataIndex]:0;
+                        item.yesterday=this.AggregateByHourList.yesterday?this.AggregateByHourList.yesterday[item.dataIndex]:0
                     })
                     })
                     this.columns=[...val];
                     this.columns=[...val];
                     let arr = JSON.stringify(this.columns)
                     let arr = JSON.stringify(this.columns)
@@ -931,6 +934,10 @@ const columns=[
                         if (columns.length >= columnsFixd.length) {
                         if (columns.length >= columnsFixd.length) {
                             
                             
                             columns = columns.slice(columnsFixd.length)
                             columns = columns.slice(columnsFixd.length)
+                            columns.forEach(item=>{
+                                item.today=0;
+                                item.yesterday=0;
+                            })
                             this.columns = [...columnsFixd, ...columns]
                             this.columns = [...columnsFixd, ...columns]