From 0b911f78bebf70b41f971af7c1c2f7943914b1b8 Mon Sep 17 00:00:00 2001
From: zhangjiming <zhangjiming@costrip.cn>
Date: Tue, 25 Feb 2025 15:23:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BC=96=E8=BE=91=E5=B7=A5?=
 =?UTF-8?q?=E8=89=BA=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icon_del_s.svg                       |   1 +
 src/views/addLiquid/index.vue                   | 218 ------------------------
 src/views/expeRecord/components/ExpeDetail.vue  |   2 +-
 src/views/graphite/components/CraftList.vue     |   2 +-
 src/views/liquidConfig/components/AddLiquid.vue |   2 +-
 src/views/oreManage/components/AddOre.vue       |   2 +-
 src/views/oreManage/components/CraftConfig.vue  |   4 +-
 src/views/oreManage/components/StepItemEx.vue   |  41 ++---
 src/views/userManage/components/AddUser.vue     |   2 +-
 9 files changed, 25 insertions(+), 249 deletions(-)
 create mode 100644 src/assets/icon_del_s.svg
 delete mode 100644 src/views/addLiquid/index.vue

diff --git a/src/assets/icon_del_s.svg b/src/assets/icon_del_s.svg
new file mode 100644
index 0000000..89fe347
--- /dev/null
+++ b/src/assets/icon_del_s.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="33" height="33" viewBox="0 0 33 33"><defs><clipPath id="master_svg0_685_8832"><rect x="0" y="0" width="33" height="33" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_685_8832)"><g><path d="M28.5707296875,29.2627375C27.6653296875,30.1682375,26.1906296875,30.1682375,25.2831296875,29.2627375L4.4580476875,8.4376975C3.5526096875,7.5301975,3.5505466875,6.0575675,4.4580476875,5.1500705C5.3614196875,4.2425705,6.8361096875000005,4.2425705,7.7477296875,5.1500705L28.5707296875,25.9730375C29.4761296875,26.8847375,29.4803296875,28.3552375,28.5707296875,29.2627375ZM28.5460296875,8.4273875L7.7229796875000005,29.2503375C6.8134196875,30.1599375,5.3407996875,30.1599375,4.4332966875,29.2503375C3.5257966875,28.3449375,3.5257966875,26.8743375,4.4353596875,25.9627375L25.2583296875,5.1418205C26.1679296875,4.2343205,27.6426296875,4.2343205,28.5460296875,5.1397585C29.4555296875,6.0472575,29.4514296875,7.519887499999999,28.5460296875,8.4273875Z" fill="#7F7F7F" fill-opacity="1" style="mix-blend-mode:passthrough"/></g></g></svg>
\ No newline at end of file
diff --git a/src/views/addLiquid/index.vue b/src/views/addLiquid/index.vue
deleted file mode 100644
index c8a80c8..0000000
--- a/src/views/addLiquid/index.vue
+++ /dev/null
@@ -1,218 +0,0 @@
-<template>
-    <div class="component-page add_liquid_bottle">
-        <div v-for="(corros, index) in corrosionList" class="add_liquid liquid_w">
-            <div class="config_title" @click="onChooseLiquid(corros)">
-                <div class="config_name">
-                    <div>{{ index + 1 }} {{ corros.name }}</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">{{ corros.ml }}</div>
-                </div>
-                <div class="ml_name">
-                    {{ `${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={}) => {
-        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: 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.5rem;
-            height: 2.5rem;
-            background: rgba(25, 137, 250, 0.1216);
-            padding-top: .5rem;
-            .config_name{
-                width: 7.8rem;
-                height: 1.625rem;
-                background: #FFFFFF;
-                margin-left: 2.5rem;
-                display: flex;
-                justify-content: center;
-                align-items: center;
-                gap: 1.625rem;
-                .arrow_img{
-                    width: .5rem;
-                    height: .75rem;
-                }
-            }
-        }
-
-        .bottle_ml{
-            
-            .liquid_pos{
-                position: relative;
-                width: 5.125rem;
-                height: 7.25rem;
-                margin-top: 1.125rem;
-                margin-left: 3.75rem;
-                display: flex;
-                justify-content: center;
-                align-items: center;
-                .bottle_wd{
-                    height: 30%;
-                    background-color:red;
-                    width: 5.15rem;
-                }
-            }
-            .liquid_status{
-                height: 1rem;
-                font-family: Source Han Sans;
-                font-size: 1rem;
-                font-weight: 500;
-                color: #40474E;
-                padding-top: 20px;
-            }
-
-            .contail_percentage{
-                position: absolute;
-                width: 5rem;
-                height: 7.125rem;
-                background-image: url('@/assets/container.svg');
-                background-size: cover;
-                background-position: center;
-                z-index: 1;
-                border-radius: 10px;
-            }
-
-            .liquid_percent {
-                position: absolute;
-                bottom: 0;
-                width: 2.625rem;
-                background-color: blue;
-                opacity: 0.5;
-                z-index: 2;
-                border-radius: 0 0 10px 10px;
-            }
-
-            
-        }
-        .percent_num{
-            font-size: 30px;
-            position: relative;
-            z-index: 2;
-        }
-        .ml_name{
-            width: 4.125rem;
-            height: 1.625rem;
-            background: #FFFFFF;
-            margin-left: 3.75rem;
-            text-align: center;
-            margin-top: 15px;
-            border-radius: 6.25rem;
-        }
-    }
-
-    @media screen and (max-width: 1120px){
-        .add_liquid{
-            margin-left: 20px;
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/views/expeRecord/components/ExpeDetail.vue b/src/views/expeRecord/components/ExpeDetail.vue
index c715b42..cd5c687 100644
--- a/src/views/expeRecord/components/ExpeDetail.vue
+++ b/src/views/expeRecord/components/ExpeDetail.vue
@@ -1,5 +1,5 @@
 <template>
-	<section class="bg-white p-6 min-w-[600px]">
+	<section class="bg-white p-6 min-w-[600px] rounded-lg">
 		<h1 class="font-medium mb-4">步骤详情</h1>
 		<header class="h-10 flex items-center bg-[#000]/[0.02] text-xs pr-3 text-text">
 			<p class="w-[10rem]">时间</p>
diff --git a/src/views/graphite/components/CraftList.vue b/src/views/graphite/components/CraftList.vue
index 5792db1..d7eaa20 100644
--- a/src/views/graphite/components/CraftList.vue
+++ b/src/views/graphite/components/CraftList.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="craft px-5 py-[1.875rem]">
+	<div class="craft px-5 py-[1.875rem] rounded-lg">
 		<p class="text-xl font-medium mb-5">选择工艺</p>
 		<el-select v-model="selectCraftId" placeholder="Select" style="width: 17.5rem" filterable no-match-text="没有匹配数据">
 			<el-option-group v-for="ore in settingStore.oreList" :key="ore.id" :label="ore.oresName">
diff --git a/src/views/liquidConfig/components/AddLiquid.vue b/src/views/liquidConfig/components/AddLiquid.vue
index bb67903..aba0990 100644
--- a/src/views/liquidConfig/components/AddLiquid.vue
+++ b/src/views/liquidConfig/components/AddLiquid.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="bg-white text-xl text-text px-5 py-7 rounded">
+	<div class="bg-white text-xl text-text px-5 py-7 rounded-lg">
 		<h1 class="font-medium">新增溶液</h1>
 		<section>
 			<div class="grid grid-cols-[5rem_1fr] gap-x-8 gap-y-4 min-w-[30rem] mt-4 mb-7 px-4">
diff --git a/src/views/oreManage/components/AddOre.vue b/src/views/oreManage/components/AddOre.vue
index 84a646c..b88ca01 100644
--- a/src/views/oreManage/components/AddOre.vue
+++ b/src/views/oreManage/components/AddOre.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="bg-white text-xl text-text px-5 py-7 rounded">
+	<div class="bg-white text-xl text-text px-5 py-7 rounded-lg">
 		<h1 class="font-medium">添加矿石</h1>
 		<section>
 			<div class="grid grid-cols-[5rem_1fr] gap-x-8 gap-y-4 min-w-[30rem] mt-4 mb-7 px-4">
diff --git a/src/views/oreManage/components/CraftConfig.vue b/src/views/oreManage/components/CraftConfig.vue
index 009611f..05515dc 100644
--- a/src/views/oreManage/components/CraftConfig.vue
+++ b/src/views/oreManage/components/CraftConfig.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="bg-white">
+	<div class="bg-white rounded-lg ">
 		<main class="dialog h-[36rem] flex text-text">
 			<section class="flex-auto border-r-[#e8e8e8] border-r p-8 overflow-auto">
 				<h1 class="text-xl font-medium">添加工艺</h1>
@@ -18,7 +18,7 @@
 			</section>
 			<section class="w-1/2 min-w-[21.25rem] relative">
 				<h1 class="text-xl font-medium ml-8 mt-8">工艺步骤</h1>
-				<div class="absolute top-[4.75rem] w-full h-[31rem] overflow-y-auto">
+				<div class="absolute px-8 top-[4.75rem] w-full h-[31rem] overflow-y-auto">
 					<div v-for="(step, idx) in stepStructs" :key="idx">
 						<StepItemEx :order="idx + 1" :step="step" @del="onStepItemDel" />
 					</div>
diff --git a/src/views/oreManage/components/StepItemEx.vue b/src/views/oreManage/components/StepItemEx.vue
index 996fd54..46a468b 100644
--- a/src/views/oreManage/components/StepItemEx.vue
+++ b/src/views/oreManage/components/StepItemEx.vue
@@ -1,12 +1,14 @@
 <template>
-	<div class="bg-[#fafafa] border-b border-b-[#f3f3f3]">
-		<section class="h-12 flex items-center text-xl px-8">
-			<span>{{ order }}.</span>
-			<span>{{ StepCmdDescMap[step.method] }}</span>
-			<span class="text-primary underline ml-auto self-stretch leading-[3rem]" @click="$emit('del', order)">删除</span>
+	<div class="bg-[#5294D7]/[.06] rounded-lg mb-[10px]">
+		<section class="h-12 flex items-center text-xl px-1">
+			<!-- <span>{{ order }}.</span> -->
+			<span class="text-base ml-5">{{ StepCmdDescMap[step.method] }}</span>
+			<div class="ml-auto w-11 h-11 flex justify-center items-center" @click="$emit('del', order)">
+				<img class="w-4" src="@/assets/icon_del_s.svg" alt="del" />
+			</div>
 		</section>
 		<template v-if="step.method !== 'takePhoto'">
-			<section v-if="step.method === 'addLiquid'" class="bg-[#f4f4f4] h-12 flex items-center px-10 text-[#5e5e5e] gap-5">
+			<section v-if="step.method === 'addLiquid'" class="h-12 flex items-start px-6 text-[#5e5e5e] gap-5">
 				<!-- <div class="h-[1.875rem] rounded-sm bg-[#eaeaea] flex items-center px-3 min-w-[8.125rem]">
 					<span>盐酸</span>
 					<img class="ml-auto w-2" src="@/assets/icon_arr_s.svg" alt="arr" />
@@ -15,22 +17,16 @@
 					<el-option v-for="item in settingStore.availableLiquids" :key="item.id" :label="item.name" :value="item.id" />
 				</el-select>
 				<div class="flex items-center">
-					<input
-						type="number"
-						v-model="step.params.volume"
-						class="h-[1.875rem] rounded-sm bg-[#eaeaea] px-3 w-[6.25rem] mr-2" />
-					<span>ml</span>
+					<el-input v-model.number="step.params.volume" style="width: 100px" />
+					<span class="ml-2">ml</span>
 				</div>
 			</section>
 			<section
 				v-if="step.method === 'shaking' || step.method === 'delay'"
-				class="bg-[#f4f4f4] h-12 flex items-center px-10 text-[#5e5e5e] gap-5">
+				class="h-12 flex items-start px-6 text-[#5e5e5e] gap-5">
 				<div class="flex items-center">
-					<input
-						type="number"
-						v-model="step.params.second"
-						class="h-[1.875rem] rounded-sm bg-[#eaeaea] px-3 w-[6.25rem] mr-2" />
-					<span>秒</span>
+					<el-input v-model.number="step.params.second" style="width: 100px" />
+					<span class="ml-2">秒</span>
 				</div>
 			</section>
 			<!-- <section
@@ -41,7 +37,7 @@
 					step.method === 'moveToHeater' ||
 					step.method === 'stopHeating'
 				"
-				class="bg-[#f4f4f4] h-12 flex items-center px-10 text-[#5e5e5e] gap-5">
+				class=" h-12 flex items-center px-6 text-[#5e5e5e] gap-5">
 				<div class="flex items-center">
 					<el-select v-model="step.params.heaterId" placeholder="Select" style="width: 120px">
 						<el-option
@@ -52,7 +48,7 @@
 					</el-select>
 				</div>
 			</section> -->
-			<section v-if="step.method === 'startHeating'" class="bg-[#f4f4f4] h-12 flex items-center px-10 text-[#5e5e5e] gap-5">
+			<section v-if="step.method === 'startHeating'" class="h-12 flex items-start px-6 text-[#5e5e5e] gap-5">
 				<div class="flex items-center gap-3">
 					<!-- <el-select v-model="step.params.heaterId" placeholder="Select" style="width: 100px">
 						<el-option
@@ -61,11 +57,8 @@
 							:label="item.label"
 							:value="item.value" />
 					</el-select> -->
-					<input
-						type="number"
-						v-model="step.params.temperature"
-						class="h-[1.875rem] rounded-sm bg-[#eaeaea] px-3 w-[6.25rem] mr-2" />
-					<span>℃</span>
+					<el-input v-model.number="step.params.temperature" style="width: 100px" />
+					<span class="ml-2">℃</span>
 				</div>
 			</section>
 		</template>
diff --git a/src/views/userManage/components/AddUser.vue b/src/views/userManage/components/AddUser.vue
index c872ac7..e8b4549 100644
--- a/src/views/userManage/components/AddUser.vue
+++ b/src/views/userManage/components/AddUser.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="bg-white text-xl text-text px-5 py-7 rounded">
+	<div class="bg-white text-xl text-text px-5 py-7 rounded-lg">
 		<h1 class="font-medium">新增用户</h1>
 		<section>
 			<div class="grid grid-cols-[5rem_1fr] gap-x-8 gap-y-4 min-w-[30rem] mt-4 mb-7 px-4">