GuoAnPeng
/
graphite-digestion-web
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix:ui修改1

master
guoapeng 2 months ago
parent
a04ec6f318
commit
a1c0ee9a13
2 changed files with 59 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      src/components/common/FTButton/index.vue
  2. 98
      src/views/home/index.vue

13
src/components/common/FTButton/index.vue
View File

@ -100,6 +100,19 @@ defineExpose({
.button-disabled { .button-disabled {
opacity: 0.5; opacity: 0.5;
} }
.my-button-large {
height: 40px;
font-size: 14px;
padding: 3px 15px;
.el-icon {
position: absolute;
left: 3px;
svg {
width: 25px;
}
}
}
.my-button-small { .my-button-small {
height: 25px; height: 25px;
font-size: 12px; font-size: 12px;

98
src/views/home/index.vue
View File

@ -495,109 +495,103 @@ const take_photo = async () => {
</div> </div>
<div class="button-box"> <div class="button-box">
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="12">
<ft-button :click-handle="door_open">
<el-col :span="8">
<ft-button size="large" :click-handle="door_open">
开门 开门
</ft-button> </ft-button>
</el-col> </el-col>
<el-col :span="12">
<ft-button :click-handle="door_close">
<el-col :span="8">
<ft-button size="large" :click-handle="door_close">
关门 关门
</ft-button> </ft-button>
</el-col> </el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="12">
<ft-button @click="startExperimentHandle">
<el-col :span="8">
<ft-button size="large" @click="startExperimentHandle">
开始实验 开始实验
</ft-button> </ft-button>
</el-col> </el-col>
<el-col :span="12">
<ft-button :click-handle="stopExperimentHandle">
停止实验
</ft-button>
</el-col>
</el-row> </el-row>
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="12">
<ft-button @click="selectCraft">
<el-col :span="8">
<ft-button size="large" @click="selectCraft">
选择工艺 选择工艺
</ft-button> </ft-button>
</el-col> </el-col>
<el-col :span="12">
<ft-button :click-handle="executeCraftHandle">
<el-col :span="8">
<ft-button size="large" :click-handle="executeCraftHandle">
执行工艺 执行工艺
</ft-button> </ft-button>
</el-col> </el-col>
<el-col :span="8">
<ft-button size="large" :click-handle="stopExperimentHandle">
停止实验
</ft-button>
</el-col>
</el-row> </el-row>
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="12">
<ft-button :click-handle="filled_solution">
<el-col :span="8">
<ft-button size="large" :click-handle="filled_solution">
预充管路 预充管路
</ft-button> </ft-button>
</el-col> </el-col>
<el-col :span="12">
<ft-button @click="addLiquid">
<el-col :span="8">
<ft-button size="large" @click="addLiquid">
添加溶液 添加溶液
</ft-button> </ft-button>
</el-col> </el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="12">
<ft-button :click-handle="shake_start">
<el-col :span="8">
<ft-button size="large" :click-handle="shake_start">
开始摇匀 开始摇匀
</ft-button> </ft-button>
</el-col> </el-col>
<el-col :span="12">
<ft-button :click-handle="shake_stop">
停止摇匀
</ft-button>
</el-col>
</el-row> </el-row>
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="12">
<ft-button :click-handle="move_to_heat_area" :disabled="!systemStore.systemStatus.gantryArm.idle">
<el-col :span="8">
<ft-button size="large" :click-handle="move_to_heat_area" :disabled="!systemStore.systemStatus.gantryArm.idle">
移至加热 移至加热
</ft-button> </ft-button>
</el-col> </el-col>
<el-col :span="12">
<ft-button :click-handle="move_to_solution_area" :disabled="!systemStore.systemStatus.gantryArm.idle">
<el-col :span="8">
<ft-button size="large" :click-handle="move_to_solution_area" :disabled="!systemStore.systemStatus.gantryArm.idle">
移至加液 移至加液
</ft-button> </ft-button>
</el-col> </el-col>
<el-col :span="8">
<ft-button size="large" :click-handle="shake_stop">
停止摇匀
</ft-button>
</el-col>
</el-row> </el-row>
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="12">
<ft-button :click-handle="heat_start">
<el-col :span="8">
<ft-button size="large" :click-handle="heat_start">
开始加热 开始加热
</ft-button> </ft-button>
</el-col> </el-col>
<el-col :span="12">
<ft-button :click-handle="heat_stop">
<el-col :span="8">
<ft-button size="large" :click-handle="heat_stop">
停止加热 停止加热
</ft-button> </ft-button>
</el-col> </el-col>
<el-col :span="8">
<ft-button size="large" :click-handle="tray_up">
抬起托盘
</ft-button>
</el-col>
</el-row> </el-row>
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="12">
<ft-button :click-handle="fan_start">
<el-col :span="8">
<ft-button size="large" :click-handle="fan_start">
开始散热 开始散热
</ft-button> </ft-button>
</el-col> </el-col>
<el-col :span="12">
<ft-button :click-handle="fan_stop">
<el-col :span="8">
<ft-button size="large" :click-handle="fan_stop">
停止散热 停止散热
</ft-button> </ft-button>
</el-col> </el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="12">
<ft-button :click-handle="tray_up">
抬起托盘
</ft-button>
</el-col>
<el-col :span="12">
<ft-button :click-handle="tray_down">
<el-col :span="8">
<ft-button size="large" :click-handle="tray_down">
降下托盘 降下托盘
</ft-button> </ft-button>
</el-col> </el-col>
@ -667,7 +661,7 @@ const take_photo = async () => {
justify-content: flex-end; justify-content: flex-end;
.el-row { .el-row {
height: fit-content; height: fit-content;
margin: 5px 0;
margin: 10px 0;
.el-col { .el-col {
display: flex; display: flex;
justify-content: center; justify-content: center;

Write Preview
Loading…
Cancel
Save