Merge remote-tracking branch 'origin/master'

jiangping

2025-01-25 cdb1fa01619623ed56e6a946bff35b9f48b2e1f8

Merge remote-tracking branch 'origin/master'

 h5/pages/applicationRecord/applicationRecord.vue

@@ -103,12 +103,20 @@
      }
    }
  },
  onLoad() {
  onShow() {
      this.pagination.page = 0
      this.list = []
    this.getList()
  },
  onReachBottom() {
    if (this.total > 10) {
        const {
            total,
            list
        } = this
        if (list.length < total) {
      this.getList()
        } else {
            this.showToast('暂无更多数据')
    }
  },
  methods: {

 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>
@@ -66,6 +66,7 @@
        },

        onShow() {

            this.page = 1

            this.datalist = []

            this.getList()

        },

        onReachBottom() {


 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/#/'


 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>

 screen/src/views/LogisticsCenter.vue

@@ -63,21 +63,22 @@
                  </div>

                </div>
                <div class="content">
                <div class="content" v-if="false">
                  <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>

@@ -2907,6 +2908,7 @@
        color: #01D9FE;
        width: 70px;
      }

      .val{
        flex: 1;
      }