修复多个bug

qingyiay

2023-04-08 237a32aadb51f4c7f51d4734f6e62663f8acde36

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

@@ -8,37 +8,57 @@
            <view class="top_right">
               <view class="">
                  称重:
                  <u--text type="success" text="正常" size="34"></u--text>
                  <u--text :type="realTimeWeigh == 0 ? 'error' : 'success'" :text="realTimeWeigh == 0 ? '异常' : '正常'" size="34"></u--text>
               </view>
               <view class="">
                  红外:
                  <u--text type="success" text="正常" size="34"></u--text>
                  <u--text :type="infraredStatus ? 'error' : 'success'" :text="infraredStatus ? '异常' : '正常'" size="34"></u--text>
               </view>
               <view class="">
               <!-- <view class="">
                  雷达:
                  <u--text type="success" text="正常" size="34"></u--text>
               </view>
               </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>
         <p>订单类型：{{ weighList.orderTye || '' }}</p>
         <p>订单余量：{{ weighList.orderSurplus }}</p>
         <p>皮重：{{ weighList.skin || 0 }}</p>
         <p>毛重：{{ weighList.hair || 0 }}</p>
         <p>净重：{{ weighList.skin == 0 && weighList.hair == 0 ? weighList.clean : weighList.skin != 0 ? realTimeWeigh - weighList.skin : weighList.hair - realTimeWeigh }}</p>
         <p>煤种名称：{{ weighList.coalName }}</p>
         <p>单位名称：{{ weighList.deptName }}</p>
         <p>矿场名称：{{ weighList.filedName }}</p>
         <p>订单余量：{{ weighList.orderSurplus || 0 }}</p>
         <p>皮重：{{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin }}</p>
         <p>毛重：{{ temporaryWeighObj.hair == 0 ? weighList.hair : temporaryWeighObj.hair }}</p>
         <p>净重：{{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean }}</p>
         <p>煤种名称：{{ weighList.coalName || '' }}</p>
         <p>单位名称：{{ weighList.deptName || '' }}</p>
         <p>矿场名称：{{ weighList.filedName || '' }}</p>
      </view>
      <view class="three">
         <!-- 外销订单成皮时，返回加减吨按钮置灰。称毛时可用.外购订单，不出现返回加减吨的按钮 -->
         <u-button type="primary" text="确定称重" :loading="isConfirmWeighLoading" 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="放空" plain @click="evacuation" throttleTime="500" :disabled="isEvacuation"></u-button>
         <!-- 外销订单称皮时，返回加减吨按钮置灰。称毛时可用.外购订单，不出现返回加减吨的按钮 -->
         <u-button
            type="primary"
            text="确定称重"
            :disabled="realTimeWeigh == 0 || infraredStatus"
            :loading="isConfirmWeighLoading"
            loadingText="加载中"
            @click="confirmWeigh"
         ></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>

@@ -47,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;
@@ -71,7 +92,7 @@
         isConfirmWeighLoading: false, //确定称重按钮
         realTimeWeigh: '',
         weighList: {},
         webSocket: null // webSocket实例
         webSocket: null, // webSocket实例
         // lockReconnect: false, // 重连锁，避免多次重连
         // maxReconnect: 6, // 最大重连次数， -1 标识无限重连
         // reconnectTime: 0, // 重连尝试次数
@@ -82,7 +103,37 @@
         //    pongTimeoutObj: null, // 接收心跳响应的定时器
         //    pingMessage: JSON.stringify({ type: 'ping' }) // 心跳请求信息
         // }
         // 临时称重对象
         temporaryWeighObj: {
            skin: 0,
            hair: 0,
            clean: 0
         },
         infraredStatus: false, // 红外状态，
         // 放空控制
         evacuationModalShow: false,
         evacuationTitle: '第二次放空确认',
         evacuationContent: '是否确认放空'
      };
   },
   watch: {
      realTimeWeigh(newV, oldV) {
         if (this.weighList.orderTye == '外销') {
            if (this.weighList.skin == 0) {
               this.temporaryWeighObj.skin = this.realTimeWeigh;
            } else {
               this.temporaryWeighObj.hair = this.realTimeWeigh;
               this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(2);
            }
         } else if (this.weighList.orderTye == '外购') {
            if (this.weighList.hair == 0) {
               this.temporaryWeighObj.hair = this.realTimeWeigh;
            } else {
               this.temporaryWeighObj.skin = this.realTimeWeigh;
               this.temporaryWeighObj = this.weighList.hair - this.temporaryWeighObj.skin;
            }
         }
      }
   },
   onShow() {
      this.init();
@@ -92,6 +143,7 @@
      token() {
         return uni.getStorageSync('token');
      },
      // 加减煤按钮禁用与否
      addAndSubtractCoalDisabled() {
         if (this.weighList.orderTye == '外销') {
            if (this.weighList.skin == 0) {
@@ -99,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;
         }
      }
   },
@@ -162,7 +221,7 @@
      addAndSubtractCoal() {
         this.$reqPost('addAndSubtractCoal', { deptId: this.weighData.deptId, sceneId: this.weighData.sceneId, carNo: this.weighData.carNo }, 'json').then(res => {
            if (res.code == 0) {
               this.$u.toast('操作成功，即将返回上一页')
               this.$u.toast('操作成功，即将返回上一页');
               setTimeout(() => {
                  uni.navigateBack({
                     delta: 1
@@ -177,7 +236,6 @@
       * 初始化 weoSocket
       */
      initWebSocket() {
         // let wsUrl = `wss://192.168.0.120:9997/wrzs/ws/info?access_token=${this.token}`;
         let wsUrl = `${webSocketUrl}?access_token=${uni.getStorageSync('token')}`;
         socket = uni.connectSocket({
            url: wsUrl,
@@ -191,13 +249,18 @@
         socket.onOpen(() => {
            console.log('onOpen');
         });
         // 获取服务器传来的数据，做相应处理
         socket.onMessage(res => {
            // 获取服务器传来的数据，做相应处理
            console.log('socketWeigh', res);
            let nowWeigh = JSON.parse(res.data.slice(7)).weigh;
            let nowWeighHouseCode = JSON.parse(res.data.slice(7)).eqCode;
            if (nowWeighHouseCode == this.weighHouseCode) {
               this.weighData.weigh = this.realTimeWeigh = nowWeigh;
            let nowWeighObj = JSON.parse(res.data.slice(7));
            if (nowWeighObj.eqCode == this.weighHouseCode) {
               if (nowWeighObj.eqInfraredStatus) {
                  this.infraredStatus = true;
                  this.weighData.weigh = this.realTimeWeigh = nowWeighObj.weigh;
               } else {
                  this.infraredStatus = false;
                  this.weighData.weigh = this.realTimeWeigh = nowWeighObj.weigh;
               }
            }
         });
         socket.onClose(() => {
@@ -208,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;
      }
   }
};
@@ -221,7 +299,7 @@
   flex-direction: column;
   .one {
      flex: 2;
      border: vww(1) solid #dddddd;
      border: vww(2) solid #dddddd;
      margin: vww(20) vww(20) 0 vww(20);
      border-radius: vww(15);
      .top {
@@ -250,7 +328,7 @@
   }
   .two {
      flex: 4;
      border: vww(1) solid #dddddd;
      border: vww(2) solid #dddddd;
      margin: vww(20);
      border-radius: vww(10);
      padding: vww(20);
@@ -270,6 +348,9 @@
         &:nth-of-type(2) {
            margin-left: vww(10);
         }
         &:nth-of-type(3) {
            margin-left: vww(10);
         }
      }
   }
   .four {