From 621693acae8dad181eb8be6e60ffd73593e1177d Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期二, 14 十一月 2023 16:50:45 +0800
Subject: [PATCH] fix: 修复设备状态组件工序运行时间未正确显示的问题
---
src/views/dashboard/index.vue | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 4b3975b..f4cff31 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -16,7 +16,7 @@
</el-tab-pane>
<el-tab-pane label="宸ヨ壓淇℃伅" name="宸ヨ壓淇℃伅">
<div style="height: 300px">
- <el-scrollbar always style="height: 100%">
+ <el-scrollbar always class="scroller" style="height: 100%">
<div
v-infinite-scroll="craftModelStore.loadMore"
infinite-scroll-delay="500"
@@ -38,7 +38,7 @@
<Loading />
</el-icon>
- <div v-if="!craftModelStore.hasMore">鍔犺浇瀹屾垚</div>
+ <div v-if="!craftModelStore.hasMore && craftModelStore.craftModelList.length > 6">鍔犺浇瀹屾垚</div>
</div>
</el-scrollbar>
</div>
@@ -185,7 +185,7 @@
const showCraftModelDetail = ref(false)
// 褰撳墠瑕佸睍绀虹殑宸ヨ壓璇︽儏
const currentCraftModelInfo = ref<CraftModel>()
-const activeArr = ref([])
+const activeArr = ref<string[]>([])
function openCraftModelDetailModal(craftModel: CraftModel) {
currentCraftModelInfo.value = craftModel
showCraftModelDetail.value = true
@@ -202,13 +202,14 @@
message: '鏇存柊鎴愬姛锛�',
type: 'success'
})
+ craftModelStore.getCraftModelList()
}
},
(err) => {
console.error(err, '----err')
setTimeout(() => {
editActive(craftModel)
- }, 500)
+ }, 300)
}
)
}
@@ -216,7 +217,7 @@
function editActive(craftModel: CraftModel) {
for (let i in activeArr.value) {
if (activeArr.value[i] == craftModel.number) {
- activeArr.value.splice(i, 1)
+ activeArr.value.splice(Number(i), 1)
}
}
}
@@ -290,4 +291,7 @@
align-items: center;
justify-content: center;
}
+.scroller {
+ padding: 4px 16px;
+}
</style>
--
Gitblit v1.8.0