@@ -57,60 +55,48 @@
percentage: '50%',
color:"#cf67e7"
},{
- id : 1,
+ id : 6,
name: '硫酸',
percentage: '10%',
color:"#cf67e7"
},{
- id : 2,
+ id : 7,
name: '硫酸',
percentage: '20%',
color:"#07a16e"
},{
- id : 3,
+ id : 8,
name: '硫酸',
percentage: '30%',
- },{
- id : 4,
- name: '硫酸',
- percentage: '40%',
- color:"#cf67e7"
- },{
- id : 5,
- name: '硫酸',
- percentage: '50%',
- color:'#3586c6'
}])
\ No newline at end of file
diff --git a/src/views/graphite/index.vue b/src/views/graphite/index.vue
index 697b8d7..b2e4279 100644
--- a/src/views/graphite/index.vue
+++ b/src/views/graphite/index.vue
@@ -1,5 +1,5 @@
-
+
@@ -7,13 +7,10 @@
-
-
-
+
-
开门
-
+
开门
开始任务
@@ -22,7 +19,6 @@
结束任务
-
选择配方
@@ -31,7 +27,6 @@
执行配方
-
添加溶液
@@ -40,9 +35,8 @@
摇匀
-
-
+
移至加热
@@ -52,7 +46,6 @@
移至特殊
-
开始加热
@@ -90,20 +83,15 @@
.graphite_home{
display: flex;
background: #F6F6F6;
- height: 1840px;
- width: 2800px;
-
}
.heat_area{
width: 1268px;
- height: 1586px;
display: flex;
justify-content: center;
flex-wrap: wrap;
margin: 5px;
gap: 20px;
flex-direction: row;
- padding-top:10px;
padding-bottom: 100px;
background: #FFFFFF;
border-radius: 20px;
@@ -111,17 +99,15 @@
.pickture_area{
width: 1040px;
- height: 1586px;
margin: 5px;
margin-left: 20px;
background: #FFFFFF;
- padding: 50px;
border-radius: 20px;
}
.graphite_btn{
- padding-top: 50px;
- margin-left: 30px;
+ margin-left: 68px;
+ margin-top: 2rem;
}
.btn_size{
@@ -129,10 +115,16 @@
height: 80px;
color: #1989FA;
border: 3px solid #1989FA;
+
+ }
+
+ .open{
+ width: 906px;
}
.graphite_operate{
- gap: 40px;
+ gap: 15px;
+ padding-top:30px;
}
.waste{