Merge branch 'develop/steels' into feature/steels/yangan

yangan

2024-06-28 3fef62b03c16aa69c109c355150cdb698b777feb

 pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue

@@ -98,7 +98,7 @@
         </view>
      </view>
      <!--  称重历史-->
      <weigh-item :list="weighHistory"></weigh-item>
      <weigh-item :list="weighHistory" class="weighingDecive-item"></weigh-item>
      <view class="three">
         <!-- .外购订单，不出现返回加减吨的按钮 -->
         <u-button type="primary"
@@ -142,7 +142,6 @@
</template>

<script>
   let socket = null;
   import { webSocketUrl, onlineurl } from '@/api/request.js';
   import { mapState, mapMutations } from 'vuex';
   import combinedTitle from '@/components/combined-title/combined-title.vue';
@@ -173,6 +172,7 @@
      data() {
         return {
            isWeighing:'',
            timer:null,
            weighData: {
               //确认称重接口参数
               deptId: '',
@@ -286,10 +286,29 @@
      onShow() {
         this.init();
         // this.realTimeWeigh = 0
           if (this.timer) {
                clearTimeout(this.timer)
            }
            this.timer = setTimeout(() => {
                if (!this.globalweigh) {
                    console.log('称重时自动重连');
                    this.socketTask.close();
                    this.changesocketTask(null);
                    this.changereconnectNum({ connectNum: 1, isWeigh: true })
                    this.$store.dispatch('websocketInit');
                }
            }, 3000)
      },
        onHide() {
            clearTimeout(this.timer)
        },
        onUnload() {
            clearTimeout(this.timer)
        },

      computed: {
         ...mapState(['globalweigh', 'globalinfraredStatus', 'globalWarning', 'globalisconnect', 'globalisUploadimg',
            'globalisLogin', 'is_open_socket'
            'globalisLogin', 'socketTask','is_open_socket'
         ]),
         token() {
            return uni.getStorageSync('token');
@@ -360,7 +379,7 @@
         }
      },
      methods: {
         ...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh']),
         ...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh','changereconnectNum','changesocketTask']),
         init() {
            uni.showLoading({
               title: '加载中'
@@ -420,12 +439,13 @@
                        this.isConfirmWeighLoading = false;
                     }, 1000);
                  } else {
                     this.$u.toast('称重失败，请稍后重试');
                     this.$u.toast('称重失败，请稍后重试' + (res.msg ? res.msg : ''));
                  }
               })
               .catch(err => {
                  this.isConfirmWeighLoading = false;
                  console.log(err);
                  this.$u.toast(err.msg ? err.msg : '称重失败');
               });
         },
         // 加减煤
@@ -513,6 +533,12 @@

<style lang="scss"
   scoped>
   .weighingDecive-item{
      min-height: 200rpx!important;
      .weigh-history {
         min-height: 200rpx!important;
      }
   }
   @mixin flex {
      display: flex;
      justify-content: space-between;
@@ -755,7 +781,7 @@
      .bottom-block {
         width: calc(100% - 60rpx);
         box-sizing: border-box;
         height: 630rpx;
         height: 420rpx;
         margin: 0 vww(15) vww(15) vww(15);
         background: #ffffff;
         box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
@@ -766,8 +792,8 @@

         .block-main {
            width: 94%;
            height: 565rpx;
            margin-top: vww(10);
            height: 420rpx;
            margin-top: vww(5);
            @include flex;
            justify-content: space-around;
            align-items: flex-start;