From 1519870c0e18171ced014a840e86a459dc6b00f1 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 12 十二月 2023 17:26:06 +0800
Subject: [PATCH] 报工记录列表增加人员姓名
---
src/views/dashboard/components/DeviceNumberInfo.vue | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/src/views/dashboard/components/DeviceNumberInfo.vue b/src/views/dashboard/components/DeviceNumberInfo.vue
index eaff37b..c0b8a7f 100644
--- a/src/views/dashboard/components/DeviceNumberInfo.vue
+++ b/src/views/dashboard/components/DeviceNumberInfo.vue
@@ -4,17 +4,27 @@
<div class="device-t">鏈満璁惧缂栫爜</div>
<div class="device-b">
<div class="device-info">
- {{ deviceInfo?.currentDeviceID }}
+ <el-popover placement="top" :width="200" trigger="click" :content="deviceInfo?.systemDeviceID">
+ <template #reference>
+ <el-text truncated style="color: #fff; max-width: 70px">{{ deviceInfo?.systemDeviceID }}</el-text>
+ </template>
+ </el-popover>
</div>
</div>
</div>
<div class="device-r">
- <div class="device-t">浜戠璁惧缂栫爜</div>
- <div class="device-b">
- <div v-for="(item, index) in deviceInfo?.deviceIDList" :key="index" class="device-info">
- {{ item }}
+ <el-scrollbar always class="scroller">
+ <div class="device-t">浜戠璁惧缂栫爜</div>
+ <div class="device-b">
+ <div v-for="item in deviceInfo?.deviceList" :key="item.deviceID" class="device-info">
+ <el-popover placement="top" :width="200" trigger="click" :content="item.deviceID">
+ <template #reference>
+ <el-text truncated style="color: #fff; max-width: 100px">{{ item.deviceID }}</el-text>
+ </template>
+ </el-popover>
+ </div>
</div>
- </div>
+ </el-scrollbar>
</div>
</div>
</template>
@@ -46,13 +56,17 @@
border: 1px solid $status-border;
box-sizing: border-box;
border-radius: 4px;
- padding: 5px 20px;
+ padding: 5px 5px 5px 20px;
.device-l {
- width: 120px;
+ width: 100px;
+ height: 100%;
float: left;
+ padding-right: 10px;
+ border-right: 1px solid $status-border;
}
.device-r {
- width: calc(100% - 130px);
+ width: calc(100% - 120px);
+ height: 100%;
float: right;
}
.device-t {
@@ -66,8 +80,8 @@
overflow: hidden;
}
.device-info {
- padding: 0px 6px;
- font-size: 12px;
+ padding: 2px 10px;
+ font-size: 14px;
line-height: 20px;
background: $status-ready;
color: #fff;
--
Gitblit v1.8.0