From c40579692637afaecbd4b63422efa66f3fa9de42 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 05 十二月 2024 18:44:36 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
admin/src/views/operation/components/deviceDetail.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/operation/components/deviceDetail.vue b/admin/src/views/operation/components/deviceDetail.vue
index 5dad8e6..f3181aa 100644
--- a/admin/src/views/operation/components/deviceDetail.vue
+++ b/admin/src/views/operation/components/deviceDetail.vue
@@ -1,5 +1,5 @@
<template>
- <GlobalWindow width="720px" title="宸ュ崟璇︽儏" :visible.sync="visible" :confirm-working="isWorking" @close="close"
+ <GlobalWindow width="720px" title="璁惧璇︽儏" :visible.sync="visible" :confirm-working="isWorking" @close="close"
@confirm="confirm">
<div class="main">
<div class="title">
@@ -25,7 +25,7 @@
</div>
<div class="item">
<div class="la">璁惧绠$悊鍛�</div>
- <div class="val">{{ info.realName }}</div>
+ <div class="val">{{ info.realName || info.realname }}</div>
</div>
<div class="item">
<div class="la">鎵�鍦ㄤ綅缃�</div>
@@ -138,7 +138,7 @@
.item {
width: 33.3%;
- margin-bottom: 12px;
+ margin-bottom: 14px;
.photo {
width: 92px;
@@ -147,7 +147,7 @@
.la {
color: #7f7f7f;
- margin-top: 2px;
+ margin-bottom: 6px;
}
}
--
Gitblit v1.9.3