From 237a32aadb51f4c7f51d4734f6e62663f8acde36 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期六, 08 四月 2023 17:02:18 +0800
Subject: [PATCH] 修复多个bug
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 55 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
index 2b56177..391fe04 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -20,7 +20,7 @@
</view> -->
</view>
</view>
- <view class="bottom"><text>TIP:褰撳墠鐘舵�佹甯稿彲浠ョО閲�</text></view>
+ <view class="bottom"><text>TIP:褰撳墠鐘舵�佷负姝ｅ父鏃跺彲浠ョО閲�</text></view>
</view>
<view class="two">
<p>璁㈠崟缂栧彿锛歿{ weighList.code || '' }}</p>
@@ -34,7 +34,9 @@
<p>鐭垮満鍚嶇О锛歿{ weighList.filedName || '' }}</p>
</view>
<view class="three">
- <!-- 澶栭攢璁㈠崟鎴愮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
+ <!-- 鏀剧┖ -->
+ <u-button type="primary" text="鏀剧┖" plain @click="evacuation" throttleTime="500" :disabled="isEvacuation"></u-button>
+ <!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
<u-button
type="primary"
text="纭畾绉伴噸"
@@ -43,9 +45,20 @@
loadingText="鍔犺浇涓�"
@click="confirmWeigh"
></u-button>
- <u-button type="primary" text="杩斿洖鍔犲噺鍚�" :disabled="addAndSubtractCoalDisabled" v-if="weighList.orderTye == '澶栭攢'" @click="addAndSubtractCoal"></u-button>
+ <u-button type="primary" text="杩斿洖鍔犲噺鍚�" :disabled="addAndSubtractCoalDisabled" @click="addAndSubtractCoal" class="jiajian"></u-button>
</view>
- <view class="four">濡傛偍闇�瑕佽皟鏁磋杞借揣鍝佸惃鏁帮紝璇风偣鍑昏繑鍥炲姞鍑忓惃</view>
+ <view class="four" v-if="weighList.orderTye == '澶栭攢'">濡傛偍闇�瑕佽皟鏁磋杞借揣鍝佸惃鏁帮紝璇风偣鍑昏繑鍥炲姞鍑忓惃</view>
+ <!-- 鏀剧┖寮圭獥 -->
+ <view class="evacuationModal">
+ <u-modal
+ :show="evacuationModalShow"
+ :title="evacuationTitle"
+ :content="evacuationContent"
+ :showCancelButton="true"
+ @confirm="evacuationConfirm"
+ @cancel="evacuationCancel"
+ ></u-modal>
+ </view>
</view>
</template>
@@ -54,6 +67,7 @@
import { webSocketUrl } from '@/api/request.js';
export default {
onLoad(params) {
+ console.log(params, '绗簩娆℃斁绌哄弬鏁�');
this.takeCoalId = params.takeCoalId;
this.weighData.sceneId = params.sceneId;
this.weighData.gateCameraId = params.gateCameraId;
@@ -95,7 +109,11 @@
hair: 0,
clean: 0
},
- infraredStatus: false // 绾㈠鐘舵��
+ infraredStatus: false, // 绾㈠鐘舵�侊紝
+ // 鏀剧┖鎺у埗
+ evacuationModalShow: false,
+ evacuationTitle: '绗簩娆℃斁绌虹‘璁�',
+ evacuationContent: '鏄惁纭鏀剧┖'
};
},
watch: {
@@ -105,7 +123,7 @@
this.temporaryWeighObj.skin = this.realTimeWeigh;
} else {
this.temporaryWeighObj.hair = this.realTimeWeigh;
- this.temporaryWeighObj.clean = this.temporaryWeighObj.hair - this.weighList.skin;
+ this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(2);
}
} else if (this.weighList.orderTye == '澶栬喘') {
if (this.weighList.hair == 0) {
@@ -133,6 +151,13 @@
} else if (this.weighList.skin != 0) {
return false;
}
+ }
+ },
+ isEvacuation() {
+ if (this.weighList.hair == this.weighList.skin || this.temporaryWeighObj.skin == this.temporaryWeighObj.hair) {
+ return false;
+ } else {
+ return true;
}
}
},
@@ -246,6 +271,21 @@
console.log('socket鎶ラ敊', err);
this.$u.toast('纾呮埧鎺ュ彛鏆傛椂涓嶈兘浣跨敤锛岃閲嶆柊杩涘叆璇ラ〉闈紝閲嶈瘯锛侊紒');
});
+ },
+ // 鏀剧┖
+ evacuation() {
+ this.evacuationModalShow = true;
+ },
+ // 鏀剧┖寮圭獥纭
+ evacuationConfirm() {
+ this.$reqPost('getTwoEvacuation', this.weighData, 'json').then(res => {
+ console.log(res, '绗簩娆℃斁绌�');
+ this.evacuationModalShow = false;
+ });
+ },
+ // 鏀剧┖寮圭獥鍙栨秷
+ evacuationCancel() {
+ this.evacuationModalShow = false;
}
}
};
@@ -308,6 +348,9 @@
&:nth-of-type(2) {
margin-left: vww(10);
}
+ &:nth-of-type(3) {
+ margin-left: vww(10);
+ }
}
}
.four {
--
Gitblit v1.9.1