修复个人中心笔记中，公开笔记评论数取值错误

src/api/boe/courseRecord.js

@@ -62,15 +62,62 @@ const courseRecordList = function(data) {
     return ajax.postJson('/b1/system/teacher/teacher-course-list',data);
 }
 const getListByToken = function(data) {
-  return ajax2.get('/manageApi',`/admin/teacherRecord/getListByToken?courseName=${data.courseName}&page=${data.page}&pageSize=${data.pageSize}`);
+  return ajax2.get('/manageApi',`/admin/teacherRecord/getListByToken?courseName=${data.courseName}&pageNo=${data.pageNo}&pageSize=${data.pageSize}`);
+}
+
+/**
+ * 导出授课记录
+ *
+ * @param {Object} data
+ */
+const courseRecordExport2 = function(data) {
+  return axios.request({
+    baseURL: "/manageApi",
+    url: '/admin/export/exportInTeacherRecord',
+    method: 'get',
+    data:data,
+    headers:{'Content-Type':'application/json;charset=utf-8'},
+    responseType: 'blob'
+  })
+}
+
+/**
+ * 导出课程下的学员信息
+ *
+ */
+const exportStudentOfCourse2 = function(courseId,courseType) {
+  return axios.request({
+    baseURL: "/manageApi",
+    url: '/admin/export/exportTeacherRecordStudentInfo?courseId='+courseId+'&courseType='+courseType,
+    method: 'get'
+    // headers:{'Content-Type':'application/json;charset=utf-8'},
+    // responseType: 'blob'
+  })
+}
+
+/**
+ * 导出教师下的所有授课记录下的学员信息
+ *
+ */
+const exportStudentOfTearcher2 = function(userId) {
+  return axios.request({
+    baseURL: "/manageApi",
+    url: '/b1/system/teacher/teacher-course-student-export?userId='+userId,
+    method: 'post',
+    headers:{'Content-Type':'application/json;charset=utf-8'},
+    responseType: 'blob'
+  })
 }
 
 
 export default {
     courseRecordExport,
+    courseRecordExport2,
     courseRecordList,
     getListByToken,
     exportStudentOfCourse,
-    exportStudentOfTearcher
+    exportStudentOfCourse2,
+    exportStudentOfTearcher,
+    exportStudentOfTearcher2,
 
 }

src/api/modules/teacher.js

@@ -38,7 +38,7 @@ const detailTeacher=function (id){
  * tlevelId级别
  * salaryId发薪地
  * tsystemId
- 
+
  * } query
  * @returns
  */

src/components/Portal/comments.vue

@@ -97,7 +97,7 @@
                            <a style="display: flex;align-items: center;" @click="showReply(com)">
                             <!-- <svg-icon icon-class="comment" style="margin-right: 0px;font-size: 16px;"></svg-icon> -->
                               <div class="is_comment"></div>
-                              <span>回复</span> 
+                              <span>回复</span>
                            </a>
                            <!--必须当前登录人是一个人-->
                            <a style="display: flex;align-items: center;" v-if="userInfo.aid==com.sysCreateAid" @click="delCommnet(com,comIdx)">
@@ -558,7 +558,7 @@
                 this.$message.error(res.message);
             }
           });
-
+          this.loadData(false);
         }
 
       },
@@ -633,6 +633,7 @@
               this.$message.error(res.message);
            }
         });
+        this.loadData(false);
       },
       delCommnet(com,idx){
         if(com.replyList!='' && com.replyList.length>0){

src/views/course/Mylecnotes.vue

@@ -1,206 +1,297 @@
 <template>
   <div style="padding: 12px 32px 10px 12px;">
-   <div style="display: flex;justify-content: flex-start;">
+    <div style="display: flex;justify-content: flex-start;">
 
-     <div><el-input v-model="keyword" placeholder="输入课程名称搜索" clearable></el-input></div>
+      <div>
-     <div style="padding-left: 10px;"><el-button @click="recordList()" type="primary" icon="el-icon-search">搜索</el-button></div>
+        <el-input v-model="keyword" placeholder="输入课程名称搜索" clearable></el-input>
-     <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" @click="keyword = ''" type="primary" >重置</el-button></div>
+      </div>
-     <div style="padding: 0px 5px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div>
+      <div style="padding-left: 10px;">
-     <div style="padding: 0px 5px;"><el-button type="primary" @click="exportStudentOfTearcher()" icon="el-icon-search" size="small" round>导出学员信息</el-button></div>
+        <el-button @click="recordList()" type="primary" icon="el-icon-search">搜索</el-button>
-   </div>
+      </div>
-   <div class="Export">
+      <div style="padding: 0px 5px;">
-     <!-- <div style="padding-left: 10px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div> -->
+        <el-button icon="el-icon-refresh-right" @click="reset()" type="primary">重置</el-button>
-     <!-- <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary" size="small" round>导出学员信息</el-button></div> -->
+      </div>
-   </div>
+      <div style="padding: 0px 5px;">
-   <div style="margin-top:20px;">
+        <el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button>
-     <el-table :data="pageData" border stripe>
+      </div>
-         <el-table-column
+<!--      <div style="padding: 0px 5px;">-->
-         label="课程时间"
+<!--        <el-button type="primary" @click="exportStudentOfTearcher()" icon="el-icon-search" size="small" round>-->
-         prop="courseTime"
+<!--          导出学员信息-->
-         width="200px">
+<!--        </el-button>-->
-         </el-table-column>
+<!--      </div>-->
-         <el-table-column
+    </div>
-         label="课程名称"
+    <div class="Export">
-         prop="courseName"
+      <!-- <div style="padding-left: 10px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div> -->
-         width="200px">
+      <!-- <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary" size="small" round>导出学员信息</el-button></div> -->
-         </el-table-column>
+    </div>
-         <el-table-column
+    <div style="margin-top:20px;">
-         label="开课场地"
+      <el-table :data="pageData" border stripe style="width: 100%">
-         prop="address"
+        <el-table-column
-         width="240px">
+          fixed
-         </el-table-column>
+          label="序号"
-         <el-table-column
+          prop="index"
-         label="所属课程"
+          width="100px">
-         prop="parentCourse"
-         width="120px">
-         </el-table-column>
-         <el-table-column
-         label="所属项目"
-         prop="parentProject"
-         ></el-table-column>
-         <el-table-column
-         label="所属路径"
-         prop="parentRoute"
-         width="200px"
-         ></el-table-column>
-         <el-table-column
-         label="学习总人数"
-         prop="studentNumber"
-         width="100px"
-         ></el-table-column>
-         <el-table-column
-         label="时长(分钟)"
-         width="100px"
-         prop="period"
-         ></el-table-column>
-         <el-table-column
-         label="评分"
-         width="100px"
-         prop="score"
-          ></el-table-column>
-         <el-table-column
-         label="操作"
-         align="center"
-         width="150px"
-         prop="cz"
-         fixed="right"
-          >
           <template v-slot="scope">
-           <el-button type="text" @click="exportStudentOfCourse(scope.row.courseId)" size="small">导出学员信息</el-button>
+            <span>{{ scope.$index + 1 }}</span>
-         </template>
+          </template>
-       </el-table-column>
+        </el-table-column>
-     </el-table>
+        <el-table-column
-   </div>
+          label="讲师工号"
+          prop="userNo"
+          width="100px">
+        </el-table-column>
+        <el-table-column
+          label="讲师姓名"
+          prop="teacherName"
+          width="200px">
+        </el-table-column>
+        <el-table-column
+          label="课程名称"
+          prop="courseName"
+          width="200px">
+        </el-table-column>
+        <el-table-column
+          label="培训发生组织"
+          prop="trainOrgName"
+          width="200px">
+        </el-table-column>
+        <el-table-column label="课程类型" prop="type" width="120px">
+          <template v-slot="scope">
+                <span>{{
+                    {
+                      "0": "在线课",
+                      "1": "面授课",
+                      "2": "课程开发",
+                      "3": "作业员入模培训",
+                      "4": "其他",
+                    }[scope.row.type + '']
+                  }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="授课/课程日期"
+          prop="teachingDate"
+          width="200px">
+        </el-table-column>
 
- <div style="text-align: center; margin-top:57px">
+        <el-table-column
-  <el-pagination
+          label="内容分类"
-   background
+          prop="courseTypeName"
-     @size-change="handleSizeChange"
+          width="200px">
-     @current-change="handleCurrentChange"
+        </el-table-column>
-     :current-page="pageInfo.page"
+        <el-table-column label="开课状态" width="100px" prop="courseStatus">
-     :page-sizes="[10, 20, 30, 40]"
+          <template v-slot="scope">
-     :page-size="pageInfo.pageSize"
+                <span>{{
-     layout="total, sizes, prev, pager, next, jumper"
+                    {
-     :total="pageInfo.total"
+                      "0": "未开课",
-   ></el-pagination>
+                      "1": "已开课",
-   </div>
+                    }[scope.row.courseStatus + '']
+                  }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="授课时长(分钟)"
+          prop="teaching"
+          width="120px"
+        ></el-table-column>
+        <el-table-column
+          label="参训人数"
+          prop="studys"
+          width="120px"
+        ></el-table-column>
+        <el-table-column
+          label="评分"
+          prop="score"
+          width="100px"
+        ></el-table-column>
+        <el-table-column
+          label="是否生成讲师费"
+          prop="createdFee"
+          width="100px"
+        >
+          <template v-slot="scope">
+                <span>{{
+                    {
+                      "0": "否",
+                      "1": "是",
+                    }[scope.row.createdFee + '']
+                  }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="备注"
+          width="200px"
+          prop="remark"
+        ></el-table-column>
+        <el-table-column
+          label="操作"
+          align="center"
+          width="150px"
+          prop="cz"
+          fixed="right"
+        >
+          <template v-slot="scope">
+            <el-button type="text" @click="exportStudentOfCourse(scope.row.courseId, scope.row.type)"
+                       size="small">导出学员信息
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
 
- </div>
+    <div style="text-align: center; margin-top:57px">
+      <el-pagination
+        background
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="pageInfo.page"
+        :page-sizes="[10, 20, 30, 40]"
+        :page-size="pageInfo.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="pageInfo.total"
+      ></el-pagination>
+    </div>
+
+  </div>
 </template>
 
 <script>
 import apiCourse from '../../api/boe/courseRecord.js';
-import { mapGetters } from 'vuex';
+import {mapGetters} from 'vuex';
+
 export default {
-data(){
+  data() {
- return {
+    return {
-     pageData:[],
+      pageData: [],
-     keyword:'',
+      keyword: '',
-     pageInfo:{},
+      pageInfo: {
- }
+        pageIndex:1,
-},
+        pageSize:10,
+      },
+    }
+  },
+  mounted() {
+    this.recordList();
+  },
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+  methods: {
+    // 导出所有记录
+    exportFile() {
+      // let req = {
+      // }
+      // apiCourse.courseRecordExport2(req).then(res => {
+      //   const link = document.createElement('a');// 创建a标签
+      //   let blob = new Blob([res.data], {type: 'application/vnd.ms-excel'}); // 设置文件类型
+      //   link.style.display = "none";
+      //   link.href = URL.createObjectURL(blob); // 创建URL
+      //   link.setAttribute("download", "授课记录.xls");
+      //   document.body.appendChild(link);
+      //   link.click();
+      //   document.body.removeChild(link);
+      // })
+      // 取pageData记录第一条
+      if (this.pageData.length > 0) {
+        let teacherId = this.pageData[0].teacherId;
+        window.open(
+          `/manageApi/admin/export/exportInTeacherRecord?teacherId=${teacherId}`
+        );
+      }
+    },
 
-mounted() {
+    // 导出课程下的学员信息
- this.recordList(1);
+    exportStudentOfCourse(courseId, courseType) {
+      // apiCourse.exportStudentOfCourse2(courseId, courseType).then(res => {
+      //   const link = document.createElement('a');// 创建a标签
+      //   let blob = new Blob([res.data], {type: 'application/vnd.ms-excel'}); // 设置文件类型
+      //   link.style.display = "none";
+      //   link.href = URL.createObjectURL(blob); // 创建URL
+      //   link.setAttribute("download", "授课记录.xls");
+      //   document.body.appendChild(link);
+      //   link.click();
+      //   document.body.removeChild(link);
+      // })
 
-},
+      window.open(
-computed: {
+        `/manageApi/admin/export/exportTeacherRecordStudentInfo?courseId=${courseId}&courseType=${courseType}`
- ...mapGetters(['userInfo'])
+      );
-},
+    },
 
-methods: {
+    // 导出教师下的所有授课记录下的学员信息
+    exportStudentOfTearcher() {
+      let userId = this.userInfo.sysId;
+      apiCourse.exportStudentOfTearcher2(userId).then(res => {
+        const link = document.createElement('a');// 创建a标签
+        let blob = new Blob([res.data], {type: 'application/vnd.ms-excel'}); // 设置文件类型
+        link.style.display = "none";
+        link.href = URL.createObjectURL(blob); // 创建URL
+        link.setAttribute("download", "授课记录.xls");
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+      })
+    },
 
-   // 导出所有记录
+    recordList() {
-   exportFile(){
+      let req = {
-     let req = {
+        courseName: this.keyword,
-       userId: this.userInfo.sysId
+        pageNo: this.pageInfo.pageIndex,
-       // userId:"70F80F4E-34BA-10AB-894A-8FA812B19637"
+        pageSize: this.pageInfo.pageSize
-     }
+      }
-     apiCourse.courseRecordExport(req).then(res=>{
+      apiCourse.getListByToken(req).then(res => {
-         const link = document.createElement('a');// 创建a标签
+        if (res.status == 200) {
-         let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); // 设置文件类型
+          this.pageData = res.data.records;
-         link.style.display = "none";
+          this.pageInfo.pageSize = Number(res.data.size);
-         link.href = URL.createObjectURL(blob); // 创建URL
+          this.pageInfo.total = Number(res.data.total);
-         link.setAttribute("download", "授课记录.xls");
+          this.pageInfo.page = Number(res.data.current);
-         document.body.appendChild(link);
+        } else {
-         link.click();
-         document.body.removeChild(link);
-     })
-   },
-
-
-   // 导出课程下的学员信息
-   exportStudentOfCourse(courseId){
-     let userId = this.userInfo.sysId;
-     apiCourse.exportStudentOfCourse(userId,courseId).then(res=>{
-         const link = document.createElement('a');// 创建a标签
-         let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); // 设置文件类型
-         link.style.display = "none";
-         link.href = URL.createObjectURL(blob); // 创建URL
-         link.setAttribute("download", "授课记录.xls");
-         document.body.appendChild(link);
-         link.click();
-         document.body.removeChild(link);
-     })
-   },
-
-   // 导出教师下的所有授课记录下的学员信息
-   exportStudentOfTearcher(){
-     let userId = this.userInfo.sysId;
-     // let userId = '5D36C207-64F4-C512-312D-C9598257695C';
-     apiCourse.exportStudentOfTearcher(userId).then(res=>{
-         const link = document.createElement('a');// 创建a标签
-         let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); // 设置文件类型
-         link.style.display = "none";
-         link.href = URL.createObjectURL(blob); // 创建URL
-         link.setAttribute("download", "授课记录.xls");
-         document.body.appendChild(link);
-         link.click();
-         document.body.removeChild(link);
-     })
-   },
-
-
-   recordList(pageIndex){
-     let req = {
-     //     userId:"6B049FAF-C314-7CCF-0D28-0D23F4C42531",
-         userId: this.userInfo.sysId,
-         keyword:this.keyword,
-         page:pageIndex,
-         pageSize:10
-     }
-     apiCourse.courseRecordList(req).then(res=>{
-       if(res.status == 200) {
-         this.pageData = res.result.list;
-         this.pageInfo = res.result.pageInfo;
-       } else {
           this.$message({
-           type: 'error',
+            type: 'error',
-           message: res.message
+            message: res.message
-         });
+          });
-       }
+        }
-     })
+      })
-   },
+    },
-
+    reset(){
-   // 每页显示的条数事件
+      let req = {
-   handleSizeChange(val){
+        courseName: "",
-     this.pageInfo.pageSize = val;
+        pageNo: this.pageInfo.pageIndex,
-     this.recordList(1);
+        pageSize: this.pageInfo.pageSize
-   },
+      }
-   // 显示制定页的数据
+      apiCourse.getListByToken(req).then(res => {
-   handleCurrentChange(val){
+        if (res.status == 200) {
-     this.pageInfo.pageIndex = val;
+          this.pageData = res.data.records;
-     this.recordList(this.pageInfo.pageIndex);
+          this.pageInfo.pageSize = Number(res.data.size);
-   },
+          this.pageInfo.total = Number(res.data.total);
-
+          this.pageInfo.page = Number(res.data.current);
-},
+        } else {
+          this.$message({
+            type: 'error',
+            message: res.message
+          });
+        }
+      })
+    },
 
+    // 每页显示的条数事件
+    handleSizeChange(val) {
+      this.pageInfo.pageIndex = 1;
+      this.pageInfo.pageSize = val;
+      this.recordList();
+    },
+    // 显示制定页的数据
+    handleCurrentChange(val) {
+      this.pageInfo.pageIndex = val;
+      this.recordList(this.pageInfo.pageIndex);
+    },
+  },
 }
 </script>
 
 <style lang="scss" scoped>
-.Export{
+.Export {
-display: flex;
+  display: flex;
-padding-top: 10px;
+  padding-top: 10px;
 }
 </style>

src/views/exam/ExamList.vue

@@ -954,7 +954,7 @@ export default {
     },
     findPapers() {
       let params={
-        pageSize:200,
+        pageSize:10000,
         name:''
       }
       apiPaper.querypaper(params).then((res) => {

src/views/grateful/index.vue

@@ -5,7 +5,7 @@
     <!-- </div> -->
     <!-- 底部 -->
     <div class="grateful">
-      <img src="../../assets/images/grateful/gratefulFooter.png" alt="" />
+      <img src="../../assets/images/grateful/gratefulFooter20250613.png" alt="" />
     </div>
   </div>
 </template>

src/views/hotforum/Index-bak.vue

@@ -0,0 +1,179 @@
+<template>
+  <div class="hot">
+    <div>
+      <div class="center">
+        <div class="item" :style="{marginRight:(i%2==0||i==0)?'49px':'0'}" v-for="item,i in imgData" :key="i">
+          <img class="img" @click="goLearn(item.url)" :src="require(`../../assets/images/hotforum/${item.img}.png`)" alt="">
+        </div>
+      </div>
+      <div style="display: flex;justify-content: center;margin-bottom: 52px;">
+        <img src="../../assets/images/hotforum/foot.png" alt="">
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "hotforum",
+    data() {
+      return {
+        imgData:[
+          {img:'01',url:'1265897142383042560'},
+          {img:'02',url:'1265697724606210048'},
+          {img:'003',url:'1280185851054231552'},
+          {img:'04',url:'1321778585966247936'},
+        ],
+      }
+    },
+    methods: {
+      goLearn(item){
+        if(item){
+          // this.$router.push({path:'/course/detail',query:{id:item}})
+          window.open(`https://u.boe.com/pc/course/detail?id=${item}`)
+        }
+      },
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+.hot{
+  width: 100%;
+  // max-width: 1920px;
+  min-height: 100%;
+  // min-height: 1373px;
+  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  justify-content: center;
+  .center{
+    max-width: 1270px;
+    max-height: 700px;
+    margin-bottom: 5%;
+    margin-top: 22%;
+    display: flex;
+    flex-wrap: wrap;
+    .item{
+      width: 610px;
+      height: 330px;
+      background: url("../../assets/images/hotforum/border.png") no-repeat;
+      background-size: 100%;
+      padding: 14px;
+      padding-top: 31px;
+      margin-bottom: 59px;
+      cursor: pointer;
+      .img{
+        width: 581px;
+        height: 283px;
+      }
+    }
+  }
+  /* 当窗口宽度大于3068px时的样式 */
+}
+@media (min-width: 3000px) {
+.hot{
+  width: 100%;
+  // max-width: 1920px;
+  min-height: 100%;
+  // min-height: 1373px;
+  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  justify-content: center;
+  .center {
+    max-width: 2560px;
+    max-height: 1300px;
+    margin-bottom: 5%;
+    margin-top: 30vh;
+    display: flex;
+    flex-wrap: wrap;
+
+    .item {
+      width: 1220px;
+      height: 660px;
+      background: url("../../assets/images/hotforum/border.png") no-repeat;
+      background-size: 100%;
+      padding: 28px;
+      padding-top: 62px;
+      margin-bottom: 59px;
+
+      .img {
+        width: 100%; // 图片宽度占满item宽度
+        height: auto; // 自动调整高度
+      }
+    }
+  }
+}
+}
+@media (min-height: 1500px) {
+.hot{
+  width: 100%;
+  // max-width: 1920px;
+  min-height: 100%;
+  // min-height: 1373px;
+  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  justify-content: center;
+  .center {
+    max-width: 1068px;
+    max-height: 580px;
+    margin-bottom: 5%;
+    margin-top: 30vh;
+    display: flex;
+    flex-wrap: wrap;
+
+    .item {
+      width: 500px;
+      height: 271px;
+      background: url("../../assets/images/hotforum/border.png") no-repeat;
+      background-size: 100%;
+      padding: 14px;
+      padding-top: 26px;
+      margin-bottom: 30px;
+
+      .img {
+        width: 100%; // 图片宽度占满item宽度
+        height: auto; // 自动调整高度
+      }
+    }
+  }
+}
+}
+@media (min-width: 1928px) and (max-width: 3000px) {
+.hot{
+  width: 100%;
+  // max-width: 1920px;
+  min-height: 100%;
+  // min-height: 1373px;
+  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  justify-content: center;
+  .center {
+    max-width: 1800px;
+    max-height: 1100px;
+    margin-bottom: 5%;
+    margin-top: 35vh;
+    display: flex;
+    flex-wrap: wrap;
+
+    .item {
+      width: 860px;
+      height: 466px;
+      background: url("../../assets/images/hotforum/border.png") no-repeat;
+      background-size: 100%;
+      padding: 28px;
+      padding-top: 48px;
+      margin-bottom: 70px;
+
+      .img {
+        width: 100%; // 图片宽度占满item宽度
+        height: auto; // 自动调整高度
+      }
+    }
+  }
+}
+}
+</style>

src/views/hotforum/Index.vue

@@ -1,7 +1,24 @@
 <template>
-  <div class="hot">
+  <div class="hot25">
     <div>
-      <div class="center">
+      <div class="title25" style="">
+          <img class="img" src="../../assets/images/hotforum/2025.png" alt="">
+      </div>
+      <div class="center" style="margin-top: 60px;">
+        <div class="item" style="margin-right: 49px;">
+          <img class="img" @click="goLearn('1351506180295131136')" src="../../assets/images/hotforum/2501.jpg" alt="">
+        </div>
+        <div class="item">
+          <img class="img" @click="goLearn('1375146833375027200')" src="../../assets/images/hotforum/2503.png" alt="">
+        </div>
+      </div>
+      <div class="line" style="margin: 0 auto;margin-top: 60px;width: 100%;text-align: center;">
+        <img class="img" src="../../assets/images/hotforum/line.png" alt="">
+      </div>
+      <div class="title24" style="margin: 0 auto;margin-top: 60px;width: 100%;text-align: center;">
+        <img class="img" src="../../assets/images/hotforum/2024.png" alt="">
+      </div>
+      <div class="center" style="margin-top: 60px;">
         <div class="item" :style="{marginRight:(i%2==0||i==0)?'49px':'0'}" v-for="item,i in imgData" :key="i">
           <img class="img" @click="goLearn(item.url)" :src="require(`../../assets/images/hotforum/${item.img}.png`)" alt="">
         </div>
@@ -11,11 +28,12 @@
       </div>
     </div>
   </div>
+
 </template>
 
 <script>
   export default {
-    name: "hotforum",
+    name: "hotforumNew",
     data() {
       return {
         imgData:[
@@ -24,6 +42,10 @@
           {img:'003',url:'1280185851054231552'},
           {img:'04',url:'1321778585966247936'},
         ],
+        imgData25:[
+          {img:'2501',url:'1351506180295131136'},
+          {img:'2503',url:'1375146833375027200'},
+        ],
       }
     },
     methods: {
@@ -38,20 +60,22 @@
 </script>
 
 <style lang="scss" scoped>
-.hot{
+.hot25{
   width: 100%;
   // max-width: 1920px;
   min-height: 100%;
   // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background: url("../../assets/images/hotforum/back25.png") no-repeat;
-  background-size: 100% 100%;
+  background-size: cover;
   display: flex;
   justify-content: center;
+  .title25{
+    margin: 0 auto;margin-top: 100px;width: 100%;text-align: center;
+  }
   .center{
     max-width: 1270px;
     max-height: 700px;
     margin-bottom: 5%;
-    margin-top: 22%;
     display: flex;
     flex-wrap: wrap;
     .item{
@@ -71,109 +95,109 @@
   }
   /* 当窗口宽度大于3068px时的样式 */
 }
-@media (min-width: 3000px) {
+// @media (min-width: 3000px) {
-.hot{
+// .hot{
-  width: 100%;
+//   width: 100%;
-  // max-width: 1920px;
+//   // max-width: 1920px;
-  min-height: 100%;
+//   min-height: 100%;
-  // min-height: 1373px;
+//   // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+//   background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-  background-size: 100% 100%;
+//   background-size: 100% 100%;
-  display: flex;
+//   display: flex;
-  justify-content: center;
+//   justify-content: center;
-  .center {
+//   .center {
-    max-width: 2560px;
+//     max-width: 2560px;
-    max-height: 1300px;
+//     max-height: 1300px;
-    margin-bottom: 5%;
+//     margin-bottom: 5%;
-    margin-top: 30vh;
+//     margin-top: 30vh;
-    display: flex;
+//     display: flex;
-    flex-wrap: wrap;
+//     flex-wrap: wrap;
 
-    .item {
+//     .item {
-      width: 1220px;
+//       width: 1220px;
-      height: 660px;
+//       height: 660px;
-      background: url("../../assets/images/hotforum/border.png") no-repeat;
+//       background: url("../../assets/images/hotforum/border.png") no-repeat;
-      background-size: 100%;
+//       background-size: 100%;
-      padding: 28px;
+//       padding: 28px;
-      padding-top: 62px;
+//       padding-top: 62px;
-      margin-bottom: 59px;
+//       margin-bottom: 59px;
 
-      .img {
+//       .img {
-        width: 100%; // 图片宽度占满item宽度
+//         width: 100%; // 图片宽度占满item宽度
-        height: auto; // 自动调整高度
+//         height: auto; // 自动调整高度
-      }
+//       }
-    }
+//     }
-  }
+//   }
-}
+// }
-}
+// }
-@media (min-height: 1500px) {
+// @media (min-height: 1500px) {
-.hot{
+// .hot{
-  width: 100%;
+//   width: 100%;
-  // max-width: 1920px;
+//   // max-width: 1920px;
-  min-height: 100%;
+//   min-height: 100%;
-  // min-height: 1373px;
+//   // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+//   background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-  background-size: 100% 100%;
+//   background-size: 100% 100%;
-  display: flex;
+//   display: flex;
-  justify-content: center;
+//   justify-content: center;
-  .center {
+//   .center {
-    max-width: 1068px;
+//     max-width: 1068px;
-    max-height: 580px;
+//     max-height: 580px;
-    margin-bottom: 5%;
+//     margin-bottom: 5%;
-    margin-top: 30vh;
+//     margin-top: 30vh;
-    display: flex;
+//     display: flex;
-    flex-wrap: wrap;
+//     flex-wrap: wrap;
 
-    .item {
+//     .item {
-      width: 500px;
+//       width: 500px;
-      height: 271px;
+//       height: 271px;
-      background: url("../../assets/images/hotforum/border.png") no-repeat;
+//       background: url("../../assets/images/hotforum/border.png") no-repeat;
-      background-size: 100%;
+//       background-size: 100%;
-      padding: 14px;
+//       padding: 14px;
-      padding-top: 26px;
+//       padding-top: 26px;
-      margin-bottom: 30px;
+//       margin-bottom: 30px;
 
-      .img {
+//       .img {
-        width: 100%; // 图片宽度占满item宽度
+//         width: 100%; // 图片宽度占满item宽度
-        height: auto; // 自动调整高度
+//         height: auto; // 自动调整高度
-      }
+//       }
-    }
+//     }
-  }
+//   }
-}
+// }
-}
+// }
-@media (min-width: 1928px) and (max-width: 3000px) {
+// @media (min-width: 1928px) and (max-width: 3000px) {
-.hot{
+// .hot{
-  width: 100%;
+//   width: 100%;
-  // max-width: 1920px;
+//   // max-width: 1920px;
-  min-height: 100%;
+//   min-height: 100%;
-  // min-height: 1373px;
+//   // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+//   background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-  background-size: 100% 100%;
+//   background-size: 100% 100%;
-  display: flex;
+//   display: flex;
-  justify-content: center;
+//   justify-content: center;
-  .center {
+//   .center {
-    max-width: 1800px;
+//     max-width: 1800px;
-    max-height: 1100px;
+//     max-height: 1100px;
-    margin-bottom: 5%;
+//     margin-bottom: 5%;
-    margin-top: 35vh;
+//     margin-top: 35vh;
-    display: flex;
+//     display: flex;
-    flex-wrap: wrap;
+//     flex-wrap: wrap;
 
-    .item {
+//     .item {
-      width: 860px;
+//       width: 860px;
-      height: 466px;
+//       height: 466px;
-      background: url("../../assets/images/hotforum/border.png") no-repeat;
+//       background: url("../../assets/images/hotforum/border.png") no-repeat;
-      background-size: 100%;
+//       background-size: 100%;
-      padding: 28px;
+//       padding: 28px;
-      padding-top: 48px;
+//       padding-top: 48px;
-      margin-bottom: 70px;
+//       margin-bottom: 70px;
 
-      .img {
+//       .img {
-        width: 100%; // 图片宽度占满item宽度
+//         width: 100%; // 图片宽度占满item宽度
-        height: auto; // 自动调整高度
+//         height: auto; // 自动调整高度
-      }
+//       }
-    }
+//     }
-  }
+//   }
-}
+// }
-}
+// }
 </style>

src/views/portal/case/Detail.vue

@@ -651,6 +651,9 @@ export default {
       });
     },
     getCaseData() {
+      // 清空pdf数据
+      this.pdfPath = '';
+
       let $this = this;
       apiCase.details(this.resolveId, true).then(res => {
         if (res.status == 200) {

src/views/study/coursenew.vue

@@ -285,7 +285,7 @@
                   <div v-else><img src="../../../public/images/Avatarwoman.png" alt=""></div>
                 </div>
               </div>
-              <div class="teacher-info">
+              <div class="teacher-info" @click="toUserHome(item)" title="点击进入他的主页">
                 <div class="teacher-name">
                     <span> {{ item.teacherName }}</span>
                     <!-- <span style="font-size: 12px; color:#666666 ;">( {{cutOrgNamePath(item.authorInfo.orgInfo)}} )</span> -->

src/views/user/Mynotes.vue

@@ -88,9 +88,9 @@
                   <div>
                     <div class="textbut-box">
                       <div style="padding-top: 8px;">
-                        <interactBar v-if="item.type == 1" nodeWidth="60px" :readonly="true"  :type="6" :data="item"  :shares="false" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar>
+                        <interactBar v-if="item.type == 1" nodeWidth="60px" :readonly="true"  :type="6" :data="item"  :shares="false" :comments="true" :answers="false" :clickAnswer="true" :views="false"></interactBar>
                       </div>
-                      <el-button @click="deleteNote(item)" style=" margin-right: 10px;" class="textbut" type="text"><svg-icon icon-class="notedel" ></svg-icon>删除</el-button>
+                      <el-button @click="deleteNote(item)" style=" margin-right: 10px;margin-left: 15px" class="textbut" type="text"><svg-icon icon-class="notedel" ></svg-icon>删除</el-button>
                       <el-button @click="edit(item)" class="textbut" type="text"><svg-icon icon-class="noteedit" ></svg-icon> 编辑</el-button>
                     </div>
                   </div>

src/views/user/Noteedit.vue

@@ -195,9 +195,7 @@ export default {
          if(num == 1) {
             this.editdata.isAuto = true;
          }
-         if(this.imgContent.length > 0) {
+         this.editdata.content = this.imgContent.join();
-            this.editdata.content = this.imgContent.join();
-         }
           apiNote.update(this.editdata).then(res=>{
             if(res.status == 200) {
               localStorage.removeItem(this.localStorageKey); //清空本地缓存

src/views/user/ranking.vue

@@ -23,7 +23,7 @@
                     </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="total">累计</el-dropdown-item>
-              <el-dropdown-item command="now">当前</el-dropdown-item>
+              <el-dropdown-item command="now">当前年</el-dropdown-item>
               <!-- <el-dropdown-item command="weeks">本周</el-dropdown-item>
               <el-dropdown-item command="months">本月</el-dropdown-item>
               <el-dropdown-item command="years">本年</el-dropdown-item> -->
@@ -33,10 +33,10 @@
       </div>
       <div class="myselftext">
         <div class="myranking">
-          {{isNow ? '当前' : '累计'}}排名 :  <span> {{currentUserRankingTotalData.rankNo}}</span>
+          {{isNow ? '当前年' : '累计'}}排名 :  <span> {{currentUserRankingTotalData.rankNo}}</span>
         </div>
         <div class="myexperience">
-          {{isNow ? '当前' : '累计'}}经验值 :  <span>{{currentUserRankingTotalData.rankValue}}</span>
+          {{isNow ? '当前年' : '累计'}}经验值 :  <span>{{currentUserRankingTotalData.rankValue}}</span>
         </div>
       </div>
 
@@ -117,7 +117,7 @@
                     </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="total">累计</el-dropdown-item>
-              <el-dropdown-item command="now">当前</el-dropdown-item>
+              <el-dropdown-item command="now">当前年</el-dropdown-item>
               <!-- <el-dropdown-item command="weeks">本周</el-dropdown-item>
               <el-dropdown-item command="months">本月</el-dropdown-item>
               <el-dropdown-item command="years">本年</el-dropdown-item> -->
@@ -127,10 +127,10 @@
       </div>
       <div class="myselftext">
         <div class="myranking">
-          {{isStudyTime ? '当前' : '累计'}}排名 :  <span> {{learningDurationTotalData.rankNo}}</span>
+          {{isStudyTime ? '当前年' : '累计'}}排名 :  <span> {{learningDurationTotalData.rankNo}}</span>
         </div>
         <div class="myexperience">
-          {{isStudyTime ? '当前' : '累计'}}学习时长:  <span> {{formatSecondToHour(learningDurationTotalData.rankValue)}}</span> h
+          {{isStudyTime ? '当前年' : '累计'}}学习时长:  <span> {{formatSecondToHour(learningDurationTotalData.rankValue)}}</span> h
         </div>
       </div>
       <div class="exp-table" style="margin-top:20px;">
@@ -206,7 +206,7 @@
                     </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="total">累计</el-dropdown-item>
-              <!-- <el-dropdown-item command="now">当前</el-dropdown-item> -->
+               <el-dropdown-item command="now">当前年</el-dropdown-item>
               <!-- <el-dropdown-item command="weeks">本周</el-dropdown-item>
               <el-dropdown-item command="months">本月</el-dropdown-item>
               <el-dropdown-item command="years">本年</el-dropdown-item> -->
@@ -216,10 +216,10 @@
       </div>
       <div class="myselftext">
         <div class="myranking">
-          {{isStudyDay ? '当前' : '累计'}}排名 :  <span> {{learningDaysTotalData.rankNo}}</span>
+          {{isStudyDay ? '当前年' : '累计'}}排名 :  <span> {{learningDaysTotalData.rankNo}}</span>
         </div>
         <div class="myexperience">
-          {{isStudyDay ? '当前' : '累计'}}学习天数 :  <span>{{learningDaysTotalData.rankValue}}</span>
+          {{isStudyDay ? '当前年' : '累计'}}学习天数 :  <span>{{learningDaysTotalData.rankValue}}</span>
         </div>
       </div>
       <div class="exp-table" style="margin-top:20px;">
@@ -311,7 +311,7 @@ export default {
       formatSecondToHour:formatSecondToHour,
       experience:{
         field:'now',
-        name:'当前',
+        name:'当前年',
         data:{
           rankingNo:0,
           total:0
@@ -320,7 +320,7 @@ export default {
       },
       learningDuration:{
         field:'now',
-        name:'当前',
+        name:'当前年',
         data:{
           rankingNo:0,
           total:0