From 52c15f14c6a71dda31780ad92e6cbe881a6a635a Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 24 一月 2025 15:54:50 +0800
Subject: [PATCH] ll
---
h5/utils/config.js | 4 ++--
screen/src/views/LogisticsCenter.vue | 12 ++++++------
h5/pages/driver/reservedRecord.vue | 7 ++++---
h5/pages/applicationRecord/applicationRecord.vue | 18 +++++++++++++-----
screen/src/views/FireFighting.vue | 2 +-
5 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/h5/pages/applicationRecord/applicationRecord.vue b/h5/pages/applicationRecord/applicationRecord.vue
index 6a17869..c7b2b4e 100644
--- a/h5/pages/applicationRecord/applicationRecord.vue
+++ b/h5/pages/applicationRecord/applicationRecord.vue
@@ -103,13 +103,21 @@
}
}
},
- onLoad() {
- this.getList()
+ onShow() {
+ this.pagination.page = 0
+ this.list = []
+ this.getList()
},
onReachBottom() {
- if (this.total > 10) {
- this.getList()
- }
+ const {
+ total,
+ list
+ } = this
+ if (list.length < total) {
+ this.getList()
+ } else {
+ this.showToast('鏆傛棤鏇村鏁版嵁')
+ }
},
methods: {
handleDetail(id) {
diff --git a/h5/pages/driver/reservedRecord.vue b/h5/pages/driver/reservedRecord.vue
index d0258c6..cf93368 100644
--- a/h5/pages/driver/reservedRecord.vue
+++ b/h5/pages/driver/reservedRecord.vue
@@ -14,7 +14,7 @@
</view>
<view class="box_list_item_nr_item">
<text>鍒板満鏃堕棿锛�</text>
- <text>{{item.arriveDate.slice(5,16)}}</text>
+ <text v-if="item.arriveDate">{{item.arriveDate.slice(5,16)}}</text>
</view>
<view class="box_list_item_nr_item">
<text>鍙告満濮撳悕锛�</text>
@@ -25,7 +25,7 @@
<text>{{item.carCodeFront}}</text>
</view>
<view class="box_list_item_nr_item">
- <text class="placeholder9">{{item.createDate.slice(0,16)}}鎻愪氦</text>
+ <text class="placeholder9" v-if="item.createDate">{{item.createDate.slice(0,16)}}鎻愪氦</text>
</view>
</view>
</view>
@@ -65,7 +65,8 @@
}
},
onShow() {
- this.page = 1
+ this.page = 1
+ this.datalist = []
this.getList()
},
onReachBottom() {
diff --git a/h5/utils/config.js b/h5/utils/config.js
index 08884a3..05ff784 100644
--- a/h5/utils/config.js
+++ b/h5/utils/config.js
@@ -1,8 +1,8 @@
-export const baseUrl = 'zhyq_interface/'
+// export const baseUrl = 'zhyq_interface/'
// export const baseUrl = 'http://192.168.0.173/gateway_interface/'
// export const baseUrl = 'http://10.50.250.253:8088/gateway_interface/'
-// export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/'
+export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/'
export const app_url = 'https://atwl.ahzyssl.com/zhyq_h5/#/'
diff --git a/screen/src/views/FireFighting.vue b/screen/src/views/FireFighting.vue
index b6fa2a4..d76046e 100644
--- a/screen/src/views/FireFighting.vue
+++ b/screen/src/views/FireFighting.vue
@@ -161,7 +161,7 @@
v-if="dataList8[dataIndex8].humidityData && dataList8[dataIndex8].humidityData.latestValue">{{
Number(dataList8[dataIndex8].humidityData.latestValue).toFixed(1) }}<span>%</span></div>
<div class="la">闃堝�� {{ dataList8[dataIndex8].humidityData?.alarmLow }}锝瀧{
- dataList8[dataIndex8].humidityData?.alarmHigh }}掳C</div>
+ dataList8[dataIndex8].humidityData?.alarmHigh }}%</div>
</div>
</div>
</div>
diff --git a/screen/src/views/LogisticsCenter.vue b/screen/src/views/LogisticsCenter.vue
index caf08ca..9ed8c3d 100644
--- a/screen/src/views/LogisticsCenter.vue
+++ b/screen/src/views/LogisticsCenter.vue
@@ -66,18 +66,18 @@
<div class="content">
<div class="unit_wrap">
<span class="la">鍚屾瘮</span>
- <template v-if="StockOutData.currentNum && StockOutData.lastNum">
- <img v-if="StockOutData.currentNum >= StockOutData.lastNum" src="@/assets/images/ic_up.png"
+ <template v-if="StockOutData.sameOutNum">
+ <img v-if="StockOutData.currentOutNum >= StockOutData.sameOutNum" src="@/assets/images/ic_up.png"
class="icon" alt="">
<img v-else src="@/assets/images/ic_down.webp" class="icon" alt="">
</template>
- <span v-if="StockOutData.lastNum && StockOutData.currentNum">{{ Math.abs((((StockOutData.currentNum
+ <span v-if="StockOutData.sameOutNum">{{ Math.abs((((StockOutData.currentOutNum
-
- StockOutData.lastNum) /
- StockOutData.lastNum)
+ StockOutData.sameOutNum) /
+ StockOutData.sameOutNum)
* 100).toFixed(2)) }}%</span>
<span v-else style="margin-left: 6px;">-</span>
- <span class="la" style="margin-left: 30px;margin-right: 10px;">绱鍑哄簱杞︽</span>
+ <span v-if="StockOutData.totalCarNum" class="la" style="margin-left: 30px;margin-right: 10px;">绱鍑哄簱杞︽</span>
<span>{{ StockOutData.totalCarNum || '' }}</span>
</div>
--
Gitblit v1.9.3