From bfbce009f37693a3ccdd47321c4b9032cc2445e4 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Tue, 20 Jan 2026 14:47:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/areaManage/defenseZone/FormDiaLog.vue | 6 +
applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue | 6 +
applications/drone-command/src/styles/common/cockpit.scss | 11 ++
applications/drone-command/src/views/basicManage/maintainRecord/FormDiaLog.vue | 158 ++++++++++++++++++++++++++++++---------
applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue | 9 ++
applications/drone-command/src/views/areaManage/precinctInfo/FormDiaLog.vue | 4
applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue | 8 +
applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue | 6 +
8 files changed, 163 insertions(+), 45 deletions(-)
diff --git a/applications/drone-command/src/styles/common/cockpit.scss b/applications/drone-command/src/styles/common/cockpit.scss
index e2468bc..9362610 100644
--- a/applications/drone-command/src/styles/common/cockpit.scss
+++ b/applications/drone-command/src/styles/common/cockpit.scss
@@ -1091,7 +1091,7 @@
text-transform: none;
}
- .el-button {
+ & > button {
width: auto;
height: auto;
display: flex;
@@ -1429,7 +1429,10 @@
height: 100%;
.header {
- padding: 0 16px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding-left: 16px;
padding-bottom: 16px;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
@@ -1438,6 +1441,10 @@
text-align: left;
font-style: normal;
text-transform: none;
+
+ .el-icon {
+ cursor: pointer;
+ }
}
.content {
diff --git a/applications/drone-command/src/views/areaManage/defenseZone/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/defenseZone/FormDiaLog.vue
index de0dbb3..3496880 100644
--- a/applications/drone-command/src/views/areaManage/defenseZone/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/defenseZone/FormDiaLog.vue
@@ -15,7 +15,9 @@
<div class="right-container">
<div class="header">
- {{ titleEnum[dialogMode] }}
+ <span>{{ titleEnum[dialogMode] }}</span>
+
+ <el-icon class="close-btn" @click.stop="visible = false"><Close /></el-icon>
</div>
<div class="content" v-if="readonly">
@@ -95,6 +97,8 @@
</template>
<script setup>
+import { Close } from '@element-plus/icons-vue'
+
import { computed, inject, nextTick, ref } from 'vue'
import { ElMessage } from 'element-plus'
import { fwDefenseZoneDetailApi, fwDefenseZoneSubmitApi } from './defenseZoneApi'
diff --git a/applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue
index 70857dd..b030bda 100644
--- a/applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue
@@ -16,7 +16,9 @@
<div class="right-container">
<div class="header">
- {{ titleEnum[dialogMode] }}
+ <span>{{ titleEnum[dialogMode] }}</span>
+
+ <el-icon class="close-btn" @click.stop="visible = false"><Close /></el-icon>
</div>
<div class="content" v-if="readonly">
@@ -163,6 +165,8 @@
</template>
<script setup>
+import { Close } from '@element-plus/icons-vue'
+
import { computed, inject, nextTick, onMounted, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
import { fwAreaDivideDetailApi, fwAreaDivideSubmitApi } from './partitionApi'
diff --git a/applications/drone-command/src/views/areaManage/precinctInfo/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/precinctInfo/FormDiaLog.vue
index d98a363..68f25b3 100644
--- a/applications/drone-command/src/views/areaManage/precinctInfo/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/precinctInfo/FormDiaLog.vue
@@ -58,8 +58,9 @@
确定
</el-button>
</template>
+ </el-dialog>
- <el-dialog class="command-page-map-view-dialog" v-model="visible1" :show-close="false"
+ <el-dialog class="command-page-map-view-dialog" v-model="visible1" :show-close="false"
:close-on-click-modal="false" destroy-on-close @closed="positionClosed">
<div class="dialog-container">
<div class="left-container">
@@ -80,7 +81,6 @@
<el-button color="#284FE3" type="primary" @click="handleMapConfirm">确定</el-button>
</template>
</el-dialog>
- </el-dialog>
</template>
<script setup>
diff --git a/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
index 86ccc50..e3d8a06 100644
--- a/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
@@ -14,7 +14,9 @@
</div>
<div class="right-container">
<div class="header">
- {{ titleEnum[dialogMode] }}
+ <span>{{ titleEnum[dialogMode] }}</span>
+
+ <el-icon class="close-btn" @click.stop="visible = false"><Close /></el-icon>
</div>
<div class="content" v-if="readonly">
@@ -139,6 +141,8 @@
</template>
<script setup>
+import { Close } from '@element-plus/icons-vue'
+
import { computed, inject, nextTick, onMounted, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
import { fwDefenseSceneDetailApi, fwDefenseSceneSubmitApi } from './sceneConfigApi'
diff --git a/applications/drone-command/src/views/basicManage/maintainRecord/FormDiaLog.vue b/applications/drone-command/src/views/basicManage/maintainRecord/FormDiaLog.vue
index 1696a0d..34ef10a 100644
--- a/applications/drone-command/src/views/basicManage/maintainRecord/FormDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/maintainRecord/FormDiaLog.vue
@@ -1,3 +1,13 @@
+<!--
+ * @Author : yuan
+ * @Date : 2026-01-20 14:04:02
+ * @LastEditors : yuan
+ * @LastEditTime : 2026-01-20 14:19:54
+ * @FilePath : \applications\drone-command\src\views\basicManage\maintainRecord\FormDiaLog.vue
+ * @Description :
+ * Copyright 2026 OBKoro1, All Rights Reserved.
+ * 2026-01-20 14:04:02
+-->
<template>
<el-dialog class="command-page-view-dialog" v-model="visible" :title="titleEnum[dialogMode]" @closed="handleClosed"
destroy-on-close :close-on-click-modal="false">
@@ -81,7 +91,7 @@
<el-form-item label="维护计划周期" prop="planCycleType">
<el-select class="command-select" popper-class="command-select-popper"
v-model="formData.planCycleType" placeholder="请选择" clearable
- @change="formData.planCycleValue = []">
+ @change="formData.planCycleValue = ''">
<el-option v-for="item in planCycleOptions" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
@@ -89,12 +99,10 @@
</el-col>
<el-col :span="12">
<el-form-item label="维护计划时间" prop="planCycleValue">
- <el-select class="command-select" popper-class="command-select-popper"
- v-model="formData.planCycleValue" placeholder="请选择" clearable multiple
- :disabled="!formData.planCycleType">
- <el-option v-for="item in planCycleValueOptions" :key="item.value" :label="item.value"
- :value="item.value" />
- </el-select>
+ <el-date-picker class="command-date-picker" popper-class="command-date-picker-popper"
+ v-model="formData.planCycleValue" type="date" placeholder="请选择" clearable
+ value-format="YYYY-MM-DD" :format="planCycleDateFormat" :disabled="!formData.planCycleType"
+ :disabled-date="getPlanCycleDisabledDate" :editable="false" />
</el-form-item>
</el-col>
</el-row>
@@ -111,6 +119,8 @@
<script setup>
import { computed, ref } from 'vue'
+import dayjs from 'dayjs'
+import 'dayjs/locale/zh-cn'
import { ElMessage } from 'element-plus'
import { fieldRules, getDictLabel } from '@ztzf/utils'
import { fwDeviceMaintainRecordPageApi } from '@/views/basicManage/maintainRecord/fwDeviceMaintainRecord'
@@ -123,11 +133,12 @@
const initForm = () => ({
deviceId: '',
planCycleType: '',
- planCycleValue: [],
+ planCycleValue: '',
})
+dayjs.locale('zh-cn')
+
const planCycleOptions = inject('planCycleOptions')
-const planCycleValueOptions = ref([])
const emit = defineEmits(['success'])
const formRef = ref(null) // 表单实例
@@ -141,10 +152,14 @@
const dialogReadonly = computed(() => dialogMode.value === 'view')
const titleEnum = ref({ edit: '编辑', view: '查看', add: '维护计划' })
-const planCycleLabel = computed(() => {
- const item = planCycleOptions.find(option => option.value === formData.value.planCycleType)
- return item?.label || formData.value.planCycleType || '-'
+const planCycleDateFormat = computed(() => {
+ const type = formData.value.planCycleType
+ if (type === '1') return 'M\u6708D\u53f7'
+ if (type === '2') return 'D\u53f7'
+ if (type === '3') return 'dddd'
+ return 'YYYY-MM-DD'
})
+
const rules = {
deviceId: fieldRules(true),
@@ -170,7 +185,14 @@
if (!isValid) return
submitting.value = true
try {
- await fwDeviceMaintainPlanSubmitApi(formData.value)
+ const payload = {
+ ...formData.value,
+ planCycleValue: [formatPlanCycleValue(
+ formData.value.planCycleValue,
+ formData.value.planCycleType
+ )],
+ }
+ await fwDeviceMaintainPlanSubmitApi(payload)
ElMessage.success(dialogMode.value === 'add' ? '新增成功' : '更新成功')
visible.value = false
emit('success')
@@ -183,7 +205,11 @@
async function loadDetail() {
if (!formData.value.id) return
const res = await fwDeviceMaintainPlanDetailApi({ id: formData.value.id })
- formData.value = res?.data?.data ?? {}
+ const data = res?.data?.data ?? {}
+ if (dialogMode.value !== 'view' && data?.planCycleType && data.planCycleValue) {
+ data.planCycleValue = normalizePlanCycleValue(data.planCycleValue, data.planCycleType)
+ }
+ formData.value = data
console.log(formData.value, 66)
}
@@ -226,28 +252,88 @@
}
}
+function toDateString(date) {
+ const year = date.getFullYear()
+ const month = String(date.getMonth() + 1).padStart(2, '0')
+ const day = String(date.getDate()).padStart(2, '0')
+ return `${year}-${month}-${day}`
+}
+
+function formatPlanCycleValue(value, type) {
+ if (typeof value !== 'string') return value
+ if (!value.includes('-')) return value
+ const date = new Date(value)
+ if (Number.isNaN(date.getTime())) return value
+ if (type === '1') return `${date.getMonth() + 1}\u6708${date.getDate()}\u53f7`
+ if (type === '2') return `${date.getDate()}\u53f7`
+ if (type === '3') {
+ const day = date.getDay()
+ const week = day === 0 ? 7 : day
+ return `\u661f\u671f${week}`
+ }
+ return value
+}
+
+function normalizePlanCycleValue(value, type) {
+ if (!value) return ''
+ const now = new Date()
+ if (typeof value !== 'string') return ''
+ if (value.includes('-')) return value
+ if (type === '1') {
+ const match = value.match(/(\d{1,2})\u6708(\d{1,2})\u53f7/)
+ if (!match) return ''
+ const month = Number.parseInt(match[1], 10) - 1
+ const day = Number.parseInt(match[2], 10)
+ return toDateString(new Date(now.getFullYear(), month, day))
+ }
+ if (type === '2') {
+ const match = value.match(/(\d{1,2})\u53f7/)
+ if (!match) return ''
+ const day = Number.parseInt(match[1], 10)
+ return toDateString(new Date(now.getFullYear(), now.getMonth(), day))
+ }
+ if (type === '3') {
+ const match = value.match(/\u661f\u671f(\d)/)
+ if (!match) return ''
+ const week = Number.parseInt(match[1], 10)
+ const { start } = getWeekRange(now)
+ const date = new Date(start)
+ date.setDate(start.getDate() + Math.min(Math.max(week, 1), 7) - 1)
+ return toDateString(date)
+ }
+ return value
+}
+
+function getWeekRange(date) {
+ const base = new Date(date.getFullYear(), date.getMonth(), date.getDate())
+ const day = base.getDay()
+ const diff = day === 0 ? -6 : 1 - day
+ const start = new Date(base)
+ start.setDate(base.getDate() + diff)
+ start.setHours(0, 0, 0, 0)
+ const end = new Date(start)
+ end.setDate(start.getDate() + 6)
+ end.setHours(23, 59, 59, 999)
+ return { start, end }
+}
+
+function getPlanCycleDisabledDate(date) {
+ const type = formData.value.planCycleType
+ if (!type) return false
+ const now = new Date()
+ if (type === '1') {
+ return date.getFullYear() !== now.getFullYear()
+ }
+ if (type === '2') {
+ return date.getFullYear() !== now.getFullYear() || date.getMonth() !== now.getMonth()
+ }
+ if (type === '3') {
+ const { start, end } = getWeekRange(now)
+ return date < start || date > end
+ }
+ return false
+}
+
defineExpose({ open })
-watch(
- () => formData.value?.planCycleType,
- type => {
- planCycleValueOptions.value = []
- if (!type) return
- if (type === '1') {
- ;[...Array(12)].forEach((item, index) => {
- ;[...Array(31)].forEach((item1, index1) => {
- planCycleValueOptions.value.push({ value: `${index + 1}月${index1 + 1}号` })
- })
- })
- } else if (type === '2') {
- ;[...Array(31)].forEach((item, index) => {
- planCycleValueOptions.value.push({ value: `${index + 1}号` })
- })
- } else if (type === '3') {
- ;[...Array(7)].forEach((item, index) => {
- planCycleValueOptions.value.push({ value: `星期${index + 1}` })
- })
- }
- }
-)
</script>
diff --git a/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue b/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue
index f18f74c..7329a48 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue
@@ -21,7 +21,11 @@
</div>
<div class="right-container">
- <div class="header">{{ formTitle }}</div>
+ <div class="header">
+ <span>{{ formTitle }}</span>
+
+ <el-icon class="close-btn" @click.stop="visible = false"><Close /></el-icon>
+ </div>
<div class="content" v-if="dialogReadonly">
<el-row>
@@ -139,6 +143,8 @@
</template>
<script setup>
+import { Close } from '@element-plus/icons-vue'
+
import { computed, inject, nextTick, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
import {
diff --git a/applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue b/applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue
index 0836897..45cdfaa 100644
--- a/applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue
+++ b/applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue
@@ -12,7 +12,12 @@
<div class="leftMap command-cesium" id="leftMapContainer"></div>
</div>
<div class="right-container">
- <div class="header">{{ dialogTitle }}</div>
+ <div class="header">
+ <span>{{ dialogTitle }}</span>
+
+ <el-icon class="close-btn" @click.stop="visible = false"><Close /></el-icon>
+ </div>
+
<div class="content">
<div class="detail-title">轨迹信息</div>
<el-row>
@@ -59,6 +64,8 @@
</template>
<script setup>
+import { Close } from '@element-plus/icons-vue'
+
import { computed, nextTick, ref } from 'vue'
import { fwDroneFlightRecordDetailApi } from '@/views/recordManage/historyTracks/fwDroneFlightRecord'
import { fwDroneFlightRecordDetailPageApi } from '@/views/recordManage/historyTracks/flyTrajectory'
--
Gitblit v1.9.3