From beb95fb5fc166804056abafd70fc01ac27de7621 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 26 Jan 2026 09:11:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/areaManage/areaStatistics/FormDiaLog.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/applications/drone-command/src/views/areaManage/areaStatistics/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/areaStatistics/FormDiaLog.vue
index 2029546..5ad124e 100644
--- a/applications/drone-command/src/views/areaManage/areaStatistics/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/areaStatistics/FormDiaLog.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog class="ztzf-page-view-dialog" v-model="visible" :title="titleEnum[dialogMode]"
+ <el-dialog class="command-page-view-dialog" v-model="visible" :title="titleEnum[dialogMode]"
:close-on-click-modal="false" width="520px">
<div class="detail-container">
<el-row>
@@ -17,7 +17,7 @@
</el-col>
<el-col :span="12">
<div class="label">场景类型</div>
- <div class="val">{{ getDictLabel(formData.sceneType, dictObj.sceneType) }}</div>
+ <div class="val">{{ getDictLabel(formData.sceneType, dictObj.CommandSceneType) }}</div>
</el-col>
<el-col :span="12">
<div class="label">设备数量</div>
@@ -42,7 +42,7 @@
</el-row>
</div>
<template #footer>
- <el-button color="#2B2B4C" @click="handleCancel">关闭</el-button>
+ <el-button v-if="dialogMode != 'view'" color="#2B2B4C" @click="handleCancel">关闭</el-button>
</template>
</el-dialog>
</template>
@@ -66,9 +66,9 @@
sceneType: '', // 场景类型
})
-const formData = ref(initForm()) // 表单数据
-const visible = defineModel() // 弹框显隐
-const dialogMode = ref('view') // 弹框模式
+const formData = ref(initForm()) // 弹框显隐
+const visible = defineModel() // 弹框模式
+const dialogMode = ref('view') // ????
const titleEnum = ref({ view: '查看' })
const dictObj = inject('dictObj')
--
Gitblit v1.9.3