Merge remote-tracking branch 'origin/250321-bugfix-shl' into 250321-bugfix-shl

# Conflicts:
#	src/views/Login.vue

public/index.html

@@ -16,9 +16,9 @@
     <meta name="referrer" content="strict-origin-when-cross-origin"/>
     <link rel="icon" href="<%= BASE_URL %>logo/favicon.ico">
     <title>京东方大学堂</title>
-    
+
     <script>
-      
+
       // if(window.top != window.self){
       //    window.top.location=window.self.location;
       // }

src/api/boe/courseRecord.js

@@ -1,5 +1,6 @@
 /**我的授课记录*/
 import ajax from '@/api/boe/boeApiAjax.js'
+import ajax2 from '@/api/unionAjax.js'
 import axios from 'axios'
 import { getToken } from '@/utils/token'
 const baseURL = process.env.VUE_APP_BOE_BASE_API;
@@ -60,12 +61,15 @@ const exportStudentOfTearcher = function(userId) {
 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}`);
+}
 
 
 export default {
     courseRecordExport,
     courseRecordList,
+    getListByToken,
     exportStudentOfCourse,
     exportStudentOfTearcher
 

src/api/modules/teacher.js

@@ -1,5 +1,5 @@
 import ajax from '@/utils/xajax.js'
-
+import ajax2 from '../unionAjax.js';
 
 /**
  * 按名称查询
@@ -9,7 +9,9 @@ const findByName = function(name) {
     return ajax.get('/xboe/teacher/name?name=' + name);
 }
 
-
+const findByNameNew = function(name) {
+    return ajax2.get('/manageApi/admin/teacher/selectTeacher?name=' + name);
+}
 const updateTeacher=function(data){
     return ajax.postJson('/xboe/teacher/update-teacher',data);
 }
@@ -217,7 +219,7 @@ export default {
     update,
     del,
     detail,
-    findByName,
+    findByNameNew,
     updateSysId,
 	has,
 	start,

src/components/Course/choice.vue

@@ -13,7 +13,7 @@
         </el-input>
         <div class="choice-box" v-if="teacherDownList.length>0">
            <ul>
-            <li v-for="te in teacherDownList" :key="te.key" @click="changeTeachers(te)">{{te.teacherName + te.teacherCode}}</li>
+            <li v-for="te in teacherDownList" :key="te.key" @click="changeTeachers(te)">{{te.teacherName + '(' + te.teacherCode + ')'}}</li>
            </ul>
         </div>
      <!-- <el-select
@@ -88,15 +88,15 @@
           if (this.teacherValues !== '') {
             this.loading = true;
             try {
-            const { result, message, status } = await apiTeacher.findByName(this.teacherValues);
+            const { data, message, code } = await apiTeacher.findByNameNew(this.teacherValues);
             this.loading = false;
-            if (status === 200) {
+            if (code === 200) {
                 let list = [];
-                result.forEach(item => {
+                data.forEach(item => {
                 list.push({
                     teacherId: item.id,
                     teacherName: item.name,
-                    teacherCode: item.code
+                    teacherCode: item.mobile
                 });
                 });
                 this.teacherDownList = list;

src/components/Course/exam.vue

@@ -327,8 +327,10 @@ export default {
     },
     startTest(){
       apiExamPaper.newPaperContent(this.info.id).then(res=>{
-        if(res.error == ''&&res.result != ''){
+        if(!res.error&&res.result != ''){
           if(this.info.paperType==2){
+            //TODO1
+            console.log("调用开始考试 if paperType == 2")
             this.examPaper.json=res.result;
             let qitems=this.convertToItems(this.examPaper.json);
             this.paper ={items:qitems};
@@ -336,9 +338,11 @@ export default {
             this.curItem=qitems[this.curIndex];
             this.startTime=new Date();//记录开始时间
             this.timerValue=this.info.testDuration;
+            this.content.status=1;
             this.timer=setInterval(this.changeTimer,60000);
             this.testStart=true;
           }else{
+            console.log("调用开始考试 else paperType != 2")
             let paper= {items:res.result};
             paper.items.forEach(item=>{
               if(item.type==101){
@@ -582,8 +586,15 @@ export default {
       apiStudy.saveExam(postData).then(res=>{
         this.thisTrue = true
          if(res.status == 200) {
+            console.log("获取数据结果 考试 res ==>",res)
             this.records.push(res.result);
-            this.content.status=9;//表已学习完，判断上级的章是否已完成
+            //TODO 评分更改 最终完成
+            if(res.result.score > res.result.passLine){
+              this.content.status=9;//表已学习完，判断上级的章是否已完成
+            }else{
+              this.content.status=1;
+            }
+
             this.studyItemId=res.result.studyItemId;//第一次保存时是没有的，所以这里要赋值
             this.$alert('您本次考试得分：'+this.lastScore, '考试成绩', {
                   confirmButtonText: '确定',

src/components/PortalHeader.vue

@@ -51,7 +51,8 @@
               <el-dropdown placement="bottom" @command="handleContributor">
                 <span class="el-dropdown-link" style="font-size:16px;cursor: pointer;" :style="{color:textColor}">贡献者大会</span>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="one">2023</el-dropdown-item>
+                  <el-dropdown-item command="three">2024</el-dropdown-item>
+                  <el-dropdown-item command="one" divided>2023</el-dropdown-item>
                   <el-dropdown-item command="two" divided>2022</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
@@ -246,6 +247,7 @@ export default {
       let obj = {
           one: urlPre + "/web/contributornew/index",
           two: urlPre + "/web/contributor/index",
+          three: urlPre + "/web/contributor_2024/index"
         };
         window.open(obj[val]);
     },

src/components/Study/manager.vue

@@ -13,7 +13,7 @@
     </div>
     <!-- <div style="color: red;">下面的表格标题及内容需要调整完善</div> -->
     <div>
-      <el-tabs v-model="tabName" @tab-click="handleTabClick">
+      <el-tabs style="width: 100%;" v-model="tabName" @tab-click="handleTabClick">
         <el-tab-pane label="报名管理" name="second">
           <!-- <div>已报名{{study.list.length}}人，共有0人报名未成功，共有{{study.list.length}}人通过审核</div> -->
           <el-row style="margin: 20px 0;" :gutter="20">
@@ -863,4 +863,19 @@ export default {
   height: 400px;
   overflow: auto;
 }
+
+.el-tabs__nav-wrap::after {
+  display: none; /* 隐藏滚动条轨道 */
+}
+
+.el-tabs__nav-scroll {
+  overflow: hidden; /* 隐藏滚动条滑块 */
+}
+
+/* 隐藏垂直滚动条 */
+.el-table .el-table__body-wrapper::-webkit-scrollbar {
+  display: none; /* Chrome, Safari, Opera*/
+}
+
+
 </style>

src/components/UserCenter/menu.vue

@@ -242,7 +242,7 @@
           <svg-icon :icon-class="activeMenu == '/user/medal'?'myxunzhang-active':'myxunzhang'"></svg-icon>
           <span slot="title">我的勋章</span>
       </el-menu-item>
-      <el-submenu index="myGrowth" v-show="curIdentity == 1">
+        <el-submenu index="myGrowth" v-show="curIdentity == 1">
           <template slot="title">
             <!-- <i class="el-icon-s-grid"></i> -->
             <img src="../../assets/images/myGrowth.jpg" style="width: 1em;height: 1em;margin-right: 8px;"></img>
@@ -433,6 +433,7 @@ export default {
     this.getLastStudy();
     //获取讲师认证中条数
     this.instructorCertification()
+    console.log(this.userInfo,'userInfouserInfo')
   },
   mounted() {
     //console.log(this.userInfo.loginName,'this.userInfo.loginName');

src/components/VideoPlayer/index.vue

@@ -18,7 +18,6 @@
       @keydown.right.prevent="forwardCurrentTime"
       @keydown.up.prevent="increaseVolume"
       @keydown.down.prevent="lowerVolume"
-      @keydown.esc.prevent="toggleFullScreen"
       tabindex="0"
       width="100%"
       height="100%"
@@ -385,9 +384,26 @@ export default {
       console.log('\x1b[31m%s\x1b[0m','*****************加载失败**********')
     })
     // 监听全屏事件的变化，保存数据
-    window.addEventListener("fullscreenchange", () => {
+    window.addEventListener("F", () => {
       this.isFullscreen = this.isFullScreen();
     });
+    document.addEventListener('fullscreenchange',this.handleFullscreenChange);
+    document.addEventListener('webkitfullscreenchange',this.handleFullscreenChange );
+    // this.videoDom.addEventListener('keydown', function(e){
+    //   //console.log('\x1b[31m%s\x1b[0m','*****************加载失败**********')
+    //   console.log("video is exit");
+    //   if(e.key === "Escape"){
+    //     console.log("按键 退出全屏 执行")
+    //   }
+    // })
+
+    // this.videoDom.addEventListener("keydown", (e) => {
+    //   console.log("是否监听到");
+    //   if(e.keyCode == 27){
+    //     console.log("是否监听到 esc");
+    //     this.toggleFullScreen();
+    //   }
+    // });
   },
   methods: {
     //当视频由于需要缓冲下一帧而停止，解决一直计时的问题
@@ -540,6 +556,7 @@ export default {
     /* 切换“全屏”和“非全屏”模式
      */
     toggleFullScreen() {
+      console.log("toggleFullScreen 执行 ",this.isFullScreen())
       let element = this.$refs.area;
       if (!this.isFullScreen()) {
         if (element.requestFullscreen) {
@@ -596,6 +613,24 @@ export default {
       const currentTime = this.$refs.video.currentTime;
       this.$emit('onTimeUpdate', currentTime);
     },
+    /**
+     * 监听全屏变化
+     */
+    handleFullscreenChange() {
+      console.log("handleFullscreenChange gx this.isFullScreen()",this.isFullScreen())
+      console.log("handleFullscreenChange gx this.isFullscreen",this.isFullscreen)
+    
+      if(this.isFullscreen){
+        this.isFullscreen = !!document.fullscreenElement;
+        if (!this.isFullscreen) {
+          // 退出全屏后的逻辑（如暂停视频、更新 UI 等）
+          console.log('ESC 已退出全屏 handleFullscreenChange',this.isFullscreen);
+          this.$emit('onFullscreen',false);//全屏
+        }
+      }
+
+     
+    }
   },
   watch: {
     currentVolume: function () {

src/components/VideoPlayer/progress-bar.vue

@@ -92,7 +92,7 @@ export default {
 
         this.$emit("updateProgress", current);
       // }
-      
+
     },
     move(e) {
       if (this.is_mousedown_progress) {
@@ -124,7 +124,7 @@ export default {
         // 禁止拖动
         if(!this.isDrag && time && arr[this.blobId] < current) return;
         this.$emit("updateProgress", current);
-        
+
       }
     },
   },
@@ -176,4 +176,4 @@ export default {
 .progress-bar:hover .progress-current::after {
   opacity: 1;
 }
-</style>
+</style>

src/views/Forward.vue

@@ -2,7 +2,7 @@
   <div class="box" :class="{ incl: url.includes('projectdetails') }">
     <portal-header style="background: #387DF7;" :hideSearch="true" textColor="#ffffff"></portal-header>
         <iframe :src="url" style="width: 100%;height: 100%;" frameborder="0" ref="iframe"></iframe>
-    <portal-footer></portal-footer>
+    <portal-footer v-if="isShowFooter"></portal-footer>
   </div>
 </template>
 <script>
@@ -16,7 +16,8 @@ import portalFooter from "@/components/PortalFooter.vue";
     data(){
       return {
        url: "",
-       boeUrl:process.env.VUE_APP_BOE_WEB_URL
+       boeUrl:process.env.VUE_APP_BOE_WEB_URL,
+       isShowFooter:true
       }
     },
     mounted() {
@@ -24,6 +25,10 @@ import portalFooter from "@/components/PortalFooter.vue";
       let to = this.$route.query.to;//跳转的地址，以 /开头的地址
       let urlPre=window.location.protocol+'//'+window.location.host;
       this.url=urlPre+to
+
+      if(to.includes('growthList')){
+        this.isShowFooter = false
+      }
       if(params){
          this.url=this.url+'?'+params;
       }

src/views/Login.vue

@@ -1,3 +1,4 @@
+<!--
 <template>
   <div class="login" :style="`background: url(${webBaseUrl}/temp/background.jpg) no-repeat`">
     <el-form :model="form" ref="form" :rules="rules">
@@ -24,7 +25,7 @@
       <el-form-item>
         <section>
           <el-checkbox v-model="rememberMe">记住密码</el-checkbox>
-          <!-- <span>忘记密码</span> -->
+          &lt;!&ndash; <span>忘记密码</span> &ndash;&gt;
         </section>
       </el-form-item>
       <el-form-item><el-button type="primary" @click="loginSubmit">点击登录</el-button></el-form-item>
@@ -194,3 +195,4 @@
   }
 }
 </style>
+-->

src/views/case/ManageList.vue

@@ -52,7 +52,7 @@
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button-group>
-            <el-button style="margin:0 5px" type="text" v-if="scope.row.recommendRank === ''" @click="suggest(scope.row)" icon="el-icon-medal">榜单推荐</el-button>
+            <el-button style="margin:0 5px" type="text" v-if="scope.row.recommendRank === ''||scope.row.recommendRank === null" @click="suggest(scope.row)" icon="el-icon-medal">榜单推荐</el-button>
             <!-- <el-button type="text" @click="shareItem(scope.row)"  icon="el-icon-share" style="margin:0 5px">推荐</el-button> -->
             <el-button style="margin:0 5px" v-if="!scope.row.isTop && scope.row.confidentialityLevel == '内部'" type="text"
               @click="setTop(scope.row)" icon="el-icon-top">置顶</el-button>

src/views/course/ManageList.vue

@@ -195,7 +195,15 @@
       </template>
     </el-dialog>
     <!--课程管理-->
-    <el-dialog custom-class="g-dialog" title="课程学习管理" width="900px" :visible.sync="manageStudy.dlgShow" :close-on-click-modal="false">
+    <el-dialog
+        custom-class="g-dialog"
+        title="课程学习管理"
+        width="900px"
+        height="900px"
+        :visible.sync="manageStudy.dlgShow"
+        :close-on-click-modal="false"
+
+        >
       <manager :manageStudyData="manageStudyData" :isShowDialog="manageStudy.dlgShow"></manager>
       <template #footer>
         <el-button @click="manageStudy.dlgShow = false">关闭</el-button>
@@ -668,8 +676,10 @@ export default {
       }
       apiCourse.pageList(this.params).then(rs=>{
           if(rs.status==200){
-            this.pageData = rs.result.list;
+            this.pageData = rs.result.list ? rs.result.list : [];
+            // this.pageData = rs.result.list;
             this.page.count = rs.result.count;
+            this.page.pageSize = rs.result.pageSize;
           }else{
             return this.$message.error(rs.message);
           }
@@ -939,4 +949,8 @@ export default {
     }
   }
 }
+
+.el-dialog__body {
+  overflow: hidden;
+}
 </style>

src/views/course/Mylecnotes.vue

@@ -1,206 +1,206 @@
 <template>
-     <div style="padding: 12px 32px 10px 12px;">
-      <div style="display: flex;justify-content: flex-start;">
+  <div style="padding: 12px 32px 10px 12px;">
+   <div style="display: flex;justify-content: flex-start;">
 
-        <div><el-input v-model="keyword" placeholder="输入课程名称搜索" clearable></el-input></div>
-        <div style="padding-left: 10px;"><el-button @click="recordList()" type="primary" icon="el-icon-search">搜索</el-button></div>
-        <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" @click="keyword = ''" type="primary" >重置</el-button></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: 0px 5px;"><el-button type="primary" @click="exportStudentOfTearcher()" icon="el-icon-search" size="small" round>导出学员信息</el-button></div>
-      </div>
-      <div class="Export">
-        <!-- <div style="padding-left: 10px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div> -->
-        <!-- <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary" size="small" round>导出学员信息</el-button></div> -->
-      </div>
-      <div style="margin-top:20px;">
-        <el-table :data="pageData" border stripe>
-            <el-table-column
-            label="课程时间"
-            prop="courseTime"
-            width="200px">
-            </el-table-column>
-            <el-table-column
-            label="课程名称"
-            prop="courseName"
-            width="200px">
-            </el-table-column>
-            <el-table-column
-            label="开课场地"
-            prop="address"
-            width="240px">
-            </el-table-column>
-            <el-table-column
-            label="所属课程"
-            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>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
+     <div><el-input v-model="keyword" placeholder="输入课程名称搜索" clearable></el-input></div>
+     <div style="padding-left: 10px;"><el-button @click="recordList()" type="primary" icon="el-icon-search">搜索</el-button></div>
+     <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" @click="keyword = ''" type="primary" >重置</el-button></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: 0px 5px;"><el-button type="primary" @click="exportStudentOfTearcher()" icon="el-icon-search" size="small" round>导出学员信息</el-button></div>
+   </div>
+   <div class="Export">
+     <!-- <div style="padding-left: 10px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div> -->
+     <!-- <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary" size="small" round>导出学员信息</el-button></div> -->
+   </div>
+   <div style="margin-top:20px;">
+     <el-table :data="pageData" border stripe>
+         <el-table-column
+         label="课程时间"
+         prop="courseTime"
+         width="200px">
+         </el-table-column>
+         <el-table-column
+         label="课程名称"
+         prop="courseName"
+         width="200px">
+         </el-table-column>
+         <el-table-column
+         label="开课场地"
+         prop="address"
+         width="240px">
+         </el-table-column>
+         <el-table-column
+         label="所属课程"
+         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>
+         </template>
+       </el-table-column>
+     </el-table>
+   </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 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>
+ </div>
 </template>
 
 <script>
 import apiCourse from '../../api/boe/courseRecord.js';
 import { mapGetters } from 'vuex';
 export default {
-  data(){
-    return {
-        pageData:[],
-        keyword:'',
-        pageInfo:{},
-    }
-  },
+data(){
+ return {
+     pageData:[],
+     keyword:'',
+     pageInfo:{},
+ }
+},
 
-  mounted() {
-    this.recordList(1);
+mounted() {
+ this.recordList(1);
 
-  },
-  computed: {
-    ...mapGetters(['userInfo'])
-  },
+},
+computed: {
+ ...mapGetters(['userInfo'])
+},
 
-  methods: {
+methods: {
 
-      // 导出所有记录
-      exportFile(){
-        let req = {
-          userId: this.userInfo.sysId
-          // userId:"70F80F4E-34BA-10AB-894A-8FA812B19637"
-        }
-        apiCourse.courseRecordExport(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);
-        })
-      },
+   // 导出所有记录
+   exportFile(){
+     let req = {
+       userId: this.userInfo.sysId
+       // userId:"70F80F4E-34BA-10AB-894A-8FA812B19637"
+     }
+     apiCourse.courseRecordExport(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);
+     })
+   },
 
 
-      // 导出课程下的学员信息
-      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);
-        })
-      },
+   // 导出课程下的学员信息
+   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);
-        })
-      },
+   // 导出教师下的所有授课记录下的学员信息
+   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',
-              message: res.message
-            });
-          }
-        })
-      },
+   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',
+           message: res.message
+         });
+       }
+     })
+   },
 
-      // 每页显示的条数事件
-      handleSizeChange(val){
-        this.pageInfo.pageSize = val;
-        this.recordList(1);
-      },
-      // 显示制定页的数据
-      handleCurrentChange(val){
-        this.pageInfo.pageIndex = val;
-        this.recordList(this.pageInfo.pageIndex);
-      },
+   // 每页显示的条数事件
+   handleSizeChange(val){
+     this.pageInfo.pageSize = val;
+     this.recordList(1);
+   },
+   // 显示制定页的数据
+   handleCurrentChange(val){
+     this.pageInfo.pageIndex = val;
+     this.recordList(this.pageInfo.pageIndex);
+   },
 
-  },
+},
 
 }
 </script>
 
 <style lang="scss" scoped>
 .Export{
-  display: flex;
-  padding-top: 10px;
+display: flex;
+padding-top: 10px;
 }
 </style>

src/views/growth/index.vue

@@ -4,18 +4,6 @@
       <div class="navbar">
         <div style="display: flex; flex: 1">
           <div class="nav-title">我的专业力必修</div>
-          <div class="nav-total">
-            <div class="total-num">{{ totalData.total }}</div>
-            <div class="total-text">总任务数</div>
-          </div>
-          <div class="nav-total">
-            <div class="total-num">{{ totalData.completed }}</div>
-            <div class="total-text">已完成数量</div>
-          </div>
-          <div class="nav-total">
-            <div class="total-num">{{ totalData.unfinished }}</div>
-            <div class="total-text">未完成数量</div>
-          </div>
         </div>
       </div>
 
@@ -45,92 +33,108 @@
             <div class="growth-btn" @click="jumpRouter(item)">去学习</div>
           </div>
         </div>
-        <div class="tip-title">说明</div>
-        <div class="tip-content">
-          {{ item.description || "暂无说明" }}
-        </div>
+        <template v-if="item.description">
+          <div class="tip-title">说明</div>
+          <div class="tip-content">
+            {{ item.description || "暂无说明" }}
+          </div>
+        </template>
+
         <div class="progress-title">学习进度</div>
 
         <div class="progress-content">
           <div class="f-j-b" style="margin-bottom: 10px">
             <div class="f-a-c">
-              <div style="font-weight: 700; font-size: 16px; color: #333333">
-                必修进度
-              </div>
-              <div style="font-size: 20px; color: #999999; margin-left: 12px">
+              <div style="font-size: 16px; color: #333333">必修进度</div>
+              <div style="font-size: 18px; color: #999999; margin-left: 12px">
                 {{ item.requiredTaskCompletedNum }}/{{ item.requiredTaskNum }}
               </div>
             </div>
-            <div style="font-weight: bold; font-size: 20px; color: #0077ec">
+            <div style="font-size: 18px; color: #0077ec">
               {{ requiredTaskCompletionRate(item) }}%
             </div>
           </div>
           <el-progress
-            :stroke-width="8"
+            :stroke-width="6"
             :show-text="false"
             :percentage="requiredTaskCompletionRate(item)"
+            color="#0077EC"
           ></el-progress>
         </div>
-        <div class="progress-content">
-          <div class="f-j-b" style="margin-bottom: 10px">
-            <div class="f-a-c">
-              <div style="font-weight: 700; font-size: 16px; color: #333333">
-                选修进度
+        <template v-if="item.electiveTaskNum !== 0">
+          <div class="progress-content">
+            <div class="f-j-b" style="margin-bottom: 10px">
+              <div class="f-a-c">
+                <div style="font-size: 16px; color: #333333">选修进度</div>
+                <div style="font-size: 18px; color: #999999; margin-left: 12px">
+                  {{ item.electiveTaskCompletedNum }}/{{ item.electiveTaskNum }}
+                </div>
+                <el-tooltip
+                  class="item"
+                  effect="light"
+                  :content="`还需完成${item.electivePoorNum}个选修任务`"
+                  placement="top-start"
+                >
+                  <i class="el-icon-question"></i>
+                </el-tooltip>
               </div>
-              <div style="font-size: 20px; color: #999999; margin-left: 12px">
-                {{ item.electiveTaskCompletedNum }}/{{ item.electiveTaskNum }}
+              <div style="font-size: 18px; color: #0077ec">
+                {{ electiveTaskCompletionRate(item) }}%
               </div>
             </div>
-            <div style="font-weight: bold; font-size: 20px; color: #0077ec">
-              {{ electiveTaskCompletionRate(item) }}%
-            </div>
+            <el-progress
+              :stroke-width="6"
+              :show-text="false"
+              color="#0077EC"
+              :percentage="electiveTaskCompletionRate(item)"
+            ></el-progress>
           </div>
-          <el-progress
-            :stroke-width="8"
-            :show-text="false"
-            :percentage="electiveTaskCompletionRate(item)"
-          ></el-progress>
-        </div>
+        </template>
         <div class="progress-content">
           <div class="f-j-b" style="margin-bottom: 10px">
             <div class="f-a-c">
-              <div style="font-weight: 700; font-size: 16px; color: #333333">
-                总进度
-              </div>
-              <div style="font-size: 20px; color: #999999; margin-left: 12px">
+              <div style="font-size: 16px; color: #333333">总进度</div>
+              <div style="font-size: 18px; color: #999999; margin-left: 12px">
                 {{ item.totalTaskCompletedNum }}/{{ item.totalTaskNum }}
               </div>
             </div>
-            <div style="font-weight: bold; font-size: 20px; color: #0077ec">
+            <div style="font-size: 18px; color: #0077ec">
               {{ totalTaskCompletionRate(item) }}%
             </div>
           </div>
           <el-progress
-            :stroke-width="8"
+            :stroke-width="6"
             :show-text="false"
+            color="#0077EC"
             :percentage="totalTaskCompletionRate(item)"
           ></el-progress>
         </div>
-      </div>
-    </div>
-    <template v-if="!list || list.length < 2"></template>
-    <div class="growth-right">
-      <div class="title">专业力必修</div>
-      <div
-        :key="item.id"
-        class="item-growth"
-        :class="activeItem.id == item.id ? 'active' : ''"
-        v-for="item of list"
-      >
-        <div class="icon"></div>
-        <div @click="handlerAnchor(item)">
-          {{ item.growthName }}
+        <div class="growth-bg-icon">
+          <img src="@/assets/images/growth/growth-bg-icon.png" />
         </div>
       </div>
+      <template v-if="!list.length">
+        <div class="empty">
+          <el-empty :image-size="200"></el-empty>
+        </div>
+      </template>
     </div>
-    <template v-if="!list.length">
-      <el-empty :image-size="200"></el-empty>
-    </template>
+    <!-- <template v-if="!list || list.length < 2">
+      <div class="growth-right">
+        <div class="title">专业力必修</div>
+        <div
+          :key="item.id"
+          class="item-growth"
+          :class="activeItem.id == item.id ? 'active' : ''"
+          v-for="item of list"
+        >
+          <div class="icon"></div>
+          <div @click="handlerAnchor(item)">
+            {{ item.growthName }}
+          </div>
+        </div>
+      </div>
+    </template> -->
   </div>
 </template>
 <script>
@@ -166,6 +170,8 @@ export default {
           num = num * 100;
           num = num.toFixed(0);
           return Number(num);
+        } else if (item.electiveTaskNum == 0) {
+          return 100;
         } else {
           return 0;
         }
@@ -237,6 +243,18 @@ export default {
   justify-content: center;
 }
 .growth {
+  .empty {
+    height: 600px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background-color: #ffffff;
+  }
+  .el-icon-question {
+    color: #387df7;
+    font-size: 16px;
+    margin-left: 5px;
+  }
   .handler-add-padding {
     padding: 100px 38px 66px 40px !important;
     margin-top: -80px;
@@ -250,8 +268,14 @@ export default {
       background: #ffffff;
       padding: 30px 38px 66px 40px;
       margin-bottom: 35px;
+      position: relative;
+      .growth-bg-icon {
+        position: absolute;
+        right: 92px;
+        bottom: 0;
+      }
       .progress-title {
-        font-weight: 700;
+        // font-weight: 700;
         font-size: 18px;
         color: #000000;
         margin: 28px 0 20px 0;
@@ -260,16 +284,15 @@ export default {
         margin-bottom: 28px;
       }
       .tip-title {
-        font-weight: 700;
+        // font-weight: 700;
         font-size: 18px;
         color: #000000;
         margin: 30px 0 10px 0;
       }
       .tip-content {
-        font-weight: 700;
-        font-size: 14px;
+        font-size: 16px;
         color: #333333;
-        line-height: 40px;
+        line-height: 30px;
       }
       .growth-nav {
         display: flex;
@@ -279,12 +302,12 @@ export default {
         border-bottom: 2px solid #f5f5f5;
       }
       .growth-name {
-        font-weight: 500;
+        font-weight: bold;
         font-size: 18px;
         color: #0071ed;
       }
       .growth-state {
-        font-size: 14px;
+        font-size: 15px;
         margin-right: 18px;
       }
       .growth-btn {
@@ -303,14 +326,15 @@ export default {
     .navbar {
       display: flex;
       align-items: center;
-      height: 130px;
+      height: 90px;
       padding-left: 40px;
       margin-bottom: 10px;
       color: #ffffff;
       background-image: url(../../assets/images/growth/growth-bg.png);
+      background-size: 100% 100%;
       .nav-title {
         font-weight: 700;
-        font-size: 22px;
+        font-size: 18px;
         margin-right: 10%;
       }
       .nav-total {

src/views/hotforum/Index.vue

@@ -22,7 +22,7 @@
           {img:'01',url:'1265897142383042560'},
           {img:'02',url:'1265697724606210048'},
           {img:'003',url:'1280185851054231552'},
-          {img:'4',url:''},
+          {img:'04',url:'1321778585966247936'},
         ],
       }
     },
@@ -97,7 +97,7 @@
       padding: 28px;
       padding-top: 62px;
       margin-bottom: 59px;
-      
+
       .img {
         width: 100%; // 图片宽度占满item宽度
         height: auto; // 自动调整高度
@@ -132,7 +132,7 @@
       padding: 14px;
       padding-top: 26px;
       margin-bottom: 30px;
-      
+
       .img {
         width: 100%; // 图片宽度占满item宽度
         height: auto; // 自动调整高度
@@ -176,4 +176,4 @@
   }
 }
 }
-</style>
+</style>

src/views/portal/case/Index.vue

@@ -185,11 +185,11 @@
           <div class="back_num" v-if="numIsFalse">
             <div class="search_div_num">
               当前已检索 <span style="color:#FF4040 ;">
-                {{ caseList.count }}</span> 条数据
+                {{ this.caseList.count }}</span> 条数据
             </div>
           </div>
           <div class="data-content">
-            <div v-for="item in caseList.list" :key="isTimeData?item.browsingHistoryId : item.id" class="case-list">
+            <div v-for="item in this.caseList.list" :key="isTimeData?item.browsingHistoryId : item.id" class="case-list">
               <div class="case-info">
                 <div class="case-info-cont">
                   <!-- <router-link :to="'/case/detail?id=' + item.id"> -->
@@ -270,7 +270,7 @@
                 </div>
               </div>
             </div>
-            <div v-if="caseList.showPagCount > queryCondition.pageSize">
+            <div v-if="this.caseList.showPagCount > queryCondition.pageSize">
               <pagination :size="queryCondition.pageSize" :total="caseList.count" :page="queryCondition.pageIndex"
                 layout="total, prev, pager, next, jumper" @change-page="currentChange"></pagination>
             </div>
@@ -279,7 +279,7 @@
             <!-- <span class="pag-text" @click="loadMore()" v-if="moreState == 1">加载更多</span>
             <span class="pag-text-msg" v-else-if="moreState == 2">数据加载中</span>
             <span class="pag-text-msg" v-else-if="moreState == 3">没有更多数据了</span> -->
-            <span class="notcoures" v-if="caseList.list.length == 0">
+            <span class="notcoures" v-if="this.caseList.list.length == 0">
               <img :src="`${webBaseUrl}/images/nocase.png`" alt="">
               <h5>暂无案例，请优先学习其它案例吧～</h5>
             </span>
@@ -555,7 +555,7 @@ export default {
         name: '',
         years: [],
         // 随机
-        notInIds: [],//重复的id
+        // notInIds: [],//重复的id
         orderField: "id",
         orderAsc: false,//排序
         sysType1:'',
@@ -1507,7 +1507,7 @@ export default {
                 };
               });
               res.result.list.forEach(item=>{
-                item.viewRankTags = item.viewRankTags.slice(0,2)
+                item.viewRankTags = item.viewRankTags?.slice(0,2)||[]
               })
               this.caseList.list = res.result.list
               this.getCaseUserData(res.result.list);
@@ -1562,7 +1562,7 @@ export default {
                 };
               });
               res.result.list.forEach(item=>{
-                item.viewRankTags = item.viewRankTags.slice(0,2)
+                item.viewRankTags = item.viewRankTags?.slice(0,2)||[]
               })
               this.caseList.list = res.result.list
               this.getCaseUserData(res.result.list);
@@ -1599,12 +1599,17 @@ export default {
           } else {
             this.moreState = 3;
           }
-          // console.log(res?.result?.list ,'有没有数据');
+          if(res.result.list.length ===0){
+            this.moreState = 3;
+            this.isSeach = false;
+          }
+          console.log(res?.result?.list ,'有没有数据1');
           res.result.list.forEach(item=>{
-            item.viewRankTags = item.viewRankTags.slice(0,2)
+            item.viewRankTags = item.viewRankTags?.slice(0,2)||[]
           })
+          console.log(res?.result?.list ,'有没有数据2');
           this.caseList.list = res.result.list
-          this.getCaseUserData(res.result.list);
+          // this.getCaseUserData(res.result.list);
           // 给所有的赋值
           this.caseList.count = res.result.count;
           this.caseList.showPagCount = res.result.count;

src/views/study/Courses.vue

@@ -253,8 +253,8 @@ export default {
         if(res.status==200){
             let localCourseIds=[];//本地在线课程的id集合
             res.result.list.forEach(item=>{
-              if(item.courseImage.startsWith('/upload')){
-                 item.courseImage=$this.fileUrl+item.courseImage.substring(7)
+              if(item.courseImage?.startsWith('/upload')){
+                 item.courseImage=$this.fileUrl+item.courseImage?.substring(7)
               }
               if(item.source==2){
                 localCourseIds.push(item.id);

src/views/study/coursenew.vue

@@ -167,7 +167,6 @@
             </div>
             <!-- 课程单元  -->
             <div class="course-units" v-if="tab == 1">
-
               <div :style="`height: ${controlHeight}px;overflow-y: auto;`">
                 <div class="catalog" v-if="courseInfo.type == 20">
                   <div  v-for="(item, index) in catalogTree" :key="index" :name="index">
@@ -292,7 +291,8 @@
                     <!-- <span style="font-size: 12px; color:#666666 ;">( {{cutOrgNamePath(item.authorInfo.orgInfo)}} )</span> -->
                 </div>
                 <!-- <div class="teacher-remark" v-html="item.authorInfo.sign"></div> -->
-                <div class="teacher-remark">{{cutOrgNamePath(item.authorInfo.orgInfo)}}</div>
+                <div v-if="item.teacherType === 1 " class="teacher-remark">{{cutOrgNamePath(item.authorInfo.orgInfo)}}</div>
+                <div v-else>{{item.supplier}}</div>
               </div>
               <div  style="padding-top:15px;width:70px;">
                 <followButton v-if="item.teacherName!=='BOE教师'" :auto="true" size="small" :aid="item.teacherId"></followButton>
@@ -755,7 +755,7 @@
         if (this.contentData.status < 2) {
           // this.contentData.status = 2; //进行中
           if(r.contentType != 61&&r.contentType != 20 && r.contentType != 10){
-            setTimeout(() => {              
+            setTimeout(() => {
               this.isContentTypeTwo = r.contentType
               $this.isShowTime()
               }, 2000);
@@ -817,7 +817,7 @@
             //console.log(h,$this.controlHeight,'$this.controlHeight');
         })
 
-        
+
         //console.log('this.contentData11:',this.contentData,this.curriculumData)
         // 视频设置禁用处理逻辑,如果用户已全部观看完该视频，则设置为能全部拖动的逻辑，把isDrag设置为true即可,同时删除本地存储的数据
         if(this.contentData.progressVideo ===1){
@@ -1140,6 +1140,8 @@
         //   }
         // }
         this.playerBoxShow = false;
+        // this.onPlayerPlayFullscreen()
+        // this.$watermark.set(this.userInfo.name + this.userInfo.loginName);
         let $this = this;
         //这里有些不准备，如果文件未能加载，这个事件就是错误的
         this.isAppendTime=true;
@@ -1157,6 +1159,7 @@
         //   }
         // }
       },
+
       onFullscreen(full) {
         let divId = 'videowatermark';
         var div = document.getElementById('myVideoPlayer')
@@ -1176,9 +1179,12 @@
             "position:absolute;pointer-events: none; width: 100%;height: 100%;top:0;left:0;bottom: 0;right: 0; display: flex;justify-content: center;flex-wrap: wrap;overflow: hidden; opacity:0.3;padding-top:10px";
           div.appendChild(div3);
         } else {
+          console.log("去除水印 ---- gx ----");
           var markDiv = div.querySelector("#" + divId);
+          console.log("去除水印 ---- gx markDiv ----",markDiv);
           if (markDiv) {
-      	     div.removeChild(markDiv);
+              console.log("执行去除水印 ---- gx markDiv ----",markDiv);
+      	      div.removeChild(markDiv);
           }
         }
       },
@@ -1546,7 +1552,7 @@
           }
         }
       },
-      progress(val) { 
+      progress(val) {
         const progressValue = parseFloat(val) * 100;
         this.sendEventProgress = Number(progressValue.toFixed(2));
        },

vue.config.js

@@ -124,11 +124,17 @@ module.exports = {
     // 114.115.162.187 测试环境
     // 192.168.0.107 晋宇
     proxy: {
+      // "/professional": {
+      //   // target: 'https://u-pre.boe.com',
+      //   // target: 'http://192.168.86.195:32002',
+      //   target: 'http://192.168.68.211:32002',
+      //   changeOrigin: true,
+      // },
       "/growth": {
         target: 'https://u-pre.boe.com',
+        // target: 'http://192.168.86.195:32002',
         changeOrigin: true,
       },
-      
       '/manageApi': {
         // 目标代理服务器地址
         target: 'https://u-pre.boe.com',