From 65d060d63db1a3df2240c81ef2f84276dcee1068 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 03 十一月 2023 15:45:54 +0800
Subject: [PATCH] feat: 切换当前高亮任务时展示对应工艺模型列表
---
src/stores/craftModel.ts | 18 +++++++++++++++---
src/views/dashboard/index.vue | 19 +++++++++----------
2 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/src/stores/craftModel.ts b/src/stores/craftModel.ts
index 7f7c5f3..5985e67 100644
--- a/src/stores/craftModel.ts
+++ b/src/stores/craftModel.ts
@@ -1,24 +1,36 @@
-import { ref, computed } from 'vue'
+import { onUnmounted, ref, watch } from 'vue'
import { defineStore } from 'pinia'
import type { CraftModel } from '@/api/craftModel'
import { apiGetCraftModelList } from '@/api'
import { useTasksStore } from '@/stores/tasks'
+
+const watcher = ref()
export const useCraftModelStore = defineStore('craftModel', () => {
const craftModelList = ref<CraftModel[]>()
const taskStore = useTasksStore()
function getCraftModelList() {
if (taskStore.activeTask?.Procedure.ID) {
+ console.log(122)
apiGetCraftModelList({
procedureId: taskStore.activeTask?.Procedure.ID,
page: 1,
- pageSize: 999,
- number: taskStore.activeTask?.Procedure?.processModelNumber
+ pageSize: 999
}).then((res) => {
+ console.log()
craftModelList.value = res.data ?? []
})
}
}
+ if (!watcher.value) {
+ watch(
+ () => taskStore.activeTask,
+ () => {
+ getCraftModelList()
+ }
+ )
+ }
+
return { craftModelList, getCraftModelList }
})
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 4f255f6..d006860 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -15,12 +15,14 @@
<ProcessingInfo style="margin-top: 6px" :task="activeTask"></ProcessingInfo>
</el-tab-pane>
<el-tab-pane label="宸ヨ壓淇℃伅" name="宸ヨ壓淇℃伅">
- <ProcessInfo
- v-for="item in craftModelStore.craftModelList"
- :key="item.ID"
- :craft-model="item"
- @detail="openCraftModelDetailModal"
- ></ProcessInfo>
+ <el-scrollbar always>
+ <ProcessInfo
+ v-for="item in craftModelStore.craftModelList"
+ :key="item.ID"
+ :craft-model="item"
+ @detail="openCraftModelDetailModal"
+ ></ProcessInfo>
+ </el-scrollbar>
</el-tab-pane>
<el-tab-pane label="鐗╂枡娓呭崟" name="鐗╂枡娓呭崟">
<InputMaterialsList
@@ -152,13 +154,10 @@
// 鍒囨崲浠诲姟鏃惰幏鍙栧搴斾换鍔＄殑宸ヨ壓妯″瀷淇℃伅
const craftModelStore = useCraftModelStore()
-watch(activeTask, () => {
- craftModelStore.getCraftModelList()
-})
+craftModelStore.getCraftModelList()
const showCraftModelDetail = ref(false)
function openCraftModelDetailModal() {
- console.log(1)
showCraftModelDetail.value = true
}
--
Gitblit v1.8.0