Browse Source

fix: 耗材滑动改变重构优化2

master
guoapeng 4 months ago
parent
commit
11a52fed8a
  1. 2
      src/pages/Index/Regular/Consumables.vue
  2. 2
      src/pages/Index/components/Consumables/BallGrid2.vue
  3. 12
      src/pages/Index/components/Consumables/InfoBar.vue
  4. 2
      src/pages/Login/index.vue

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

@ -77,7 +77,7 @@
<!--缓冲液区域小--> <!--缓冲液区域小-->
<div class="buffer-little-title"> <div class="buffer-little-title">
<div class="line"></div> <div class="line"></div>
<div class="content">缓冲液()</div>
<div class="content">耗材区</div>
</div> </div>
<div class="ball-area"> <div class="ball-area">
<MainComponent <MainComponent

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

@ -92,7 +92,7 @@ const updateSliderVal = async (empty) => {
} }
const activated = total - empty const activated = total - empty
emit('update:TipNum', activated, props.order, false)
emit('update:TipNum', activated, props.order, true)
} }
const updateSliderEndVal = async (hVal, vVal) => { const updateSliderEndVal = async (hVal, vVal) => {

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

@ -1,13 +1,19 @@
<template> <template>
<div :style="`width:${width}`"> <div :style="`width:${width}`">
<div class="status-bar" v-if="currentCount"> <div class="status-bar" v-if="currentCount">
<span class="project-name">{{ projectName }}</span>
<el-tooltip :content="projectName" placement="top" trigger="click">
<span class="project-name">{{ projectName }}</span>
</el-tooltip>
<el-tooltip :content="lotId" placement="top" trigger="click">
<span class="project-name">{{ lotId }}</span>
</el-tooltip>
<span class="project-name">{{ lotId }}</span>
<span class="project-count">{{ currentCount }}/{{ maxCount }}</span> <span class="project-count">{{ currentCount }}/{{ maxCount }}</span>
</div> </div>
<div v-else class="status-bar"> <div v-else class="status-bar">
<span class="project-name">{{ projectName }}</span>
<el-tooltip :content="projectName" placement="top" trigger="click">
<span class="project-name">{{ projectName }}</span>
</el-tooltip>
<span class="project-count"></span> <span class="project-count"></span>
</div> </div>
</div> </div>

2
src/pages/Login/index.vue

@ -117,7 +117,7 @@ const submitPin = async () => {
> >
{{ n }} {{ n }}
</div> </div>
<div class="key" @click="password = ''">重输</div>
<div class="key" @click="password = '';errorMsg = ''">重输</div>
<div class="key" @click="inputPin('0')">0</div> <div class="key" @click="inputPin('0')">0</div>
<div class="key" @click="submitPin">确定</div> <div class="key" @click="submitPin">确定</div>
</div> </div>

Loading…
Cancel
Save