Merge branch 'master' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage

src/App.vue

@@ -34,7 +34,7 @@ import {USER_PERMISSION} from "@/api/apis";
 const store = useStore();
 const isLogin = ref(false);
 
-console.log("版本3.1.0------------");
+console.log("版本3.1.2------------");
 
 
 

src/components/NavLeft.vue

@@ -437,14 +437,14 @@
               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')">
           <div class="imgBox">
             <img
               style="width: 22px; height: 22px"
-              src="../assets/images/navleft/review.png"
+              src="../assets/images/navleft/review.png"s
             />
           </div>
           <router-link to="/readingclubmanage">业务支援读书会管理</router-link>

src/components/TwoDimensionalCode.vue

@@ -25,7 +25,7 @@
                 {{ codeInfo.name ? codeInfo.name : "" }}
               </div>
               <qrcode-vue
-                :value="codeInfo.url.startsWith('/')?(domain+codeInfo.url):codeInfo.url"
+                :value="codeInfo.url.startsWith('/')?(`${domain+codeInfo.url}&t=10`):`${codeInfo.url}&t=10`"
                 :size="qrcodeSize"
                 style="width: 200px; height: 200px"
               ></qrcode-vue>
@@ -34,12 +34,12 @@
           <div class="codeUrl" :style="{ display: showUrl ? 'flex' : 'none' }">
             <div class="codeUrlLink">链接</div>
             <a-input
-              :value="codeInfo.url.startsWith('/')?(domain+codeInfo.url):codeInfo.url"
+              :value="codeInfo.url.startsWith('/')?`${domain+codeInfo.url}&t=10`:`${codeInfo.url}&t=10`"
               disabled
               class="codeUrlInp"
             />
             <a-input
-              :value="codeInfo.url.startsWith('/')?(domain+codeInfo.url):codeInfo.url"
+              :value="codeInfo.url.startsWith('/')?`${domain+codeInfo.url}&t=10`:`${codeInfo.url}&t=10`"
               id="courseUrl"
               class="codeUrlInp"
               style="position: absolute; opacity: 0; z-index: -1"

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

@@ -3312,6 +3312,7 @@ export default defineComponent({
     };
     const handleSearchTable3 = () => {
       state.manageStuLoading = true;
+      state.currentPage222 = 1
       getCourseStudentList();
     };
 
@@ -4557,6 +4558,8 @@ export default defineComponent({
       console.log(state.kk_inputV1);
       console.log(state.kk_inputV2);
       console.log(state.selectTime);
+      state.pageSize222 = 10
+      state.currentPage1 = 1
       getTableDate();
       getTableDate3();
     };
@@ -4566,6 +4569,8 @@ export default defineComponent({
       state.selectTime = "";
       state.currentPage2 = 1;
       state.tableDataTotal2 = [];
+      state.pageSize222 = 10
+      state.currentPage1 = 1
       getTableDate();
       getTableDate3();
     };