From 2dfc8dc4bcd3d3cd4aed1b6054e073e140eba9c8 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 19 May 2025 16:05:50 +0800
Subject: [PATCH] Merge branch 'master' into jiangwu
---
src/views/device/addDevice.vue | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/src/views/device/addDevice.vue b/src/views/device/addDevice.vue
index 224ed67..6bf203f 100644
--- a/src/views/device/addDevice.vue
+++ b/src/views/device/addDevice.vue
@@ -31,6 +31,7 @@
import ConnectWebSocket from '@/websocket';
import { $Clipboard } from "@smallwei/avue";
+
export default {
components: {
},
@@ -157,6 +158,30 @@
],
},
{
+ label: '设备类型',
+ prop: 'type',
+ type: 'radio',
+ labelWidth: 130,
+ value: 0,
+ dicData: [
+ {
+ label: '机场',
+ value: 0
+ },
+ {
+ label: '遥控器',
+ value: 1
+ }
+ ],
+ rules: [
+ {
+ required: true,
+ message: '请选择设备类型',
+ trigger: 'change',
+ },
+ ],
+ },
+ {
label: '创建时间',
prop: 'create_time',
addDisplay: false,
@@ -204,8 +229,10 @@
methods: {
copyInfo(row, index) {
- let params = `
- host: tcp://139.196.74.78:1883
+ if(import.meta.env.VITE_APP_ENV==='development'){
+ // alert('地址'+import.meta.env.VITE_APP_ENV);
+ let params = `
+ host: tcp://139.196.74.78:1883
账号：drone
密码：123456
组织id：${row.bing_id}
@@ -219,6 +246,23 @@
}).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("复制失败");
+ });}
},
init() {
this.onLoad(this.page);
--
Gitblit v1.9.3