Browse Source

优化

feature/debugger_250106
LiLongLong 7 months ago
parent
commit
82a9b56c56
  1. 8
      src/pages/Index/Regular/Emergency.vue
  2. 2
      src/pages/Index/components/Consumables/MoveLiquidArea.vue

8
src/pages/Index/Regular/Emergency.vue

@ -338,21 +338,15 @@ watch(isEmergencyEnabled, (newVal) => {
// //
onMounted(() => { onMounted(() => {
const {emergencyInfo} = emergencyStore.$state const {emergencyInfo} = emergencyStore.$state
//@ts-ignore
if (Object.keys(emergencyInfo).length > 0) {
if (emergencyInfo && Object.keys(emergencyInfo).length > 0) {
console.log("🚀 ~ onMounted ~ emergencyInfo:", emergencyInfo) console.log("🚀 ~ onMounted ~ emergencyInfo:", emergencyInfo)
isEmergencyEnabled.value = true isEmergencyEnabled.value = true
//@ts-ignore
emergencyPosition.value.bloodType = emergencyInfo.bloodType; emergencyPosition.value.bloodType = emergencyInfo.bloodType;
//@ts-ignore
emergencyInfo.projInfo.forEach(item => { emergencyInfo.projInfo.forEach(item => {
emergencyPosition.value.projIds.push(item.projId); emergencyPosition.value.projIds.push(item.projId);
}) })
//@ts-ignore
emergencyPosition.value.sampleBarcode = emergencyInfo.sampleBarcode; emergencyPosition.value.sampleBarcode = emergencyInfo.sampleBarcode;
//@ts-ignore
emergencyPosition.value.userid = emergencyInfo.userid; emergencyPosition.value.userid = emergencyInfo.userid;
//@ts-ignore
bloodType.value = emergencyInfo.bloodType; bloodType.value = emergencyInfo.bloodType;
projectName.value = ''; projectName.value = '';
} }

2
src/pages/Index/components/Consumables/MoveLiquidArea.vue

@ -290,7 +290,6 @@ const handleEmergencyPosState = (data: EmergencyPosStateMessage['data']) => {
let { state } = data.tube let { state } = data.tube
// EMPTYTO_BE_PROCESSEDPROCESS_COMPLETEERROR // EMPTYTO_BE_PROCESSEDPROCESS_COMPLETEERROR
emergencyStore.setInfo(data.tube)
if(emergencyStateList.includes(state)){ if(emergencyStateList.includes(state)){
emergencyStatus.value = true; emergencyStatus.value = true;
}else{ }else{
@ -333,6 +332,7 @@ watch(
() => props.emergencyInfo, () => props.emergencyInfo,
(newVal) => { (newVal) => {
// //
console.log('newVal.state===', newVal?.state)
if (newVal && (newVal.state == EMERGENCY_STATE.EMPTY || newVal.state == EMERGENCY_STATE.ERROR)) { if (newVal && (newVal.state == EMERGENCY_STATE.EMPTY || newVal.state == EMERGENCY_STATE.ERROR)) {
isActive.value = false // isActive.value = false //
} else {// } else {//

Loading…
Cancel
Save