- {{todayNum}}
- 今日进馆人数
+
+
- {{monthNum}}
- 本月进馆人数
+
- {{ yearNum }}
- 本年进馆人数
+ diff --git a/bak/public/config.js b/bak/public/config.js index 034da03..895d130 100644 --- a/bak/public/config.js +++ b/bak/public/config.js @@ -1,6 +1,7 @@ window.publicConfig = { // 必填: api地址, 换成自己的域名即可 // BASE_API: '../index.php?s=/store' - BASE_API: 'http://btgym.xingtongworld.com/' + // BASE_API: 'http://btgym.xingtongworld.com/' + BASE_API: 'http://192.168.66.16/' } \ No newline at end of file diff --git a/bak/src/utils/request.js b/bak/src/utils/request.js index 5d4ec23..91b5e0f 100644 --- a/bak/src/utils/request.js +++ b/bak/src/utils/request.js @@ -8,7 +8,7 @@ const service = axios.create({ //baseURL: publicConfig.BASE_API, //baseURL:ahost, timeout: 60000, // 请求超时时间毫秒 - withCredentials: true, // 异步请求携带cookie + withCredentials: false, // 异步请求携带cookie headers: { // 设置后端需要的传参类型 'Content-Type': 'application/json', diff --git a/public/config.js b/public/config.js index 48ec1e8..ae464fa 100644 --- a/public/config.js +++ b/public/config.js @@ -1,4 +1,4 @@ window.publicConfig={ - // BASE_API:"http://192.168.66.16/api", - BASE_API:"http://10.97.121.2/api", + BASE_API:"http://192.168.66.16/api", + // BASE_API:"http://10.97.121.2/api", } diff --git a/src/App.vue b/src/App.vue index 7333ad7..d61d9cd 100644 --- a/src/App.vue +++ b/src/App.vue @@ -58,7 +58,8 @@ export default { }, mounted() { this.getTimespan(); - this.getStat() + this.getStat(); + this.getWS() }, methods: { // @@ -90,6 +91,27 @@ export default { }); }, + getWS(){ + // 假设服务端ip为127.0.0.1 + let ws = new WebSocket("ws://192.168.66.16:2000"); + ws.onopen = function() { + alert("连接成功"); + let aa = { + type: 'allGroupTimeNum', + request: { + granularity: 'daily', + groupsId: '' + } + }; + ws.send(JSON.stringify(aa)); + alert("给服务端发送一个字符串:tom"); + }; + ws.onmessage = function(e) { + console.log(JSON.parse(e.data)); + alert("收到服务端的消息:" + e.data); + }; + console.log(11111) + } }, }; @@ -105,21 +127,23 @@ body { } #app { - height: 100vh; + // height: 100vh; + height: 13.5rem; } // 基类 .btgym { - width: 100vw; + // width: 100vw; // height: 100%; position: relative; - background-size: 100%; - background-repeat: no-repeat; + // background-size: 100%; + // background-repeat: no-repeat; // 顶部信息 .topnav { width: 100%; - height: 14vh; + height: 14vh; + height: 2.79rem; background-image: url("assets/index/topnav.png"); background-size: 100% 100%; background-repeat: no-repeat; @@ -131,9 +155,9 @@ body { justify-content: space-between; .topImg { - margin-top: 0.6%; - width: 24%; - height: 3vh; + margin-top: 0.33rem; + width: 11.83rem; + height: 0.52rem; margin-left: auto; margin-right: auto; } @@ -151,7 +175,7 @@ body { width: 24%; height: 36%; // border: 1px solid red; - margin: 16px auto; + margin: 0.6rem auto 10px; display: flex; justify-content: space-between; font-weight: bold; @@ -161,8 +185,8 @@ body { a { text-decoration: none; display: block; - width: 33.33%; - height: 86%; + width: 2.19rem; + height: 0.76rem; background-size: 100% 100%; background-repeat: no-repeat; color: #00bdf9; diff --git a/src/assets/g_footbg.png b/src/assets/g_footbg.png index e402cda..cc2ea5e 100644 Binary files a/src/assets/g_footbg.png and b/src/assets/g_footbg.png differ diff --git a/src/assets/index/bg.png b/src/assets/index/bg.png new file mode 100644 index 0000000..4f4c020 Binary files /dev/null and b/src/assets/index/bg.png differ diff --git a/src/assets/index/left_t3_bg.png b/src/assets/index/left_t3_bg.png index 65a4e69..7c7e031 100644 Binary files a/src/assets/index/left_t3_bg.png and b/src/assets/index/left_t3_bg.png differ diff --git a/src/assets/index/mid_bg.png b/src/assets/index/mid_bg.png index 4e8e35e..a5dfc7b 100644 Binary files a/src/assets/index/mid_bg.png and b/src/assets/index/mid_bg.png differ diff --git a/src/assets/index/right_t1_bg.png b/src/assets/index/right_t1_bg.png index b1b1f20..8210fd4 100644 Binary files a/src/assets/index/right_t1_bg.png and b/src/assets/index/right_t1_bg.png differ diff --git a/src/assets/index/top_title.png b/src/assets/index/top_title.png index 2b78ae1..c459b97 100644 Binary files a/src/assets/index/top_title.png and b/src/assets/index/top_title.png differ diff --git a/src/assets/index/topnav.png b/src/assets/index/topnav.png index 3384126..58b9515 100644 Binary files a/src/assets/index/topnav.png and b/src/assets/index/topnav.png differ diff --git a/src/assets/ty/active.png b/src/assets/ty/active.png new file mode 100644 index 0000000..b43192b Binary files /dev/null and b/src/assets/ty/active.png differ diff --git a/src/assets/ty/bg.png b/src/assets/ty/bg.png new file mode 100644 index 0000000..4f4c020 Binary files /dev/null and b/src/assets/ty/bg.png differ diff --git a/src/assets/ty/c_bg_l.png b/src/assets/ty/c_bg_l.png new file mode 100644 index 0000000..2c34723 Binary files /dev/null and b/src/assets/ty/c_bg_l.png differ diff --git a/src/assets/ty/c_bg_r.png b/src/assets/ty/c_bg_r.png new file mode 100644 index 0000000..50b77c0 Binary files /dev/null and b/src/assets/ty/c_bg_r.png differ diff --git a/src/assets/ty/c_bg_t.png b/src/assets/ty/c_bg_t.png new file mode 100644 index 0000000..af6c0a5 Binary files /dev/null and b/src/assets/ty/c_bg_t.png differ diff --git a/src/assets/ty/ins_count.png b/src/assets/ty/ins_count.png new file mode 100644 index 0000000..5944d13 Binary files /dev/null and b/src/assets/ty/ins_count.png differ diff --git a/src/assets/ty/ins_title_bg.png b/src/assets/ty/ins_title_bg.png index e4eb1c0..70f719d 100644 Binary files a/src/assets/ty/ins_title_bg.png and b/src/assets/ty/ins_title_bg.png differ diff --git a/src/assets/ty/l_t_bg.png b/src/assets/ty/l_t_bg.png new file mode 100644 index 0000000..e39c0c6 Binary files /dev/null and b/src/assets/ty/l_t_bg.png differ diff --git a/src/assets/ty/no_active.png b/src/assets/ty/no_active.png new file mode 100644 index 0000000..91d864f Binary files /dev/null and b/src/assets/ty/no_active.png differ diff --git a/src/assets/ty/r_t_bg_1.png b/src/assets/ty/r_t_bg_1.png new file mode 100644 index 0000000..33248a7 Binary files /dev/null and b/src/assets/ty/r_t_bg_1.png differ diff --git a/src/assets/ty/r_t_bg_2.png b/src/assets/ty/r_t_bg_2.png new file mode 100644 index 0000000..e08d859 Binary files /dev/null and b/src/assets/ty/r_t_bg_2.png differ diff --git a/src/assets/ty/ty_pcb_item_bg.png b/src/assets/ty/ty_pcb_item_bg.png new file mode 100644 index 0000000..4913362 Binary files /dev/null and b/src/assets/ty/ty_pcb_item_bg.png differ diff --git a/src/assets/ty/vbig_bg.png b/src/assets/ty/vbig_bg.png index a6c7d99..5d908bd 100644 Binary files a/src/assets/ty/vbig_bg.png and b/src/assets/ty/vbig_bg.png differ diff --git a/src/assets/wh/center_bg.png b/src/assets/wh/center_bg.png index 7823791..b00e88b 100644 Binary files a/src/assets/wh/center_bg.png and b/src/assets/wh/center_bg.png differ diff --git a/src/assets/wh/ins_count.png b/src/assets/wh/ins_count.png index a977575..fc17f8b 100644 Binary files a/src/assets/wh/ins_count.png and b/src/assets/wh/ins_count.png differ diff --git a/src/assets/wh/l_t_bg.png b/src/assets/wh/l_t_bg.png new file mode 100644 index 0000000..e0f0d75 Binary files /dev/null and b/src/assets/wh/l_t_bg.png differ diff --git a/src/assets/wh/r_t_bg_1.png b/src/assets/wh/r_t_bg_1.png new file mode 100644 index 0000000..921244b Binary files /dev/null and b/src/assets/wh/r_t_bg_1.png differ diff --git a/src/assets/wh/r_t_bg_2.png b/src/assets/wh/r_t_bg_2.png new file mode 100644 index 0000000..d97a721 Binary files /dev/null and b/src/assets/wh/r_t_bg_2.png differ diff --git a/src/assets/wh/whbg.jpg b/src/assets/wh/whbg.jpg deleted file mode 100644 index 78ff60c..0000000 Binary files a/src/assets/wh/whbg.jpg and /dev/null differ diff --git a/src/assets/wh/whbg.png b/src/assets/wh/whbg.png new file mode 100644 index 0000000..4f4c020 Binary files /dev/null and b/src/assets/wh/whbg.png differ diff --git a/src/assets/wh/wht_bg.png b/src/assets/wh/wht_bg.png index ba9c10e..70e7c57 100644 Binary files a/src/assets/wh/wht_bg.png and b/src/assets/wh/wht_bg.png differ diff --git a/src/views/cultrue/index.vue b/src/views/cultrue/index.vue index 89d1a2e..d67d39b 100644 --- a/src/views/cultrue/index.vue +++ b/src/views/cultrue/index.vue @@ -9,7 +9,7 @@
@@ -40,14 +40,14 @@

- {{todayNum}}
- 今日进馆人数
+
+
- {{monthNum}}
- 本月进馆人数
+
- {{ yearNum }}
- 本年进馆人数
+