hanzhengzheng/Goats-Cloud-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
hzz 2024-10-09 09:52:08 +08:00
parent aa7caccffd
commit 80daffe10b
3 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/layout/components/Sidebar/Logo.vue
View File

@ -1,16 +1,13 @@
<template> <template>
<div class="sidebar-logo-container" :class="{ 'collapse': collapse }" <div class="sidebar-logo-container" :class="{ 'collapse': collapse }" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
:style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
<transition name="sidebarLogoFade"> <transition name="sidebarLogoFade">
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/"> <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
<img v-if="logo" :src="logo" class="sidebar-logo" /> <!-- <img v-if="logo" :src="logo" class="sidebar-logo" /> -->
<!-- <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }}</h1> --> <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }}</h1>
</router-link> </router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/"> <router-link v-else key="expand" class="sidebar-logo-link" to="/">
<img v-if="logo" :src="logo" class="sidebar-logo" /> <!-- <img v-if="logo" :src="logo" class="sidebar-logo" /> -->
<h1 class="sidebar-title" <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }}</h1>
:style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{
title }}</h1>
</router-link> </router-link>
</transition> </transition>
</div> </div>
@ -18,7 +15,6 @@
<script setup> <script setup>
import variables from '@/assets/styles/variables.module.scss' import variables from '@/assets/styles/variables.module.scss'
import logo from '@/assets/logo/goat.png'
import useSettingsStore from '@/store/modules/settings' import useSettingsStore from '@/store/modules/settings'
defineProps({ defineProps({
@ -55,10 +51,10 @@ const sideTheme = computed(() => settingsStore.sideTheme);
& .sidebar-logo-link { & .sidebar-logo-link {
height: 100%; height: 100%;
width: 100%; width: 100%;
background-color: #fff;
& .sidebar-logo { & .sidebar-logo {
width: 80%; width: 32px;
height: 32px;
vertical-align: middle; vertical-align: middle;
margin-right: 12px; margin-right: 12px;
} }

21
src/views/big/screen/index.vue
View File

@ -273,10 +273,29 @@ function handleSelectionChange(selection) {
multiple.value = !selection.length; multiple.value = !selection.length;
} }
function param(obj) {
return Object.keys(obj)
.map(key => encodeURIComponent(key) + '=' + encodeURIComponent(obj[key]))
.join('&');
}
const appendQuery = (url, key, value) => {
var options = key;
if (typeof options == 'string') {
options = {};
options[key] = value;
}
options = param(options);
if (url.includes('?')) {
url += '&' + options
} else {
url += '?' + options
}
return url;
}
/**前往大屏 */ /**前往大屏 */
const toScreen = (row) => { const toScreen = (row) => {
window.open(row.url + '?hash=' + row.hash); window.open(appendQuery(row.url,'hash',row.hash));
} }
/**修改大屏发布状态 */ /**修改大屏发布状态 */

2
src/views/system/user/authRole.vue
View File

@ -77,7 +77,7 @@ function getRowKey(row) {
}; };
/** 关闭按钮 */ /** 关闭按钮 */
function close() { function close() {
const obj = { path: "/system/user" }; const obj = { path: "/org/user" };
proxy.$tab.closeOpenPage(obj); proxy.$tab.closeOpenPage(obj);
}; };
/** 提交按钮 */ /** 提交按钮 */