From 97d88adcdfa7e13b2203c8716c02866fae087704 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 26 九月 2023 09:38:47 +0800
Subject: [PATCH] 修改磅房忙碌问题及其他问题
---
pages/login/userPassword.vue | 1 +
pages/login/login.vue | 4 +---
pages/tabbar-page/index-tabbar/index-tabbar.vue | 7 ++++---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 16 ++++++++++++++--
store/index.js | 1 +
5 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
index 7549489..7e18b5a 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -130,7 +130,7 @@
height="150"
:previewFullImage="true"
:disabled="isModifyoriginInfo"
- :deletable='!deletable'></u-upload>
+ :deletable="!deletable"></u-upload>
</u-form-item>
</u-form>
<view class="submit-button">
@@ -241,7 +241,7 @@
</view>
<!-- 纾呮埧蹇欑鎻愮ず寮圭獥 -->
<view class="">
- <u-modal :show="wsgVisiable"
+ <u-modal :show="wsgShow"
title="鎻愮ず"
:content="wsgContent"
@confirm="wsgContentConfirm"></u-modal>
@@ -269,7 +269,9 @@
this.getWeightHouseObj.overTmWaixiao = value.overTmWaixiao
}
this.fileList1 = []
+ this.changeglobalIsFirstWeighing(1)
if (this.globalIsFirstWeighing === 1) {
+ console.log('鑾峰彇璇︽儏 onload');
this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
}
this.init(); //鑾峰彇鏃ュ織
@@ -277,6 +279,7 @@
onShow() {
this.coalDayPage(); //鑾峰彇鏃ュ織 瀹氭椂浠诲姟
if (this.globalIsFirstWeighing === 2) {
+ console.log('鑾峰彇璇︽儏 onShow');
this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
}
},
@@ -400,9 +403,18 @@
}
},
timeout: '0',
+ wsgShow: false
};
},
+ watch: {
+ '$store.state.wsgVisiable': {
+ deep: true,
+ handler: function(val) {
+ this.wsgShow = val
+ }
+ }
+ },
computed: {
...mapState(['globalweigh', 'globalinfraredStatus', 'wsgVisiable', 'wsgContent', 'globalIsFirstWeighing']),
name() {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 53ea34c..f2af9b5 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -141,9 +141,7 @@
this.setUserTabbar(res.data.type);
uni.setStorageSync('roleType', res.data.type);
uni.setStorageSync("userId", res.data.userId)
- if (res.data.carNo) {
- uni.setStorageSync("carNo", res.data.carNo)
- }
+ uni.setStorageSync("carNo", res.data.carNo)
setCustomerId(res.data.customerid);
uni.hideLoading();
//璺宠浆椤甸潰
diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue
index b39078a..73b5cfc 100644
--- a/pages/login/userPassword.vue
+++ b/pages/login/userPassword.vue
@@ -89,6 +89,7 @@
this.setUserTabbar(res.data.type);
uni.setStorageSync('roleType', res.data.type);
uni.setStorageSync("userId", res.data.userId)
+ uni.setStorageSync("carNo", res.data.carNo)
setCustomerId(res.data.customerid);
setName(res.name);
uni.hideLoading();
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index 90c8b6a..7e9dcc4 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -191,9 +191,10 @@
}
} else if (v.startsWith('wsg')) {
let wsgObj = JSON.parse(v.slice(5));
- if (uni.getStorageInfoSync('carNo') === wsgObj.carNo) {
- changewsgVisiable(true)
- changewsgContent(wsgObj.content)
+ console.log(uni.getStorageSync('carNo'), wsgObj.carNo);
+ if (uni.getStorageSync('carNo') === wsgObj.carNo) {
+ this.changewsgVisiable(true)
+ this.changewsgContent(wsgObj.content)
}
}
}
diff --git a/store/index.js b/store/index.js
index 6f0ddfe..8485ad9 100644
--- a/store/index.js
+++ b/store/index.js
@@ -249,6 +249,7 @@
console.log('ws澶辫触');
commit('changereconnectState', false)
dispatch('reconnect')
+ commit('changeisconnect', false)
}
})
state.socketTast.onOpen(() => dispatch('websocketOnOpen'))
--
Gitblit v1.9.1