From 408a966e97b390af794f80ef8ffaee39f7405bea Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Fri, 05 Sep 2025 10:56:43 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v5.0/5.0.5' into patch_management
---
src/utils/cesium/publicCesium.js | 6 +++---
src/views/device/addDevice.vue | 13 ++++++++-----
src/views/device/airport.vue | 6 ++++--
3 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/utils/cesium/publicCesium.js b/src/utils/cesium/publicCesium.js
index 59b1acf..e5ea8f9 100644
--- a/src/utils/cesium/publicCesium.js
+++ b/src/utils/cesium/publicCesium.js
@@ -99,8 +99,8 @@
dockOptions = {},
-
-
+ boundaryColor = '#7FFFD4',
+ boundaryChange,
dockRangeType = 1,
useDockHeight = false
} = options
@@ -135,7 +135,7 @@
this.viewer.clockViewModel.currentTime = Cesium.JulianDate.addHours(utc, 0, new Cesium.JulianDate())
// 边界，机巢
-
+ this.boundary = useBoundary(this.viewer, { multiple, dockOptions, boundaryChange, boundaryColor, dockRangeType, useDockHeight })
this.viewer?.imageryLayers.removeAll()
this.viewer._cesiumWidget._creditContainer.style.display = 'none'
handler = new Cesium.ScreenSpaceEventHandler(this.viewer?.scene.canvas)
diff --git a/src/views/device/addDevice.vue b/src/views/device/addDevice.vue
index 4bf099e..292fe4e 100644
--- a/src/views/device/addDevice.vue
+++ b/src/views/device/addDevice.vue
@@ -70,7 +70,8 @@
lazy: true,
tree: true,
- // dialogWidth: 1050,
+ dialogWidth: 1050,
+ searchGutter: 30,
tip: false,
searchShow: true,
searchMenuSpan: 6,
@@ -94,7 +95,7 @@
prop: 'workspace_name',
// editDisabled: true,
editDisplay: false,
- searchLabelWidth: 130,
+ // searchLabelWidth: 130,
search: true,
// searchSpan: 4,
labelWidth: 130,
@@ -213,20 +214,22 @@
width: 200,
},
{
- label: '设备位置',// '行政区划',
+ label: '设备位置',
prop: 'area_code',
type: 'cascader',
labelWidth: 130,
searchSpan: 4,
hide: true,
search: true,
+ // overHidden: true,
editDisplay: true,
- viewDisplay: false,
+ viewDisplay: true,
+ checkStrictly: true,
+
props: {
label: 'title',
value: 'value',
emitPath: false,
- checkStrictly: true,
multiple: false,
expandTrigger: 'hover',
},
diff --git a/src/views/device/airport.vue b/src/views/device/airport.vue
index bd3b139..3f3ca55 100644
--- a/src/views/device/airport.vue
+++ b/src/views/device/airport.vue
@@ -57,7 +57,7 @@
</template>
<template #menu="scope">
<el-dropdown>
- <el-button type="primary" text icon="el-icon-more" v-if="permission.oss_set">更 多</el-button>
+ <el-button type="primary" text icon="el-icon-folder-opened" v-if="permission.oss_set">更 多</el-button>
<template #dropdown v-if="scope.row.domain == 3">
<el-dropdown-menu teleported>
<el-dropdown-item command="a">
@@ -281,6 +281,7 @@
tree: true,
dialogWidth: 1050,
+ searchGutter: 30,
tip: false,
searchShow: true,
searchMenuSpan: 6,
@@ -399,11 +400,12 @@
// overHidden: true,
editDisplay: true,
viewDisplay: true,
+ checkStrictly: true,
+
props: {
label: 'title',
value: 'value',
emitPath: false,
- checkStrictly: true,
multiple: false,
expandTrigger: 'hover',
},
--
Gitblit v1.9.3