From e9696375103396eebcf11c88f7f5af1bf684fa85 Mon Sep 17 00:00:00 2001
From: LiLongLong <13717757313@163.com>
Date: Tue, 11 Feb 2025 11:53:44 +0800
Subject: [PATCH] rebase master

---
 src/components/HelloWorld.vue                  |  46 -------
 src/components/OverlayModal.vue                |  59 +++++++++
 src/views/addLiquid/index.vue                  | 162 ++++++++++++++++-------
 src/views/components/chooseAcidDlg.vue         |  73 +++++++++++
 src/views/graphite/components/AddLiquid.vue    | 173 +++++++++++++++++++++++++
 src/views/graphite/components/AddWaste.vue     | 173 -------------------------
 src/views/graphite/components/CarfList.vue     | 101 +++++++++++++++
 src/views/graphite/components/HeatPosition.vue |   2 -
 src/views/graphite/components/index.ts         |   2 +-
 src/views/graphite/index.vue                   |  57 ++++----
 10 files changed, 556 insertions(+), 292 deletions(-)
 delete mode 100644 src/components/HelloWorld.vue
 create mode 100644 src/components/OverlayModal.vue
 create mode 100644 src/views/components/chooseAcidDlg.vue
 create mode 100644 src/views/graphite/components/AddLiquid.vue
 delete mode 100644 src/views/graphite/components/AddWaste.vue
 create mode 100644 src/views/graphite/components/CarfList.vue

diff --git a/src/components/HelloWorld.vue b/src/components/HelloWorld.vue
deleted file mode 100644
index 3402ee1..0000000
--- a/src/components/HelloWorld.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<script setup lang="ts">
-import { ref } from "vue";
-import { showToast } from "vant";
-
-defineProps<{
-	msg: string;
-}>();
-const value = ref<number>(50);
-const onChange = (value: number) => showToast("当前值：" + value);
-</script>
-
-<template>
-	<div class="greetings">
-		<h1 class="green">{{ msg }}</h1>
-		<h3>
-			You’ve successfully created a project with
-			<a href="https://vite.dev/" target="_blank" rel="noopener">Vite</a> +
-			<a href="https://vuejs.org/" target="_blank" rel="noopener">Vue 3</a>. What's next?
-		</h3>
-		<span class="text-lg font-medium">{{ value }}</span>
-		<van-slider class="my-8" :step="0.5" v-model="value" @change="onChange" />
-	</div>
-</template>
-
-<style scoped>
-.greetings {
-	--van-slider-bar-height: 6px;
-	--van-slider-button-width: 32px;
-	--van-slider-button-height: 32px;
-}
-h1 {
-	font-weight: 500;
-	font-size: 2.6rem;
-	position: relative;
-	top: -10px;
-}
-
-h3 {
-	font-size: 1.2rem;
-}
-
-.greetings h1,
-.greetings h3 {
-	text-align: center;
-}
-</style>
diff --git a/src/components/OverlayModal.vue b/src/components/OverlayModal.vue
new file mode 100644
index 0000000..d8ca6d0
--- /dev/null
+++ b/src/components/OverlayModal.vue
@@ -0,0 +1,59 @@
+<template>
+    <van-overlay :show="visible" style="z-index: 999;">
+        <div class="overlay_modal" >
+          <slot></slot>
+        </div>
+      </van-overlay>
+</template>
+<script lang="ts" setup>
+    import { ref, onMounted, watch } from "vue"
+    const emits = defineEmits(['confirm', 'changeVisible'])
+
+    const props = defineProps({
+        title:{
+            type: String,
+            default: ''
+        },
+        visible:{
+            type: Boolean,
+            default: false
+        },
+        list:{
+            type: Array,
+            default: ()=>[]
+        },
+        width:{
+            type:String,
+            default:'32rem'
+        },
+        height:{
+            type:String,
+            default:'25rem'
+        },
+        item:{
+            type: Object
+        }
+    })
+
+    const columnsList = ref<any>(props.list)
+
+    const onSubmit = () => {
+        emits('confirm')
+    }
+
+    const onCancel = ()=> {
+        emits("changeVisible", false)
+    }
+</script>
+<style scoped>
+    .overlay_modal{
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        margin-top: 12.5rem;
+    }
+    .picker_title{
+        font-size: 2rem;
+    }
+
+</style>
\ No newline at end of file
diff --git a/src/views/addLiquid/index.vue b/src/views/addLiquid/index.vue
index 4277e9d..85c2f70 100644
--- a/src/views/addLiquid/index.vue
+++ b/src/views/addLiquid/index.vue
@@ -1,9 +1,9 @@
 <template>
-    <div class="add_liquid_bottle">
-        <div class="add_liquid">
-            <div class="config_title">
+    <div class="component-page add_liquid_bottle">
+        <div v-for="(corros, index) in corrosionList" class="add_liquid">
+            <div class="config_title" @click="onChooseLiquid(corros)">
                 <div class="config_name">
-                    <div>1 硝酸</div>
+                    <div>{{ index + 1 }} {{ corros.name }}</div>
                     <img :src="ArrowSvg" class="arrow_img"/>
                 </div>
             </div>
@@ -11,60 +11,126 @@
                 <div class="liquid_pos">
                     <div class="contail_percentage"></div>
                     <div class="liquid_percent bottle_wd"></div>
-                    <div class="percent_num">300ml</div>
+                    <div class="percent_num">{{ corros.ml }}</div>
                 </div>
                 <div class="ml_name">
-                    300ml
-                </div>
-            </div>
-        </div>
-
-        <div class="add_liquid">
-            <div class="config_title">
-                <div class="config_name">
-                    <div>1 硝酸</div>
-                    <img :src="ArrowSvg" class="arrow_img"/>
-                </div>
-            </div>
-            <div class="bottle_ml">
-                <div class="liquid_pos">
-                    <div class="contail_percentage"></div>
-                    <div class="liquid_percent bottle_wd"></div>
-                    <div class="percent_num">300ml</div>
-                </div>
-                <div class="ml_name">
-                    300ml
+                    {{ `${corros.ml}/${corros.totalMl}` }}
                 </div>
             </div>
         </div>
+        <choose-acid-dlg ref="chooseAcidDlg"></choose-acid-dlg>
     </div>
 </template>
 <script lang="ts" setup>
+    import { ref } from 'vue'
+    import ChooseAcidDlg from '../components/chooseAcidDlg.vue'
     import ArrowSvg from '@/assets/arrow.svg'
+    interface Corrosion {
+    }
+    const visible  = ref(false)
+    const chooseAcidDlg = ref()
+    const corrosion = ref<Corrosion>()
+    const temp_list = [{
+        text: '硫酸1', 
+        value: '11' 
+    },{
+        text: '硫酸2', 
+        value: '12' 
+    },{
+        text: '硫酸3', 
+        value: '13' 
+    },{
+        text: '硫酸4', 
+        value: '14' 
+    }]
+    const selectList = ref(temp_list)
+    const list = [{
+        name:'硝酸',
+        id: 10,
+        ml: '100ml',
+        color: '#26D574',
+        totalMl: '500ml'
+    },{
+        name:'硫酸',
+        id: 20,
+        ml: '200ml',
+        color: '#26D574',
+        totalMl: "500ml"
+    },{
+        name:'硫酸',
+        id: 20,
+        ml: '200ml',
+        color: '#26D574',
+        totalMl: "500ml"
+    },{
+        name:'硫酸',
+        id: 20,
+        ml: '200ml',
+        color: '#26D574',
+        totalMl: "500ml"
+    },{
+        name:'硫酸',
+        id: 20,
+        ml: '200ml',
+        color: '#26D574',
+        totalMl: "500ml"
+    },{
+        name:'硫酸',
+        id: 20,
+        ml: '200ml',
+        color: '#26D574',
+        totalMl: "500ml"
+    },{
+        name:'硫酸',
+        id: 20,
+        ml: '200ml',
+        color: '#26D574',
+        totalMl: "500ml"
+    },{
+        name:'硫酸',
+        id: 20,
+        ml: '200ml',
+        color: '#26D574',
+        totalMl: "500ml"
+    }]
+
+    const corrosionList = ref(list)
+
+    const onChooseLiquid = (item={}) => {
+        console.log('------item--------', item)
+        visible.value = true;
+        corrosion.value = item;
+        chooseAcidDlg.value.showDlg()
+    }
+
+    const changeVisible = (value=false) => {
+        visible.value = value;
+    }
 </script>
 <style lang="scss" scoped>
     @use "@/assets/style/mixin.scss" as *;
     .add_liquid_bottle{
         display: flex;
+        flex-wrap: wrap;
     }
     .add_liquid{
         background: #F4F9FF;
         width: $addLiquidWidth;
-        height: 430px;
+        height: 13.5rem;
         border:1px solid #275EFB;
-        margin-left: 135px;
-        margin-top:  160px;
-        border-radius: 20px;
+        margin-left: 4.25rem;
+        margin-top:  5rem;
+        border-radius: 10px;
         .config_title{
             width: $addLiquidWidth;
-            height: 80px;
+            height: 2.5rem;
             background: rgba(25, 137, 250, 0.1216);
-            padding-top: 16px;
+            padding-top: .5rem;
             .config_name{
-                width: 248px;
-                height: 50px;
+                width: 7.875rem;
+                height: 1.625rem;
                 background: #FFFFFF;
-                margin-left: 80px;
+                margin-left: 2.5rem;
                 display: flex;
                 justify-content: center;
                 align-items: center;
@@ -80,32 +146,32 @@
             
             .liquid_pos{
                 position: relative;
-                width: 162px;
-                height: 228px;
+                width: 5.125rem;
+                height: 7.25rem;
                 margin-top: 36px;
-                margin-left: 120px;
+                margin-left: 3.75rem;
                 display: flex;
                 justify-content: center;
                 align-items: center;
                 .bottle_wd{
                     height: 30%;
                     background-color:red;
-                    width: 162px;
+                    width: 5.15rem;
                 }
             }
             .liquid_status{
-                height: 29px;
+                height: 1rem;
                 font-family: Source Han Sans;
-                font-size: 30px;
+                font-size: 1rem;
                 font-weight: 500;
                 color: #40474E;
-                padding-top: 19px;
+                padding-top: 20px;
             }
 
             .contail_percentage{
                 position: absolute;
-                width: 162px;
-                height: 228px;
+                width: 5rem;
+                height: 7.125rem;
                 background-image: url('@/assets/container.svg');
                 background-size: cover;
                 background-position: center;
@@ -116,7 +182,7 @@
             .liquid_percent {
                 position: absolute;
                 bottom: 0;
-                width: 83px;
+                width: 2.625rem;
                 background-color: blue;
                 opacity: 0.5;
                 z-index: 2;
@@ -131,13 +197,13 @@
             z-index: 2;
         }
         .ml_name{
-            width: 174px;
-            height: 50px;
+            width: 4.125rem;
+            height: 1.625rem;
             background: #FFFFFF;
-            margin-left: 120px;
+            margin-left: 3.75rem;
             text-align: center;
             margin-top: 15px;
-            border-radius: 195px;
+            border-radius: 6.25rem;
         }
     }
 </style>
\ No newline at end of file
diff --git a/src/views/components/chooseAcidDlg.vue b/src/views/components/chooseAcidDlg.vue
new file mode 100644
index 0000000..cf6b059
--- /dev/null
+++ b/src/views/components/chooseAcidDlg.vue
@@ -0,0 +1,73 @@
+<template>
+    <van-overlay :show="visible" style="z-index: 999;">
+        <div class="overlay_modal" >
+            <div class="overlay_title">液体选择</div>
+            <div class="overlay_content">
+
+            </div>
+            <div class="overlay_btn">
+                <van-button type="primary" class="btn ok">确定</van-button>
+                <van-button class="btn cancel" @click="onCancel">取消</van-button>
+            </div>
+        </div>
+    </van-overlay>
+</template>
+<script lang="ts" setup>
+    import { ref, onMounted, watch, defineExpose } from "vue"
+    
+    const visible = ref(false)
+    const emits = defineEmits(['confirm', 'changeVisible'])
+    const props = defineProps({})
+
+    const showDlg = ()=>{
+        visible.value = true;
+    }
+
+    const onCancel = ()=> {
+        visible.value = false;
+    }
+    defineExpose({
+        showDlg
+    });
+</script>
+<style lang="scss" scoped>
+    @use "@/assets/style/mixin.scss" as *;
+    .overlay_modal{
+        width:56.25rem;
+        height: 32.5rem;
+        margin-left: 19.75rem;
+        margin-top: 12.5rem;
+        background: #ffffff;
+
+        .overlay_content{
+            width: 53.125rem;
+            height: 23.125rem;
+        }
+
+        .overlay_title{
+            width: 8.5rem;
+            height: 1.875rem;
+            padding-left: 1.5rem;
+            padding-top: 1.875rem;
+            font-size: 1.25rem;
+        }
+
+        .overlay_btn{
+            .btn{
+                width: 13.625rem;
+                height: 2.875rem;
+                font-size: 1.25rem;
+                
+            }
+
+            .ok{
+                margin-left: 14.375rem;
+            }
+
+            .cancel{
+                margin-left: 2.375rem;
+            }
+
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/graphite/components/AddLiquid.vue b/src/views/graphite/components/AddLiquid.vue
new file mode 100644
index 0000000..00c696a
--- /dev/null
+++ b/src/views/graphite/components/AddLiquid.vue
@@ -0,0 +1,173 @@
+<template>
+    <div>
+        <div>
+            <div class="title">添加溶液</div>
+        </div>
+        <div class="waste_main">
+            <div class="waste_area" v-for="el in 8">
+                <!--左溶液瓶区-->
+                <div>
+                    <div class="waste_percentage">
+                        <div class="percent_num">300ml</div>
+                        <div class="waste_color" style="background-color:#26D574;"></div>
+                    </div>
+                    <div class="waste_name">硫酸</div>
+                </div>
+                <!--右操作区-->
+                <div>
+                    <div class="waste_edit">
+                        <div >
+                            <van-icon name="edit" />
+                            <span>请输入添加值</span>
+                        </div>
+                        <br/>
+                        <div class="waste_field">
+                            <img :src="AddSvg"/>
+                            <van-field  placeholder="请输入" />
+                            <div class="ml">ml</div>
+                        </div>
+                        <br/>
+                        <div>
+                            <van-button class="add_btn">加酸</van-button>
+                        </div>
+                    </div>
+                    <div class="add_result">硫酸已添加100ml</div>
+                </div>
+            </div>
+        </div>
+        <div class="waste_button">
+            <van-button class="btn" @click="onConfirm" type="primary">确认添加</van-button>
+            <van-button class="btn" @click="onCancel" style="margin-left: 50px;">取消添加</van-button>
+        </div>
+    </div>
+</template>
+<script setup>
+    import AddSvg from '@/assets/add.svg'
+    const emits = defineEmits(['cancel'])
+
+    const onConfirm = () => {
+
+    }
+
+    const onCancel = () => {
+        emits('cancel')
+    }
+
+</script>
+<style scoped>
+    .title{
+        font-size: 40px;
+        font-weight: 500;
+        line-height: 22px;
+        padding-top: 80px;
+        margin-left:90px;
+        color: #323233;
+    }
+    
+    .waste_main{
+        height: 900px;
+        flex-wrap: wrap;
+        display: flex;
+        .waste_area{
+            height: 330px;
+            width: 480px;
+            border: 2px solid #275EFB;
+            margin-top: 100px;
+            margin-left: 70px;
+            background: rgb(243 251 255);
+            border-radius: 20px;
+            display: flex;
+            .waste_percentage{
+                position: relative;
+                width: 141px;
+                height: 198px;
+                background-image: url('@/assets/container.svg');
+                background-size: cover;
+                background-position: center;
+                z-index: 1;
+                border-radius: 10px;
+                margin-top: 33px;
+                margin-left: 32px;
+            }
+
+            .percent_num{
+                position: relative;
+                top: 40%;
+                left: 22%;
+                font-size: 30px;
+            }
+            .waste_color{
+                position: absolute;
+                bottom: 0;
+                left: 0;
+                width: 141px;
+                height: 50%;
+                background-color: blue;
+                opacity: 0.5;
+                z-index: 2;
+                border-radius: 0 0 10px 10px;
+            }
+
+            .waste_name{
+                margin-left: 76px;
+                margin-top: 27px;
+                font-size: 26px;
+                color: #393F46;
+            }
+
+            .waste_edit{
+                background: #ffffff;
+                width: 256px;
+                height: 220px;
+                margin-left: 30px;
+                margin-top: 20px;
+                padding-top: 30px;
+                font-size: 20px;
+                padding-left: 35px;
+            }
+
+            .waste_field{
+                width: 210px;
+                display: flex;
+                border: 1px solid;
+                border-radius: 304px;
+                border: 1px solid #E4E5F1;
+            }
+           
+        }
+        
+        .add_btn{
+            background-color: #26D574;
+            font-size: 20px;
+            color: #ffffff;
+            width: 200px;
+            border-radius: 100px;
+        }
+        
+    }
+    
+
+    .waste_button{
+        width: 100%;
+        padding-top: 50px;
+        margin-left: 35%;
+        height: 200px;
+        .btn{
+            width:438px;
+            height: 90px;
+            font-size: 40px;
+        }
+    }
+    .ml{
+        margin-right: 20px;
+        padding-top: 5px;
+    }
+
+    .add_result{
+        font-size: 26px;
+        color: #393f46; 
+        margin-top: 18px;
+        margin-left: 45px;
+    }
+
+</style>
\ No newline at end of file
diff --git a/src/views/graphite/components/AddWaste.vue b/src/views/graphite/components/AddWaste.vue
deleted file mode 100644
index 00c696a..0000000
--- a/src/views/graphite/components/AddWaste.vue
+++ /dev/null
@@ -1,173 +0,0 @@
-<template>
-    <div>
-        <div>
-            <div class="title">添加溶液</div>
-        </div>
-        <div class="waste_main">
-            <div class="waste_area" v-for="el in 8">
-                <!--左溶液瓶区-->
-                <div>
-                    <div class="waste_percentage">
-                        <div class="percent_num">300ml</div>
-                        <div class="waste_color" style="background-color:#26D574;"></div>
-                    </div>
-                    <div class="waste_name">硫酸</div>
-                </div>
-                <!--右操作区-->
-                <div>
-                    <div class="waste_edit">
-                        <div >
-                            <van-icon name="edit" />
-                            <span>请输入添加值</span>
-                        </div>
-                        <br/>
-                        <div class="waste_field">
-                            <img :src="AddSvg"/>
-                            <van-field  placeholder="请输入" />
-                            <div class="ml">ml</div>
-                        </div>
-                        <br/>
-                        <div>
-                            <van-button class="add_btn">加酸</van-button>
-                        </div>
-                    </div>
-                    <div class="add_result">硫酸已添加100ml</div>
-                </div>
-            </div>
-        </div>
-        <div class="waste_button">
-            <van-button class="btn" @click="onConfirm" type="primary">确认添加</van-button>
-            <van-button class="btn" @click="onCancel" style="margin-left: 50px;">取消添加</van-button>
-        </div>
-    </div>
-</template>
-<script setup>
-    import AddSvg from '@/assets/add.svg'
-    const emits = defineEmits(['cancel'])
-
-    const onConfirm = () => {
-
-    }
-
-    const onCancel = () => {
-        emits('cancel')
-    }
-
-</script>
-<style scoped>
-    .title{
-        font-size: 40px;
-        font-weight: 500;
-        line-height: 22px;
-        padding-top: 80px;
-        margin-left:90px;
-        color: #323233;
-    }
-    
-    .waste_main{
-        height: 900px;
-        flex-wrap: wrap;
-        display: flex;
-        .waste_area{
-            height: 330px;
-            width: 480px;
-            border: 2px solid #275EFB;
-            margin-top: 100px;
-            margin-left: 70px;
-            background: rgb(243 251 255);
-            border-radius: 20px;
-            display: flex;
-            .waste_percentage{
-                position: relative;
-                width: 141px;
-                height: 198px;
-                background-image: url('@/assets/container.svg');
-                background-size: cover;
-                background-position: center;
-                z-index: 1;
-                border-radius: 10px;
-                margin-top: 33px;
-                margin-left: 32px;
-            }
-
-            .percent_num{
-                position: relative;
-                top: 40%;
-                left: 22%;
-                font-size: 30px;
-            }
-            .waste_color{
-                position: absolute;
-                bottom: 0;
-                left: 0;
-                width: 141px;
-                height: 50%;
-                background-color: blue;
-                opacity: 0.5;
-                z-index: 2;
-                border-radius: 0 0 10px 10px;
-            }
-
-            .waste_name{
-                margin-left: 76px;
-                margin-top: 27px;
-                font-size: 26px;
-                color: #393F46;
-            }
-
-            .waste_edit{
-                background: #ffffff;
-                width: 256px;
-                height: 220px;
-                margin-left: 30px;
-                margin-top: 20px;
-                padding-top: 30px;
-                font-size: 20px;
-                padding-left: 35px;
-            }
-
-            .waste_field{
-                width: 210px;
-                display: flex;
-                border: 1px solid;
-                border-radius: 304px;
-                border: 1px solid #E4E5F1;
-            }
-           
-        }
-        
-        .add_btn{
-            background-color: #26D574;
-            font-size: 20px;
-            color: #ffffff;
-            width: 200px;
-            border-radius: 100px;
-        }
-        
-    }
-    
-
-    .waste_button{
-        width: 100%;
-        padding-top: 50px;
-        margin-left: 35%;
-        height: 200px;
-        .btn{
-            width:438px;
-            height: 90px;
-            font-size: 40px;
-        }
-    }
-    .ml{
-        margin-right: 20px;
-        padding-top: 5px;
-    }
-
-    .add_result{
-        font-size: 26px;
-        color: #393f46; 
-        margin-top: 18px;
-        margin-left: 45px;
-    }
-
-</style>
\ No newline at end of file
diff --git a/src/views/graphite/components/CarfList.vue b/src/views/graphite/components/CarfList.vue
new file mode 100644
index 0000000..c99e26f
--- /dev/null
+++ b/src/views/graphite/components/CarfList.vue
@@ -0,0 +1,101 @@
+<template>
+    <div class="carf">
+        <div class="carf_title">选择工艺</div>
+        <div>
+            <div class="carf_column_name">工艺名称</div>
+            <div v-for="item in list" class="carf_item" @click="onChooseCarf(item)">
+                <div :style="`background: ${currentItem?.id == item.id ? activeColor : ''}`" class="carf_li">{{ item.name }}</div>
+            </div>
+        </div>
+        <div class="overlay_btn">
+            <van-button type="primary" class="btn ok">确定</van-button>
+            <van-button class="btn cancel" @click="onCancel">取消</van-button>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+    import { ref, onMounted } from 'vue'
+    const currentItem = ref()
+    const activeColor = ref('#ffffff')
+    const list = ref()
+    const emits = defineEmits(['changeVisible'])
+    onMounted(()=>{
+        list.value = [{
+            id: 10,
+            name: '硫酸溶解法1'
+        },{
+            id: 20,
+            name: '硫酸溶解法2'
+        },{
+            id: 30,
+            name: '硫酸溶解法3'
+        }]
+    })
+
+    const onChooseCarf = (data:any) => {
+        activeColor.value = '#d9d9d9'
+        currentItem.value = data
+    }
+
+    const onCancel = () => {
+        emits('changeVisible')
+    }
+</script>
+
+<style lang="scss" scoped>
+    .carf{
+        height: 27.5rem;
+        width: 23.75rem;
+        background: #ffffff;
+
+        .carf_title{
+            width: 5.25rem;
+            height: 1.875rem;
+            margin-left: 1.25rem;
+            margin-top: 1.875rem;
+            color: #40474E;
+            font-weight: 500;
+            font-size: 1.25rem;
+        }
+        
+    }
+
+    .carf_column_name{
+        width: 5rem;
+        height: 1.875rem;
+        color: rgba(0, 0, 0, 0.85);
+        margin-left: 2rem;
+        margin-top: .625rem;
+    }
+
+    .carf_item{
+        .carf_li{
+            display: flex;
+            align-items: center;
+            width: 23.75rem;
+            height: 3.125rem;
+            padding-left: 1.875rem;
+            font-size: 1.25rem;
+            color: rgba(0, 0, 0, 0.85);
+        }
+    }
+
+    .overlay_btn{
+        .btn{
+            width: 6.875rem;
+            height: 2.875rem;
+            font-size: 1.25rem;
+            margin-top: 6.875rem;
+        }
+
+        .ok{
+            margin-left: 5rem;
+        }
+
+        .cancel{
+            margin-left: 2.375rem;
+        }
+
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/graphite/components/HeatPosition.vue b/src/views/graphite/components/HeatPosition.vue
index 7b7099a..1f52ec3 100644
--- a/src/views/graphite/components/HeatPosition.vue
+++ b/src/views/graphite/components/HeatPosition.vue
@@ -62,8 +62,6 @@
       formulaVisible.value = true;
       formulaList.value = [{ text: '硫酸', value: '1' }]
       formulaList.value.push({ text: '硫酸', value: '1' })
-      console.log('----------选择配方-----------')
-
     }
 
     const onConfirmFormula = (value:any) => {
diff --git a/src/views/graphite/components/index.ts b/src/views/graphite/components/index.ts
index 6874727..6a67c69 100644
--- a/src/views/graphite/components/index.ts
+++ b/src/views/graphite/components/index.ts
@@ -1,4 +1,4 @@
 
 export {default as HeatPosition} from './HeatPosition.vue'
 export {default as TakePickture} from './TakePickture.vue'
-export { default as AddWaste} from './AddWaste.vue'
+export { default as AddLiquid} from './AddLiquid.vue'
diff --git a/src/views/graphite/index.vue b/src/views/graphite/index.vue
index b2e4279..0222997 100644
--- a/src/views/graphite/index.vue
+++ b/src/views/graphite/index.vue
@@ -21,15 +21,15 @@
                 </van-row>
                 <van-row class="graphite_operate">
                     <van-col span="11">
-                        <van-button  size="large" class="btn_size">选择配方</van-button>
+                        <van-button  size="large" class="btn_size" @click="onChooseCaft">选择工艺</van-button>
                     </van-col>
                     <van-col span="11">
-                        <van-button  size="large" class="btn_size">执行配方</van-button>
+                        <van-button  size="large" class="btn_size">执行工艺</van-button>
                     </van-col>
                 </van-row>
                 <van-row class="graphite_operate">
                     <van-col span="11">
-                        <van-button  size="large" class="btn_size" @click="onAddWaste">添加溶液</van-button>
+                        <van-button  size="large" class="btn_size" @click="onAddLiquid">添加溶液</van-button>
                     </van-col>
                     <van-col span="11">
                         <van-button  size="large" class="btn_size">摇匀</van-button>
@@ -57,25 +57,38 @@
 
             </div>
         </div>
-        <van-overlay :show="wasteVisible" style="z-index: 999;">
+        <van-overlay :show="liquidVisible" style="z-index: 999;">
             <div class="waste">
-                <div class="addWaste">
-                    <AddWaste @cancel="wasteVisible=false"></AddWaste>
+                <div class="addLiquid">
+                    <AddLiquid @cancel="liquidVisible=false"></AddLiquid>
                 </div>
             </div>
         </van-overlay>
+        <!--选择工艺-->
+        <OverlayModal :visible="carfVisible">
+            <CarfList @changeVisible="changeVisible"></CarfList>
+        </OverlayModal>
     </div>
 </template>
 <script lang="ts" setup>
     import { ref } from 'vue';
-    import {HeatPosition, TakePickture, AddWaste} from './components'
-
+    import {HeatPosition, TakePickture, AddLiquid} from './components'
+    import OverlayModal from '@/components/OverlayModal.vue';
+    import CarfList from './components/CarfList.vue';
     const heatList:any = ref([1,2,3,4,5,6])
-
+    const carfVisible = ref(false)
     //添加溶液
-    const wasteVisible = ref(false)
-    const onAddWaste = () => {
-        wasteVisible.value = true;
+    const liquidVisible = ref(false)
+    const onAddLiquid = () => {
+        liquidVisible.value = true;
+    }
+
+    const changeVisible = () => {
+        carfVisible.value = false;
+    }
+    //选择工艺
+    const onChooseCaft = () => {
+        carfVisible.value = true;
     }
 </script>
 <style>
@@ -85,7 +98,7 @@
         background: #F6F6F6;
     }
     .heat_area{
-        width: 1268px;
+        width: 79.25rem;
         display: flex;
         justify-content: center;
         flex-wrap: wrap;
@@ -98,33 +111,33 @@
     }
 
     .pickture_area{
-        width: 1040px;
+        width: 65rem;
         margin: 5px;
-        margin-left: 20px;
+        margin-left: 1.25rem;
         background: #FFFFFF;
         border-radius: 20px;
     }
 
     .graphite_btn{
-        margin-left: 68px;
+        margin-left: 2.125rem;
         margin-top: 2rem;
     }
 
     .btn_size{
-        font-size: 30px;
-        height: 80px;
+        font-size: .9375rem;
+        height: 2.5rem;
         color: #1989FA;
         border: 3px solid #1989FA;
         
     }
 
     .open{
-        width: 906px;
+        width: 28.125rem;
     }
 
     .graphite_operate{
-        gap: 15px;
-        padding-top:30px;
+        gap: 10px;
+        padding-top:1rem;
     }
 
     .waste{
@@ -133,7 +146,7 @@
         width: 100%;
         height: 100%;
         align-items: center;
-        .addWaste{
+        .addLiquid{
             width: 2250px;
             height: 1235px;
             background: #FFFFFF;