From 1b1953b435e3187243102c794d29b56acb0dba5a Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 03 十一月 2023 16:44:22 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/bulletin-board-style1 into wn
---
src/views/dashboard/index.vue | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
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