From b07d485502803e3c573ee9c3e3c86cab9bf8966d Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Wed, 14 Jan 2026 18:01:17 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web

---
 applications/drone-command/src/views/areaManage/areaStatistics/FormDiaLog.vue |   80 +++++++++++++++++++++++-----------------
 1 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/applications/drone-command/src/views/areaManage/areaStatistics/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/areaStatistics/FormDiaLog.vue
index 318c8d7..835ee47 100644
--- a/applications/drone-command/src/views/areaManage/areaStatistics/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/areaStatistics/FormDiaLog.vue
@@ -1,36 +1,48 @@
 <template>
-	<el-dialog v-model="visible" :title="titleEnum[dialogMode]" :close-on-click-modal="false" width="520px">
-		<el-row>
-			<el-col :span="12">
-				<div>区域名称: {{ formData.areaName || '-' }}</div>
-			</el-col>
-			<el-col :span="12">
-				<div>区域类型: {{ getDictLabel(formData.areaType, dictObj.areaType) }}</div>
-			</el-col>
-			<el-col :span="12">
-				<div>关联场景: {{ formData.sceneName || '-' }}</div>
-			</el-col>
-			<el-col :span="12">
-				<div>场景类型: {{ getDictLabel(formData.sceneType, dictObj.sceneType) }}</div>
-			</el-col>
-			<el-col :span="12">
-				<div>设备数量: {{ formData.deviceCount ?? '-' }}</div>
-			</el-col>
-			<el-col :span="12">
-				<div>告警次数: {{ formData.alarmCount ?? '-' }}</div>
-			</el-col>
-			<el-col :span="12">
-				<div>侦测反制次数: {{ formData.counterCount ?? '-' }}</div>
-			</el-col>
-			<el-col :span="12">
-				<div>反制成功次数: {{ formData.counterSuccessCount ?? '-' }}</div>
-			</el-col>
-			<el-col :span="24">
-				<div>管控效果: {{ formData.controlEffect || '-' }}</div>
-			</el-col>
-		</el-row>
+	<el-dialog class="ztzf-page-view-dialog" v-model="visible" :title="titleEnum[dialogMode]"
+		:close-on-click-modal="false" width="520px">
+		<div class="detail-container">
+			<el-row>
+				<el-col :span="12">
+					<div class="label">区域名称</div>
+					<div class="val">{{ formData.areaName || '-' }}</div>
+				</el-col>
+				<el-col :span="12">
+					<div class="label">区域类型</div>
+					<div class="val">{{ getDictLabel(formData.areaType, dictObj.areaType) }}</div>
+				</el-col>
+				<el-col :span="12">
+					<div class="label">关联场景</div>
+					<div class="val">{{ formData.sceneName || '-' }}</div>
+				</el-col>
+				<el-col :span="12">
+					<div class="label">场景类型</div>
+					<div class="val">{{ getDictLabel(formData.sceneType, dictObj.sceneType) }}</div>
+				</el-col>
+				<el-col :span="12">
+					<div class="label">设备数量</div>
+					<div class="val">{{ formData.deviceCount ?? '-' }}</div>
+				</el-col>
+				<el-col :span="12">
+					<div class="label">告警次数</div>
+					<div class="val">{{ formData.alarmCount ?? '-' }}</div>
+				</el-col>
+				<el-col :span="12">
+					<div class="label">侦测反制次数</div>
+					<div class="val">{{ formData.counterCount ?? '-' }}</div>
+				</el-col>
+				<el-col :span="12">
+					<div class="label">反制成功次数</div>
+					<div class="val">{{ formData.counterSuccessCount ?? '-' }}</div>
+				</el-col>
+				<el-col :span="24">
+					<div class="label">管控效果</div>
+					<div class="val">{{ formData.controlEffect || '-' }}</div>
+				</el-col>
+			</el-row>
+		</div>
 		<template #footer>
-			<el-button @click="handleCancel">关闭</el-button>
+			<el-button color="#2B2B4C" @click="handleCancel">关闭</el-button>
 		</template>
 	</el-dialog>
 </template>
@@ -54,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