From a9657a9b188b6b3318e1737a3619e6712e4e62aa Mon Sep 17 00:00:00 2001
From: luyisha <luyisha@xingtongworld.com>
Date: Fri, 11 Aug 2023 11:45:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BD=93=E8=82=B2=E5=AF=B9=E6=8E=A5?=
 =?UTF-8?q?=E5=AE=9E=E6=97=B6=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/HomeView.vue | 11 ++++--
 src/views/TycView.vue  | 87 +++++++++++++++++++++++++++++++++++++++---
 2 files changed, 88 insertions(+), 10 deletions(-)

diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index a2bd82c..838b570 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -142,7 +142,7 @@ import { numGrow,ecMaxVal,numberGrow} from '@/utils/comm';
 
 // 引入api
 import * as homeApi from '@/api/home'
-
+let ws = null;
 export default {
   name: 'HomeView',
   data() {
@@ -700,12 +700,12 @@ export default {
     getsckdata(){
       let that = this;
       // websocket 
-      const ws = new WebSocket(publicConfig.WS_URL_ZL);
+      ws = new WebSocket(publicConfig.WS_URL_ZL);
       ws.onopen = function() {
-        console.log("ws connected success!")
+        // console.log("ws connected success!")
       };
       ws.onclose = function(event) {
-        console.log('WebSocket连接已关闭');
+        // console.log('WebSocket连接已关闭');
       };
       ws.onmessage = (e)=> {
         var jstr = JSON.parse(e.data);
@@ -822,6 +822,9 @@ export default {
       });
     }
 
+  },
+  beforeUnmount(){
+    ws.close();
   }
 
 }
diff --git a/src/views/TycView.vue b/src/views/TycView.vue
index 1d3436d..1d927a0 100644
--- a/src/views/TycView.vue
+++ b/src/views/TycView.vue
@@ -402,6 +402,7 @@ import * as echarts from 'echarts';
 import * as btApi from '../api/home'
 import { ecMaxVal,numGrow } from '@/utils/comm';
 
+let ws = null;
 export default {
   name: 'TycView',
   data() {
@@ -431,6 +432,8 @@ export default {
     this.cg_line()
     //
     this.getTdcg()
+
+    this.getsckdata()
   },
   methods: {
     // 110,210,310 
@@ -495,7 +498,7 @@ export default {
       });    
       // 2  
     },
-    // 24H 进馆人数
+    // 24H 服务人次绘制柱形图
     cgsf_line() {
       var chartDom = document.getElementById('gcins_charts');
       var myChart = echarts.init(chartDom);
@@ -625,19 +628,19 @@ export default {
         ]
       }
 
-      option && myChart.setOption(option);
+      // option && myChart.setOption(option);
       //消停几秒后开始，动画
     
-     setInterval(()=>{
+    //  setInterval(()=>{
         myChart.clear()
         option && myChart.setOption(option);
-     },4000);
+    //  },4000);
     },
 
     // 获取各场馆的趋势
     getTdcg(){
       let guids = "110|210|310"
-      btApi.tdGroupRealTimeEnter({groupsId:guids}).then(res=>{
+      btApi.tdGroupRealTimeEnter({type:1}).then(res=>{
         console.log(res)
         const tmpdata = res.data.data
         // X 轴的名称字段
@@ -658,7 +661,7 @@ export default {
       })
     },
 
-    // 场馆人流趋势
+    // 场馆人流趋势绘制线图
     cg_line() {
       var chartDom = document.getElementById("gc_charts");
       var myChart = echarts.init(chartDom);
@@ -817,9 +820,81 @@ export default {
         series: series,
       }
 
+      myChart.clear()
       option && myChart.setOption(option);
     },
 
+    getsckdata(){
+      let that = this;
+      // websocket 
+      ws = new WebSocket(publicConfig.WS_URL_TY);
+      ws.onopen = function() {
+        // console.log("ws connected success!")
+      };
+      ws.onclose = function(event) {
+        // console.log('WebSocket连接已关闭');
+      };
+      ws.onmessage = (e)=> {
+        var jstr = JSON.parse(e.data);
+        if(!jstr){
+          return;
+        }
+
+        // 24 小时柱形图数据
+        const vkdata = new Array;
+        vkdata.push({
+          xname: jstr.getPassHoursData.data.dkeys.slice(-8, jstr.getPassHoursData.data.dkeys.length),
+          xval:  jstr.getPassHoursData.data.dvalue.slice(-8, jstr.getPassHoursData.data.dvalue.length)
+        })
+        that.ecbardata = vkdata;
+        that.cgsf_line();
+        // 线图数据
+        function linedata(){
+          that.zxliddata=[];
+          that.rsqsDataName=[],that.rsqsDatas=[];
+          const tmpdata = jstr.toDayGroupsEnterNum.data;
+          tmpdata.forEach((item) => {
+            that.rsqsDataName.push(item.groupName);
+            that.rsqsDatas.push(item.list)
+          })
+          
+          that.zxlindata = jstr.toDayGroupsEnterNum.data[0].list.dkeys;
+          that.rsqsDatas.forEach((item) => {
+            let rsqsData = []
+            Object.getOwnPropertyNames(item).forEach((value) => {
+              if(value=='dvalue'){
+                rsqsData = item[value];
+              }
+            });
+            that.zxliddata.push(rsqsData)
+          })
+          that.cg_line()
+        }
+        linedata();
+        // 占比、顶部数据
+        function proportion(){
+          // 场馆人次占比
+          const tgdata = jstr.allGroupTimeNum.data.data.groupsData
+          that.cgdata = tgdata
+          // today in
+          // tgdata.forEach(item=>{
+          //   that.tdnum += item.noRepeatInNum
+          // });
+        }
+        proportion();
+        // 服务人数数据
+        const rtdata = jstr.allGroupNum.data
+        that.tdnum = rtdata.day.noRepeatInNum
+        that.wdnum = rtdata.week.noRepeatInNum
+        that.tmdata = rtdata.month.noRepeatInNum
+        that.tydata = rtdata.year.noRepeatInNum
+      }
+    }
+
   },
+  beforeUnmount(){
+    // console.log('体育关闭链接');
+    ws.close();
+  }
 }
 </script>
\ No newline at end of file

From eb64b9086cd886e42d9d7353bf6d76fcc6c54e25 Mon Sep 17 00:00:00 2001
From: luyisha <luyisha@xingtongworld.com>
Date: Fri, 11 Aug 2023 14:21:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=80=BB=E8=A7=88=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/yyg_icon.png   | Bin 794 -> 1646 bytes
 src/assets/img/yyg_icon_2.png | Bin 0 -> 794 bytes
 src/views/HomeView.vue        |  34 +++++++++++++++++++++++-----------
 3 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 src/assets/img/yyg_icon_2.png

diff --git a/src/assets/img/yyg_icon.png b/src/assets/img/yyg_icon.png
index 87f28c7a8f8f619fae59e0734de8dc914c0a2678..25af7990dbb101e047d1497749ec25d3279d2727 100644
GIT binary patch
delta 1640
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

literal 794
zcmeAS@N?(olHy`uVBq!ia0vp^dLYcf3?viMZ?gia`2jv5u0Z-fg&>XLKLo+efs0Vg
zn3_~k1azWFNswPKgRh61rk=E%nlhiGBCDYehX{|2iO~0F+sq|cGSi~Pxvn4SEf28M
z{P6zV9615D6<)@Ae6Lr1+Q`7b_|4PBF~s9|@6?w`s|*BMPr5ZIoltueHhtCI_qnsb
z*KbSmP*HLI`sdIYahsWEc;>A>!5=YcL&NiXzCTsn!Y5Ah|Cg{_MA>^r??3kjL6u!C
z4_-J%XJnlCJ7b!QzDq-<=pr{A{#~-I&h4@?*7=G8avoNVpBw~Fu2I#S{Gj@~=A@FR
zcQt2D&e7qL+W%A~ZR*EQOZap8^LI~wUbU}ki{J8h+Z{W;SVmrT%KUaMKSB3g$V!!`
zU-Rsq9SW$u^qTuhR+e?mozBLz|7S~D#QyFSpEmFOuN4R0+HtzC-?bxf^~1IQ_i%(u
zi|WYK=rX(w-Jql)Q8km>L%z99Tj26}(~kK*bG|+Or0J0BW0P69E>Hg0_3Pcb%RZHr
z@}G71bAxrWm`|!@Q0xAtA3O8?)uML={$N~`z4%1ZP0xt6HI6?V#eJtw_Ff(SxO4tq
zY1a#UD}v+}UcPDjX0l-<muY{;@+})**4Hww=1Ka=F#T-J>n-fAX`knowdKD&^6ELK
z+?H=;Tf-%7_V9bLK0Q|RB#m3{`s%aWH%^G{_;PQf$iv3_e?AGPFWw?^d#ddnOCNm$
zqvGXn4>MQKR7$<`v~b6k48N2HtNEOFay_&Un@lyxFup$D=*|+w=Y_X4#B2{twm-rl
zu<Txk8e`$ZmEYUNR1I%jim%!}MW5+Zgw&6T(!W{tWn!0I=M8)fOhF8uu6{1-oD!M<
D)YXg4

diff --git a/src/assets/img/yyg_icon_2.png b/src/assets/img/yyg_icon_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..87f28c7a8f8f619fae59e0734de8dc914c0a2678
GIT binary patch
literal 794
zcmeAS@N?(olHy`uVBq!ia0vp^dLYcf3?viMZ?gia`2jv5u0Z-fg&>XLKLo+efs0Vg
zn3_~k1azWFNswPKgRh61rk=E%nlhiGBCDYehX{|2iO~0F+sq|cGSi~Pxvn4SEf28M
z{P6zV9615D6<)@Ae6Lr1+Q`7b_|4PBF~s9|@6?w`s|*BMPr5ZIoltueHhtCI_qnsb
z*KbSmP*HLI`sdIYahsWEc;>A>!5=YcL&NiXzCTsn!Y5Ah|Cg{_MA>^r??3kjL6u!C
z4_-J%XJnlCJ7b!QzDq-<=pr{A{#~-I&h4@?*7=G8avoNVpBw~Fu2I#S{Gj@~=A@FR
zcQt2D&e7qL+W%A~ZR*EQOZap8^LI~wUbU}ki{J8h+Z{W;SVmrT%KUaMKSB3g$V!!`
zU-Rsq9SW$u^qTuhR+e?mozBLz|7S~D#QyFSpEmFOuN4R0+HtzC-?bxf^~1IQ_i%(u
zi|WYK=rX(w-Jql)Q8km>L%z99Tj26}(~kK*bG|+Or0J0BW0P69E>Hg0_3Pcb%RZHr
z@}G71bAxrWm`|!@Q0xAtA3O8?)uML={$N~`z4%1ZP0xt6HI6?V#eJtw_Ff(SxO4tq
zY1a#UD}v+}UcPDjX0l-<muY{;@+})**4Hww=1Ka=F#T-J>n-fAX`knowdKD&^6ELK
z+?H=;Tf-%7_V9bLK0Q|RB#m3{`s%aWH%^G{_;PQf$iv3_e?AGPFWw?^d#ddnOCNm$
zqvGXn4>MQKR7$<`v~b6k48N2HtNEOFay_&Un@lyxFup$D=*|+w=Y_X4#B2{twm-rl
zu<Txk8e`$ZmEYUNR1I%jim%!}MW5+Zgw&6T(!W{tWn!0I=M8)fOhF8uu6{1-oD!M<
D)YXg4

literal 0
HcmV?d00001

diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 838b570..1377202 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -442,7 +442,7 @@ export default {
             }
           },
           {
-            data: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+            data: [1, 1, 1, 1, 1, 1, 1, 1],
             type: 'pictorialBar',
             barMaxWidth: '15',
             symbol: 'circle',
@@ -489,7 +489,8 @@ export default {
 
       option = {
 
-        color: ["#F2A0CE", "#0780e2", "#FF6504", "#01FE00", "#00FFFF", "#fdff00"],
+        // color: ["#F2A0CE", "#0780e2", "#FF6504", "#01FE00", "#00FFFF", "#fdff00"],
+        color: ['#ff9acc', '#6666ff', '#a9eeff', '#02ff00','#00ffff', '#fdff00'],
 
         series: [
           {
@@ -846,7 +847,9 @@ export default {
   color: #fff;
   left: 0;
   top: 0;
-  background-color: #080A25;
+  /* background-color: #080A25; */
+  background-color: #032461;
+  box-shadow: 0px 3px 4px 0px rgba(255, 255, 255, 0.1);
   margin-bottom: 30rpx;
 }
 
@@ -945,6 +948,13 @@ export default {
   width: 20%;
   height: 3.2rem;
   float: left;
+  width: 5rem;
+  height: 4rem;
+}
+.numbox .numicon img{
+  width: 100%;
+  height: 100%;
+  margin-top: 0.7rem;
 }
 
 .numbox .numdiv {
@@ -993,11 +1003,11 @@ export default {
 .klqs .klqs_bg {
   float: left;
   /* width: 80%; */
-  margin-left: 4rem;
+  margin-left: 5rem;
   /* padding-left: 6.4rem; */
   line-height: 2.8rem;
   font-size: 1.1rem;
-  color: gray;
+  color: #999;
 }
 
 .klqs .klbtn {
@@ -1120,10 +1130,10 @@ export default {
   background-size: 100% 100%;
   background-position: -1.04rem 0.2rem;
   height: 3.2rem;
-  line-height: 0rem;
-  padding-left: 4.6rem;
+  line-height: 3.5rem;
+  padding-left: 5rem;
   font-size: 1.1rem;
-  color: gray;
+  color: #999;
   padding-bottom: 1rem;
 }
 
@@ -1142,9 +1152,9 @@ export default {
   height: 3.8rem;
   line-height: 2.8rem;
   background-position: -1.04rem 0.2rem;
-  padding-left: 4.6rem;
+  padding-left: 5.5rem;
   font-size: 1.1rem;
-  color: gray;
+  color: #999;
 }
 
 .pcgrs .pcg_item {
@@ -1170,6 +1180,7 @@ export default {
   margin-top: 1.6rem;
   margin-right: 1.1rem;
   /* padding-right: 0.9rem; */
+  color: #3E96F7;
 }
 
 .pcgrs .pcg_item .pcval {
@@ -1225,7 +1236,8 @@ export default {
   font-size: 0.2rem;
 }
 .pcgrs .pcg_item .rbrate0 {
-  width: 32%;
+  /* width: 32%; */
+  width: 3.4rem;
   height: 3.4rem;
   line-height: 3.4rem;
   display: block;