From 9eb8bb59b802ceef1f52d334c8e577f2bf02c90e Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 21 Jan 2026 15:12:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/basicManage/maintainRecord/MaintenanceDiaLog.vue | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/maintainRecord/MaintenanceDiaLog.vue b/applications/drone-command/src/views/basicManage/maintainRecord/MaintenanceDiaLog.vue
index 52af6f6..d54c885 100644
--- a/applications/drone-command/src/views/basicManage/maintainRecord/MaintenanceDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/maintainRecord/MaintenanceDiaLog.vue
@@ -1,8 +1,13 @@
<template>
- <el-dialog class="ztzf-page-view-dialog" v-model="visible" :title="titleEnum[dialogMode]" @closed="handleClosed"
- destroy-on-close>
+ <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">
- <div class="detail-title">设备详情</div>
<el-row>
<el-col :span="12">
<div class="label">设备名称</div>
@@ -14,13 +19,20 @@
</el-col>
</el-row>
</div>
- <el-form class="dialog-form" v-else ref="formRef" :model="formData" :rules="rules"
- :disabled="dialogReadonly" label-width="110px">
+ <el-form
+ class="dialog-form"
+ v-else
+ ref="formRef"
+ :model="formData"
+ :rules="rules"
+ :disabled="dialogReadonly"
+ label-width="110px"
+ >
<el-row>
<el-col :span="24">
<el-form-item label="维护内容" prop="maintainContent">
<el-input
- class="ztzf-data-cockpit-search-input"
+ class="command-input"
v-model="formData.maintainContent"
maxlength="200"
type="textarea"
@@ -32,7 +44,7 @@
<el-col :span="24">
<el-form-item label="更换部件" prop="replacePart">
<el-input
- class="ztzf-data-cockpit-search-input"
+ class="command-input"
v-model="formData.replacePart"
maxlength="200"
type="textarea"
@@ -41,20 +53,7 @@
/>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="实际维护时间" prop="maintainTime">
- <el-date-picker
- class="ztzf-data-cockpit-date-picker"
- popper-class="ztzf-data-cockpit-date-picker-popper"
- v-model="formData.maintainTime"
- type="date"
- 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>
@@ -74,6 +73,7 @@
<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'
@@ -102,7 +102,7 @@
const deviceList = ref([]) // 设备列表
const dialogReadonly = computed(() => dialogMode.value === 'view')
-const titleEnum = ref({ edit: '编辑', view: '查看', add: '维护计划' })
+const titleEnum = ref({ edit: '维护', view: '查看', add: '维护计划' })
const planCycleLabel = computed(() => {
const item = planCycleOptions.find(option => option.value === formData.value.planCycleType)
@@ -116,7 +116,6 @@
const rules = {
maintainContent: fieldRules(true, 200),
replacePart: fieldRules(true, 200),
- maintainTime: fieldRules(true),
}
// 关闭弹框
@@ -130,6 +129,7 @@
if (!isValid) return
submitting.value = true
try {
+ formData.value.maintainTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
await fwDeviceMaintainRecordSubmitApi(formData.value)
ElMessage.success(dialogMode.value === 'add' ? '新增成功' : '更新成功')
visible.value = false
--
Gitblit v1.9.3