From f90a37d5f8c2eabf3e00f64d7b7e42aa781888b8 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 24 Sep 2021 20:31:22 +0800
Subject: [PATCH] 冲突
---
vue.config.js | 4 ++--
src/components/map/main.vue | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/components/map/main.vue b/src/components/map/main.vue
index 2e69e7e..a991e36 100644
--- a/src/components/map/main.vue
+++ b/src/components/map/main.vue
@@ -246,7 +246,7 @@
this[type].getSource().addFeature(iconFeature)
- this.flyTo(Number(item.LGTD), Number(item.LTTD), 18)
+ this.flyTo(Number(item.LGTD), Number(item.LTTD), 13)
},
addLines (arr) {
@@ -277,7 +277,7 @@
this.peopleLineAddlayer.getSource().addFeature(feature_LineString)
- this.flyTo(arr[Math.ceil(arr.length / 2)][0], arr[Math.ceil(arr.length / 2)][1], 15)
+ this.flyTo(arr[Math.ceil(arr.length / 2)][0], arr[Math.ceil(arr.length / 2)][1], 13)
},
addEntity (LGTD, LTTD) {
diff --git a/vue.config.js b/vue.config.js
index acf2d4c..843154f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -30,8 +30,8 @@
// target: 'http://192.168.0.109:1',
//远程演示服务地址,可用于直接启动项目
// target: 'http://2h3f861221.wicp.vip:58646',
- // target: 'http://s16s652780.51mypc.cn/api',
// target: 'http://192.168.0.114:82',
+ // target: 'http://192.168.0.108:82',
target: 'http://192.168.0.110:82',
// target: 'http://s16s652780.51mypc.cn/api',
// 服务器使用
@@ -43,4 +43,4 @@
}
}
}
-};
\ No newline at end of file
+};
--
Gitblit v1.9.3