From b9bd29a1a81f6f7de479e3cc3fdfe3d85fc660bf Mon Sep 17 00:00:00 2001
From: he wei <858544502@qq.com>
Date: 星期三, 23 四月 2025 13:35:06 +0800
Subject: [PATCH] UA 整理提交

---
 src/layout/index.vue |   43 ++++++++++++++++++++++++++-----------------
 1 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/layout/index.vue b/src/layout/index.vue
index 0cda2fe..b0a58f6 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -10,11 +10,12 @@
       <div :class="{ 'fixed-header': fixedHeader }">
         <navbar />
         <tags-view v-if="needTagsView" />
+        <!-- <TestTagsView /> -->
       </div>
       <app-main />
       <!-- <right-panel v-if="showSettings">
-        <settings />
-      </right-panel> -->
+          <settings />
+        </right-panel> -->
     </div>
   </div>
   <el-drawer
@@ -25,16 +26,18 @@
     :with-header="false"
     :before-close="handleClose"
   >
-    <sidebar class="sidebar-container" />
+    <Sidebar class="sidebar-container" />
   </el-drawer>
 </template>
 
 <script setup name="LayoutIndex">
 // import RightPanel from "@/components/RightPanel";
-import { AppMain, Navbar, Settings, TagsView, Sidebar } from "./components";
-import useAppStore from "@/store/app";
-import useSettingsStore from "@/store/settings";
-import useUserStore from "@/store/user";
+import { AppMain, Navbar, Sidebar, TagsView } from "./components/index.js";
+// import TestTagsView from "./components/TagsView/test.vue";
+import { useAppStore } from "@/store/app";
+import { useSettingsStore } from "@/store/settings";
+import { useUserStore } from "@/store/user";
+import { useUKeyStore } from "@/store/ukey";
 import { defineComponent } from "vue";
 import changeTheme from "@/utils/changeTheme.js";
 import { throttle } from "@/utils/throttle.js";
@@ -46,12 +49,18 @@
 const route = useRoute();
 const router = useRouter();
 
+console.log('TagsView', TagsView, '=============');
+
+
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();
 const userStore = useUserStore();
+const ukeyStore = useUKeyStore();
+
+const { isIn } = storeToRefs(ukeyStore);
 const { sidebar, device } = storeToRefs(appStore);
-const { showSettings, theme, needTagsView: tagsView, fixedHeader, secondMenuPopup } = storeToRefs(settingsStore);
-const { name, sessionid } = storeToRefs(userStore);
+const { showSettings, theme,  tagsView: needTagsView, fixedHeader, secondMenuPopup } = storeToRefs(settingsStore);
+const { uname, sessionid } = storeToRefs(userStore);
 const { logout } = userStore;
 const { closeSidebar, toggleSidebar } = appStore;
 
@@ -101,19 +110,19 @@
 }
 
 onMounted(() => {
-	document.addEventListener("click", () => throttleConect(sessionid.value, name.value));
-	document.addEventListener("mousemove", () => throttleConect(sessionid.value, name.value));
-	document.addEventListener("keydown", () => throttleConect(sessionid.value, name.value));
+	document.addEventListener("click", () => throttleConect(sessionid.value, uname.value));
+	document.addEventListener("mousemove", () => throttleConect(sessionid.value, uname.value));
+	document.addEventListener("keydown", () => throttleConect(sessionid.value, uname.value));
 });
 onBeforeUnmount(() => {
-	document.removeEventListener("click", () => throttleConect(sessionid.value, name.value));
-	document.removeEventListener("mousemove", () => throttleConect(sessionid.value, name.value));
-	document.removeEventListener("keydown", () => throttleConect(sessionid.value, name.value));
+	document.removeEventListener("click", () => throttleConect(sessionid.value, uname.value));
+	document.removeEventListener("mousemove", () => throttleConect(sessionid.value, uname.value));
+	document.removeEventListener("keydown", () => throttleConect(sessionid.value, uname.value));
 });
 </script>
 
-<style lang="less" scoped>
-@use "@/styles/mixin.less";
+<style lang="scss" scoped>
+@use "@/styles/mixin.scss";
 
 .app-wrapper {
   // @include clearfix;

--
Gitblit v1.9.1