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

@@ -60,31 +60,37 @@
               <view class="suffix">{{ weighList.filedName || '' }}</view>
            </view>
            <!-- <view class="main-information">
               <view class="prefix">煤种名称:</view>
               <view class="prefix">物料名称:</view>
               <view class="suffix">{{ weighList.coalName || '' }}</view>
            </view> -->
            <view class="main-information">
               <view class="prefix">订单类型:</view>
               <view class="suffix">{{ weighList.orderType || '' }}</view>
            </view>
            <view class="main-information">
            <!-- <view class="main-information"  v-if="isweight">
               <view class="prefix">皮重:</view>
               <view class="suffix">
                  {{currentSkin}}
               </view>
            </view>
            <view class="main-information">
            <view class="main-information"  v-if="isweight">
               <view class="prefix">毛重:</view>
               <view class="suffix">
                  {{currentHair}}
               </view>
            </view>
            <view class="main-information">
            <view class="main-information" v-if="isweight">
               <view class="prefix">净重:</view>
               <view class="suffix">
                  {{ currentClean}}
               </view>
            </view>
            <view class="main-information" v-else>
               <view class="prefix">净重:</view>
               <view class="suffix">
                  {{ isWeightclean}}
               </view>
            </view> -->
            <!-- <view class="main-information">
               <view class="prefix">订单余量:</view>
               <view class="suffix">{{ weighList.orderSurplus || 0 }}</view>
@@ -92,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"
@@ -136,13 +142,14 @@
</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';
   import weighItem from '@/components/weighItem.vue'
   export default {
      onLoad(params) {

         this.isWeighing = params.isWeighing; // 当前是不是回磅的
         this.takeCoalId = params.takeCoalId;
         this.weighData.sceneId = params.sceneId;
         this.weighData.gateCameraId = params.gateCameraId;
@@ -164,6 +171,8 @@
      },
      data() {
         return {
            isWeighing:'',
            timer:null,
            weighData: {
               //确认称重接口参数
               deptId: '',
@@ -192,7 +201,8 @@
            temporaryWeighObj: {
               skin: null,
               hair: null,
               clean: null
               clean: null,
               isWeightclean:null,
            },
            infraredStatus: false, // 红外状态，
            // 放空控制
@@ -228,16 +238,16 @@
         globalweigh: {
            handler: function(newV) {
               this.weighData.weigh = this.realTimeWeigh = newV;
               if (this.weighList.orderType == '外销' || this.weighList.orderType == '内销' || this.weighList
                  .orderType == '转出') {
               if  ((this.weighList.orderType == '外销' || this.weighList.orderType == '内销' || this.weighList
                  .orderType == '转出')) {
                  if (!this.showWeigh.skin) {
                     this.temporaryWeighObj.skin = newV;
                  } else {
                     this.temporaryWeighObj.hair = newV;
                     this.isweigh = Number(this.currentClean) < 0;
                  }
               } else if (this.weighList.orderType == '外购' || this.weighList.orderType == '内购' || this.weighList
                  .orderType == '转入') {
               } else if ( (this.isweight) && (this.weighList.orderType == '外购' || this.weighList.orderType == '内购' || this.weighList
                  .orderType == '转入')) {
                  if (!this.showWeigh.hair) {
                     this.temporaryWeighObj.hair = newV;
                  } else {
@@ -246,17 +256,60 @@
                        .showWeigh
                        .skin > 0;
                  }
               }
               }else if((this.weighList.orderType == '外购' || this.weighList.orderType == '内购' || this.weighList
                  .orderType == '转入') && (!this.isweight)){
                     if (!this.showWeigh.skin) {
                     this.temporaryWeighObj.skin = newV;
                     this.temporaryWeighObj.isWeightclean = newV;
                  } else {
                     this.temporaryWeighObj.isWeightclean = newV;

                     this.isweigh = Number(this.currentClean) < 0;
                  }
                  }
            },
            deep: true
         }
      },
      onPullDownRefresh() {
         if (!this.globalisconnect && !this.globalisUploadimg && this.globalisLogin) {
            if (!this.is_open_socket) {
               this.$store.dispatch('websocketInit')
               this.changeisconnect(false);
               console.log('称重的ws');
               uni.stopPullDownRefresh();
            } else {
               uni.stopPullDownRefresh();
            }
         }
      },
      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']),
         ...mapState(['globalweigh', 'globalinfraredStatus', 'globalWarning', 'globalisconnect', 'globalisUploadimg',
            'globalisLogin', 'socketTask','is_open_socket'
         ]),
         token() {
            return uni.getStorageSync('token');
         },
@@ -307,10 +360,26 @@
                  .currentHair - this.currentSkin).toFixed(2) : ''
            }

         },
         isWeightclean(){
            console.log(this.temporaryWeighObj,'his.temporaryWeighObj')
            return this.temporaryWeighObj.skin || ''
         },
         isweight(){
            if(this.isWeighing){
               if(this.isWeighing == '不回磅'){
                  return false
               }else{
                  return true
               }

            }else{
               return true
            }
         }
      },
      methods: {
         ...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh']),
         ...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh','changereconnectNum','changesocketTask']),
         init() {
            uni.showLoading({
               title: '加载中'
@@ -370,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 : '称重失败');
               });
         },
         // 加减煤
@@ -463,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;
@@ -705,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);
@@ -716,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;