Browse Source

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

# Conflicts:
#	src/components/v-fastmenu.vue
彭宇 2 years ago
parent
commit
2783f77a7a
1 changed files with 10 additions and 7 deletions
  1. 10 7
      src/components/v-fastmenu.vue

+ 10 - 7
src/components/v-fastmenu.vue

@@ -22,7 +22,7 @@
 						<el-button type="primary" size="small" @click="resetPwd">修改密码</el-button>
 						<el-button type="warning" size="small" @click="logout">退出登录</el-button>
 					</div>
-					<a href="http://117.78.49.164:15001/index58" style="border-top: 1px solid #334780;"><i class="el-icon-s-home"></i>返回首页</a>
+					<a href="http://10.6.52.1:15001/newpage" style="border-top: 1px solid #334780;"><i class="el-icon-s-home"></i>返回首页</a>
 <!--					<a href="#"><i class="el-icon-monitor"></i>管理系统</a>-->
 				</div>
 				<div slot="reference" style="text-align: center; width:4rem;height:3rem;">
@@ -39,7 +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() {
@@ -71,11 +70,15 @@ import { selectConfigKey } from "@/api/system/config";
           this.isResetPwd=true
         });
       },
-      backToMainPage(){
-        selectConfigKey('backToMainPage').then(res => {
-          window.location.href = res.data;
-        })
-      },
+			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/newpage"
+				window.location.href = toUrl
+			},
       async logout() {
         this.$confirm('确定注销并退出系统吗?', '提示', {
           confirmButtonText: '确定',