From e85193ea9acae04e9dbf6ca5b97f1735d4cc2e13 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期二, 28 十一月 2023 16:33:05 +0800
Subject: [PATCH] style: 调整表格无数据文案
---
src/views/dashboard/index.vue | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 4b3975b..2ffecc5 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>
@@ -58,7 +58,7 @@
<template #middleBlock3>
<SubTitle>浠诲姟璇︽儏</SubTitle>
<div class="task-detail">
- <TaskControl :task="activeTask" @should-reload="reloadChannel"></TaskControl>
+ <TaskControl :task="activeTask" :workers="currentWorkers" @should-reload="reloadChannel"></TaskControl>
</div>
<ColorInfo :type="1"></ColorInfo>
<ColorInfo :type="2"></ColorInfo>
@@ -96,7 +96,7 @@
import { computed, ref } from 'vue'
import ChannelCollapse from '@/views/dashboard/components/ChannelCollapse.vue'
-import type { Worker, Order, Task, Material } from '@/api/task'
+import type { Task, Material } from '@/api/task'
import type { CraftModel } from '@/api/craftModel'
import PersonInfo from '@/views/dashboard/components/PersonInfo.vue'
import ProcessInfo from '@/views/dashboard/components/ProcessInfo.vue'
@@ -124,6 +124,7 @@
import { updateCraftParams } from '@/api'
import { Loading } from '@element-plus/icons-vue'
+import { isNumber } from 'lodash-es'
defineOptions({
name: 'DashboardView'
@@ -185,7 +186,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 +203,14 @@
message: '鏇存柊鎴愬姛锛�',
type: 'success'
})
+ craftModelStore.getCraftModelList()
}
},
(err) => {
console.error(err, '----err')
setTimeout(() => {
editActive(craftModel)
- }, 500)
+ }, 300)
}
)
}
@@ -216,7 +218,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)
}
}
}
@@ -234,6 +236,15 @@
currentMaterialInfo.value = material
showMaterialDetail.value = true
}
+
+const currentWorkers = computed(() => {
+ const channel = activeTask.value?.Channel
+ if (isNumber(channel)) {
+ return channels.value[channel].workers ?? []
+ } else {
+ return []
+ }
+})
</script>
<style scoped lang="scss">
@@ -290,4 +301,7 @@
align-items: center;
justify-content: center;
}
+.scroller {
+ padding: 4px 16px;
+}
</style>
--
Gitblit v1.8.0