-
+
{{ index + 1 }} {{ corros.name }}
@@ -97,7 +97,6 @@
const corrosionList = ref(list)
const onChooseLiquid = (item={}) => {
- console.log('------item--------', item)
visible.value = true;
corrosion.value = item;
chooseAcidDlg.value.showDlg()
@@ -111,23 +110,27 @@
@use "@/assets/style/mixin.scss" as *;
.add_liquid_bottle{
display: flex;
- flex-wrap: wrap;
+ flex-wrap: wrap;
}
+
.add_liquid{
background: #F4F9FF;
- width: 12.875rem;
+ width: 12.5rem;
height: 13.5rem;
border:1px solid #275EFB;
margin-left: 4.25rem;
margin-top: 5rem;
border-radius: 10px;
+ @media (min-width: $md) {
+ margin-top: 32px;
+ }
.config_title{
- width: 12.875rem;
+ width: 12.5rem;
height: 2.5rem;
background: rgba(25, 137, 250, 0.1216);
padding-top: .5rem;
.config_name{
- width: 7.875rem;
+ width: 7.8rem;
height: 1.625rem;
background: #FFFFFF;
margin-left: 2.5rem;
@@ -206,4 +209,10 @@
border-radius: 6.25rem;
}
}
+
+ @media screen and (max-width: 1120px){
+ .add_liquid{
+ margin-left: 20px;
+ }
+ }
\ No newline at end of file
diff --git a/src/views/components/Header.vue b/src/views/components/Header.vue
index ecb4c1d..038c7a0 100644
--- a/src/views/components/Header.vue
+++ b/src/views/components/Header.vue
@@ -11,18 +11,32 @@
Admin
-
修改密码
-
退出登录
+
+
![]()
+ 修改密码
+
+
+
![]()
+ 退出登录
+
+
+
\ No newline at end of file
diff --git a/src/views/graphite/components/AddLiquid.vue b/src/views/graphite/components/AddLiquid.vue
index 9c5e550..ff50238 100644
--- a/src/views/graphite/components/AddLiquid.vue
+++ b/src/views/graphite/components/AddLiquid.vue
@@ -47,7 +47,7 @@
-
+
{{ item.solutionName }}添加{{ item.solutionNum }}ml
@@ -125,8 +125,8 @@
}
//删除队列中 试管需要加的溶液
- const delQueueSolution = () => {
-
+ const delQueueSolution = (data) => {
+ console.log('data===', data)
}
//溶液添加到试管
@@ -281,6 +281,7 @@
display: flex;
height: 4.125rem;
background: rgba(25, 137, 250, 0.12);
+ align-items: center;
}
.liquid_button{
width: 100%;
diff --git a/src/views/graphite/components/HeatPosition.vue b/src/views/graphite/components/HeatPosition.vue
index f796226..2778e32 100644
--- a/src/views/graphite/components/HeatPosition.vue
+++ b/src/views/graphite/components/HeatPosition.vue
@@ -1,5 +1,5 @@
-
+
{{ `A-${posIndex || ''}` }}
已放置
@@ -168,11 +168,10 @@
display: flex;
justify-content: center;
flex-wrap: wrap;
- margin-left: 5px;
+ margin-left: 2px;
gap: .625rem;
flex-direction: row;
border: 2px solid #7592A8;
- margin-left: .5rem;
padding-top: .5rem;
border-radius: 0.5rem;
@@ -218,14 +217,13 @@
margin-left: 5px;
.heat_temperature{
height: 1.625rem;
- width: 10.375rem;
+ width: 10rem;
background: #FFFFFF;
box-shadow: inset 2px 2px 4px 0px rgba(204, 204, 204, 0.3);
border-radius: 5px;
display: flex;
align-items: center;
justify-content: center;
- margin-left: .375rem;
.target_temp{
color: #384D5D;
font-size: .75rem;
@@ -234,7 +232,7 @@
.heating{
color: #FE0A0A;
font-size: .875rem;
- margin-left: 2.25rem;
+ margin-left: 1rem;
}
}