Merge branch 'master' of ssh://git.xingtongworld.com:10022/xioayue/btgym

# Conflicts:
#	src/views/ty/index.vue

src/views/ty/index.vue

@@ -58,15 +58,16 @@
 
         </div>
 
+        <!-- 0801 #0750 紧急预案 -->
         <div class="center">
           <div class="c_title">24小时进馆人数</div>
           <div class="c_l" id="animationA"></div>
           <div class="c_r">
-            <span class="c_r_num">{{ cgdata[0]&&cgdata[0].gval }}</span>
+            <span class="c_r_num">{{ cgdata[2]&&cgdata[2].gval }}</span>
             <span class="c_r_txt">体育场</span>
-            <span class="c_r_num">{{ cgdata[1]&&cgdata[1].gval }}</span>
+            <span class="c_r_num">{{ cgdata[0]&&cgdata[0].gval }}</span>
             <span class="c_r_txt">体育馆</span>
-            <span class="c_r_num">{{ cgdata[2]&&cgdata[2].gval }}</span>
+            <span class="c_r_num">{{ cgdata[1]&&cgdata[1].gval }}</span>
             <span class="c_r_txt">游泳场馆</span>
           </div>
 
@@ -692,8 +693,8 @@ export default {
           myChart.clear();
           option && myChart.setOption(option);
           run(myChart);
-        }, 3000);
+        }, 2000);
-      }, 2000)
+      }, 600)
     },
     ty_pieDo(){
       let that = this;
@@ -890,8 +891,9 @@ export default {
             idArr += "|"+item.groupId;
           }
         })
+
+        // alert(idArr)
         // that.groupsData = [];
-      });
 
         // 场馆人次占比
         homeApi.homeBarData({groupsId:idArr}).then(res=>{
@@ -917,6 +919,10 @@ export default {
             that.cgv_3 = that.groupsData[2].noRepeatInNum;
             that.cgp_3 = that.groupsData[2]?that.groupsData[2].proportion:'';
         });
+
+      });
+      
+
     },
 
     // 总计 体育场馆的总数
@@ -931,7 +937,6 @@ export default {
             groups += "|"+item.groupId;
           }
         })
-      });
 
         homeApi.allGroupNum({granularity:"daily",groupsId:groups}).then(res=>{
           const rtdata = res.data.returnData
@@ -942,6 +947,10 @@ export default {
           //
       });
 
+      });
+
+
+    
     },
 
     // 折线趋势图