From 59569559a1d90d7a4340e5474346353fb823a0c1 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期五, 15 十一月 2024 17:01:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/Home/Index.vue | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue
index aa64a85..822f800 100644
--- a/src/views/Home/Index.vue
+++ b/src/views/Home/Index.vue
@@ -5,9 +5,9 @@
<el-skeleton :loading="loading" animated>
<div id="app" v-for="(item, index) in appList" :key="`dynamics-${index}`">
<div class="card" @click="gotoApp(item)">
- <img :src="item.icon" style="width: 100px; height: 100px" />
+ <img :src="item.icon" style="width: 100px; height: 100px"/>
<div>
- {{item.appName}}
+ {{ item.appName }}
</div>
</div>
</div>
@@ -19,12 +19,11 @@
import * as AppApi from '@/api/system/app'
import {Apps} from "@/views/Home/types";
import {CACHE_KEY, useCache} from "@/hooks/web/useCache";
-import * as authUtil from "@/utils/auth";
-defineOptions({ name: 'Home' })
+defineOptions({name: 'Home'})
-const { wsCache } = useCache()
+const {wsCache} = useCache()
const loading = ref(true)
@@ -35,7 +34,7 @@
appList = Object.assign(appList, data)
}
-const getAppMenuList = async (id) => {
+const getAppMenuList = async (id, appCode) => {
const data = await AppApi.getAppMenuList(id)
let userInfo = wsCache.get(CACHE_KEY.USER)
userInfo.menus = data
@@ -55,32 +54,38 @@
// 进入应用
const gotoApp = async (item) => {
+ let path = window.location.pathname
+ let appName = path.split("/")[0]
+ console.log(appName)
let id = item.id
let type = item.type
- if(type === 0) {
- getAppMenuList(id)
+ let appCode = item.appCode
+ if (type === 0) {
+ await getAppMenuList(id, appCode)
} else {
const data = await AppApi.getAppMenuList(id)
let userInfo = wsCache.get(CACHE_KEY.USER)
userInfo.menus = data
wsCache.set(CACHE_KEY.USER, userInfo)
wsCache.set(CACHE_KEY.ROLE_ROUTERS, data)
- // await OAuth2Login(formData.value)
- // window.open(item.appDomain + '/login?appid=' + item.id + "&username=" + authUtil.getLoginForm().username, '_blank')
window.open(item.appDomain + '/index', '_blank')
+ // window.open('/plat/shasteel', '_blank')
+ // window.location.href = '/plat/shasteel'
+ // window.location.href = `/plat/shasteel?key=energy&url=http://localhost:9000&energy=/energy/demo`
}
}
</script>
<style lang="scss" scoped>
-#app{
+#app {
width: 300px;
height: 200px;
display: inline-block;
background: transparent;
}
-.card{
+
+.card {
border: thin dashed gainsboro;
width: 150px;
height: 120px;
--
Gitblit v1.9.3