From 89380e6260a75d1d3b94de687ebcc2f50d50659d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 03 Feb 2026 15:44:33 +0800
Subject: [PATCH] feat:环境变量配置调整

---
 applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue |   45 +++++++++++++++++++++++++++++----------------
 1 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue b/applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue
index 2903b88..7e3ef76 100644
--- a/applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue
@@ -1,44 +1,56 @@
 <template>
-	<el-dialog v-model="visible" :title="titleEnum[dialogMode]" @closed="handleClosed" destroy-on-close>
-		<div v-if="dialogReadonly">
+	<el-dialog class="command-page-view-dialog" v-model="visible" :title="titleEnum[dialogMode]" @closed="handleClosed"
+		destroy-on-close :close-on-click-modal="false">
+		<div class="detail-container" v-if="dialogReadonly">
 			<el-row>
 				<el-col :span="12">
-					<div>设备名称: {{ formData.deviceName }}</div>
+					<div class="label">设备名称</div>
+					<div class="val">{{ formData.deviceName }}</div>
 				</el-col>
 				<el-col :span="12">
-					<div>设备类型: {{ getDictLabel(formData.deviceType, dictObj.deviceType) }}</div>
+					<div class="label">设备类型</div>
+					<div class="val">{{ getDictLabel(formData.deviceType, dictObj.deviceType) }}</div>
 				</el-col>
 				<el-col :span="12">
-					<div>型号 : {{ formData.deviceModel }}</div>
+					<div class="label">型号</div>
+					<div class="val">{{ formData.deviceModel }}</div>
 				</el-col>
 				<el-col :span="12">
-					<div>生产厂商 : {{ formData.manufacturer }}</div>
+					<div class="label">生产厂商</div>
+					<div class="val">{{ formData.manufacturer }}</div>
 				</el-col>
 				<el-col :span="12">
-					<div>入库时间 : {{ formData.createTime }}</div>
+					<div class="label">入库时间</div>
+					<div class="val">{{dayjs(formData.createTime).format('YYYY-MM-DD')}}</div>
 				</el-col>
 				<el-col :span="12">
-					<div>来源 : {{ formData.source }}</div>
+					<div class="label">来源</div>
+					<div class="val">{{ formData.source }}</div>
 				</el-col>
 				<el-col :span="12">
-					<div>所属部门 : {{ formData.belongDeptName }}</div>
+					<div class="label">所属部门</div>
+					<div class="val">{{ formData.belongDeptName }}</div>
 				</el-col>
 				<el-col :span="12">
-					<div>负责人 : {{ formData.charger }}</div>
+					<div class="label">负责人</div>
+					<div class="val">{{ formData.charger }}</div>
 				</el-col>
 				<el-col :span="12">
-					<div>报废时间 : {{ formData.scrapTime }}</div>
+					<div class="label">报废时间</div>
+					<div class="val">{{dayjs(formData.scrapTime).format('YYYY-MM-DD')}}</div>
+				</el-col>
+				<el-col :span="12">
+					<div class="label">报废原因</div>
+					<div class="val">{{ formData.scrapReason }}</div>
 				</el-col>
 				<el-col :span="24">
-					<div>报废原因 : {{ formData.scrapReason }}</div>
-				</el-col>
-				<el-col :span="24">
-					<div>处置方式 : {{ formData.disposeWay }}</div>
+					<div class="label">处置方式</div>
+					<div class="val">{{ formData.disposeWay }}</div>
 				</el-col>
 			</el-row>
 		</div>
 		<template #footer>
-			<el-button @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
+			<el-button v-if="dialogMode != 'view'" color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
 		</template>
 	</el-dialog>
 </template>
@@ -47,6 +59,7 @@
 import { computed, ref } from 'vue'
 import { getDictLabel } from '@ztzf/utils'
 import { fwDeviceScrapDetailApi } from '@/views/basicManage/deviceStock/fwDeviceScrapApi'
+import dayjs from 'dayjs'
 
 const initForm = () => ({})
 const emit = defineEmits(['success'])

--
Gitblit v1.9.3