From 96db936c641b23897636ff6a15e31f8f87964342 Mon Sep 17 00:00:00 2001 From: qingyiay <2386314947@qq.com> Date: 星期三, 11 十月 2023 13:44:05 +0800 Subject: [PATCH] 确定装卸逻辑修改 增加称重时稳定态 --- pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 1506 +++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 972 insertions(+), 534 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 96f39bd..750e47f 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,87 +1,133 @@ <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;" - > + background-size: cover;"> <view class="top"> <view class="top_left"> - <text>{{ realTimeWeigh }}</text> + <text>{{ globalweigh }}</text> </view> <view class="top_right"> <view class=""> 绉伴噸: - <u--text :type="realTimeWeigh == 0 ? 'error' : 'success'" :text="realTimeWeigh == 0 ? '寮傚父' : '姝e父'" size="34"></u--text> + <u--text :type="realTimeWeigh == 0 ? 'error' : 'success'" + :text="realTimeWeigh == 0 ? '寮傚父' : '姝e父'" + size="34"></u--text> </view> <view class=""> 绾㈠: - <u--text :type="globalinfraredStatus ? 'error' : 'success'" :text="globalinfraredStatus ? '寮傚父' : '姝e父'" size="34"></u--text> + <u--text :type="globalinfraredStatus ? 'error' : 'success'" + :text="globalinfraredStatus ? '寮傚父' : '姝e父'" + size="34"></u--text> </view> </view> </view> - <view class="bottom" v-if="weighList.orderType == '鍐呰喘' || weighList.orderType == '杞叆'"> - <view> - <view style="font-weight: 600;">鍘熷彂淇℃伅</view> - - <text>姣涢噸:{{ primaryHair || '' }}鐨噸:{{ primarySkin || '' }}鍑�閲�:{{ primaryClean || '' }}</text> - </view> - </view> - <!-- <view class="bottom" v-else-if="weighList.orderType == '澶栬喘' && weighList.hair == 0"> - <text> - 姣涢噸:{{ coalContactHair || '' }}鐨噸:{{ coalContactSkin || '' }}鍑�閲�:{{ (Number(this.coalContactHair) - Number(this.coalContactSkin)).toFixed(2) || '' }} - </text> - </view> --> <view class="bottom"><text>TIP:褰撳墠鐘舵�佷负姝e父鏃跺彲浠ョО閲�</text></view> </view> - <view class="middle-block"> - <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">鐨噸</view> - <view class="input-container"><u--input placeholder="璇疯緭鍏ョ毊閲�" border="surround" v-model="weighData.coalContactSkin"></u--input></view> - <view class="unit">鍚�</view> - </view> - <view class="second-line"> - <view class="label-text">姣涢噸</view> - <view class="input-container"><u--input placeholder="璇疯緭鍏ユ瘺閲�" border="surround" v-model="weighData.coalContactHair"></u--input></view> - <view class="unit">鍚�</view> - </view> - <view class="second-line"> - <view class="label-text">鍑�閲�</view> - <view class="input-container"><u--input placeholder="璇疯緭鍏ュ噣閲�" border="surround" v-model="coalContactClean"></u--input></view> - <view class="unit">鍚�</view> - </view> - </view> - <view class="block-sideline" v-else> + <view class="middle-block" + v-if="sideline"> + <view class="block-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.skin }}</view> + <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.hair }}</view> + <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.clean }}</view> + <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"> + <text>骞冲潎鐨噸:{{avgSkin}}</text> + <text style="color: #ff6363;font-weight: bold;font-size: 26rpx;" + class="error-tip" + v-if="errorTipShow">* 寮傚父</text> + </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"> + <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"> - <view class="prefix">鐭垮満锛�</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"> + <view class="main-information" + v-if="weighList.orderType!=='杞叆'||weighList.orderType!=='杞嚭'"> <view class="prefix">鐓ゅ満:</view> <view class="suffix">{{ weighList.filedName || '' }}</view> </view> @@ -91,550 +137,942 @@ </view> <view class="main-information"> <view class="prefix">鐨噸:</view> - <view class="suffix">{{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin }}</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 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 class="suffix"> + {{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean ||"" }} + </view> </view> <view class="main-information"> <view class="prefix">璁㈠崟浣欓噺:</view> - <view class="suffix">{{ weighList.orderSurplus || 0 }}</view> + <view class="suffix">{{ weighList.orderSurplus ||"" }}</view> + <text style="color: #ff6363;font-weight: bold;font-size: 26rpx;" + class="error-tip" + v-show="orderSurplusLess">* 璁㈠崟浣欓噺涓嶈冻</text> + </view> + </view> + </view> + <view v-show="mergeStateShow"> + <view class="mergeState"> + <view class="merge-wrap"> + <view>鏄惁纭鍚堝苟</view> + <view class="merge-checkbox"> + <u-checkbox-group v-model="checkboxValue1" + placement="column" + @change="mergeStateChange"> + <u-checkbox :customStyle="{marginBottom: '8px'}" + :label="mergeState?'纭':'鍙栨秷'" + name="confirm" + label-size="30" + size="30" + activeColor="#48a2ff"> + </u-checkbox> + </u-checkbox-group> + </view> </view> </view> </view> <view class="three"> <!-- 鏀剧┖ --> - <u-button type="primary" text="鏀剧┖" plain @click="evacuation" throttleTime="500" :disabled="!isEvacuation"></u-button> + <u-button type="primary" + text="鏀剧┖" + plain + @click="evacuation" + throttleTime="500" + :disabled="!isEvacuation" + v-if='weighList.skin||weighList.hair'></u-button> <!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 --> - <u-button - type="primary" + <u-button type="primary" text="纭畾绉伴噸" - :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh" + :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||!mergeState||globalWarning" :loading="isConfirmWeighLoading" loadingText="纭" @click="confirmWeigh" - ></u-button> - <u-button type="primary" text="杩斿洖鍔犲噺鍚�" :disabled="addAndSubtractCoalDisabled" @click="addAndSubtractCoal" class="jiajian"></u-button> + throttleTime="800"></u-button> + <u-button type="primary" + text="杩斿洖瑁呭嵏" + :disabled="addAndSubtractCoalDisabled" + @click="addAndSubtractCoal" + class="jiajian" + v-if="outBuy||!isSkinWeigh"></u-button> </view> - <view class="four" v-if="weighList.orderType !== '澶栬喘'">濡傛偍闇�瑕佽皟鏁磋杞借揣鍝佸惃鏁帮紝璇风偣鍑昏繑鍥炲姞鍑忓惃</view> + <view v-show="isExceedOrigin" + style="color: #ff6363;width: auto;margin: 0 auto;"> + <text v-if="weighList.orderType == '澶栬喘'">瓒呭嚭鍘熷彂姣涢噸,纾呮埧浜哄憳纭涓�,璇峰嬁绂诲紑姝ら〉闈�</text> + <text v-else>瓒呭嚭鏈�澶ф瘺閲�,纾呮埧浜哄憳纭涓�,璇峰嬁绂诲紑姝ら〉闈�</text> + </view> <!-- 鏀剧┖寮圭獥 --> <view class="evacuationModal"> - <u-modal - :show="evacuationModalShow" + <u-modal :show="evacuationModalShow" :title="evacuationTitle" :content="evacuationContent" :showCancelButton="true" @confirm="evacuationConfirm" - @cancel="evacuationCancel" - ></u-modal> + @cancel="evacuationCancel"></u-modal> + </view> + <!-- 绉伴噸寮傚父寮圭獥 --> + <view class=""> + <u-modal :show="abnormalModalShow" + title="寮傚父鍘熷洜" + :showCancelButton="false" + @confirm="abnormalConfirm" + confirmText="鎻愪氦"> + <view class="slot-content"> + <u--form labelPosition="top" + :model='abnormalForm' + :rules="rules" + ref="uForm"> + <u-form-item prop="abnormalContent"> + <u-textarea v-model="abnormalForm.abnormalContent" + confirmType="done" + placeholder="璇疯緭鍏ュ紓甯稿師鍥�(瀛楁暟涓嶅皯浜�5涓瓧)" + height='140' + count + border="surround" + autoHeight></u-textarea> + </u-form-item> + </u--form> + </view> + </u-modal> + </view> + <!-- 纭鍚庣О閲嶆彁绀哄脊绐� --> + <view class=""> + <u-modal :show="confirmWeighVisiable" + title="鎻愮ず" + :content="confirmWeighContent" + @confirm="confirmWeighConfirm"></u-modal> </view> </view> </template> <script> -let socket = null; -import { webSocketUrl } from '@/api/request.js'; -import { mapState, mapMutations } from 'vuex'; -import combinedTitle from '@/components/combined-title/combined-title.vue'; -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; - this.changeweighHouseCode(params.weighHouseCode); - }, - components: { - combinedTitle - }, - data() { - return { - weighData: { - //纭绉伴噸鎺ュ彛鍙傛暟 - deptId: '', - tmId: '', - sceneId: '', - carNo: '', - gateCameraId: '', - equipmentCode: '', - weigh: 0, - tmCode: '', - sceneInOut: '', - coalContactClean: 0, - coalContactHair: 0, - coalContactSkin: 0 - }, - 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: '' - // 浜屾纭 - }; - }, - watch: { - realTimeWeigh(newV, oldV) { - if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType == '杞嚭') { - if (this.weighList.skin == 0) { - // this.temporaryWeighObj.skin = this.realTimeWeigh; - this.temporaryWeighObj.skin = newV; - this.isweigh = this.temporaryWeighObj.skin > this.weighList.orderSurplus; - } else { - // this.temporaryWeighObj.hair = this.realTimeWeigh; - this.temporaryWeighObj.hair = newV; - this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(2); - this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus; + 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 !== 'null') { + this.weighData.overTmWaixiao = 1 + } + this.changeweighHouseCode(params.weighHouseCode); + this.init(); + this.changeWeigh('') + this.realTimeWeigh = 0 + }, + onShow() { + 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'); } - } else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞叆') { - if (this.weighList.hair == 0) { - // this.temporaryWeighObj.hair = this.realTimeWeigh; - this.temporaryWeighObj.hair = newV; - this.isweigh = this.temporaryWeighObj.hair > this.weighList.orderSurplus; - } else { - // this.temporaryWeighObj.skin = this.realTimeWeigh; - this.temporaryWeighObj.skin = newV; - this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(2); - this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus; - } - } + }, 3000) }, - // 鐩戝惉閲嶉噺鍙樺寲 - globalweigh: { - handler(v) { - this.weighData.weigh = this.realTimeWeigh = v; - console.log(this.realTimeWeigh, '鐪熷疄閲嶉噺鏀瑰彉浜�'); - }, - deep: true, - immediate: true - } - }, - onShow() { - this.init(); - this.realTimeWeigh = 0; - // this.initWebSocket(); - }, - computed: { - ...mapState(['globalweigh', 'globalinfraredStatus']), - coalContactClean() { - return (Number(this.weighData.coalContactHair) - Number(this.weighData.coalContactSkin)).toFixed(2); + onHide() { + clearTimeout(this.timer) }, - token() { - return uni.getStorageSync('token'); + onUnload() { + clearTimeout(this.timer) }, - // 鍔犲噺鐓ゆ寜閽鐢ㄤ笌鍚� - addAndSubtractCoalDisabled() { - if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType == '杞嚭') { - if (this.weighList.hair == 0) { - return true; - } else if (this.weighList.hair != 0) { - return false; - } - } + components: { + combinedTitle }, - // 鏄惁鏀剧┖鎸夐挳绂佺敤 - isEvacuation() { - if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType == '杞嚭') { - return this.weighList.skin == this.temporaryWeighObj.hair || this.temporaryWeighObj.skin == this.temporaryWeighObj.hair; - } - if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞叆') { - return this.weighList.hair == this.temporaryWeighObj.skin || this.temporaryWeighObj.skin == this.temporaryWeighObj.hair; - } - } - }, - methods: { - ...mapMutations(['changeweighHouseCode']), - init() { - // 鑾峰彇绉伴噸淇℃伅 - this.$reqGet('weighList', { id: this.takeCoalId }).then(res => { - console.log(res, '鑾峰彇绉伴噸淇℃伅'); - if (res.code == 0) { - 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; - if (this.weighList.orderType == '澶栬喘' && this.weighList.hair == 0) { - this.firstHairCustomernameShow = true; + data() { + return { + weighData: { + //纭绉伴噸鎺ュ彛鍙傛暟 + deptId: '', + tmId: '', + sceneId: '', + carNo: '', + gateCameraId: '', + equipmentCode: '', + weigh: 0, + tmCode: '', + sceneInOut: '', + coalContactClean: 0, + coalContactHair: 0, + coalContactSkin: 0, + isMerge: '0', //1鏄� 0涓嶆槸 榛樿0 鏄惁鍚堝崱 + isBackground: '0' + }, + 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, + orderSurplusLess: false, + // 澶栬喘绫诲瀷绉伴噸濉啓姣涳紝鐨紝 + firstHairCustomernameShow: false, + // 澶栬喘绗竴娆$О姣涢噸涓嶉渶瑕佸姞鍑忓惃 + outBuy: true, + // 鐨噸寮傚父鐩稿叧 + abnormalForm: { + abnormalContent: '', + }, + avgSkin: '', // 骞冲潎鐨噸 + isAbnormalAvgSkin: true, //骞冲潎鐨噸鏄惁寮傚父 + tmTaskCoalList: [], + abnormalModalShow: false, + historyBtn: false, + historyShow: false, + // 鏄惁鍦ㄧО鐨噸锛岀偣鍑荤‘瀹氱О閲嶅垽鏂槸鍚﹀紓甯� + isSkinWeigh: false, + errorTipShow: false, + rules: { + abnormalContent: [{ + required: true, + message: "璇峰~鍐欏紓甯稿師鍥�", + trigger: ['blur', 'change'], + type: 'string' + }, + { + validator: (rule, value, callback) => { + if (value.length < 5) { + callback(new Error('鍘熷洜涓嶅彲灏戜簬5涓瓧')) + } else { + callback() + } + } + }, + ] + }, + mergeState: true, //鍚堝崱鐘舵�� + mergeStateShow: false, //鍚堝崱寮圭獥 + checkboxValue1: [], + isExceedOrigin: false, //鏄惁瓒呭嚭姣涢噸 + refreshLoading: false, + timer: null + }; + }, + watch: { + // 鐩戝惉閲嶉噺鍙樺寲 + 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.outBuy = false //绉扮毊娌℃湁杩斿洖瑁呭嵏 + this.temporaryWeighObj.skin = newV; + let xx = new BigNumber(this.avgSkin) + let yy = new BigNumber(newV) + this.errorTipShow = (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) && + this.avgSkin !== 0 + } else { + this.isSkinWeigh = false; + this.outBuy = true; + 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; + this.orderSurplusLess = this.temporaryWeighObj.clean > this.weighList.orderSurplus + this.mergeStateShow = this.weighList.source !== 0 && this.orderSurplusLess + } + } else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList + .orderType == '杞叆') { + if (this.weighList.hair == 0) { + this.isSkinWeigh = false; + this.outBuy = true; + this.temporaryWeighObj.hair = newV; + // if (this.weighList.orderType == '澶栬喘') { + // let xx = new BigNumber(newV) + // let yy = new BigNumber(this.weighList.hairTwo) + // if (xx.minus(yy) > 0.3) { + // this.$u.toast('瓒呭嚭鍘熷彂淇℃伅姣涢噸,璇风瓑寰呯鐞嗕汉鍛樺鐞�') + // this.isExceedOrigin = true + // this.saveWeigh() + // } + // } + } else { + this.isSkinWeigh = true; //绉扮毊娌℃湁杩斿洖瑁呭嵏 + this.outBuy = false //绉扮毊娌℃湁杩斿洖瑁呭嵏 + this.temporaryWeighObj.skin = newV; + let xx = new BigNumber(this.avgSkin) + let yy = new BigNumber(newV) + this.errorTipShow = (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) && + this.avgSkin !== 0; + this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed( + 2); + this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this + .temporaryWeighObj + .clean < 0; + this.orderSurplusLess = this.temporaryWeighObj.clean > this.weighList.orderSurplus + this.mergeStateShow = this.weighList.source !== 0 && this.orderSurplusLess + } } } - }); + }, }, - /** - * @纭绉伴噸绛夊緟鍚庣鎻愪緵瀹炴椂绉伴噸鎺ュ彛锛岃幏鍙栫毊閲嶏紝姣涢噸 - */ - confirmWeigh() { - if (this.isConfirmWeighLoading == false) { - this.isConfirmWeighLoading = true; - if (this.weighData.weigh != 0) { - if (this.weighList.orderType == '澶栭攢') { - if (this.weighList.skin ? (this.weighList.skin < this.realTimeWeigh ? true : false) : true) { - this.saveWeigh(); + computed: { + ...mapState(['globalweigh', 'globalinfraredStatus', 'globalisconnect', 'globalisUploadimg', 'globalisLogin', + 'is_open_socket', 'socketTask', 'confirmWeighVisiable', 'confirmWeighContent', 'globalWarning' + ]), + coalContactClean() { + let xx = BigNumber(this.weighData.coalContactHair) + let yy = BigNumber(this.weighData.coalContactSkin) + return xx.minus(yy).toNumber().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 == this.temporaryWeighObj.hair; + } + if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == + '杞叆') { + return this.weighList.hair == this.temporaryWeighObj.skin; + } + }, + sideline() { + return this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞叆'; + } + }, + + methods: { + ...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh', 'changeconfirmWeighVisiable', + 'changesocketTask', 'changereconnectNum' + ]), + 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; + this.weighList.source = res.data.source + 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.$u.toast('姣涢噸涓嶈兘灏忎簬鐨噸'); - this.isConfirmWeighLoading = false; + this.isInputOrigin = true; } } else { - this.saveWeigh(); + uni.hideLoading() + this.$u.toast('鍔犺浇澶辫触') } - } else { - this.$u.toast('鏈兘鑾峰彇鍦扮閲嶉噺'); - this.isConfirmWeighLoading = false; + }).then(() => { + this.getAverageSkin() + }) + }, + /** + * @纭绉伴噸绛夊緟鍚庣鎻愪緵瀹炴椂绉伴噸鎺ュ彛锛岃幏鍙栫毊閲嶏紝姣涢噸 + */ + confirmWeigh() { + if (this.isConfirmWeighLoading == false) { + this.isConfirmWeighLoading = true; + if (this.weighData.weigh != 0) { + // 濡傛灉姝e湪绉扮毊 + if (this.isSkinWeigh) { + // 濡傛灉骞冲潎鐨噸涓�0 + 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 + this.skinAbnormal() + } 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, '绉伴噸鎺ュ彛'); + }, + // 纭绉伴噸鎺ュ彛 + saveWeigh() { + this.weighData.coalContactClean = this.coalContactClean; + this.$reqPost('saveWeigh', this.weighData, 'json') + .then(res => { + console.log(res, '绉伴噸鎺ュ彛'); + if (res.code == 0) { + this.$u.toast('绉伴噸鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�'); + this.isConfirmWeighLoading = false; + setTimeout(() => { + uni.navigateBack({ + delta: 1 + }); + }, 1000); + } else if (res.code === 3) { + this.isExceedOrigin = true + } else { + this.$u.toast(res.msg ? res.msg : '绉伴噸澶辫触锛岃绋嶅悗閲嶈瘯'); + 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, + weigh: this.weighData.weigh + }, 'json').then(res => { if (res.code == 0) { - this.$u.toast('绉伴噸鎴愬姛'); + 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('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�'); + setTimeout(() => { + uni.navigateBack({ + delta: 1 + }); + }, 1000); + this.evacuationModalShow = false; } else { - this.$u.toast('绉伴噸澶辫触锛岃绋嶅悗閲嶈瘯'); + 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 + this.isAbnormalAvgSkin = this.avgSkin == 0 + } else { + uni.hideLoading() + this.$u.toast('鍔犺浇澶辫触') } }) - .catch(err => { - this.isConfirmWeighLoading = false; - console.log(err); - }); - }, - // 鍔犲噺鐓� - 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('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�'); - setTimeout(() => { + }, + abnormalCancel() { + this.abnormalModalShow = false + this.isConfirmWeighLoading = false; + this.$u.toast('鍙告満鍙栨秷鎻愪氦') + }, + // 鎻愪氦寮傚父鍘熷洜 + abnormalConfirm() { + this.weighData.abnormalText = this.abnormalContent + this.saveWeigh() + this.abnormalModalShow = false + }, + skinAbnormal() { + this.$reqPost('skinAbnormal', { sceneId: this.weighData.sceneId, tmId: this.weighData.tmId }, 'params') + }, + mergeStateChange(e) { + if (e.length !== 0) { + this.weighData.isMerge = 1 + this.MergeState = true + this.isweigh = false + this.orderSurplusLess = false + } else { + this.weighData.isMerge = 0 + this.MergeState = false + this.isweigh = true + this.orderSurplusLess = true + } + }, + confirmWeighConfirm() { + this.changeconfirmWeighVisiable(false) + this.isConfirmWeighLoading = false + setTimeout(() => { + this.$u.toast('鍗冲皢杩斿洖涓婁竴椤�'), uni.navigateBack({ delta: 1 - }); - this.isConfirmWeighLoading = false; - }, 1000); - console.log(res, '鍔犲噺鐓�'); - } - }); - }, - /** - * 鍒濆鍖� weoSocket - */ - // initWebSocket() { - // let wsUrl = `${webSocketUrl}?access_token=${uni.getStorageSync('token')}`; - // let socket = uni.connectSocket({ - // url: wsUrl, - // header: { - // CLIENT_TOC: 'Y' - // }, - // complete: res => { - // console.log(res, 'socket缁撴灉'); - // } - // }); - // socket.onOpen(() => { - // console.log('onOpen'); - // }); - // // 鑾峰彇鏈嶅姟鍣ㄤ紶鏉ョ殑鏁版嵁锛屽仛鐩稿簲澶勭悊 - // socket.onMessage(res => { - // console.log('socketWeigh', res); - // 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(() => { - // uni.closeSocket(); - // console.log('webSocketClose'); - // this.$u.toast('纾呮埧宸插叧闂�'); - // }); - // socket.onError(err => { - // console.log('socket鎶ラ敊', err); - // this.$u.toast('纾呮埧鏆傛椂涓嶈兘浣跨敤锛岃閲嶆柊杩涘叆璇ラ〉闈紝閲嶈瘯锛侊紒'); - // }); - // }, - // 鏀剧┖ - 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; + }) + }, 800) + } } - } -}; + }; </script> -<style lang="scss" scoped> -@mixin flex { - display: flex; - justify-content: space-between; - align-items: center; -} -::v-deep.weighingDevice { - width: 100%; - height: 100vh; - display: flex; - flex-direction: column; - .one { - // flex: 3; - height: 290rpx; - margin: vww(20) vww(20) 0 vww(20); - border-radius: vww(15); - .top { - height: 75%; - display: flex; - .top_left { - flex: 3; - font-size: vww(50); - display: flex; - align-items: center; - justify-content: center; - font-size: 74rpx; - font-family: Determination Sans; - font-weight: 400; - color: #ffffff; - line-height: 69rpx; - text-shadow: 0rpx 3rpx 14rpx rgba(0, 0, 0, 0.33); - } - .top_right { - display: flex; - flex-direction: column; - justify-content: center; - flex: 2; - font-size: 31rpx; - font-family: Microsoft YaHei; - 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-family: Microsoft YaHei; - font-weight: 300; - color: #d9e1fe; - // position: relative; - // top: vww(-10); - } - } - .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); - .first-line, - .second-line { - width: 90%; - height: vww(44); - .input-container { - border: 2px solid #c5c5c5; - box-shadow: 0rpx 5rpx 13rpx 0rpx #c5c5c5; - border-radius: 12rpx; - } - } - .first-line { - @include flex; - } - .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 { - width: vww(50); - height: vww(45); - font-size: 21rpx; - font-family: Microsoft YaHei; - 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-family: Microsoft YaHei; - font-weight: 300; - color: #303030; - } - } - } - } - } - .bottom-block { - width: 690rpx; - 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; - .block-main { - width: 94%; - height: 565rpx; - margin-top: vww(22); - @include flex; - align-items: flex-start; - flex-direction: column; - .main-information { - width: 50%; - height: 28rpx; - font-size: 28rpx; - font-family: Microsoft YaHei; - font-weight: 300; - color: #303030; - @include flex; - } - } - } - .two { - flex: 4; - border: vww(2) solid #dddddd; - margin: vww(20); - border-radius: vww(10); - padding: vww(20); - .uni-table { - .uni-table-tr { - padding: 0; - border: vww(1) solid #c6c6c6; - .uni-table-th { - font-size: vww(14); - height: vww(30); - line-height: vww(30); - padding: vww(5) vww(10); - color: #111111; - font-weight: 500; - background: #e2e2e2; - } - .uni-table-td { - font-size: vww(14); - font-weight: 400; - height: vww(30); - line-height: vww(30); - padding: vww(5) vww(10); - color: #111111; - } - } - } - p { - text-align: center; - font-size: vww(20); - font-weight: 500; - margin-top: vww(5); - } - } - .three { - margin: 0 auto vww(20); - 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 { - margin: vww(10) auto; - flex: 0.5; - } -} -.secondary-confirmation__main { - display: flex; - flex-direction: column; - justify-content: space-between; - align-items: center; - .secondary-child { +<style lang="scss" + scoped> + @mixin flex { display: flex; justify-content: space-between; + align-items: center; } -} -</style> + + ::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; + } + + .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; + + .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-block { + width: calc(100% - 60rpx); + box-sizing: border-box; + height: 630rpx; + 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); + 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; + position: relative; + + .prefix { + min-width: vww(60); + } + + .suffix { + flex: 1; + margin-left: vww(12); + text-align: left; + } + + .error-tip { + position: absolute; + right: 200rpx; + } + } + } + } + + .mergeState { + width: 100%; + margin: vww(4) 0; + margin-bottom: vww(10); + display: flex; + justify-content: center; + font-size: vww(16); + overflow: hidden; + + .merge-wrap { + width: vww(200); + height: vww(30); + display: flex; + justify-content: space-between; + align-items: center; + + .merge-checkbox { + margin-top: vww(10); + } + } + + } + + .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: vww(80); + margin: 0 auto; + } + + .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%; + + .error-tip { + display: inline-block; + margin-left: 34rpx; + } + } + + .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); + } + } + } + } + + .secondary-confirmation__main { + display: flex; + flex-direction: column; + justify-content: space-between; + align-items: center; + + .secondary-child { + display: flex; + justify-content: space-between; + } + } +</style> \ No newline at end of file -- Gitblit v1.9.1