From 9259c2235e31708f954a3578bde3c6a7ab9753e8 Mon Sep 17 00:00:00 2001 From: houzhongjian <houzhongyi@126.com> Date: 星期一, 30 十二月 2024 15:51:40 +0800 Subject: [PATCH] 1、工作流相关组件更新 2、偶尔出现退出登录时路由报错的bug导致无法回到登录页面 3、全局配置文件修改,移除VITE_UPLOAD_URL配置等 --- src/views/Home/Index.vue | 138 ++++++++++++++++++++++++++++++++------------- 1 files changed, 97 insertions(+), 41 deletions(-) diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue index ea052b1..1558788 100644 --- a/src/views/Home/Index.vue +++ b/src/views/Home/Index.vue @@ -1,13 +1,20 @@ <template> - <div> - <h1>IAILAB 平台主页</h1> + <div id="title"> + <span>工业互联网平台</span> </div> <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" /> + <div id="app"> + <div class="card" v-for="(item, index) in appList" :key="`dynamics-${index}`"> <div> - {{item.appName}} + <img class="card-left" :src="item.icon"/> + <div class="card-right"> + <div class="app-title"> + {{ item.appName }} + </div> + <div class="goto-app" @click="gotoApp(item)"> + <div>进入应用</div> + </div> + </div> </div> </div> </div> @@ -18,13 +25,13 @@ 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"; +import {CACHE_KEY, useCache, useSessionCache} from "@/hooks/web/useCache"; -defineOptions({ name: 'Home' }) +defineOptions({name: 'Home'}) -const { wsCache } = useCache() +const {wsCache} = useCache() +const {wsSessionCache} = useSessionCache() const loading = ref(true) @@ -35,18 +42,13 @@ appList = Object.assign(appList, data) } -const getAppMenuList = async (id) => { +const getAppMenuList = async (id, appCode) => { const data = await AppApi.getAppMenuList(id) - console.log(data) - let userInfo = wsCache.get(CACHE_KEY.USER) - let routers = wsCache.get(CACHE_KEY.ROLE_ROUTERS) - console.log(userInfo) - console.log(routers) - userInfo.menus = data + // userInfo.menus = data wsCache.set(CACHE_KEY.USER, userInfo) - wsCache.set(CACHE_KEY.ROLE_ROUTERS, data) - window.location.href = '/plat/index' + wsSessionCache.set(CACHE_KEY.ROLE_ROUTERS, data) + window.location.href = import.meta.env.VITE_BASE_PATH + 'index' } const getAllApi = async () => { @@ -60,37 +62,91 @@ // 进入应用 const gotoApp = async (item) => { + let path = window.location.pathname + let appName = path.split("/")[0] let id = item.id let type = item.type - console.log(type) - if(type === 0) { - getAppMenuList(id) + let appCode = item.appCode + if (type === 0) { + await getAppMenuList(id, appCode) } else { - // await OAuth2Login(formData.value) - window.open(item.appDomain + '/login?appid=' + item.id + "&username=" + authUtil.getLoginForm().username, '_blank') + // const data = await AppApi.getAppMenuList(id) + // let userInfo = wsCache.get(CACHE_KEY.USER) + // userInfo.menus = data + // wsCache.set(CACHE_KEY.USER, userInfo) + // wsSessionCache.set(CACHE_KEY.ROLE_ROUTERS, data) + localStorage.setItem(appCode, id) + 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{ - width: 300px; - height: 200px; - display: inline-block; - background: transparent; +#title { + width: 280px; + height: 51px; + margin: 30px auto; + font-family: Microsoft YaHei UI, Microsoft YaHei UI; + font-weight: bold; + font-size: 40px; + color: #282F3D; } -.card{ - border: thin dashed gainsboro; - width: 150px; - height: 120px; - padding: 30px; - text-align: center; - justify-content: center; - font-size: 15px; - font-weight: bolder; - color: blue; - background: aliceblue; - border-radius: 10px; + +#app { + margin: 0 96px; + width: 100%; +} + +.card { + width: 354px; + height: 200px; + margin: 0 24px 24px 0; + background: linear-gradient(180deg, #E9F0FA 0%, #FFFFFF 100%); + border-radius: 12px 12px 12px 12px; + border: 2px solid; + border-image: linear-gradient(180deg, rgba(255, 255, 255, 1), rgba(255, 255, 255, 1)) 2 2; + display: inline-block; +} + +.card-left { + height: 100px; + width: 100px; + float: left; + margin: 50px 30px; +} + +.card-right { + float: right; + margin: 61px 10px; +} + +.app-title { + width: 162px; + font-family: Microsoft YaHei, Microsoft YaHei; + font-weight: bold; + font-size: 24px; + color: #282F3D; +} + +.goto-app { + width: 96px; + height: 35px; + margin-top: 5px; + background: #3A99FD; + border-radius: 80px 80px 80px 80px; + cursor: pointer; +} + +.goto-app > div { + padding: 6px; + margin-left: 5px; + font-family: Microsoft YaHei UI, Microsoft YaHei UI; + font-weight: 400; + font-size: 18px; + color: #FFFFFF; } </style> -- Gitblit v1.9.3