From 788186e4dbdc5bc0d78e5006f605e02a468060b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=AE=8F=E6=9D=B0?= <1943105267@qq.com>
Date: Fri, 20 Sep 2024 14:20:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E7=BD=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development         | 3 ++-
 .env.production          | 8 ++++++--
 public/index.html        | 5 +++--
 src/components/grids.vue | 6 +++---
 src/views/car.vue        | 3 ++-
 src/views/carInfo.vue    | 3 ++-
 vue.config.js            | 9 ++++++++-
 7 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/.env.development b/.env.development
index fa254a7..642f552 100644
--- a/.env.development
+++ b/.env.development
@@ -6,9 +6,10 @@ ENV = 'development'
 
 # 云坤地图/开发环境
 # VUE_APP_BASE_API = 'http://192.168.0.91/gps-web/api'
-# VUE_APP_BASE_API = 'http://39.101.188.84:9066'
+# VUE_APP_BASE_API = 'http://39.101.188.84:9066' "https://www.jichuanglanhai.com:88/3dtiles/yunkun/tileset.json"
 VUE_APP_BASE_API = ''
 VUE_APP_BASE_API2 = '/map'
+VUE_APP_BASE_API3='/3dtiles'
 VUE_APP_BASE_API_YUNKUN = 'http://192.168.0.91/gps-web/api'
 
 # 路由懒加载
diff --git a/.env.production b/.env.production
index 78489f3..630deb3 100644
--- a/.env.production
+++ b/.env.production
@@ -4,7 +4,11 @@ VUE_APP_TITLE = 云坤地图
 # 生产环境配置
 ENV = 'production'
 
-# 云坤地图/生产环境
-VUE_APP_BASE_API = 'http://192.168.0.77:9066'
+# 自己写的接口
+VUE_APP_BASE_API = 'http://192.168.0.77/api'
+# 离线底图
 VUE_APP_BASE_API2 = 'http://192.168.0.77/map'
+# 3D白膜
+VUE_APP_BASE_API3='http://192.168.0.77/3dtiles'
+# 押运公司接口
 VUE_APP_BASE_API_YUNKUN = 'http://192.168.0.91/gps-web/api'
diff --git a/public/index.html b/public/index.html
index a7e3b62..0bb5a3a 100644
--- a/public/index.html
+++ b/public/index.html
@@ -20,12 +20,13 @@
 
     <!--引入mars3d库lib-->
     <link href="./lib/mars3d/mars3d.css" rel="stylesheet" type="text/css" />
+    <script src="./lib/mars3d/mars3d-dev.js" type="text/javascript"></script>
 
-    <% if (process.env.NODE_ENV === 'production' ) { %>
+    <!-- <% if (process.env.NODE_ENV === 'production' ) { %>
     <script src="./lib/mars3d/mars3d.js" type="text/javascript"></script>
     <% } else {%>
     <script src="./lib/mars3d/mars3d-dev.js" type="text/javascript"></script>
-    <% } %>
+    <% } %> -->
 
     <!-- 插件 -->
     <!-- <script
diff --git a/src/components/grids.vue b/src/components/grids.vue
index 42c81c9..5e64792 100644
--- a/src/components/grids.vue
+++ b/src/components/grids.vue
@@ -207,7 +207,7 @@ export default {
               return;
             }
             if (msg.cmd == "tmn_open") {
-              console.log(2);
+              // console.log(2);
               //  alert("�յ��ն���Ƶ����");
               return;
             }
@@ -222,7 +222,7 @@ export default {
               // console.log(4);
               return;
             }
-            console.log(JSON.stringfiy(msg));
+            // console.log(JSON.stringfiy(msg));
           },
         },
         { enableStashBuffer: false, fixAudioTimestampGap: false }
@@ -233,7 +233,7 @@ export default {
       } else {
         video = document.getElementById(`video${id}`);
       }
-      console.log(video);
+      // console.log(video);
       this.video_player[id].attachMediaElement(video);
       this.video_player[id].on(flvjs.Events.MEDIA_INFO, function () {
         //�յ���Ƶ����ʼ����
diff --git a/src/views/car.vue b/src/views/car.vue
index 99c1d3b..4271183 100644
--- a/src/views/car.vue
+++ b/src/views/car.vue
@@ -130,6 +130,7 @@ export default {
           // },
         ],
       },
+      baimoUrl: process.env.VUE_APP_BASE_API3 + "/yunkun/tileset.json",
       show: false,
       showVideo: true,
       show3D: false,
@@ -202,7 +203,7 @@ export default {
         if (!this.mapLayer.tiles3dLayer) {
           this.mapLayer.tiles3dLayer = new mars3d.layer.TilesetLayer({
             name: "姑苏区建筑物",
-            url: "https://www.jichuanglanhai.com:88/3dtiles/yunkun/tileset.json",
+            url: this.baimoUrl,
             maximumScreenSpaceError: 16,
             maximumMemoryUsage: 1024 / 2,
             dynamicScreenSpaceError: false,
diff --git a/src/views/carInfo.vue b/src/views/carInfo.vue
index 1793bc3..4195d01 100644
--- a/src/views/carInfo.vue
+++ b/src/views/carInfo.vue
@@ -82,6 +82,7 @@ export default {
       },
       Line: [],
       carUrl: basePathUrl + "static/qiche.gltf",
+      baimoUrl: process.env.VUE_APP_BASE_API3 + "/yunkun/tileset.json",
       timer: null,
     };
   },
@@ -139,7 +140,7 @@ export default {
         if (!this.mapLayer.tiles3dLayer) {
           this.mapLayer.tiles3dLayer = new mars3d.layer.TilesetLayer({
             name: "姑苏区建筑物",
-            url: "https://www.jichuanglanhai.com:88/3dtiles/yunkun/tileset.json",
+            url: this.baimoUrl,
             maximumScreenSpaceError: 16,
             maximumMemoryUsage: 1024 / 2,
             dynamicScreenSpaceError: false,
diff --git a/vue.config.js b/vue.config.js
index 6a05b51..0c3b5df 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -33,7 +33,14 @@ module.exports = {
     host: "0.0.0.0",
     port: port,
     open: true,
+    // http://192.168.0.77/3dtiles/yunkun/tileset.json
     proxy: {
+      "/3dtiles": {
+        target: `http://192.168.0.77/3dtiles`,
+        pathRewrite: {
+          "^/3dtiles": "",
+        },
+      },
       "/map": {
         target: `http://192.168.0.77/map`,
         pathRewrite: {
@@ -42,7 +49,7 @@ module.exports = {
       },
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.0.77:9066`,
+        target: `http://192.168.0.77/api`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",