From e86112404de118a8db3cb4b6e1543511eceecc83 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 25 六月 2024 19:03:46 +0800
Subject: [PATCH] fix:密码提示，称重bug
---
pages/tabbar-page/index-tabbar/index-tabbar.vue | 158 ++++++++++++++++++++--------------------------------
1 files changed, 61 insertions(+), 97 deletions(-)
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index 7fe7a38..e882dd7 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -23,6 +23,7 @@
<driver-index v-if="roleType == 3"
ref="driverIndexRef"
:indexdriverBillOfLoadingData="indexdriverBillOfLoadingData"></driver-index>
+ <inspectionIndex ref="inspectionIndex" v-if='roleType == 4'/>
<tab-bar :current="0"></tab-bar>
<!-- 鎺ㄩ�佹秷鎭脊绐� -->
<u-modal :show="messagePushShow"
@@ -38,26 +39,28 @@
<script>
import customerIndex from '@/pages/customer-page/customer-index/customer-index.vue';
import driverIndex from '@/pages/driver-page/driver-index/driver-index.vue';
+ import inspectionIndex from '@/pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue'
import freightForwarderIndex from '@/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue';
- import { mapState, mapMutations } from 'vuex';
+ import { mapState, mapMutations, mapGetters } from 'vuex';
import { webSocketUrl } from '@/api/request.js';
-
let socket = null;
export default {
components: {
customerIndex,
driverIndex,
- freightForwarderIndex
+ freightForwarderIndex,
+ inspectionIndex
},
computed: {
...mapState(['globalweighHouseCode', 'globalweigh', 'globalisconnect', 'globalSocket', 'websocketData',
'globalIntervalId'
- ])
+ ]),
+ ...mapGetters(['websocketData'])
},
//棣栭〉涓嬫媺鍒锋柊
onPullDownRefresh() {
uni.showLoading({ title: '鍔犺浇涓�...' });
- // 鑾峰彇鍘嗗彶鎻愮叅鍗�
+ // 鑾峰彇鍘嗗彶閫氱煡鍗�
if (this.roleType == 1 || this.roleType == 2) {
this.$reqGet('getJhOrderPlanDataPage', { current: 1, size: 10 }).then(res => {
if (res.data.records) {
@@ -70,7 +73,7 @@
});
}
// 瀹㈡埛鑾峰彇鏃ヨ鍒�
- if (this.roleType == 1) {
+ if (this.roleType == 1 || this.roleType == 4) {
this.$reqGet('GetOrderPlan').then(res => {
if (res.data) {
this.orderPlanDataStore = res.data;
@@ -138,50 +141,58 @@
},
isconnect: false,
dotShow: false,
- appHide: false
+ appHide: false,
+ phone: ''
};
},
watch: {
- '$store.state.websocketData'(v) {
- console.log(v, '鎺ュ彈鐨剋s鏁版嵁');
- 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);
- }
- }
- } else if (v.startsWith('msg')) {
- function removeTags(str) {
- return str.replace(/<\/?[^>]+>/gi, '');
- }
- this.messageList = JSON.parse(v.slice(5));
- this.messageList = {
- ...this.messageList,
- title: this.messageList.title.slice(0, 8) + '...',
- content: removeTags(this.messageList.content).trim().slice(0, 8) + '...'
- }
- this.messagePushShow = true;
- } else {}
+ 'websocketData': {
+ handler(v) {
+ console.log(v, '鎺ュ彈鐨剋s鏁版嵁');
+ if(v) {
+ 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);
+ let warningState = nowWeighObj.warning == 1
+ this.changeWarning(warningState)
+ } else {
+ this.changeinfraredStatus(false);
+ this.changeWeigh(nowWeighObj.weigh);
+ let warningState = nowWeighObj.warning == 1
+ this.changeWarning(warningState)
+ }
+ }
+ } else if (v.startsWith('msg')) {
+ function removeTags(str) {
+ return str.replace(/<\/?[^>]+>/gi, '');
+ }
+ this.messageList = JSON.parse(v.slice(5));
+ this.messageList = {
+ ...this.messageList,
+ title: this.messageList.title.slice(0, 8) + '...',
+ content: removeTags(this.messageList.content).trim().slice(0, 8) + '...'
+ }
+ this.messagePushShow = true;
+ } else {}
+ }
+ },
+ deep: true,
+ immediate: true
}
},
onShow() {
this.init();
- console.log(this.globalisconnect);
if (this.globalisconnect) {
this.$store.dispatch('websocketInit')
this.changeisconnect(false)
- console.log(this.globalisconnect, 'index鐨剋s蹇冧簨鈥�');
+ this.changeisLogin(true)
+ console.log(this.globalisconnect, 'index鐨剋s鏁版嵁鈥�');
}
this.userAuthorization();
this.messageReq();
- },
- onHide() {
- console.log('椤甸潰闅愯棌')
},
onUnload() {
console.log('椤甸潰鍗歌浇');
@@ -190,7 +201,9 @@
this.changeisconnect(true)
},
methods: {
- ...mapMutations(['pushMessage', 'changeWeigh', 'changeinfraredStatus', 'changeisconnect', 'websocketInit']),
+ ...mapMutations(['pushMessage', 'changeWeigh', 'changeinfraredStatus', 'changeisconnect', 'websocketInit',
+ 'changeisLogin', 'changeWarning'
+ ]),
messagePage() {
uni.navigateTo({
url: '/pages/public-page/message/message'
@@ -215,6 +228,12 @@
console.log('driverIndexRef');
this.$nextTick(() => {
this.$refs.driverIndexRef.init();
+ });
+ break;
+ case 4:
+ console.log('inspectionIndex');
+ this.$nextTick(() => {
+ this.$refs.inspectionIndex.init();
});
break;
default:
@@ -258,63 +277,6 @@
}
});
},
- // 鍒濆鍖杦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() {
this.messagePushShow = false;
uni.navigateTo({
@@ -329,7 +291,7 @@
this.dotShow = filtermessage.length > 0;
}
});
- }
+ },
}
};
</script>
@@ -338,6 +300,8 @@
scoped>
.max-block {
font-family: siYuanLight !important;
+ width: 100%;
+ height: 100%;
}
.white-block {
@@ -377,4 +341,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.1