From 373929a32aa4a3197260a106be3fdc21eb109afc Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 04 三月 2025 08:38:11 +0800
Subject: [PATCH] feat:门卫页面修改状态传参
---
pages/tabbar-page/index-tabbar/index-tabbar.vue | 145 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 127 insertions(+), 18 deletions(-)
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index 859715a..7d3aff6 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -27,6 +27,16 @@
v-if="roleType == 5"></load-unload>
<!-- <selectTarget v-if="roleType == 5"
ref="LoadUnloadRef"></selectTarget> -->
+ <sampling
+ v-if="roleType == 6"
+ ref="samplingRef"
+ :samplingData="samplingData"
+ />
+ <entranceGuard
+ v-if="roleType == 7"
+ ref="entranceGuardgRef"
+ :samplingData="entranceGuardData"
+ />
<tab-bar :current="0"></tab-bar>
<!-- 鎺ㄩ�佹秷鎭脊绐� -->
<u-modal :show="messagePushShow"
@@ -44,9 +54,11 @@
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 { mapState, mapMutations } from 'vuex';
+ import selectTarget from '@/pages/loadUnload-page/selectTarget/selectTarget.vue';
+ import { mapState, mapMutations,mapGetters } from 'vuex';
import { webSocketUrl } from '@/api/request.js';
+ import sampling from '@/pages/sampling-page/index.vue'
+ import entranceGuard from '@/pages/entranceGuard/index.vue'
let socket = null;
export default {
@@ -55,12 +67,15 @@
driverIndex,
freightForwarderIndex,
LoadUnload,
- selectTarget
+ selectTarget,
+ sampling,
+ entranceGuard
},
computed: {
...mapState(['globalweighHouseCode', 'globalweigh', 'globalisconnect', 'globalSocket', 'websocketData',
'globalIntervalId'
- ])
+ ]),
+ ...mapGetters(['websocketData'])
},
//棣栭〉涓嬫媺鍒锋柊
onPullDownRefresh() {
@@ -113,10 +128,56 @@
uni.stopPullDownRefresh();
}
});
+ }else if(this.roleType == 6){
+ this.$reqGet('inspectedTaskPage',{inspectionStatus:2}).then(res => {
+ if (res.code == 0) {
+ if(res.data.records.length){
+ this.orderPlanData = [res.data.records[0]]
+ }else{
+ this.orderPlanData = [];
+ }
+
+ this.$u.toast('鍔犺浇鎴愬姛');
+ uni.hideLoading();
+ uni.stopPullDownRefresh();
+ } else {
+ this.$u.toast('鍔犺浇澶辫触');
+ uni.hideLoading();
+ uni.stopPullDownRefresh();
+ }
+ });
+ }else if(this.roleType == 7){
+
+ this.$reqGet('gateAuth',{current:1,size:5,status:25}).then(res => {
+ if (res.code == 0) {
+ if(res.data.records.length){
+ this.orderPlanData = res.data.records;
+ }else{
+ this.orderPlanData = [];
+ }
+
+ this.$u.toast('鍔犺浇鎴愬姛');
+ uni.hideLoading();
+ uni.stopPullDownRefresh();
+ } else {
+ this.$u.toast('鍔犺浇澶辫触');
+ uni.hideLoading();
+ uni.stopPullDownRefresh();
+ }
+ });
}
},
onHide() {
console.log('椤甸潰闅愯棌')
+ this.$nextTick(()=>{
+ if(this.roleType === 7){
+ this.$refs.entranceGuardgRef.clearTime();
+ }else{
+ this.$refs.samplingRef.clearTime();
+ }
+
+
+ })
},
onUnload() {
console.log('椤甸潰鍗歌浇');
@@ -124,8 +185,11 @@
clearInterval(this.globalIntervalId);
this.changeisconnect(false)
},
- onLoad() {
+ onShow() {
this.init();
+ this.messageReq();
+ },
+ onLoad() {
this.$store.dispatch('websocketInit')
this.$store.commit('changeisLogin', true)
console.log(this.globalisconnect, 'index鐨剋s鏁版嵁');
@@ -152,8 +216,10 @@
roleType: null,
orderPlanDataStore: [],
indexHuoDaiOrderPlanData: [],
+ entranceGuardData:[],
indexHistoryCoalData: [],
indexdriverBillOfLoadingData: {},
+ samplingData:[],
messagePushShow: false,
messageList: {
title: '',
@@ -165,16 +231,19 @@
};
},
watch: {
- '$store.state.websocketData'(v) {
+ 'websocketData': {
+ handler(v){
console.log(v, '鎺ュ彈鐨剋s鏁版嵁');
- if (v.startsWith('weigh')) {
+ if(v){
+ 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 +253,47 @@
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)
}
}
+ //鍙栨牱鍛橀〉闈�
+ else if (v.startsWith('inspect')) {
+ //鏀跺埌閫氱煡鏇存柊鏁版嵁
+ this.$nextTick(() => {
+ this.$refs.samplingRef.init();
+ });
+
+ }
+ //闂ㄥ崼椤甸潰
+ else if (v.startsWith('gate_auth')) {
+ //鏀跺埌閫氱煡鏇存柊鏁版嵁
+ this.$nextTick(() => {
+ this.$refs.entranceGuardgRef.init();
+ });
+
+ }
+ }
+
+ },
+ deep:true,
+ immediate:true
+
}
},
methods: {
...mapMutations(['pushMessage', 'changeWeigh', 'changeinfraredStatus', 'changeisconnect', 'websocketInit',
- 'changewsgVisiable', 'changewsgContent'
+ 'changewsgVisiable', 'changewsgContent', 'changeconfirmWeighVisiable', 'changeconfirmWeighContent',
+ 'changeWarning'
]),
messagePage() {
uni.navigateTo({
@@ -230,6 +325,20 @@
console.log('LoadUnloadRef');
this.$nextTick(() => {
this.$refs.LoadUnloadRef.init();
+ });
+ break;
+ case 6:
+ console.log('samplingRef');
+ this.$nextTick(() => {
+ this.$refs.samplingRef.init();
+ this.$refs.samplingRef.timerFun();
+ });
+ break;
+ case 7:
+ console.log('entranceGuardgRef');
+ this.$nextTick(() => {
+ this.$refs.entranceGuardgRef.init();
+ this.$refs.entranceGuardgRef.timerFun();
});
break;
default:
@@ -332,4 +441,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.1