From a06873cdf7cdd472a2dc7f96596647b0965e30d9 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Thu, 11 Sep 2025 11:21:35 +0800
Subject: [PATCH] Merge branch 'feature/v5.0/5.0.5' into feature/v6.0/6.0.1
---
src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue | 1
.env.production | 2
src/utils/cesium/createRouteLine.js | 35 ++++++++
src/views/device/addDevice.vue | 22 +++--
src/views/resource/patchManagement.vue | 17 ++--
src/views/device/airport.vue | 109 +++++++++++++++++++-------
src/api/device/device.js | 4
7 files changed, 138 insertions(+), 52 deletions(-)
diff --git a/.env.production b/.env.production
index 97e2aff..06cd550 100644
--- a/.env.production
+++ b/.env.production
@@ -33,6 +33,8 @@
# 算法仓库图片地址
VITE_APP_PICTURE_URL = https://wrj.shuixiongit.com/aiskyminio/cloud-bucket
+# 行政区划存放地址
+VITE_APP_REGION_URL = https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ztzf_region
# 是否在打包时开启压缩，支持 gzip 和 brotli
VITE_BUILD_COMPRESS = gzip
diff --git a/src/api/device/device.js b/src/api/device/device.js
index b3c9d62..d1d0d3d 100644
--- a/src/api/device/device.js
+++ b/src/api/device/device.js
@@ -145,9 +145,9 @@
}
// 注销
-export const deviceOffline = (dockSn) => {
+export const deviceOffline = (dockSn, deleteFlag) => {
return request({
- url: `/drone-device-core/manage/api/v1/devices/deviceOffline?dockSn=${dockSn}`,
+ url: `/drone-device-core/manage/api/v1/devices/deviceOffline?dockSn=${dockSn}&deleteFlag=${deleteFlag}`,
method: 'get',
})
}
diff --git a/src/utils/cesium/createRouteLine.js b/src/utils/cesium/createRouteLine.js
index 92ca1b4..eaa7290 100644
--- a/src/utils/cesium/createRouteLine.js
+++ b/src/utils/cesium/createRouteLine.js
@@ -36,6 +36,34 @@
speed: 5
})
+let arrowLineMaterialPropertyOrange = new ArrowLineMaterialProperty({
+ color: new Cesium.Color(255 / 255, 185 / 255, 58 / 255, 1),
+ directionColor: new Cesium.Color(1, 1, 1, 1),
+ outlineColor: new Cesium.Color(1, 1, 1, 1),
+ outlineWidth: 0,
+ speed: 5,
+})
+
+let arrowLineMaterialPropertyGreen = new ArrowLineMaterialProperty({
+ color: new Cesium.Color(6 / 255, 217 / 255, 87 / 255, 1),
+ directionColor: new Cesium.Color(1, 1, 1, 1),
+ outlineColor: new Cesium.Color(1, 1, 1, 1),
+ outlineWidth: 0,
+ speed: 5,
+})
+
+// 记录index
+let indexLog = 0
+// 颜色
+function getLineColor(lineNumber) {
+ // 颜色顺序: 蓝(0), 黄(1), 绿(2)
+ const colors = [arrowLineMaterialProperty, arrowLineMaterialPropertyOrange, arrowLineMaterialPropertyGreen]
+ // 计算颜色索引 (从0开始)
+ const colorIndex = (lineNumber - 1) % 3
+ // 返回对应颜色
+ return colors[colorIndex]
+}
+
let runningLineMaterial = new LineTrailMaterial({
color: Cesium.Color.fromCssColorString('#1FFF69'),
opacity: 1,
@@ -94,6 +122,7 @@
* @param {*} viewer
*/
initCreateRoute (viewer) {
+ indexLog = 0
this.viewer = viewer
}
@@ -469,7 +498,7 @@
*/
async drawPointRoute (lineObj, missionConfig, dronePosition, data, startPoint, isShowDock, isShowPointBillboard, wayline_type) {
const { positionArray, filePositions } = this.disposeData(lineObj, missionConfig, dronePosition, data, startPoint, wayline_type)
-
+
const droneTransformPosition = Cesium.Cartesian3.fromDegrees(
Number(dronePosition.longitude),
Number(dronePosition.latitude),
@@ -478,6 +507,7 @@
// 路径线
let polyline
+
if (this.type === 'clusterScheduling') {
filePositions.forEach((item, index) => {
@@ -630,7 +660,7 @@
polyline: {
width: 4,
positions: positionArray,
- material: arrowLineMaterialProperty,
+ material: getLineColor(indexLog),
clampToGround: false,
},
@@ -681,6 +711,7 @@
* @returns {} {positionArray： 带拼接点位置， filePositions：光航线点位置}
*/
disposeData (lineObj, missionConfig, dronePosition, data, startPoint, wayline_type) {
+ indexLog = indexLog + 1
const { device_sn } = data
const executeHeightMode = lineObj.executeHeightMode === "WGS84"
diff --git a/src/views/device/addDevice.vue b/src/views/device/addDevice.vue
index 8b12544..45ebc85 100644
--- a/src/views/device/addDevice.vue
+++ b/src/views/device/addDevice.vue
@@ -181,17 +181,16 @@
label: '设备类型',
editDisplay: false,
prop: 'type',
- type: 'radio',
labelWidth: 130,
value: 0,
type: 'select',
dicData: [
{
- label: '机场',
+ label: '机巢',
value: 0
},
{
- label: '遥控器',
+ label: '控制器',
value: 1
}
],
@@ -279,24 +278,31 @@
{
label: '设备描述', // '工作空间描述',
prop: 'workspace_desc',
+ type: 'textarea',
labelWidth: 130,
searchSpan: 4,
+ overHidden: true,
+ minRows: 3,
+ maxRows: 5,
+ maxlength: 250,
+ span: 24,
+ showWordLimit: true,
rules: [
{
required: true,
- message: '请输入设备描述',
+ message: '请输入设备描述不能超过250个字',
trigger: 'blur',
},
{
- max: 30,
- message: '设备描述不能超过30个字',
+ max: 250,
+ message: '设备描述不能超过250个字',
trigger: 'blur',
},
// 如果需要更严格的校验（如中文字符计算），可以使用 validator
{
validator: (rule, value, callback) => {
- if (value && value.length > 30) {
- callback(new Error('设备描述不能超过30个字'));
+ if (value && value.length > 250) {
+ callback(new Error('设备描述不能超过250个字'));
} else {
callback();
}
diff --git a/src/views/device/airport.vue b/src/views/device/airport.vue
index 95c0edf..314b3fd 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-folder-opened" v-if="permission.oss_set">更 多</el-button>
+ <el-button type="primary" text v-if="permission.oss_set"><el-icon><MoreFilled /></el-icon>更多</el-button>
<template #dropdown v-if="scope.row.domain == 3">
<el-dropdown-menu teleported>
<el-dropdown-item command="a">
@@ -74,9 +74,9 @@
<el-dropdown-item command="d"><el-button type="primary" text icon="el-icon-collection" v-if="permission.fly_device_offline"
@click.stop="rollFirmware(scope.row)">固件版本管理</el-button>
</el-dropdown-item>
- <el-dropdown-item command="d">
- <el-button type="primary" text icon="el-icon-collection" v-if="!scope.row.status" @click.stop="dockNotLine(scope.row)">
- {{ scope.row.hidden_flag == 1 ? '设备上线' : '设备下线'}}
+ <el-dropdown-item command="d" v-if="!scope.row.status">
+ <el-button type="primary" text icon="el-icon-collection" @click.stop="dockNotLine(scope.row)">
+ {{ scope.row.hidden_flag === 1 ? '设备上线' : '设备下线'}}
</el-button>
</el-dropdown-item>
<el-dropdown-item command="e"><el-button type="primary" text icon="el-icon-document-delete" v-if="permission.fly_device_offline"
@@ -86,17 +86,19 @@
</template>
<template #dropdown v-else>
<el-dropdown-menu teleported>
- <el-dropdown-item command="a">
+ <!-- <el-dropdown-item command="a">
<el-button type="primary" text icon="el-icon-circle-close" @click.stop="rowDel(scope.row, scope.index)">删除</el-button>
- </el-dropdown-item>
- <el-dropdown-item command="a">
+ </el-dropdown-item> -->
+ <!-- <el-dropdown-item command="a">
<el-button type="primary" text icon="el-icon-key" v-if="permission.operate_password_set" @click.stop="handleOperatePassword(scope.row, scope.index)">操控密码设置</el-button>
+ </el-dropdown-item> -->
+ <el-dropdown-item command="d"><el-button type="primary" text icon="el-icon-collection" @click.stop="rollFirmware(scope.row)">固件版本管理</el-button>
</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</template>
-
+
<!-- 添加行政区划显示模板 -->
<template #area_code="{ row }">
<span>{{ row.area_name }}</span>
@@ -122,6 +124,20 @@
<el-dialog title="操控密码查看" append-to-body v-model="operatePasswordViewBox" width="455px">
<el-input v-model="operate_password" disabled></el-input>
+ </el-dialog>
+
+ <el-dialog title="注销" class="zx-cancel" append-to-body v-model="cancenOperate" width="460px">
+ <div style="display: flex;justify-content: center;margin-bottom: 10px;">注销
+ <span style="color:cornflowerblue;font-weight: bolder;margin: 0px 4px;">
+ {{ cancelSNName }}
+ </span> 设备可能会影响相关数据,确认注销吗?</div>
+ <div style="display: flex;justify-content: center;color:red;font-size: 12px;">*删除相关图片、视频、事件</div>
+ <template #footer>
+ <span class="dialog-footer" style="display: flex;justify-content: center;">
+ <el-button @click="cancenOperate = false">取 消</el-button>
+ <el-button type="primary" @click="cancenOperateDo">确 定</el-button>
+ </span>
+ </template>
</el-dialog>
<el-dialog title="固件升级" append-to-body v-model="firmwareBox" width="455px">
@@ -232,10 +248,15 @@
}
}
return {
+ treeResolveMap: new Map(),
rules: {
password: [{ required: true, validator: validatePass, trigger: 'blur' }],
password2: [{ required: true, validator: validatePass2, trigger: 'blur' }],
},
+ cancelSNName: '',
+ cancenOperate: false,
+ cancenOperateRow: {},
+ deleteFlag: false,
passwordForm: {
id: '',
password: '',
@@ -468,7 +489,7 @@
},
],
},
-
+
// {
// label: '设备位置',
// prop: 'address',
@@ -513,7 +534,7 @@
endPlaceholder: '保险结束日期',
rules: [
{
- required: true,
+ required: false,
message: '请选择保险有效期',
trigger: 'blur',
},
@@ -658,7 +679,7 @@
// },
-
+
{
label: '在线时间',
@@ -831,6 +852,7 @@
},
},
destroyed () {
+ this.treeResolveMap.clear()
this.websocketMap.forEach((k, v) => {
if (null != v) {
v.close()
@@ -935,25 +957,24 @@
this.operateTitle = row.nickname + ' - ' + row.device_sn
},
- // 设备下线
+ // 设备注销
handleDeviceOffline (row) {
- ElMessageBox.confirm('确定注销该设备吗?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- type: 'warning',
- })
- .then(() => {
- deviceOffline(row.device_sn)
- .then(res => {
- ElMessage.success('注销成功')
+ this.cancenOperate = true
+ this.cancelSNName = row.nickname
+ this.cancenOperateRow = row
+
+ },
- this.init()
- })
- .catch(error => {
- ElMessage.error('注销失败')
- })
- })
- .catch(() => { })
+ cancenOperateDo () {
+ this.cancenOperate = false
+ this.deleteFlag = false
+ deviceOffline(this.cancenOperateRow.device_sn, this.deleteFlag).then(res => {
+ ElMessage.success('注销成功')
+
+ this.init()
+ }).catch(error => {
+ ElMessage.error('注销失败')
+ })
},
// 打开存储对象配置页面
@@ -990,9 +1011,9 @@
})
.then(() => {
let hidden_flag = row.hidden_flag === 1?0:1
- devicesUpdate({id:row.id, hidden_flag:hidden_flag})
+ devicesUpdate({id:row.id, hiddenFlag:hidden_flag})
.then(res => {
- ElMessage.success('下线成功')
+ ElMessage.success(`${txt}成功`)
this.init()
})
.catch(error => {
@@ -1288,7 +1309,25 @@
update(submitData).then(
() => {
- this.onLoad(this.page)
+ if (row.domain === 0) {
+ // 获取保存的 resolve 函数
+ const resolve = this.treeResolveMap.get(row.device_sn)
+ if (resolve) {
+ // 重新加载子节点数据
+ var params = {
+ childSn: row.device_sn,
+ }
+ getList(1, 10, params).then(res => {
+ const data = res.data.data.records
+ data.forEach(e => {
+ e.duration_of_insurance = [e.insure_start_time || '', e.insure_expired_time || '']
+ })
+ resolve(data)
+ })
+ }
+ } else {
+ this.onLoad(this.page)
+ }
this.$message({
type: 'success',
message: '操作成功!',
@@ -1440,6 +1479,8 @@
})
},
treeLoad (tree, treeNode, resolve) {
+ // 保存resolve
+ this.treeResolveMap.set(tree.child_sn, resolve)
var params = {
childSn: tree.child_sn,
}
@@ -1586,5 +1627,11 @@
right: 0;
}
+:deep(.avue-crud__pagination) {
+ position: fixed;
+ bottom: 10px;
+ right: 30px;
+}
+
</style>
diff --git a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
index 22363fa..8749468 100644
--- a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -169,7 +169,6 @@
const jobId = ref('')
const handleDetail = row => {
if (!row.device_sns.length) return ElMessage.warning('没有device_sns')
- // if (row.device_sns.length !== 1) return ElMessage.success('即将跳转到集群调度')
rowData.value = row ? row : {}
if (row.device_sns.length > 1 && (row.status === 2 || row.status === 1)) {
const adminUrl = `${import.meta.env.VITE_APP_AREA_NAME}/command-center-dashboard/#/clusterScheduling`
diff --git a/src/views/resource/patchManagement.vue b/src/views/resource/patchManagement.vue
index 1ff8005..0f78973 100644
--- a/src/views/resource/patchManagement.vue
+++ b/src/views/resource/patchManagement.vue
@@ -89,7 +89,7 @@
</basic-container>
</template>
<script setup>
-import {findAreaName} from '@/utils/areaUtils'
+import { findAreaName } from '@/utils/areaUtils';
import {
spotManagementTableApi,
searchManagementApi,
@@ -161,7 +161,7 @@
border: true,
index: true,
indexLabel: '序号',
- indexWidth: 60,
+ indexWidth: 60,
selection: true,
grid: false,
menuWidth: 240,
@@ -468,7 +468,7 @@
data.value = d.records.map(i => ({
...i,
dataFrom: i.date_from === 0 ? '本地上传' : '国土调查云',
- areaName: findAreaName(i.area_code, regionalData.value, true)
+ areaName: findAreaName(i.area_code, regionalData.value, true),
}));
loading.value = false;
selectionClear();
@@ -510,12 +510,14 @@
};
// 图斑上传
const uploadFlightFile = (file, t) => {
-loading.value = true
+ loading.value = true;
const fileSuffix = file.name.substring(file.name.lastIndexOf('.') + 1);
if (!['kmz', 'kml', 'zip'].includes(fileSuffix)) {
return ElMessage.error('请上传zip/kmz/kml格式的文件');
}
-
+ if (file) {
+ box.value = false;
+ }
let data = new FormData();
let type = t === '3' ? '' : t;
const params = {
@@ -535,15 +537,14 @@
ElMessage.success('上传成功');
- box.value = false;
-
+ loading.value = false;
ruleForm.name = '';
ruleForm.region = '';
if (ruleFormRef.value) {
ruleFormRef.value.resetFields();
}
-loading.value = true
+
searchReset();
});
};
--
Gitblit v1.9.3