From aa107f0283a7043a5a0016e0797fffe10e3962d0 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 21 Jul 2025 14:05:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
.env.development | 3 +
.env.localhost | 3 +
.env.production | 14 ++-----
src/views/device/addDevice.vue | 49 +++++++-----------------
.env.jiangwu | 3 +
.env.test | 3 +
6 files changed, 31 insertions(+), 44 deletions(-)
diff --git a/.env.development b/.env.development
index 1281a23..1434f0e 100644
--- a/.env.development
+++ b/.env.development
@@ -36,7 +36,10 @@
#页面基础路径
# VITE_APP_BASE_COMMAND = /drone-web-manage/
+
#天地图token 浏览器端口
VITE_APP_TDT_TOKEN = e110584a27d506da2740edca951683f4
VITE_APP_CESIUM_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJkYTZlNGNlYS01NTU1LTQ1MGEtYmNlZS0yNTE2NDk5YWM2MjEiLCJpZCI6MTc5Njk2LCJpYXQiOjE3MDA1NDcwMjV9.qcl4AH2731cfFd0-I1ZLUINPXqvglLkDFD-UGR2zU5M
+# 设备ip地址
+VITE_APP_DEVICE_IP = '139.196.74.78:1883'
diff --git a/.env.jiangwu b/.env.jiangwu
index 02ebe23..ca87300 100644
--- a/.env.jiangwu
+++ b/.env.jiangwu
@@ -40,3 +40,6 @@
# 图片资源存放地址
VITE_APP_IMAGESOURCE_URL = http://192.168.253.121:9000/cloud-bucket
+
+# 设备ip地址
+VITE_APP_DEVICE_IP = '139.196.74.78:1883'
diff --git a/.env.localhost b/.env.localhost
index e3fe6b3..e49eac7 100644
--- a/.env.localhost
+++ b/.env.localhost
@@ -39,3 +39,6 @@
#天地图token 浏览器端口
VITE_APP_TDT_TOKEN = e110584a27d506da2740edca951683f4
VITE_APP_CESIUM_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJkYTZlNGNlYS01NTU1LTQ1MGEtYmNlZS0yNTE2NDk5YWM2MjEiLCJpZCI6MTc5Njk2LCJpYXQiOjE3MDA1NDcwMjV9.qcl4AH2731cfFd0-I1ZLUINPXqvglLkDFD-UGR2zU5M
+
+# 设备ip地址
+VITE_APP_DEVICE_IP = '139.196.74.78:1883'
diff --git a/.env.production b/.env.production
index 184ae38..0ff225a 100644
--- a/.env.production
+++ b/.env.production
@@ -1,13 +1,4 @@
-###
- # @Author : yuan
- # @Date : 2025-06-26 15:18:36
- # @LastEditors : yuan
- # @LastEditTime : 2025-07-01 16:34:42
- # @FilePath : \.env.production
- # @Description :
- # Copyright 2025 OBKoro1, All Rights Reserved.
- # 2025-06-26 15:18:36
-###
+
NODE_ENV = 'production'
#生产环境配置
@@ -50,3 +41,6 @@
#天地图token 浏览器端口
VITE_APP_TDT_TOKEN = e110584a27d506da2740edca951683f4
VITE_APP_CESIUM_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJkYTZlNGNlYS01NTU1LTQ1MGEtYmNlZS0yNTE2NDk5YWM2MjEiLCJpZCI6MTc5Njk2LCJpYXQiOjE3MDA1NDcwMjV9.qcl4AH2731cfFd0-I1ZLUINPXqvglLkDFD-UGR2zU5M
+
+# 设备ip地址
+VITE_APP_DEVICE_IP = '101.132.85.201:1883'
diff --git a/.env.test b/.env.test
index ebb4ef9..06a3d3c 100644
--- a/.env.test
+++ b/.env.test
@@ -36,7 +36,10 @@
#页面基础路径
# VITE_APP_BASE_COMMAND = /drone-web-manage/
+
#天地图token 浏览器端口
VITE_APP_TDT_TOKEN = e110584a27d506da2740edca951683f4
VITE_APP_CESIUM_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJkYTZlNGNlYS01NTU1LTQ1MGEtYmNlZS0yNTE2NDk5YWM2MjEiLCJpZCI6MTc5Njk2LCJpYXQiOjE3MDA1NDcwMjV9.qcl4AH2731cfFd0-I1ZLUINPXqvglLkDFD-UGR2zU5M
+# 设备ip地址
+VITE_APP_DEVICE_IP = '139.196.74.78:1883'
diff --git a/src/views/device/addDevice.vue b/src/views/device/addDevice.vue
index 88a8a89..a1c4833 100644
--- a/src/views/device/addDevice.vue
+++ b/src/views/device/addDevice.vue
@@ -231,41 +231,22 @@
methods: {
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
- 账号：drone
- 密码：123456
- 组织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 = `
- host: tcp://101.132.85.201:1883
- 账号：drone
+ const ipAddress = import.meta.env.VITE_APP_DEVICE_IP
+ let params = `
+ host: tcp://${ipAddress}
+ 账号：drone
密码：drone@123
- 组织id：${row.bing_id}
- 设备码：${row.bind_code}
- 机场名称：${row.workspace_name}
+ 组织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("复制失败")
- })
- }
+ $Clipboard({
+ text: params,
+ }).then(() => {
+ this.$message.success("复制成功")
+ }).catch(() => {
+ this.$message.error("复制失败")
+ })
},
init () {
this.onLoad(this.page)
@@ -443,4 +424,4 @@
border-color: #409eff;
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3