diff --git a/src/components/OverlayModal.vue b/src/components/OverlayModal.vue
index 0063206..ccc67cb 100644
--- a/src/components/OverlayModal.vue
+++ b/src/components/OverlayModal.vue
@@ -1,4 +1,5 @@
 <template>
+<<<<<<< HEAD
     <div v-if="visible" class="overlay">
         <div class="overlay_modal" >
           <slot></slot>
@@ -7,10 +8,28 @@
 </template>
 <script lang="ts" setup>
     defineProps({
+=======
+    <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: ''
+        },
+>>>>>>> d371cd3 (完善溶液配置页面)
         visible:{
             type: Boolean,
             default: false
         },
+<<<<<<< HEAD
     })
 </script>
 <style scoped>
@@ -23,6 +42,36 @@
         left: 0px;
         z-index: 999
     }
+=======
+        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>
+>>>>>>> d371cd3 (完善溶液配置页面)
     .overlay_modal{
         display: flex;
         justify-content: center;
diff --git a/src/views/addLiquid/index.vue b/src/views/addLiquid/index.vue
index e013f46..4ad1074 100644
--- a/src/views/addLiquid/index.vue
+++ b/src/views/addLiquid/index.vue
@@ -148,7 +148,11 @@
                 position: relative;
                 width: 5.125rem;
                 height: 7.25rem;
+<<<<<<< HEAD
                 margin-top: 1.125rem;
+=======
+                margin-top: 36px;
+>>>>>>> d371cd3 (完善溶液配置页面)
                 margin-left: 3.75rem;
                 display: flex;
                 justify-content: center;
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 ef47d01..d5b1fbb 100644
--- a/src/views/graphite/components/HeatPosition.vue
+++ b/src/views/graphite/components/HeatPosition.vue
@@ -100,6 +100,7 @@
     const trayInfo = ref(props.heatInfo || {})
     const trayTempVale = ref(trayInfo.value.trayTempVale || '')
     const formulaList:any = ref([])
+<<<<<<< HEAD
 
     //选中托盘
     const isSelect = ref(false)
@@ -115,6 +116,12 @@
         
         emits("onSelectedTray", props.heatInfo)
         
+=======
+    const onChooseFormula = () => {
+      formulaVisible.value = true;
+      formulaList.value = [{ text: '硫酸', value: '1' }]
+      formulaList.value.push({ text: '硫酸', value: '1' })
+>>>>>>> d371cd3 (完善溶液配置页面)
     }
 
 
diff --git a/src/views/graphite/index.vue b/src/views/graphite/index.vue
index 2226aa4..e9529ca 100644
--- a/src/views/graphite/index.vue
+++ b/src/views/graphite/index.vue
@@ -27,15 +27,26 @@
                     </van-col>
                 </van-row>
                 <van-row class="graphite_operate">
+<<<<<<< HEAD
                     <van-col class="w-56">
                         <van-button  size="large" class="btn_size" @click="onChooseCaft">选择工艺</van-button>
                     </van-col>
                     <van-col class="w-[13.5rem]">
+=======
+                    <van-col span="11">
+                        <van-button  size="large" class="btn_size" @click="onChooseCaft">选择工艺</van-button>
+                    </van-col>
+                    <van-col span="11">
+>>>>>>> d371cd3 (完善溶液配置页面)
                         <van-button  size="large" class="btn_size">执行工艺</van-button>
                     </van-col>
                 </van-row>
                 <van-row class="graphite_operate">
+<<<<<<< HEAD
                     <van-col class="w-56">
+=======
+                    <van-col span="11">
+>>>>>>> d371cd3 (完善溶液配置页面)
                         <van-button  size="large" class="btn_size" @click="onAddLiquid">添加溶液</van-button>
                     </van-col>
                     <van-col class="w-[13.5rem]">
@@ -72,12 +83,18 @@
             </div>
         </van-overlay>
         <!--选择工艺-->
+<<<<<<< HEAD
         <OverlayModal :visible="craftVisible">
             <CraftList @changeVisible="changeVisible"></CraftList>
+=======
+        <OverlayModal :visible="carfVisible">
+            <CarfList @changeVisible="changeVisible"></CarfList>
+>>>>>>> d371cd3 (完善溶液配置页面)
         </OverlayModal>
     </div>
 </template>
 <script lang="ts" setup>
+<<<<<<< HEAD
     import { ref, onMounted } from 'vue';
     import {HeatPosition, TakePickture, AddLiquid} from './components'
     import OverlayModal from '@/components/OverlayModal.vue';
@@ -103,6 +120,14 @@
         console.log('selectedTrayList.value--', selectedTrayList.value)
     }
     
+=======
+    import { ref } from 'vue';
+    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)
+>>>>>>> d371cd3 (完善溶液配置页面)
     //添加溶液
     const liquidVisible = ref(false)
     const onAddLiquid = () => {
@@ -110,11 +135,19 @@
     }
 
     const changeVisible = () => {
+<<<<<<< HEAD
         craftVisible.value = false;
     }
     //选择工艺
     const onChooseCaft = () => {
         craftVisible.value = true;
+=======
+        carfVisible.value = false;
+    }
+    //选择工艺
+    const onChooseCaft = () => {
+        carfVisible.value = true;
+>>>>>>> d371cd3 (完善溶液配置页面)
     }
 </script>
 <style lang="scss" scoped>