From 5a2b6e23d459d3416dee98b417dad82a6659337f Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Thu, 14 Nov 2024 09:08:50 +0800
Subject: [PATCH 1/3] 1

---
 src/view/guide.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/view/guide.vue b/src/view/guide.vue
index 39ec9bf..05f1ad2 100644
--- a/src/view/guide.vue
+++ b/src/view/guide.vue
@@ -137,8 +137,6 @@ const getCookie = (cname) => {
 };
 // 登录
 const login = () => {
-  console.log(111111111);
-
   let backurl = tools.data.get("backUrl");
   dd.getAuthCode()
     .then((res) => {
@@ -155,8 +153,6 @@ const login = () => {
               tools.data.set("type", 1);
               getMenu();
               if (backurl) {
-                console.log(222222);
-
                 window.location.href = backurl;
                 tools.data.remove("backUrl");
               }
@@ -217,7 +213,6 @@ const login = () => {
         window.addEventListener("mousemove", resetTimer);
         window.addEventListener("keydown", resetTimer);
         if (backurl) {
-          console.log(33333333333);
           window.location.href = backurl;
           tools.data.remove("backUrl");
         }

From 57020922eeeb5f14f74efd7c8fd0beeaaea066ed Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Fri, 15 Nov 2024 09:55:17 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9C=AA=E6=93=8D=E4=BD=9C=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E7=A7=BB=E5=88=B0app.vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue        | 43 +++++++++++++++++++++++++++++++++-
 src/view/guide.vue | 58 +++++++++++++++++++++++-----------------------
 2 files changed, 71 insertions(+), 30 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 2586915..54c79d5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,3 +1,44 @@
-<template> 
+<template>
   <router-view />
 </template>
+<script setup>
+import { ref, onMounted, onUnmounted, reactive } from "vue";
+import { useRouter, useRoute } from "vue-router";
+import tools from "@/utils/tools";
+const router = useRouter();
+const inactivityTimer = ref(null);
+const resetTimer = () => {
+  console.log("执行");
+  let typeE = tools.data.get("type");
+  if (typeE == "2") {
+    clearTimeout(inactivityTimer.value);
+    inactivityTimer.value = setTimeout(() => {
+      // 执行注销操作或者跳转到登录页面的代码
+      // ElMessage.error("请重新登录!");
+      // 清空cook
+      ElMessage.error("长时间未操作,请重新登录");
+      window.removeEventListener("mousemove", resetTimer);
+      window.removeEventListener("keydown", resetTimer);
+      const cookies = document.cookie.split(";");
+      for (let i = 0; i < cookies.length; i++) {
+        const cookie = cookies[i];
+        const eqPos = cookie.indexOf("=");
+        const name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie;
+        document.cookie =
+          name + "=;expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/;";
+      }
+      let backurl = window.location.href;
+      tools.data.set("backUrl", backurl);
+      router.replace({
+        path: "/guide",
+      });
+      window.location.href =
+        "http://220.191.238.50:996/api/login?returnURL=" + window.location.href;
+    }, 30 * 60 * 1000); // 30分钟
+  }
+};
+onMounted(() => {
+  window.addEventListener("mousemove", resetTimer);
+  window.addEventListener("keydown", resetTimer);
+});
+</script>
diff --git a/src/view/guide.vue b/src/view/guide.vue
index 05f1ad2..7c548a5 100644
--- a/src/view/guide.vue
+++ b/src/view/guide.vue
@@ -210,8 +210,8 @@ const login = () => {
         tools.data.set("token", token);
         tools.data.set("type", 2);
         getMenu();
-        window.addEventListener("mousemove", resetTimer);
-        window.addEventListener("keydown", resetTimer);
+        // window.addEventListener("mousemove", resetTimer);
+        // window.addEventListener("keydown", resetTimer);
         if (backurl) {
           window.location.href = backurl;
           tools.data.remove("backUrl");
@@ -248,33 +248,33 @@ const reset_font = () => {
     "scale(" + width / 1920 + "," + height / 1080 + ")";
 };
 //未操作，退出登录
-const inactivityTimer = ref(null);
-const resetTimer = () => {
-  clearTimeout(inactivityTimer.value);
-  inactivityTimer.value = setTimeout(() => {
-    // 执行注销操作或者跳转到登录页面的代码
-    // ElMessage.error("请重新登录!");
-    // 清空cook
-    ElMessage.error("长时间未操作,请重新登录");
-    window.removeEventListener("mousemove", resetTimer);
-    window.removeEventListener("keydown", resetTimer);
-    const cookies = document.cookie.split(";");
-    for (let i = 0; i < cookies.length; i++) {
-      const cookie = cookies[i];
-      const eqPos = cookie.indexOf("=");
-      const name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie;
-      document.cookie =
-        name + "=;expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/;";
-    }
-    let backurl = window.location.href;
-    tools.data.set("backUrl", backurl);
-    router.replace({
-      path: "/guide",
-    });
-    window.location.href =
-      "http://220.191.238.50:996/api/login?returnURL=" + window.location.href;
-  }, 30 * 60 * 1000); // 30分钟
-};
+// const inactivityTimer = ref(null);
+// const resetTimer = () => {
+//   clearTimeout(inactivityTimer.value);
+//   inactivityTimer.value = setTimeout(() => {
+//     // 执行注销操作或者跳转到登录页面的代码
+//     // ElMessage.error("请重新登录!");
+//     // 清空cook
+//     ElMessage.error("长时间未操作,请重新登录");
+//     window.removeEventListener("mousemove", resetTimer);
+//     window.removeEventListener("keydown", resetTimer);
+//     const cookies = document.cookie.split(";");
+//     for (let i = 0; i < cookies.length; i++) {
+//       const cookie = cookies[i];
+//       const eqPos = cookie.indexOf("=");
+//       const name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie;
+//       document.cookie =
+//         name + "=;expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/;";
+//     }
+//     let backurl = window.location.href;
+//     tools.data.set("backUrl", backurl);
+//     router.replace({
+//       path: "/guide",
+//     });
+//     window.location.href =
+//       "http://220.191.238.50:996/api/login?returnURL=" + window.location.href;
+//   }, 30 * 60 * 1000); // 30分钟
+// };
 
 onMounted(() => {
   login();

From a09eedca310a7cf0a36429f37424bb79922f0c2b Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Fri, 15 Nov 2024 10:06:22 +0800
Subject: [PATCH 3/3] gx

---
 src/App.vue        | 7 ++++---
 src/view/guide.vue | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 54c79d5..f7ef837 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,10 +5,11 @@
 import { ref, onMounted, onUnmounted, reactive } from "vue";
 import { useRouter, useRoute } from "vue-router";
 import tools from "@/utils/tools";
+import { ElMessage } from "element-plus";
 const router = useRouter();
 const inactivityTimer = ref(null);
 const resetTimer = () => {
-  console.log("执行");
+  // console.log("执行");
   let typeE = tools.data.get("type");
   if (typeE == "2") {
     clearTimeout(inactivityTimer.value);
@@ -32,8 +33,8 @@ const resetTimer = () => {
       router.replace({
         path: "/guide",
       });
-      window.location.href =
-        "http://220.191.238.50:996/api/login?returnURL=" + window.location.href;
+      // window.location.href =
+      //   "http://220.191.238.50:996/api/login?returnURL=" + window.location.href;
     }, 30 * 60 * 1000); // 30分钟
   }
 };
diff --git a/src/view/guide.vue b/src/view/guide.vue
index 7c548a5..a2cf020 100644
--- a/src/view/guide.vue
+++ b/src/view/guide.vue
@@ -79,7 +79,6 @@ import png5 from "@/assets/guide/Dp/5.png";
 import png6 from "@/assets/guide/Dp/6.png";
 import png7 from "@/assets/guide/Dp/7.png";
 import png8 from "@/assets/guide/Dp/8.png";
-import { ElMessage } from "element-plus";
 import tools from "@/utils/tools";
 import CryptoJS from "crypto-js";
 const router = useRouter();