From 56fe5da07bf822f86ce4d0e8b32a7941b1451091 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Sat, 28 Jun 2025 09:24:25 +0800
Subject: [PATCH] Merge branch 'refs/heads/test' into feature/v3.0.0/帮助中心
---
src/views/device/addDevice.vue | 254 ++++++++++++++++++++++++--------------------------
1 files changed, 124 insertions(+), 130 deletions(-)
diff --git a/src/views/device/addDevice.vue b/src/views/device/addDevice.vue
index 52b0b32..88a8a89 100644
--- a/src/views/device/addDevice.vue
+++ b/src/views/device/addDevice.vue
@@ -1,20 +1,20 @@
<template>
<basic-container>
- <avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" ref="crud" @row-del="rowDel"
- v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
+ <avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" ref="crud"
+ @row-del="rowDel" v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
:before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad">
<template #menu="scope">
- <el-button type="primary" text icon="el-icon-copy-document" @click.stop="copyInfo(scope.row, scope.index)"
- v-if="userInfo.role_name.includes('admin')">复制
+ <el-button type="primary" text icon="el-icon-copy-document"
+ @click.stop="copyInfo(scope.row, scope.index)" v-if="userInfo.role_name.includes('admin')">复制
</el-button>
</template>
</avue-crud>
</basic-container>
</template>
-
+
<script>
import {
getList,
@@ -22,21 +22,21 @@
update,
add,
getDetail,
-} from '@/api/device/workspaces';
+} from '@/api/device/workspaces'
-import { getLazyTree } from '@/api/base/region';
+import { getLazyTree } from '@/api/base/region'
-import { mapGetters } from 'vuex';
-import { getWebsocketUrl } from '@/websocket/util/config';
-import ConnectWebSocket from '@/websocket';
-import { $Clipboard } from "@smallwei/avue";
+import { mapGetters } from 'vuex'
+import { getWebsocketUrl } from '@/websocket/util/config'
+import ConnectWebSocket from '@/websocket'
+import { $Clipboard } from "@smallwei/avue"
export default {
components: {
},
- data() {
+ data () {
return {
// 用于记录已经创建的websocket，防止重复创建
webSocketIdSet: new Set(),
@@ -65,8 +65,7 @@
menuWidth: 300,
lazy: true,
tree: true,
- // height: '460',
- // calcHeight: 32,
+
// dialogWidth: 1050,
tip: false,
searchShow: true,
@@ -79,6 +78,9 @@
addBtn: true,
dialogClickModal: false,
grid: false,
+
+ height: 'auto',
+ calcHeight: 20,
column: [
{
label: '工作空间名称',
@@ -197,39 +199,39 @@
},
data: [],
- };
+ }
},
computed: {
...mapGetters(['userInfo', 'permission']),
- permissionList() {
+ permissionList () {
return {
addBtn: this.validData(this.permission.airport_add, false),
viewBtn: this.validData(this.permission.airport_view, true),
delBtn: this.validData(this.permission.airport_delete, false),
editBtn: this.validData(this.permission.airport_edit, false),
- };
+ }
},
- ids() {
- let ids = [];
+ ids () {
+ let ids = []
this.selectionList.forEach(ele => {
- ids.push(ele.id);
- });
- return ids.join(',');
+ ids.push(ele.id)
+ })
+ return ids.join(',')
},
},
- destroyed() {
+ destroyed () {
this.websocketMap.forEach((k, v) => {
if (null != v) {
v.close()
this.websocketMap.delete(k)
this.webSocketIdSet.delete(k)
}
- });
+ })
},
methods: {
- copyInfo(row, index) {
- if(import.meta.env.VITE_APP_ENV==='development'){
+ copyInfo (row, index) {
+ if (import.meta.env.VITE_APP_ENV === 'development') {
// alert('地址'+import.meta.env.VITE_APP_ENV);
let params = `
host: tcp://139.196.74.78:1883
@@ -238,111 +240,112 @@
组织id：${row.bing_id}
设备码：${row.bind_code}
机场名称：${row.workspace_name}
- aircrattName：${row.workspace_desc}`;
- $Clipboard({
- text: params,
- }).then(() => {
- this.$message.success("复制成功");
- }).catch(() => {
- this.$message.error("复制失败");
- });
- }else{
- // alert('地址'+import.meta.env.VITE_APP_ENV);
- let params = `
+ aircrattName：${row.workspace_desc}`
+ $Clipboard({
+ text: params,
+ }).then(() => {
+ this.$message.success("复制成功")
+ }).catch(() => {
+ this.$message.error("复制失败")
+ })
+ } else {
+ // alert('地址'+import.meta.env.VITE_APP_ENV);
+ let params = `
host: tcp://101.132.85.201:1883
账号：drone
密码：drone@123
组织id：${row.bing_id}
设备码：${row.bind_code}
机场名称：${row.workspace_name}
- aircrattName：${row.workspace_desc}`;
- $Clipboard({
- text: params,
- }).then(() => {
- this.$message.success("复制成功");
- }).catch(() => {
- this.$message.error("复制失败");
- });}
+ aircrattName：${row.workspace_desc}`
+ $Clipboard({
+ text: params,
+ }).then(() => {
+ this.$message.success("复制成功")
+ }).catch(() => {
+ this.$message.error("复制失败")
+ })
+ }
},
- init() {
- this.onLoad(this.page);
+ init () {
+ this.onLoad(this.page)
},
- handleOpenRemoteDebugging(row) {
- this.curDeviceInfo = row;
- this.remoteDebuggingShow = true;
+ handleOpenRemoteDebugging (row) {
+ this.curDeviceInfo = row
+ this.remoteDebuggingShow = true
},
- rowSave(row, done, loading) {
+ rowSave (row, done, loading) {
add(row).then(
() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: 'success',
message: '操作成功!',
- });
- done();
+ })
+ done()
},
error => {
- window.console.log(error);
- loading();
+ window.console.log(error)
+ loading()
}
- );
+ )
},
- rowUpdate(row, index, done, loading) {
+ rowUpdate (row, index, done, loading) {
update(row).then(
() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: 'success',
message: '操作成功!',
- });
- done();
+ })
+ done()
},
error => {
- window.console.log(error);
- loading();
+ window.console.log(error)
+ loading()
}
- );
+ )
},
- rowDel(row) {
+ rowDel (row) {
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
- return remove(row.id);
+ return remove(row.id)
})
.then(() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: 'success',
message: '操作成功!',
- });
- });
+ })
+ })
},
- searchReset() {
- this.query = {};
- this.onLoad(this.page);
+ searchReset () {
+ this.query = {}
+ this.onLoad(this.page)
},
- searchChange(params, done) {
- this.query = params;
- this.page.currentPage = 1;
- this.onLoad(this.page, params);
- done();
+ searchChange (params, done) {
+ this.query = params
+ this.page.currentPage = 1
+ this.onLoad(this.page, params)
+ done()
},
- selectionChange(list) {
- this.selectionList = list;
+ selectionChange (list) {
+ this.selectionList = list
},
- selectionClear() {
- this.selectionList = [];
- this.$refs.crud.toggleSelection();
+ selectionClear () {
+ this.selectionList = []
+ this.$refs.crud.toggleSelection()
},
- handleDelete() {
+ handleDelete () {
if (this.selectionList.length === 0) {
- this.$message.warning('请选择至少一条数据');
- return;
+ this.$message.warning('请选择至少一条数据')
+ return
}
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
@@ -350,86 +353,78 @@
type: 'warning',
})
.then(() => {
- return remove(this.ids);
+ return remove(this.ids)
})
.then(() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: 'success',
message: '操作成功!',
- });
- this.$refs.crud.toggleSelection();
- });
+ })
+ this.$refs.crud.toggleSelection()
+ })
},
- beforeOpen(done, type) {
+ beforeOpen (done, type) {
if (['edit', 'view'].includes(type)) {
getDetail(this.form.id).then(res => {
- this.form = res.data.data;
- });
+ this.form = res.data.data
+ })
}
- done();
+ done()
},
- currentChange(currentPage) {
- this.page.currentPage = currentPage;
+ currentChange (currentPage) {
+ this.page.currentPage = currentPage
},
- sizeChange(pageSize) {
- this.page.pageSize = pageSize;
+ sizeChange (pageSize) {
+ this.page.pageSize = pageSize
},
- refreshChange() {
- this.onLoad(this.page, this.query);
+ refreshChange () {
+ this.onLoad(this.page, this.query)
},
- onLoad(page, params = {}) {
- const { releaseTimeRange } = this.query;
+ onLoad (page, params = {}) {
+ const { releaseTimeRange } = this.query
let values = {
...params,
...this.query,
- };
+ }
if (releaseTimeRange) {
values = {
...values,
releaseTime_datege: releaseTimeRange[0],
releaseTime_datelt: releaseTimeRange[1],
- };
- values.releaseTimeRange = null;
+ }
+ values.releaseTimeRange = null
}
- values['type'] = 1;
- this.loading = true;
+ values['type'] = 1
+ this.loading = true
getList(page.currentPage, page.pageSize, values).then(res => {
- const data = res.data.data;
- this.page.total = data.total;
+ const data = res.data.data
+ this.page.total = data.total
// data.records.forEach(e => {
// e['hasChildren'] = e.has_children;
// if (e.firmware_status == 4) {
// this.connectWebSocket(e);
// }
// });
- this.data = data.records;
- this.loading = false;
- this.selectionClear();
- });
+ this.data = data.records
+ this.loading = false
+ this.selectionClear()
+ })
},
- treeLoad(tree, treeNode, resolve) {
+ treeLoad (tree, treeNode, resolve) {
var params = {
childSn: tree.child_sn,
- };
+ }
getList(1, 10, params).then(res => {
- const data = res.data.data.records;
- resolve(data);
- });
+ const data = res.data.data.records
+ resolve(data)
+ })
},
},
-};
+}
</script>
-
+
<style lang="scss" scoped>
- :deep(){
- .avue-crud__body{
- .el-form{
- height: 745px;
- overflow: auto;
- }
- }
- }
.firmware_status {
background-color: aqua;
border-radius: 4px;
@@ -448,5 +443,4 @@
border-color: #409eff;
}
}
-</style>
-
\ No newline at end of file
+</style>
\ No newline at end of file
--
Gitblit v1.9.3