From 5c63b1fccedfcd208f3434edb79926c206c3d26f Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 29 四月 2025 14:52:35 +0800
Subject: [PATCH] feat:增加类型显示
---
store/index.js | 248 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 191 insertions(+), 57 deletions(-)
diff --git a/store/index.js b/store/index.js
index 17ed592..d206873 100644
--- a/store/index.js
+++ b/store/index.js
@@ -3,7 +3,7 @@
import { webSocketUrl,BaseUrl } from '@/api/request.js'
// 璇锋眰鐩稿叧
import {
- reqGet,
+ reqGet
} from '@/api/index.js'
Vue.use(Vuex)
@@ -11,103 +11,211 @@
const userRoleTabbar = {
first: [{
pagePath: 'pages/tabbar-page/index-tabbar/index-tabbar',
+ //#ifdef MP-WEIXIN
iconPath: '../../static/tabBar-icon/home.png',
selectedIconPath: '../../static/tabBar-icon/homeblue.png',
+ // #endif
+ // #ifdef H5
+ iconPath: '/static/tabBar-icon/home.png',
+ selectedIconPath: '/static/tabBar-icon/homeblue.png',
+ // #endif
text: '棣栭〉'
},
{
pagePath: 'pages/customer-page/customer-my/faYunstatistics/faYunstatistics',
+ //#ifdef MP-WEIXIN
iconPath: '../../static/tabBar-icon/statistics.png',
selectedIconPath: '../../static/tabBar-icon/statisticsactive.png',
+ // #endif
+ // #ifdef H5
+ iconPath: '/static/tabBar-icon/statistics.png',
+ selectedIconPath: '/static/tabBar-icon/statisticsactive.png',
+ // #endif
text: '缁熻'
},
{
pagePath: 'pages/tabbar-page/myPage-tabbar/myPage-tabbar',
+ //#ifdef MP-WEIXIN
iconPath: '../../static/tabBar-icon/Gmine10.png',
selectedIconPath: '../../static/tabBar-icon/Bmine57.png',
+ // #endif
+ // #ifdef H5
+ iconPath: '/static/tabBar-icon/Gmine10.png',
+ selectedIconPath: '/static/tabBar-icon/Bmine57.png',
+ // #endif
text: '鎴戠殑'
}
],
second: [{
pagePath: 'pages/tabbar-page/index-tabbar/index-tabbar',
+ //#ifdef MP-WEIXIN
iconPath: '../../static/tabBar-icon/home.png',
selectedIconPath: '../../static/tabBar-icon/homeblue.png',
+ // #endif
+ // #ifdef H5
+ iconPath: '/static/tabBar-icon/home.png',
+ selectedIconPath: '/static/tabBar-icon/homeblue.png',
+ // #endif
text: '棣栭〉'
},
{
pagePath: 'pages/customer-page/customer-my/faYunstatistics/faYunstatistics',
+ //#ifdef MP-WEIXIN
iconPath: '../../static/tabBar-icon/statistics.png',
selectedIconPath: '../../static/tabBar-icon/statisticsactive.png',
+ // #endif
+ //#ifdef H5
+ iconPath: '/static/tabBar-icon/statistics.png',
+ selectedIconPath: '/static/tabBar-icon/statisticsactive.png',
+ // #endif
text: '缁熻'
},
{
pagePath: 'pages/tabbar-page/myPage-tabbar/myPage-tabbar',
+ //#ifdef MP-WEIXIN
iconPath: '../../static/tabBar-icon/Gmine10.png',
selectedIconPath: '../../static/tabBar-icon/Bmine57.png',
+ // #endif
+ //#ifdef H5
+ iconPath: '/static/tabBar-icon/Gmine10.png',
+ selectedIconPath: '/static/tabBar-icon/Bmine57.png',
+ // #endif
text: '鎴戠殑'
}
],
three: [{
pagePath: 'pages/tabbar-page/index-tabbar/index-tabbar',
+ //#ifdef MP-WEIXIN
iconPath: '../../static/tabBar-icon/home.png',
selectedIconPath: '../../static/tabBar-icon/homeblue.png',
+ // #endif
+ //#ifdef H5
+ iconPath: '/static/tabBar-icon/home.png',
+ selectedIconPath: '/static/tabBar-icon/homeblue.png',
+ // #endif
text: '棣栭〉'
},
{
pagePath: 'pages/tabbar-page/myPage-tabbar/myPage-tabbar',
+ //#ifdef MP-WEIXIN
iconPath: '../../static/tabBar-icon/Gmine10.png',
selectedIconPath: '../../static/tabBar-icon/Bmine57.png',
+ // #endif
+ //#ifdef H5
+ iconPath: '/static/tabBar-icon/Gmine10.png',
+ selectedIconPath: '/static/tabBar-icon/Bmine57.png',
+ // #endif
text: '鎴戠殑'
}
],
fourth: [{
pagePath: 'pages/tabbar-page/index-tabbar/index-tabbar',
+ //#ifdef MP-WEIXIN
iconPath: '../../static/tabBar-icon/home.png',
selectedIconPath: '../../static/tabBar-icon/homeblue.png',
+ // #endif
+ //#ifdef H5
+ iconPath: '/static/tabBar-icon/home.png',
+ selectedIconPath: '/static/tabBar-icon/homeblue.png',
+ // #endif
text: '杩涘満'
},{
pagePath: 'pages/doorkeeper-page/doorkeeper-index/exit-index',
+ //#ifdef MP-WEIXIN
iconPath: '../../static/tabBar-icon/home.png',
selectedIconPath: '../../static/tabBar-icon/homeblue.png',
+ // #endif
+ //#ifdef H5
+ iconPath: '/static/tabBar-icon/home.png',
+ selectedIconPath: '/static/tabBar-icon/homeblue.png',
+ // #endif
text: '鍑哄満'
},
{
pagePath: 'pages/tabbar-page/myPage-tabbar/myPage-tabbar',
+ //#ifdef MP-WEIXIN
iconPath: '../../static/tabBar-icon/Gmine10.png',
selectedIconPath: '../../static/tabBar-icon/Bmine57.png',
+ // #endif
+ //#ifdef H5
+ iconPath: '/static/tabBar-icon/Gmine10.png',
+ selectedIconPath: '/static/tabBar-icon/Bmine57.png',
+ // #endif
text: '鎴戠殑'
},
],
five:[{
pagePath: 'pages/tabbar-page/index-tabbar/index-tabbar',
+ //#ifdef MP-WEIXIN
iconPath: '../../static/tabBar-icon/home.png',
selectedIconPath: '../../static/tabBar-icon/homeblue.png',
+ // #endif
+ //#ifdef H5
+ iconPath: '/static/tabBar-icon/home.png',
+ selectedIconPath: '/static/tabBar-icon/homeblue.png',
+ // #endif
text: '棣栭〉'
},
{
+ pagePath: 'pages/loadUnload-page/historyOrder/index',
+ //#ifdef MP-WEIXIN
+ iconPath: '../../static/tabBar-icon/home.png',
+ selectedIconPath: '../../static/tabBar-icon/homeblue.png',
+ // #endif
+ //#ifdef H5
+ iconPath: '/static/tabBar-icon/home.png',
+ selectedIconPath: '/static/tabBar-icon/homeblue.png',
+ // #endif
+ text: '鍘嗗彶鏀跺彂鍗�'
+ },
+ {
pagePath: 'pages/loadUnload-page/orderPlanList/index',
- iconPath: '../../static/tabBar-icon/Gmine10.png',
- selectedIconPath: '../../static/tabBar-icon/Bmine57.png',
- text: '鏃ヨ鍒�'
+ //#ifdef MP-WEIXIN
+ iconPath: '../../static/tabBar-icon/statistics.png',
+ selectedIconPath: '../../static/tabBar-icon/statisticsactive.png',
+ // #endif
+ //#ifdef H5
+ iconPath: '/static/tabBar-icon/statistics.png',
+ selectedIconPath: '/static/tabBar-icon/statisticsactive.png',
+ // #endif
+ text: '鏃ヨ鍒�'
},
{
pagePath: 'pages/tabbar-page/myPage-tabbar/myPage-tabbar',
+ //#ifdef MP-WEIXIN
iconPath: '../../static/tabBar-icon/Gmine10.png',
selectedIconPath: '../../static/tabBar-icon/Bmine57.png',
+ // #endif
+ //#ifdef H5
+ iconPath: '/static/tabBar-icon/Gmine10.png',
+ selectedIconPath: '/static/tabBar-icon/Bmine57.png',
+ // #endif
text: '鎴戠殑'
}
],
six:[{
pagePath: 'pages/tabbar-page/index-tabbar/index-tabbar',
+ //#ifdef MP-WEIXIN
iconPath: '../../static/tabBar-icon/home.png',
selectedIconPath: '../../static/tabBar-icon/homeblue.png',
+ // #endif
+ //#ifdef H5
+ iconPath: '/static/tabBar-icon/home.png',
+ selectedIconPath: '/static/tabBar-icon/homeblue.png',
+ // #endif
text: '棣栭〉'
},
{
pagePath: 'pages/tabbar-page/myPage-tabbar/myPage-tabbar',
+ //#ifdef MP-WEIXIN
iconPath: '../../static/tabBar-icon/Gmine10.png',
selectedIconPath: '../../static/tabBar-icon/Bmine57.png',
+ // #endif
+ //#ifdef H5
+ iconPath: '/static/tabBar-icon/Gmine10.png',
+ selectedIconPath: '/static/tabBar-icon/Bmine57.png',
+ // #endif
text: '鎴戠殑'
}]
}
@@ -151,51 +259,51 @@
// 鎵撳嵃鍑哄叆闂ㄨ瘉 涓�娆″氨鍙互鏈夋墦鍗板叆闂ㄨ瘉锛� 涓ゆ鍙互鏈夊叆闂ㄨ瘉 鍑洪棬璇� 0娆′竴寮犻兘娌℃湁
ablePrintInduction: false, //鍏ラ棬璇�
ablePrintOut: false, //鍑洪棬璇�
- driverTourImgList: ['https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj1.png',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj2.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj3.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj4.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj5.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj6.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj7.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj8.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj9.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj10.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj11.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj12.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj13.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj14.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj15.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj16.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj17.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj18.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj19.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj20.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj21.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj22.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj23.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj24.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj25.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj26.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj27.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj28.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj29.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj30.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj31.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj32.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj33.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj33-1.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj34.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj35.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj36.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj37.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj38.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj39.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj40.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj41.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj42.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj43.jpg',
- 'https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj44.jpg',
+ driverTourImgList: ['https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj1.png',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj2.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj3.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj4.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj5.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj6.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj7.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj8.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj9.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj10.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj11.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj12.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj13.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj14.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj15.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj16.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj17.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj18.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj19.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj20.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj21.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj22.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj23.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj24.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj25.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj26.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj27.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj28.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj29.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj30.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj31.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj32.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj33.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj33-1.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj34.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj35.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj36.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj37.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj38.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj39.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj40.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj41.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj42.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj43.jpg',
+ 'https://wrzs.czjlchem.com:9090/appimg/image/tour/driver/sj44.jpg',
],
wsgVisiable: false, //纾呮埧蹇欑寮圭獥鎺у埗
wsgContent: '',
@@ -204,8 +312,10 @@
confirmWeighContent: '',
// 绉伴噸绋冲畾鎬� 0/绋冲畾 1/闈炵ǔ瀹� 闈炵ǔ瀹氭�佷笉鑳界偣绉伴噸
globalWarning: false,
- filedId:'', //鐓ゅ満id
- bunkerList:'', //鐓や粨list
+ filedId:'', //鍦哄湴id
+ bunkerList:'', //浠撳簱list
+ samplingPersonList:'', //閲囨牱鍛榣ist
+ pvcIdList:['1818242458023153665'],
},
mutations: {
setUserInfo(state, identity) {
@@ -267,6 +377,7 @@
console.log(state.globalisLogin, '鍏ㄥ眬鐧诲綍鐘舵�佹敼鍙樹簡')
},
setWebsocketData(state, data) {
+ console.log(data,'data-----')
state.websocketData = data
},
// 鏀瑰彉閲嶈繛鐘舵��
@@ -310,22 +421,26 @@
changeWarning(state, payload) {
state.globalWarning = payload
},
- // 鐓ゅ満filedId鐨勮幏鍙�
+ // 鍦哄湴filedId鐨勮幏鍙�
getFiledId(state, payload) {
console.log(payload,'filedId=====')
state.filedId = payload
uni.setStorageSync('filedId', state.filedId)
},
getBunkerList(state, payload) {
- console.log('鎴戞墽琛屼簡getBunkerList====',payload)
state.bunkerList = payload
uni.setStorageSync('bunkerList', state.bunkerList)
- }
+ },
+ getSamplingPersonList(state, payload) {
+ console.log('鎴戞墽琛屼簡samplingPersonList====',payload)
+ state.samplingPersonList = payload
+ uni.setStorageSync('samplingPersonList', state.samplingPersonList)
+ },
},
actions: {
websocketInit({ state, dispatch, commit }) {
// #ifdef H5
- let wsUrl = `access_token=${uni.getStorageSync('token')}`
+ let wsUrl = `${webSocketUrl}?UUID=${uni.getStorageSync('token')}`
// #endif
// #ifndef H5
let wsUrl = `${webSocketUrl}?access_token=${uni.getStorageSync('token')}`
@@ -461,14 +576,33 @@
})
},
- getFiledIdCoalBunker({ state, commit }) { //鐓や粨鍒楄〃锛堥噰鏍峰湴鐐癸級
+ getSamplingPerson({ state, commit }) { //閲囨牱浜�
+ let params = {
+ current: 1,
+ size: 999,
+ type: 7
+ }
+ reqGet('pageCarAndHuoDai',params).then(res => {
+ console.log(res,'pageCarAndHuoDai======')
+ if(res.code == 0) {
+ let temp = res.data.records
+ commit('getSamplingPersonList',temp)
+ }
+ })
+ },
+ getFiledIdCoalBunker({ state, commit }) { //浠撳簱鍒楄〃锛堥噰鏍峰湴鐐癸級
let filedId = uni.getStorageSync('filedId')
console.log(filedId,'鏈�缁堢殑filedId=============')
reqGet('getFiledIdCoalBunker', {filedId: filedId}).then(res => {
- console.log(res,'res----鐓や粨')
+ console.log(res,'res----浠撳簱')
commit('getBunkerList',res.data)
})
},
+ },
+ getters:{
+ websocketData:(state) => state.websocketData,
+ samplingPersonList: (state) => state.samplingPersonList
+
}
})
--
Gitblit v1.9.1