From 82a7eba143cc761b303b99889193f7aad2dc9d08 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 28 八月 2023 08:56:08 +0800
Subject: [PATCH] 修改bug，称重页面增加历史和异常原因填写
---
pages/tabbar-page/index-tabbar/index-tabbar.vue | 52 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index 78d1d35..ca55d78 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -23,13 +23,15 @@
<driver-index v-if="roleType == 3"
ref="driverIndexRef"
:indexdriverBillOfLoadingData="indexdriverBillOfLoadingData"></driver-index>
+ <load-unload ref="LoadUnloadRef"
+ v-if="roleType == 5"></load-unload>
<tab-bar :current="0"></tab-bar>
<!-- 鎺ㄩ�佹秷鎭脊绐� -->
<u-modal :show="messagePushShow"
:title="messageList.title"
@confirm="messageconfirm"
confirm-text="鍓嶅幓鏌ョ湅">
- <view class="slot-content"><rich-text :nodes="messageList.content"></rich-text></view>
+ <view class="slot-content"><u-parse :content="messageList.content"></u-parse></view>
</u-modal>
<!-- <view class="white-block"></view> -->
</view>
@@ -39,6 +41,7 @@
import customerIndex from '@/pages/customer-page/customer-index/customer-index.vue';
import driverIndex from '@/pages/driver-page/driver-index/driver-index.vue';
import freightForwarderIndex from '@/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue';
+ import LoadUnload from '@/pages/loadUnload-page/loadUnload-page.vue'
import { mapState, mapMutations } from 'vuex';
import { webSocketUrl } from '@/api/request.js';
@@ -47,7 +50,8 @@
components: {
customerIndex,
driverIndex,
- freightForwarderIndex
+ freightForwarderIndex,
+ LoadUnload
},
computed: {
...mapState(['globalweighHouseCode', 'globalweigh', 'globalisconnect', 'globalSocket', 'websocketData',
@@ -132,7 +136,10 @@
indexHistoryCoalData: [],
indexdriverBillOfLoadingData: {},
messagePushShow: false,
- messageList: {},
+ messageList: {
+ title: '',
+ content: "",
+ },
isconnect: false,
dotShow: false,
appHide: false
@@ -153,15 +160,28 @@
}
}
} else if (v.startsWith('msg')) {
+ function removeTags(str) {
+ return str.replace(/<\/?[^>]+>/gi, '');
+ }
this.messageList = JSON.parse(v.slice(5));
- this.messagePushShow = true;
+ this.messageList = {
+ ...this.messageList,
+ 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 {}
}
},
onShow() {
this.init();
- if (!this.globalisconnect) {
+ 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();
@@ -173,6 +193,7 @@
console.log('椤甸潰鍗歌浇');
this.$store.dispatch('websocketOnClose')
clearInterval(this.globalIntervalId);
+ this.changeisconnect(true)
},
methods: {
...mapMutations(['pushMessage', 'changeWeigh', 'changeinfraredStatus', 'changeisconnect', 'websocketInit']),
@@ -202,6 +223,12 @@
this.$refs.driverIndexRef.init();
});
break;
+ case 5:
+ console.log('LoadUnloadRef');
+ this.$nextTick(() => {
+ this.$refs.LoadUnloadRef.init();
+ });
+ break;
default:
break;
}
@@ -210,29 +237,26 @@
userAuthorization() {
wx.getSetting({
success(res) {
- // wx.startRecord();
- console.log('鎺堟潈鐩告満/楹﹀厠椋庢潈闄恠uccess');
+ console.log(res);
if (!res.authSetting['scope.record'] || !res.authSetting['scope.camera']) {
if (!res.authSetting['scope.camera']) {
wx.authorize({
scope: 'scope.camera',
success() {
- // 鐢ㄦ埛宸茬粡鍚屾剰灏忕▼搴忎娇鐢ㄥ綍闊冲姛鑳斤紝鍚庣画璋冪敤 wx.startRecord 鎺ュ彛涓嶄細寮圭獥璇㈤棶
- console.log('鎺堟潈鎴愬姛');
+ console.log('鐩告満鎴愬姛');
},
fail() {
- console.log('鎺堟潈澶辫触');
+ console.log('鐩告満澶辫触');
}
});
} else if (!res.authSetting['scope.record']) {
wx.authorize({
scope: 'scope.record',
success() {
- // 鐢ㄦ埛宸茬粡鍚屾剰灏忕▼搴忎娇鐢ㄥ綍闊冲姛鑳斤紝鍚庣画璋冪敤 wx.startRecord 鎺ュ彛涓嶄細寮圭獥璇㈤棶
- console.log('鎺堟潈鎴愬姛');
+ console.log('褰曢煶鎴愬姛');
},
fail: () => {
- console.log('鎺堟潈澶辫触');
+ console.log('褰曢煶澶辫触');
}
});
}
@@ -240,7 +264,7 @@
},
fail() {
console.log('鑾峰彇澶辫触');
- }
+ },
});
},
// 鍒濆鍖杦ebsocket
--
Gitblit v1.9.1