From 7bd5a0ad135c7156e856b156560d8fffff265ac4 Mon Sep 17 00:00:00 2001
From: LiLongLong <13717757313@163.com>
Date: Thu, 20 Feb 2025 11:41:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=89=E6=8B=A9=E5=B7=A5?=
 =?UTF-8?q?=E8=89=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/services/ore/oreManage.ts               |  3 ++
 src/views/graphite/components/CraftList.vue | 84 ++++++++++++++++++++++-------
 src/views/graphite/index.vue                |  7 ++-
 3 files changed, 73 insertions(+), 21 deletions(-)

diff --git a/src/services/ore/oreManage.ts b/src/services/ore/oreManage.ts
index 050cbf9..995a27d 100644
--- a/src/services/ore/oreManage.ts
+++ b/src/services/ore/oreManage.ts
@@ -34,3 +34,6 @@ export function updateCraft(params: { id: number; name: string; steps: string })
 export function deleteCraft(ids: string) {
 	return httpRequest<BaseResponse>({ url: `/api/crafts/${ids}`, method: "DELETE" });
 }
+export function getCraftList(ids: string) {
+	return httpRequest<BaseResponse>({ url: `/api/crafts/list/${ids}`, method: "GET" });
+}
diff --git a/src/views/graphite/components/CraftList.vue b/src/views/graphite/components/CraftList.vue
index ce7f262..46f7338 100644
--- a/src/views/graphite/components/CraftList.vue
+++ b/src/views/graphite/components/CraftList.vue
@@ -1,6 +1,25 @@
 <template>
     <div class="craft">
-        <div class="craft_title">选择工艺</div>
+        <div class="craft_title">
+            <div style="width: 5rem;">
+                选择矿石
+            </div>
+            <div class="ore_select">
+                <el-select
+                    placeholder="请选择矿石"
+                    size="large"
+                    style="width: 240px;height: 5rem;"
+                    v-model="oreId"
+                    @change="onOreChange"
+                >
+                    <el-option
+                        v-for="item in oreList"
+                        :label="item.oresName"
+                        :value="item.id"
+                    />
+                </el-select>
+            </div>
+        </div>
         <section>
             <div class="craft_column_name">工艺名称</div>
             <div v-for="item in list" class="craft_item" @click="onChooseCraft(item)">
@@ -8,7 +27,7 @@
             </div>
         </section>
         <footer class="overlay_btn">
-            <van-button type="primary" class="btn ok">确定</van-button>
+            <van-button type="primary" class="btn ok" @click="onSave">确定</van-button>
             <van-button class="btn cancel" @click="onCancel">取消</van-button>
         </footer>
     </div>
@@ -16,30 +35,51 @@
 
 <script lang="ts" setup>
     import { ref, onMounted } from 'vue'
+    import {
+        getCraftList,
+        getOreList,
+    } from "@/services/ore/oreManage";
     const currentItem = ref()
     const activeColor = ref('#ffffff')
     const list = ref()
-    const emits = defineEmits(['changeVisible'])
+    const emits = defineEmits(['changeVisible', 'onSelectedCraft'])
+    const craftList = ref([])
+    const oreList = ref<any>([])
+    const oreId = ref()
     onMounted(()=>{
-        //获取工艺列表
-        
-        list.value = [{
-            id: 10,
-            name: '硫酸溶解法1'
-        },{
-            id: 20,
-            name: '硫酸溶解法2'
-        },{
-            id: 30,
-            name: '硫酸溶解法3'
-        }]
+        //获取矿石列表
+        queryOreList()
     })
 
+    const onOreChange = (value:any) => {
+        queryCraftList(value)
+    }
+
+    const queryOreList = () => {
+        const params = { pageNum: 1, pageSize: 20 }
+        getOreList(params).then(res=> {
+            if(res.success){
+                oreList.value = res.data.list;
+            }
+        })
+    }
+
+    const queryCraftList = (oreId:string) => {
+        getCraftList(oreId).then(res=> {
+            list.value = res.data
+        })
+    }
+
     const onChooseCraft = (data:any) => {
         activeColor.value = 'rgb(157 205 241)'
         currentItem.value = data
     }
 
+    const onSave = () => {
+        console.log('currentItem---', currentItem.value)
+        emits('onSelectedCraft', currentItem.value)
+    }
+
     const onCancel = () => {
         emits('changeVisible')
     }
@@ -52,23 +92,27 @@
         background: #ffffff;
 
         .craft_title{
-            width: 5.25rem;
             height: 1.875rem;
             margin-left: 1.25rem;
             margin-top: 1.875rem;
             color: #40474E;
             font-weight: 500;
             font-size: 1.25rem;
+            display: flex;
+
+            .ore_select{
+                margin-top:-0.5rem;
+                margin-left:0.5rem;
+            }
         }
-        
     }
 
     .craft_column_name{
-        width: 5rem;
         height: 1.875rem;
-        color: rgba(0, 0, 0, 0.85);
-        margin-left: 2rem;
+        margin-left: 1.5rem;
         margin-top: .625rem;
+        font-size: 1.5rem;
+        color:#868686
     }
 
     .craft_item{
diff --git a/src/views/graphite/index.vue b/src/views/graphite/index.vue
index 01c80ae..8f8617b 100644
--- a/src/views/graphite/index.vue
+++ b/src/views/graphite/index.vue
@@ -94,7 +94,7 @@
     </van-overlay>
     <!--选择工艺-->
     <OverlayModal :visible="craftVisible">
-      <CraftList @changeVisible="changeVisible"></CraftList>
+      <CraftList @changeVisible="changeVisible" @onSelectedCraft="onSelectedCraft"></CraftList>
     </OverlayModal>
 
 	<!--实验名称-->
@@ -213,6 +213,11 @@ const onAddLiquid = () => {
   liquidVisible.value = true;
 };
 
+//选择的工艺
+const onSelectedCraft = (craftData:any) => {
+	console.log('craftData===', craftData)
+}
+
 const onAddSolution = (data: any) => {
   let ids = data.map((item: any) => item.id);
   tubeList.forEach((item: any) => {