From 80daffe10b945b99deebb6e1c77fa20f77978cdb Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Wed, 9 Oct 2024 09:52:08 +0800
Subject: [PATCH] update

---
 src/layout/components/Sidebar/Logo.vue | 18 +++++++-----------
 src/views/big/screen/index.vue         | 21 ++++++++++++++++++++-
 src/views/system/user/authRole.vue     |  2 +-
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 0428363..ba809a6 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -1,16 +1,13 @@
 <template>
-  <div class="sidebar-logo-container" :class="{ 'collapse': collapse }"
-    :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
+  <div class="sidebar-logo-container" :class="{ 'collapse': collapse }" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <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> -->
+        <!-- <img v-if="logo" :src="logo" class="sidebar-logo" /> -->
+        <h1  class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }}</h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 class="sidebar-title"
-          :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{
-      title }}</h1>
+        <!-- <img v-if="logo" :src="logo" class="sidebar-logo" /> -->
+        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }}</h1>
       </router-link>
     </transition>
   </div>
@@ -18,7 +15,6 @@
 
 <script setup>
 import variables from '@/assets/styles/variables.module.scss'
-import logo from '@/assets/logo/goat.png'
 import useSettingsStore from '@/store/modules/settings'
 
 defineProps({
@@ -55,10 +51,10 @@ const sideTheme = computed(() => settingsStore.sideTheme);
   & .sidebar-logo-link {
     height: 100%;
     width: 100%;
-    background-color: #fff;
 
     & .sidebar-logo {
-      width: 80%;
+      width: 32px;
+      height: 32px;
       vertical-align: middle;
       margin-right: 12px;
     }
diff --git a/src/views/big/screen/index.vue b/src/views/big/screen/index.vue
index 3669345..89c2958 100644
--- a/src/views/big/screen/index.vue
+++ b/src/views/big/screen/index.vue
@@ -273,10 +273,29 @@ function handleSelectionChange(selection) {
   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) => {
-  window.open(row.url + '?hash=' + row.hash);
+  window.open(appendQuery(row.url,'hash',row.hash));
 }
 
 /**修改大屏发布状态 */
diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue
index 0b5c14b..e7f63de 100644
--- a/src/views/system/user/authRole.vue
+++ b/src/views/system/user/authRole.vue
@@ -77,7 +77,7 @@ function getRowKey(row) {
 };
 /** 关闭按钮 */
 function close() {
-  const obj = { path: "/system/user" };
+  const obj = { path: "/org/user" };
   proxy.$tab.closeOpenPage(obj);
 };
 /** 提交按钮 */