From 2adce788c1a411959b81f08d5569d92861c7f300 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 17 十月 2023 16:54:52 +0800
Subject: [PATCH] 删除无用代码 修改部分逻辑 调整部分样式
---
store/index.js | 70 ++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 26 deletions(-)
diff --git a/store/index.js b/store/index.js
index 8485ad9..bd9cb60 100644
--- a/store/index.js
+++ b/store/index.js
@@ -145,12 +145,13 @@
],
wsgVisiable: false, //纾呮埧蹇欑寮圭獥鎺у埗
wsgContent: '',
- globalIsFirstWeighing: 1 //鏄惁鏄涓�娆′笂纾�
+ globalIsFirstWeighing: 1, //鏄惁鏄涓�娆′笂纾�
+ confirmWeighVisiable: false, //纾呮埧绠＄悊纭绉伴噸瀹屾垚鎻愮ず寮圭獥
+ confirmWeighContent: '',
+ // 绉伴噸绋冲畾鎬� 0/绋冲畾 1/闈炵ǔ瀹� 闈炵ǔ瀹氭�佷笉鑳界偣绉伴噸
+ globalWarning: false,
},
mutations: {
- lengthchange(state, payload) {
- state.fleetDriverDataLength = payload
- },
setUserInfo(state, identity) {
state.userInfo = userObj[identity]
},
@@ -189,6 +190,9 @@
changeuserInfo(state, payload) {
state.globaluserInfo = payload
},
+ changesocketTask(state, payload) {
+ state.socketTask = payload
+ },
// 鏀圭増鍏ㄥ眬websocket鐘舵��
changeisconnect(state, payload) {
state.globalisconnect = payload
@@ -209,10 +213,14 @@
},
// 鏀瑰彉閲嶈繛娆℃暟
changereconnectNum(state, payload) {
- if (state.connectNum < 6) {
- state.connectNum += payload
+ if (payload.isWeigh) {
+ state.connectNum = payload.connectNum
} else {
- state.connectNum = payload
+ if (state.connectNum < 6) {
+ state.connectNum += payload.connectNum
+ } else {
+ state.connectNum = payload.connectNum
+ }
}
},
changeablePrintInduction(state, payload) {
@@ -229,12 +237,22 @@
},
changeglobalIsFirstWeighing(state, payload) {
state.globalIsFirstWeighing = payload
- }
+ },
+ changeconfirmWeighVisiable(state, payload) {
+ state.confirmWeighVisiable = payload
+ },
+ changeconfirmWeighContent(state, payload) {
+ state.confirmWeighContent = payload
+ },
+ // 鏀瑰彉绋冲畾鎬�
+ changeWarning(state, payload) {
+ state.globalWarning = payload
+ },
},
actions: {
websocketInit({ state, dispatch, commit }) {
let wsUrl = `${webSocketUrl}?access_token=${uni.getStorageSync('token')}`
- state.socketTast = uni.connectSocket({
+ state.socketTask = uni.connectSocket({
url: wsUrl,
header: { CLIENT_TOC: 'Y' },
success: res => {
@@ -252,17 +270,17 @@
commit('changeisconnect', false)
}
})
- state.socketTast.onOpen(() => dispatch('websocketOnOpen'))
- state.socketTast.onMessage(result => dispatch('websocketOnMessage', result.data))
- state.socketTast.onClose(e => dispatch('websocketOnClose', e))
- state.socketTast.onError(e => dispatch('websocketOnError', e))
+ state.socketTask.onOpen(() => dispatch('websocketOnOpen'))
+ state.socketTask.onMessage(result => dispatch('websocketOnMessage', result.data))
+ state.socketTask.onClose(e => dispatch('websocketOnClose', e))
+ state.socketTask.onError(e => dispatch('websocketOnError', e))
},
websocketOnOpen({ state, commit }) {
console.log('ws鎵撳紑')
clearInterval(state.reconnectTimeOut)
clearInterval(state.globalIntervalId)
state.globalIntervalId = setInterval(() => {
- state.socketTast.send({
+ state.socketTask.send({
data: JSON.stringify({ type: 'ping' }),
success(e) {
console.log(e, '鍙戦�佸績璺虫垚鍔�')
@@ -271,24 +289,24 @@
}, 30000)
},
websocketOnClose({ state, commit, dispatch }, e) {
- if (!state.socketTast) return
+ if (!state.socketTask) return
console.log('ws鍏抽棴', e)
- state.socketTast.close(e => {
+ state.socketTask.close(e => {
commit('changeisconnect', false)
})
clearInterval(state.globalIntervalId)
clearInterval(state.reconnectTimeOut)
- state.socketTast = null
+ state.socketTask = null
commit('changereconnectState', false)
- if (state.connectNum < 6 && state.globalisLogin) {
+ if ((state.connectNum < 6 || state.connectNum.connectNum < 6) && state.globalisLogin) {
uni.showToast({
- title: `杩炴帴澶辫触锛屾鍦ㄥ皾璇曠${state.connectNum}娆¤繛鎺,
+ title: '杩炴帴澶辫触锛屾鍦ㄥ皾璇曢噸鏂拌繛鎺�',
icon: 'none'
})
- commit('changereconnectNum', 1)
+ commit('changereconnectNum', { connectNum: 1, isWeigh: false })
dispatch('reconnect')
} else if (state.connectNum >= 6 && state.globalisLogin) {
- commit('changereconnectNum', 1)
+ commit('changereconnectNum', { connectNum: 1, isWeigh: false })
uni.showToast({
title: '缃戠粶寮傚父,璇风◢鍚庨噸璇�',
icon: 'none'
@@ -302,17 +320,17 @@
console.log('ws鎶ラ敊', e)
clearInterval(state.globalIntervalId)
clearInterval(state.reconnectTimeOut)
- state.socketTast = null
+ state.socketTask = null
commit('changereconnectState', false)
- if (state.connectNum < 6 && state.globalisLogin) {
+ if (state.connectNum < 6 || state.connectNum.connectNum < 6 && state.globalisLogin) {
uni.showToast({
- title: `杩炴帴澶辫触锛屾鍦ㄥ皾璇曠${state.connectNum}娆¤繛鎺,
+ title: '杩炴帴澶辫触锛屾鍦ㄥ皾璇曢噸鏂拌繛鎺�',
icon: 'none'
})
- commit('changereconnectNum', 1)
+ commit('changereconnectNum', { connectNum: 1, isWeigh: false })
dispatch('reconnect')
} else if (state.connectNum > 6 && state.globalisLogin) {
- commit('changereconnectNum', 1)
+ commit('changereconnectNum', { connectNum: 1, isWeigh: false })
uni.showToast({
title: '缃戠粶寮傚父,璇风◢鍚庨噸璇�',
icon: 'none'
--
Gitblit v1.9.1