Merge branch 'develoop' of http://182.92.169.222:3000/dlsx/Teaching_integration_platform_admin_template into develoop

generated/core/OpenAPI.ts

@@ -22,7 +22,8 @@ export type OpenAPIConfig = {
 
 export const OpenAPI: OpenAPIConfig = {
     //BASE: 'http://39.106.16.162:8080',
-    BASE: 'http://127.0.0.1:8080',
+    // BASE: 'http://127.0.0.1:8080',
+    BASE: import.meta.env.VITE_APP_BASE_API,
     VERSION: '1.0.0',
     WITH_CREDENTIALS: false,
     CREDENTIALS: 'include',

src/views/MyCourseStudy/learningProcess.vue

@@ -140,61 +140,29 @@ const goToAnotherPage = (address, courseId) => {
       <!-- 头部 -->
       <div class="header">
         <el-button type="primary" plain>浏览记录</el-button>
-        <el-button
+        <el-button type="danger" plain style="float: right" @click="deleteSelected">
-          type="danger"
-          plain
-          style="float: right"
-          @click="deleteSelected"
-        >
           批量删除
         </el-button>
-        <el-button
+        <el-button type="primary" plain @click="toggleCheckbox" style="float: right">
-          type="primary"
-          plain
-          @click="toggleCheckbox"
-          style="float: right"
-        >
           管理
         </el-button>
       </div>
       <!-- 中间 -->
       <div class="record-list">
         <ul v-if="recordList.length > 0">
-          <li
+          <li v-for="record in recordList" :key="record.id" v-loading="loading">
-            v-for="record in recordList"
+            <input style="display: flex" type="checkbox" :value="record.id" @change="toggleSelection(record.id)"
-            :key="record.id"
+              v-if="showCheckbox" />
-            v-loading="loading"
-            @click="
-              goToAnotherPage(
-                '/myCourseStudyManagement/learningProcess1',
-                record.courseId,
-              )
-            "
-          >
-            <input
-              style="display: flex"
-              type="checkbox"
-              :value="record.id"
-              @change="toggleSelection(record.id)"
-              v-if="showCheckbox"
-            />
 
-            <img
+            <img class="img" :src="record.img" @click="goToAnotherPage(record.address)" style="margin-bottom: 10px" />
-              class="img"
-              :src="record.img"
-              @click="goToAnotherPage(record.address)"
-              style="margin-bottom: 10px"
-            />
 
-            <div
+            <div style="
-              style="
                 display: flex;
                 justify-content: space-between;
                 flex-grow: 1;
                 margin-top: 10px;
                 margin-bottom: 10px;
-              "
+              ">
-            >
               <p>
                 {{ record.courseName }}
               </p>
@@ -202,17 +170,29 @@ const goToAnotherPage = (address, courseId) => {
                 <Delete />
               </el-icon>
             </div>
-            <div
+            <div style="
-              style="
                 display: flex;
                 justify-content: space-between;
                 flex-grow: 1;
                 margin-top: 10px;
-              "
+              ">
-            >
               <p>{{ record.time }}</p>
               <p>学习人数:{{ record.number }}</p>
             </div>
+            <div style="display: flex;margin: 10px 0;">
+              <el-button @click="
+                goToAnotherPage(
+                  '/myCourseStudyManagement/learningProcess1',
+                  record.courseId,
+                )
+                ">知识点学习记录</el-button>
+              <el-button @click="
+                goToAnotherPage(
+                  '/myCourseStudyManagement/learningProcess2',
+                  record.courseId,
+                )
+                ">资源学习记录</el-button>
+            </div>
           </li>
         </ul>
         <el-empty v-else description="暂时没有浏览记录" />
@@ -220,17 +200,10 @@ const goToAnotherPage = (address, courseId) => {
     </div>
     <!-- 分页 -->
     <div class="example-pagination-block">
-      <el-pagination
+      <el-pagination v-model:current-page="params.pagenum" v-model:page-size="params.pagesize"
-        v-model:current-page="params.pagenum"
+        :page-sizes="[5, 10, 15, 20]" :background="true" layout="jumper,total, sizes, prev, pager, next " :total="total"
-        v-model:page-size="params.pagesize"
+        @current-change="onCurrentChange" @size-change="onSizeChange"
-        :page-sizes="[5, 10, 15, 20]"
+        style="margin-top: 20px; justify-content: flex-end" />
-        :background="true"
-        layout="jumper,total, sizes, prev, pager, next "
-        :total="total"
-        @current-change="onCurrentChange"
-        @size-change="onSizeChange"
-        style="margin-top: 20px; justify-content: flex-end"
-      />
     </div>
   </div>
 </template>
@@ -241,9 +214,11 @@ const goToAnotherPage = (address, courseId) => {
   flex-direction: column;
   min-height: 100vh;
 }
+
 .content {
   flex: 1;
 }
+
 .example-pagination-block {
   position: sticky;
   bottom: 0;
@@ -254,6 +229,7 @@ const goToAnotherPage = (address, courseId) => {
 .record-list {
   margin: 10px 0;
 }
+
 ul {
   width: 100%;
   list-style-type: none;
@@ -268,9 +244,11 @@ ul {
   grid-template-columns: repeat(auto-fill, 272px);
   justify-content: space-around;
 }
+
 li {
   /* margin-bottom: 30px; */
-  transition: filter 0.3s; /* 添加过渡动画 */
+  transition: filter 0.3s;
+  /* 添加过渡动画 */
   /* flex: 1 0 20%; */
   width: calc(20% - 20px);
   width: 250px;
@@ -285,6 +263,7 @@ li {
   transition: box-shadow 0.3s;
   cursor: pointer;
 }
+
 li:hover {
   box-shadow: 0 2px 6px rgba(0, 0, 0, 0.2);
 }