Merge branch 'yx' of http://61.161.152.110:10101/r/electronic-map into sl

# Conflicts:
#	public/static/config/modeConfig.js
#	src/views/WindSite/components/gax6.vue

public/static/config/modeConfig.js

@@ -8,15 +8,20 @@ let baseURL = null;
 let websocketUrl = null;
 
 if (localTest) {
+<<<<<<< HEAD
   baseURL = "http://10.155.32.4:8082/" // 联机调试 - 石林
   // baseURL = "http://10.155.32.33:9001/" // 联机调试 - 谢生杰
+=======
+    baseURL = "http://192.168.10.12:8082/" // 联机调试 - 石林
+        // baseURL = "http://10.155.32.33:9001/" // 联机调试 - 谢生杰
+>>>>>>> fea4cda6da55b7933232f0f801dc1dc6c3669a33
 } else {
-  baseURL = "http://10.155.32.4:8082/" // 正式环境
+    baseURL = "http://10.155.32.4:8082/" // 正式环境
 }
 
 websocketUrl = (baseURL.replace(/http:\/\/|https:\/\//g, "")) + "gyee-websocket";
 
 window.__MODE__ = {
-  baseURL,
-  websocketUrl
+    baseURL,
+    websocketUrl
 };