From b6cc11253d3e4f81ba3219539fb9b0c09c01ebe9 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Mon, 08 Sep 2025 14:12:00 +0800
Subject: [PATCH] feat:更新设备
---
src/views/algorithmMange/algorithmMange.vue | 66 ++++++++++++++++++++++
src/views/device/addDevice.vue | 22 ++++--
src/views/device/airport.vue | 72 +++++++++++++++---------
src/api/device/device.js | 4
4 files changed, 127 insertions(+), 37 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/algorithmMange/algorithmMange.vue b/src/views/algorithmMange/algorithmMange.vue
new file mode 100644
index 0000000..767f003
--- /dev/null
+++ b/src/views/algorithmMange/algorithmMange.vue
@@ -0,0 +1,66 @@
+<template>
+ <div class="algorithmMange">
+ <div class="search-box">
+ <el-form :model="searchForm" inline>
+ <el-form-item label="算法名称:">
+ <el-input v-model="searchForm.key_word" placeholder="请输入任务编号/名称" clearable />
+ </el-form-item>
+ <el-form-item label="算法类型:">
+ <el-tree-select
+ popper-class="custom-tree-select"
+ v-model="searchForm.area_code"
+ :data="deptTreeData"
+ :default-expanded-keys="[searchForm.area_code]"
+ check-strictly
+ node-key="id"
+ :props="treeProps"
+ @node-click="handleNodeClick"
+ />
+ </el-form-item>
+ </el-form>
+ </div>
+ <div class="mange-table">
+ <el-table border :data="jobListData" class="custom-header">
+ <el-table-column label="序号" type="index" width="60">
+ <template #default="{ $index }">
+ {{ ($index + 1 + (jobListParams.current - 1) * jobListParams.size).toString().padStart(2,
+ '0') }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="job_info_num" label="算法名称" width="160"></el-table-column>
+ <el-table-column prop="name" label="算法类型" width="160"></el-table-column>
+ <el-table-column prop="device_names" label="最低准确率" show-overflow-tooltip/>
+ <el-table-column prop="ai_type_str" label="最高准确率" show-overflow-tooltip align="center" />
+ <el-table-column prop="ai_type_str" label="事件生成类型" show-overflow-tooltip align="center" />
+ <el-table-column prop="cycle_time_value" label="算法描述" show-overflow-tooltip />
+ <el-table-column label="操作" width="140" align="center">
+ <template #default="scope">
+ <el-button icon="el-icon-close" type="text" @click="cancelTask(scope.row)">编辑</el-button>
+ <el-button icon="el-icon-view" type="text" @click="handleDetail(scope.row)">查看</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <div class="pagination">
+ <el-pagination class="ztzf-pagination" popper-class="custom-pagination-dropdown" background
+ :page-sizes="[10, 20, 30, 40, 50, 100]" :size="size" v-model:current-page="jobListParams.current"
+ v-model:page-size="jobListParams.size" layout="total, sizes, prev, pager, next, jumper" :total="total"
+ @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+ </div>
+ </div>
+</template>
+<script setup>
+</script>
+
+<style lang="scss" scoped>
+ .algorithmMange {
+ height: 0;
+ flex: 1;
+ margin: 0 10px 10px 10px;
+ background-color: #ffffff;
+ padding: 10px 20px;
+ border-radius: 5px;
+ display: flex;
+ flex-direction: column;
+ }
+</style>
\ No newline at end of file
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 151bd2d..eead055 100644
--- a/src/views/device/airport.vue
+++ b/src/views/device/airport.vue
@@ -74,12 +74,11 @@
<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>
<el-dropdown-item command="e"><el-button type="primary" text icon="el-icon-document-delete" v-if="permission.fly_device_offline"
@click.stop="handleDeviceOffline(scope.row)">注销</el-button>
</el-dropdown-item>
@@ -87,11 +86,13 @@
</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>
@@ -123,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">
@@ -237,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: '',
@@ -936,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('注销失败')
+ })
},
// 打开存储对象配置页面
@@ -991,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