Browse Source

优化

master
LiLongLong 4 months ago
parent
commit
37759d3954
  1. 43
      src/pages/Index/Regular/TestTube.vue
  2. 10
      src/pages/Login/Login.vue
  3. 2
      tsconfig.app.tsbuildinfo

43
src/pages/Index/Regular/TestTube.vue

@ -98,8 +98,6 @@ import {
import { ElDialog } from 'element-plus'
import { BloodType, ReactionPlateGroup, TestTubeRack } from '@/websocket/socket'
import { eMessage } from '../utils'
import { reactionPlateGroupItem } from './type'
const router = useRouter()
const settingTubeStore = useSettingTestTubeStore()
@ -278,47 +276,6 @@ const updateTubeSettings = async (rackIdx: number, tubeIdx: number) => {
eMessage.error('试管架已激活,不能修改')
return
}
// console.log('tubeRack---', testTubeStore.tubeRacks)
// console.log('rack---', rack.tubeSettings)
// let hasExistProject = existValidProject(rack)
// if(!hasExistProject){
// //
// if(consumablesStore.consumableData && consumablesStore.consumableData.reactionPlateGroup){
// let reactionPlateGroup = consumablesStore.consumableData.reactionPlateGroup
// let list:reactionPlateGroupItem[] = []
// reactionPlateGroup.forEach((item:any) => {
// if(item.projId && selectedProjIds.value.includes(item.projId) && item.num <=0){
// list.push(item.projName)
// }
// })
// if(list.length){
// eMessage.error(`${list.join(',')}`)
// return;
// }
// }
// }
//
// if(consumablesStore.projectsAvailable){
// let list = []
// consumablesStore.projectsAvailable.map((item:any) => {
// console.log('projIdCntMap===', projIdCntMap.value)
// let cn = projIdCntMap.value[item.projId || 1];
// if(cn){
// console.log('cn===', cn , item.num)
// if(cn > item.num){
// list.push(item)
// }
// }
// })
// if(list && list.length){
// eMessage.error(``)
// return;
// }
// }
if (tubeIdx < rack.tubeSettings.length) {
const setting = rack.tubeSettings[tubeIdx]

10
src/pages/Login/Login.vue

@ -132,11 +132,11 @@ const clearPin = () => {
// PIN
// PIN
const submitPin = async () => {
let resData = await isBoardParamInited()
if(!resData.data){//
message.warning('设备正在初始化,请稍候...')
return;
}
// let resData = await isBoardParamInited()
// if(!resData.data){//
// message.warning('...')
// return;
// }
if (selectedUser.value === null) {
loginStatus.value = '请选择用户'
return

2
tsconfig.app.tsbuildinfo
File diff suppressed because it is too large
View File

Loading…
Cancel
Save