From 727a377afaef94694886bfbcedcdecc24931b917 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 3 Jul 2023 15:18:59 +0800
Subject: [PATCH 01/32] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                  | 2 +-
 src/components/project/OrgClass.vue          | 2 +-
 src/components/project/OrgClassCheck.vue     | 2 +-
 src/components/project/ProjectManagerNew.vue | 2 +-
 src/components/student/CommonStudent.vue     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 2db7e647..68aca5ca 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -86,7 +86,7 @@ async function initDict(key) {
 
 function getUserPermission(){
   request(USER_PERMISSION,{permissionType:'PAGE'}).then(res=>{
-    store.commit("SET_PERMISSION", res.result.flatMap(t=>t?.permissionPageList.map(s=>s.url)));
+    store.commit("SET_PERMISSION", res.data?.map(s=>s.url));
   })
 }
 
diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue
index 66835508..f687e4a2 100644
--- a/src/components/project/OrgClass.vue
+++ b/src/components/project/OrgClass.vue
@@ -36,7 +36,7 @@
 </template>
 <script setup>
 import { defineEmits, defineProps, ref, watch } from "vue";
-import {boeRequest, useBoeApi, useRequest} from "@/api/request";
+import {boeRequest, useRequest} from "@/api/request";
 import {ORG_CHILD_LIST, ORG_LIST} from "@/api/apis";
 
 const props = defineProps({
diff --git a/src/components/project/OrgClassCheck.vue b/src/components/project/OrgClassCheck.vue
index 8dc801be..6b92f5e4 100644
--- a/src/components/project/OrgClassCheck.vue
+++ b/src/components/project/OrgClassCheck.vue
@@ -37,7 +37,7 @@
 </template>
 <script setup>
 import {defineEmits, defineProps, ref, watch, watchEffect} from "vue";
-import {boeRequest, useBoeApi, useRequest} from "@/api/request";
+import {boeRequest, useRequest} from "@/api/request";
 import { ORG_CHILD_LIST, ORG_LIST } from "@/api/ThirdApi";
 
 const props = defineProps({
diff --git a/src/components/project/ProjectManagerNew.vue b/src/components/project/ProjectManagerNew.vue
index 5c1374f4..f0fb9816 100644
--- a/src/components/project/ProjectManagerNew.vue
+++ b/src/components/project/ProjectManagerNew.vue
@@ -28,7 +28,7 @@
 </template>
 <script setup>
 import {computed, defineEmits, defineProps, onMounted, ref, watch} from "vue";
-import {useBoeUserListPage, usePage} from "@/api/request";
+import {usePage} from "@/api/request";
 import {USER_LIST} from "@/api/apis";
 
 const props = defineProps({
diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index b88421ab..462a4d58 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -296,7 +296,7 @@
 <script setup>
 import {message} from "ant-design-vue";
 import {computed, defineEmits, defineProps, ref, watch} from "vue";
-import {boeRequest, useBoeApi, useBoeApiPage, useBoeApiUserInfoPage, useBoeApiAuditPage, usePage, useNewRowsPageNoInit, request, useRequest} from "@/api/request";
+import { useNewRowsPageNoInit, request, useRequest} from "@/api/request";
 import {
   saveStu,
 } from "@/api/index1";

From be90a8b34e88e78241d7944420b6e384827dbd6f Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 8 Jul 2023 11:14:37 +0800
Subject: [PATCH 02/32] =?UTF-8?q?fix=20bug=20=E7=94=A8=E6=88=B7=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                              |   2 +-
 src/api/request.js                       | 147 +++++++++++++----------
 src/components/project/OrgClass.vue      |   9 +-
 src/components/project/OrgClassCheck.vue |   6 +-
 4 files changed, 94 insertions(+), 70 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 68aca5ca..6ce19a10 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -28,7 +28,7 @@ import BreadCrumb from "@/components/BreadCrumb";
 import zhCN from "ant-design-vue/es/locale/zh_CN";
 import * as api1 from "@/api/index1";
 import * as api2 from "@/api/index";
-import {boeRequest, request} from "@/api/request";
+import {request} from "@/api/request";
 import {USER_PERMISSION} from "@/api/apis";
 
 const store = useStore();
diff --git a/src/api/request.js b/src/api/request.js
index ba2def14..a41c60eb 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -79,68 +79,68 @@ export function useBoeApiPage(_url, params = {}, config = {
   };
 }
 
-export function useBoeApi(_url, params = {}, config = {
-  init: true,
-  result: res => res.result,
-}) {
+// export function useBoeApi(_url, params = {}, config = {
+//   init: true,
+//   result: res => res.result,
+// }) {
+//
+//   const state = reactive({
+//     data: [],
+//     loading: false,
+//   });
+//   watch(() => params, () => {
+//     fetch();
+//   });
+//
+//   function fetch() {
+//     state.loading = true;
+//     return boeRequest(_url, params).then(r => {
+//       state.data = config.result(r);
+//       state.loading = false;
+//     });
+//   }
+//
+//   config.init && fetch();
+//   return {
+//     ...toRefs(state),
+//     fetch,
+//   };
+// }
 
-  const state = reactive({
-    data: [],
-    loading: false,
-  });
-  watch(() => params, () => {
-    fetch();
-  });
-
-  function fetch() {
-    state.loading = true;
-    return boeRequest(_url, params).then(r => {
-      state.data = config.result(r);
-      state.loading = false;
-    });
-  }
-
-  config.init && fetch();
-  return {
-    ...toRefs(state),
-    fetch,
-  };
-}
-
-export function useBoeUserListPage(_url, params = {}, init = true) {
-
-  const state = reactive({
-    data: [],
-    loading: false,
-    total: 0,
-    totalPage: 0,
-    page: 1,
-    ...params
-  });
-
-  watch(() => params.keyword, throttle(fetch, 600));
-  watch(() => params.page, fetch);
-
-  function fetch() {
-    state.loading = true;
-    if (!params.keyword) {
-      state.loading = false;
-      return;
-    }
-    return boeRequest(_url, params).then(r => {
-      state.data = params.page === 1 ? r.result.userInfoList : [...state.data, ...r.result.userInfoList];
-      state.totalPage = r.result.totalPage;
-      state.total = r.result.totalElement;
-      state.loading = false;
-    });
-  }
-
-  init && fetch();
-  return {
-    ...toRefs(state),
-    fetch,
-  };
-}
+// export function useBoeUserListPage(_url, params = {}, init = true) {
+//
+//   const state = reactive({
+//     data: [],
+//     loading: false,
+//     total: 0,
+//     totalPage: 0,
+//     page: 1,
+//     ...params
+//   });
+//
+//   watch(() => params.keyword, throttle(fetch, 600));
+//   watch(() => params.page, fetch);
+//
+//   function fetch() {
+//     state.loading = true;
+//     if (!params.keyword) {
+//       state.loading = false;
+//       return;
+//     }
+//     return boeRequest(_url, params).then(r => {
+//       state.data = params.page === 1 ? r.result.userInfoList : [...state.data, ...r.result.userInfoList];
+//       state.totalPage = r.result.totalPage;
+//       state.total = r.result.totalElement;
+//       state.loading = false;
+//     });
+//   }
+//
+//   init && fetch();
+//   return {
+//     ...toRefs(state),
+//     fetch,
+//   };
+// }
 export function useNewRowsPageNoInit(_url, params) {
   const state = reactive({
     data: [],
@@ -318,7 +318,32 @@ export function useRequest(_url, params, init = true) {
     fetchData,
   };
 }
+export function useArrayRequest(_url, params, init = true) {
 
+  const data = ref([]);
+  const loading = ref(false);
+
+  if (isRef(params)) {
+    watch(params.value, () => {
+      fetchData();
+    });
+  }
+
+  function fetchData() {
+    loading.value = true;
+    request(_url, unref(params)).then(r => {
+      data.value = r.data;
+      loading.value = false;
+    });
+  }
+
+  init && fetchData();
+  return {
+    data,
+    loading,
+    fetchData,
+  };
+}
 export async function boeRequest(_url, params = {}) {
   const s = _url.split(" ");
   let url = s[0];
diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue
index f687e4a2..d010a9a5 100644
--- a/src/components/project/OrgClass.vue
+++ b/src/components/project/OrgClass.vue
@@ -36,7 +36,7 @@
 </template>
 <script setup>
 import { defineEmits, defineProps, ref, watch } from "vue";
-import {boeRequest, useRequest} from "@/api/request";
+import {request, useArrayRequest, useRequest} from "@/api/request";
 import {ORG_CHILD_LIST, ORG_LIST} from "@/api/apis";
 
 const props = defineProps({
@@ -50,7 +50,7 @@ const props = defineProps({
 const emit = defineEmits({});
 const stuTreeExpandedKeys = ref([]);
 const labelValue = ref({ value: props.value, label: props.name });
-const { data: options, loading: orgLoading } = useRequest(
+const { data: options, loading: orgLoading } = useArrayRequest(
   ORG_LIST,
   { keyword: "" },
 );
@@ -66,9 +66,9 @@ watch(props, () => {
 });
 
 function onLoadData(treeNode) {
-  return boeRequest(ORG_CHILD_LIST, { keyword: "", orgId: treeNode.id }).then(
+  return useArrayRequest(ORG_CHILD_LIST, { keyword: "", orgId: treeNode.id }).then(
     (r) => {
-      treeNode.dataRef.treeChildList = r.result.directChildList;
+      treeNode.dataRef.treeChildList = r.data;
       options.value = [...options.value];
     }
   );
@@ -83,7 +83,6 @@ function change(
     },
   }
 ) {
-  console.log("label2222", label, namePath, value);
   emit("update:name", label);
   emit("update:fullName", namePath);
   emit("update:value", value);
diff --git a/src/components/project/OrgClassCheck.vue b/src/components/project/OrgClassCheck.vue
index 6b92f5e4..ffccb1e0 100644
--- a/src/components/project/OrgClassCheck.vue
+++ b/src/components/project/OrgClassCheck.vue
@@ -37,7 +37,7 @@
 </template>
 <script setup>
 import {defineEmits, defineProps, ref, watch, watchEffect} from "vue";
-import {boeRequest, useRequest} from "@/api/request";
+import {request, useRequest} from "@/api/request";
 import { ORG_CHILD_LIST, ORG_LIST } from "@/api/ThirdApi";
 
 const props = defineProps({
@@ -80,9 +80,9 @@ watch(props, () => {
 });
 
 function onLoadData(treeNode) {
-  return boeRequest(ORG_CHILD_LIST, { keyword: "", orgId: treeNode.id }).then(
+  return request(ORG_CHILD_LIST, { keyword: "", orgId: treeNode.id }).then(
     (r) => {
-      treeNode.dataRef.treeChildList = r.result.directChildList;
+      treeNode.dataRef.treeChildList = r.data;
       options.value = [...options.value];
     }
   );

From 692eabb474d7f4d1f106d1ec443cc6c5ce2ee79f Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 10 Jul 2023 09:56:24 +0800
Subject: [PATCH 03/32] =?UTF-8?q?fix=20bug=20=E7=94=A8=E6=88=B7=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/NavLeft.vue | 40 +++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue
index f5c88b87..10b2d9c0 100644
--- a/src/components/NavLeft.vue
+++ b/src/components/NavLeft.vue
@@ -174,26 +174,26 @@
           <router-link to="/researchmanage">评估管理</router-link>
         </a-menu-item>
 
-        <a-sub-menu key="sub6">
-          <template #icon>
-            <div class="imgBox">
-              <img
-                  style="width: 22px; height: 22px"
-                  src="../assets/images/navleft/review.png"
-              />
-            </div>
-          </template>
-          <template #title>系统管理</template>
-          <a-menu-item key="sub6-1">
-            <span
-                :class="{
-                circleActive: selectedKeys[0] === 'sub6-1',
-                circle: selectedKeys[0]!=='sub6-1',
-              }"
-            ></span>
-            <router-link to="/dictmanage">字典管理</router-link>
-          </a-menu-item>
-        </a-sub-menu>
+<!--        <a-sub-menu key="sub6">-->
+<!--          <template #icon>-->
+<!--            <div class="imgBox">-->
+<!--              <img-->
+<!--                  style="width: 22px; height: 22px"-->
+<!--                  src="../assets/images/navleft/review.png"-->
+<!--              />-->
+<!--            </div>-->
+<!--          </template>-->
+<!--          <template #title>系统管理</template>-->
+<!--          <a-menu-item key="sub6-1">-->
+<!--            <span-->
+<!--                :class="{-->
+<!--                circleActive: selectedKeys[0] === 'sub6-1',-->
+<!--                circle: selectedKeys[0]!=='sub6-1',-->
+<!--              }"-->
+<!--            ></span>-->
+<!--            <router-link to="/dictmanage">字典管理</router-link>-->
+<!--          </a-menu-item>-->
+<!--        </a-sub-menu>-->
 
         <a-menu-item key="sub5" v-if="checkMenu('systemManage')">
           <div class="imgBox">

From 9d2760c3cf569d1dbaed211c81175e70bc396af0 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 13 Jul 2023 14:44:50 +0800
Subject: [PATCH 04/32] =?UTF-8?q?fix=20bug=20=E7=94=A8=E6=88=B7=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue        | 24 +++++++++++++++++-------
 src/api/apis.js    |  2 ++
 src/api/request.js | 13 +++++++++++--
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 6ce19a10..6cdfd8ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -29,7 +29,7 @@ import zhCN from "ant-design-vue/es/locale/zh_CN";
 import * as api1 from "@/api/index1";
 import * as api2 from "@/api/index";
 import {request} from "@/api/request";
-import {USER_PERMISSION} from "@/api/apis";
+import {USER_PERMISSION, VALIDATE_TOKEN} from "@/api/apis";
 
 const store = useStore();
 const isLogin = ref(false);
@@ -37,7 +37,6 @@ const isLogin = ref(false);
 console.log("版本3.1.0------------");
 
 
-
 // 监听关闭浏览器
 let time1 = ref(0);
 let time2 = ref(0);
@@ -54,8 +53,7 @@ function beforeunloadHandler() {
 }
 
 function init() {
-  getUserInfo();
-  getUserPermission();
+  validateToken();
   initDict("content_type"); //内容分类
   initDict("project_level"); //项目级别
   initDict("project_sys");  //培训分类
@@ -66,6 +64,17 @@ function init() {
   initDict("band"); //band
 }
 
+async function validateToken() {
+  try{
+    await request(VALIDATE_TOKEN)
+    await getUserInfo();
+    await getUserPermission();
+  }catch (e) {
+    console.log('token失效 跳转到登录页')
+  }
+
+}
+
 function unloadHandler() {
   time2.value = new Date().getTime() - time1.value;
   if (time2.value <= 5) {
@@ -84,9 +93,9 @@ async function initDict(key) {
   store.commit("SET_DICT", {key, data: list});
 }
 
-function getUserPermission(){
-  request(USER_PERMISSION,{permissionType:'PAGE'}).then(res=>{
-    store.commit("SET_PERMISSION", res.data?.map(s=>s.url));
+async function getUserPermission() {
+  return request(USER_PERMISSION, {permissionType: 'PAGE'}).then(res => {
+    store.commit("SET_PERMISSION", res.data?.map(s => s.url));
   })
 }
 
@@ -109,6 +118,7 @@ const getDictList = (param) => api1.getDictTree({code: param,}).then((res) => re
       text-align: center !important;
     }
   }
+
   .ant-table-tbody > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td {
     background: #f6f9fd;
   }
diff --git a/src/api/apis.js b/src/api/apis.js
index 75887b62..7f1f7c7a 100644
--- a/src/api/apis.js
+++ b/src/api/apis.js
@@ -32,3 +32,5 @@ export const ORG_CHILD_LIST = "/admin/thirdApi/org/info";
 
 export const AUDIENCE_LIST = "/admin/thirdApi/audience/userAudiences";
 export const USER_PERMISSION = "/admin/thirdApi/permission/listByUser";
+export const VALIDATE_TOKEN = "/admin/thirdApi/validateToken";
+export const REFRESH_TOKEN = "/admin/thirdApi/refreshToken";
diff --git a/src/api/request.js b/src/api/request.js
index a41c60eb..9798c01c 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -1,8 +1,9 @@
 import {isRef, reactive, ref, toRefs, unref, watch, watchEffect} from "vue";
-import {getCookieForName, throttle} from "@/api/method";
+import {getCookieForName, setCookie, throttle} from "@/api/method";
 import JSONBigInt from "json-bigint";
 import router from "@/router";
 import {message} from "ant-design-vue";
+import {REFRESH_TOKEN, VALIDATE_TOKEN} from "@/api/apis";
 
 const JSONBigIntStr = JSONBigInt({ storeAsString: true });
 
@@ -405,13 +406,21 @@ export async function request(_url, params) {
     if (res.code === 0 || res.code === 200) {
       return res;
     }
-    if (res.code === 1000) {
+    if (res.code === 1000 || res.code === 1002) {
       (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ?
         router.push({path: 'login', query: { returnUrl: router.currentRoute.value.fullPath }}) :
         (window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath))
       localStorage.removeItem('refreshPage')
       return Promise.reject(res);
+    }else if(res.code=== 1001){
+      request(REFRESH_TOKEN).then((res)=>{
+        if(res.code===0 || res.code === 200){
+          setCookie('token',res.data)
+          return request(_url, params)
+        }
+      })
     }
+    //刷新token
     res.show ? message.error(res.msg):message.error('系统接口数据异常，请联系管理员');
     return Promise.reject(res);
   });

From 7c35352bb62573ffcd641c507350ddbd62bc53f9 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 27 Jul 2023 18:15:04 +0800
Subject: [PATCH 05/32] fix bug checktoken

---
 src/App.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 6cdfd8ae..6026b58b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -52,8 +52,8 @@ function beforeunloadHandler() {
   time1.value = new Date().getTime();
 }
 
-function init() {
-  validateToken();
+async function init() {
+  await validateToken();
   initDict("content_type"); //内容分类
   initDict("project_level"); //项目级别
   initDict("project_sys");  //培训分类

From a5b81ac71272c8767146e5d231bd32b3ff5e07d2 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 28 Jul 2023 03:12:53 +0800
Subject: [PATCH 06/32] fix bug checktoken

---
 src/App.vue        | 12 ------------
 src/api/request.js |  1 +
 src/main.js        | 22 +++++++++++++++++++++-
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 6026b58b..d8e53f4c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -53,7 +53,6 @@ function beforeunloadHandler() {
 }
 
 async function init() {
-  await validateToken();
   initDict("content_type"); //内容分类
   initDict("project_level"); //项目级别
   initDict("project_sys");  //培训分类
@@ -64,17 +63,6 @@ async function init() {
   initDict("band"); //band
 }
 
-async function validateToken() {
-  try{
-    await request(VALIDATE_TOKEN)
-    await getUserInfo();
-    await getUserPermission();
-  }catch (e) {
-    console.log('token失效 跳转到登录页')
-  }
-
-}
-
 function unloadHandler() {
   time2.value = new Date().getTime() - time1.value;
   if (time2.value <= 5) {
diff --git a/src/api/request.js b/src/api/request.js
index 9798c01c..7380f9fa 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -413,6 +413,7 @@ export async function request(_url, params) {
       localStorage.removeItem('refreshPage')
       return Promise.reject(res);
     }else if(res.code=== 1001){
+      setCookie('token',getCookieForName('refreshToken'))
       request(REFRESH_TOKEN).then((res)=>{
         if(res.code===0 || res.code === 200){
           setCookie('token',res.data)
diff --git a/src/main.js b/src/main.js
index ae142895..ad4a39af 100644
--- a/src/main.js
+++ b/src/main.js
@@ -16,6 +16,9 @@ import 'element-plus/dist/index.css'
 import "@/assets/scss/common.scss"
 import Antd from 'ant-design-vue';
 import 'ant-design-vue/dist/antd.css';
+import {getCookieForName} from "@/api/method";
+import {request} from "@/api/request";
+import {VALIDATE_TOKEN} from "@/api/apis";
 // import axios from 'axios'
 // axios.defaults.withCredentials = true;
 // import zhCN from 'ant-design-vue/es/locale/zh_CN';
@@ -25,7 +28,24 @@ app.config.warnHandler = () => null;
 // app.use(ElementPlus, {
 // 	locale: zhCn,
 // })
+
+router.beforeEach(async (to, from, next) => {
+    if (!getCookieForName("token")) {
+        window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath)
+    }
+    //第一次进入 没有用户信息
+    if(!store.state.userInfo.userId){
+        try{
+            await request(VALIDATE_TOKEN)
+            await getUserInfo();
+            await getUserPermission();
+            next();
+        }catch (e){
+            console.log('token失效 跳转到登录页')
+        }
+    }
+})
 app.use(Antd);
 app.use(router);
 app.use(store);
-app.mount('#app');
+app.mount('#app');
\ No newline at end of file

From b1a7ab9ba98350414586b74c502063f65149a142 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 28 Jul 2023 13:37:49 +0800
Subject: [PATCH 07/32] ---fix bug

---
 src/App.vue   | 39 ---------------------------------------
 src/main.js   | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 vue.config.js |  2 +-
 3 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 6026b58b..cdaf3e0a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,7 +42,6 @@ let time1 = ref(0);
 let time2 = ref(0);
 
 onMounted(() => {
-  init()
   window.addEventListener('beforeunload', e => beforeunloadHandler(e));
   window.addEventListener('unload', e => unloadHandler(e));
 })
@@ -52,28 +51,7 @@ function beforeunloadHandler() {
   time1.value = new Date().getTime();
 }
 
-async function init() {
-  await validateToken();
-  initDict("content_type"); //内容分类
-  initDict("project_level"); //项目级别
-  initDict("project_sys");  //培训分类
-  initDict("project_pic"); //项目封面
-  initDict("router_pic"); //路径图封面
-  initDict("course_pic"); //课程封面
-  initDict("job_type"); //岗位
-  initDict("band"); //band
-}
 
-async function validateToken() {
-  try{
-    await request(VALIDATE_TOKEN)
-    await getUserInfo();
-    await getUserPermission();
-  }catch (e) {
-    console.log('token失效 跳转到登录页')
-  }
-
-}
 
 function unloadHandler() {
   time2.value = new Date().getTime() - time1.value;
@@ -83,23 +61,6 @@ function unloadHandler() {
   }
 }
 
-async function getUserInfo() {
-  const userInfo = await api2.userInfo();
-  store.commit("SET_USER", userInfo.data.data);
-}
-
-async function initDict(key) {
-  const list = await getDictList(key);
-  store.commit("SET_DICT", {key, data: list});
-}
-
-async function getUserPermission() {
-  return request(USER_PERMISSION, {permissionType: 'PAGE'}).then(res => {
-    store.commit("SET_PERMISSION", res.data?.map(s => s.url));
-  })
-}
-
-const getDictList = (param) => api1.getDictTree({code: param,}).then((res) => res.data.data);
 </script>
 <style lang="scss">
 #app {
diff --git a/src/main.js b/src/main.js
index ae142895..9cf0a314 100644
--- a/src/main.js
+++ b/src/main.js
@@ -16,6 +16,11 @@ import 'element-plus/dist/index.css'
 import "@/assets/scss/common.scss"
 import Antd from 'ant-design-vue';
 import 'ant-design-vue/dist/antd.css';
+import {request} from "@/api/request";
+import {USER_PERMISSION, VALIDATE_TOKEN} from "@/api/apis";
+import * as api2 from "@/api";
+import * as api1 from "@/api/index1";
+import {getCookieForName} from "@/api/method";
 // import axios from 'axios'
 // axios.defaults.withCredentials = true;
 // import zhCN from 'ant-design-vue/es/locale/zh_CN';
@@ -25,7 +30,50 @@ app.config.warnHandler = () => null;
 // app.use(ElementPlus, {
 // 	locale: zhCn,
 // })
+
+router.beforeEach(async (to, from, next) => {
+    if (!getCookieForName("token")) {
+        window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath)
+    }
+    //第一次进入 没有用户信息
+    if(!store.state.userInfo.userId){
+        try{
+            await request(VALIDATE_TOKEN)
+            await getUserInfo();
+            await getUserPermission();
+            init()
+            next();
+        }catch (e){
+            console.log('token失效 跳转到登录页')
+        }
+    }
+})
 app.use(Antd);
 app.use(router);
 app.use(store);
 app.mount('#app');
+async function getUserPermission() {
+    return request(USER_PERMISSION, {permissionType: 'PAGE'}).then(res => {
+        store.commit("SET_PERMISSION", res.data?.map(s => s.url));
+    })
+}
+async function getUserInfo() {
+    const userInfo = await api2.userInfo();
+    store.commit("SET_USER", userInfo.data.data);
+}
+async function initDict(key) {
+    const list = await getDictList(key);
+    store.commit("SET_DICT", {key, data: list});
+}
+const getDictList = (param) => api1.getDictTree({code: param,}).then((res) => res.data.data);
+
+async function init() {
+    initDict("content_type"); //内容分类
+    initDict("project_level"); //项目级别
+    initDict("project_sys");  //培训分类
+    initDict("project_pic"); //项目封面
+    initDict("router_pic"); //路径图封面
+    initDict("course_pic"); //课程封面
+    initDict("job_type"); //岗位
+    initDict("band"); //band
+}
\ No newline at end of file
diff --git a/vue.config.js b/vue.config.js
index 381823e6..b2cce88c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -16,7 +16,7 @@ module.exports = defineConfig({
         port: 8070,
         proxy: {
             "/manageApi": {
-                target: 'http:' + process.env.VUE_APP_PROXY_URL,
+                target: 'https:' + process.env.VUE_APP_PROXY_URL,
                 changeOrigin: true, //表示是否改变原域名
                 pathRewrite: {
                     "^/manageApi": "",

From 9fde3a1ea2263c2923914f567579c2672a8b2707 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 28 Jul 2023 13:50:06 +0800
Subject: [PATCH 08/32] ---fix bug

---
 src/api/apis.js           | 1 +
 src/components/NavTop.vue | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/api/apis.js b/src/api/apis.js
index 7f1f7c7a..096baeeb 100644
--- a/src/api/apis.js
+++ b/src/api/apis.js
@@ -34,3 +34,4 @@ export const AUDIENCE_LIST = "/admin/thirdApi/audience/userAudiences";
 export const USER_PERMISSION = "/admin/thirdApi/permission/listByUser";
 export const VALIDATE_TOKEN = "/admin/thirdApi/validateToken";
 export const REFRESH_TOKEN = "/admin/thirdApi/refreshToken";
+export const LOGOUT = "/admin/thirdApi/logOut";
diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue
index ddca470e..4f9f699e 100644
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@@ -49,6 +49,8 @@ import {computed, reactive} from "vue";
 import {studentUrl,teacherUrl} from "@/api/method";
 import router from "@/router";
 import {useStore, createStore} from "vuex";
+import {LOGOUT} from "@/api/apis";
+import {request} from "@/api/request";
 
 const store = useStore();
 
@@ -83,7 +85,8 @@ const changeRole = (value) => {
     }
   });
 };
-const logOut = () => {
+const logOut = async () => {
+  await request(LOGOUT)
   store.replaceState(createStore({state: {openpages: []}}).state);
   localStorage.clear();
   (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? router.push({path: '/login'}) : (window.location.href = window.location.protocol + process.env.VUE_APP_LOGIN_URL)

From ff2c0e4fde8bb9d141244496378699cfbb946626 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 28 Jul 2023 15:51:44 +0800
Subject: [PATCH 09/32] ---fix bug

---
 src/api/apis.js    | 1 +
 src/api/request.js | 2 +-
 src/main.js        | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/api/apis.js b/src/api/apis.js
index 096baeeb..237dc62f 100644
--- a/src/api/apis.js
+++ b/src/api/apis.js
@@ -35,3 +35,4 @@ export const USER_PERMISSION = "/admin/thirdApi/permission/listByUser";
 export const VALIDATE_TOKEN = "/admin/thirdApi/validateToken";
 export const REFRESH_TOKEN = "/admin/thirdApi/refreshToken";
 export const LOGOUT = "/admin/thirdApi/logOut";
+export const USER_INFO = "/admin/CheckUser/userInfo";
diff --git a/src/api/request.js b/src/api/request.js
index 9798c01c..56f2ac7f 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -415,7 +415,7 @@ export async function request(_url, params) {
     }else if(res.code=== 1001){
       request(REFRESH_TOKEN).then((res)=>{
         if(res.code===0 || res.code === 200){
-          setCookie('token',res.data)
+
           return request(_url, params)
         }
       })
diff --git a/src/main.js b/src/main.js
index 9cf0a314..62cdad5c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -17,8 +17,7 @@ import "@/assets/scss/common.scss"
 import Antd from 'ant-design-vue';
 import 'ant-design-vue/dist/antd.css';
 import {request} from "@/api/request";
-import {USER_PERMISSION, VALIDATE_TOKEN} from "@/api/apis";
-import * as api2 from "@/api";
+import {USER_INFO, USER_PERMISSION, VALIDATE_TOKEN} from "@/api/apis";
 import * as api1 from "@/api/index1";
 import {getCookieForName} from "@/api/method";
 // import axios from 'axios'
@@ -34,12 +33,13 @@ app.config.warnHandler = () => null;
 router.beforeEach(async (to, from, next) => {
     if (!getCookieForName("token")) {
         window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath)
+        return
     }
     //第一次进入 没有用户信息
     if(!store.state.userInfo.userId){
         try{
             await request(VALIDATE_TOKEN)
-            await getUserInfo();
+            await getUserInfo()
             await getUserPermission();
             init()
             next();
@@ -58,7 +58,7 @@ async function getUserPermission() {
     })
 }
 async function getUserInfo() {
-    const userInfo = await api2.userInfo();
+    const userInfo = await request(USER_INFO);
     store.commit("SET_USER", userInfo.data.data);
 }
 async function initDict(key) {

From 18cea294c0815528910ac9c1831961d110d1a5b2 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 28 Jul 2023 16:40:00 +0800
Subject: [PATCH 10/32] ---fix bug

---
 src/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.js b/src/main.js
index 62cdad5c..f70e0a28 100644
--- a/src/main.js
+++ b/src/main.js
@@ -59,7 +59,7 @@ async function getUserPermission() {
 }
 async function getUserInfo() {
     const userInfo = await request(USER_INFO);
-    store.commit("SET_USER", userInfo.data.data);
+    store.commit("SET_USER", userInfo.data);
 }
 async function initDict(key) {
     const list = await getDictList(key);

From 0f5929f34eae034a8111894234f535dfa2755183 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 28 Jul 2023 16:59:59 +0800
Subject: [PATCH 11/32] ---fix bug

---
 src/api/request.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/request.js b/src/api/request.js
index 56f2ac7f..5bc97080 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -413,7 +413,7 @@ export async function request(_url, params) {
       localStorage.removeItem('refreshPage')
       return Promise.reject(res);
     }else if(res.code=== 1001){
-      request(REFRESH_TOKEN).then((res)=>{
+      return request(REFRESH_TOKEN).then((res)=>{
         if(res.code===0 || res.code === 200){
 
           return request(_url, params)

From e8612a32cf194d9e919e86c804631c4e244fe1b6 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 28 Jul 2023 17:40:01 +0800
Subject: [PATCH 12/32] ---fix bug

---
 src/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.js b/src/main.js
index f70e0a28..75cac4a1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -42,11 +42,11 @@ router.beforeEach(async (to, from, next) => {
             await getUserInfo()
             await getUserPermission();
             init()
-            next();
         }catch (e){
             console.log('token失效 跳转到登录页')
         }
     }
+    next();
 })
 app.use(Antd);
 app.use(router);

From 8ffff197fa907de68a3459ec56a2dc4d6da84bc8 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 28 Jul 2023 17:53:57 +0800
Subject: [PATCH 13/32] ---fix bug

---
 src/components/NavTop.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue
index 4f9f699e..1ab59fcb 100644
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@@ -88,7 +88,9 @@ const changeRole = (value) => {
 const logOut = async () => {
   await request(LOGOUT)
   store.replaceState(createStore({state: {openpages: []}}).state);
+  document.cookie=''
   localStorage.clear();
+  sessionStorage.clear();
   (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? router.push({path: '/login'}) : (window.location.href = window.location.protocol + process.env.VUE_APP_LOGIN_URL)
 };
 </script>

From 7aab20177b1f84c6721de91417c8c343cdc770d1 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 28 Jul 2023 18:31:06 +0800
Subject: [PATCH 14/32] ---fix bug

---
 src/components/NavTop.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue
index 1ab59fcb..6d5b2e4b 100644
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@@ -88,7 +88,6 @@ const changeRole = (value) => {
 const logOut = async () => {
   await request(LOGOUT)
   store.replaceState(createStore({state: {openpages: []}}).state);
-  document.cookie=''
   localStorage.clear();
   sessionStorage.clear();
   (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? router.push({path: '/login'}) : (window.location.href = window.location.protocol + process.env.VUE_APP_LOGIN_URL)

From f6e77b740c24a2899c91ec5fa1ace2c2596e7210 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 28 Jul 2023 18:41:55 +0800
Subject: [PATCH 15/32] ---fix bug

---
 src/api/ThirdApi.js       | 3 +++
 src/api/apis.js           | 1 -
 src/api/request.js        | 1 -
 src/components/NavTop.vue | 6 +++---
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/api/ThirdApi.js b/src/api/ThirdApi.js
index 0bc2c9bc..981e0b1c 100644
--- a/src/api/ThirdApi.js
+++ b/src/api/ThirdApi.js
@@ -12,4 +12,7 @@ export const CASE_PAGE = "/systemapi/xboe/m/boe/cases/pagelist post formData";
 export const EXAM_PAPER_PAGE = "/systemapi/xboe/m/exam/paper/querylist post formData";
 export const TEST_PAGE = "/api/b1/system/quiz/quiz-list post formData";
 export const ONLINE_PAGE = "/systemapi/xboe/m/course/manage/pagelist post formData";
+
+export const LOGOUT = "/userbasic/logout post";
+
 export const ONLINE_COURSE_DEL = (id, courseId) => `/systemapi/xboe/school/study/course/delete-signup?id=${id}&couserId=${courseId} post`;
\ No newline at end of file
diff --git a/src/api/apis.js b/src/api/apis.js
index 237dc62f..e7d25dd1 100644
--- a/src/api/apis.js
+++ b/src/api/apis.js
@@ -34,5 +34,4 @@ export const AUDIENCE_LIST = "/admin/thirdApi/audience/userAudiences";
 export const USER_PERMISSION = "/admin/thirdApi/permission/listByUser";
 export const VALIDATE_TOKEN = "/admin/thirdApi/validateToken";
 export const REFRESH_TOKEN = "/admin/thirdApi/refreshToken";
-export const LOGOUT = "/admin/thirdApi/logOut";
 export const USER_INFO = "/admin/CheckUser/userInfo";
diff --git a/src/api/request.js b/src/api/request.js
index 5bc97080..f99ae242 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -415,7 +415,6 @@ export async function request(_url, params) {
     }else if(res.code=== 1001){
       return request(REFRESH_TOKEN).then((res)=>{
         if(res.code===0 || res.code === 200){
-
           return request(_url, params)
         }
       })
diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue
index 6d5b2e4b..c6f27b51 100644
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@@ -49,8 +49,8 @@ import {computed, reactive} from "vue";
 import {studentUrl,teacherUrl} from "@/api/method";
 import router from "@/router";
 import {useStore, createStore} from "vuex";
-import {LOGOUT} from "@/api/apis";
-import {request} from "@/api/request";
+import {boeRequest, request} from "@/api/request";
+import {LOGOUT} from "@/api/ThirdApi";
 
 const store = useStore();
 
@@ -86,7 +86,7 @@ const changeRole = (value) => {
   });
 };
 const logOut = async () => {
-  await request(LOGOUT)
+  await boeRequest(LOGOUT,{from:'pc'})
   store.replaceState(createStore({state: {openpages: []}}).state);
   localStorage.clear();
   sessionStorage.clear();

From 5125b34664e58877a1165e14242f535a431c69c1 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 3 Aug 2023 16:52:55 +0800
Subject: [PATCH 16/32] fix bug

---
 src/api/request.js                           | 35 ++++++++++++++++++++
 src/components/project/ProjectManagerNew.vue |  5 +--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/api/request.js b/src/api/request.js
index f99ae242..302ef562 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -292,6 +292,41 @@ export function usePage(_url, params, init = true,listing = false) {
     reset,
   };
 }
+  export function useThrottlePage(_url, params = {}, init = true) {
+
+  const state = reactive({
+    data: [],
+    loading: false,
+    total: 0,
+    totalPage: 0,
+    page: 1,
+    ...params
+  });
+
+  watch(() => params.keyword, throttle(fetch, 600));
+  watch(() => params.page, fetch);
+
+  function fetch() {
+    state.loading = true;
+    if (!params.keyword) {
+      state.loading = false;
+      return;
+    }
+    return request(_url, params).then(r => {
+      state.data = params.page === 1 ? r.data.records : [...state.data, ...r.data.records];
+      state.totalPage = r.data.pages;
+      state.total = r.data.total;
+      state.loading = false;
+    });
+  }
+
+  init && fetch();
+  return {
+    ...toRefs(state),
+    fetch,
+  };
+}
+
 
 export function useRequest(_url, params, init = true) {
 
diff --git a/src/components/project/ProjectManagerNew.vue b/src/components/project/ProjectManagerNew.vue
index f0fb9816..c7c91771 100644
--- a/src/components/project/ProjectManagerNew.vue
+++ b/src/components/project/ProjectManagerNew.vue
@@ -28,7 +28,7 @@
 </template>
 <script setup>
 import {computed, defineEmits, defineProps, onMounted, ref, watch} from "vue";
-import {usePage} from "@/api/request";
+import {useThrottlePage} from "@/api/request";
 import {USER_LIST} from "@/api/apis";
 
 const props = defineProps({
@@ -58,7 +58,7 @@ const isOpen = ref(false)
 
 const memberParam = ref({keyword: '', page: 1, pageSize: 20})
 
-const {data: userList, loading} = usePage(USER_LIST, memberParam.value, false)
+const {data: userList, loading} = useThrottlePage(USER_LIST, memberParam.value, false)
 
 const options = computed(() => userList.value.filter(e => !(props.value + '').includes(e.id)).map(e => ({
   label: e.realName + e.userNo,
@@ -94,6 +94,7 @@ const searchMember = (keyword) => {
   userList.value = []
   memberParam.value.page = 1
   memberParam.value.keyword = keyword
+  console.log('searchMember', memberParam.value)
 };
 
 function blur() {

From a3a09ed70bd2acfd1375f920fa2db3d9b0325b6b Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 4 Aug 2023 11:32:47 +0800
Subject: [PATCH 17/32] fix bug

---
 src/api/apis.js                              |  2 +-
 src/api/request.js                           | 57 +++++++++++++++++++-
 src/components/project/ProjectManagerNew.vue | 10 ++--
 src/components/student/CommonStudent.vue     | 12 +----
 4 files changed, 63 insertions(+), 18 deletions(-)

diff --git a/src/api/apis.js b/src/api/apis.js
index e7d25dd1..658a6a91 100644
--- a/src/api/apis.js
+++ b/src/api/apis.js
@@ -26,7 +26,7 @@ export const ASSESSMENT_DETAIL = (assessmentId)=>`/assessment/queryAssessmentDet
 
 export const USER_LIST_PAGE = "/admin/thirdApi/user/list";
 //学员列表 没有分页数据 只能通过名称检索 速度较快
-export const USER_LIST = "/admin/thirdApi/user/searchList";
+export const USER_LIST = "/admin/thirdApi/user/list";
 export const ORG_LIST = "/admin/thirdApi/org/list";
 export const ORG_CHILD_LIST = "/admin/thirdApi/org/info";
 
diff --git a/src/api/request.js b/src/api/request.js
index 302ef562..401d5a72 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -248,6 +248,58 @@ export function useRowsPage(_url, params, init = true) {
   };
 }
 
+/**
+ * 分页只返回 total 无分页信息
+ * @param _url
+ * @param params
+ * @param init
+ * @param listing
+ */
+export function useTotalPage(_url, params, init = true,listing = false) {
+
+  const state = reactive({
+    data: [],
+    total: 1,
+    current: 1,
+    pages: 1,
+    pageNo: 1,
+    pageSize: 10,
+    loading: false
+  });
+
+  if (isRef(params) && listing) {
+    watch(params.value, () => {
+      fetch();
+    });
+  }
+
+  if (isRef(_url)) {
+    watchEffect(fetch);
+  } else {
+    init && fetch();
+  }
+
+  function reset() {
+    state.data = [];
+    state.loading = false;
+  }
+
+  function fetch() {
+    state.loading = true;
+    return request(unref(_url), unref(params)).then(r => {
+      state.data = r.data.list;
+      state.pages = r.data.total/state.pageSize || 1;
+      state.total = r.data.total;
+      state.loading = false;
+    });
+  }
+
+  return {
+    ...toRefs(state),
+    fetch,
+    reset,
+  };
+}
 export function usePage(_url, params, init = true,listing = false) {
 
   const state = reactive({
@@ -300,6 +352,7 @@ export function usePage(_url, params, init = true,listing = false) {
     total: 0,
     totalPage: 0,
     page: 1,
+    pageNo: 1,
     ...params
   });
 
@@ -313,8 +366,8 @@ export function usePage(_url, params, init = true,listing = false) {
       return;
     }
     return request(_url, params).then(r => {
-      state.data = params.page === 1 ? r.data.records : [...state.data, ...r.data.records];
-      state.totalPage = r.data.pages;
+      state.data = params.pageNo === 1 ? r.data.list : [...state.data, ...r.data.list];
+      state.totalPage = r.data.total/10 || 1;
       state.total = r.data.total;
       state.loading = false;
     });
diff --git a/src/components/project/ProjectManagerNew.vue b/src/components/project/ProjectManagerNew.vue
index c7c91771..027e2f02 100644
--- a/src/components/project/ProjectManagerNew.vue
+++ b/src/components/project/ProjectManagerNew.vue
@@ -56,7 +56,7 @@ const emit = defineEmits({})
 
 const isOpen = ref(false)
 
-const memberParam = ref({keyword: '', page: 1, pageSize: 20})
+const memberParam = ref({keyword: '', pageNo:1, pageSize: 20})
 
 const {data: userList, loading} = useThrottlePage(USER_LIST, memberParam.value, false)
 
@@ -83,7 +83,7 @@ onMounted(() => {
 
 
 const memberScroll = ({target: {scrollHeight, scrollTop, clientHeight}}) => {
-  scrollHeight === (clientHeight + scrollTop) && memberParam.value.page++
+  scrollHeight === (clientHeight + scrollTop) && memberParam.value.pageNo++
 };
 
 //搜索学员
@@ -92,7 +92,7 @@ const searchMember = (keyword) => {
   loading.value = true
   isOpen.value = true
   userList.value = []
-  memberParam.value.page = 1
+  memberParam.value.pageNo = 1
   memberParam.value.keyword = keyword
   console.log('searchMember', memberParam.value)
 };
@@ -100,12 +100,12 @@ const searchMember = (keyword) => {
 function blur() {
   isOpen.value = false
   memberParam.value.keyword = ''
-  memberParam.value.page = 1
+  memberParam.value.pageNo = 1
 }
 
 function change(e, l) {
   memberParam.value.keyword = ''
-  memberParam.value.page = 1
+  memberParam.value.pageNo = 1
   isOpen.value = false
   Array.isArray(l) && (selectOptions.value = l)
   Array.isArray(selectOptions.value) && emit('onChange', e, l, selectOptions.value.find(e => e.departId)?.departId, selectOptions.value.find(e => e.departId)?.departName, selectOptions.value.find(e => e.departId)?.orgName)
diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 462a4d58..40f1e64b 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -132,7 +132,7 @@
                   </div>
                   <div class="tableBox tabb">
                     <BaseTable ref="auditTableRef" :columns="audiColums" :url="AUDIENCE_LIST" page-key="pageNo"
-                               v-model:params="audienceName"
+                               v-model:params="audienceName" :request="useTotalPage"
                                v-model:selectedRows="auditSelectRows" v-model:selectedRowKeys="auditSelectRowKeys"
                                type="checkbox"></BaseTable>
                   </div>
@@ -296,7 +296,7 @@
 <script setup>
 import {message} from "ant-design-vue";
 import {computed, defineEmits, defineProps, ref, watch} from "vue";
-import { useNewRowsPageNoInit, request, useRequest} from "@/api/request";
+import {useNewRowsPageNoInit, request, useRequest, useTotalPage} from "@/api/request";
 import {
   saveStu,
 } from "@/api/index1";
@@ -507,14 +507,6 @@ const audiColums = ref([
     align: "center",
     className: "h",
   },
-  {
-    title: "类型",
-    dataIndex: "audienceType",
-    key: "audienceType",
-    width: 40,
-    align: "center",
-    className: "h",
-  },
 ]);
 const orgSelectKeys = ref([]);
 const auditTableRef = ref();

From e033ab825e86edc01758b2774f39c4f8aab6ba24 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 4 Aug 2023 12:16:28 +0800
Subject: [PATCH 18/32] fix bug

---
 src/api/request.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/api/request.js b/src/api/request.js
index 401d5a72..c425c760 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -288,7 +288,6 @@ export function useTotalPage(_url, params, init = true,listing = false) {
     state.loading = true;
     return request(unref(_url), unref(params)).then(r => {
       state.data = r.data.list;
-      state.pages = r.data.total/state.pageSize || 1;
       state.total = r.data.total;
       state.loading = false;
     });

From 379f9448bd19192ed30253a75e73bf8feb4fe234 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 4 Aug 2023 16:45:15 +0800
Subject: [PATCH 19/32] fix bug

---
 src/api/ThirdApi.js | 1 +
 src/api/request.js  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/api/ThirdApi.js b/src/api/ThirdApi.js
index 981e0b1c..9fb90dc7 100644
--- a/src/api/ThirdApi.js
+++ b/src/api/ThirdApi.js
@@ -14,5 +14,6 @@ export const TEST_PAGE = "/api/b1/system/quiz/quiz-list post formData";
 export const ONLINE_PAGE = "/systemapi/xboe/m/course/manage/pagelist post formData";
 
 export const LOGOUT = "/userbasic/logout post";
+export const REFRESH_TOKEN_API = "/userbasic/refreshToken";
 
 export const ONLINE_COURSE_DEL = (id, courseId) => `/systemapi/xboe/school/study/course/delete-signup?id=${id}&couserId=${courseId} post`;
\ No newline at end of file
diff --git a/src/api/request.js b/src/api/request.js
index c425c760..227cfc6d 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -4,6 +4,7 @@ import JSONBigInt from "json-bigint";
 import router from "@/router";
 import {message} from "ant-design-vue";
 import {REFRESH_TOKEN, VALIDATE_TOKEN} from "@/api/apis";
+import {REFRESH_TOKEN_API} from "@/api/ThirdApi";
 
 const JSONBigIntStr = JSONBigInt({ storeAsString: true });
 
@@ -500,7 +501,7 @@ export async function request(_url, params) {
       localStorage.removeItem('refreshPage')
       return Promise.reject(res);
     }else if(res.code=== 1001){
-      return request(REFRESH_TOKEN).then((res)=>{
+      return boeRequest(REFRESH_TOKEN_API).then((res)=>{
         if(res.code===0 || res.code === 200){
           return request(_url, params)
         }

From 6804653285a86320aba05daa7ecaa03aa29e9682 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 4 Aug 2023 17:51:27 +0800
Subject: [PATCH 20/32] fix bug

---
 src/api/index1.js                                     | 7 ++++---
 src/api/indexEval.js                                  | 5 +++--
 src/api/indexVote.js                                  | 3 ++-
 src/components/common/BaseUpload.vue                  | 4 +++-
 src/components/common/CommonImport.vue                | 3 +++
 src/components/drawers/AddLevelImportStu.vue          | 5 ++++-
 src/components/drawers/AddLive.vue                    | 3 +++
 src/components/drawers/ExportAchievement.vue          | 4 ++++
 src/components/drawers/ExportScore.vue                | 5 +++++
 src/components/drawers/ImportStu.vue                  | 4 ++++
 src/components/drawers/TaskFaceIn.vue                 | 5 +++++
 src/components/drawers/project/AddCertificate.vue     | 5 +++++
 src/components/drawers/project/CreateCertificate.vue  | 4 ++++
 src/components/drawers/project/ImpoterGroupLeader.vue | 3 +++
 src/components/vote/VoteQuestionItem copy.vue         | 4 ++++
 src/components/vote/VoteQuestionItem.vue              | 5 +++--
 src/views/courselibrary/CoursewareManage_Old.vue      | 7 ++++++-
 src/views/learningpath/LevelAdd.vue                   | 4 ++++
 src/views/projectcenter/ClassAdd.vue                  | 7 ++++---
 src/views/projectcenter/LibraryAdd.vue                | 5 +++++
 src/views/projectcenter/TaskPage.vue                  | 6 +++++-
 src/views/research/components/ResearchAddItem.vue     | 4 ++++
 src/views/system/SystemManage.vue                     | 6 ++++--
 23 files changed, 91 insertions(+), 17 deletions(-)

diff --git a/src/api/index1.js b/src/api/index1.js
index 8fb4412b..ac32f578 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -8,6 +8,7 @@
  */
 import http from "./config";
 import qs from "qs";
+import {getCookieForName} from "@/api/method";
 // import { getCookie } from '../api/method'
 /**
  * 接口传参数方式（get）
@@ -188,7 +189,7 @@ export const auditStudentBatch = (obj) => http.post('/admin/student/auditStudent
 // //面授课批量导入成绩
 export const batchImportScore = (obj) =>
     http.post('/admin/student/importHomeWork', obj, {
-        headers: { "Content-Type": "multipart/form-data" },
+        headers: { "Content-Type": "multipart/form-data",token:getCookieForName("token") },
     });
 //数据导入状态
 export const getImportStatus = (uuid) => http.get('/admin/student/getImportStatus', { params: { uuid: uuid } })
@@ -197,7 +198,7 @@ export const getImportStatus = (uuid) => http.get('/admin/student/getImportStatu
 // export const exportHomeWork=(obj)=>http.get('admin/student/exportHomeWork',{params:obj})
 
 // 面授课导入学员
-export const FaceTeachImportStudent = (obj) => http.post('/admin/student/importStudent', obj, { headers: { "Content-Type": "multipart/form-data" } })
+export const FaceTeachImportStudent = (obj) => http.post('/admin/student/importStudent', obj, { headers: { "Content-Type": "multipart/form-data" },token:getCookieForName("token") })
 //成绩录入
 export const updateStudent = (obj) => http.post('/admin/student/homeWorkScoreEntry', obj)
 
@@ -227,7 +228,7 @@ export const createExamination = (obj) => http.post('/examination/createExaminat
 //催促考试
 export const batchSendMessage = (obj) => http.post('/admin/taskmanage/batchSendMessage', obj)
 // 外部考试导入成绩
-export const ImportExternalExamScore = (obj) => http.post('/admin/external/exam/manage/importExternalExamScore', obj, { headers: { "Content-Type": "multipart/form-data" } })
+export const ImportExternalExamScore = (obj) => http.post('/admin/external/exam/manage/importExternalExamScore', obj, { headers: { "Content-Type": "multipart/form-data",token:getCookieForName("token") } })
 //分组
 export const changeGroupByStudentId = (obj) => http.post('/admin/student/changeGroupByStudentId', obj)
 //导入小组
diff --git a/src/api/indexEval.js b/src/api/indexEval.js
index 5bb05bc8..a19eb1ed 100644
--- a/src/api/indexEval.js
+++ b/src/api/indexEval.js
@@ -1,4 +1,5 @@
 import http from "./config";
+import {getCookieForName} from "@/api/method";
 // import qs from 'qs';
 
 /**
@@ -42,13 +43,13 @@ export const createEvaluation = (obj) =>
 //上传组件
 export const fileUp = (data) =>
   http.post("/file/upload", data, {
-    headers: { "Content-Type": "multipart/form-data" },
+    headers: { "Content-Type": "multipart/form-data",token:getCookieForName("token") },
   });
 
 //上传文件
 export const baseVoteupload = (data) =>
   http.post("/vote/baseVoteupload", data, {
-    headers: { "Content-Type": "multipart/form-data" },
+    headers: { "Content-Type": "multipart/form-data",token:getCookieForName("token") },
   });
 
 //删除测评信息
diff --git a/src/api/indexVote.js b/src/api/indexVote.js
index 0fc677c9..2aeca10d 100644
--- a/src/api/indexVote.js
+++ b/src/api/indexVote.js
@@ -1,5 +1,6 @@
 import http from "./config";
 import qs from "qs";
+import {getCookieForName} from "@/api/method";
 
 /**
  * 接口传参数方式（get）
@@ -44,7 +45,7 @@ import qs from "qs";
 export const baseVoteupload = (obj) =>
   http.post("/vote/baseVoteupload", obj, {
     headers: {
-      token: "123",
+      token: getCookieForName("token"),
       "Content-Type": "multipart/form-data",
     },
   });
diff --git a/src/components/common/BaseUpload.vue b/src/components/common/BaseUpload.vue
index b9146eeb..8b03d2d4 100644
--- a/src/components/common/BaseUpload.vue
+++ b/src/components/common/BaseUpload.vue
@@ -5,6 +5,7 @@
       :show-upload-list="showUploadList"
       :multiple="multiple"
       :before-upload="beforeUpload"
+      :headers="headers"
       @change="handleChange"
       ref="imageRef"
   >
@@ -17,6 +18,7 @@
 import {defineProps, defineEmits, defineExpose, ref, watch} from "vue";
 import {message} from "ant-design-vue";
 import {FILE_UPLOAD_URL} from "@/api/config";
+import {getCookieForName} from "@/api/method";
 
 const props = defineProps({
   value: {
@@ -41,7 +43,7 @@ const emit = defineEmits({})
 
 const files = ref([])
 const imageRef = ref()
-
+const headers = { token: getCookieForName("token") };
 watch(props, () => {
   props.value.length !== files.value.length && (files.value = props.value)
 })
diff --git a/src/components/common/CommonImport.vue b/src/components/common/CommonImport.vue
index 54933169..ae39652b 100644
--- a/src/components/common/CommonImport.vue
+++ b/src/components/common/CommonImport.vue
@@ -31,6 +31,7 @@
                 :data="data"
                 :multiple="true"
                 :name="name"
+                :headers="headers"
                 :accept="accept"
                 :action="uploadUrl"
                 @change="handleChange"
@@ -99,6 +100,7 @@ import {getImportStatus} from "@/api/index1";
 import {useTimeout} from "@/utils/useCommon";
 import err from "@/assets/images/err.png";
 import success from "@/assets/images/success.png";
+import {getCookieForName} from "@/api/method";
 
 const props = defineProps({
   url: String,
@@ -115,6 +117,7 @@ const props = defineProps({
 const emit = defineEmits({});
 const visible = ref(false);
 const fileList = ref([]);
+const headers = { token: getCookieForName("token") };
 const uploadUrl = ref(process.env.VUE_APP_BASE_API + props.url);
 const { start } = useTimeout(async ({ uuid, file }) => {
   const { data: { data: upData } } = await getImportStatus(uuid);
diff --git a/src/components/drawers/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue
index 2a8e2f4e..8788129f 100644
--- a/src/components/drawers/AddLevelImportStu.vue
+++ b/src/components/drawers/AddLevelImportStu.vue
@@ -35,6 +35,7 @@
                 v-model:fileList="fileList"
                 :action="importStudent"
                 name="uploadFile"
+                :headers="headers"
                 :multiple="false"
                 @change="handleChange"
                 :data="{
@@ -187,6 +188,7 @@ import { message } from "ant-design-vue";
 import * as api from "../../api/index1";
 import { BATCH_IMPORT_SCORE } from "@/api/config";
 import { useStore } from "vuex";
+import {getCookieForName} from "@/api/method";
 export default {
   name: "ImpStu",
   props: {
@@ -222,7 +224,7 @@ export default {
       showBottomBar: false, // 显示底部成功条数和失败条数
       fileName: "",
     });
-
+    const headers = { token: getCookieForName("token") };
     const userInfo = computed(() => store.state.userInfo);
 
     const closeDrawer = () => {
@@ -341,6 +343,7 @@ export default {
       userInfo,
       closeDrawer,
       // change,
+      headers,
       handleChange,
       BATCH_IMPORT_SCORE,
       downloadEeeorData,
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 7d2fd531..a1244199 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -86,6 +86,7 @@
             </div>
             <div class="item_inp" style="background-color: #fff;">
               <a-upload name="avatar" list-type="picture-card" class="avatar-uploader" :show-upload-list="false"
+                        :headers="headers"
                 :before-upload="beforeUpload">
                 <img class="i_upload_img" v-if="imageUrl" :src="imageUrl" alt="avatar" />
                 <div class="i_upload" v-else>
@@ -227,6 +228,7 @@ import AddInvistRoot from "@/components/drawers/AddInvistRoot.vue";
 import { Form, message } from "ant-design-vue";
 import { fileUp } from "../../api/indexEval";
 import {useResetRef} from "@/utils/useCommon";
+import {getCookieForName} from "@/api/method";
 
 const removePG = () => {
   formData.value.assessmentId = "";
@@ -243,6 +245,7 @@ const props = defineProps({
   taskList: [],
 });
 const visible = ref(false);
+const headers = { token: getCookieForName("token") };
 const formData = useResetRef({
   liveName: "",
   liveLink: "",
diff --git a/src/components/drawers/ExportAchievement.vue b/src/components/drawers/ExportAchievement.vue
index c516e392..a7ad4fc0 100644
--- a/src/components/drawers/ExportAchievement.vue
+++ b/src/components/drawers/ExportAchievement.vue
@@ -33,6 +33,7 @@
                 :action="importScore"
                 name="uploadFile"
                 :multiple="true"
+                :headers="headers"
                 @change="handleChange"
                 :showUploadList="false"
                 :data="{
@@ -195,6 +196,7 @@ import { reactive, toRefs } from "vue";
 import { message } from "ant-design-vue";
 import * as api from "../../api/index1";
 import { BATCH_IMPORT_SCORE } from "@/api/config";
+import {getCookieForName} from "@/api/method";
 
 export default {
   name: "EScore",
@@ -255,6 +257,7 @@ export default {
             process.env.VUE_APP_FILE_PATH,
       template: process.env.VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE,
     });
+    const headers = { token: getCookieForName("token") };
     const closeDrawer = () => {
       ctx.emit("closeDraw", true);
       ctx.emit("update:eScorevisibleExternalExternal", false);
@@ -405,6 +408,7 @@ export default {
       BATCH_IMPORT_SCORE,
       beforeUpload,
       handleUpload,
+      headers,
       removeUpload,
       downloadEeeorData,
     };
diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue
index eadbe8d2..c93283bb 100644
--- a/src/components/drawers/ExportScore.vue
+++ b/src/components/drawers/ExportScore.vue
@@ -21,6 +21,7 @@
           <div class="right">
             <div style="height: 176px; margin-bottom: 20px">
               <a-upload-dragger v-model:fileList="fileList" :action="importHomeWork" name="uploadFile" :multiple="true"
+                                :headers="headers"
                 @change="handleChange" :showUploadList="false" :data="{
                   type: type,
                   taskId: Number(id),
@@ -155,6 +156,7 @@ import { reactive, toRefs } from "vue";
 import { message } from "ant-design-vue";
 import * as api from "../../api/index1";
 import { BATCH_IMPORT_SCORE } from "@/api/config";
+import {getCookieForName} from "@/api/method";
 export default {
   name: "EScore",
   props: {
@@ -201,6 +203,8 @@ export default {
       downloadErrUrl: null, //下载失败数据
       fileName: "",
     });
+    const headers = { token: getCookieForName("token") };
+
     const closeDrawer = () => {
       ctx.emit("update:eScorevisible", false);
       state.fileList = [];
@@ -344,6 +348,7 @@ export default {
       closeDrawer,
       handleChange,
       downTemplate,
+      headers,
       BATCH_IMPORT_SCORE,
       beforeUpload,
       handleUpload,
diff --git a/src/components/drawers/ImportStu.vue b/src/components/drawers/ImportStu.vue
index dc3de36e..a0c7fa3d 100644
--- a/src/components/drawers/ImportStu.vue
+++ b/src/components/drawers/ImportStu.vue
@@ -30,6 +30,7 @@
                 :action="importLeader"
                 name="uploadFile"
                 :multiple="true"
+                :headers="headers"
                 @change="handleChange"
                 :showUploadList="false"
               >
@@ -252,6 +253,7 @@ import { reactive, toRefs } from "vue";
 import { message } from "ant-design-vue";
 import * as api from "../../api/index1";
 import { BATCH_IMPORT_SCORE } from "@/api/config";
+import {getCookieForName} from "@/api/method";
 export default {
   name: "ImportStu",
   props: {
@@ -279,6 +281,7 @@ export default {
             process.env.VUE_APP_FILE_PATH,
       template: process.env.VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE,
     });
+    const headers = { token: getCookieForName("token") };
     const closeDrawer = () => {
       ctx.emit("closeDraw", true);
       ctx.emit("update:TaskFaceImpStuvisible", false);
@@ -422,6 +425,7 @@ export default {
       afterVisibleChange,
       closeDrawer,
       handleChange,
+      headers,
       downTemplate,
       BATCH_IMPORT_SCORE,
       beforeUpload,
diff --git a/src/components/drawers/TaskFaceIn.vue b/src/components/drawers/TaskFaceIn.vue
index 7e4f4342..4fea9c39 100644
--- a/src/components/drawers/TaskFaceIn.vue
+++ b/src/components/drawers/TaskFaceIn.vue
@@ -31,6 +31,7 @@
                 :action="importLeader"
                 name="uploadFile"
                 :multiple="true"
+                :headers="headers"
                 @change="handleChange"
                 :showUploadList="false"
               >
@@ -183,6 +184,7 @@ import { reactive, toRefs } from "vue";
 import { message } from "ant-design-vue";
 import * as api from "../../api/index1";
 import { BATCH_IMPORT_SCORE } from "@/api/config";
+import {getCookieForName} from "@/api/method";
 export default {
   name: "TaskImpStu",
   props: {
@@ -221,6 +223,8 @@ export default {
             process.env.VUE_APP_FILE_PATH,
       template: process.env.VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE,
     });
+    const headers = { token: getCookieForName("token") };
+
     const closeDrawer = () => {
       ctx.emit("closeDraw", true);
       ctx.emit("update:TaskFaceImpStuvisible", false);
@@ -364,6 +368,7 @@ export default {
 
     return {
       ...toRefs(state),
+      headers,
       afterVisibleChange,
       closeDrawer,
       handleChange,
diff --git a/src/components/drawers/project/AddCertificate.vue b/src/components/drawers/project/AddCertificate.vue
index a1dcf80c..41715852 100644
--- a/src/components/drawers/project/AddCertificate.vue
+++ b/src/components/drawers/project/AddCertificate.vue
@@ -59,6 +59,7 @@
                 style="width: 200px"
                 list-type="picture-card"
                 class="avatar-uploader"
+                :headers="headers"
                 :show-upload-list="false"
                 :before-upload="beforeUpload"
               >
@@ -326,6 +327,7 @@ import CreateCertificate from "../../../components/drawers/project/CreateCertifi
 import { message } from "ant-design-vue";
 import * as api from "@/api/index1";
 import { fileUp } from "../../../api/indexEval";
+import {getCookieForName} from "@/api/method";
 export default {
   name: "AddCertificate",
   components: {
@@ -380,6 +382,8 @@ export default {
 
       fileType: ["jpg", "jpeg", "png", "gif", "svg", "bmp"],
     });
+    const headers = { token: getCookieForName("token") };
+
     const reset = () => {
       state.certificateName = null;
       state.certificateRemark = null;
@@ -673,6 +677,7 @@ export default {
     };
     return {
       ...toRefs(state),
+      headers,
       afterVisibleChange,
       closeDrawer,
       selectCondition,
diff --git a/src/components/drawers/project/CreateCertificate.vue b/src/components/drawers/project/CreateCertificate.vue
index 7ff031c4..d0468c0b 100644
--- a/src/components/drawers/project/CreateCertificate.vue
+++ b/src/components/drawers/project/CreateCertificate.vue
@@ -68,6 +68,7 @@
                   style="width: 200px"
                   list-type="picture-card"
                   class="avatar-uploader"
+                  :headers="headers"
                   :show-upload-list="false"
                   action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
                   :before-upload="beforeUpload"
@@ -118,6 +119,7 @@ import * as apiTask from "../../../api/indexTaskadd";
 import { message } from "ant-design-vue";
 import { RouterEditTask } from "@/api/indexTask";
 import { addTempTask } from "../../../api/indexTaskadd";
+import {getCookieForName} from "@/api/method";
 export default {
   name: "AddRef",
   props: {
@@ -178,6 +180,7 @@ export default {
       title: null,
       isClick: false,
     });
+    const headers = { token: getCookieForName("token") };
     const closeDrawer = () => {
       ctx.emit("update:CCertificate", false);
       ctx.emit("update:edit", false);
@@ -335,6 +338,7 @@ export default {
     };
     return {
       ...toRefs(state),
+      headers,
       afterVisibleChange,
       closeDrawer,
       handleFinish,
diff --git a/src/components/drawers/project/ImpoterGroupLeader.vue b/src/components/drawers/project/ImpoterGroupLeader.vue
index a12a607f..7b7c46b7 100644
--- a/src/components/drawers/project/ImpoterGroupLeader.vue
+++ b/src/components/drawers/project/ImpoterGroupLeader.vue
@@ -31,6 +31,7 @@
                   :data="data"
                   :multiple="true"
                   :accept="accept"
+                  :headers="headers"
                   :action="uploadUrl"
                   @change="handleChange"
                   v-model:file-list="fileList"
@@ -95,6 +96,7 @@ import {getImportStatus} from "@/api/index1";
 import {useTimeout} from "@/utils/useCommon";
 import err from "@/assets/images/err.png";
 import success from "@/assets/images/success.png";
+import {getCookieForName} from "@/api/method";
 
 const props = defineProps({
   url: String,
@@ -109,6 +111,7 @@ const emit = defineEmits({})
 const visible = ref(false)
 const fileList = ref([])
 const uploadUrl = ref(process.env.VUE_APP_BASE_API + props.url);
+const headers = { token: getCookieForName("token") };
 const {start} = useTimeout(async ({uuid,file}) => {
   const {data: {data: upData}} = await getImportStatus(uuid)
   file.uploadState = upData;
diff --git a/src/components/vote/VoteQuestionItem copy.vue b/src/components/vote/VoteQuestionItem copy.vue
index bd73dc7a..58925e79 100644
--- a/src/components/vote/VoteQuestionItem copy.vue	
+++ b/src/components/vote/VoteQuestionItem copy.vue	
@@ -22,6 +22,7 @@
       <a-upload
         v-show="!item.imgVal"
         class="in uploadBtn"
+        :headers="headers"
         :show-upload-list="false"
         :before-upload="beforeUpload"
       >
@@ -50,6 +51,7 @@
 import { reactive, toRefs, ref } from "vue";
 import { message } from "ant-design-vue";
 import { fileUp } from "../../api/indexEval";
+import {getCookieForName} from "@/api/method";
 
 export default {
   name: "VoteQuestionItem",
@@ -66,6 +68,7 @@ export default {
     const state = reactive({
       hasImgName: "",
     });
+    const headers = { token: getCookieForName("token") };
 
     const handleInput = (value) => {
       console.log(value.target.value);
@@ -121,6 +124,7 @@ export default {
       handleDel,
       handleCancel,
       beforeUpload,
+      headers,
     };
   },
 };
diff --git a/src/components/vote/VoteQuestionItem.vue b/src/components/vote/VoteQuestionItem.vue
index 767e6988..394337a3 100644
--- a/src/components/vote/VoteQuestionItem.vue
+++ b/src/components/vote/VoteQuestionItem.vue
@@ -13,7 +13,7 @@
       <div class="delete" @click="handleDel">删除</div>
     </div>
     <div class="name uploadContent">
-      <a-upload v-show="!formData.optionPictureAddress" class="in uploadBtn" :show-upload-list="false" :before-upload="beforeUpload">
+      <a-upload v-show="!formData.optionPictureAddress" class="in uploadBtn" :headers="headers" :show-upload-list="false" :before-upload="beforeUpload">
         <div class="addimg">+添加图片</div>
       </a-upload>
       <div v-show="formData.optionPictureAddress" class="picture" style="position: relative">
@@ -35,13 +35,14 @@
 import { defineEmits, defineProps, ref } from "vue";
 import { message } from "ant-design-vue";
 import { fileUp } from "../../api/indexEval";
+import {getCookieForName} from "@/api/method";
 
 const props = defineProps({
   item: {},
   index: Number
 })
 const emit = defineEmits(['del'])
-
+const headers = { token: getCookieForName("token") };
 const formData = ref(props.item)
 
 const beforeUpload = (file) => {
diff --git a/src/views/courselibrary/CoursewareManage_Old.vue b/src/views/courselibrary/CoursewareManage_Old.vue
index dd6ff52d..59e90d46 100644
--- a/src/views/courselibrary/CoursewareManage_Old.vue
+++ b/src/views/courselibrary/CoursewareManage_Old.vue
@@ -612,6 +612,7 @@
                   <div class="item_inp">
                     <a-upload
                       multiple
+                      :headers="headers"
                       :show-upload-list="false"
                       :before-upload="beforeUpload2"
                     >
@@ -1051,6 +1052,7 @@
                   <div class="item_inp">
                     <a-upload
                       multiple
+                      :headers="headers"
                       :show-upload-list="false"
                       :before-upload="beforeUpload2"
                     >
@@ -2356,6 +2358,7 @@
               <a-upload
                 name="file"
                 :show-upload-list="false"
+                :headers="headers"
                 :before-upload="beforeUpload3"
               >
                 <div class="upload_box">
@@ -3142,6 +3145,7 @@ import ProjectManager from "@/components/project/ProjectManagerNew";
 
 import SeeModal from "./components/seeModal.vue";
 import * as moment from "moment";
+import {getCookieForName} from "@/api/method";
 
 //列表表格
 const columns1 = [
@@ -3923,7 +3927,7 @@ export default defineComponent({
       assessmentName: "",
       assessmentVisible: false,
     });
-
+    const headers = { token: getCookieForName("token") };
     const showStuAdd = (record) => {
       state.selectCourseId = record.offcoursePlanId;
       state.shipType = 2;
@@ -5690,6 +5694,7 @@ export default defineComponent({
     };
     return {
       ...toRefs(state),
+      headers,
       getdateToDateFn,
       moment,
       getdateToTimeFn,
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 2c02e5e7..4da52337 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -685,6 +685,7 @@
                         v-if="docChecked == true"
                         v-model:file-list="fileList"
                         name="file"
+                        :headers="headers"
                         :action="uploadAction"
                         @change="handleChange"
                       >
@@ -1415,6 +1416,7 @@ import ImpoterGroupLeader from "@/components/drawers/project/ImpoterGroupLeader.
 import TaskImpStu from "../../components/drawers/TaskFaceIn";
 
 import { checkPer,fixDoublePer } from "@/utils/utils";
+import {getCookieForName} from "@/api/method";
 
 export default {
   name: "LevelAdd",
@@ -1446,6 +1448,7 @@ export default {
     const router = useRouter();
     const route = useRoute();
     const stuRef = ref();
+    const headers = { token: getCookieForName("token") };
     // const store = useStore();
     const state = reactive({
       createId: null,
@@ -2911,6 +2914,7 @@ export default {
       ...toRefs(state),
       ...toRefs(levelList),
       stuRef,
+      headers,
       clearChooseStu,
       showDeleteALLModal,
       closeDeleteALLModal,
diff --git a/src/views/projectcenter/ClassAdd.vue b/src/views/projectcenter/ClassAdd.vue
index 23ce8905..3928974b 100644
--- a/src/views/projectcenter/ClassAdd.vue
+++ b/src/views/projectcenter/ClassAdd.vue
@@ -104,6 +104,7 @@
               class="avatar-uploader"
               :show-upload-list="false"
               action="/api/file/upload"
+              :headers="headers"
               :before-upload="beforeUpload"
               @change="handleChange"
               :disabled="viewDetail ? true : false"
@@ -401,7 +402,7 @@ import { useRouter, useRoute } from "vue-router";
 import dayjs from "dayjs";
 import * as api from "../../api/index";
 import * as api1 from "../../api/index1";
-import { toDate, scrollLoad } from "../../api/method";
+import {toDate, scrollLoad, getCookieForName} from "../../api/method";
 import { useStore } from "vuex";
 export default {
   name: "projectAdd",
@@ -413,7 +414,7 @@ export default {
     const isEdit = ref(false);
     let peojectID = "";
     let paraentID = "";
-
+    const headers = { token: getCookieForName("token") };
     const state = reactive({
       classifySelect: null,
       classifySelectId: null,
@@ -1040,7 +1041,7 @@ export default {
       uplodaFileCount,
       createProject,
       removeFile,
-
+      headers,
       isEdit,
       backPage,
       dateFormatList,
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index 74a07c44..13493338 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -606,6 +606,7 @@
                         v-model:file-list="fileList"
                         name="file"
                         :action="uploadAction"
+                        :headers="headers"
                         @change="handleChange2"
                       >
                         <span
@@ -759,6 +760,7 @@ import {useRoute, useRouter} from "vue-router";
 import {scoreRule, setScoreRule} from "@/api/indexTaskadd";
 import ProjectLevel from "@/components/project/ProjectLevel";
 import TrainClass from "@/components/project/TrainClass";
+import {getCookieForName} from "@/api/method";
 
 export default defineComponent({
   name: "LibraryAdd",
@@ -924,6 +926,8 @@ export default defineComponent({
       editFlag: false,
       uploadAction: process.env.VUE_APP_BASE_API + '/file/uploadunlimit'
     });
+    const headers = { token: getCookieForName("token") };
+
     const value = ref("");
     const textnum = "150";
     const routered = useRouter();
@@ -1397,6 +1401,7 @@ export default defineComponent({
 
     return {
       ...toRefs(state),
+      headers,
       value,
       projectId,
       textnum,
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index feb47a1c..425bde25 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -1337,6 +1337,7 @@
                         "
                         v-model:file-list="fileList"
                         name="file"
+                        :headers="headers"
                         :action="uploadAction"
                         @change="handleChange"
                       >
@@ -2309,7 +2310,7 @@ import { message, Modal } from "ant-design-vue";
 import * as apitl from "../../api/index";
 import { getTask } from "../../api/indexTaskadd";
 import { editProjDoc } from "../../api/indexTaskadd";
-import { toDate } from "../../api/method";
+import {getCookieForName, toDate} from "../../api/method";
 import projSet from "../../components/Modals/projSet";
 import { overview } from "../../api/indexProjStu";
 import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
@@ -2362,6 +2363,8 @@ export default {
   setup() {
     const store = useStore();
     const route = useRoute();
+    const headers = { token: getCookieForName("token") };
+
     const state = reactive({
       createId: "",
       permissions: "",
@@ -4912,6 +4915,7 @@ export default {
     return {
       ...toRefs(state),
       ...toRefs(levelList),
+      headers,
       stageChange,
       showStudent,
       settingTopFlag,
diff --git a/src/views/research/components/ResearchAddItem.vue b/src/views/research/components/ResearchAddItem.vue
index de9df027..d02590c8 100644
--- a/src/views/research/components/ResearchAddItem.vue
+++ b/src/views/research/components/ResearchAddItem.vue
@@ -27,6 +27,7 @@
       <a-upload
         v-show="!item[imgKey]"
         class="in uploadBtn"
+        :headers="headers"
         :show-upload-list="false"
         :before-upload="beforeUpload"
       >
@@ -53,9 +54,12 @@
 <script setup>
 import {message} from "ant-design-vue";
 import {fileUp} from "@/api/indexEval";
+import {getCookieForName} from "@/api/method";
 
 const props = defineProps({ index: Number, list: Array, item: Object ,nameKey:String,imgKey:String});
 const VUE_APP_FILE_PATH = process.env.VUE_APP_FILE_PATH;
+const headers = { token: getCookieForName("token") };
+
 const handleCancel = () => props.item[props.imgKey] = "";
 const handleDel = () => props.item.id?(props.item.deleted = true):(props.list.splice(props.index, 1))
 const beforeUpload = (file) => {
diff --git a/src/views/system/SystemManage.vue b/src/views/system/SystemManage.vue
index a8bed695..a0c832bf 100644
--- a/src/views/system/SystemManage.vue
+++ b/src/views/system/SystemManage.vue
@@ -28,6 +28,7 @@
       name="avatar"
       action="/api/file/upload"
       list-type="picture-card"
+      :headers="headers"
       class="avatar-uploader"
       :show-upload-list="false"
       :before-upload="beforeUpload"
@@ -139,6 +140,7 @@ import html2canvas from "html2canvas";
 import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
 import SubsetManage from "../../components/drawers/SubsetManage.vue";
 import AddGroup from "../../components/drawers/AddGroup.vue";
+import {getCookieForName} from "@/api/method";
 export default {
   name: "SystemManage",
   components: {
@@ -262,7 +264,7 @@ export default {
       Svisible: false,
       Avisible: false,
     });
-
+    const headers = { token: getCookieForName("token") };
     const showDrawer = () => {
       state.visible = true;
     };
@@ -456,7 +458,7 @@ export default {
       downloadQr,
       changeCodevisible,
       changeCodevisible2,
-
+      headers,
       onSelectChange,
       randomgroup,
       showAddGroup,

From 3b7b408897ef0ec7bb814da0bf002dfa4c111ba2 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 4 Aug 2023 18:50:22 +0800
Subject: [PATCH 21/32] fix bug

---
 src/views/research/ResearchManage.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index cf808ffe..287da0dd 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -68,7 +68,7 @@ shan<!-- 评估管理页面 -->
           <a-space style="padding-right: 10px">
             <a-button
               v-if="
-                record.releaseStatus === '1' && checkPer(record.permissions)
+                record.releaseStatus === '1'
               "
               @click="handleOper(record, 'push')"
               type="link"
@@ -76,7 +76,7 @@ shan<!-- 评估管理页面 -->
             </a-button>
             <a-button
               v-if="
-                record.releaseStatus === '1' && checkPer(record.permissions)
+                record.releaseStatus === '1'
               "
               @click="editOper(record)"
               type="link"
@@ -84,7 +84,7 @@ shan<!-- 评估管理页面 -->
             </a-button>
             <a-button
               v-if="
-                record.releaseStatus === '1' && checkPer(record.permissions)
+                record.releaseStatus === '1'
               "
               @click="handleEditPage(record.id)"
               type="link"
@@ -92,7 +92,7 @@ shan<!-- 评估管理页面 -->
             </a-button>
             <a-button
               v-if="
-                record.releaseStatus === '2' && checkPer(record.permissions)
+                record.releaseStatus === '2'
               "
               @click="toManage(record.id, record)"
               type="link"
@@ -106,7 +106,7 @@ shan<!-- 评估管理页面 -->
             </a-button>
             <a-button
               v-if="
-                record.releaseStatus === '2' && checkPer(record.permissions)
+                record.releaseStatus === '2'
               "
               @click="() => handleOper(record, 'withdraw')"
               type="link"
@@ -114,7 +114,7 @@ shan<!-- 评估管理页面 -->
             </a-button>
             <a-button
               v-if="
-                record.releaseStatus === '2' && checkPer(record.permissions)
+                record.releaseStatus === '2'
               "
               @click="handleOper(record, 'end')"
               type="link"
@@ -122,7 +122,7 @@ shan<!-- 评估管理页面 -->
             </a-button>
             <a-button
               v-if="
-                record.releaseStatus !== '2' && checkPer(record.permissions)
+                record.releaseStatus !== '2'
               "
               @click="handleOper(record, 'del')"
               type="link"

From 8b8d808ce4e617d06a5fd17e4af9e8f9632f01e1 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 4 Aug 2023 18:53:25 +0800
Subject: [PATCH 22/32] fix bug

---
 src/components/project/OrgClass.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue
index d010a9a5..df217301 100644
--- a/src/components/project/OrgClass.vue
+++ b/src/components/project/OrgClass.vue
@@ -68,7 +68,7 @@ watch(props, () => {
 function onLoadData(treeNode) {
   return useArrayRequest(ORG_CHILD_LIST, { keyword: "", orgId: treeNode.id }).then(
     (r) => {
-      treeNode.dataRef.treeChildList = r.data;
+      treeNode.dataRef.treeChildList = r.data.directChildList;
       options.value = [...options.value];
     }
   );

From 49e6d82d1b5f694116c9113946fb1e52badb3582 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 5 Aug 2023 14:14:08 +0800
Subject: [PATCH 23/32] fix bug

---
 src/components/project/OrgClass.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue
index df217301..03a77207 100644
--- a/src/components/project/OrgClass.vue
+++ b/src/components/project/OrgClass.vue
@@ -68,7 +68,7 @@ watch(props, () => {
 function onLoadData(treeNode) {
   return useArrayRequest(ORG_CHILD_LIST, { keyword: "", orgId: treeNode.id }).then(
     (r) => {
-      treeNode.dataRef.treeChildList = r.data.directChildList;
+      treeNode.dataRef.treeChildList = r.directChildList;
       options.value = [...options.value];
     }
   );

From 4785a53997f44a6bcdec17dd70b27e0ea9f79612 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 5 Aug 2023 14:19:36 +0800
Subject: [PATCH 24/32] fix bug

---
 src/components/project/OrgClass.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue
index 03a77207..d010a9a5 100644
--- a/src/components/project/OrgClass.vue
+++ b/src/components/project/OrgClass.vue
@@ -68,7 +68,7 @@ watch(props, () => {
 function onLoadData(treeNode) {
   return useArrayRequest(ORG_CHILD_LIST, { keyword: "", orgId: treeNode.id }).then(
     (r) => {
-      treeNode.dataRef.treeChildList = r.directChildList;
+      treeNode.dataRef.treeChildList = r.data;
       options.value = [...options.value];
     }
   );

From 3cb3f34fccdd75e079be92557e468aa9522b64ec Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 5 Aug 2023 14:23:57 +0800
Subject: [PATCH 25/32] fix bug

---
 src/components/project/OrgClass.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue
index d010a9a5..544c6cf0 100644
--- a/src/components/project/OrgClass.vue
+++ b/src/components/project/OrgClass.vue
@@ -24,7 +24,7 @@
     :load-data="onLoadData"
     :tree-data="options"
     :fieldNames="{
-      children: 'treeChildList',
+      children: 'directChildList',
       label: 'name',
       value: 'id',
     }"
@@ -68,7 +68,7 @@ watch(props, () => {
 function onLoadData(treeNode) {
   return useArrayRequest(ORG_CHILD_LIST, { keyword: "", orgId: treeNode.id }).then(
     (r) => {
-      treeNode.dataRef.treeChildList = r.data;
+      treeNode.dataRef.directChildList = r.data;
       options.value = [...options.value];
     }
   );

From 1a8836b4d5c51a9025df779ef32887d9d667d999 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 5 Aug 2023 15:44:44 +0800
Subject: [PATCH 26/32] fix bug

---
 src/components/project/OrgClass.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue
index 544c6cf0..dd592694 100644
--- a/src/components/project/OrgClass.vue
+++ b/src/components/project/OrgClass.vue
@@ -66,7 +66,7 @@ watch(props, () => {
 });
 
 function onLoadData(treeNode) {
-  return useArrayRequest(ORG_CHILD_LIST, { keyword: "", orgId: treeNode.id }).then(
+  return request(ORG_CHILD_LIST, { keyword: "", orgId: treeNode.id }).then(
     (r) => {
       treeNode.dataRef.directChildList = r.data;
       options.value = [...options.value];

From f3306efce00fc037a4f55e3bc2efd048cabd0d50 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 8 Aug 2023 08:20:29 +0800
Subject: [PATCH 27/32] ---fix bug

---
 src/components/NavLeft.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue
index 10b2d9c0..8f96a577 100644
--- a/src/components/NavLeft.vue
+++ b/src/components/NavLeft.vue
@@ -437,7 +437,7 @@
               src="../assets/images/navleft/review.png"
             />
           </div>
-          <a target="_blank" :href="oldManage">旧版管理员界面</a>
+          <a :href="oldManage">旧版管理员界面</a>
           <!-- <router-link target="_blank" to="/oldsystemmanage">旧版管理员界面</router-link> -->
         </a-menu-item>
         <a-menu-item key="sub17" v-if="checkMenu('ReadingClubManage')">

From 6f088ec29cfbe829a5c581787b481a292d5b9326 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 8 Aug 2023 08:47:55 +0800
Subject: [PATCH 28/32] ---fix bug

---
 src/components/NavLeft.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue
index 8f96a577..925f153a 100644
--- a/src/components/NavLeft.vue
+++ b/src/components/NavLeft.vue
@@ -445,7 +445,7 @@
             <img
               style="width: 22px; height: 22px"
               src="../assets/images/navleft/review.png"
-            />
+            />¡
           </div>
           <router-link to="/readingclubmanage">业务支援读书会管理</router-link>
         </a-menu-item>

From 56f64149a7b5ad5521334110edb2e238647a04ed Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 8 Aug 2023 15:29:04 +0800
Subject: [PATCH 29/32] ---fix bug

---
 src/components/NavLeft.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue
index 925f153a..c60d8f17 100644
--- a/src/components/NavLeft.vue
+++ b/src/components/NavLeft.vue
@@ -437,7 +437,7 @@
               src="../assets/images/navleft/review.png"
             />
           </div>
-          <a :href="oldManage">旧版管理员界面</a>
+          <a target="_blank" :href="oldManage">旧版管理员界面</a>
           <!-- <router-link target="_blank" to="/oldsystemmanage">旧版管理员界面</router-link> -->
         </a-menu-item>
         <a-menu-item key="sub17" v-if="checkMenu('ReadingClubManage')">

From fa31a9ff1226cb1ff5b3fa74431cadab95d7fa5f Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 8 Aug 2023 15:33:49 +0800
Subject: [PATCH 30/32] ---fix bug

---
 src/components/NavLeft.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue
index c60d8f17..0951a440 100644
--- a/src/components/NavLeft.vue
+++ b/src/components/NavLeft.vue
@@ -430,7 +430,7 @@
             </a-menu-item>
           </a-sub-menu>
         </a-sub-menu>
-        <a-menu-item key="sub16" v-if="checkMenu('OldSystemManage')">
+        <a-menu-item key="sub16">
           <div class="imgBox">
             <img
               style="width: 22px; height: 22px"
@@ -445,7 +445,7 @@
             <img
               style="width: 22px; height: 22px"
               src="../assets/images/navleft/review.png"
-            />¡
+            />
           </div>
           <router-link to="/readingclubmanage">业务支援读书会管理</router-link>
         </a-menu-item>

From 0771f610af6d1f2f00bb2c99cd83b962e2c4cdf7 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 8 Aug 2023 17:18:11 +0800
Subject: [PATCH 31/32] ---fix bug

---
 src/components/NavLeft.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue
index 0951a440..8fb04ba5 100644
--- a/src/components/NavLeft.vue
+++ b/src/components/NavLeft.vue
@@ -438,7 +438,6 @@
             />
           </div>
           <a target="_blank" :href="oldManage">旧版管理员界面</a>
-          <!-- <router-link target="_blank" to="/oldsystemmanage">旧版管理员界面</router-link> -->
         </a-menu-item>
         <a-menu-item key="sub17" v-if="checkMenu('ReadingClubManage')">
           <div class="imgBox">

From dbdf3fb27c5f1f2da988af825d083a12454e47aa Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 8 Aug 2023 18:52:13 +0800
Subject: [PATCH 32/32] ---fix bug

---
 src/components/NavLeft.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue
index 8fb04ba5..d0b60391 100644
--- a/src/components/NavLeft.vue
+++ b/src/components/NavLeft.vue
@@ -430,7 +430,7 @@
             </a-menu-item>
           </a-sub-menu>
         </a-sub-menu>
-        <a-menu-item key="sub16">
+        <a-menu-item key="sub16" v-if="checkMenu('OldSystemManage')">
           <div class="imgBox">
             <img
               style="width: 22px; height: 22px"