合并解决冲突

src/App.vue

@@ -34,7 +34,7 @@ import {USER_PERMISSION, VALIDATE_TOKEN} from "@/api/apis";
 const store = useStore();
 const isLogin = ref(false);
 
-console.log("版本3.1.1------------");
+console.log("版本3.1.2------------");
 
 
 // 监听关闭浏览器

src/components/NavLeft.vue

@@ -471,15 +471,15 @@
               <router-link to="/employeelearning">员工学习数据</router-link>
             </a-menu-item>
           </a-sub-menu>
-        </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"
               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')">
@@ -487,7 +487,7 @@
             <img
               style="width: 22px; height: 22px"
               src="../assets/images/navleft/review.png"
-            />¡
+            />
           </div>
           <router-link to="/readingclubmanage">业务支援读书会管理</router-link>
         </a-menu-item>

src/components/student/TableStudent.vue

@@ -51,7 +51,7 @@
         <a-button
           class="cus-btn"
           style="background: #4ea6ff; color: #fff; width: 100px"
-          @click="getStuList"
+          @click="search"
           :loading="stuAsyncLoading"
         >
           <template #icon>
@@ -603,6 +603,11 @@ function showChangeGroupModal() {
   checkgroupParam.value.checkBatch = true;
 }
 
+function search(){
+  tableParam.value.pageNo = 1
+  getStuList()
+}
+
 // 导出数据
 function exportTaskStu() {
   console.log("props.datasource", props);

src/views/courselibrary/CoursewareManage.vue

@@ -3321,6 +3321,7 @@ export default defineComponent({
     };
     const handleSearchTable3 = () => {
       state.manageStuLoading = true;
+      state.currentPage222 = 1
       getCourseStudentList();
     };
 
@@ -4573,6 +4574,8 @@ export default defineComponent({
       console.log(state.kk_inputV1);
       console.log(state.kk_inputV2);
       console.log(state.selectTime);
+      state.pageSize222 = 1
+      state.currentPage1 = 1
       getTableDate();
       getTableDate3();
     };
@@ -4582,6 +4585,8 @@ export default defineComponent({
       state.selectTime = "";
       state.currentPage2 = 1;
       state.tableDataTotal2 = [];
+      state.pageSize222 = 1
+      state.currentPage1 = 1
       getTableDate();
       getTableDate3();
     };