From b5cb2129674c45050362bf7b2188a6a3b56d71d3 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 21 Jan 2026 16:02:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue | 3 ++-
applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/index.vue | 6 +++---
applications/drone-command/src/styles/common/cockpit.scss | 2 +-
applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue | 2 +-
applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/reasonForRejectionDialog.vue | 1 +
applications/task-work-order/src/views/orderView/orderManage/orderManage/test.vue | 2 +-
applications/task-work-order/src/views/orderView/orderDataManage/evaluate/FormDiaLog.vue | 1 +
applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue | 7 +++++--
applications/task-work-order/src/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue | 1 +
applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/FormDiaLog.vue | 1 +
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue | 1 +
applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue | 2 +-
applications/task-work-order/src/styles/common/cockpit.scss | 10 +++++++---
applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/FormDiaLog.vue | 1 +
applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue | 2 +-
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue | 1 +
16 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/applications/drone-command/src/styles/common/cockpit.scss b/applications/drone-command/src/styles/common/cockpit.scss
index 82e2132..add79aa 100644
--- a/applications/drone-command/src/styles/common/cockpit.scss
+++ b/applications/drone-command/src/styles/common/cockpit.scss
@@ -1503,7 +1503,7 @@
.detail-title {
- line-height: 40px;
+ margin-bottom: 20px;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 500;
font-size: 16px;
diff --git a/applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue
index d877214..32318d9 100644
--- a/applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue
@@ -201,7 +201,7 @@
const dialogMode = ref('add') // 弹框模式
const submitting = ref(false) // 提交中
const readonly = computed(() => dialogMode.value === 'view')
-const titleEnum = ref({ edit: '编辑场景', view: '查看场景', add: '新增场景' })
+const titleEnum = ref({ edit: '编辑区域', view: '查看区域', add: '新增区域' })
const flyDateRange = ref([]) // 飞行时间
const deviceTableRef = ref(null)
const searchName = ref('')
diff --git a/applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/index.vue b/applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/index.vue
index a996a0c..ea7f4af 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/index.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/index.vue
@@ -29,11 +29,11 @@
</el-select>
</el-form-item>
- <el-form-item label="设备状态" prop="deviceStatus">
+ <el-form-item label="设备状态" prop="status">
<el-select
class="command-select"
popper-class="command-select-popper"
- v-model="searchParams.deviceStatus"
+ v-model="searchParams.status"
placeholder="请选择"
clearable
@change="handleSearch"
@@ -124,7 +124,7 @@
const initSearchParams = () => ({
deviceName: '', // 设备名称
deviceType: '', // 设备类型
- deviceStatus: '', // 设备状态
+ status: '', // 设备状态
current: 1, // 当前页
size: 10, // 每页大小
})
diff --git a/applications/task-work-order/src/styles/common/cockpit.scss b/applications/task-work-order/src/styles/common/cockpit.scss
index 6ad24b1..4c671ac 100644
--- a/applications/task-work-order/src/styles/common/cockpit.scss
+++ b/applications/task-work-order/src/styles/common/cockpit.scss
@@ -461,7 +461,13 @@
background: #FFFFFF;
border: 1px solid #CCCCCC;
border-radius: 6px 6px 6px 6px;
- margin-top: 10vh !important;
+ margin-top: auto !important;
+ max-height: 90vh;
+ min-height: 20vh;
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, -50%);
.el-dialog__header {
@@ -482,8 +488,6 @@
}
.el-dialog__body {
- max-height: 70vh;
- min-height: 20vh;
overflow: auto;
.detail-title {
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/FormDiaLog.vue
index 0a5fa12..6dd96d2 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/FormDiaLog.vue
@@ -5,6 +5,7 @@
:title="titleEnum[dialogMode]"
@closed="visible = false"
destroy-on-close
+ :close-on-click-modal="false"
>
<div class="detail-container" v-if="dialogReadonly">
<el-row>
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue
index ac943fb..a69b97d 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue
@@ -5,6 +5,7 @@
:title="titleEnum[dialogMode]"
@closed="visible = false"
destroy-on-close
+ :close-on-click-modal="false"
>
<div class="detail-container" v-if="dialogReadonly">
<el-row class="detail-row-view">
@@ -311,7 +312,7 @@
}
// 申请提交
async function handleApply() {
-
+
}
// 加载详情
async function loadDetail() {
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/FormDiaLog.vue
index 0c9103c..1d35abc 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/FormDiaLog.vue
@@ -5,6 +5,7 @@
:title="titleEnum[dialogMode]"
@closed="visible = false"
destroy-on-close
+ :close-on-click-modal="false"
>
<el-row class="detail-row-view" v-if="dialogReadonly">
<el-col :span="12">
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue
index 8b9c5d2..b1bb4c2 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog class="gd-dialog" v-model="visible" :title="'查看'" @closed="visible = false" destroy-on-close>
+ <el-dialog class="gd-dialog" :close-on-click-modal="false" v-model="visible" :title="'查看'" @closed="visible = false" destroy-on-close>
<div class="detail-container">
<!-- 左侧审批记录 -->
<div class="detail-left">
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/FormDiaLog.vue
index f3b1b9a..828e6db 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/FormDiaLog.vue
@@ -5,6 +5,7 @@
:title="titleEnum[dialogMode]"
@closed="visible = false"
destroy-on-close
+ :close-on-click-modal="false"
>
<div class="detail-container" v-if="dialogReadonly">
<el-row class="detail-row-view">
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/reasonForRejectionDialog.vue b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/reasonForRejectionDialog.vue
index ad8dfee..6c0742f 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/reasonForRejectionDialog.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/reasonForRejectionDialog.vue
@@ -7,6 +7,7 @@
destroy-on-close
width="550px"
align-center
+ :close-on-click-modal="false"
>
<div class="detail-container">
<div class="detail-cell">
diff --git a/applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue
index 6e91018..895f39d 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog class="gd-dialog" v-model="visible" title="查看" @closed="visible = false" width="1000px" destroy-on-close>
+ <el-dialog class="gd-dialog" :close-on-click-modal="false" v-model="visible" title="查看" @closed="visible = false" width="1000px" destroy-on-close>
<div class="gd-table-container" v-loading="loading">
<div class="gd-table-content gd-table-content-bg">
<el-table class="gd-table" :data="list">
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
index d45ba68..0757422 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
@@ -6,6 +6,7 @@
@closed="visible = false"
destroy-on-close
width="60%"
+ :close-on-click-modal="false"
>
<div class="gd-dialog-form">
<!-- 关联工单选择 -->
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
index 31eeb9a..eb1dbb6 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
@@ -6,6 +6,7 @@
@closed="visible = false"
:style="{ width: pxToRem(1216) }"
destroy-on-close
+ :close-on-click-modal="false"
>
<div class="content" style="display: flex">
<div class="leftBox">
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
index f554aab..f054c12 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
@@ -6,6 +6,7 @@
@closed="visible = false"
width="80%"
destroy-on-close
+ :close-on-click-modal="false"
>
<div class="content" style="display: flex">
<div class="processBox" v-if="dialogMode !== 'add'">
@@ -275,6 +276,8 @@
dialogMode.value = 'edit'
nextTick(() => {
syncSelection()
+ viewPlane && viewer.entities.remove(viewPlane)
+ editPolygon()
})
}
@@ -388,12 +391,13 @@
drawPolygonExample.subscribe('getPolygonPositions', drawFinished)
}
+let viewPlane
// 查看面
function viewPolygon() {
if (!formData.value?.geom) return
pointList = geomAnalysis(formData.value.geom)
const result = pointList.map(item => [item.longitude, item.latitude]).flat()
- const mian = viewer.entities?.add({
+ viewPlane = viewer.entities?.add({
customType: 'control_group',
position: Cesium.Cartesian3.fromDegrees(result[0], result[1]),
polyline: {
@@ -449,7 +453,6 @@
}
function mapReady() {
- console.log(6363)
dialogMode.value === 'add' && mapRef.value.flyBoundary()
}
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue
index 49eb247..7575fcc 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue
@@ -5,6 +5,7 @@
:title="titleEnum[dialogMode]"
@closed="visible = false"
destroy-on-close
+ :close-on-click-modal="false"
>
<el-form
class="gd-dialog-form"
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/test.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/test.vue
index ed069a0..73d5851 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/test.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/test.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog v-model="visible" :title="titleEnum[dialogMode]" :close-on-click-modal="false" width="80%">
+ <el-dialog v-model="visible" :title="titleEnum[dialogMode]" :close-on-click-modal="false" width="80%">
<div class="bodyBox">
<div class="leftMap ztzf-cesium" id="mapContainer"></div>
<div class="rightInfo">
--
Gitblit v1.9.3