From 001c59d8deb7e6e8e5a6d602d81d664b46a8a2aa Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 9 May 2024 10:58:57 +0800
Subject: [PATCH] =?UTF-8?q?websocket=E6=94=B9=E5=AE=9A=E6=97=B6=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home.vue      | 55 +++++++++++++++++-----------------------
 pages/home/home_back.vue | 55 +++++++++++++++++++++++-----------------
 pages/login/login.vue    |  4 +--
 3 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 5b6a7b6..4c34437 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -27,63 +27,54 @@
 </template>
 
 <script>
-	import { sendWebsocket, closeWebsocket } from '@/utils/websocket.js'
+	import {getBillsCount} from '@/utils/getData2.js'
 	export default {
 		data() {
 			return {
 				intervalId: null,
+				interTime: this.$store.getters.setTime,
 				userName: this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).username : '',
 				menuList: []
 			};
 		},
-		onLoad() {
-			// setTimeout(() => {
-			// 	uni.showLoading({
-			// 		title: '加载中...'
-			// 	})
-			// }, 200)
+		created () {
 			this._getBillsCount()
+			this.intervalId = setInterval(() => {
+				this._getBillsCount()
+			}, this.interTime)
 		},
 		beforeDestroy () {
-			closeWebsocket(true)
-			clearTimeout(this.intervalId)
+			clearInterval(this.intervalId)
 			this.intervalId = null
 		},
 		destroyed () {
-			closeWebsocket(true)
-			clearTimeout(this.intervalId)
+			clearInterval(this.intervalId)
 			this.intervalId = null
 		},
 		methods: {
-			_getBillsCount () {
-				let getTimestamp = new Date().getTime()
-				let url = this.$store.getters.baseUrl
-				url = url.substring(7)
-				sendWebsocket('ws://' + url + '/webSocket/SendHomeInfo/' + getTimestamp, {}, this.wsMessage, this.wsErr)
-			},
-			wsMessage (res) {
-				console.log(res)
-				clearTimeout(this.intervalId)
-				// uni.hideLoading()
-				this.menuList = [...res]
-			},
-			wsErr () {
-				this.intervalId = setTimeout(() => {
-					this._getBillsCount()
-				}, 10000)
+			async _getBillsCount () {
+				let res = await getBillsCount()
+				if (res.code === 1) {
+					this.menuList = [...res.result]
+				} else {
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				}
 			},
 			toPage (e) {
 				let url = ''
 				url = '/pages/management/in-storage?id=' + e.djlx + '&name=' + e.name + '&type=' + e.ywlx
-				uni.navigateTo({
+				uni.redirectTo({
 					url: url
 				})
 			},
 			Quit () {
-				this.$store.dispatch('delUserInfo', '')
-				uni.redirectTo({
-					url: '/pages/login/login'
-				})
+			  this.$store.dispatch('delUserInfo', '')
+			  uni.redirectTo({
+			  	url: '/pages/login/login'
+			  })
 			}
 		}
 	}
diff --git a/pages/home/home_back.vue b/pages/home/home_back.vue
index 4c34437..5b6a7b6 100644
--- a/pages/home/home_back.vue
+++ b/pages/home/home_back.vue
@@ -27,54 +27,63 @@
 </template>
 
 <script>
-	import {getBillsCount} from '@/utils/getData2.js'
+	import { sendWebsocket, closeWebsocket } from '@/utils/websocket.js'
 	export default {
 		data() {
 			return {
 				intervalId: null,
-				interTime: this.$store.getters.setTime,
 				userName: this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).username : '',
 				menuList: []
 			};
 		},
-		created () {
+		onLoad() {
+			// setTimeout(() => {
+			// 	uni.showLoading({
+			// 		title: '加载中...'
+			// 	})
+			// }, 200)
 			this._getBillsCount()
-			this.intervalId = setInterval(() => {
-				this._getBillsCount()
-			}, this.interTime)
 		},
 		beforeDestroy () {
-			clearInterval(this.intervalId)
+			closeWebsocket(true)
+			clearTimeout(this.intervalId)
 			this.intervalId = null
 		},
 		destroyed () {
-			clearInterval(this.intervalId)
+			closeWebsocket(true)
+			clearTimeout(this.intervalId)
 			this.intervalId = null
 		},
 		methods: {
-			async _getBillsCount () {
-				let res = await getBillsCount()
-				if (res.code === 1) {
-					this.menuList = [...res.result]
-				} else {
-					uni.showToast({
-						title: res.desc,
-						icon: 'none'
-					})
-				}
+			_getBillsCount () {
+				let getTimestamp = new Date().getTime()
+				let url = this.$store.getters.baseUrl
+				url = url.substring(7)
+				sendWebsocket('ws://' + url + '/webSocket/SendHomeInfo/' + getTimestamp, {}, this.wsMessage, this.wsErr)
+			},
+			wsMessage (res) {
+				console.log(res)
+				clearTimeout(this.intervalId)
+				// uni.hideLoading()
+				this.menuList = [...res]
+			},
+			wsErr () {
+				this.intervalId = setTimeout(() => {
+					this._getBillsCount()
+				}, 10000)
 			},
 			toPage (e) {
 				let url = ''
 				url = '/pages/management/in-storage?id=' + e.djlx + '&name=' + e.name + '&type=' + e.ywlx
-				uni.redirectTo({
+				uni.navigateTo({
 					url: url
 				})
 			},
 			Quit () {
-			  this.$store.dispatch('delUserInfo', '')
-			  uni.redirectTo({
-			  	url: '/pages/login/login'
-			  })
+				this.$store.dispatch('delUserInfo', '')
+				uni.redirectTo({
+					url: '/pages/login/login'
+				})
 			}
 		}
 	}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 2b140a0..582a273 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -43,12 +43,12 @@
 									<input type="text" placeholder="域名地址" v-model.trim="baseUrl" class="inputStyle">
 								</view>
 							</view>
-							<!-- <view class="zd-row mgb20">
+							<view class="zd-row mgb20">
 								<view class="zd-col-7 login_label">刷新时间(s)</view>
 								<view class="zd-col-17">
 									<input type="number" placeholder="刷新时间" v-model.trim="setTime" class="inputStyle">
 								</view>
-							</view> -->
+							</view>
 						</view>
 						<view class="zd-row mgt20 mgb20">
 							<button class="primary-button" :disabled="disabled" @tap="toConfig">配&nbsp;&nbsp;置</button>