From 6c20f43ff1cb24758b11fbe29488804e418c4e42 Mon Sep 17 00:00:00 2001
From: wk
Date: 星期一, 04 十一月 2024 15:26:08 +0800
Subject: [PATCH] feat:注册更改
---
pages/tabbar-page/index-tabbar/index-tabbar.vue | 84 ++++++++++++++++++++++-------------------
1 files changed, 45 insertions(+), 39 deletions(-)
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index 81b3617..245e23d 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -47,28 +47,23 @@
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 selectTarget from '@/pages/loadUnload-page/selectTarget/selectTarget.vue'
- import qualityIndex from '@/pages/quality-inspection-page/qualityIndex/qualityIndex'
+ import qualityIndex from '@/pages/quality-inspection-page/qualityIndex/qualityIndex'
import doorkeepIndex from '@/pages/doorkeeper-page/doorkeeper-index/doorkeeper-index.vue';
- import { mapState, mapMutations } from 'vuex';
- import { webSocketUrl } from '@/api/request.js';
-
- let socket = null;
+ import { mapState, mapMutations, mapGetters } from 'vuex';
export default {
components: {
customerIndex,
driverIndex,
freightForwarderIndex,
LoadUnload,
- selectTarget,
- qualityIndex, //鍖栭獙
- doorkeepIndex,
- selectTarget
+ qualityIndex, //鍖栭獙
+ doorkeepIndex,
},
computed: {
...mapState(['globalweighHouseCode', 'globalweigh', 'globalisconnect', 'globalSocket', 'websocketData',
'globalIntervalId'
- ])
+ ]),
+ ...mapGetters(['websocketData'])
},
//棣栭〉涓嬫媺鍒锋柊
onPullDownRefresh() {
@@ -77,7 +72,7 @@
}else{
this.$refs.doorkeepIndexRef.TaskCoalList()
}
- // 鑾峰彇鍘嗗彶鎻愮叅鍗�
+ // 鑾峰彇鍘嗗彶鏀跺彂鍗�
if (this.roleType == 1 || this.roleType == 2) {
this.$reqGet('getJhOrderPlanDataPage', { current: 1, size: 10 }).then(res => {
if (res.data.records) {
@@ -203,29 +198,37 @@
};
},
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) {
- this.changeWeigh(nowWeighObj.weigh);
- this.changeinfraredStatus(!!nowWeighObj.eqInfraredStatus);
- 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 = !this.messageList.appUserId || uni.getStorageSync('userId') === this.messageList
- .appUserId;
- } else if (v.startsWith('wsg')) { //鎻愰啋纾呮埧鏈夎溅
+ '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 if (v.startsWith('wsg')) { //鎻愰啋纾呮埧鏈夎溅
let wsgObj = JSON.parse(v.slice(5));
if (uni.getStorageSync('carNo') === wsgObj.carNo && !wsgObj.peopleWeigh) {
this.changewsgVisiable(true) //纾呮埧蹇欑鐨勫脊妗嗙殑鐜伴殣钘�
@@ -236,6 +239,10 @@
this.changeconfirmWeighContent(wsgObj.content)
}
}
+ }
+ },
+ deep: true,
+ immediate: true
}
},
methods: {
@@ -274,9 +281,8 @@
console.log('LoadUnloadRef');
this.$nextTick(() => {
console.log(this.count,'count')
- if(this.count <=1){
this.$refs.LoadUnloadRef.init();
- }
+
});
break;
case 7:
@@ -350,9 +356,9 @@
});
},
getDetailData(){
- this.$reqGet('getTaskCoalListByBunkerId', { bunkerId:uni.getStorageSync('bunkerId')}).then(res => {
+ this.$reqGet('getTaskCoalListByBunkerId', { bunkerIds:uni.getStorageSync('bunkerIds'),productIds:uni.getStorageSync('productIds')}).then(res => {
if (res.code === 0) {
- this.detailData = res.data.map(item=>{
+ this.detailData = res.data.map(item=>{
item.tmTaskCoalList.map(el=>{
el.flag = el.isPretendDischar ? false : true
return el
--
Gitblit v1.9.1