From 4469cbb5d6bfb997667178943753e5c460c58086 Mon Sep 17 00:00:00 2001
From: zq <136432190602163.com>
Date: Mon, 14 Apr 2025 15:00:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=B7=E6=B1=82=E5=A4=B4?=
 =?UTF-8?q?=EF=BC=8C=E4=BE=A7=E8=BE=B9=E7=9B=AE=E5=BD=95=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SetLeftMenu.vue | 46 ++++++++++++++++++++++++++++--------------
 src/utils/request.js           |  6 ++++++
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/src/components/SetLeftMenu.vue b/src/components/SetLeftMenu.vue
index 893f1d6..a612baf 100644
--- a/src/components/SetLeftMenu.vue
+++ b/src/components/SetLeftMenu.vue
@@ -3,22 +3,22 @@
     <ul>
       <li v-for="(item, index) in menuList" :key="item.path">
         <div :class="[$route.path == item.path ? 'active' : '', 'flex', $route.path == item.path ? curIndex = index : '']"
-          @click="gotoPath(item.path)">
+          @click="gotoPath(item.path,index)">
           <img v-if="$route.path == item.path" :src="item.imgActive" alt="">
           <img v-else :src="item.img" alt="">
           {{ item.name }}
         </div>
-        <p :class="[$route.path != item.path ? 'not-point' : '', 'flex', activeFloor == item1.desc ? 'curActive' : '']"
-          v-for="(item1) in item.list" @click="setActiveCur(item1.desc)" :key="item1.name">{{ item1.name }}</p>
-
+        <p :class="['flex', activeFloor == item1.desc ? 'curActive' : '']"
+          v-for="(item1) in item.list" @click="setActiveCur(item1.desc,item)" :key="item1.name">{{ item1.name }}</p>
       </li>
     </ul>
   </aside>
 </template>
 
 <script>
-// import {setHighActive} from '@/utils/common';
-
+// :class="[$route.path != item.path ? 'not-point' : '', 'flex', activeFloor == item1.desc ? 'curActive' : '']"
+import { mapState } from 'vuex';
+import store from '../store';
 export default {
   name: 'Sidebar',
   props: {
@@ -32,8 +32,6 @@ export default {
     // curIndex:{
     //   type:Number
     // }
-
-
   },
   data() {
     return {
@@ -129,7 +127,7 @@ export default {
     }
   },
   mounted() {
-    console.log(this.curIndex,'this.curIndex');
+    // console.log(this.curIndex,'this.curIndex');
     this.activeFloor = this.menuList[this.curIndex]['list'][0]['desc'];
     this.calculateFloorOffsets();
     this.$nextTick(() => {
@@ -140,6 +138,9 @@ export default {
   created() {
     // console.log(this.$parent.$refs.scrollContainer,'this.$refs.sc--rollContainer--');
   },
+  computed: {
+        ...mapState(['pageTitle']) // 从Vuex映射showSidebar状态到组件的计算属性中
+    },
   beforeDestroy() {
     this.$parent.$refs.scrollContainer.removeEventListener('scroll', this.handleScroll);
   },
@@ -168,19 +169,34 @@ export default {
       });
       this.activeFloor = activeFloor; // 更新数据以触发视图更新
     },
-    setActiveCur(dom) {
-      this.activeFloor = dom;
-      this.setHighActive(dom)
+    setActiveCur(dom,item) {
+      if(this.$route.path != item.path){
+        this.$router.push(item.path)
+        store.commit('SET_PAGETITLE', item.name);
+      }
+      setTimeout(()=>{
+        this.activeFloor = dom;
+        this.setHighActive(dom)
+      },500)
     },
-    gotoPath(path) {
-      this.$router.push(path)
+    gotoPath(path,index) {
+      if(this.$route.path != path){
+        this.curIndex = index
+        this.scrollLock = false;
+        this.handleScroll()
+        // 重置页面滚动高度
+        const dom = document.getElementById('main-content')
+        dom.scrollTop = 0
+        this.$router.push(path)
+      }
     },
     activeArea(type) {
       console.log(type);
     },
     setHighActive(dom) {
-      this.scrollLock = true
+      this.scrollLock = true;
       const ele = document.getElementById(dom)
+      if(!ele)return
       ele.classList.add('ceshi')
       ele.scrollIntoView({ behavior: 'smooth', block: 'start' })
       setTimeout(() => {
diff --git a/src/utils/request.js b/src/utils/request.js
index f8a1eb3..bfb42b9 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -74,6 +74,9 @@ const request = (method, url, data = {}, config = {}) => {
       method: "get",
       url,
       params: data,
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded'
+      },
       ...config,
     });
   } else {
@@ -82,6 +85,9 @@ const request = (method, url, data = {}, config = {}) => {
       method: lowerCaseMethod,
       url,
       data,
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded'
+      },
       ...config,
     });
   }