From 6e88705bd5b443a259b24c17c8a299765d059d96 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 23 Jul 2026 16:50:41 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web

---
 applications/drone-command/src/views/basicManage/maintainRecord/MaintenanceDiaLog.vue |   31 ++++++++++++++-----------------
 1 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/applications/drone-command/src/views/basicManage/maintainRecord/MaintenanceDiaLog.vue b/applications/drone-command/src/views/basicManage/maintainRecord/MaintenanceDiaLog.vue
index 70f5b9f..5d7d61f 100644
--- a/applications/drone-command/src/views/basicManage/maintainRecord/MaintenanceDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/maintainRecord/MaintenanceDiaLog.vue
@@ -5,9 +5,9 @@
 		:title="titleEnum[dialogMode]"
 		@closed="handleClosed"
 		destroy-on-close
+		:close-on-click-modal="false"
 	>
 		<div class="detail-container" v-if="dialogReadonly">
-			<div class="detail-title">设备详情</div>
 			<el-row>
 				<el-col :span="12">
 					<div class="label">设备名称</div>
@@ -53,23 +53,10 @@
 						/>
 					</el-form-item>
 				</el-col>
-				<el-col :span="12">
-					<el-form-item label="实际维护时间" prop="maintainTime">
-						<el-date-picker
-							class="command-date-picker"
-							popper-class="command-date-picker-popper"
-							v-model="formData.maintainTime"
-							type="datetime"
-							placeholder="选择日期"
-							value-format="YYYY-MM-DD HH:mm:ss"
-							clearable
-						/>
-					</el-form-item>
-				</el-col>
-			</el-row>
+</el-row>
 		</el-form>
 		<template #footer>
-			<el-button color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
+			<el-button v-if="dialogMode != 'view'" color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
 			<el-button
 				v-if="!dialogReadonly"
 				type="primary"
@@ -86,10 +73,13 @@
 
 <script setup>
 import { computed, ref } from 'vue'
+import dayjs from 'dayjs'
 import { ElMessage } from 'element-plus'
 import { fieldRules } from '@ztzf/utils'
 import { fwDeviceMaintainRecordSubmitApi } from '@/views/basicManage/maintainRecord/fwDeviceMaintainRecord'
 import { fwDeviceMaintainPlanDetailApi } from '@/views/basicManage/maintainRecord/maintainRecordApi'
+import { saveOperationLog } from '@ztzf/apis'
+import { useRoute } from 'vue-router'
 
 const initForm = () => ({
 	deviceId: '',
@@ -112,6 +102,7 @@
 const dialogMode = ref('add') // 弹框模式
 const submitting = ref(false) // 提交中
 const deviceList = ref([]) // 设备列表
+const route = useRoute()
 
 const dialogReadonly = computed(() => dialogMode.value === 'view')
 const titleEnum = ref({ edit: '维护', view: '查看', add: '维护计划' })
@@ -128,7 +119,6 @@
 const rules = {
 	maintainContent: fieldRules(true, 200),
 	replacePart: fieldRules(true, 200),
-	maintainTime: fieldRules(true),
 }
 
 // 关闭弹框
@@ -142,7 +132,14 @@
 	if (!isValid) return
 	submitting.value = true
 	try {
+		formData.value.maintainTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
 		await fwDeviceMaintainRecordSubmitApi(formData.value)
+		const actionText = dialogMode.value === 'add' ? '维护-新增' : '维护-编辑'
+		saveOperationLog({
+			requestUri: route.path,
+			title: `${route.name || '维护记录管理'}-${actionText}`,
+			type: 1
+		})
 		ElMessage.success(dialogMode.value === 'add' ? '新增成功' : '更新成功')
 		visible.value = false
 		emit('success')

--
Gitblit v1.9.3