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 | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index 859715a..1b0ee4f 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -124,8 +124,12 @@
clearInterval(this.globalIntervalId);
this.changeisconnect(false)
},
- onLoad() {
+ 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鏁版嵁');
@@ -153,6 +157,7 @@
orderPlanDataStore: [],
indexHuoDaiOrderPlanData: [],
indexHistoryCoalData: [],
+ count:0,
indexdriverBillOfLoadingData: {},
messagePushShow: false,
messageList: {
@@ -167,14 +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) {
this.changeWeigh(nowWeighObj.weigh);
this.changeinfraredStatus(!!nowWeighObj.eqInfraredStatus);
- console.log(!!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, '');
}
@@ -184,21 +190,25 @@
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;
- }
- } else if (v.startsWith('wsg')) {
+ 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.getStorageInfoSync('carNo') === wsgObj.carNo) {
- changewsgVisiable(true)
- changewsgContent(wsgObj.content)
+ if (uni.getStorageSync('carNo') === wsgObj.carNo && !wsgObj.peopleWeigh) {
+ this.changewsgVisiable(true) //纾呮埧蹇欑鐨勫脊妗嗙殑鐜伴殣钘�
+ this.changewsgContent(wsgObj.content) //纾呮埧蹇欑鐨勫脊妗嗙殑鍐呭鎻愮ず
+ }
+ if (uni.getStorageSync('carNo') === wsgObj.carNo && wsgObj.peopleWeigh === 2) {
+ this.changeconfirmWeighVisiable(true)
+ this.changeconfirmWeighContent(wsgObj.content)
}
}
}
},
methods: {
...mapMutations(['pushMessage', 'changeWeigh', 'changeinfraredStatus', 'changeisconnect', 'websocketInit',
- 'changewsgVisiable', 'changewsgContent'
+ 'changewsgVisiable', 'changewsgContent', 'changeconfirmWeighVisiable', 'changeconfirmWeighContent',
+ 'changeWarning'
]),
messagePage() {
uni.navigateTo({
@@ -229,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:
@@ -332,4 +345,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.1