Browse Source

小缓冲液区添加批次

master
LiLongLong 3 months ago
parent
commit
c9c74557da
  1. 3
      src/pages/Index/Regular/Consumables.vue
  2. 5
      src/pages/Index/components/Consumables/InfoBar.vue
  3. 4
      src/pages/Index/components/Consumables/MainComponent.vue
  4. 4
      src/pages/Index/components/Consumables/MoveLiquidArea.vue
  5. 10
      src/pages/Login/Login.vue

3
src/pages/Index/Regular/Consumables.vue

@ -90,6 +90,7 @@
:totalBalls="25"
:activatedBalls="item.num"
:columns="5"
:lotId="item.lotId"
gridWidth="240px"
gridHeight="240px"
:activeColor="consumableStore.projIdColorMap[item.projId!]"
@ -124,7 +125,7 @@ import {
unloadAllConsumable,
unloadConsumable,
ConsumableGroupNo,
} from '@/services/Index/index'
} from "@/services/Index/index"
import { useConsumablesStore, useEmergencyStore } from '@/store'
import { useDeviceStore } from '@/store/index'
import { eventBus } from '@/eventBus'

5
src/pages/Index/components/Consumables/InfoBar.vue

@ -2,6 +2,8 @@
<div :style="`width:${width}`">
<div class="status-bar" v-if="currentCount">
<span class="project-name">{{ projectName }}</span>
<span class="project-name">{{ lotId }}</span>
<span class="project-count">{{ currentCount }}/{{ maxCount }}</span>
</div>
<div v-else class="status-bar">
@ -32,6 +34,9 @@ const props = defineProps({
type: String,
default: '120px',
},
lotId: {
type: String,
},
})
// props

4
src/pages/Index/components/Consumables/MainComponent.vue

@ -20,6 +20,7 @@
:currentCount="currentCount"
:maxCount="maxCount"
:width="gridWidth"
:lotId="lotId"
/>
</div>
</template>
@ -73,6 +74,9 @@ const props = defineProps({
type: Boolean,
default: true,
},
lotId:{
type: String,//
}
})
const emit = defineEmits(['updateBottleNum'])

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

@ -336,9 +336,9 @@ const changePlate = (index: number) => {
}
.load-consumables {
margin: 0 16px 12px 10px;
margin: 12px 16px 12px 10px;
padding: 0;
height: 100px;
height: 90px;
font-size: 40px;
border-radius: 10px;
// margin-bottom: 15px;

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

Loading…
Cancel
Save