From ee8589ea223a7ff864df467c4dbcafe9aa45909e Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Sat, 20 Sep 2025 11:05:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/v6.0/6.0.3' into feature/v6.0/6.0.3
---
src/views/device/airport.vue | 126 ++++++++++++++++++++++++++++++------------
1 files changed, 90 insertions(+), 36 deletions(-)
diff --git a/src/views/device/airport.vue b/src/views/device/airport.vue
index cc20d08..8d91e18 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 v-if="permission.oss_set"><el-icon><MoreFilled /></el-icon>更多</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">
@@ -196,7 +212,8 @@
getDeviceFirmwareList,
getDevices,
deviceOffline,
- devicesUpdate
+ devicesUpdate,
+ devicesUpAndDown
} from '@/api/device/device'
import { deleteByOssId, addOrUpdate as addOrUpdateOssBind } from '@/api/device/ossBind'
import { getListPage as getOssList } from '@/api/resource/oss'
@@ -232,10 +249,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 +490,7 @@
},
],
},
-
+
// {
// label: '设备位置',
// prop: 'address',
@@ -508,16 +530,20 @@
width: 200,
type: 'daterange',
format: 'YYYY-MM-DD',
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'YYYY-MM-DD',
startPlaceholder: '保险开始日期',
endPlaceholder: '保险结束日期',
+ align: 'center',
rules: [
{
- required: true,
+ required: false,
message: '请选择保险有效期',
trigger: 'blur',
},
],
+ formatter: (row, value) => {
+ return value[0]? `${this.$dayjs(value[0]).format('YYYY-MM-DD')}~${this.$dayjs(value[1]).format('YYYY-MM-DD')}` : '/';
+ },
},
// {
// label: '保险有效期',
@@ -657,7 +683,7 @@
// },
-
+
{
label: '在线时间',
@@ -830,6 +856,7 @@
},
},
destroyed () {
+ this.treeResolveMap.clear()
this.websocketMap.forEach((k, v) => {
if (null != v) {
v.close()
@@ -934,25 +961,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, true).then(res => {
+ ElMessage.success('注销成功')
+
+ this.init()
+ }).catch(error => {
+ ElMessage.error('注销失败')
+ })
},
// 打开存储对象配置页面
@@ -989,9 +1015,9 @@
})
.then(() => {
let hidden_flag = row.hidden_flag === 1?0:1
- devicesUpdate({id:row.id, hidden_flag:hidden_flag})
+ devicesUpAndDown({id:row.id, hiddenFlag:hidden_flag})
.then(res => {
- ElMessage.success('下线成功')
+ ElMessage.success(`${txt}成功`)
this.init()
})
.catch(error => {
@@ -1275,8 +1301,8 @@
const submitData = {
...row,
area_code: row.area_code.split(',').pop(),
- insure_start_time: row.duration_of_insurance[0],
- insure_expired_time: row.duration_of_insurance[1],
+ insure_start_time: row.duration_of_insurance[0] || null,
+ insure_expired_time: row.duration_of_insurance[1] || null,
deptId: row.dept_id,
areaCode: row.area_code.split(',').pop(),
}
@@ -1287,7 +1313,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: '操作成功!',
@@ -1384,7 +1428,6 @@
area_code: await this.getFullAreaCode(data.area_code),
area_name: this.form.area_name,
cnmode_code: this.getDockModeText(this.form.mode_code),
- // domain: data.domain === 0 ? '无人机' : data.domain === 3 ? '机巢' : '未知',
domainTxt: data.domain === 0 ? '无人机' : data.domain === 3 ? '机巢' : '未知',
cnstatus: this.form.status === false ? '离线' : '在线',
duration_of_insurance: [data?.insure_start_time || '', data?.insure_expired_time || ''],
@@ -1439,11 +1482,16 @@
})
},
treeLoad (tree, treeNode, resolve) {
+ // 保存resolve
+ this.treeResolveMap.set(tree.child_sn, resolve)
var params = {
childSn: tree.child_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)
})
},
@@ -1582,5 +1630,11 @@
right: 0;
}
+:deep(.avue-crud__pagination) {
+ position: fixed;
+ bottom: 10px;
+ right: 30px;
+}
+
</style>
--
Gitblit v1.9.3