From cdb09e07c477931c8d7f7139945e66fd5fc01cce Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期一, 27 五月 2024 09:02:40 +0800
Subject: [PATCH] feat:客户创建日计划
---
pages/tabbar-page/index-tabbar/index-tabbar.vue | 139 +++++++++++++++------------------------------
1 files changed, 47 insertions(+), 92 deletions(-)
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index 2d8d92b..1b0ee4f 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -115,7 +115,26 @@
});
}
},
+ onHide() {
+ console.log('椤甸潰闅愯棌')
+ },
+ onUnload() {
+ console.log('椤甸潰鍗歌浇');
+ this.$store.dispatch('websocketOnClose')
+ clearInterval(this.globalIntervalId);
+ this.changeisconnect(false)
+ },
+ onShow() {
+ this.count = this.count +1;
+ this.init();
+ this.messageReq();
+ },
onLoad() {
+ this.$store.dispatch('websocketInit')
+ this.$store.commit('changeisLogin', true)
+ console.log(this.globalisconnect, 'index鐨剋s鏁版嵁');
+ this.userAuthorization();
+ this.messageReq();
// 寮�鍚弻浜洪�氳瘽
wx.setEnable1v1Chat({
enable: true,
@@ -138,6 +157,7 @@
orderPlanDataStore: [],
indexHuoDaiOrderPlanData: [],
indexHistoryCoalData: [],
+ count:0,
indexdriverBillOfLoadingData: {},
messagePushShow: false,
messageList: {
@@ -152,18 +172,15 @@
watch: {
'$store.state.websocketData'(v) {
console.log(v, '鎺ュ彈鐨剋s鏁版嵁');
- if (v.startsWith('weigh')) {
+ if (v.startsWith('weigh')) { //閲嶉噺锛堢О閲嶇殑鏉′欢锛�
let nowWeighObj = JSON.parse(v.slice(7));
if (this.globalweighHouseCode && nowWeighObj.eqCode == this.globalweighHouseCode) {
- if (nowWeighObj.eqInfraredStatus) {
- this.changeinfraredStatus(true);
- this.changeWeigh(nowWeighObj.weigh);
- } else {
- this.changeinfraredStatus(false);
- this.changeWeigh(nowWeighObj.weigh);
- }
+ this.changeWeigh(nowWeighObj.weigh);
+ this.changeinfraredStatus(!!nowWeighObj.eqInfraredStatus);
+ let warningState = nowWeighObj.warning == 1
+ this.changeWarning(warningState)
}
- } else if (v.startsWith('msg')) {
+ } else if (v.startsWith('msg')) { //娑堟伅
function removeTags(str) {
return str.replace(/<\/?[^>]+>/gi, '');
}
@@ -173,34 +190,26 @@
title: this.messageList.title.slice(0, 8) + '...',
content: removeTags(this.messageList.content).trim().slice(0, 8) + '...'
}
- if (uni.getStorageSync('userId') === this.messageList.appUserId) {
- this.messagePushShow = true;
+ this.messagePushShow = !this.messageList.appUserId || uni.getStorageSync('userId') === this.messageList
+ .appUserId;
+ } else if (v.startsWith('wsg')) { //鎻愰啋纾呮埧鏈夎溅
+ let wsgObj = JSON.parse(v.slice(5));
+ if (uni.getStorageSync('carNo') === wsgObj.carNo && !wsgObj.peopleWeigh) {
+ this.changewsgVisiable(true) //纾呮埧蹇欑鐨勫脊妗嗙殑鐜伴殣钘�
+ this.changewsgContent(wsgObj.content) //纾呮埧蹇欑鐨勫脊妗嗙殑鍐呭鎻愮ず
}
- } else {}
+ if (uni.getStorageSync('carNo') === wsgObj.carNo && wsgObj.peopleWeigh === 2) {
+ this.changeconfirmWeighVisiable(true)
+ this.changeconfirmWeighContent(wsgObj.content)
+ }
+ }
}
- },
- onShow() {
- this.init();
- if (this.globalisconnect) {
- this.$store.dispatch('websocketInit')
- this.changeisconnect(false)
- this.$store.commit('changeisLogin', true)
- console.log(this.globalisconnect, 'index鐨剋s鏁版嵁');
- }
- this.userAuthorization();
- this.messageReq();
- },
- onHide() {
- console.log('椤甸潰闅愯棌')
- },
- onUnload() {
- console.log('椤甸潰鍗歌浇');
- this.$store.dispatch('websocketOnClose')
- clearInterval(this.globalIntervalId);
- this.changeisconnect(true)
},
methods: {
- ...mapMutations(['pushMessage', 'changeWeigh', 'changeinfraredStatus', 'changeisconnect', 'websocketInit']),
+ ...mapMutations(['pushMessage', 'changeWeigh', 'changeinfraredStatus', 'changeisconnect', 'websocketInit',
+ 'changewsgVisiable', 'changewsgContent', 'changeconfirmWeighVisiable', 'changeconfirmWeighContent',
+ 'changeWarning'
+ ]),
messagePage() {
uni.navigateTo({
url: '/pages/public-page/message/message'
@@ -230,7 +239,10 @@
case 5:
console.log('LoadUnloadRef');
this.$nextTick(() => {
- this.$refs.LoadUnloadRef.init();
+ console.log(this.count,'count')
+ if(this.count <=1){
+ this.$refs.LoadUnloadRef.init();
+ }
});
break;
default:
@@ -269,63 +281,6 @@
fail() {
console.log('鑾峰彇澶辫触');
},
- });
- },
- // 鍒濆鍖杦ebsocket
- initWebsocket() {
- let wsUrl = `${webSocketUrl}?access_token=${uni.getStorageSync('token')}`;
- socket = uni.connectSocket({
- url: wsUrl,
- header: {
- CLIENT_TOC: 'Y'
- },
- complete: res => {
- console.log(res, 'socket缁撴灉');
- if (res.errMsg == 'connectSocket:ok') {
- this.changeisconnect(true);
- this.isconnect = true;
- }
- }
- });
- socket.onOpen(() => {
- console.log('onOpen');
- this.intervalId = setInterval(() => {
- socket.send({
- data: JSON.stringify({ type: 'ping' }),
- success(e) {
- console.log(e, '鍙戦�佸績璺虫垚鍔�');
- }
- });
- }, 30000);
- });
-
- // 鑾峰彇鏈嶅姟鍣ㄤ紶鏉ョ殑鏁版嵁锛屽仛鐩稿簲澶勭悊
- socket.onMessage(res => {
- console.log('message', res);
- if (res.data.startsWith('weigh')) {
- let nowWeighObj = JSON.parse(res.data.slice(7));
- if (this.globalweighHouseCode && nowWeighObj.eqCode == this.globalweighHouseCode) {
- if (nowWeighObj.eqInfraredStatus) {
- this.changeinfraredStatus(true);
- this.changeWeigh(nowWeighObj.weigh);
- } else {
- this.changeinfraredStatus(false);
- this.changeWeigh(nowWeighObj.weigh);
- }
- }
- } else if (res.data.startsWith('msg')) {
- this.messageList = JSON.parse(res.data.slice(5));
- this.messagePushShow = true;
- } else {}
- });
- socket.onClose(e => {
- console.log('webSocketClose', e);
- this.isconnect = false;
- this.changeisconnect(false);
- });
- socket.onError(err => {
- console.log('socket鎶ラ敊', err);
- this.$u.toast('鍑虹幇閿欒锛岃閲嶆柊杩涘叆璇ラ〉闈紝閲嶈瘯锛侊紒');
});
},
messageconfirm() {
@@ -390,4 +345,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.1