From ea809c9469faed97170563b32204c387393969b2 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 09 Apr 2026 15:31:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue b/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
index 92a83a7..2240b15 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
@@ -10,7 +10,7 @@
</el-col>
<el-col :span="12">
<div class="label">设备类型</div>
- <div class="val">{{ formData.deviceType }}</div>
+ <div class="val">{{ getDictLabel(formData.deviceType, dictObj.deviceType) }}</div>
</el-col>
<el-col :span="12">
<div class="label">设备编码</div>
@@ -18,7 +18,7 @@
</el-col>
<el-col :span="12">
<div class="label">设备属性</div>
- <div class="val">{{ formData.deviceAtt }}</div>
+ <div class="val">{{ getDictLabel(formData.deviceAtt, dictObj.deviceAtt) }}</div>
</el-col>
<el-col :span="12">
<div class="label">型号</div>
--
Gitblit v1.9.3