From 82a7eba143cc761b303b99889193f7aad2dc9d08 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 28 八月 2023 08:56:08 +0800
Subject: [PATCH] 修改bug，称重页面增加历史和异常原因填写
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 1079 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 931 insertions(+), 148 deletions(-)
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
index 11f6dac..1ee26ca 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -1,188 +1,971 @@
<template>
<view class="weighingDevice">
- <view class="one">
+ <view class="one"
+ style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/weighbanner.png') no-repeat;
+ background-size: cover;">
<view class="top">
- <view class="top_left"><text>41.5</text></view>
+ <view class="top_left">
+ <!-- <text>{{ realTimeWeigh }}</text> -->
+ <text>{{ globalweigh }}</text>
+ </view>
<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>
- </view>
- <view class="">
- 闆疯揪:
- <u--text type="success" text="姝ｅ父" size="34"></u--text>
+ <u--text :type="globalinfraredStatus ? 'error' : 'success'"
+ :text="globalinfraredStatus ? '寮傚父' : '姝ｅ父'"
+ size="34"></u--text>
</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.allowance }}</p>
- <p>鐨噸锛歿{ weighList.skin || '' }}</p>
- <p>姣涢噸锛歿{ weighList.hair || '' }}</p>
- <p>鍑�閲嶏細{{ weighList.clean || '' }}</p>
+ <view class="middle-block"
+ v-if="firstHairCustomernameShow || sideline">
+ <view class="block-main"
+ v-if="firstHairCustomernameShow">
+ <view class="first-line"><combined-title title="鍘熷彂淇℃伅"></combined-title></view>
+ <view class="second-line">
+ <view class="label-text"
+ :class="{ focusClass: isfocus1 }">鐨噸</view>
+ <view class="input-container"
+ :class="{ inputClass: isfocus1, disabledClass: haveInputOrigin }">
+ <u--input placeholder="璇疯緭鍏ョ毊閲�"
+ border="surround"
+ v-model="weighData.coalContactSkin"
+ @focus="inputFocus(1)"
+ @blur="inputBlur"
+ @change="inputChange"
+ :disabled="haveInputOrigin"></u--input>
+ </view>
+ <view class="unit"
+ :class="{ focusClass: isfocus1 }">鍚�</view>
+ </view>
+ <view class="second-line">
+ <view class="label-text"
+ :class="{ focusClass: isfocus2 }">姣涢噸</view>
+ <view class="input-container"
+ :class="{ inputClass: isfocus2, disabledClass: haveInputOrigin }">
+ <u--input placeholder="璇疯緭鍏ユ瘺閲�"
+ border="surround"
+ v-model="weighData.coalContactHair"
+ @focus="inputFocus(2)"
+ @blur="inputBlur"
+ @change="inputChange"
+ :disabled="haveInputOrigin"></u--input>
+ </view>
+ <view class="unit"
+ :class="{ focusClass: isfocus2 }">鍚�</view>
+ </view>
+ <view class="second-line">
+ <view class="label-text">鍑�閲�</view>
+ <view class="input-container"
+ :class="{ disabledClass: haveInputOrigin }">
+ <u--input placeholder="鍑�閲�"
+ border="surround"
+ v-model="coalContactClean"
+ :disabled="haveInputOrigin"></u--input>
+ </view>
+ <view class="unit">鍚�</view>
+ </view>
+ </view>
+ <view class="block-sideline"
+ v-if="sideline">
+ <view class="first-line"><combined-title title="鍘熷彂淇℃伅"></combined-title></view>
+ <view class="weigh-item">
+ <view class="item">
+ <view class="concrete"
+ style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
+ 鐨�</view>
+ <view class="num">{{ weighList.skinTwo }}</view>
+ </view>
+ <view class="item">
+ <view class="concrete"
+ style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
+ 姣�</view>
+ <view class="num">{{ weighList.hairTwo }}</view>
+ </view>
+ <view class="item">
+ <view class="concrete"
+ style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
+ 鍑�</view>
+ <view class="num">{{ weighList.cleanTwo }}</view>
+ </view>
+ </view>
+ </view>
+ </view>
+ <view v-else
+ style="width: 100%;height: 40rpx;"></view>
+ <view class="history-utils">
+ <view class="history-utils_item">
+ 骞冲潎鐨噸:{{avgSkin}}
+ </view>
+ <view class="history-utils_item btn">
+ <u-button plain
+ type="primary"
+ :text="historyShow?'闅愯棌鍘嗗彶绉伴噸':'鏄剧ず鍘嗗彶绉伴噸'"
+ @click="historyShow=!historyShow"></u-button>
+ </view>
+ </view>
+ <Transition name="slide-fade">
+ <view class="history-skin"
+ v-show="historyShow">
+ <view class="table-title">
+ <view class="table-title_item time">
+ 绉伴噸鏃堕棿
+ </view>
+ <view class="table-title_item coal-name">
+ 鐓ょ鍚嶇О
+ </view>
+ <view class="table-title_item skin">
+ 鐨噸閲嶉噺
+ </view>
+ </view>
+ <view class="history-skin_item"
+ v-for="item in tmTaskCoalList">
+ <view class="item createTime">
+ {{item.createTime||"" }}
+ </view>
+ <view class="item">
+ {{item.coalName||"" }}
+ </view>
+ <view class="item skin">
+ <view class="">
+ {{item.skin||"" }}
+ </view>
+ </view>
+ </view>
+ </view>
+ </Transition>
+ <view class="bottom-block">
+ <view class="block-main">
+ <view class="main-information"
+ v-if="weighList.orderType=='杞叆'||weighList.orderType=='杞嚭'">
+ <view class="prefix">
+ 鍙戣揣鍦扮叅鍦�:
+ </view>
+ <view class="suffix">
+ {{ weighList.filedName || '' }}
+ </view>
+ </view>
+ <view class="main-information"
+ v-if="weighList.orderType=='杞叆'||weighList.orderType=='杞嚭'">
+ <view class="prefix">
+ 鏀惰揣鍦扮叅鍦�:
+ </view>
+ <view class="suffix">
+ {{ weighList.toFiledName || '' }}
+ </view>
+ </view>
+ <view class="main-information"
+ v-if="weighList.orderType!=='杞叆'||weighList.orderType!=='杞嚭'">
+ <view class="prefix">瀹㈡埛:</view>
+ <view class="suffix">{{ weighList.customerName }}</view>
+ </view>
+ <view class="main-information"
+ v-if="weighList.orderType!=='杞叆'||weighList.orderType!=='杞嚭'">
+ <view class="prefix">鐭垮満:</view>
+ <view class="suffix">{{ weighList.deptName || '' }}</view>
+ </view>
+ <view class="main-information"
+ v-if="weighList.orderType!=='杞叆'||weighList.orderType!=='杞嚭'">
+ <view class="prefix">鐓ゅ満:</view>
+ <view class="suffix">{{ weighList.filedName || '' }}</view>
+ </view>
+ <view class="main-information">
+ <view class="prefix">鐓ょ鍚嶇О:</view>
+ <view class="suffix">{{ weighList.coalName || '' }}</view>
+ </view>
+ <view class="main-information">
+ <view class="prefix">鐨噸:</view>
+ <view class="suffix">
+ {{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin||"" }}
+ </view>
+ </view>
+ <view class="main-information">
+ <view class="prefix">姣涢噸:</view>
+ <view class="suffix">
+ {{ temporaryWeighObj.hair == 0 ? weighList.hair : temporaryWeighObj.hair||"" }}
+ </view>
+ </view>
+ <view class="main-information">
+ <view class="prefix">鍑�閲�:</view>
+ <view class="suffix">
+ {{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean ||"" }}
+ </view>
+ </view>
+ <view class="main-information">
+ <view class="prefix">璁㈠崟浣欓噺:</view>
+ <view class="suffix">{{ weighList.orderSurplus ||"" }}</view>
+ </view>
+ </view>
</view>
<view class="three">
- <!-- 澶栭攢璁㈠崟鎴愮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
- <u-button type="primary" text="纭畾绉伴噸" @click="confirmWeigh"></u-button>
- <u-button type="primary" text="杩斿洖鍔犲噺鍚�"></u-button>
+ <!-- 鏀剧┖ -->
+ <u-button type="primary"
+ text="鏀剧┖"
+ plain
+ @click="evacuation"
+ throttleTime="500"
+ :disabled="!isEvacuation"></u-button>
+ <!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
+ <u-button type="primary"
+ text="纭畾绉伴噸"
+ :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh || !isInputOrigin"
+ :loading="isConfirmWeighLoading"
+ loadingText="纭"
+ @click="confirmWeigh"
+ throttleTime="800"></u-button>
+ <u-button type="primary"
+ text="杩斿洖鍔犲噺鍚�"
+ :disabled="addAndSubtractCoalDisabled"
+ @click="addAndSubtractCoal"
+ class="jiajian"
+ v-if="outBuy"></u-button>
</view>
- <view class="four">濡傛偍闇�瑕佽皟鏁磋杞借揣鍝佸惃鏁帮紝璇风偣鍑昏繑鍥炲姞鍑忓惃</view>
+ <!-- 鏀剧┖寮圭獥 -->
+ <view class="evacuationModal">
+ <u-modal :show="evacuationModalShow"
+ :title="evacuationTitle"
+ :content="evacuationContent"
+ :showCancelButton="true"
+ @confirm="evacuationConfirm"
+ @cancel="evacuationCancel"></u-modal>
+ </view>
+ <!-- 绉伴噸寮傚父寮圭獥 -->
+ <view class="">
+ <u-modal :show="abnormalModalShow"
+ title="寮傚父鍘熷洜"
+ :showCancelButton="true"
+ @confirm="abnormalConfirm"
+ @cancel="abnormalCancel"
+ confirmText="鎻愪氦">
+ <view class="slot-content">
+ <u--form labelPosition="top">
+ <u-form-item>
+ <u-textarea v-model="abnormalContent"
+ confirmType="done"
+ placeholder="璇疯緭鍏ュ紓甯稿師鍥�"
+ height='140'
+ count
+ border="surround"
+ autoHeight></u-textarea>
+ </u-form-item>
+ </u--form>
+ </view>
+ </u-modal>
+ </view>
</view>
</template>
<script>
-let socket = null;
-import { webSocketUrl } from '@/api/request.js';
-export default {
- onLoad(params) {
- console.log('绉伴噸椤甸潰', params);
- this.takeCoalId = params.takeCoalId;
- },
- data() {
- return {
- takeCoalId: null,
- weighList: {},
- webSocket: null // webSocket瀹炰緥
- // lockReconnect: false, // 閲嶈繛閿侊紝閬垮厤澶氭閲嶈繛
- // maxReconnect: 6, // 鏈�澶ч噸杩炴鏁帮紝 -1 鏍囪瘑鏃犻檺閲嶈繛
- // reconnectTime: 0, // 閲嶈繛灏濊瘯娆℃暟
- // heartbeat: {
- // interval: 30 * 1000, // 蹇冭烦闂撮殧鏃堕棿
- // timeout: 10 * 1000, // 鍝嶅簲瓒呮椂鏃堕棿
- // pingTimeoutObj: null, // 寤舵椂鍙戦�佸績璺崇殑瀹氭椂鍣�
- // pongTimeoutObj: null, // 鎺ユ敹蹇冭烦鍝嶅簲鐨勫畾鏃跺櫒
- // pingMessage: JSON.stringify({ type: 'ping' }) // 蹇冭烦璇锋眰淇℃伅
- // }
- };
- },
- onShow() {
- this.init();
- this.initWebSocket();
- },
- computed: {
- token() {
- return uni.getStorageSync('token');
- }
- },
- methods: {
- init() {
- // 鑾峰彇绉伴噸淇℃伅
- this.$reqGet('weighList', { id: this.takeCoalId }).then(res => {
- console.log(res, '鑾峰彇绉伴噸淇℃伅');
- if (res.code == 0) {
- this.weighList = res.data;
- }
- });
+ let socket = null;
+ import { webSocketUrl } from '@/api/request.js';
+ import { mapState, mapMutations } from 'vuex';
+ import combinedTitle from '@/components/combined-title/combined-title.vue';
+ import BigNumber from "bignumber.js"
+ export default {
+ onLoad(params) {
+ this.takeCoalId = params.takeCoalId;
+ this.weighData.sceneId = params.sceneId;
+ this.weighData.gateCameraId = params.gateCameraId;
+ this.weighData.equipmentCode = params.gateCameraCode;
+ this.weighData.sceneInOut = params.sceneInOut;
+ this.weighHouseCode = params.weighHouseCode;
+ this.primarySkin = params.primarySkin;
+ this.primaryHair = params.primaryHair;
+ this.primaryClean = params.primaryClean;
+ if (params.overTmWaixiao) {
+ this.weighData.overTmWaixiao = 1
+ }
+ this.changeweighHouseCode(params.weighHouseCode);
+ this.init();
+ this.changeWeigh('')
+ this.realTimeWeigh = 0
},
- /**
- * @纭绉伴噸绛夊緟鍚庣鎻愪緵瀹炴椂绉伴噸鎺ュ彛锛岃幏鍙栫毊閲嶏紝姣涢噸
- */
- confirmWeigh() {
- // this.$reqPost('saveWeigh',{id:this.takeCoalId,skin:'',hair:''}).then(res=>{
- // console.log(res,"纭绉伴噸");
- // })
+ components: {
+ combinedTitle
},
- /**
- * 鍒濆鍖� weoSocket
- */
- initWebSocket() {
- // let wsUrl = `wss://192.168.0.120:9997/wrzs/ws/info?access_token=${this.token}`;
- let wsUrl = `${webSocketUrl}?access_token=c954c7f5-f34b-453e-8c9d-e291747b401f`;
- socket = uni.connectSocket({
- url: wsUrl,
- header: {
- CLIENT_TOC: 'Y'
+ data() {
+ return {
+ weighData: {
+ //纭绉伴噸鎺ュ彛鍙傛暟
+ deptId: '',
+ tmId: '',
+ sceneId: '',
+ carNo: '',
+ gateCameraId: '',
+ equipmentCode: '',
+ weigh: 0,
+ tmCode: '',
+ sceneInOut: '',
+ coalContactClean: 0,
+ coalContactHair: 0,
+ coalContactSkin: 0
},
- complete: res => {
- console.log(res, 'socket缁撴灉');
+ // 鏄惁濉啓鍘熷彂淇℃伅
+ isInputOrigin: false,
+ haveInputOrigin: false,
+
+ takeCoalId: null,
+ weighHouseCode: '',
+ isConfirmWeighLoading: false, //纭畾绉伴噸鎸夐挳
+ realTimeWeigh: 0,
+ weighList: {},
+ // 涓存椂绉伴噸瀵硅薄
+ temporaryWeighObj: {
+ skin: 0,
+ hair: 0,
+ clean: 0
+ },
+ infraredStatus: false, // 绾㈠鐘舵�侊紝
+ // 鏀剧┖鎺у埗
+ evacuationModalShow: false,
+ evacuationTitle: '鏀剧┖纭',
+ evacuationContent: '鏄惁纭鏀剧┖',
+ // 鑾峰彇鍘熷彂淇℃伅
+ primarySkin: null,
+ primaryHair: null,
+ primaryClean: null,
+ // 鍒ゆ柇绉伴噸鎸夐挳鏄惁鍙敤
+ isweigh: false,
+ // 澶栬喘绫诲瀷绉伴噸濉啓姣涳紝鐨紝
+ firstHairCustomernameShow: false,
+ coalContactHair: '',
+ coalContactSkin: '',
+ // 鑱氱劍鏃舵敼鍙樻牱寮�
+ isfocus1: false,
+ isfocus2: false,
+ // 澶栬喘绗竴娆＄О姣涢噸涓嶉渶瑕佸姞鍑忓惃
+ outBuy: true,
+ // 鐨噸寮傚父鐩稿叧
+ abnormalContent: '',
+ avgSkin: '', // 骞冲潎鐨噸
+ isAbnormalAvgSkin: true, //骞冲潎鐨噸鏄惁寮傚父
+ tmTaskCoalList: [],
+ abnormalModalShow: false,
+ historyBtn: false,
+ historyShow: false,
+ // 鏄惁鍦ㄧО鐨噸锛岀偣鍑荤‘瀹氱О閲嶅垽鏂槸鍚﹀紓甯�
+ isSkinWeigh: false
+ };
+ },
+ watch: {
+ realTimeWeigh(newV, oldV) {
+
+ },
+ // 鐩戝惉閲嶉噺鍙樺寲
+ globalweigh: {
+ deep: true,
+ handler: function(newV) {
+ this.weighData.weigh = this.realTimeWeigh = newV;
+ if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList
+ .orderType ==
+ '杞嚭') {
+ if (this.weighList.skin == 0) {
+ this.isSkinWeigh = true
+ this.temporaryWeighObj.skin = newV;
+ } else {
+ this.isSkinWeigh = false;
+ this.temporaryWeighObj.hair = newV;
+ this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(
+ 2);
+ this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
+ .temporaryWeighObj
+ .clean < 0;
+ }
+ } else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
+ .orderType == '杞叆') {
+ if (this.weighList.hair == 0) {
+ this.isSkinWeigh = false;
+ this.temporaryWeighObj.hair = newV;
+ } else {
+ this.isSkinWeigh = true;
+ this.temporaryWeighObj.skin = newV;
+ this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(
+ 2);
+ this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
+ .temporaryWeighObj
+ .clean < 0;
+ }
+ }
}
- });
- socket.onOpen(() => {
- console.log('onOpen');
- });
- socket.onMessage(res => {
- console.log(res, '鏈嶅姟鍣ㄨ繑鍥炵殑鏁版嵁');
- }); // 鑾峰彇鏈嶅姟鍣ㄤ紶鏉ョ殑鏁版嵁锛屽仛鐩稿簲澶勭悊
- socket.onClose(() => {
- console.log('close');
- });
- socket.onError(err => {
- console.log('socket鎶ラ敊', err);
- });
+ }
+ },
+ computed: {
+ ...mapState(['globalweigh', 'globalinfraredStatus']),
+ coalContactClean() {
+ return (Number(this.weighData.coalContactHair) - Number(this.weighData.coalContactSkin)).toFixed(2);
+ },
+ token() {
+ return uni.getStorageSync('token');
+ },
+ // 鍔犲噺鐓ゆ寜閽鐢ㄤ笌鍚�
+ addAndSubtractCoalDisabled() {
+ return this.realTimeWeigh == 0;
+ },
+ // 鏄惁鏀剧┖鎸夐挳绂佺敤
+ isEvacuation() {
+ if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType ==
+ '杞嚭') {
+ return (this.weighList.skin === 0 ? this.temporaryWeighObj.skin : this.weighList.skin) == this
+ .temporaryWeighObj.hair;
+ }
+ if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList.orderType ==
+ '杞叆') {
+ return (this.weighList.hair === 0 ? this.temporaryWeighObj.skin : this.weighList.hair) == this
+ .temporaryWeighObj.hair;
+ }
+ },
+ sideline() {
+ return this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞叆';
+ }
+ },
+ methods: {
+ ...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh']),
+ init() {
+ uni.showLoading({
+ title: "鍔犺浇涓�"
+ })
+ // 鑾峰彇绉伴噸淇℃伅
+ this.$reqGet('weighList', { id: this.takeCoalId }).then(res => {
+ console.log(res, '鑾峰彇绉伴噸淇℃伅');
+ if (res.code == 0) {
+ uni.hideLoading()
+ this.weighList = res.data;
+ this.weighData.deptId = res.data.deptId;
+ this.weighData.tmId = res.data.id;
+ this.weighData.carNo = res.data.carNo;
+ this.weighData.tmCode = res.data.code;
+ this.weighData.filedId = res.data.filedId;
+ this.weighData.coalContactHair = res.data.hairTwo ? res.data.hairTwo : 0;
+ this.weighData.coalContactSkin = res.data.skinTwo ? res.data.skinTwo : 0;
+ if (this.weighList.orderType == '澶栬喘') {
+ this.firstHairCustomernameShow = true;
+ if (this.weighList.hair > 0) {
+ this.haveInputOrigin = true;
+ this.isInputOrigin = true;
+ }
+ if (this.weighList.hair == 0) {
+ this.outBuy = false;
+ }
+ } else {
+ this.isInputOrigin = true;
+ }
+ } else {
+ uni.hideLoading()
+ this.$u.toast('鍔犺浇澶辫触')
+ }
+ }).then(() => {
+ this.getAverageSkin()
+ })
+ },
+ /**
+ * @纭绉伴噸绛夊緟鍚庣鎻愪緵瀹炴椂绉伴噸鎺ュ彛锛岃幏鍙栫毊閲嶏紝姣涢噸
+ */
+ confirmWeigh() {
+ if (this.isConfirmWeighLoading == false) {
+ this.isConfirmWeighLoading = true;
+ if (this.weighData.weigh != 0) {
+ // 濡傛灉姝ｅ湪绉扮毊
+ if (this.isSkinWeigh) {
+ // 濡傛灉绗竴娆＄О閲�
+ if (this.isAbnormalAvgSkin) {
+ this.abnormalModalShow = false
+ this.saveWeigh();
+ } else {
+ let xx = new BigNumber(this.avgSkin)
+ let yy = new BigNumber(this.globalweigh)
+ if (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) {
+ this.abnormalModalShow = true
+ } else {
+ this.saveWeigh();
+ }
+ }
+ } else {
+ this.saveWeigh();
+ }
+
+ } else {
+ this.$u.toast('鏈兘鑾峰彇鍦扮閲嶉噺');
+ this.isConfirmWeighLoading = false;
+ }
+ }
+ },
+ // 纭绉伴噸鎺ュ彛
+ saveWeigh() {
+ this.weighData.coalContactClean = this.coalContactClean;
+ this.$reqPost('saveWeigh', this.weighData, 'json')
+ .then(res => {
+ console.log(res, '绉伴噸鎺ュ彛');
+ if (res.code == 0) {
+ this.$u.toast('绉伴噸鎴愬姛');
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 1
+ });
+ this.isConfirmWeighLoading = false;
+ }, 1000);
+ } else {
+ this.$u.toast('绉伴噸澶辫触锛岃绋嶅悗閲嶈瘯');
+ this.isConfirmWeighLoading = false
+ }
+ })
+ .catch(err => {
+ this.isConfirmWeighLoading = false;
+ console.log(err);
+ });
+ },
+ // 鍔犲噺鐓�
+ addAndSubtractCoal() {
+ this.$reqPost('addAndSubtractCoal', {
+ deptId: this.weighData.deptId,
+ sceneId: this.weighData.sceneId,
+ carNo: this.weighData.carNo,
+ tmId: this.weighData.tmId,
+ filedId: this.weighData.filedId,
+ equipmentCode: this.weighData.equipmentCode
+ }, 'json').then(res => {
+ if (res.code == 0) {
+ this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 1
+ });
+ this.isConfirmWeighLoading = false;
+ }, 1000);
+ console.log(res, '鍔犲噺鐓�');
+ }
+ });
+ },
+ // 鏀剧┖
+ evacuation() {
+ this.evacuationModalShow = true;
+ },
+ // 鏀剧┖寮圭獥纭
+ evacuationConfirm() {
+ this.$reqPost('getTwoEvacuation', this.weighData, 'json').then(res => {
+ console.log(res, '绗簩娆℃斁绌�');
+ if (res.code == 0) {
+ this.$u.toast('鎿嶄綔鎴愬姛');
+ this.evacuationModalShow = false;
+ } else {
+ this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触');
+ this.evacuationModalShow = true;
+ }
+ });
+ },
+ // 鏀剧┖寮圭獥鍙栨秷
+ evacuationCancel() {
+ this.evacuationModalShow = false;
+ },
+ // input鑱氱劍
+ inputFocus(v) {
+ if (v == 1) {
+ this.isfocus1 = true;
+ } else {
+ this.isfocus2 = true;
+ }
+ },
+ // input澶辩劍
+ inputBlur() {
+ this.isfocus1 = false;
+ this.isfocus2 = false;
+ },
+ inputChange() {
+ if (this.weighData.coalContactHair > 0 && this.weighData.coalContactSkin > 0) {
+ this.isInputOrigin = true;
+ }
+ },
+ getAverageSkin() {
+ uni.showLoading({
+ title: "鍔犺浇涓�"
+ })
+ this.$reqGet('getAvgSkin', { xsUserId1: this.weighList.xsUserId1 }).then(res => {
+ if (res.code === 0) {
+ uni.hideLoading()
+ this.avgSkin = res.data.avgSkin
+ this.tmTaskCoalList = res.data.tmTaskCoalList
+ /**
+ * @description true鐨勮瘽鏄笉寮傚父 false灏辨槸寮傚父 娌℃湁鍘嗗彶锛屽钩鍧囩毊閲嶄负0鏄涓�娆℃甯� */
+ this.isAbnormalAvgSkin = (Array.isArray(this.tmTaskCoalList) && this
+ .tmTaskCoalList.length === 0 || !this.tmTaskCoalList) && this.avgSkin == 0
+ } else {
+ uni.hideLoading()
+ this.$u.toast('鍔犺浇澶辫触')
+ }
+ })
+ },
+ abnormalCancel() {
+ this.abnormalModalShow = false
+ this.isConfirmWeighLoading = false;
+ },
+ // 鎻愪氦寮傚父鍘熷洜
+ abnormalConfirm() {
+ this.weighData.abnormalText = this.abnormalContent
+ this.saveWeigh()
+ // uni.showLoading({
+ // title: "鎻愪氦涓�"
+ // })
+ // this.$reqPost('tmAbnormalTextAdd', { tmId: this.weighData.tmId, abnormalText: this.abnormalContent },
+ // 'params').then(
+ // res => {
+ // if (res.code == 0) {
+ // uni.hideLoading()
+ // this.$u.toast('鎻愪氦鎴愬姛')
+ // this.abnormalModalShow = false
+ // this.isConfirmWeighLoading = false
+ // setTimeout(() => {
+ // uni.navigateBack({
+ // delta: 1
+ // });
+ // }, 1000);
+
+ // } else {
+ // uni.hideLoading()
+ // this.$u.toast('鎻愪氦澶辫触')
+ // this.abnormalModalShow = true
+ // this.isConfirmWeighLoading = false
+ // }
+ // })
+ },
}
- }
-};
+ };
</script>
-<style lang="scss" scoped>
-::v-deep.weighingDevice {
- width: 100%;
- height: 100vh;
- display: flex;
- flex-direction: column;
- .one {
- flex: 2;
- border: vww(1) solid #dddddd;
- margin: vww(20) vww(20) 0 vww(20);
- border-radius: vww(15);
- .top {
- height: 80%;
- display: flex;
- .top_left {
- flex: 3;
- font-size: vww(50);
- display: flex;
- align-items: center;
- justify-content: center;
+<style lang="scss"
+ scoped>
+ @mixin flex {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ }
+
+ ::v-deep.weighingDevice {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+
+ .slot-content {
+ width: 96%;
+ border: 1rpx solid rgb(220, 223, 230);
+ }
+
+ .table-title {
+ width: 96%;
+ @include flex;
+ position: absolute;
+ top: 8rpx;
+ color: #9e9399;
+
+ &_item {
+ width: 33.3%;
+ text-align: center;
}
- .top_right {
+
+ .time {
+ padding-left: 20rpx;
+ }
+
+ .coal-name {
+ padding-left: 70rpx;
+ }
+
+ .skin {
+ padding-left: 10rpx;
+ }
+ }
+
+ .one {
+ // flex: 3;
+ height: 290rpx;
+ margin: vww(20) vww(20) 0 vww(20);
+ border-radius: vww(15);
+
+ .top {
+ height: 75%;
display: flex;
- flex-direction: column;
- justify-content: center;
- flex: 2;
- view {
+
+ .top_left {
+ flex: 3;
+ font-size: vww(50);
display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 74rpx;
+ font-weight: 400;
+ color: #ffffff;
+ line-height: 69rpx;
+ text-shadow: 0rpx 3rpx 14rpx rgba(0, 0, 0, 0.33);
+
+ text {
+ font-family: weighting;
+ }
+ }
+
+ .top_right {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ flex: 2;
+ font-size: 31rpx;
+ font-weight: 300;
+ color: #ffffff;
+
+ view {
+ display: flex;
+ align-items: center;
+ }
+ }
+ }
+
+ .bottom {
+ text-align: center;
+ height: 25%;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ flex-direction: column;
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #d9e1fe;
+ }
+ }
+
+ .middle-block {
+ width: 690rpx;
+ height: 386rpx;
+ margin: vww(20) vww(15) vww(13);
+ background: #ffffff;
+ box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
+ border-radius: 20rpx;
+ @include flex;
+ justify-content: center;
+ overflow: hidden;
+
+ .block-main {
+ width: 650rpx;
+ height: 350rpx;
+ @include flex;
+ flex-direction: column;
+ margin-bottom: vww(20);
+ position: relative;
+
+ .first-line,
+ .second-line {
+ width: 90%;
+ height: vww(44);
+
+ .focusClass {
+ color: #5b95fd;
+ }
+
+ .inputClass {
+ border: 1px solid rgba(73, 95, 252, 0.6) !important;
+ box-shadow: 0rpx 5rpx 13rpx 0rpx rgba(73, 95, 252, 0.6) !important;
+ border-radius: 12rpx !important;
+ }
+
+ .isInputOrigin {
+ background-color: #f4f4fc;
+ }
+
+ .input-container {
+ border: 2px solid #c5c5c5;
+ box-shadow: 0rpx 5rpx 13rpx 0rpx #c5c5c5;
+ border-radius: 12rpx;
+ }
+ }
+
+ .first-line {
+ @include flex;
+ position: relative;
+ top: vww(8);
+ }
+
+ .second-line {
+ @include flex;
+ }
+ }
+
+ .block-sideline {
+ width: 94%;
+ height: vww(100);
+ @include flex flex-direction: column;
+ align-items: flex-start;
+
+ .first-line {
+ width: 100%;
+ }
+
+ .weigh-item {
+ width: 100%;
+ height: vww(36);
+ @include flex justify-content: space-around;
+
+ .item {
+ min-width: vww(50);
+ height: vww(45);
+ font-size: 21rpx;
+ font-weight: 400;
+ color: #ffffff;
+ text-align: center;
+ line-height: vww(30);
+ @include flex;
+
+ .concrete {
+ width: vww(36);
+ height: vww(36);
+ }
+
+ .num {
+ font-size: 40rpx;
+ font-weight: 300;
+ color: #303030;
+ }
+ }
}
}
}
- .bottom {
- text-align: center;
+
+ .bottom-block {
+ width: calc(100% - 60rpx);
+ box-sizing: border-box;
+ height: 630rpx;
+ margin: 0 vww(15) vww(45) 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);
+ border-radius: 20rpx;
+ @include flex;
+ justify-content: center;
+ overflow: hidden;
+
+ .block-main {
+ width: 94%;
+ height: 565rpx;
+ margin-top: vww(10);
+ @include flex;
+ justify-content: space-around;
+ align-items: flex-start;
+ flex-direction: column;
+ overflow: hidden;
+
+ .main-information {
+ width: 100%;
+ height: 28rpx;
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #303030;
+ @include flex;
+ justify-content: flex-start;
+ overflow: hidden;
+
+ .prefix {
+ min-width: vww(60);
+ }
+
+ .suffix {
+ flex: 1;
+ margin-left: vww(12);
+ text-align: left;
+ }
+ }
+ }
}
- }
- .two {
- flex: 4;
- border: vww(1) solid #dddddd;
- margin: vww(20);
- border-radius: vww(10);
- padding: vww(20);
- p {
- text-align: center;
- font-size: vww(20);
- font-weight: 500;
+
+ .three {
+ margin: 0 auto vww(30);
+ flex: 0.7;
+ display: flex;
+ color: #939393;
+
+ .u-button {
+ &:nth-of-type(2) {
+ margin-left: vww(10);
+ }
+
+ &:nth-of-type(3) {
+ margin-left: vww(10);
+ }
+ }
+ }
+
+ .four {
+ width: 100%;
margin-top: vww(5);
+ text-align: center;
}
- }
- .three {
- margin: 0 auto vww(20);
- flex: 0.7;
- display: flex;
- color: #939393;
- .u-button {
- &:nth-of-type(2) {
- margin-left: vww(10);
+
+ .slide-fade-enter-active {
+ transition: all 0.3s ease-out;
+ }
+
+ .history-utils {
+ width: 96%;
+ margin: vww(10) auto;
+ @include flex;
+ justify-content: space-around;
+
+ &_item {
+ width: 50%;
+ }
+
+ .btn {
+ width: 180rpx;
+ }
+ }
+
+ .history-skin {
+ width: 96%;
+ height: vww(300);
+ margin: auto;
+ margin-top: vww(10);
+ background: #ffffff;
+ box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
+ border-radius: 20rpx;
+ overflow: scroll;
+ color: #000;
+ position: relative;
+
+ .history-skin_item {
+ width: 96%;
+ height: vww(30);
+ @include flex;
+ margin: vww(40) auto;
+
+ .item {
+ width: 33.3%;
+ text-align: center;
+ }
+
+ .createTime {
+ color: rgb(60, 156, 255);
+ }
+
+ .skin {
+ color: #f81414;
+ width: 180rpx;
+ height: vww(30);
+ }
}
}
}
- .four {
- margin: vww(10) auto;
- flex: 0.5;
+
+ .secondary-confirmation__main {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ align-items: center;
+
+ .secondary-child {
+ display: flex;
+ justify-content: space-between;
+ }
}
-}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.1