Merge remote-tracking branch 'origin/visu_village' into visu_village

# Conflicts:
#	src/components/v-fastmenu.vue

src/components/v-fastmenu.vue

@@ -39,8 +39,6 @@
 <script>
 import resetPwd from "../views/system/user/profile/resetPwd";
 import { getUserProfile } from "@/api/system/user";
-import { selectConfigKey } from "@/api/system/config";
-
 	export default {
     components: {resetPwd },
 		data() {
@@ -72,9 +70,14 @@ import { selectConfigKey } from "@/api/system/config";
     },
 		methods: {
       backToMainPage(){
-        selectConfigKey('backToMainPage').then(res => {
-          window.location.href = res.data;
-        })
+        let href = window.location.href
+        let protacal = href.substr(0,href.indexOf("://")+3)
+        let mo = href.lastIndexOf(":") > 6  ? href.lastIndexOf(":") : href.lastIndexOf("/")
+        let ip = href.substr(href.indexOf("://")+3,mo);
+        let url =href.substr(0,mo)
+        // let toUrl = url +":15001/newpage"
+        let toUrl = "http://10.6.52.1:15001/newpage"
+        window.location.href = toUrl
       },
       getUser(){
         getUserProfile().then(response => {
@@ -91,15 +94,6 @@ import { selectConfigKey } from "@/api/system/config";
           this.isResetPwd=true
         });
       },
-			backToMainPage() {
-				let href = window.location.href
-				let protacal = href.substr(0, href.indexOf("://") + 3)
-				let mo = href.lastIndexOf(":") > 6 ? href.lastIndexOf(":") : href.lastIndexOf("/")
-				let ip = href.substr(href.indexOf("://") + 3, mo);
-				let url = href.substr(0, mo)
-				let toUrl = url + ":15001/index58"
-				window.location.href = toUrl
-			},
       async logout() {
         this.$confirm('确定注销并退出系统吗？', '提示', {
           confirmButtonText: '确定',