From 01164b54635ee589b66974efd10a4d085f0fd88d Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 08 Sep 2025 17:02:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/v5.0/5.0.5' into feature/v5.0/5.0.5
---
src/views/device/addDevice.vue | 22 +++++++----
src/views/device/airport.vue | 75 +++++++++++++++++++++++--------------
src/api/device/device.js | 4 +-
3 files changed, 63 insertions(+), 38 deletions(-)
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/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 f3178d6..eead055 100644
--- a/src/views/device/airport.vue
+++ b/src/views/device/airport.vue
@@ -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,19 @@
<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="注销" append-to-body v-model="cancenOperate" width="460px">
+ <div style="display: flex;justify-content: end;">注销 <span style="color:cornflowerblue;">{{ cancelSNName }}</span> 设备可能会影响相关数据,确认注销吗?</div>
+ <div style="display: flex;justify-content: end;">
+ <div><el-checkbox v-model="deleteFlag"></el-checkbox>删除相关图片、视频、事件</div>
+ </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">
@@ -236,6 +251,10 @@
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 +487,7 @@
},
],
},
-
+
// {
// label: '设备位置',
// prop: 'address',
@@ -658,7 +677,7 @@
// },
-
+
{
label: '在线时间',
@@ -935,25 +954,25 @@
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 () {
+ console.log('333')
+ 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 +1009,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 => {
--
Gitblit v1.9.3