Merge branch 'master' of http://h.gemho.cn:7099/18963165066/ziboyingji

public/datav/detail/static/js/public-detail.js

@@ -244,9 +244,9 @@ var menuObj = {
             model: 'ecosystem',
             url: '/datav/detail/video-monitor.html'
         },{
-            name: '水土流失',
+            name: '水质监测',
             model: 'ecosystem',
-            url: '/datav/detail/shuitu-monitor.html'
+            url: '/datav/detail/shuizhi-monitor.html'
         },{
             name: '土壤监测',
             model: 'ecosystem',

public/datav/natural.html

@@ -754,12 +754,12 @@
 <!-- cookie -->
 <script src="js/js.cookie.js"></script>
 <script>
-    const host = location.protocol + '//' + (location.hostname === '192.168.3.226' ? '192.168.3.37' : '192.168.13.200') + ':8013';
+    const host = location.protocol + '//' + (location.hostname === '192.168.3.180' ? '192.168.3.37' : '192.168.13.200') + ':8013';
 
-	// 小黄
-	//const host = location.protocol + '//' + (location.hostname === '192.168.3.226' ? '192.168.2.200' : '192.168.13.200') + ':8013';
+// 小黄
+//const host = location.protocol + '//' + (location.hostname === '192.168.3.180' ? '192.168.2.200' : '192.168.13.200') + ':8013';
 
-	const selfHost = location.hostname === '192.168.3.226' ? 'http://192.168.3.226:8057' : location.protocol + '//' + window.location.host;
+const selfHost = location.hostname === '192.168.3.180' ? 'http://192.168.3.180:8057' : location.protocol + '//' + window.location.host;
 
     const token = Cookies.get('ELADMIN-TOEKN');
     axios = axios.create({

public/datav/watersource.html

@@ -863,12 +863,12 @@
 <script src="js/highcharts.js"></script>
 
 <script>
-    const host = location.protocol + '//' + (location.hostname === '192.168.3.226' ? '192.168.3.37' : '192.168.13.200') + ':8013';
+    const host = location.protocol + '//' + (location.hostname === '192.168.3.180' ? '192.168.3.37' : '192.168.13.200') + ':8013';
 
 	// 小黄
-	//const host = location.protocol + '//' + (location.hostname === '192.168.3.226' ? '192.168.2.200' : '192.168.13.200') + ':8013';
+	//const host = location.protocol + '//' + (location.hostname === '192.168.3.180' ? '192.168.2.200' : '192.168.13.200') + ':8013';
 
-	const selfHost = location.hostname === '192.168.3.226' ? 'http://192.168.3.226:8057' : location.protocol + '//' + window.location.host;
+	const selfHost = location.hostname === '192.168.3.180' ? 'http://192.168.3.180:8057' : location.protocol + '//' + window.location.host;
 
     const token = Cookies.get('ELADMIN-TOEKN');
     axios = axios.create({

src/views/home4Index.vue

@@ -132,6 +132,7 @@ export default {
         store.dispatch('needLoadMenus')
         this.$router.push({ path: "/1/edoc" });
       }else if (type === "生态环境") {
+        location.href = host + "/datav/env.html";
         // this.$router.push({ path: "home4Center" });
         // this.$router.push({ path: "/user/center" });
       }