From 0082fa417fb2af9add3406bf05ab3e3e45890c34 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 12 Jun 2025 14:30:02 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/drone-web-manage

---
 src/views/device/addDevice.vue |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/src/views/device/addDevice.vue b/src/views/device/addDevice.vue
index 224ed67..52b0b32 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);
@@ -378,6 +422,14 @@
 </script>
   
 <style lang="scss" scoped>
+ :deep(){
+    .avue-crud__body{
+      .el-form{
+        height: 745px;
+        overflow: auto;
+      }
+    }
+  }
 .firmware_status {
     background-color: aqua;
     border-radius: 4px;

--
Gitblit v1.9.3