Skip to content

Z
ZiBoYingJI
Commit a2fc9bb9 authored by xinzhedeai's avatar xinzhedeai
Browse files
Options

amap key更换

parent a321d892
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 16 deletions
.env.production
View file @ a2fc9bb9
...@@ -4,14 +4,14 @@ ENV = 'production' ...@@ -4,14 +4,14 @@ ENV = 'production'
# 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
# 如果接口是 http 形式， wss 需要改为 ws # 如果接口是 http 形式， wss 需要改为 ws
# VUE_APP_BASE_API = 'http://218.56.105.134:8057' # VUE_APP_BASE_API = 'http://192.168.13.200:8057'
VUE_APP_BASE_API = 'http://218.56.105.134:8057' VUE_APP_BASE_API = 'http://218.56.105.134:8057'
# ------------------------
# VUE_APP_LOCAL_API = 'http://218.56.105.134:8013' # VUE_APP_LOCAL_API = 'http://192.168.13.200:8013'
VUE_APP_LOCAL_API = 'http://218.56.105.134:8013' VUE_APP_LOCAL_API = 'http://218.56.105.134:8013'
......
public/datav/env.html
View file @ a2fc9bb9
...@@ -734,12 +734,16 @@ ...@@ -734,12 +734,16 @@
<!-- cookie --> <!-- cookie -->
<script src="js/js.cookie.js"></script> <script src="js/js.cookie.js"></script>
<script> <script>
<<<<<<< Updated upstream
const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.3.37' : '218.56.105.134') + ':8013'; const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.3.37' : '218.56.105.134') + ':8013';
=======
const host = location.protocol + '//' + (location.hostname === '192.168.2.11' ? '192.168.2.37' : '192.168.13.200') + ':8013';
>>>>>>> Stashed changes
// 小黄 // 小黄
//const host = location.protocol + '//' + (location.hostname === '192.168.3.180' ? '192.168.2.200' : '218.56.105.134') + ':8013'; //const host = location.protocol + '//' + (location.hostname === '192.168.3.180' ? '192.168.2.200' : '218.56.105.134') + ':8013';
const selfHost = location.hostname === '192.168.3.38' ? 'http://192.168.3.38:8057' : location.protocol + '//' + window.location.host; const selfHost = location.hostname === '192.168.2.11' ? 'http://192.168.2.11:8057' : location.protocol + '//' + window.location.host;
const token = Cookies.get('ELADMIN-TOEKN'); const token = Cookies.get('ELADMIN-TOEKN');
axios = axios.create({ axios = axios.create({
......
public/datav/index.html
View file @ a2fc9bb9
...@@ -875,7 +875,6 @@ ...@@ -875,7 +875,6 @@
</div> </div>
</div> </div>
</body> </body>
<script src="/static/js/qf_web_ui.min.js"></script> <script src="/static/js/qf_web_ui.min.js"></script>
<!-- 引入echarts --> <!-- 引入echarts -->
<script src="js/echarts.min.js"></script> <script src="js/echarts.min.js"></script>
...@@ -892,12 +891,19 @@ ...@@ -892,12 +891,19 @@
<!-- cookie --> <!-- cookie -->
<script src="js/js.cookie.js"></script> <script src="js/js.cookie.js"></script>
<script> <script>
<<<<<<< Updated upstream
const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.3.37' : '218.56.105.134') + ':8013'; const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.3.37' : '218.56.105.134') + ':8013';
// 小黄 // 小黄
//const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.2.200' : '218.56.105.134') + ':8013'; //const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.2.200' : '218.56.105.134') + ':8013';
=======
const host = location.protocol + '//' + (location.hostname === '192.168.2.11' ? '192.168.2.37' : '192.168.13.200') + ':8013';
// 小黄
//const host = location.protocol + '//' + (location.hostname === '192.168.2.11' ? '192.168.2.200' : '192.168.13.200') + ':8013';
>>>>>>> Stashed changes
const selfHost = location.hostname === '192.168.3.38' ? 'http://192.168.3.38:8057' : location.protocol + '//' + window.location.host; const selfHost = location.hostname === '192.168.2.11' ? 'http://192.168.2.11:8057' : location.protocol + '//' + window.location.host;
const token = Cookies.get('ELADMIN-TOEKN'); const token = Cookies.get('ELADMIN-TOEKN');
axios = axios.create({ axios = axios.create({
......
public/datav/js/maps-MouseTool.js
View file @ a2fc9bb9
This source diff could not be displayed because it is too large. You can view the blob instead.
public/datav/js/maps.js
View file @ a2fc9bb9
This source diff could not be displayed because it is too large. You can view the blob instead.
public/datav/natural.html
View file @ a2fc9bb9
...@@ -755,13 +755,21 @@ ...@@ -755,13 +755,21 @@
<script src="js/js.cookie.js"></script> <script src="js/js.cookie.js"></script>
<script> <script>
// 小黄 // 小黄
<<<<<<< Updated upstream
//const host = location.protocol + '//' + (location.hostname === '192.168.3.180' ? '192.168.2.200' : '218.56.105.134') + ':8013'; //const host = location.protocol + '//' + (location.hostname === '192.168.3.180' ? '192.168.2.200' : '218.56.105.134') + ':8013';
const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.3.37' : '218.56.105.134') + ':8013'; const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.3.37' : '218.56.105.134') + ':8013';
// 小黄 // 小黄
//const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.2.200' : '218.56.105.134') + ':8013'; //const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.2.200' : '218.56.105.134') + ':8013';
=======
//const host = location.protocol + '//' + (location.hostname === '192.168.3.180' ? '192.168.2.200' : '192.168.13.200') + ':8013';
const host = location.protocol + '//' + (location.hostname === '192.168.2.11' ? '192.168.2.37' : '192.168.13.200') + ':8013';
const selfHost = location.hostname === '192.168.3.38' ? 'http://192.168.3.38:8057' : location.protocol + '//' + window.location.host; // 小黄
//const host = location.protocol + '//' + (location.hostname === '192.168.2.11' ? '192.168.2.200' : '192.168.13.200') + ':8013';
>>>>>>> Stashed changes
const selfHost = location.hostname === '192.168.2.11' ? 'http://192.168.2.11:8057' : location.protocol + '//' + window.location.host;
const token = Cookies.get('ELADMIN-TOEKN'); const token = Cookies.get('ELADMIN-TOEKN');
axios = axios.create({ axios = axios.create({
......
public/datav/open-air.html
View file @ a2fc9bb9
...@@ -345,9 +345,13 @@ ...@@ -345,9 +345,13 @@
} }
); );
<<<<<<< Updated upstream
const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.3.37' : '218.56.105.134') + ':8013'; const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.3.37' : '218.56.105.134') + ':8013';
=======
const host = location.protocol + '//' + (location.hostname === '192.168.2.11' ? '192.168.2.37' : '192.168.13.200') + ':8013';
>>>>>>> Stashed changes
const selfHost = location.hostname === '192.168.3.38' ? 'http://192.168.3.38:8057' : location.protocol + '//' + window.location.host; const selfHost = location.hostname === '192.168.2.11' ? 'http://192.168.2.11:8057' : location.protocol + '//' + window.location.host;
// 请求 token 用 // 请求 token 用
......
public/datav/tailings.html
View file @ a2fc9bb9
...@@ -421,9 +421,13 @@ ...@@ -421,9 +421,13 @@
//const host = location.protocol + '//' + window.location.host; //const host = location.protocol + '//' + window.location.host;
<<<<<<< Updated upstream
const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.3.37' : '218.56.105.134') + ':8013'; const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.3.37' : '218.56.105.134') + ':8013';
=======
const host = location.protocol + '//' + (location.hostname === '192.168.2.11' ? '192.168.2.37' : '192.168.13.200') + ':8013';
>>>>>>> Stashed changes
const selfHost = 'http://192.168.3.38:8057'; const selfHost = 'http://192.168.2.11:8057';
......
public/datav/watersource.html
View file @ a2fc9bb9
...@@ -863,12 +863,19 @@ ...@@ -863,12 +863,19 @@
<script src="js/highcharts.js"></script> <script src="js/highcharts.js"></script>
<script> <script>
<<<<<<< Updated upstream
const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.3.37' : '218.56.105.134') + ':8013'; const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.3.37' : '218.56.105.134') + ':8013';
// 小黄 // 小黄
//const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.2.200' : '218.56.105.134') + ':8013'; //const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.2.200' : '218.56.105.134') + ':8013';
=======
const host = location.protocol + '//' + (location.hostname === '192.168.2.11' ? '192.168.2.37' : '192.168.13.200') + ':8013';
const selfHost = location.hostname === '192.168.3.38' ? 'http://192.168.3.38:8057' : location.protocol + '//' + window.location.host; // 小黄
//const host = location.protocol + '//' + (location.hostname === '192.168.2.11' ? '192.168.2.200' : '192.168.13.200') + ':8013';
>>>>>>> Stashed changes
const selfHost = location.hostname === '192.168.2.11' ? 'http://192.168.2.11:8057' : location.protocol + '//' + window.location.host;
const token = Cookies.get('ELADMIN-TOEKN'); const token = Cookies.get('ELADMIN-TOEKN');
axios = axios.create({ axios = axios.create({
......
public/index.html
View file @ a2fc9bb9
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<script type="text/javascript" src="./static/js/config.js"></script> <script type="text/javascript" src="./static/js/config.js"></script>
<script type="text/javascript"> <script type="text/javascript">
window._AMapSecurityConfig = { window._AMapSecurityConfig = {
securityJsCode: '063051f26bc0d70690b78bccfcab2236' securityJsCode: '43b719b484e2691a32a7c4fc2b3814a3'
} }
</script> </script>
<div id="app"></div> <div id="app"></div>
......
src/components/AMap/AMapSearchPoint.vue
View file @ a2fc9bb9
...@@ -92,7 +92,7 @@ export default { ...@@ -92,7 +92,7 @@ export default {
}, },
initMap() { initMap() {
AMapLoader.load({ AMapLoader.load({
key: 'a0efee399e638b35211705625d786e83', key: '031fffe3bf7ba63fd7ed383da7e61702',
version: '2.0', version: '2.0',
plugins: [] plugins: []
}).then((AMap) => { }).then((AMap) => {
......
src/components/AMap/AMapSearchPointAdd.vue
View file @ a2fc9bb9
...@@ -92,7 +92,7 @@ export default { ...@@ -92,7 +92,7 @@ export default {
}, },
initMap() { initMap() {
AMapLoader.load({ AMapLoader.load({
key: 'a0efee399e638b35211705625d786e83', key: '031fffe3bf7ba63fd7ed383da7e61702',
version: '2.0', version: '2.0',
plugins: [] plugins: []
}).then((AMap) => { }).then((AMap) => {
......
src/views/home4Enterprise.vue
View file @ a2fc9bb9
...@@ -47,7 +47,7 @@ export default { ...@@ -47,7 +47,7 @@ export default {
methods: { methods: {
initMap() { initMap() {
AMapLoader.load({ AMapLoader.load({
key: 'a0efee399e638b35211705625d786e83', key: '031fffe3bf7ba63fd7ed383da7e61702',
version: '2.0', version: '2.0',
plugins: [] plugins: []
}).then((AMap) => { }).then((AMap) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment