From f03605da8514c822fc98f2a98a0242d2cc1a311a Mon Sep 17 00:00:00 2001
From: "453530270@qq.com" <aa123456>
Date: Fri, 28 Jul 2023 16:06:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=91=BD=E5=90=8D=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/home.js        |  6 ++---
 src/views/HomeView.vue | 21 ++--------------
 src/views/TycView.vue  | 54 +++++++++++++++++++++++++++++++-----------
 3 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/src/api/home.js b/src/api/home.js
index 05fa27a..46f20c2 100644
--- a/src/api/home.js
+++ b/src/api/home.js
@@ -24,7 +24,7 @@ export function homeBarData(param) {
 		param,
 	})
 }
-
+// ge
 export function allGroupNum(param) {
     return request({
 		url: '/pass.passcc/allGroupNum',
@@ -41,10 +41,10 @@ export function allInfoDatas(param) {
 	})
 }
 // 今日各场馆的趋势
-export function allGcgNumDatas(param) {
+export function tdGroupRealTimeEnter(param) {
     return request({
 		url: '/pass.passcc/toDayGroupsEnterNum',
-		method: 'post',
+		method: 'get',
 		param,
 	})
 }
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index b94318c..cae8b2b 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -673,28 +673,11 @@ export default {
     // 获取实时数据
     getInfoDatas() {
       // interface
-      homeApi.allGcgNumDatas().then(res=>{
+      homeApi.tdGroupRealTimeEnter().then(res=>{
         this.ssjgNumDatas = res.data.returnData
       })
     },
 
-    // 待删除
-    TPgetsckdata_tcp(){
-      // websocket 
-      const param ={
-        type:'realTimeData',
-      }
-      const ws = new WebSocket("ws://10.97.121.2/ws");
-      ws.onopen = function() {
-        ws.send(JSON.stringify(param))
-      };
-      ws.onmessage = (e)=>{
-        var jstr = JSON.parse(e.data)
-        const darr = jstr.data;
-        this.ssjgNumDatas = darr.data
-      };
-    },
-
     // udp
     getsckdata(){
       // websocket 
@@ -712,7 +695,7 @@ export default {
 
     // 各个场馆的人流
     getGcgNumDatas() {
-      homeApi.allGcgNumDatas().then(res => {
+      homeApi.tdGroupRealTimeEnter().then(res => {
         // get allTimeData
         const tmpdata = res.data.data
         // X 轴的名称字段
diff --git a/src/views/TycView.vue b/src/views/TycView.vue
index 3b279a8..bab4d17 100644
--- a/src/views/TycView.vue
+++ b/src/views/TycView.vue
@@ -13,17 +13,17 @@
 
         <div class="jgitem">
           <div class="jgimg"><img src="../assets/img/icon01.png" /></div>
-          <span class="jgival">{{ tdnum }}</span>
+          <span class="jgival" id="tdjg">{{ tdnum }}</span>
           <span class="jgdesc">今日进馆人数</span>
         </div>
         <div class="jgitem">
           <div class="jgimg"><img src="../assets/img/icon02.png" /></div>
-          <span class="jgival">{{ tmdata }}</span>
+          <span class="jgival" id="tmjg">{{ tmdata }}</span>
           <span class="jgdesc">本月进馆人数</span>
         </div>
         <div class="jgitem">
           <div class="jgimg"><img src="../assets/img/icon03.png" /></div>
-          <span class="jgival">{{ tydata }}</span>
+          <span class="jgival" id="tyjg">{{ tydata }}</span>
           <span class="jgdesc">本年进馆人数</span>
         </div>
       </div>
@@ -272,7 +272,7 @@
 <script>
 import * as echarts from 'echarts';
 import * as btApi from '../api/home'
-import { ecMaxVal } from '@/utils/comm';
+import { ecMaxVal,numGrow } from '@/utils/comm';
 
 export default {
   name: 'TycView',
@@ -288,16 +288,20 @@ export default {
       tmdata:0,
       // year
       tydata:0,
+
+      //折线区域的数据
+      zxliddata:[],
+      // 折线名称
+      zxlindata:[],
     }
   },
   mounted() {
     // 统计概况信息
     this.csstat()
-
-    // 进馆人数统计
-    // -- this.cgsf_line()--
     // 各场馆人数趋势
     this.cg_line()
+    //
+    this.getTdcg()
   },
   methods: {
     // 110,210,310 
@@ -310,6 +314,8 @@ export default {
         // 场馆人次占比
         const tgdata = cgdata.groupsData
         this.cgdata = tgdata
+        // today in
+        const tdjg=0;
         tgdata.forEach(item=>{
           this.tdnum += item.noRepeatInNum
         });
@@ -356,7 +362,8 @@ export default {
           tgdata.forEach(item=>{
             this.tydata += item.noRepeatInNum
           });
-      });      
+      });    
+      // 2  
     },
     // 24H 进馆人数
     cgsf_line() {
@@ -496,6 +503,29 @@ export default {
         option && myChart.setOption(option);
      },4000);
     },
+
+    // 获取各场馆的趋势
+    getTdcg(){
+      let guids = "110|210|310"
+      btApi.tdGroupRealTimeEnter({groupsId:guids}).then(res=>{
+        const tmpdata = res.data.data
+        // X 轴的名称字段
+        const xarr =new Array
+        const darr =new Array;
+        tmpdata.forEach(function(item,idx){
+          // 读取list
+          const list = item.list
+          xarr.push(list.dkeys)
+          darr.push(list.dval)
+        })
+        //
+        this.zxlindata = xarr[0]
+        this.zxliddata = darr
+        // bind
+        this.cg_line()
+      })
+    },
+
     // 场馆人流趋势
     cg_line() {
       var chartDom = document.getElementById("gc_charts");
@@ -504,12 +534,8 @@ export default {
       var option
       var xData = ['09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00',];
       var color = ['#FF99CC', '#6666FF', '#FF6600', '#7049f0', '#fa704d', '#01babc',]
-      var name = ['体育场', '体育馆', '游泳场馆']
-      var data = [
-        [137, 34, 135, 161, 74, 152, 110, 100, 150],
-        [174, 137, 135, 34, 152, 135, 140, 160, 100],
-        [134, 74, 137, 135, 161, 137, 300, 220, 250],
-      ]
+      var name = this.zxlindata
+      var data = this.zxliddata
 
       var series = [];
       for (var i = 0; i < 6; i++) {