From feadd98b8227d0f223e2695f8665bc2d573f7c92 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 01 八月 2024 15:22:27 +0800
Subject: [PATCH] feat:打包上传
---
pages/loadUnload-page/selectTarget/selectTarget.vue | 113 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 84 insertions(+), 29 deletions(-)
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index 71fd9d3..f18c4e9 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -2,7 +2,7 @@
<view class="main">
<!-- 褰撳墠閫夋嫨浠撳簱 -->
<view class="top-tag">
- <text>鐐瑰嚮鍒囨崲/閫夋嫨浠撳簱</text>
+ <text style="margin-right:20rpx">鐐瑰嚮鍒囨崲/閫夋嫨浠撳簱</text>
<u-tag
size='large'
icon='map'
@@ -11,6 +11,7 @@
></u-tag>
</view>
<!-- 鐐瑰嚮鏌ョ湅鍘熺洂閽欓晛 -->
+
<view class="self-deliver">
<view class="self-deliver_text">
鏌ョ湅鍘熺洂閽欓晛缁撴灉
@@ -22,6 +23,11 @@
@click="todoDetail"></u-button>
</view>
</view>
+ <view
+ v-if="messageObj.carNo"
+ class="notice-bar"><u-notice-bar :text="messageText"
+ :fontSize="30" :showIcon = 'true'
+ ></u-notice-bar></view>
<!-- <u--form labelPosition="top"
labelWidth="20%"
:borderBottom="false"
@@ -98,14 +104,14 @@
<uni-table border stripe
emptyText="鏆傛棤鏇村鏁版嵁">
<uni-tr>
- <uni-th width='140'
+ <uni-th width='120'
align="center">鎿嶄綔</uni-th>
<uni-th align="center" width='120'>浜у搧</uni-th>
- <uni-th align="center" width='220'>浠撳簱</uni-th>
- <uni-th align="center" width='120'>鐨噸</uni-th>
- <uni-th align="center" width='120'>姣涢噸</uni-th>
- <uni-th align="center" width='120'>鍑�閲�</uni-th>
- <uni-th align="center" width='120'>鏁伴噺</uni-th>
+ <uni-th align="center" width='200'>浠撳簱</uni-th>
+ <uni-th align="center" width='100'>鐨噸</uni-th>
+ <uni-th align="center" width='100'>姣涢噸</uni-th>
+ <uni-th align="center" width='100'>鍑�閲�</uni-th>
+ <uni-th align="center" width='100'>鏁伴噺</uni-th>
<!-- <uni-th align="center">浠撳簱</uni-th> -->
<!-- <uni-th align="center">鐘舵��</uni-th> -->
@@ -231,6 +237,7 @@
<script>
import { BaseUrl } from '@/api/publicInterface.js'
+ import { mapState, mapMutations, mapGetters } from 'vuex';
export default {
props: {
loadUnloadData: {
@@ -254,7 +261,16 @@
}
- }
+ },
+ messageText(){
+ if(this.messageObj.carNo){
+ return `鏃堕棿:${this.messageObj.now}锛�${this.messageObj.carNo}锛屼骇鍝�${this.messageObj.productNames}鍦�${this.messageObj.bunkerName}鍏ュ満浜嗭紝璇峰強鏃舵鏌ワ紒`
+ }else{
+ return '鏆傛棤娑堟伅'
+ }
+
+ },
+ ...mapGetters(['websocketData'])
},
watch: {
@@ -265,6 +281,29 @@
},
deep: true,
immediate: true
+ },
+ //鐩戝惉娑堟伅
+ 'websocketData': {
+ handler(v) {
+ console.log(v, '鎺ュ彈鐨剋s鏁版嵁');
+ if(v) {
+ if (v.startsWith('kgTipHead')) {
+ console.log('vvvvv',v.slice(11))
+ let nowWeighObj = JSON.parse(v.slice(11));
+ console.log(nowWeighObj,'nowWeight');
+ this.messageObj = nowWeighObj;
+ // 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;
+ }
+ }
+ },
+ deep: true,
+ immediate: true
}
},
data() {
@@ -273,7 +312,10 @@
firstClass: "",
secondClass: "",
orderType: '',
- bunkerId:""
+ bunkerIds:""
+ },
+ messageObj:{
+ carNo:'',
},
isEmptyCar:null, //鏄惁绌鸿溅鍑哄巶
checkStatusList:[
@@ -343,9 +385,10 @@
if (res.code === 0) {
this.firstClassActionsList = res.data;
if(res.data.length){
- this.dataForm.bunkerId = res.data[0].id;
- uni.setStorageSync('bunkerId',res.data[0].id)
- this.dataForm.firstClass = res.data[0].name;
+ this.dataForm.bunkerIds = res.data.map(item=>item.id).join(',')
+ uni.setStorageSync('bunkerIds',res.data.map(item=>item.id).join(','))
+ this.firstClassActionsList.unshift({name:'鍏ㄩ儴',id:res.data.map(item=>item.id).join(',')})
+ this.dataForm.firstClass = '鍏ㄩ儴'
this.getDetailData();
}
@@ -366,7 +409,7 @@
uni.showLoading({
title:'鍔犺浇涓�'
})
- this.$reqGet('getTaskCoalListByBunkerId', { bunkerId:this.dataForm.bunkerId }).then(res => {
+ this.$reqGet('getTaskCoalListByBunkerId', { bunkerIds:this.dataForm.bunkerIds }).then(res => {
uni.hideLoading();
if (res.code === 0) {
this.detailData = res.data.map(item=>{
@@ -389,8 +432,9 @@
},
firstClassSelectClick(val) {
this.dataForm.firstClass = val.name;
- this.dataForm.bunkerId= val.id;
- uni.setStorageSync('bunkerId', val.id);
+ this.dataForm.bunkerIds= val.id;
+ uni.removeStorageSync('bunkerIds')
+ uni.setStorageSync('bunkerIds', val.id);
this.getDetailData();
this.filedId = val.id
},
@@ -543,18 +587,12 @@
uni.hideLoading()
if (res.code === 0) {
this.firstClassActionsList = res.data;
- if(res.data.length === 1){
- this.dataForm.bunkerId = res.data[0].id;
- uni.setStorageSync('bunkerId', res.data[0].id)
- this.dataForm.firstClass = res.data[0].name;
- }
} else {
this.$u.toast('鍔犺浇澶辫触')
}
}).then(() => {
- this.getUserInfo()
});
@@ -572,16 +610,31 @@
/deep/ .uni-table{
min-width: 0!important;
margin-left: 20rpx;
+ width: auto;
}
}
+.notice-bar{
+ margin-left: vww(10);
+ margin-bottom: 20rpx;
+ margin-top: 20rpx;
+
+ width: 98%;
+ .u-notice-bar{
+ border-radius: 20rpx;
+ margin-top: 20rpx;
+ height: 40rpx;
+ }
+}
// 鑷富閰嶉��
.self-deliver {
- position: relative;
+ position: relative;
+ text-indent: 20rpx;
top: vww(10);
- width: 98%;
+ width: 95%;
height: vww(40);
- margin: vww(8) 10rpx;
+ margin: vww(13) 10rpx;
+ margin-left: 20rpx;
padding: 0 vww(8);
background: #ffffff;
box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
@@ -591,9 +644,10 @@
justify-content: space-between;
/deep/.u-button {
width: 100%;
- // height: 28px !important;
+ height: 28px !important;
line-height: 40px;
padding: 0 12px;
+ text-indent: 0!important;
font-size: 28rpx;
font-weight: 300;
color: #ffffff;
@@ -657,14 +711,15 @@
position: relative;
top: vww(-160);
.top-tag{
- width: 33%;
+ width: 60%;
+ margin-left: 55%;
height: 100rpx;
- margin-left: 65%;
+ margin-left: 50%;
display: flex;
/* margin-top: 40rpx; */
color: #fff;
align-items: center;
- justify-content: space-between;
+
}
.div-box{
@@ -712,7 +767,7 @@
}
}
.history-information {
- margin-bottom:50rpx;
+ margin-bottom:30rpx;
margin-top: 10rpx;
background: #ffffff;
border-radius: 20rpx;
--
Gitblit v1.9.1