修改前端进度条

This reverts commit 6208caf4ca.

package-lock.json

@@ -39,8 +39,7 @@
         "vue-pdf": "^4.2.0",
         "vue-quill-editor": "^3.0.6",
         "vue-router": "^3.5.2",
-        "vuex": "^3.6.2",
+        "vuex": "^3.6.2"
-        "wangeditor": "^4.7.15"
       },
       "devDependencies": {
         "@vue/cli-plugin-babel": "~4.5.0",
@@ -1446,6 +1445,7 @@
       "version": "7.18.3",
       "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.18.3.tgz",
       "integrity": "sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==",
+      "dev": true,
       "dependencies": {
         "regenerator-runtime": "^0.13.4"
       },
@@ -1453,17 +1453,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/runtime-corejs3": {
-      "version": "7.28.4",
-      "resolved": "https://registry.npmmirror.com/@babel/runtime-corejs3/-/runtime-corejs3-7.28.4.tgz",
-      "integrity": "sha512-h7iEYiW4HebClDEhtvFObtPmIvrd1SSfpI9EhOeKk4CtIK/ngBWFpuhCzhdmRKtg71ylcue+9I6dv54XYO1epQ==",
-      "dependencies": {
-        "core-js-pure": "^3.43.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/template": {
       "version": "7.16.7",
       "resolved": "https://registry.npmmirror.com/@babel/template/-/template-7.16.7.tgz",
@@ -4632,16 +4621,6 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/core-js-pure": {
-      "version": "3.46.0",
-      "resolved": "https://registry.npmmirror.com/core-js-pure/-/core-js-pure-3.46.0.tgz",
-      "integrity": "sha512-NMCW30bHNofuhwLhYPt66OLOKTMbOhgTTatKVbaQC3KRHpTCiRIBYvtshr+NBYSnBxwAFhjW/RfJ0XbIjS16rw==",
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
     "node_modules/core-util-is": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
@@ -11892,7 +11871,8 @@
     "node_modules/regenerator-runtime": {
       "version": "0.13.9",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+      "dev": true
     },
     "node_modules/regenerator-transform": {
       "version": "0.15.0",
@@ -15217,16 +15197,6 @@
       "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz",
       "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw=="
     },
-    "node_modules/wangeditor": {
-      "version": "4.7.15",
-      "resolved": "https://registry.npmmirror.com/wangeditor/-/wangeditor-4.7.15.tgz",
-      "integrity": "sha512-aPTdREd8BxXVyJ5MI+LU83FQ7u1EPd341iXIorRNYSOvoimNoZ4nPg+yn3FGbB93/owEa6buLw8wdhYnMCJQLg==",
-      "dependencies": {
-        "@babel/runtime": "^7.11.2",
-        "@babel/runtime-corejs3": "^7.11.2",
-        "tslib": "^2.1.0"
-      }
-    },
     "node_modules/watchpack": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
@@ -17501,18 +17471,11 @@
       "version": "7.18.3",
       "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.18.3.tgz",
       "integrity": "sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==",
+      "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.4"
       }
     },
-    "@babel/runtime-corejs3": {
-      "version": "7.28.4",
-      "resolved": "https://registry.npmmirror.com/@babel/runtime-corejs3/-/runtime-corejs3-7.28.4.tgz",
-      "integrity": "sha512-h7iEYiW4HebClDEhtvFObtPmIvrd1SSfpI9EhOeKk4CtIK/ngBWFpuhCzhdmRKtg71ylcue+9I6dv54XYO1epQ==",
-      "requires": {
-        "core-js-pure": "^3.43.0"
-      }
-    },
     "@babel/template": {
       "version": "7.16.7",
       "resolved": "https://registry.npmmirror.com/@babel/template/-/template-7.16.7.tgz",
@@ -20309,11 +20272,6 @@
         }
       }
     },
-    "core-js-pure": {
-      "version": "3.46.0",
-      "resolved": "https://registry.npmmirror.com/core-js-pure/-/core-js-pure-3.46.0.tgz",
-      "integrity": "sha512-NMCW30bHNofuhwLhYPt66OLOKTMbOhgTTatKVbaQC3KRHpTCiRIBYvtshr+NBYSnBxwAFhjW/RfJ0XbIjS16rw=="
-    },
     "core-util-is": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
@@ -26395,7 +26353,8 @@
     "regenerator-runtime": {
       "version": "0.13.9",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+      "dev": true
     },
     "regenerator-transform": {
       "version": "0.15.0",
@@ -29191,16 +29150,6 @@
       "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz",
       "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw=="
     },
-    "wangeditor": {
-      "version": "4.7.15",
-      "resolved": "https://registry.npmmirror.com/wangeditor/-/wangeditor-4.7.15.tgz",
-      "integrity": "sha512-aPTdREd8BxXVyJ5MI+LU83FQ7u1EPd341iXIorRNYSOvoimNoZ4nPg+yn3FGbB93/owEa6buLw8wdhYnMCJQLg==",
-      "requires": {
-        "@babel/runtime": "^7.11.2",
-        "@babel/runtime-corejs3": "^7.11.2",
-        "tslib": "^2.1.0"
-      }
-    },
     "watchpack": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",

package.json

@@ -46,8 +46,7 @@
     "vue-pdf": "^4.2.0",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "^3.5.2",
-    "vuex": "^3.6.2",
+    "vuex": "^3.6.2"
-    "wangeditor": "^4.7.15"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "~4.5.0",

src/api/httpAjax.js

@@ -1,208 +0,0 @@
-import axios from 'axios'
-import qs from 'qs'
-import {Notification, MessageBox, Message} from 'element-ui'
-import store from '@/store'
-import {getToken} from '@/utils/token'
-import errorCode from '@/utils/errorCode'
-
-/**
- *request请求 axios.request(config)
- *requestJson请求 axios.request(config)
- *get请求 axios.get(url[, config])
- *post请求 axios.post(url[, data[, config]])
- *postJson请求 axios.post(url[, data[, config]])
- *put请求 axios.put(url[, data[, config]])
- *putJson请求 axios.put(url[, data[, config]])
- *patch请求 axios.patch(url[, data[, config]])
- *patchJson请求 axios.patch(url[, data[, config]])
- *delete请求 axios.delete(url[, config])
- */
-
-
-// const ReLoginUrl=process.env.VUE_APP_LOGIN_URL;
-const TokenName = 'token';
-/**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
-//只是用于发送json对象数据时使用post,put,patch
-/**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
-//只是用于发送json对象数据时使用post,put,patch
-//用于普通的发送请求
-const formRequest = axios.create({
-  //headers:{'Content-Type':'application/x-www-form-urlencoded'},
-  // axios中请求配置有baseURL选项，表示请求URL公共部分
-  // baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
-  //超时
-  timeout: 10000,
-})
-//发送json对象的拦截器
-formRequest.interceptors.request.use(config => {
-  //是否需要设置 token
-  const isToken = (config.headers || {}).isToken === false
-  let curToken = getToken();
-  //curToken='eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzIzMTE2MTIsImV4cCI6MTY3MjMxODgxMiwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.a4f41376e994c5fcd3ab537ce17572ef4c633863f87785cf7b6ffa353e2ed51c';
-  if (curToken && !isToken) {
-    config.headers[TokenName] = curToken // 让每个请求携带自定义token 请根据实际情况自行修改
-  }
-  return config
-}, error => {
-  console.log(error)
-  Promise.reject(error)
-});
-formRequest.interceptors.response.use(res => {
-    //console.log(res);
-    const code = res.data.status || 200;
-    if (code === 200) {
-      return res.data
-    } else {
-      if (code === 401) {
-        // store.dispatch('LogOut').then(() => {
-        //    location.href = this.webBaseUrl + ReLoginUrl;
-        // })
-        console.error('', res.data);
-        return Promise.reject(new Error('接口返回未登录'))
-      } else if (code === 403) {
-        var msg = '当前操作没有权限';
-        Message({message: msg, type: 'error'});
-        return Promise.reject(new Error(msg))
-      } else {
-        //Message({message: res.data.message, type: 'error'});
-        //console.log('err' + res.data.error);
-        return res.data
-      }
-    }
-  },
-  error => {
-    console.log('err', error)
-    let {message} = error;
-    if (message == "Network Error") {
-      message = "网络异常，请稍后重试";
-    } else if (message.includes("timeout")) {
-      message = "网络异常或接口错误，请求超时";
-    } else if (message.includes("Request failed with status code")) {
-      message = "系统接口" + message.substr(message.length - 3) + "异常";
-    }
-    Message({
-      message: message,
-      type: 'error',
-      duration: 5 * 1000
-    })
-    return Promise.reject(error)
-  }
-)
-
-/**
- * request请求,可以自定义参数
- */
-const request = formRequest.request;
-
-/**
- * get请求 ,只有url
- */
-const get = function (baseURL, url) {
-  return request({
-    baseURL,
-    url: url,
-    method: 'get',
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-
-/**
- * post请求
- * @param {Object} url
- * @param {Object} postData
- */
-const post = function (baseURL, url, postData) {
-  // if (postData) {
-  //   postData = qs.stringify(postData);
-  // }
-  return request({
-    baseURL,
-    url: url,
-    method: 'post',
-    data: postData,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-//post请求
-const postForm = function (baseURL, url, data) {
-  return request({
-    baseURL,
-    url,
-    data,
-    method: 'post',
-    headers: {'Content-Type': 'application/x-www-form-urlencoded'}
-  });
-}
-//  const postJson=jsonRequest.post;
-
-const postJson = function (baseURL, url, postData) {
-  return request({
-    baseURL,
-    url: url,
-    method: 'post',
-    data: postData,
-    headers: {'Content-Type': 'application/json;charset=utf-8'},
-  })
-}
-
-// 导出文件请求定义
-const postJsonToFile = function (baseURL, url, postData) {
-  return request({
-    baseURL,
-    url: url,
-    method: 'post',
-    data: postData,
-    headers: {'Content-Type': 'application/json;charset=utf-8'},
-    responseType: 'blob'
-  })
-}
-
-const getJsonToFile = function (baseURL, url, postData) {
-  return request({
-    baseURL,
-    url: url,
-    method: 'get',
-    data: postData,
-    headers: {'Content-Type': 'application/json;charset=utf-8'},
-    responseType: 'blob'
-  })
-}
-
-/**
- * put请求
- */
-const put = function (baseURL, url, data) {
-  if (data) {
-    data = qs.stringify(data);
-  }
-  return request({
-    baseURL,
-    url: url,
-    method: 'put',
-    data: data,
-    headers: {'Content-Type': 'application/x-www-form-urlencoded'}
-  })
-}
-
-const putJson = function (baseURL, url, data) {
-  return request({
-    baseURL,
-    url: url,
-    method: 'put',
-    data: data,
-    headers: {'Content-Type': 'application/json;charset=utf-8'},
-  })
-}
-
-
-export default {
-  tokenName: TokenName,
-  request,
-  get,
-  post,
-  postJson,
-  postJsonToFile,
-  put,
-  putJson,
-  getJsonToFile
-}

src/api/modules/course.js

@@ -1,7 +1,7 @@
 /**
  * 课程的操作，课程的添加，修改，列表查询，课程的审核发布等操作。
  * 针对于管理员，教师的功能
- *
+ * 
  **/
 import ajax from '@/utils/xajax.js'
 
@@ -170,9 +170,7 @@ const updateContentOrders = function(cid,items) {
 const detail = function(id) {
     return ajax.get('/xboe/m/course/manage/detail?id=' + id);
 }
-const getDictIds = function(pid,type) {
+
-  return ajax.get(`/xboe/m/course/manage/getDictIds?pid=${pid}&type=${type}`);
-}
 /**
  * 更新内容的名称
  * @param {Object} data
@@ -276,7 +274,7 @@ const countWaitAudit = function() {
 }
 
 /**
- * [已用courseAudit中的hrbpAuditList替换]
+ * [已用courseAudit中的hrbpAuditList替换]
  * 当前用户需要审核的课程列表
  * @param {Object} query 同pageList
  */
@@ -285,9 +283,9 @@ const auditList = function(query) {
 }
 
 
-/**
+/**
- * 【已移到courseAudit中】
+ * 【已移到courseAudit中】
- * 教师需要审核的课程列表
+ * 教师需要审核的课程列表
  */
 const teacherAuditList = function(query) {
     return ajax.post('/xboe/m/course/audit/teacher-course', query);
@@ -448,7 +446,6 @@ export default {
     findUpdateLogs,
     getUpdateLog,
     detail,
-    getDictIds,
     saveContent,
     pageList,
     setEnabled,

src/api/new-employee/newEmployee.js

@@ -1,91 +0,0 @@
-import ajax from '../ajax';
-
-/**
- * 获取欢迎页数据
- */
-export function getWelcomeData() {
-  return ajax.get('/manageApi/stu/project/socialRecruit/enroll/getStudentEnrollInfo')
-}
-
-/**
- * 报名审批
- */
-export function enrollRequest() {
-  return ajax.get('/manageApi/stu/project/socialRecruit/enroll/socialRecruitRegistrationRequest')
-}
-
-/**
- * 获取学习列表
- * @param {Object} params - 参数对象
- * @param {string} params.type - 类型：''全部, 'course'在线课, 'exam'考试
- * @param {string} params.status - 状态：''全部, 'completed'已完成, 'incomplete'未完成
- * @param {number} params.pageIndex - 页码
- * @param {number} params.pageSize - 每页条数
- */
-export function getStudyList(params) {
-  return ajax.postJson('/boe/new-employee/study/list', params)
-}
-
-/**
- * 获取学习进度
- */
-export function getStudyProgress() {
-  return ajax.get('/boe/new-employee/study/progress')
-}
-
-/**
- * 下载成绩单
- */
-export function downloadScorecard() {
-  // 使用request方法支持responseType: 'blob'
-  return ajax.request({
-    url: '/boe/new-employee/study/scorecard/download',
-    method: 'get',
-    responseType: 'blob'
-  })
-}
-/**
- * 获取社招新员工项目信息
- * GET
- */
-export function getSzxygProjectInfo() {
-  return ajax.get('/manageApi/admin/project/getSzxygProjectInfo')
-}
-
-/**
- * 社招新员工培训及考试列表查询
- * POST
- * @param {Object} params
- * @param {number} params.pageNo - 页码
- * @param {number} params.pageSize - 每页条数
- * @param {string|number} params.studentId - 学员ID
- * @param {string|number} params.projectId - 项目ID
- */
-export function getStuProjectTaskList(data) {
-  return ajax.postJson('', '/manageApi/stu/project/getStuProjectTaskList', data)
-}
-
-/**
- * 学员项目进度明细查询
- * POST
- * @param {string|number} params.studentId - 学员ID
- * @param {string|number} params.projectId - 项目ID
- */
-export function getStuProjectProcess(data) {
-  return ajax.postJson('', `/manageApi/stu/project/getStuProjectTaskProgress`, data)
-}
-
-/**
- * 社招新员工培训在线课程成绩单下载
- * GET
- * @param {string|number} projectId - 项目ID
- * @param {string|number} studentId - 学员ID
- */
-export function downloadSocialRecruitReport(projectId, studentId) {
-  return ajax.request({
-    url: `/manageApi/stu/project/socialRecruit/report/download?projectId=${projectId}&studentId=${studentId}`,
-    method: 'get',
-    responseType: 'arraybuffer',
-  })
-}
-

src/api/phase2/index.js

@@ -1,7 +1,5 @@
 import ajax from '@/utils/xajax.js'
 import http from '../unionAjax'
-import httpAjax from '../httpAjax'
-
 const baseURL = process.env.VUE_APP_MANAGER_API_PATH;
 
 
@@ -49,18 +47,6 @@ const articlelist=function (type){
 const courselist=function (data){
   return ajax.post('/xboe/portal/index/courselist',data);
 }
-// 精品课信息列表
-const qualitylist=function (data){
-  return httpAjax.post(baseURL,'/quality/home/qualityItem',data);
-}
-// 精品课分页查询
-export const qualityPageList=function (data){
-  return httpAjax.post(baseURL,'/quality/home/qualityPages',data);
-}
-// 课程精品课标记时间年份列表
-export const qualityCourseTimeMark=function (){
-  return httpAjax.post(baseURL,'/quality/manage/qualityYearList',{});
-}
 /**
  * 首页新课程推荐列表
  */
@@ -75,7 +61,5 @@ export default {
   articlelist,
   courselist,
   newCases,
-  getRecommendList,
+  getRecommendList
-  qualitylist,
-  qualityPageList
 }

src/components/Course/courseForm.vue

@@ -565,13 +565,15 @@ export default {
         this.requireSaveCourse = true;
 
         console.log("--- watch比较 = ", oldVal.orgId, newVal.orgId);
-        this.checkOrgPermission(newVal.orgId);
+        if (newVal.orgId !== oldVal.orgId) {
+          console.log("--- watch newVal.orgId = ", newVal.orgId);
+          this.checkOrgPermission(newVal.orgId);
+        }
       },
       deep: true
     }
   },
   mounted() {
-    this.getDictIds();
     let extendFlag=this.$route.query.f; //是否是管理端过来的
     this.extendRefId=this.$route.query.refId;
     this.extendRefType=this.$route.query.refType;
@@ -602,8 +604,11 @@ export default {
         this.isPermission = false;
         return;
       }
-      console.log("--- this.dicts  = ",this.dicts)
       this.isPermission = this.dicts.includes(orgId);
+      this.courseInfo.device = 3;
+      if(this.isPermission){
+        this.courseInfo.device = 4;
+      }
       console.log("--- 监听结束 this.isPermission  = ",this.isPermission)
     },
     // 关键字的更改
@@ -910,21 +915,6 @@ export default {
       this.courseCoverurl = '';
       this.courseInfo.coverImg = '';
     },
-    //获取字典信息
-    async getDictIds() {
-      console.log("--- 获取字典信息 1  = ", this.dicts);
-      try {
-        const response = await apiCourse.getDictIds(637, 1); // 确保返回 Promise
-        console.log("--- 获取字典信息 2 result= ", response);
-
-        if (response.status === 200) {
-          this.dicts = response.result.dicts; // 正确提取 dicts
-          console.log("--- 获取字典信息 3 = ", this.dicts);
-        }
-      } catch (error) {
-        console.error("获取字典信息失败：", error);
-      }
-    },
     //获取课程信息
     async getDetail(id) {
       this.curCourseId = id;

src/components/CustomErrorMessage.vue

@@ -1,112 +0,0 @@
-<template>
-  <transition name="fade">
-    <div v-if="visible" class="custom-info-message" @click="handleClose">
-      <div class="message-content">
-        <div class="icon-wrapper">
-          <span class="icon-text">X</span>
-        </div>
-        <div class="message-text">{{ message }}</div>
-      </div>
-    </div>
-  </transition>
-</template>
-
-<script>
-export default {
-  name: "CustomErrorMessage",
-  data() {
-    return {
-      visible: false,
-      message: "",
-      timer: null,
-    };
-  },
-  methods: {
-    show(msg, duration = 3000) {
-      this.message = msg;
-      this.visible = true;
-
-      if (this.timer) {
-        clearTimeout(this.timer);
-      }
-
-      this.timer = setTimeout(() => {
-        this.hide();
-      }, duration);
-    },
-    hide() {
-      this.visible = false;
-      if (this.timer) {
-        clearTimeout(this.timer);
-        this.timer = null;
-      }
-    },
-    handleClose() {
-      this.hide();
-    },
-  },
-  beforeDestroy() {
-    if (this.timer) {
-      clearTimeout(this.timer);
-    }
-  },
-};
-</script>
-
-<style scoped>
-.custom-info-message {
-  position: fixed;
-  top: 20%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  z-index: 3000;
-  cursor: pointer;
-}
-
-.message-content {
-  display: flex;
-  align-items: center;
-  background: rgba(255, 241, 240, 1);
-  border-radius: 8px;
-  padding: 8px 16px;
-  border: 1px solid rgba(255, 204, 199, 1);
-}
-
-.icon-wrapper {
-  width: 16px;
-  height: 16px;
-  border-radius: 50%;
-  background: rgba(230, 31, 31, 1);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-right: 12px;
-  flex-shrink: 0;
-}
-
-.icon-wrapper .icon-text {
-  color: #fff;
-  font-size: 12px;
-  font-weight: 400;
-  font-style: normal;
-  line-height: 1;
-}
-
-.message-text {
-  color: rgba(0, 0, 0, 0.88);
-  font-size: 14px;
-  font-weight: 400;
-  line-height: 1.5;
-  flex: 1;
-}
-
-.fade-enter-active,
-.fade-leave-active {
-  transition: opacity 0.3s;
-}
-
-.fade-enter,
-.fade-leave-to {
-  opacity: 0;
-}
-</style>

src/components/CustomInfoMessage.vue

@@ -1,112 +0,0 @@
-<template>
-  <transition name="fade">
-    <div v-if="visible" class="custom-info-message" @click="handleClose">
-      <div class="message-content">
-        <div class="icon-wrapper">
-          <span class="icon-text">i</span>
-        </div>
-        <div class="message-text">{{ message }}</div>
-      </div>
-    </div>
-  </transition>
-</template>
-
-<script>
-export default {
-  name: "CustomInfoMessage",
-  data() {
-    return {
-      visible: false,
-      message: "",
-      timer: null,
-    };
-  },
-  methods: {
-    show(msg, duration = 3000) {
-      this.message = msg;
-      this.visible = true;
-
-      if (this.timer) {
-        clearTimeout(this.timer);
-      }
-
-      this.timer = setTimeout(() => {
-        this.hide();
-      }, duration);
-    },
-    hide() {
-      this.visible = false;
-      if (this.timer) {
-        clearTimeout(this.timer);
-        this.timer = null;
-      }
-    },
-    handleClose() {
-      this.hide();
-    },
-  },
-  beforeDestroy() {
-    if (this.timer) {
-      clearTimeout(this.timer);
-    }
-  },
-};
-</script>
-
-<style scoped>
-.custom-info-message {
-  position: fixed;
-  top: 20%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  z-index: 3000;
-  cursor: pointer;
-}
-
-.message-content {
-  display: flex;
-  align-items: center;
-  background: #ffffff;
-  border-radius: 8px;
-  padding: 8px 16px;
-  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-}
-
-.icon-wrapper {
-  width: 16px;
-  height: 16px;
-  border-radius: 50%;
-  background: rgba(22, 119, 255, 1);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-right: 12px;
-  flex-shrink: 0;
-}
-
-.icon-wrapper .icon-text {
-  color: #ffffff;
-  font-size: 12px;
-  font-weight: 400;
-  font-style: normal;
-  line-height: 1;
-}
-
-.message-text {
-  color: rgba(0, 0, 0, 0.88);
-  font-size: 14px;
-  font-weight: 400;
-  line-height: 1.5;
-  flex: 1;
-}
-
-.fade-enter-active,
-.fade-leave-active {
-  transition: opacity 0.3s;
-}
-
-.fade-enter,
-.fade-leave-to {
-  opacity: 0;
-}
-</style>

src/components/NewEmployeeGuideDialog.vue

@@ -1,185 +0,0 @@
-<template>
-  <el-dialog
-    :visible.sync="innerVisible"
-    :close-on-click-modal="false"
-    class="custom-strategy-dialog"
-    width="880px"
-    @close="handleClose"
-  >
-    <div class="strategy-container">
-      <div class="strategy-content">
-        <div class="strategy-title">转正攻略</div>
-        <div class="strategy-body">
-          <RichTextEditor v-model="modalContent" />
-        </div>
-      </div>
-      <div class="strategy-footer-btns">
-        <el-button
-          class="footer-btn"
-          type="primary"
-          :loading="processing"
-          @click="handleCancelClick"
-          v-if="showBtn"
-        >
-          关闭
-        </el-button>
-      </div>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import RichTextEditor from "@/components/RichTextEditor.vue";
-import { getSzxygProjectInfo } from "@/api/new-employee/newEmployee";
-
-export default {
-  name: "NewEmployeeGuideDialog",
-  components: { RichTextEditor },
-  props: {
-    visible: {
-      type: Boolean,
-      default: false,
-    },
-    processing: {
-      type: Boolean,
-      default: false,
-    },
-    showBtn: {
-      type: Boolean,
-      default: true,
-    },
-    onConfirm: {
-      type: Function,
-      default: null,
-    },
-    onCancel: {
-      type: Function,
-      default: null,
-    },
-  },
-  data() {
-    return {
-      modalContent: "",
-      innerVisible: this.visible,
-      hasLoadedOnce: false,
-    };
-  },
-  watch: {
-    visible(val) {
-      this.innerVisible = val;
-      if (val) {
-        this.fetchContent();
-      }
-    },
-    innerVisible(val) {
-      if (val !== this.visible) {
-        this.$emit("update:visible", val);
-      }
-    },
-  },
-  mounted() {
-    if (this.visible) {
-      this.fetchContent();
-    }
-  },
-  methods: {
-    async fetchContent() {
-      if (this.hasLoadedOnce) return;
-      try {
-        const res = await getSzxygProjectInfo();
-        this.modalContent =
-          (res && res.data && res.data.learningGuideConfig) || "";
-        this.hasLoadedOnce = true;
-      } catch (e) {
-        // 保底：避免影响弹窗展示
-        this.modalContent = "";
-      }
-    },
-    handleConfirmClick() {
-      if (typeof this.onConfirm === "function") {
-        this.onConfirm();
-      } else {
-        // 默认行为：关闭并派发事件
-        this.innerVisible = false;
-        this.$emit("confirm");
-      }
-    },
-    handleCancelClick() {
-      if (typeof this.onCancel === "function") {
-        this.onCancel();
-      } else {
-        this.innerVisible = false;
-        this.$emit("cancel");
-      }
-    },
-    handleClose() {
-      this.$emit("close");
-    },
-  },
-};
-</script>
-
-<style scoped>
-.custom-strategy-dialog >>> .el-dialog {
-  background: url("../assets/images/bg_yd.png");
-  background-size: cover;
-  border-radius: 18px;
-  overflow: hidden;
-  padding: 0;
-  box-shadow: 0 8px 32px rgba(0, 43, 121, 0.14);
-}
-.strategy-container {
-  position: relative;
-  min-height: 360px;
-  padding: 0px 40px 28px 40px;
-  border-radius: 18px;
-}
-.strategy-content {
-  position: relative;
-  z-index: 1;
-}
-.strategy-title {
-  font-size: 24px;
-  font-weight: bold;
-  color: #1e7cfa;
-  line-height: 32px;
-  margin-bottom: 18px;
-  text-align: left;
-  letter-spacing: 1px;
-}
-.strategy-body {
-  color: #444;
-  font-size: 15px;
-  min-height: 200px;
-  line-height: 2;
-  margin-bottom: 16px;
-  text-align: left;
-}
-.strategy-footer-btns {
-  display: flex;
-  margin-top: 18px;
-  z-index: 1;
-  position: relative;
-  gap: 14px;
-}
-.footer-btn {
-  min-width: 115px;
-  font-size: 16px;
-  border-radius: 6px;
-  height: 40px;
-}
-.footer-btn.el-button--primary {
-  background: linear-gradient(
-    90deg,
-    rgba(48, 116, 239, 1) 0%,
-    rgba(81, 146, 238, 1) 100%
-  );
-  border-color: #278cff;
-  color: #fff;
-  font-weight: bold;
-  width: 210px;
-  border-radius: 58px;
-}
-</style>
-
-

src/components/Portal/interactBar.vue

@@ -44,7 +44,7 @@
           <!-- <svg-icon v-else style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}" :icon-class="isFavorite?'scactive2':'xihuan'"></svg-icon> -->
            <div v-else class="is_favorite" :class="isFavorite?'is_favorite_a':'is_favorite'"></div>
         </el-tooltip>
-        <span v-if="!courseExclusive" class="interact-bar-value"> {{ data.favorites? data.favorites:data.hasCollect?number(data.hasCollect):1}}</span>
+        <span v-if="!courseExclusive" class="interact-bar-value"> {{ data.favorites? data.favorites:0}}</span>
       </div>
       <div v-if="shares" @click="addShare()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="分享" placement="top" :visible-arrow="false" popper-class="text-tooltip">
@@ -114,8 +114,6 @@ export default {
             shares:0,
             praises:0,
             views:0,
-             courseId:'',
-            courseName:''
           }
       }
     },
@@ -236,7 +234,7 @@ export default {
   created(){
   },
   mounted() {
-    if(this.data && (this.data.id||this.data.courseId) && !this.readonly){
+    if(this.data && this.data.id && !this.readonly){
        this.checkHas();
     }
 
@@ -310,7 +308,7 @@ export default {
         }
       let msgPageParams=this.pageParams;
       if(!msgPageParams){
-        msgPageParams=this.data.id ?this.data.id: this.data.courseId;
+        msgPageParams=this.data.id;
       }
       let message={
         content,
@@ -333,9 +331,9 @@ export default {
       })
     },
     checkHas(){
-      if(this.type>0 && !this.readonly && (this.data.id||this.data.courseId)){
+      if(this.type>0 && !this.readonly && this.data.id){
         if(this.favorites){
-          apiFavorites.has(this.type,(this.data.id || this.data.courseId)).then(rs=>{
+          apiFavorites.has(this.type,this.data.id).then(rs=>{
             if(rs.status==200 && rs.result){
               this.isFavorite=true;
             }else{
@@ -508,11 +506,9 @@ export default {
         return;
        }
       //需要判断是否已点赞，已点赞的不再加
-      console.log(this.data,'---------------');
-      
       let postData={
         objType:this.type,
-        objId:this.data.id ?this.data.id: this.data.courseId,
+        objId:this.data.id,
         title:'',
       }
       if(this.loading) {
@@ -520,7 +516,7 @@ export default {
         }
         this.loading=true;
       if(this.type==1){
-        postData.title=this.data.name?this.data.name:this.data.courseName;
+        postData.title=this.data.name;
       }else if(this.type==60){
         postData.title=this.data.content;
       } else if(this.type==5){
@@ -529,7 +525,7 @@ export default {
         postData.title=this.data.title;
       }
       if(this.isFavorite) {// 已经收藏，再次点击取消收藏
-        apiFavorites.remove(this.type,this.data.id ?this.data.id: this.data.courseId).then(res=>{
+        apiFavorites.remove(this.type,this.data.id).then(res=>{
           this.loading=false;
         if(res.status==200){
           this.isFavorite=false;
@@ -558,7 +554,7 @@ export default {
             this.$store.dispatch("unicomFavorites",true)
           }
           //if(this.type===2||this.type===4){
-            this.messageSave(this.data.id ?this.data.id: this.data.courseId,this.data.title,this.userInfo.name,this.data.sysCreateBy,this.data.sysCreateAid,'收藏了我发布的');
+            this.messageSave(this.data.id,this.data.title,this.userInfo.name,this.data.sysCreateBy,this.data.sysCreateAid,'收藏了我发布的');
           //}
           this.$message({message:'已加入收藏',type:'success'});
           //this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功，false代表已存在

src/components/RichTextEditor.vue

@@ -1,55 +0,0 @@
-<template>
-  <div class="editor-wrap">
-    <div ref="editor" style="min-height: 200px"></div>
-  </div>
-</template>
-
-<script>
-import E from "wangeditor";
-
-export default {
-  name: "RichTextEditor",
-  props: {
-    value: { type: String, default: "" },
-  },
-  data() {
-    return {
-      editor: null,
-    };
-  },
-  mounted() {
-    const editor = new E(this.$refs.editor);
-    editor.config.zIndex = 1000;
-    editor.create();
-    editor.txt.html(this.value || "");
-    editor.disable(); // 只读
-    this.editor = editor;
-  },
-  watch: {
-    value(val) {
-      if (this.editor && val !== this.editor.txt.html()) {
-        this.editor.txt.html(val || "");
-      }
-    },
-  },
-  beforeDestroy() {
-    if (this.editor) {
-      this.editor.destroy();
-      this.editor = null;
-    }
-  },
-};
-</script>
-
-<style scoped>
-.editor-wrap {
-  width: 100%;
-}
-.editor-wrap >>> .w-e-toolbar {
-  display: none;
-}
-.editor-wrap >>> .w-e-text-container {
-  border: 0px !important;
-  background-color: rgba(0, 0, 0, 0);
-}
-</style>

src/components/VideoPlayer/progress-bar.vue

@@ -37,6 +37,7 @@ export default {
     },
     isDrag:{
       type: Boolean,
+      default: true,
     },
     blobId:{
       type: String,
@@ -85,10 +86,9 @@ export default {
         if(current<0) current = 0;
         var time = localStorage.getItem('videoProgressData');
         var arr = time&&JSON.parse(time) || {}
-        //console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
+        console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
-        // 禁止拖动
+        // 禁止拖动 true:禁止拖动，false:允许拖动
         if(!this.isDrag && time && arr[this.blobId] < current) return;
-
         this.$emit("updateProgress", current);
       // }
 
@@ -102,7 +102,7 @@ export default {
         if(current<0) current = 0;
         var time = localStorage.getItem('videoProgressData');
         var arr = time&&JSON.parse(time) || {}
-        //console.log('move arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
+        console.log('move arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
         // 禁止拖动
         if(!this.isDrag && time && arr[this.blobId] < current) return;
         this.$emit("updateProgress", current);
@@ -118,12 +118,12 @@ export default {
         if(current<0) current = 0;
         var time = localStorage.getItem('videoProgressData');
         var arr = time&&JSON.parse(time) || {}
-        //console.log('up arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
+        console.log('up arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
         this.$emit("getMouseDownStatus", false);
         // 禁止拖动
         if(!this.isDrag && time && arr[this.blobId] < current) return;
         this.$emit("updateProgress", current);
-
+        this.$emit("getMouseDownStatus", false);
       }
     },
   },

src/layout/components/TopNav/Index.vue

@@ -2,67 +2,35 @@
   <div>
     <div class="xtop">
       <div class="xtop-content">
-        <div class="xtop-left">
+      <div class="xtop-left">
-          <div class="xtop-logo">
+        <div class="xtop-logo">
-            <router-link class="routerLink" to="/index"
+          <router-link class="routerLink" to="/index"><img src="../../../assets/logo/logo-white.png" style="width:161px;height:27px;" /></router-link>
-              ><img
-                src="../../../assets/logo/logo-white.png"
-                style="width: 161px; height: 27px"
-            /></router-link>
-          </div>
-          <div class="xtop-nav" v-if="userInfo.role === 1">
-            <div class="xtop-nav-item">
-              <a :href="`${webBaseUrl}/index`">首页</a>
-            </div>
-            <div class="xtop-nav-item">
-              <a :href="`${webBaseUrl}/course`">课程</a>
-            </div>
-            <div class="xtop-nav-item">
-              <a :href="`${webBaseUrl}/case`">案例</a>
-            </div>
-            <div class="xtop-nav-item">
-              <a :href="`${webBaseUrl}/article`">文章</a>
-            </div>
-            <div class="xtop-nav-item">
-              <a :href="`${webBaseUrl}/qa`">问答</a>
-            </div>
-            <div class="xtop-nav-item">
-              <el-dropdown placement="bottom" @command="handleCommand">
-                <span
-                  class="el-dropdown-link"
-                  style="color: #fff; font-size: 16px; cursor: pointer"
-                  >专区</span
-                >
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="one"
-                    >BOE系列公开课</el-dropdown-item
-                  >
-                  <el-dropdown-item command="two" divided
-                    >Grow180</el-dropdown-item
-                  >
-                  <el-dropdown-item command="three" divided
-                    >管理者进阶</el-dropdown-item
-                  >
-                  <el-dropdown-item command="for" divided
-                    >U选小课堂</el-dropdown-item
-                  >
-                  <el-dropdown-item command="five" divided
-                    >社招新员工</el-dropdown-item
-                  >
-                  <el-dropdown-item command="seven" divided
-                    >教师专区</el-dropdown-item
-                  >
-                </el-dropdown-menu>
-              </el-dropdown>
-            </div>
-            <div class="xtop-nav-item">
-              <a :href="`${webBaseUrl}/follow`">我的关注</a>
-            </div>
-          </div>
         </div>
-        <div class="xtop-right">
+        <div class="xtop-nav" v-if="userInfo.role === 1">
-          <!-- <div style="margin-left:250px;margin-right:50px;"> -->
+          <div class="xtop-nav-item"><a :href="`${webBaseUrl}/index`">首页</a></div>
-          <!-- <el-input placeholder="搜索" style="width: 260px;border-radius: 20px !important;" @keyup.enter.native="searchJump()" clearable maxlength="50" v-model="keyword" class="input-with-select">
+          <div class="xtop-nav-item"><a :href="`${webBaseUrl}/course`">课程</a></div>
+          <div class="xtop-nav-item"><a :href="`${webBaseUrl}/case`">案例</a></div>
+          <div class="xtop-nav-item"><a :href="`${webBaseUrl}/article`">文章</a></div>
+          <div class="xtop-nav-item"><a :href="`${webBaseUrl}/qa`">问答</a></div>
+          <div class="xtop-nav-item">
+            <el-dropdown placement="bottom" @command="handleCommand">
+              <span class="el-dropdown-link" style="color:#fff;font-size:16px;cursor: pointer;">专区</span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command='one'>BOE系列公开课</el-dropdown-item>
+                <el-dropdown-item command='two' divided>Grow180</el-dropdown-item>
+                <el-dropdown-item command='three' divided>管理者进阶</el-dropdown-item>
+                <el-dropdown-item command='for' divided>U选小课堂</el-dropdown-item>
+                <el-dropdown-item command='five' divided>社招新员工</el-dropdown-item>
+                <el-dropdown-item command="seven" divided>教师专区</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </div>
+          <div class="xtop-nav-item"><a :href="`${webBaseUrl}/follow`">我的关注</a></div>
+        </div>
+      </div>
+      <div class="xtop-right">
+         <!-- <div style="margin-left:250px;margin-right:50px;"> -->
+            <!-- <el-input placeholder="搜索" style="width: 260px;border-radius: 20px !important;" @keyup.enter.native="searchJump()" clearable maxlength="50" v-model="keyword" class="input-with-select">
               <el-select  v-model="findType" style="width: 75px;" slot="prepend" placeholder="请选择">
                 <el-option label="课程" value="1"></el-option>
                 <el-option label="案例" value="2"></el-option>
@@ -73,115 +41,41 @@
             </el-input> -->
           <!-- </div> -->
           <div>
-            <el-badge
+            <el-badge :value="userMsg" :hidden="userMsg==0" class="message-count">
-              :value="userMsg"
+              <el-link type="primary" :href="`${webBaseUrl}/message/center/index`" :underline="false">
-              :hidden="userMsg == 0"
+                <svg-icon style="margin-right: 0;font-size:22px;" icon-class="messfff"></svg-icon>
-              class="message-count"
-            >
-              <el-link
-                type="primary"
-                :href="`${webBaseUrl}/message/center/index`"
-                :underline="false"
-              >
-                <svg-icon
-                  style="margin-right: 0; font-size: 22px"
-                  icon-class="messfff"
-                ></svg-icon>
               </el-link>
             </el-badge>
           </div>
           <div>
-            <el-dropdown class="person-action-index" style="margin-left: 44px">
+            <el-dropdown class="person-action-index" style="margin-left: 44px;">
               <span class="el-dropdown-link">
-                <span v-if="current == 'qa'" style="color: #333">{{
+                 <span v-if="current == 'qa'" style="color: #333;">{{curIdentity==3? '管理员':curIdentity==2? '教师':'学员'}}</span>
-                  curIdentity == 3
+                <span v-else style="color: #fff;">{{curIdentity==3? '管理员':curIdentity==2? '教师':'学员'}}</span><i class="el-icon-arrow-down el-icon--right"></i>
-                    ? "管理员"
+
-                    : curIdentity == 2
-                    ? "教师"
-                    : "学员"
-                }}</span>
-                <span v-else style="color: #fff">{{
-                  curIdentity == 3
-                    ? "管理员"
-                    : curIdentity == 2
-                    ? "教师"
-                    : "学员"
-                }}</span
-                ><i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item
+                <el-dropdown-item><router-link to="/index">学员</router-link></el-dropdown-item>
-                  ><router-link to="/index">学员</router-link></el-dropdown-item
+                <el-dropdown-item v-if="identity == 2 || identity == 5" @click.native="setCurIdentity(2)"><router-link to="/need/waitaudit">教师</router-link></el-dropdown-item>
-                >
+                <el-dropdown-item v-if="identity == 3 || identity == 5" @click.native="setCurIdentity(3)"><a :href="managerPath+'/learningpath'">管理员</a></el-dropdown-item>
-                <el-dropdown-item
-                  v-if="identity == 2 || identity == 5"
-                  @click.native="setCurIdentity(2)"
-                  ><router-link to="/need/waitaudit"
-                    >教师</router-link
-                  ></el-dropdown-item
-                >
-                <el-dropdown-item
-                  v-if="identity == 3 || identity == 5"
-                  @click.native="setCurIdentity(3)"
-                  ><a :href="managerPath + '/learningpath'"
-                    >管理员</a
-                  ></el-dropdown-item
-                >
               </el-dropdown-menu>
             </el-dropdown>
           </div>
           <div>
             <el-dropdown>
-              <div
+                <div style="margin-left: 50px;color: #fff;font-size: 14px;cursor: pointer;">
-                style="
+                  <el-avatar v-if="userInfo.avatar !== ''" :src="userInfo.avatar" style="vertical-align: middle;width:40px;height:40px;margin-right:10px;"></el-avatar>
-                  margin-left: 50px;
+                  <span v-else style="display: inline-block;">
-                  color: #fff;
+                    <img v-if="userInfo.sex === 1 " src="../../../../public/images/Avatarman.png" alt="" style="width: 30px;height: 30px;vertical-align: middle;">
-                  font-size: 14px;
+                    <img v-else src="../../../../public/images/Avatarwoman.png" alt="" style="width: 30px;height: 30px;vertical-align: middle;">
-                  cursor: pointer;
+                  </span>
-                "
-              >
-                <el-avatar
-                  v-if="userInfo.avatar !== ''"
-                  :src="userInfo.avatar"
-                  style="
-                    vertical-align: middle;
-                    width: 40px;
-                    height: 40px;
-                    margin-right: 10px;
-                  "
-                ></el-avatar>
-                <span v-else style="display: inline-block">
-                  <img
-                    v-if="userInfo.sex === 1"
-                    src="../../../../public/images/Avatarman.png"
-                    alt=""
-                    style="width: 30px; height: 30px; vertical-align: middle"
-                  />
-                  <img
-                    v-else
-                    src="../../../../public/images/Avatarwoman.png"
-                    alt=""
-                    style="width: 30px; height: 30px; vertical-align: middle"
-                  />
-                </span>
 
-                {{ userInfo.name }}
+                  {{userInfo.name}}
-              </div>
+                </div>
-              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item @click.native="setCurIdentity(1)"
+                  <el-dropdown-item @click.native="setCurIdentity(1)"><a :href="`${webBaseUrl}${isTiao ? '/uc/study/task' : '/uc/study/courses'}`">个人中心</a></el-dropdown-item>
-                  ><a
+                  <el-dropdown-item><router-link :to="'/home/'+userInfo.aid">个人主页</router-link></el-dropdown-item>
-                    :href="`${webBaseUrl}${
+                </el-dropdown-menu>
-                      isTiao ? '/uc/study/task' : '/uc/study/courses'
-                    }`"
-                    >个人中心</a
-                  ></el-dropdown-item
-                >
-                <el-dropdown-item
-                  ><router-link :to="'/home/' + userInfo.aid"
-                    >个人主页</router-link
-                  ></el-dropdown-item
-                >
-              </el-dropdown-menu>
             </el-dropdown>
           </div>
 
@@ -195,53 +89,20 @@
               </el-dropdown-menu>
             </el-dropdown>
           </div> -->
-          <div class="person-action">
+        <div class="person-action">
-            <el-button @click="logout()" type="text"
+          <el-button @click="logout()" type="text"><svg-icon  style="margin-right: 4px;font-size:16px;" icon-class="white-out"></svg-icon>登出</el-button>
-              ><svg-icon
-                style="margin-right: 4px; font-size: 16px"
-                icon-class="white-out"
-              ></svg-icon
-              >登出</el-button
-            >
-          </div>
         </div>
       </div>
+      </div>
     </div>
-    <el-dialog
+    <el-dialog title="修改登录密码" :close-on-click-modal="false" :visible.sync="pwdDlg.show" width="600px" custom-class="g-dialog">
-      title="修改登录密码"
-      :close-on-click-modal="false"
-      :visible.sync="pwdDlg.show"
-      width="600px"
-      custom-class="g-dialog"
-    >
       <el-form :model="pwdDlg" size="medium" label-width="100px">
-        <el-form-item label="当前密码"
+        <el-form-item label="当前密码"><el-input v-model="pwdDlg.nowPwd" type="password" placeholder="当前的登录密码" :style="{ width: '100%' }"></el-input></el-form-item>
-          ><el-input
-            v-model="pwdDlg.nowPwd"
-            type="password"
-            placeholder="当前的登录密码"
-            :style="{ width: '100%' }"
-          ></el-input
-        ></el-form-item>
         <el-form-item label="新密码">
-          <el-input
+          <el-input v-model="pwdDlg.newPwd" type="password" placeholder="新的密码" :maxlength="20" clearable :style="{ width: '100%' }"></el-input>
-            v-model="pwdDlg.newPwd"
-            type="password"
-            placeholder="新的密码"
-            :maxlength="20"
-            clearable
-            :style="{ width: '100%' }"
-          ></el-input>
         </el-form-item>
         <el-form-item label="密码确认">
-          <el-input
+          <el-input v-model="pwdDlg.rePwd" type="password" placeholder="和上面新密码一致" :maxlength="20" clearable :style="{ width: '100%' }"></el-input>
-            v-model="pwdDlg.rePwd"
-            type="password"
-            placeholder="和上面新密码一致"
-            :maxlength="20"
-            clearable
-            :style="{ width: '100%' }"
-          ></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -249,37 +110,14 @@
         <el-button type="primary" @click="submitPwd">提交修改</el-button>
       </span>
     </el-dialog>
-    <el-dialog
+    <el-dialog custom-class="dialog-signin" :show-close="false" :visible.sync="signInShow" :close-on-click-modal="false" width="520px" top="8vh">
-      custom-class="dialog-signin"
+       <div>
-      :show-close="false"
+         <img usemap="#HotMap" src="/pc/ad/dlg.png" style="width:416px;height: 576px;">
-      :visible.sync="signInShow"
+         <map name="HotMap" id="HotMap">
-      :close-on-click-modal="false"
+             <area shape="circle" name="link1" coords="380,40,30" @click="closeSignDlg" href="javascript:;" />
-      width="520px"
+             <area shape="rectangle" name="link2" coords="150,400,300,500" target="_blank"  href="https://boehrsurvey.wjx.cn/vm/PmreuFN.aspx"  />
-      top="8vh"
+           </map>
-    >
+        </div>
-      <div>
-        <img
-          usemap="#HotMap"
-          src="/pc/ad/dlg.png"
-          style="width: 416px; height: 576px"
-        />
-        <map name="HotMap" id="HotMap">
-          <area
-            shape="circle"
-            name="link1"
-            coords="380,40,30"
-            @click="closeSignDlg"
-            href="javascript:;"
-          />
-          <area
-            shape="rectangle"
-            name="link2"
-            coords="150,400,300,500"
-            target="_blank"
-            href="https://boehrsurvey.wjx.cn/vm/PmreuFN.aspx"
-          />
-        </map>
-      </div>
     </el-dialog>
     <gonggao></gonggao>
     <div class="u-class">
@@ -310,7 +148,9 @@
                   内容涵盖：领导力、市场营销、职场技能、财务知识、法律常识、人力资源、经典国学、人文社科
                 </div>
               </div>
-              <div class="text_msg">创新力专区课程版权已到期！</div>
+              <div class="text_msg">
+                创新力专区课程版权已到期！
+              </div>
               <!-- <div class="cyl" @click="cylClick">
                 <div class="tyl_title">
                   <img
@@ -335,45 +175,44 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
+import { mapGetters } from 'vuex';
-import desk from "@/api/console.js";
+import desk from '@/api/console.js';
-import { getWelcomeData } from "@/api/new-employee/newEmployee";
+import Cookies from 'vue-cookies';
-import Cookies from "vue-cookies";
+import InterestCollection from '@/components/Portal/interestCollection.vue'
-import InterestCollection from "@/components/Portal/interestCollection.vue";
+import GuideBox from '@/components/Portal/guideBox.vue'
-import GuideBox from "@/components/Portal/guideBox.vue";
+import gonggao from '@/components/Gonggao.vue';
-import gonggao from "@/components/Gonggao.vue";
 export default {
-  components: { InterestCollection, GuideBox, gonggao },
+  components:{InterestCollection,GuideBox,gonggao},
   data() {
     return {
       uClassShow: false,
-      isTiao: false,
+      isTiao:false,
-      managerPath: process.env.VUE_APP_MANAGER_PATH,
+      managerPath:process.env.VUE_APP_MANAGER_PATH,
-      interestShow: false,
+      interestShow:false,
-      checked: true,
+      checked:true,
       signInShow: false,
-      signLocalTimesKey: "xboe_sign_dlg_times",
+      signLocalTimesKey:'xboe_sign_dlg_times',
-      keyword: "",
+      keyword: '',
-      findType: "1",
+      findType: '1',
       mouseIndex: 0,
-      activeIndex: "",
+      activeIndex: '',
       msg: { num: 0 },
-      user: { name: "" },
+      user: { name: '' },
-      pwdDlg: { show: false, newPwd: "", nowPwd: "", rePwd: "" },
+      pwdDlg: { show: false, newPwd: '', nowPwd: '', rePwd: '' },
-      current: 1,
+      current:1
     };
   },
   computed: {
-    ...mapGetters(["userInfo", "userMsg", "curIdentity", "identity"]),
+    ...mapGetters(['userInfo', 'userMsg','curIdentity','identity']),
-    showName: function () {
+    showName: function() {
       //console.log('name='+this.name);
       //console.log('loginName='+this.loginName);
-      if (this.userInfo.name != "") {
+      if (this.userInfo.name != '') {
         return this.userInfo.name;
       } else {
         return this.userInfo.userName;
       }
-    },
+    }
   },
   mounted() {
     this.interestShow = true;
@@ -399,7 +238,7 @@ export default {
     //       localStorage.setItem(this.$xpage.constants.newLoginKey,0);
     //     }
     // }
-    this.$store.dispatch("refrashMsg");
+    this.$store.dispatch('refrashMsg');
   },
   methods: {
     tylClick() {
@@ -408,13 +247,13 @@ export default {
     cylClick() {
       window.open("https://u.boe.com/pc/course?keyword=创新力专区");
     },
-    setCurIdentity(iden) {
+    setCurIdentity(iden){
-      this.$store.dispatch("SetCurIdentity", iden);
+        this.$store.dispatch('SetCurIdentity',iden);
+      },
+    closeSignDlg(){
+       this.signInShow=false;
     },
-    closeSignDlg() {
+    handleCommand(val) {
-      this.signInShow = false;
-    },
-    async handleCommand(val) {
       // let obj = {
       //   one: process.env.VUE_APP_BOE_WEB_URL+'/web/teacherLesson',
       //   two: process.env.VUE_APP_BOE_WEB_URL+'/grow180/login',
@@ -422,16 +261,6 @@ export default {
       //   four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
       //   five: process.env.VUE_APP_BOE_WEB_URL+'/boe/new-employee/index.html'
       // };
-      if (val === "five") {
-        // 从后端获取用户信息和报名状态
-        const res = await getWelcomeData();
-        if (res.status === 200 && res.data) {
-          if (res.data?.approvalResults && res.data?.approvalResults != 1) {
-            this.$router.push("/new-employee/study");
-            return;
-          }
-        }
-      }
       if (val === "for") {
         this.uClassShow = true;
       } else {
@@ -442,14 +271,14 @@ export default {
           two: urlPre + "/grow180/login",
           three: this.webBaseUrl + "/study/index?study=1",
           // four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
-          five: this.webBaseUrl + "/new-employee/welcome",
+          five: urlPre + "/boe/new-employee/index.html",
-          seven: this.webBaseUrl + "/grateful/index",
+          seven: this.webBaseUrl + '/grateful/index'
         };
         window.open(obj[val]);
       }
     },
-    handleUcCommand(val) {
+    handleUcCommand(val){
-      if (val == "logout") {
+      if(val == 'logout'){
         this.logout();
       }
     },
@@ -460,39 +289,36 @@ export default {
       this.pwdDlg.show = true;
     },
     submitPwd() {
-      if (
+      if (this.pwdDlg.nowPwd == '' || (this.pwdDlg.newPwd == '') | (this.pwdDlg.rePwd == '')) {
-        this.pwdDlg.nowPwd == "" ||
-        (this.pwdDlg.newPwd == "") | (this.pwdDlg.rePwd == "")
-      ) {
         return;
       }
       let params = {
         loginName: this.loginName,
         old: this.pwdDlg.nowPwd,
         newPassword: this.pwdDlg.newPwd,
-        rePassword: this.pwdDlg.rePwd,
+        rePassword: this.pwdDlg.rePwd
       };
-      desk.updatePassword(params).then((res) => {
+      desk.updatePassword(params).then(res => {
         if (res.status == 200) {
-          this.$message({ message: "修改成功，请重新登录", type: "success" });
+          this.$message({ message: '修改成功，请重新登录', type: 'success' });
         } else {
-          this.$message({ message: "修改失败，请检查输入", type: "error" });
+          this.$message({ message: '修改失败，请检查输入', type: 'error' });
         }
       });
     },
     logout() {
-      this.$confirm("确定退出系统吗？", "提示", {
+      this.$confirm('确定退出系统吗？', '提示', {
-        confirmButtonText: "确定",
+        confirmButtonText: '确定',
-        cancelButtonText: "取消",
+        cancelButtonText: '取消',
-        type: "warning",
+        type: 'warning'
       }).then(() => {
-        this.$store.dispatch("LogOut").then(() => {
+        this.$store.dispatch('LogOut').then(() => {
           //location.href = this.webBaseUrl + '/login';
-          location.href = process.env.VUE_APP_LOGIN_URL;
+          location.href =process.env.VUE_APP_LOGIN_URL;
         });
       });
-    },
+    }
-  },
+  }
 };
 </script>
 
@@ -609,7 +435,7 @@ export default {
           border: 0.96px solid rgba(140, 105, 242, 1);
           box-shadow: 7px 5px 6px 0px rgba(76, 31, 221, 0.3);
         }
-        .text_msg {
+        .text_msg{
           margin: 43px 0 0 222px;
           font-size: 14px;
           color: #000;
@@ -671,86 +497,89 @@ export default {
     }
   }
 }
-::v-deep .el-dropdown-menu__item:not(.is-disabled):hover {
+::v-deep .el-dropdown-menu__item:not(.is-disabled):hover{
-  background-color: #fff !important;
+    background-color: #fff !important;
-  color: #0059ff !important;
+    color: #0059FF !important;
 }
 ::v-deep.el-dropdown-menu {
-  text-align: center;
+text-align: center;
   border: none !important;
+
 }
-::v-deep .el-avatar {
+::v-deep .el-avatar{
-  margin-right: 8px;
+      margin-right: 8px;
-  img {
+       img{
-    width: 100% !important;
+           width: 100% !important;
-  }
+         }
-}
+    }
-::v-deep.xtop .xtop-right .person-action[data-v-5bcef51e] .message-count i {
+::v-deep.xtop .xtop-right .person-action[data-v-5bcef51e] .message-count i{
   color: #fff !important;
 }
-.el-button--text {
+.el-button--text{
   color: #fff;
 }
-img {
+img{
+
 }
-::v-deep .dialog-signin {
+::v-deep .dialog-signin{
   background: transparent;
-  box-shadow: none;
+  box-shadow:none;
-  .el-dialog__header {
+ .el-dialog__header{
     padding: 0;
   }
-  .el-dialog__body {
+  .el-dialog__body{
     padding: 0;
   }
   .el-dialog__footer {
     padding: 0;
+
+}
+.signin-bg{
+  position: relative;
+  .el-icon-close{
+    position: absolute;
+    top: 20px;
+    right: 10px;
+    color: #fff;
+    font-size: 16px;
   }
-  .signin-bg {
+}
-    position: relative;
+.signin-box2{
-    .el-icon-close {
+	margin-left: 100px;
-      position: absolute;
+	font-size: 12px;
-      top: 20px;
+	.signin-checkbox{
-      right: 10px;
+		display: flex;
-      color: #fff;
+		align-items: center;
-      font-size: 16px;
+		color: #FFFFFF;
-    }
+		margin-top: 10px;
-  }
+		.el-checkbox{
-  .signin-box2 {
+			margin-right: 5px;
-    margin-left: 100px;
+		}
-    font-size: 12px;
+	}
-    .signin-checkbox {
+	.signin-text{
-      display: flex;
+		font-family: Alibaba PuHuiTi;
-      align-items: center;
+		font-style:italic;
-      color: #ffffff;
+		cursor: pointer;
-      margin-top: 10px;
+		margin-left: 20px;
-      .el-checkbox {
+		color:#003eb7;
-        margin-right: 5px;
+		font-weight: bolder;
-      }
+	}
-    }
+}
-    .signin-text {
+  .signin-box{
-      font-family: Alibaba PuHuiTi;
-      font-style: italic;
-      cursor: pointer;
-      margin-left: 20px;
-      color: #003eb7;
-      font-weight: bolder;
-    }
-  }
-  .signin-box {
     margin: 0 70px;
-    p {
+    p{
       line-height: 28px;
     }
-    .signin-text {
+    .signin-text{
       font-size: 12px;
       font-weight: bold;
-      color: #ffffff;
+      color: #FFFFFF;
-      .ti-yan {
+      .ti-yan{
-        border-bottom: 1px solid #ffffff;
+        border-bottom: 1px solid #FFFFFF;
         margin-left: 10px;
         cursor: pointer;
       }
-      img {
+      img{
         width: 14px;
         height: 14px;
         margin-left: 6px;
@@ -758,38 +587,38 @@ img {
         margin-bottom: 4px;
       }
     }
-    .signin-a {
+    .signin-a{
       font-size: 12px;
       font-family: Alibaba PuHuiTi;
       font-weight: 600;
-      color: #ffffff;
+      color: #FFFFFF;
-      span {
+      span{
-        border-bottom: 1px solid #ffffff;
+        border-bottom: 1px solid #FFFFFF;
       }
     }
-    .signin-b {
+    .signin-b{
       font-size: 12px;
-      color: #ffffff;
+      color:#FFFFFF;
       text-align: right;
-      .el-checkbox__inner {
+      .el-checkbox__inner{
         //background-color: #588AFC;
-        border-color: #ffffff;
+        border-color: #FFFFFF;
       }
-      .el-checkbox__input.is-checked .el-checkbox__inner {
+      .el-checkbox__input.is-checked .el-checkbox__inner{
-        background-color: #588afc;
+        background-color: #588AFC;
       }
     }
   }
 }
-.dialog-footer-signin {
+.dialog-footer-signin{
   display: flex;
-  justify-content: space-between;
+  justify-content: space-between
 }
 .xtop {
   height: 72px;
   line-height: 72px;
   min-width: 1280px;
-  background-color: #0078fc;
+  background-color: #0078FC;
   position: fixed;
   top: 0px;
   left: 0px;
@@ -799,15 +628,15 @@ img {
   justify-content: space-between;
   border-bottom: 1px solid #e9e9e9;
   z-index: 9999;
-  .xtop-content {
+  .xtop-content{
     width: 100%;
     display: flex;
     justify-content: space-between;
-    margin: 0 40px;
+    margin:0 40px;
     .xtop-left {
       display: flex;
       justify-content: flex-start;
-      .xtop-logo {
+      .xtop-logo{
         padding-top: 20px;
         padding-right: 50px;
         display: flex;
@@ -818,26 +647,27 @@ img {
   }
 }
 
+
 .xtop-nav {
   display: flex;
   // justify-content: flex-start;
-  a {
+  a{
     display: inline-block;
   }
 }
 .xtop-nav-item {
-  line-height: 72px;
+  line-height:72px;
   color: #fff;
 }
 
-@media screen and (max-width: 1366px) {
+@media screen and (max-width: 1366px){
-  .xtop-nav-item {
+  .xtop-nav-item{
     padding: 0px 10px;
   }
 }
 
-@media screen and (min-width: 1366px) {
+@media screen and (min-width: 1366px){
-  .xtop-nav-item {
+  .xtop-nav-item{
     padding: 0px 24px;
   }
 }
@@ -846,21 +676,21 @@ img {
   display: flex;
   justify-content: flex-end;
   align-items: center;
-  .person-action {
+  .person-action{
     display: flex;
     justify-content: flex-end;
     align-items: center;
     margin-left: 44px;
-    ::v-deep .message-count {
+    ::v-deep .message-count{
       margin-right: 30px;
-      i {
+      i{
         font-size: 26px;
-        color: #409eff;
+        color:#409EFF;
       }
     }
 
-    .el-button {
+    .el-button{
-      margin-top: 1px;
+		margin-top: 1px;
       // margin-left: 20px;
     }
   }
@@ -878,7 +708,7 @@ img {
 }
 
 .xtop .arrow-down {
-  content: "";
+  content: '';
   width: 0;
   height: 0;
   border-style: solid dashed dashed;
@@ -959,21 +789,21 @@ img {
     outline: none;
   }
 }
-.message-count a {
+.message-count a{
-  color: #fff;
+    color: #fff;
-  font-size: 28px;
+    font-size: 28px;
-  margin-top: 0 !important;
+    margin-top: 0 !important;
 }
-::v-deep .el-badge {
+::v-deep .el-badge{
   margin-top: 0 !important;
-  .el-badge__content {
+  .el-badge__content{
     top: 20px;
   }
 }
 ::v-deep .el-link.el-link--primary:hover {
-  color: #588afc;
+  color:#588AFC;
 }
-.el-dropdown-link {
+.el-dropdown-link{
   cursor: pointer;
   color: #fff;
 }

src/main.js

@@ -20,8 +20,8 @@ import '@/assets/styles/uc.scss' // global css
 import Pagination from "@/components/Pagination";
 import Remark from "@/components/Remark";
 import './security'; //security control
-import VueAwesomeSwiper from 'vue-awesome-swiper';
+import  VueAwesomeSwiper from 'vue-awesome-swiper';
-import 'swiper/dist/css/swiper.css';
+import  'swiper/dist/css/swiper.css';
 Vue.use(VueAwesomeSwiper)
 import watermark from './utils/warterMark.js'
 import Bus from './utils/bus.js'
@@ -35,44 +35,44 @@ Vue.config.productionTip = false
 Vue.prototype.$xpage = xpage;
 
 
-Vue.prototype.msgSuccess = function (msg) {
+Vue.prototype.msgSuccess = function(msg) {
-  this.$message({ showClose: true, message: msg, type: "success", offset: 50 });
+    this.$message({ showClose: true, message: msg, type: "success", offset: 50 });
 }
 //用来筛选图标是否显示的方法，字符串和数组都支持,如果传入其他值或者不传值图标全显示
-Vue.prototype.$iconFilter = function (hideArray) {
+Vue.prototype.$iconFilter = function(hideArray) {
-  let iconOpinion = {
+    let iconOpinion = {
-    isRemark: false,
+        isRemark: false,
-    isShare: false,
+        isShare: false,
-    isCollect: false,
+        isCollect: false,
-    isPraise: false,
+        isPraise: false,
-    isBrowse: false
+        isBrowse: false
-  }
+    }
-  if (typeof hideArray == 'string') {
+    if (typeof hideArray == 'string') {
-    iconOpinion[hideArray] = true
+        iconOpinion[hideArray] = true
-  }
+    }
-  if (hideArray instanceof Array) {
+    if (hideArray instanceof Array) {
-    hideArray.forEach(item => {
+        hideArray.forEach(item => {
-      iconOpinion[item] = true;
+            iconOpinion[item] = true;
-    })
+        })
-  }
+    }
-  return iconOpinion
+    return iconOpinion
 }
 
-Vue.prototype.msgError = function (msg) {
+Vue.prototype.msgError = function(msg) {
-  this.$message({ showClose: true, message: msg, type: "error" });
+    this.$message({ showClose: true, message: msg, type: "error" });
 }
 
-Vue.prototype.msgInfo = function (msg) {
+Vue.prototype.msgInfo = function(msg) {
-  this.$message.info(msg);
+    this.$message.info(msg);
 }
 
 //高亮显示
-Vue.prototype.$keywordActiveShow = function (str, keyword) {
+Vue.prototype.$keywordActiveShow=function(str,keyword){
   //color:#588afc暂时用老系统颜色，ui给的颜色是这个值
-  if (!str || str.indexOf(keyword) === -1 || keyword == '') {
+  if(!str||str.indexOf(keyword)===-1||keyword==''){
     return str
   }
-  return str.replace(keyword, `<span style="color:#FF0000">${keyword}</span>`)
+  return str.replace(keyword,`<span style="color:#FF0000">${keyword}</span>`)
 }
 
 Vue.prototype.webBaseUrl = process.env.VUE_APP_PUBLIC_PATH;
@@ -83,10 +83,9 @@ Vue.component('Remark', Remark)
 
 
 Vue.use(Element, {
-  size: VueCookies.get('size') || 'medium' // set element-ui default size
+    size: VueCookies.get('size') || 'medium' // set element-ui default size
 })
 
-// VueCookies.set('token', "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJjb21wYW55Q29kZSI6IkMwMDEiLCJ1SWQiOiI5NjUzNDIwMjc0OTc2MDcxNjgiLCJjb21wYW55SWQiOiIxMDQxNjczOTc3Mzc5OTQ2NDk2IiwibG9naW5JZCI6IjE5MzgwNTQ2NDY2OTAxNzcwMjYiLCJpc3MiOiJodHRwOi8vdS5ib2UuY29tIiwiR2l2ZW5OYW1lIjoiYm9ldSIsImV4cCI6MTc1MDkxMDQwOTc0NiwidXNlck5hbWUiOiLmnY7njonlhrAiLCJ1c2VySWQiOiI2QjA0OUZBRi1DMzE0LTdDQ0YtMEQyOC0wRDIzRjRDNDI1MzEifQ==.7f03d1ce991253197f0e733ba554496e8de715595b169b505bed8831ede565a9", 1)
 // 加入百度统计
 router.beforeEach((to, from, next) => {
   if (to.path) {
@@ -98,7 +97,7 @@ router.beforeEach((to, from, next) => {
 })
 
 new Vue({
-  router,
+    router,
-  store,
+    store,
-  render: h => h(App)
+    render: h => h(App)
 }).$mount('#app')

src/router/index.js

@@ -2,6 +2,7 @@ import Vue from 'vue'
 import VueRouter from 'vue-router'
 /* Layout */
 import Layout from '@/layout/index'
+import LayoutPortal from '@/layout/portal'
 import Grateful from '@/views/grateful'
 
 Vue.use(VueRouter)
@@ -18,27 +19,27 @@ export const constantRoutes = [{
   path: '',
   redirect: '/study'
 },
-{
+  {
-  path: '/loading',
+    path: '/loading',
-  hidden: true,
+    hidden: true,
-  component: (resolve) => require(['@/views/Loading'], resolve),
+    component: (resolve) => require(['@/views/Loading'], resolve),
-  name: 'loading',
+    name: 'loading',
-  meta: { title: '正在进入学习中心', icon: 'dashboard', noCache: true, affix: false },
+    meta: {title: '正在进入学习中心', icon: 'dashboard', noCache: true, affix: false},
-},
+  },
-{
+  {
-  path: '/login',
+    path: '/login',
-  hidden: true,
+    hidden: true,
-  component: (resolve) => require(['@/views/Login'], resolve),
+    component: (resolve) => require(['@/views/Login'], resolve),
-  name: 'login',
+    name: 'login',
-  meta: { title: '京东方大学堂登录', icon: 'dashboard', noCache: true, affix: false },
+    meta: {title: '京东方大学堂登录', icon: 'dashboard', noCache: true, affix: false},
-},
+  },
-{
+  {
-  path: '/index',
+    path: '/index',
-  hidden: true,
+    hidden: true,
-  component: (resolve) => require(['@/views/Index'], resolve),
+    component: (resolve) => require(['@/views/Index'], resolve),
-  name: 'index',
+    name: 'index',
-  meta: { title: '首页', icon: 'dashboard', noCache: true, affix: false },
+    meta: {title: '首页', icon: 'dashboard', noCache: true, affix: false},
-},
+  },
 // {
 //   path: '/grateful/index',
 //   hidden: true,
@@ -46,344 +47,322 @@ export const constantRoutes = [{
 //   name: 'gratefulIndex',
 //   meta: { title: '感恩教师首页', icon: 'dashboard', noCache: true, affix: false },
 // },
-{
+  {
-  path: '/grateful',
+    path: '/grateful',
-  component: Grateful,
+    component: Grateful,
-  redirect: '/grateful/index',
+    redirect: '/grateful/index',
-  children: [
+    children: [
-    {
+      {
-      path: 'index',
+        path: 'index',
-      hidden: true,
+        hidden: true,
-      component: (resolve) => require(['@/views/grateful/GratefulHomePage'], resolve),
+        component: (resolve) => require(['@/views/grateful/GratefulHomePage'], resolve),
-      name: 'GratefulHomePage',
+        name: 'GratefulHomePage',
-      meta: { title: '感恩教师首页', icon: 'dashboard', noCache: true, affix: true, hidden: false }
+        meta: {title: '感恩教师首页', icon: 'dashboard', noCache: true, affix: true, hidden: false}
-    },
+      },
-    {
+      {
-      path: 'teacherEmpowerment',
+        path: 'teacherEmpowerment',
-      hidden: true,
+        hidden: true,
-      component: (resolve) => require(['@/views/grateful/TeacherEmpowerment'], resolve),
+        component: (resolve) => require(['@/views/grateful/TeacherEmpowerment'], resolve),
-      name: 'TeacherEmpowerment',
+        name: 'TeacherEmpowerment',
-      meta: { title: '教师赋能', icon: 'dashboard', noCache: true, affix: true, hidden: true }
+        meta: {title: '教师赋能', icon: 'dashboard', noCache: true, affix: true, hidden: true}
-    },
+      },
-    {
+      {
-      path: 'toolDown',
+        path: 'toolDown',
-      hidden: true,
+        hidden: true,
-      component: (resolve) => require(['@/views/grateful/ToolDown'], resolve),
+        component: (resolve) => require(['@/views/grateful/ToolDown'], resolve),
-      name: 'ToolDown',
+        name: 'ToolDown',
-      meta: { title: '工具下载', icon: 'dashboard', noCache: true, affix: true, hidden: true }
+        meta: {title: '工具下载', icon: 'dashboard', noCache: true, affix: true, hidden: true}
-    },
+      },
-    {
+      {
-      path: 'gratefulNotice',
+        path: 'gratefulNotice',
-      hidden: true,
+        hidden: true,
-      component: (resolve) => require(['@/views/grateful/GratefulNotice'], resolve),
+        component: (resolve) => require(['@/views/grateful/GratefulNotice'], resolve),
-      name: 'GratefulNotice',
+        name: 'GratefulNotice',
-      meta: { title: '通知列表', icon: 'dashboard', noCache: true, affix: true, hidden: true }
+        meta: {title: '通知列表', icon: 'dashboard', noCache: true, affix: true, hidden: true}
-    },
+      },
-    {
+      {
-      path: 'noticeDetail',
+        path: 'noticeDetail',
-      hidden: true,
+        hidden: true,
-      component: (resolve) => require(['@/views/grateful/NoticeDetail'], resolve),
+        component: (resolve) => require(['@/views/grateful/NoticeDetail'], resolve),
-      name: 'NoticeDetail',
+        name: 'NoticeDetail',
-      meta: { title: '通知详情', icon: 'dashboard', noCache: true, affix: true, hidden: true }
+        meta: {title: '通知详情', icon: 'dashboard', noCache: true, affix: true, hidden: true}
-    },
+      },
-    {
+      {
-      path: 'teacherOpinion',
+        path: 'teacherOpinion',
-      hidden: true,
+        hidden: true,
-      component: (resolve) => require(['@/views/grateful/TeacherOpinion'], resolve),
+        component: (resolve) => require(['@/views/grateful/TeacherOpinion'], resolve),
-      name: 'TeacherOpinion',
+        name: 'TeacherOpinion',
-      meta: { title: '师资大全', icon: 'dashboard', noCache: true, affix: true, hidden: true }
+        meta: {title: '师资大全', icon: 'dashboard', noCache: true, affix: true, hidden: true}
-    },
+      },
-  ]
+    ]
-},
-{
-  path: '/forward',
-  hidden: true,
-  component: (resolve) => require(['@/views/Forward'], resolve),
-  name: 'forward',
-  meta: { title: '详细信息', icon: 'dashboard', noCache: true, affix: false },
-},
-{
-  path: '/course',
-  hidden: true,
-  component: (resolve) => require(['@/views/portal/course/Index'], resolve),
-  name: 'course',
-  meta: { title: '课程', keepAlive: true, icon: 'dashboard', noCache: true, affix: false },
-},
-{
-  path: '/courseRecommended',
-  hidden: true,
-  component: (resolve) => require(['@/views/portal/course/CourseRecommended'], resolve),
-  name: 'courseRecommended',
-  meta: { title: '推荐课程', keepAlive: true, icon: 'dashboard', noCache: true, affix: false },
-},
-{
-  path: '/courseSeries',
-  hidden: true,
-  component: (resolve) => require(['@/views/portal/course/CourseSeries'], resolve),
-  name: 'courseSeries',
-  meta: { title: '系列课程', keepAlive: true, icon: 'dashboard', noCache: true, affix: false },
-},
-{
-  path: '/course/micro',
-  hidden: true,
-  component: (resolve) => require(['@/views/portal/course/Micro'], resolve),
-  name: 'courseDetailMicro',
-  meta: { title: '课程详情', icon: 'dashboard', noCache: true, affix: false },
-},
-{
-  path: '/course/detail',
-  hidden: true,
-  component: (resolve) => require(['@/views/portal/course/Detail'], resolve),
-  name: 'courseDetail',
-  meta: { title: '课程详情', keepAlive: true, icon: 'dashboard', noCache: true, affix: false },
-},
-// 课程预览
-{
-  path: '/course/microPreview',
-  hidden: true,
-  component: (resolve) => require(['@/views/portal/course/microPreview'], resolve),
-  name: 'microPreview',
-  meta: { title: '课程预览', icon: 'dashboard', noCache: true, affix: false },
-},
-{
-  path: '/course/rePreview',
-  hidden: true,
-  component: (resolve) => require(['@/views/portal/course/rePreview'], resolve),
-  name: 'courseRePreview',
-  meta: { title: '课程预览', icon: 'dashboard', noCache: true, affix: false },
-},
-//
-// 外来链接
-{
-  path: '/course/boeframe',
-  hidden: true,
-  component: (resolve) => require(['@/views/portal/boeframe'], resolve),
-  name: 'courseBoeframe',
-  meta: { title: '课程预览', icon: 'dashboard', noCache: true, affix: false },
-},
-//外来链接
-{
-  path: '/course/recorded',
-  hidden: true,
-  component: (resolve) => require(['@/views/portal/course/Recorded'], resolve),
-  name: 'courseDetailRecorded',
-  meta: { title: '课程详情', icon: 'dashboard', noCache: true, affix: false },
-},
-{
-  //此页面需要指定课程的参数
-  path: '/course/studyindex',
-  hidden: true,
-  component: (resolve) => require(['@/views/study/coursenew'], resolve),
-  name: 'courseStudyIndex',
-  meta: { title: '课程学习', keepAlive: true, icon: 'dashboard', noCache: true, affix: false },
-},
-//讲师认证
-{
-  path: '/case',
-  hidden: true,
-  component: (resolve) => require(['@/views/portal/case/Index'], resolve),
-  name: 'case',
-  meta: { title: '案例', keepAlive: true, icon: 'dashboard', noCache: false, affix: true },
-},
-{
-  path: '/case/detail',
-  hidden: true,
-  component: (resolve) => require(['@/views/portal/case/Detail'], resolve),
-  name: 'caseDetail',
-  meta: { title: '案例详情', keepAlive: true, icon: 'dashboard', noCache: false, affix: true },
-},
-{
-  path: '/case/charts',
-  hidden: true,
-  component: (resolve) => require(['@/views/portal/case/Charts'], resolve),
-  name: 'caseCharts',
-  meta: { title: '排行榜', keepAlive: true, icon: 'dashboard', noCache: false, affix: true },
-},
-{
-  path: '/case/excellent',
-  hidden: true,
-  component: (resolve) => require(['@/views/portal/case/Excellent'], resolve),
-  name: 'caseExcellent',
-  meta: { title: '浏览量榜单', keepAlive: true, icon: 'dashboard', noCache: false, affix: true },
-},
-{
-  path: '/article',
-  hidden: true,
-  component: (resolve) => require(['@/views/portal/article/Index'], resolve),
-  name: 'article',
-  meta: { title: '文章', icon: 'dashboard', noCache: true, affix: false },
-},
-{
-  path: '/article/detail',
-  hidden: true,
-  component: (resolve) => require(['@/views/portal/article/Detail'], resolve),
-  name: 'articleDetail',
-  meta: { title: '文章详情', icon: 'dashboard', noCache: true, affix: false },
-},
-{
-  path: '/article/add',
-  hidden: true,
-  component: (resolve) => require(['@/views/portal/article/Add'], resolve),
-  name: 'articleAdd',
-  meta: { title: '发布文章', icon: 'dashboard', noCache: true, affix: false },
-},
-{
-  path: '/qa',
-  hidden: true,
-  component: (resolve) => require(['@/views/portal/qa/Index'], resolve),
-  name: 'qa',
-  meta: { title: '问答', icon: 'dashboard', noCache: true, affix: false },
-},
-{
-  path: '/message',
-  hidden: true,
-  component: (resolve) => require(['@/views/portal/user/Message'], resolve),
-  name: 'userMsg',
-  meta: { title: '我的消息', icon: 'dashboard', noCache: true, affix: false },
-},
-{
-  path: '/home',
-  hidden: true,
-  component: (resolve) => require(['@/views/homepage/Index'], resolve),
-  name: 'homePage',
-  redirect: '/home/:id',
-  meta: { title: '个人主页', icon: 'dashboard', noCache: true, affix: false },
-  children: [{
-    path: ':id',
-    hidden: true,
-    component: (resolve) => require(['@/views/homepage/page'], resolve),
-    name: 'page',
-    meta: { title: '个人主页', icon: 'dashboard', noCache: true, affix: true }
   },
   {
-    path: ':id/leaving',
+    path: '/forward',
     hidden: true,
-    component: (resolve) => require(['@/views/homepage/leavingMessage'], resolve),
+    component: (resolve) => require(['@/views/Forward'], resolve),
-    name: 'leavingMessage',
+    name: 'forward',
-    meta: { title: '留言', icon: 'dashboard', noCache: true, affix: true }
+    meta: {title: '详细信息', icon: 'dashboard', noCache: true, affix: false},
+  },
+  {
+    path: '/course',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/course/Index'], resolve),
+    name: 'course',
+    meta: {title: '课程', keepAlive: true, icon: 'dashboard', noCache: true, affix: false},
+  },
+  {
+    path: '/courseRecommended',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/course/CourseRecommended'], resolve),
+    name: 'courseRecommended',
+    meta: {title: '推荐课程', keepAlive: true, icon: 'dashboard', noCache: true, affix: false},
+  },
+  {
+    path: '/courseSeries',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/course/CourseSeries'], resolve),
+    name: 'courseSeries',
+    meta: {title: '系列课程', keepAlive: true, icon: 'dashboard', noCache: true, affix: false},
+  },
+  {
+    path: '/course/micro',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/course/Micro'], resolve),
+    name: 'courseDetailMicro',
+    meta: {title: '课程详情', icon: 'dashboard', noCache: true, affix: false},
+  },
+  {
+    path: '/course/detail',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/course/Detail'], resolve),
+    name: 'courseDetail',
+    meta: {title: '课程详情', keepAlive: true, icon: 'dashboard', noCache: true, affix: false},
+  },
+// 课程预览
+  {
+    path: '/course/microPreview',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/course/microPreview'], resolve),
+    name: 'microPreview',
+    meta: {title: '课程预览', icon: 'dashboard', noCache: true, affix: false},
+  },
+  {
+    path: '/course/rePreview',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/course/rePreview'], resolve),
+    name: 'courseRePreview',
+    meta: {title: '课程预览', icon: 'dashboard', noCache: true, affix: false},
+  },
+//
+// 外来链接
+  {
+    path: '/course/boeframe',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/boeframe'], resolve),
+    name: 'courseBoeframe',
+    meta: {title: '课程预览', icon: 'dashboard', noCache: true, affix: false},
+  },
+//外来链接
+  {
+    path: '/course/recorded',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/course/Recorded'], resolve),
+    name: 'courseDetailRecorded',
+    meta: {title: '课程详情', icon: 'dashboard', noCache: true, affix: false},
+  },
+  {
+    //此页面需要指定课程的参数
+    path: '/course/studyindex',
+    hidden: true,
+    component: (resolve) => require(['@/views/study/coursenew'], resolve),
+    name: 'courseStudyIndex',
+    meta: {title: '课程学习', keepAlive: true, icon: 'dashboard', noCache: true, affix: false},
+  },
+  //讲师认证
+  {
+    path: '/case',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/case/Index'], resolve),
+    name: 'case',
+    meta: {title: '案例', keepAlive: true, icon: 'dashboard', noCache: false, affix: true},
+  },
+  {
+    path: '/case/detail',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/case/Detail'], resolve),
+    name: 'caseDetail',
+    meta: {title: '案例详情', keepAlive: true, icon: 'dashboard', noCache: false, affix: true},
+  },
+  {
+    path: '/case/charts',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/case/Charts'], resolve),
+    name: 'caseCharts',
+    meta: {title: '排行榜', keepAlive: true, icon: 'dashboard', noCache: false, affix: true},
+  },
+  {
+    path: '/case/excellent',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/case/Excellent'], resolve),
+    name: 'caseExcellent',
+    meta: {title: '浏览量榜单', keepAlive: true, icon: 'dashboard', noCache: false, affix: true},
+  },
+  {
+    path: '/article',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/article/Index'], resolve),
+    name: 'article',
+    meta: {title: '文章', icon: 'dashboard', noCache: true, affix: false},
+  },
+  {
+    path: '/article/detail',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/article/Detail'], resolve),
+    name: 'articleDetail',
+    meta: {title: '文章详情', icon: 'dashboard', noCache: true, affix: false},
+  },
+  {
+    path: '/article/add',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/article/Add'], resolve),
+    name: 'articleAdd',
+    meta: {title: '发布文章', icon: 'dashboard', noCache: true, affix: false},
+  },
+  {
+    path: '/qa',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/qa/Index'], resolve),
+    name: 'qa',
+    meta: {title: '问答', icon: 'dashboard', noCache: true, affix: false},
+  },
+  {
+    path: '/message',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/user/Message'], resolve),
+    name: 'userMsg',
+    meta: {title: '我的消息', icon: 'dashboard', noCache: true, affix: false},
+  },
+  {
+    path: '/home',
+    hidden: true,
+    component: (resolve) => require(['@/views/homepage/Index'], resolve),
+    name: 'homePage',
+    redirect: '/home/:id',
+    meta: {title: '个人主页', icon: 'dashboard', noCache: true, affix: false},
+    children: [{
+      path: ':id',
+      hidden: true,
+      component: (resolve) => require(['@/views/homepage/page'], resolve),
+      name: 'page',
+      meta: {title: '个人主页', icon: 'dashboard', noCache: true, affix: true}
+    },
+      {
+        path: ':id/leaving',
+        hidden: true,
+        component: (resolve) => require(['@/views/homepage/leavingMessage'], resolve),
+        name: 'leavingMessage',
+        meta: {title: '留言', icon: 'dashboard', noCache: true, affix: true}
+      }
+    ]
+  },
+  {
+    path: '/comments',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/Comments'], resolve),
+    name: 'commentReply',
+    meta: {title: '评论回复', icon: 'dashboard', noCache: true, affix: false},
+  },
+  {
+    path: '/qa/answer',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/qa/Answer'], resolve),
+    name: 'qaAnswer',
+    meta: {title: '写回答', icon: 'dashboard', noCache: true, affix: false},
+  },
+  {
+    path: '/follow',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/follow'], resolve),
+    name: 'follow',
+    meta: {title: '我的关注', icon: 'dashboard', noCache: true, affix: false},
+  },
+  {
+    path: '/study',
+    component: Layout,
+    redirect: '/study/index',
+    children: [{
+      path: 'index',
+      hidden: true,
+      component: (resolve) => require(['@/views/StudyIndex'], resolve),
+      name: 'studyIndex',
+      meta: {title: '首页', icon: 'dashboard', noCache: true, affix: true}
+    }]
+  },
+  {
+    path: '/teacher',
+    component: Layout,
+    children: [{
+      path: 'index',
+      hidden: true,
+      component: (resolve) => require(['@/views/TeacherIndex'], resolve),
+      name: 'teacherIndex',
+      meta: {title: '教师个人中心', icon: 'dashboard', noCache: true, affix: true}
+    }]
+  },
+  {
+    path: '/manager',
+    component: Layout,
+    children: [{
+      path: 'index',
+      hidden: true,
+      component: (resolve) => require(['@/views/ManageIndex'], resolve),
+      name: 'managerIndex',
+      meta: {title: '管理员个人中心', icon: 'dashboard', noCache: true, affix: true}
+    }]
+  },
+  {
+    path: '/exam/test',
+    hidden: true,
+    component: (resolve) => require(['@/views/exam/Test'], resolve),
+    name: 'test',
+    meta: {title: '京东方大学堂考试', icon: 'dashboard', noCache: true, affix: true},
+  },
+  {
+    path: '/video/test',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/course/video'], resolve),
+    name: 'videotest',
+    meta: {title: '课程视频测试', icon: 'dashboard', noCache: true, affix: true},
+  },
+  {
+    path: '/hotforum',
+    hidden: true,
+    component: (resolve) => require(['@/views/hotforum/Index'], resolve),
+    name: 'hotforum',
+    meta: {title: '热点论坛', icon: 'dashboard', noCache: true, affix: true},
+  },
+  {
+    path: '/lexiang',
+    hidden: true,
+    component: (resolve) => require(['@/views/sso/lexiang'], resolve),
+    name: 'lexiang',
+    meta: {title: '单点登录', icon: 'dashboard', noCache: true, affix: true},
+  },
+  {
+    path: '/404',
+    component: (resolve) => require(['@/views/error/404'], resolve),
+    hidden: true
+  },
+  {
+    path: '/401',
+    component: (resolve) => require(['@/views/error/401'], resolve),
+    hidden: true
+  },
+  {
+    path: '/500',
+    component: (resolve) => require(['@/views/error/500'], resolve),
+    hidden: true
   }
-  ]
-},
-{
-  path: '/comments',
-  hidden: true,
-  component: (resolve) => require(['@/views/portal/Comments'], resolve),
-  name: 'commentReply',
-  meta: { title: '评论回复', icon: 'dashboard', noCache: true, affix: false },
-},
-{
-  path: '/qa/answer',
-  hidden: true,
-  component: (resolve) => require(['@/views/portal/qa/Answer'], resolve),
-  name: 'qaAnswer',
-  meta: { title: '写回答', icon: 'dashboard', noCache: true, affix: false },
-},
-{
-  path: '/follow',
-  hidden: true,
-  component: (resolve) => require(['@/views/portal/follow'], resolve),
-  name: 'follow',
-  meta: { title: '我的关注', icon: 'dashboard', noCache: true, affix: false },
-},
-{
-  path: '/study',
-  component: Layout,
-  redirect: '/study/index',
-  children: [{
-    path: 'index',
-    hidden: true,
-    component: (resolve) => require(['@/views/StudyIndex'], resolve),
-    name: 'studyIndex',
-    meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-  }]
-},
-{
-  path: '/teacher',
-  component: Layout,
-  children: [{
-    path: 'index',
-    hidden: true,
-    component: (resolve) => require(['@/views/TeacherIndex'], resolve),
-    name: 'teacherIndex',
-    meta: { title: '教师个人中心', icon: 'dashboard', noCache: true, affix: true }
-  }]
-},
-{
-  path: '/manager',
-  component: Layout,
-  children: [{
-    path: 'index',
-    hidden: true,
-    component: (resolve) => require(['@/views/ManageIndex'], resolve),
-    name: 'managerIndex',
-    meta: { title: '管理员个人中心', icon: 'dashboard', noCache: true, affix: true }
-  }]
-},
-{
-  path: '/exam/test',
-  hidden: true,
-  component: (resolve) => require(['@/views/exam/Test'], resolve),
-  name: 'test',
-  meta: { title: '京东方大学堂考试', icon: 'dashboard', noCache: true, affix: true },
-},
-{
-  path: '/video/test',
-  hidden: true,
-  component: (resolve) => require(['@/views/portal/course/video'], resolve),
-  name: 'videotest',
-  meta: { title: '课程视频测试', icon: 'dashboard', noCache: true, affix: true },
-},
-{
-  path: '/hotforum',
-  hidden: true,
-  component: (resolve) => require(['@/views/hotforum/Index'], resolve),
-  name: 'hotforum',
-  meta: { title: '热点论坛', icon: 'dashboard', noCache: true, affix: true },
-},
-{
-  path: '/lexiang',
-  hidden: true,
-  component: (resolve) => require(['@/views/sso/lexiang'], resolve),
-  name: 'lexiang',
-  meta: { title: '单点登录', icon: 'dashboard', noCache: true, affix: true },
-},
-{
-  path: '/404',
-  component: (resolve) => require(['@/views/error/404'], resolve),
-  hidden: true
-},
-{
-  path: '/401',
-  component: (resolve) => require(['@/views/error/401'], resolve),
-  hidden: true
-},
-{
-  path: '/500',
-  component: (resolve) => require(['@/views/error/500'], resolve),
-  hidden: true
-},
-{
-  path: '/qualityCourse',
-  hidden: true,
-  component: (resolve) => require(['@/views/portal/course/qualityCourse'], resolve),
-  name: 'qualityCourse',
-  meta: { title: '精品课课程', keepAlive: true, icon: 'dashboard', noCache: true, affix: false },
-},
-{
-  path: '/new-employee/welcome',
-  hidden: true,
-  component: (resolve) => require(['@/views/new-employee/WelcomePage'], resolve),
-  name: 'NewEmployeeWelcome',
-  meta: { title: '社招新员工欢迎页', icon: 'dashboard', noCache: true, affix: false },
-},
-{
-  path: '/new-employee/study',
-  hidden: true,
-  component: (resolve) => require(['@/views/new-employee/StudyPage'], resolve),
-  name: 'NewEmployeeStudy',
-  meta: { title: '社招新员工学习页面', icon: 'dashboard', noCache: true, affix: false },
-}
-
 ]
 
 const router = new VueRouter({
@@ -394,7 +373,7 @@ const router = new VueRouter({
     if (saveTop) {
       return saveTop;
     } else {
-      return { x: 0, y: 0 }
+      return {x: 0, y: 0}
     }
   },
 })

src/views/Index.vue

@@ -153,85 +153,9 @@
       </div>
     </div>
     <div class="xindex-content">
-      
       <!-- 推荐课程 -->
       <div class="modules xcontent2">
-        <!-- <div class="xcontent2-main"> -->
-          <!--内容块-->
-        
-          <!-- </div> -->
-           <!-- 精品课模块 -->
         <div class="xcontent2-main">
-          <div class="modules-title xindex-main" v-if="this.qusisityList.list.length > 0">
-            <!-- <span class="modules-text" style="color: #3D86F4;">精品课</span> -->
-            <span class="quyer-tag" style="margin-left: 0px;">
-              <!-- <img src="../assets/images/tutoring1.pn" alt=""> -->
-              <img class="modules-text" style="height: 28px;" src="../assets/images/course/courseTitle.png" alt="">
-            </span>
-            <span class="more">
-              <router-link to="/qualityCourse">查看更多>></router-link>
-            </span>
-          </div>
-
-
-          
-          <div
-              v-for="(course, eIndex) in exquisiteList"
-              :key="'cc' + eIndex"
-              class="xindex-course courseBg"
-              style="position: relative;margin-top: 20px;"
-            >
-              <div style="position: absolute; right: 25px; bottom: 72px">
-                <interactBar
-                  nodeWidth="20px"
-                  :courseExclusive="true"
-                  :type="1"
-                  :data="course"
-                  :comments="false"
-                  :praises="false"
-                  :shares="false"
-                  :views="false"
-                >
-                </interactBar>
-                <!-- <svg-icon style="font-size: 32px;margin-top: -5px;" icon-class="collectedCourse"></svg-icon> -->
-              </div>
-              <a @click="toCourseDetail(course)">
-                <div class="xindex-course-image">
-                  <course-image :course="course"></course-image>
-                  <!-- <span v-if="course.type == 20 || 10" class="course-type"
-                    >录播课</span
-                  > -->
-                  <img v-if="course.type == 20 || 10" src="../assets/images/course/courseTag.png" class="course-type" style="background: none;" alt="">
-                </div>
-                <div
-                  style="width: 80%"
-                  :title="course.courseName"
-                  class="course-title portal-title-tow two-line-ellipsis"
-                >
-                  {{ course.courseName }}
-                </div>
-                <div class="course-author">
-                  <div class="course-author-left">
-                    {{ course.authorInfo.name }}
-
-                    <span class="study-num"
-                      >{{ formatNum(course.studyNum) }}人学习</span
-                    >
-                  </div>
-                  <div style="display: flex">
-                    <div v-if="course.courseScore">
-                      <span class="course-score-value" style="margin-left: 10px"
-                        >{{ toScore(course.courseScore) }}分</span
-                      >
-                    </div>
-                    <div v-else class="course-score-no">未评分</div>
-                  </div>
-                </div>
-              </a>
-            </div>
-
-
-        
           <!--内容块-->
           <div class="modules-title xindex-main">
             <span class="modules-text">推荐课程</span>
@@ -1213,9 +1137,6 @@ export default {
         orderType: 2,
         list: [],
       },
-      qusisityList: {
-        list: [],
-      },
       // 推荐课程
       recommendedList:{
         list: [],
@@ -1243,7 +1164,6 @@ export default {
   },
   mounted() {
     this.getCourseData(1);
-    this.getEsqusiteList();
     this.getRecommendList();
     this.getPositive()
     this.getCaseData();
@@ -1307,10 +1227,6 @@ export default {
     courseComputedTwoList(){
       return this.courseList.list.slice(3)
     },
-    // 精品课展示
-    exquisiteList() { 
-      return this.qusisityList.list.slice(0,3)
-    },
   },
   methods: {
     getPositive() {
@@ -1505,27 +1421,21 @@ export default {
       //二期调整，直接改成一个地址
       //return this.webBaseUrl + '/course/detail?id=' + item.id;
       let $this = this;
-      let cId = "";
-      if (item.id) {
-        cId = item.id;
-      } else {
-        cId = item.courseId;
-      }
       if (item.type == 10) {
         //return this.webBaseUrl + "/course/studyindex?id=" + item.id;
         //console.log("直接进入学习页面");
-        this.$router.push("/course/studyindex?id=" + cId);
+        this.$router.push("/course/studyindex?id=" + item.id);
       } else if (item.type == 20) {
-        apiCourseStudy.hasSignup(cId).then((rs) => {
+        apiCourseStudy.hasSignup(item.id).then((rs) => {
           if (rs.status == 200) {
-            //return $this.webBaseUrl + "/course/studyindex?id=" + cId;
+            //return $this.webBaseUrl + "/course/studyindex?id=" + item.id;
-            this.$router.push("/course/studyindex?id=" + cId);
+            this.$router.push("/course/studyindex?id=" + item.id);
           } else {
-            //return $this.webBaseUrl + "/course/detail?id=" + cId;
+            //return $this.webBaseUrl + "/course/detail?id=" + item.id;
-            this.$router.push("/course/detail?id=" + cId);
+            this.$router.push("/course/detail?id=" + item.id);
           }
         });
-        //return $this.webBaseUrl + "/course/detail?id=" + cId;
+        //return $this.webBaseUrl + "/course/detail?id=" + item.id;
       }
     },
     orderTypeFilter(val) {
@@ -1562,29 +1472,6 @@ export default {
         }
       })
     },
-    //精品课展示
-    getEsqusiteList(){
-      let course = {
-        aid: this.userInfo.aid,
-      }
-      apiIndex.qualitylist(course).then((res) => { 
-         let courseIds = [];
-          res.data.result.forEach((item) => {
-            item.authorInfo = {
-              aid: "",
-              name: "",
-              orgInfo: "",
-              avatar: "",
-              code: "",
-              sex: null,
-            };
-            courseIds.push(item.courseId);
-          });
-          this.loadCouserTeacher(res.data.result, courseIds);
-        console.log(res.data.result,'--------------------------');
-        this.qusisityList.list = res.data.result;
-      })
-    },
     getCourseData(pageIndex) {
       this.isNext = false;
       let { orderType, num } = this.courseList;
@@ -1784,7 +1671,7 @@ export default {
           let userIds = [];
           list.forEach((item, index) => {
             cres.result.some((courseTeahcer) => {
-              if (courseTeahcer.courseId == (item.id||item.courseId)) {
+              if (courseTeahcer.courseId == item.id) {
                 if (courseTeahcer.teacherIds) {
                   userIds.push(courseTeahcer.teacherIds[0]);
                   item.authorInfo.aid = courseTeahcer.teacherIds[0];
@@ -2774,7 +2661,6 @@ export default {
     // padding-bottom: 10px;
     display: flex;
     justify-content: space-between;
-    margin-bottom: 20px;
 
     .course-author-left {
       font-size: 14px;
@@ -3123,17 +3009,4 @@ export default {
     }
   }
 }
-.courseBg{
-  // width: 332px;
-  // height: 323px;
-  // background: url("../assets/images/course/courseBackground.png") no-repeat;
-  // background-size: 100% 100%; /* 或 use 'contain' */
-  // background-position: center;
-  // border: none;
-  border-radius: 12px;
-  background: linear-gradient(135deg, #e6f7ff, #f0f8ff, #ffffff);
-  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.05);
-  border: 1px solid #d9edf7;
-  //overflow: hidden;
-}
 </style>

src/views/grateful/GratefulHomePage.vue

@@ -5,8 +5,8 @@
         <!-- 当轮播图等于一张时 -->
         <swiper :options="swiperOptiontwo">
           <swiper-slide style="margin: 0 auto" v-for="(item, idx) in resonimg" :key="'a' + idx"
-            class="swiper-slide games pointer"  >
+            class="swiper-slide games pointer">
-            <div class="bannbox" @click="handleCarouselClick(item)" :style="{
+            <div class="bannbox" :style="{
               background: `url(${fileBaseUrl + item.image
                 }) center center no-repeat`,
             }"></div>
@@ -17,8 +17,8 @@
       <div id="container" style="z-index: 99" v-else>
         <swiper :options="swiperOption" ref="mySwiper" v-if="resonimg.length > 1">
           <swiper-slide style="margin: 0 auto" v-for="(item, idx) in resonimg" :key="'b' + idx"
-            class="swiper-slide games pointer"  >
+            class="swiper-slide games pointer">
-            <div class="bannbox" @click="handleCarouselClick(item)"  :style="{
+            <div class="bannbox" :style="{
               background: `url(${fileBaseUrl + item.image
                 })  center center no-repeat`,
             }"></div>
@@ -220,7 +220,7 @@ export default {
         autoplay: false,
         // noSwiping: true,
       },
-      // resonimg: [],
+      resonimg: [],
       swiperOption: {
         autoplay: {
           delay: 2000,
@@ -249,13 +249,6 @@ export default {
     this.getToolData()
   },
   methods: {
-    // 添加点击轮播图跳转的方法
-    handleCarouselClick(item) {
-      if (item.url) {
-        window.open(item.url, '_blank');
-      }
-    },
-
     downTool(toolInfo) {
       console.log(toolInfo);
       window.open(`/activityApi/xboe/m/boe/tools/url/download?urlStr=${process.env.VUE_APP_BOE_WEB_URL}/upload${toolInfo.filePath}&fileName=${toolInfo.name}`)

src/views/grateful/TeacherOpinion.vue

@@ -8,7 +8,7 @@
           <div class="navTop">
             <div>
               <router-link to="/grateful" class="nav">首页</router-link>&nbsp;>&nbsp;
-              <span style="cursor: pointer;" class="nav">认证讲师库</span>
+              <span style="cursor: pointer;" class="nav">认证讲师库（2023）</span>
             </div>
             <div style="position: relative;">
               <el-input class="portal-input" placeholder="请输入课程名称" style="border-radius: 20px !important; "

src/views/new-employee/StudyPage.vue

@@ -1,872 +0,0 @@
-<template>
-  <div class="ne-study-page">
-    <div class="banner-header">
-      <portalHeader textColor="#fff" />
-    </div>
-    <!-- 顶部横幅与标题 -->
-    <div class="banner">
-      <div class="banner-inner">
-        <div class="title">社招新员工培训及考试</div>
-        <!-- 筛选条 -->
-        <div class="filters">
-          <div class="filter-group">
-            <span class="label">类型：</span>
-            <el-radio-group
-              v-model="flag"
-              @change="onTypeChange"
-              class="pill-radios"
-            >
-              <el-radio-button label="all">全部</el-radio-button>
-              <el-radio-button label="1">必修</el-radio-button>
-              <el-radio-button label="0">选修</el-radio-button>
-            </el-radio-group>
-          </div>
-          <div class="filter-group">
-            <span class="label">状态：</span>
-            <el-radio-group
-              v-model="status"
-              @change="onStatusChange"
-              class="pill-radios"
-            >
-              <el-radio-button label="all">全部</el-radio-button>
-              <el-radio-button label="0">未开始</el-radio-button>
-              <el-radio-button label="2">进行中</el-radio-button>
-              <el-radio-button label="1">已完成</el-radio-button>
-            </el-radio-group>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div class="content">
-      <!-- 左侧主区域 -->
-      <div class="main">
-        <!-- 列表：课程 -->
-        <div class="list" v-loading="loading">
-          <div
-            class="list-item card"
-            v-for="it in items"
-            :key="it.id"
-            @click="toLearn(it.courseId)"
-          >
-            <div style="margin-right: 16px">
-              <img
-                width="160px"
-                src="../../assets/images/course_icon.png"
-                alt=""
-              />
-            </div>
-            <div class="item-left">
-              <div>
-                <div class="title-box">
-                  <div class="item-title">{{ it.name }}</div>
-                  <!-- 右侧动作/成绩 -->
-                  <div class="item-right">
-                    <el-button
-                      v-if="it.status == 0"
-                      type="text"
-                      style="color: #999999"
-                      >未开始</el-button
-                    >
-                    <el-button
-                      v-if="it.status == 2"
-                      type="text"
-                      style="color: #ffb01e"
-                      >进行中</el-button
-                    >
-                    <el-button
-                      v-if="it.status == 1"
-                      type="text"
-                      style="color: #27ce9a"
-                      >已完成</el-button
-                    >
-                  </div>
-                </div>
-                <div class="tags">
-                  <span class="tag" :class="'tag-blue'"> 在线课 </span>
-                  <span v-if="it.flag" class="tag tag-green">必修</span>
-                  <span v-else class="tag tag-yellow">选修</span>
-                </div>
-                <div class="progress-wrap">
-                  <div class="progress">
-                    <div
-                      class="bar"
-                      :style="{ width: (it.currentRatio || 0) + '%' }"
-                    ></div>
-                  </div>
-                  <div class="percent">{{ it.currentRatio || 0 }}%</div>
-                </div>
-              </div>
-            </div>
-          </div>
-
-          <!-- 分页 -->
-          <div class="pagination">
-            <el-pagination
-              background
-              layout="prev, pager, next"
-              :total="total"
-              :page-size="pageSize"
-              :current-page.sync="page"
-              @current-change="onPageChange"
-            />
-          </div>
-        </div>
-      </div>
-
-      <!-- 右侧侧栏 -->
-      <div class="sidebar">
-        <div class="profile card">
-          <div
-            class="avatar"
-            :style="`background: url(${userInfo.avatar}) no-repeat center/100% 100%;`"
-          ></div>
-          <div class="name">{{ userInfo.name }}</div>
-          <div class="desc">{{ userInfo.departName }}</div>
-          <div class="btns">
-            <el-button class="btn btn-outline" @click="onGuide"
-              >转正攻略</el-button
-            >
-          </div>
-          <div>
-            <div v-if="approvalResults == 2">
-              <el-alert type="warning" center show-icon :closable="false">
-                <template slot="title">
-                  <span style="color: rgba(0, 0, 0, 0.88)"
-                    >报名申请正在审核中</span
-                  >
-                </template>
-              </el-alert>
-            </div>
-            <div v-if="approvalResults == 3">
-              <el-alert type="success" center show-icon :closable="false">
-                <template slot="title">
-                  <span style="color: rgba(0, 0, 0, 0.88)"
-                    >报名申请审核已通过</span
-                  >
-                </template>
-              </el-alert>
-            </div>
-            <div
-              v-if="approvalResults == 4"
-              style="cursor: pointer"
-              @click="returnEnroll"
-            >
-              <el-alert type="error" center show-icon :closable="false">
-                <template slot="title">
-                  <span style="color: rgba(0, 0, 0, 0.88)">审核已驳回，请</span>
-                  <span style="color: #0078fc">重新报名</span>
-                </template>
-              </el-alert>
-            </div>
-          </div>
-          <div style="text-align: center">
-            <el-button type="text" @click="chartVisible = true"
-              >转正流程示意图 ></el-button
-            >
-          </div>
-          <div class="label">成绩单</div>
-          <div class="transcript">
-            <el-button
-              class="btn btn-long"
-              :class="{ 'btn-disabled': isDownloadDisabled }"
-              type="success"
-              icon="el-icon-download"
-              :disabled="isDownloadDisabled"
-              @click="onDownload"
-              >成绩下载</el-button
-            >
-          </div>
-          <div class="label">学习进度</div>
-          <div class="progress-circles">
-            <div class="circle">
-              <div
-                class="ring"
-                :style="`background: conic-gradient(#0078FC 0 ${progressRing.total}%, #eef2f6 ${progressRing.total}%);`"
-              >
-                <span>{{ progressRing.total }}</span>
-              </div>
-              <div class="text">总进度</div>
-            </div>
-            <div class="circle">
-              <div
-                class="ring"
-                :style="`background: conic-gradient(#27ce9a 0 ${progressRing.required}%, #eef2f6 ${progressRing.required}%);`"
-              >
-                <span>{{ progressRing.required }}</span>
-              </div>
-              <div class="text">必修课进度</div>
-            </div>
-            <div class="circle">
-              <div
-                class="ring"
-                :style="`background: conic-gradient(#FFB01E 0 ${progressRing.elective}%, #eef2f6 ${progressRing.elective}%);`"
-              >
-                <span>{{ progressRing.elective }}</span>
-              </div>
-              <div class="text">选修课进度</div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <portalFooter />
-    <portalFloatTools />
-    <!-- 学习引导弹窗 -->
-    <NewEmployeeGuideDialog
-      :visible.sync="guideDialogVisible"
-      @close="guideDialogVisible = false"
-      :showBtn="true"
-    />
-    <!-- 转正流程图弹窗 -->
-    <el-dialog
-      :visible.sync="chartVisible"
-      title="转正流程示意图"
-      :close-on-click-modal="false"
-      @close="chartVisible = false"
-    >
-      <div>
-        <!-- <el-image src="../../assets/images/flowchart.png" fit="fill" /> -->
-        <img width="100%" src="../../assets/images/flowchart.png" alt="" />
-      </div>
-    </el-dialog>
-    <!-- 自定义信息提示 -->
-    <CustomInfoMessage ref="customMessage" />
-    <CustomErrorMessage ref="errorMessage" />
-  </div>
-</template>
-
-<script>
-import portalHeader from "@/components/PortalHeader.vue";
-import portalFooter from "@/components/PortalFooter.vue";
-import portalFloatTools from "@/components/PortalFloatTools.vue";
-import NewEmployeeGuideDialog from "@/components/NewEmployeeGuideDialog.vue";
-import CustomInfoMessage from "@/components/CustomInfoMessage.vue";
-import { mapGetters } from "vuex";
-import {
-  getWelcomeData,
-  getStuProjectTaskList,
-  getStuProjectProcess,
-  downloadSocialRecruitReport,
-  getSzxygProjectInfo,
-  enrollRequest,
-} from "@/api/new-employee/newEmployee";
-import CustomErrorMessage from "@/components/CustomErrorMessage.vue";
-import { start } from "nprogress";
-
-export default {
-  name: "StudyPage",
-  components: {
-    portalHeader,
-    portalFooter,
-    portalFloatTools,
-    NewEmployeeGuideDialog,
-    CustomInfoMessage,
-    CustomErrorMessage,
-  },
-  data() {
-    return {
-      flag: "all",
-      status: "all",
-      page: 1,
-      pageSize: 20,
-      total: 0,
-      loading: false,
-      projectId: "",
-      studentId: "",
-      // 列表数据（课程/考试混合）
-      items: [],
-      // 进度环数据
-      progressRing: {
-        total: 0,
-        required: 0,
-        elective: 0,
-      },
-      // 学习引导弹窗
-      guideDialogVisible: false,
-      // 转正流程图弹窗
-      chartVisible: false,
-      approvalList: {
-        1: "报名失败",
-        2: "审核中",
-        3: "审核通过",
-        4: "审核失败",
-      },
-      approvalResults: 1,
-    };
-  },
-  computed: {
-    ...mapGetters(["userInfo"]),
-    // 判断下载按钮是否应该禁用
-    isDownloadDisabled() {
-      // 只有在审核通过(3)且学习进度为100时才可下载
-      // 其他情况（报名失败1、审核中2、审核失败4、进度未到100）都禁用
-      return this.approvalResults != 3 || this.progressRing.total != 100;
-    },
-  },
-  methods: {
-    async initIds() {
-      // studentId 来自用户信息
-      this.studentId = this.userInfo?.aid || this.userInfo?.id || "";
-      const res = await getSzxygProjectInfo();
-      this.projectId = res.data.id || "";
-    },
-    async loadList() {
-      if (!this.studentId || !this.projectId) return;
-      this.loading = true;
-      try {
-        const res = await getStuProjectTaskList({
-          pageNo: this.page,
-          pageSize: this.pageSize,
-          studentId: this.studentId,
-          projectId: this.projectId,
-          status: this.status === "all" ? undefined : this.status,
-          flag: this.flag === "all" ? undefined : this.flag,
-        });
-        const payload = res?.data || {};
-        const records = payload.rows || [];
-        this.total = Number(payload.total || 0);
-        this.items = records;
-      } catch (e) {
-        this.$message.error("加载学习列表失败");
-      } finally {
-        this.loading = false;
-      }
-    },
-    async loadProcess() {
-      if (!this.studentId || !this.projectId) return;
-      try {
-        const res = await getStuProjectProcess({
-          studentId: this.studentId,
-          projectId: this.projectId,
-        });
-        const data = res?.data || {};
-        const total = Number(data.totalProgress ?? 0) | 0;
-        const required = Number(data.compulsoryProgress ?? 0) | 0;
-        const elective = Number(data.electiveProgress ?? 0) | 0;
-        this.progressRing = {
-          total: total,
-          required: required,
-          elective: elective,
-        };
-      } catch (_) {
-        // 默认0
-        this.progressRing = { total: 0, required: 0, elective: 0 };
-      }
-    },
-    async onTypeChange() {
-      await this.loadList();
-    },
-    async onStatusChange() {
-      await this.loadList();
-    },
-    async onPageChange(p) {
-      this.page = p;
-      await this.loadList();
-    },
-    onGuide() {
-      this.guideDialogVisible = true;
-    },
-    toLearn(courseId) {
-      this.$router.push(
-        `/course/studyindex?id=${courseId}&newEmployee=${true}`
-      );
-    },
-    async onDownload() {
-      try {
-        const res = await downloadSocialRecruitReport(
-          this.projectId,
-          this.studentId
-        );
-        const blob = new Blob([res], { type: "application/pdf" });
-        const pdfUrl = URL.createObjectURL(blob);
-        window.open(pdfUrl);
-      } catch (e) {
-        this.$message.error("下载失败");
-      }
-    },
-    async returnEnroll() {
-      this.$confirm("是否重新报名社招新员工项目?", {
-        title: "报名确认",
-        type: "warning",
-        customClass: "returnEnroll",
-      }).then(async () => {
-        const res = await enrollRequest();
-        if (res.data.sendToOaSuccess != 0) {
-          this.$refs.errorMessage.show(
-            "报名失败请稍后重试，如果再次失败，请联系：XXXX，联系方式：XXXX。"
-          );
-        } else {
-          this.$refs.customMessage.show("您已重新报名成功");
-          this.approvalResults = 2;
-        }
-      });
-    },
-  },
-  async mounted() {
-    const res = await getWelcomeData();
-    // 社招新员工项目标识：0否，1是
-    if (res.data.approvalResults == 1 || !res.data.approvalResults) {
-      this.$refs.customMessage.show("未报名或报名失败，请前往报名页面进行报名");
-      this.$router.push("/new-employee/welcome");
-    }
-    this.guideDialogVisible = this.$route.query?.fromWelcome == 1;
-    // 1报名失败、2审核中、3审核通过、4审核失败
-    this.approvalResults = res.data.approvalResults;
-    await this.initIds();
-    if (!this.projectId || !this.studentId) {
-      this.$message.warning("未获得项目或学员信息，列表可能无法加载");
-    }
-    await Promise.all([this.loadList(), this.loadProcess()]);
-  },
-};
-</script>
-
-<style scoped>
-/* 颜色变量近似还原截图 */
-.ne-study-page {
-  font-family: "PingFang SC", "Helvetica Neue", Arial, "Microsoft YaHei",
-    sans-serif;
-  color: #2b2f36;
-  background: #f4f6f9;
-}
-
-.banner-header {
-  background: #0f80ff;
-}
-.banner {
-  background: #0f80ff;
-  padding-top: 36px;
-}
-.banner-inner {
-  max-width: 1200px;
-  margin: 0 auto;
-  padding: 24px 16px 0px;
-}
-.title {
-  color: #ffffff;
-  font-weight: 600;
-  font-size: 20px;
-  margin-bottom: 10px;
-}
-
-.content {
-  max-width: 1200px;
-  margin: 16px auto 40px;
-  padding: 0 16px;
-  display: flex;
-  gap: 16px;
-}
-.main {
-  flex: 1;
-}
-.sidebar {
-  width: 360px;
-  margin-top: -70px;
-}
-
-.card {
-  background: #ffffff;
-  border-radius: 8px;
-  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.04);
-}
-
-/* 筛选条 */
-.filters {
-  padding: 0px 12px 8px;
-  display: flex;
-  gap: 24px;
-  align-items: center;
-  background: #ffffff;
-  border-radius: 8px 8px 0 0;
-  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.04);
-  width: 68%;
-}
-.filter-group {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-.label {
-  color: #333333;
-  font-size: 14px;
-  font-weight: bold;
-  margin: 24px 0px 12px;
-}
-.pills {
-  display: flex;
-  gap: 8px;
-}
-.pill {
-  padding: 6px 12px;
-  border-radius: 16px;
-  background: #f3f5f8;
-  color: #4b5563;
-  font-size: 12px;
-  cursor: default;
-}
-.pill.active {
-  background: #e6f1ff;
-  color: #0f80ff;
-  border: 1px solid #b3d4ff;
-}
-
-/* 列表 */
-.list {
-  margin-top: 12px;
-}
-.list-item {
-  display: flex;
-  justify-content: space-between;
-  padding: 16px;
-  margin-bottom: 12px;
-  transition: transform 0.08s ease, box-shadow 0.12s ease,
-    background-color 0.12s ease;
-  cursor: pointer;
-}
-.list-item:hover,
-.list-item:active {
-  transform: translateY(-1px);
-  box-shadow: 0 6px 18px rgba(0, 0, 0, 0.06);
-  background-color: #ffffff;
-}
-/* 触摸设备：点按反馈 */
-@media (hover: none) {
-  .list-item:active {
-    transform: scale(0.995);
-    background-color: #f8fbff;
-  }
-}
-.item-left {
-  flex: 1;
-}
-
-.title-box {
-  display: flex;
-  justify-content: space-between;
-}
-
-.item-title {
-  font-size: 15px;
-  font-weight: 600;
-  margin-bottom: 8px;
-  color: #2b2f36;
-}
-.tags {
-  display: flex;
-  gap: 8px;
-  margin-bottom: 10px;
-}
-.tag {
-  display: inline-flex;
-  align-items: center;
-  height: 22px;
-  padding: 0 8px;
-  border-radius: 12px;
-  font-size: 12px;
-  color: #0f80ff;
-  background: #eaf3ff;
-}
-.tag-green {
-  color: #27ce9a;
-  background: #e9fbf3;
-}
-.tag-yellow {
-  color: #ffb01e;
-  background: #ffecec;
-}
-.tag-blue {
-  color: #0f80ff;
-  background: #eaf3ff;
-}
-
-.progress-wrap {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-}
-.progress {
-  position: relative;
-  flex: 1;
-  height: 8px;
-  background: #eff2f6;
-  border-radius: 4px;
-  overflow: hidden;
-}
-.bar {
-  position: absolute;
-  left: 0;
-  top: 0;
-  bottom: 0;
-  background: #19c37d;
-  border-radius: 4px;
-}
-.w-8 {
-  width: 8%;
-  background: #ffb74d;
-}
-.w-40 {
-  width: 40%;
-  background: #2fa3ff;
-}
-.w-100 {
-  width: 100%;
-  background: #19c37d;
-}
-.percent {
-  font-size: 12px;
-  color: #8a8f99;
-  width: 42px;
-  text-align: right;
-}
-
-.item-right {
-  min-width: 72px;
-  text-align: right;
-  font-size: 14px;
-}
-.item-right.score {
-  font-weight: 700;
-}
-.item-right.score.good {
-  color: #19c37d;
-}
-.item-right.score.bad {
-  color: #ff5a5f;
-}
-
-/* 分页 */
-.pagination {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  gap: 8px;
-  padding: 12px 0 4px;
-}
-.pg {
-  min-width: 30px;
-  height: 30px;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  border-radius: 6px;
-  background: #ffffff;
-  color: #4b5563;
-  font-size: 12px;
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.06);
-}
-.pg.btn {
-  padding: 0 8px;
-}
-.pg.active {
-  background: #0f80ff;
-  color: #ffffff;
-}
-
-/* 细化 text 按钮与原页面链接的一致性 */
-.item-right >>> .el-button--text {
-  padding: 0;
-  color: inherit;
-  font-weight: inherit;
-}
-.item-right.link >>> .el-button--text {
-  color: #0f80ff;
-}
-.item-right.done >>> .el-button--text {
-  color: #8a8f99;
-}
-.item-right.score.good >>> .el-button--text {
-  color: #19c37d;
-}
-.item-right.score.bad >>> .el-button--text {
-  color: #ff5a5f;
-}
-
-/* 单选按钮组胶囊皮肤（替代 Tabs），保持外观一致 */
-.pill-radios {
-  padding-top: 20px;
-}
-.pill-radios >>> .el-radio-button__inner {
-  background: #f3f5f8;
-  color: #4b5563;
-  font-size: 12px;
-  padding: 6px 12px;
-  border-radius: 16px !important;
-  border: 1px solid transparent;
-  box-shadow: none;
-  margin-right: 8px;
-}
-.pill-radios
-  >>> .el-radio-button__orig-radio:checked
-  + .el-radio-button__inner {
-  background: #e6f1ff;
-  color: #0f80ff;
-  border-color: #b3d4ff;
-  box-shadow: none;
-}
-.pill-radios >>> .el-radio-button__inner:hover {
-  filter: brightness(0.98);
-}
-.pill-radios >>> .el-radio-button__inner::before,
-.pill-radios >>> .el-radio-button__inner::after {
-  display: none;
-}
-
-/* 侧栏 */
-.profile {
-  padding: 20px 16px;
-}
-.avatar {
-  width: 80px;
-  height: 80px;
-  background: #d9e8ff;
-  border-radius: 50%;
-  margin: -48px auto 12px;
-  border: 6px solid #ffffff;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
-}
-.name {
-  text-align: center;
-  font-weight: 700;
-  color: #2b2f36;
-}
-.desc {
-  text-align: center;
-  color: #8a8f99;
-  font-size: 12px;
-  margin-top: 4px;
-}
-.btns {
-  display: flex;
-  gap: 12px;
-  justify-content: center;
-  margin-top: 14px;
-  margin-bottom: 16px;
-}
-.btn {
-  width: 100% !important;
-  height: 36px;
-  padding: 0 14px;
-  border-radius: 8px;
-  border: none;
-  font-weight: 600;
-}
-.btn-outline {
-  background: rgba(0, 120, 252, 1);
-  color: #fff;
-  border: 1px solid rgba(0, 120, 252, 1);
-  width: 120px;
-}
-.transcript {
-  text-align: center;
-}
-.transcript .label {
-  color: #8a8f99;
-  font-size: 12px;
-  margin-bottom: 8px;
-}
-.btn-long {
-  width: 100%;
-  height: 40px;
-  border-radius: 8px;
-  background: #1ac07f;
-  color: #ffffff;
-  box-shadow: 0 2px 8px rgba(26, 192, 127, 0.35);
-}
-.btn-long.btn-disabled,
-.btn-long:disabled {
-  background: #cccccc !important;
-  color: #ffffff !important;
-  cursor: not-allowed !important;
-  box-shadow: none !important;
-}
-.btn-long.btn-disabled:hover,
-.btn-long:disabled:hover {
-  background: #cccccc !important;
-  transform: none !important;
-}
-
-.progress-circles {
-  display: flex;
-  justify-content: space-between;
-  margin-top: 8px;
-}
-.circle {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: 6px;
-  width: 32%;
-}
-.ring {
-  width: 84px;
-  height: 84px;
-  border-radius: 50%;
-  background: conic-gradient(#d9dfe7 0 65%, #eef2f6 65%);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: #4b5563;
-  font-weight: 700;
-}
-.ring span {
-  background: #ffffff;
-  width: 66px;
-  height: 66px;
-  border-radius: 50%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  box-shadow: inset 0 0 0 6px #ffffff;
-}
-.circle .text {
-  font-size: 12px;
-  color: #8a8f99;
-  text-align: center;
-}
-</style>
-
-<style lang="scss">
-.returnEnroll {
-  width: 380px;
-  height: auto;
-  .el-message-box__header {
-    display: block;
-    position: relative;
-    padding: 15px 15px 10px;
-    .el-message-box__title {
-      font-size: 16px;
-    }
-  }
-  .el-message-box__content {
-    padding: 10px 15px;
-    color: #606266;
-    font-size: 14px;
-    text-align: left;
-    font-weight: 500;
-    margin-top: 0px;
-    font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
-      Microsoft YaHei, SimSun, sans-serif;
-  }
-  .el-message-box__status {
-    display: block;
-  }
-  .el-message-box__btns {
-    padding: 5px 15px 0;
-    text-align: right;
-    margin-top: 0px;
-    .el-button {
-      padding: 9px 15px;
-      font-size: 12px;
-      border-radius: 3px;
-      width: auto;
-      height: auto;
-    }
-  }
-  .el-message-box__btns button:nth-child(2) {
-    margin-left: 10px;
-  }
-}
-</style>
-
-

src/views/new-employee/WelcomePage.vue

@@ -1,368 +0,0 @@
-<template>
-  <div class="welcome" v-loading="enrollLoading">
-    <p class="top-title">欢迎来到京东方大学</p>
-    <!-- 内容卡片 -->
-    <div class="main">
-      <div class="row">
-        <div class="col-md-6">
-          <img
-            class="img-responsive wel_img"
-            src="@/assets/images/new-employee/wel.png"
-            alt=""
-          />
-        </div>
-        <div class="col-md-6">
-          <!-- 桌面端显示 -->
-          <div class="right-font visible-lg-block visible-md-block">
-            <p class="greeting">{{ userInfo.name }}，您好!</p>
-            <p>欢迎加入京东方科技集团股份有限公司</p>
-            <p>从这一刻起，你就是这个大家庭里的一份子。</p>
-            <p>在这里，我们干事业、交朋友、长本领、练胸怀!</p>
-            <p>为了帮你快速融入BOE，我们为你准备了丰富的入职培训课程!</p>
-            <p>快开始学习吧!</p>
-          </div>
-          <!-- 移动端显示 -->
-          <div class="right-font-sm visible-xs-block">
-            <p>{{ userInfo.name }}，您好！</p>
-            <p>欢迎加入京东方</p>
-            <p>为了帮你快速融入BOE</p>
-            <P>我们为你准备了丰富的入职培训课程</P>
-            <p>快开始学习吧！</p>
-          </div>
-          <div class="col-md-12 send_btn">
-            <button
-              v-if="
-                (approvalResults == '1' || approvalResults == '4') &&
-                allowSelfRegistration
-              "
-              class="btn btn-default btn-lg send center-block start-btn"
-              :disabled="enrollLoading"
-              @click="handleEnrollClick"
-            >
-              报名社招新员工项目
-            </button>
-            <button
-              v-else
-              class="btn btn-default btn-lg send center-block start-btn"
-              :disabled="enrollLoading"
-              @click="handleEnrollClick"
-            >
-              开启学习之旅
-            </button>
-            <p
-              style="
-                color: #ffe551;
-                font-size: 14px;
-                font-family: '黑体';
-                margin-top: 20px;
-              "
-            >
-              温馨提示：仅社招新员工可以报名，校招新员工和其他员工请不要点击
-            </p>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <!-- 学习引导页面 -->
-    <!-- <NewEmployeeGuideDialog
-      :visible.sync="infoConfirmDialogVisible"
-      :processing="processing"
-      :onConfirm="handleConfirm"
-      :onCancel="() => (infoConfirmDialogVisible = false)"
-      @close="handleDialogClose"
-    /> -->
-    <!-- 自定义信息提示 -->
-    <CustomErrorMessage ref="customMessage" />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from "vuex";
-import { getWelcomeData, enrollRequest } from "@/api/new-employee/newEmployee";
-import NewEmployeeGuideDialog from "@/components/NewEmployeeGuideDialog.vue";
-import CustomErrorMessage from "@/components/CustomErrorMessage.vue";
-
-export default {
-  name: "WelcomePage",
-  components: { NewEmployeeGuideDialog, CustomErrorMessage },
-  data() {
-    return {
-      userName: "",
-      projectId: "",
-      approvalResults: 1,
-      allowSelfRegistration: false,
-      processing: false,
-      confirmBtnText: "确认",
-      infoConfirmDialogVisible: false,
-      enrollLoading: false,
-    };
-  },
-  computed: {
-    // 如果需要使用Vuex中的用户信息
-    ...mapGetters(["userInfo"]),
-  },
-  mounted() {
-    this.initPageData();
-  },
-  methods: {
-    // 初始化页面数据
-    async initPageData() {
-      try {
-        // 从后端获取用户信息和报名状态
-        const res = await getWelcomeData();
-        if (res.status === 200 && res.data) {
-          this.userName = res.data.studentName;
-          // 1报名失败、2审核中、3审核通过、4审核失败
-          if (res.data.approvalResults) {
-            this.approvalResults = res.data.approvalResults;
-            this.allowSelfRegistration = res.data.allowSelfRegistration;
-            if (res.data.approvalResults != 1) {
-              this.$router.push("/new-employee/study");
-            }
-          }
-        }
-      } catch (error) {
-        console.error("初始化数据失败:", error);
-      }
-    },
-
-    // 报名按钮点击
-    async handleEnrollClick() {
-      if (this.approvalResults == "1" || this.approvalResults == "4") {
-        this.enrollLoading = true;
-        try {
-          const res = await enrollRequest();
-          if (res.data.data.sendToOaSuccess != 0) {
-            this.$refs.customMessage.show(
-              "报名失败请稍后重试，如果再次失败，请联系：XXXX，联系方式：XXXX。"
-            );
-          } else {
-            this.$router.push("/new-employee/study?fromWelcome=1");
-          }
-        } catch (error) {
-          console.error("报名请求失败:", error);
-          this.$refs.customMessage.show(
-            "报名失败请稍后重试，如果再次失败，请联系：XXXX，联系方式：XXXX。"
-          );
-        } finally {
-          this.enrollLoading = false;
-        }
-      } else {
-        this.$router.push("/new-employee/study?fromWelcome=1");
-      }
-    },
-
-    // 确认按钮
-    // async handleConfirm() {
-    //   try {
-    //     this.$router.push("/new-employee/study");
-    //   } catch (error) {
-    //     console.error("提交失败:", error);
-    //     this.processing = false;
-    //     this.confirmBtnText = "确认";
-    //     this.$message.error("提交失败，请重试");
-    //   }
-    // },
-
-    // 关闭对话框
-    handleDialogClose() {
-      this.processing = false;
-      this.confirmBtnText = "确认";
-    },
-  },
-};
-</script>
-
-<style scoped>
-/* 欢迎页面样式 */
-.welcome {
-  min-height: 100vh;
-  background: #2e5aa6;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-
-/* 顶部标题 */
-.top-title {
-  /* 左移整个屏幕的1/4 */
-  font-size: 48px;
-  font-weight: bold;
-  color: white;
-  text-align: center;
-  margin: 40px 20px 60px;
-  font-family: "Microsoft YaHei", sans-serif;
-  text-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
-  margin-left: -25%;
-}
-
-/* 主内容卡片 */
-.welcome .main {
-  background: #2e5aa6;
-  border-radius: 10px;
-  padding: 50px 40px;
-  max-width: 1200px;
-  width: 100%;
-}
-
-/* 自定义栅格系统 */
-.welcome .main .row {
-  display: flex;
-  flex-wrap: wrap;
-  margin: 0 -15px;
-}
-
-.welcome .main .col-md-6 {
-  position: relative;
-  width: 100%;
-  padding: 0 15px;
-  flex: 0 0 50%;
-  max-width: 50%;
-}
-
-.welcome .main .col-md-12 {
-  position: relative;
-  width: 100%;
-  padding: 0 15px;
-  flex: 0 0 100%;
-  max-width: 100%;
-}
-
-.wel_img {
-  max-width: 100%;
-  height: auto;
-  margin: 0 auto;
-  display: block;
-}
-
-/* 右侧文字区域 */
-.right-font {
-  padding: 20px 0;
-}
-
-.right-font .greeting {
-  font-size: 20px;
-  font-weight: bold;
-  color: white;
-  margin-bottom: 15px;
-  font-family: "Microsoft YaHei", sans-serif;
-}
-
-.right-font p {
-  font-size: 18px;
-  line-height: 2;
-  color: white;
-  margin-bottom: 10px;
-  font-family: "Microsoft YaHei", sans-serif;
-}
-
-.right-font-sm p {
-  font-size: 16px;
-  line-height: 1.8;
-  color: white;
-  margin-bottom: 8px;
-  font-family: "Microsoft YaHei", sans-serif;
-}
-
-.send_btn {
-  margin-top: 30px;
-  text-align: center;
-}
-
-.start-btn {
-  /* background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); */
-  background: #2e5aa6;
-  border: 5px solid #6e88b5;
-  color: white;
-  padding: 15px 50px;
-  font-size: 20px;
-  border-radius: 4px;
-  cursor: pointer;
-  transition: all 0.3s ease;
-  /* box-shadow: 0 4px 15px rgba(102, 126, 234, 0.4); */
-}
-
-.start-btn:hover {
-  transform: translateY(-2px);
-  /* box-shadow: 0 6px 20px rgba(102, 126, 234, 0.6);
-  background: linear-gradient(135deg, #764ba2 0%, #667eea 100%); */
-}
-
-.start-btn:active {
-  transform: translateY(0);
-}
-
-.start-btn:disabled {
-  opacity: 0.6;
-  cursor: not-allowed;
-  transform: none;
-}
-
-.start-btn:disabled:hover {
-  transform: none;
-}
-
-/* 响应式样式 */
-@media (max-width: 768px) {
-  .top-title {
-    font-size: 32px;
-    margin-bottom: 30px;
-  }
-
-  .welcome {
-    padding: 40px 15px 30px;
-  }
-
-  .welcome .main {
-    padding: 30px 20px;
-  }
-
-  .welcome .main .col-md-6 {
-    flex: 0 0 100%;
-    max-width: 100%;
-    margin-bottom: 20px;
-  }
-
-  .right-font p {
-    font-size: 16px;
-  }
-
-  .start-btn {
-    padding: 12px 30px;
-    font-size: 18px;
-  }
-}
-
-/* 显示/隐藏控制 */
-.visible-lg-block,
-.visible-md-block,
-.visible-xs-block {
-  display: block;
-}
-
-@media (max-width: 767px) {
-  .visible-lg-block,
-  .visible-md-block {
-    display: none !important;
-  }
-}
-
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-xs-block {
-    display: none !important;
-  }
-}
-
-@media (min-width: 992px) {
-  .visible-xs-block {
-    display: none !important;
-  }
-}
-
-/* Loading遮罩层透明度 */
-.welcome ::v-deep .el-loading-mask {
-  background-color: rgba(255, 255, 255, 0.5) !important;
-}
-</style>
-

src/views/portal/case/Detail.vue

@@ -20,7 +20,7 @@
               </div>
               <div class="label">
                 <author :aid="caseDetail.sysCreateAid" :onlyAvatar="true" :avatar="authorInfo.avatar"
-                  :sex="authorInfo.sex" :name="authorInfo.name"></author>
+                  :sex="authorInfo.sex"></author>
                 <span>案主：{{ authorInfo.name }} ({{ authorInfo.orgInfo }})</span>
                 <!-- <span>案主：{{ authorInfo.name }}</span>
                     <span>工号：{{ authorInfo.code }}</span>

src/views/portal/case/Index.vue

@@ -1609,7 +1609,7 @@ export default {
           })
           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/TaskList.vue

@@ -1,254 +1,186 @@
 <template>
   <div>
-    <!-- <div style="display:flex; padding-left:20px; width:100%">
+     <!-- <div style="display:flex; padding-left:20px; width:100%">
       <div style="width:100px">完成情况</div>
       <div class="progress"><div class="msg">课程完成情况</div> <el-progress :text-inside="true" :stroke-width="16" :percentage="porcessData.course"  status="warning" class="progressItem"> </el-progress> </div>
       <div class="progress" ><div class="msg">项目完成情况</div> <el-progress :text-inside="true" :stroke-width="16" :percentage="porcessData.project" status="success" class="progressItem"> </el-progress>  </div>
       <div class="progress"><div class="msg">路径图完成情况</div> <el-progress :text-inside="true" :stroke-width="16" :percentage="porcessData.router" class="progressItem"> </el-progress>  </div>
      
       </div> -->
-    <div
+    <div style="display: flex; justify-content: space-between; padding: 12px 32px 10px 22px;">
-      style="
-        display: flex;
-        justify-content: space-between;
-        padding: 12px 32px 10px 22px;
-      "
-    >
       <div style="display: flex; justify-content: flex-start">
         <div>
-          <el-select
+          <el-select class="search-input" v-model="status" clearable placeholder="学习进度">
-            class="search-input"
-            v-model="status"
-            clearable
-            placeholder="学习进度"
-          >
             <el-option label="全部" value=""></el-option>
             <el-option label="未开始" value="0"></el-option>
             <el-option label="进行中" value="1"></el-option>
             <el-option label="已完成" value="2"></el-option>
           </el-select>
         </div>
-        <div style="padding-left: 10px">
+        <div style="padding-left: 10px"><el-input v-model="params.cmtask_name" clearable placeholder="搜索名称"></el-input></div>
-          <el-input
+        <div class="button-class" style="padding-left: 10px"><el-button type="primary" icon="el-icon-search" @click="search()">搜索</el-button></div>
-            v-model="params.cmtask_name"
+        <div class="button-class" style="padding-left: 10px"><el-button type="primary" icon="el-icon-refresh-right"  @click="reset()">重置</el-button></div>
-            clearable
-            placeholder="搜索名称"
-          ></el-input>
-        </div>
-        <div class="button-class" style="padding-left: 10px">
-          <el-button type="primary" icon="el-icon-search" @click="search()"
-            >搜索</el-button
-          >
-        </div>
-        <div class="button-class" style="padding-left: 10px">
-          <el-button
-            type="primary"
-            icon="el-icon-refresh-right"
-            @click="reset()"
-            >重置</el-button
-          >
-        </div>
       </div>
     </div>
     <!--课程列表内容-->
     <div class="uc-list" v-if="couresList.length > 0">
-      <div
+      <div class="uc-course" v-for="(item, idx) in couresList" @click="jumpRouter(item)" :key="idx">
-        class="uc-course"
-        v-for="(item, idx) in couresList"
-        @click="jumpRouter(item)"
-        :key="idx"
-      >
         <div class="uc-course-img">
           <img :src="item.cmtask_imgurl" />
-          <span class="spanname" v-if="item.cmtask_type == 1">学习路径图</span>
+          <span class="spanname" v-if="item.cmtask_type==1">学习路径图</span>
-          <span class="spanname" v-if="item.cmtask_type == 2">学习项目</span>
+          <span class="spanname" v-if="item.cmtask_type==2">学习项目</span>
           <!-- 类型3不显示，20230307 东吴说已确认的修改 -->
-          <!-- <span class="spanname" v-if="item.cmtask_type==3">老系统必修任务</span> -->
+         <!-- <span class="spanname" v-if="item.cmtask_type==3">老系统必修任务</span> -->
         </div>
         <div class="uc-course-info">
           <!-- 任务名称 -->
           <div class="uc-course-name one-line-ellipsis" style="cursor: pointer">
-            <span v-if="item.type == 10" class="uc-course-type2">录播</span>
+            <span v-if="item.type==10" class="uc-course-type2">录播</span>
-            <span v-if="item.type == 20" class="uc-course-type2">录播</span>
+            <span v-if="item.type==20" class="uc-course-type2">录播</span>
             <!-- <a href="/course/detail?id=" target="_blank"> {{item.name}}</a> -->
             <span v-html="item.cmtask_name"></span>
           </div>
           <!-- <div class="uc-course-source" @click="jumpRouter(item)">来源：{{ item.cmtask_name }}</div> -->
-          <div style="padding-top: 18px" class="uc-course-text">
+          <div style="padding-top: 18px; " class="uc-course-text">学习进度：
-            学习进度：
+            <span v-if="item.cmtask_user_status==0">未开始</span>
-            <span v-if="item.cmtask_user_status == 0">未开始</span>
+            <span v-if="item.cmtask_user_status==1">进行中</span>
-            <span v-if="item.cmtask_user_status == 1">进行中</span>
+            <span v-if="item.cmtask_user_status==2">已完成</span>
-            <span v-if="item.cmtask_user_status == 2">已完成</span>
           </div>
           <!-- <div class="uc-course-time">推送时间：{{ formatsec(Number(item.updated_at)  * 1000 )}}</div> -->
-          <div class="uc-course-time">推送时间：{{ item.created_at }}</div>
+          <div class="uc-course-time">推送时间：{{ item.created_at}}</div>
         </div>
         <div class="uc-course-btns">
-          <el-button @click="jumpRouter(item)" type="primary" size="small"
+          <el-button @click="jumpRouter(item)" type="primary" size="small">开始学习</el-button>
-            >开始学习</el-button
-          >
         </div>
       </div>
-      <div style="height: 150px; text-align: center; margin-top: 57px">
+      <div style="height:150px;  text-align: center;  margin-top:57px;" >
-        <el-pagination
+        <el-pagination background
-          background
+            @size-change="handleSizeChange"
-          @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
-          @current-change="handleCurrentChange"
+            :page-sizes="[10, 20, 30, 40]"
-          :page-sizes="[10, 20, 30, 40]"
+            :current-page="page"
-          :current-page="page"
+            :page-size="size"
-          :page-size="size"
+            layout="total, sizes, prev, pager, next, jumper"
-          layout="total, sizes, prev, pager, next, jumper"
+            :total="total">
-          :total="total"
-        >
         </el-pagination>
       </div>
-    </div>
+
+     </div>
     <!-- </div> -->
     <div v-else class="zan-wu">
-      <div v-if="loading">
+        <div v-if="loading">
-        <span v-if="couresList.length == 0">正在加载数据...</span>
+            <span v-if="couresList.length==0">正在加载数据...</span>
-        <span v-else>查询中...</span>
+            <span v-else>查询中...</span>
-      </div>
+        </div>
-      <div v-else>
+        <div v-else>
-        <span v-if="couresList.length == 0">没有查询到相关内容</span>
+          <span v-if="couresList.length==0">没有查询到相关内容</span>
-      </div>
+        </div>
     </div>
   </div>
 </template>
 
 <script>
-import studyItem from "@/components/Course/studyItem.vue";
+import studyItem from '@/components/Course/studyItem.vue';
-import apiManage from "@/api/manage/manage.js";
+import apiManage from '@/api/manage/manage.js'
-import { getToken } from "@/utils/token";
+import { getToken } from '@/utils/token'
-import { formatsec } from "@/utils/datetime.js";
+import {formatsec} from '@/utils/datetime.js'
-import axios from "axios";
+import axios from 'axios'
 export default {
-  name: "ucStudyTask",
+  name: 'ucStudyTask',
   components: { studyItem },
   data() {
     return {
-      status: "",
+      status: '',
-      params: {
+      params:{
-        cmtask_name: "",
+         cmtask_name:'',
-        cmtask_status: "",
+         cmtask_status:'',
-        type: "",
+         type:'',
       },
-      porcessData: {
+      porcessData:{
-        course: 0,
+        course:0,
-        project: 0,
+        project:0,
-        router: 0,
+        router:0,
       },
-      loading: true,
+      loading:true,
-      size: 10,
+      size:10,
-      page: 1,
+      page:1,
-      keyword: "",
+      keyword:'',
       formatsec,
-      couresList: [],
+      couresList:[],
-      total: 0,
+      total: 0
     };
   },
   mounted() {
-    this.loadBoeData();
+   this.loadBoeData();
-    this.getPossData();
+   this.getPossData()
   },
   methods: {
     jumpRouter(item) {
-      if (item.szxygProjectFlag == 1) {
-        this.$router.push("/new-employee/study");
-        return;
-      }
       //location.href=`${this.webBaseUrl}/course/boeframe?id=${item.cmtask_id}`;
 
       //let urlPre=window.location.protocol+'//'+window.location.host;
-      let studentPath = process.env.VUE_APP_STUDENT_PATH;
+      let studentPath=process.env.VUE_APP_STUDENT_PATH;
-      if (item.cmtask_type == 1) {
+      if(item.cmtask_type==1){ //学习路径图
-        //学习路径图
+         let params=encodeURIComponent('routerId='+item.cmtask_id);
-        let params = encodeURIComponent("routerId=" + item.cmtask_id);
+         //this.$router.push('/forward?to='+studentPath+'/pathdetails&params='+params);
-        //this.$router.push('/forward?to='+studentPath+'/pathdetails&params='+params);
+         this.$router.push('/forward?to='+studentPath+'/pathchapterdetails&params='+params);
-        this.$router.push(
+      }else if(item.cmtask_type==2){ //学习项目
-          "/forward?to=" + studentPath + "/pathchapterdetails&params=" + params
+         let params=encodeURIComponent('projectId='+item.cmtask_id);
-        );
+         this.$router.push('/forward?to='+studentPath+'/projectdetails&params='+params);
-      } else if (item.cmtask_type == 2) {
+      }else if(item.cmtask_type==3){
-        //学习项目
+         let pushUrl=`/course/boeframe?id=${item.cmtask_id}&type=3`;
-        let params = encodeURIComponent("projectId=" + item.cmtask_id);
+         this.$router.push(pushUrl);
-        this.$router.push(
-          "/forward?to=" + studentPath + "/projectdetails&params=" + params
-        );
-      } else if (item.cmtask_type == 3) {
-        let pushUrl = `/course/boeframe?id=${item.cmtask_id}&type=3`;
-        this.$router.push(pushUrl);
       }
     },
-    getPossData() {
+  getPossData(){
-      axios({
+       axios({
         method: "POST",
-        url: "/report/boeu/studyInfo",
+        url: '/report/boeu/studyInfo',
         params: {},
-        headers: { token: getToken() },
+        headers:{token:getToken(),}
       }).then((res) => {
-        console.log("111", res.data.result);
+        console.log('111',res.data.result)
         // this.porcessData=response.data.data
-        this.porcessData.course = Math.floor(
+        this.porcessData.course=Math.floor(res.data.result.course.total === 0 ? 0: (res.data.result.course.completion/res.data.result.course.total)*100)
-          res.data.result.course.total === 0
+        this.porcessData.project=Math.floor(res.data.result.project.total === 0 ? 0: (res.data.result.project.completion/res.data.result.project.total)*100)
-            ? 0
+        this.porcessData.router=Math.floor(res.data.result.router.total === 0 ? 0: (res.data.result.router.completion/res.data.result.router.total)*100)
-            : (res.data.result.course.completion /
+      })
-                res.data.result.course.total) *
-                100
-        );
-        this.porcessData.project = Math.floor(
-          res.data.result.project.total === 0
-            ? 0
-            : (res.data.result.project.completion /
-                res.data.result.project.total) *
-                100
-        );
-        this.porcessData.router = Math.floor(
-          res.data.result.router.total === 0
-            ? 0
-            : (res.data.result.router.completion /
-                res.data.result.router.total) *
-                100
-        );
-      });
     },
     loadBoeData() {
-      if (this.status !== "5") {
+      if(this.status !== '5') {
         this.params.cmtask_status = this.status;
       }
-      let params = {
+      let params={
-        pageNo: this.page,
+          pageNo:this.page,
-        pageSize: this.size,
+          pageSize:this.size,
-        cmtask_user_status: this.params.cmtask_status,
+          cmtask_user_status:this.params.cmtask_status,
-        cmtask_name: this.params.cmtask_name,
+          cmtask_name:this.params.cmtask_name,
-      };
+        }
-      this.loading = true;
+      this.loading=true;
-      apiManage
+      apiManage.userTaskList(params).then(res=>{
-        .userTaskList(params)
+        if(res.code==200){
-        .then((res) => {
+             this.total =parseInt(res.data.total);
-          if (res.code == 200) {
+             this.couresList = res.data.records;
-            this.total = parseInt(res.data.total);
+           }else{
-            this.couresList = res.data.records;
+             this.$message.error('查询数据失败：'+res.msg);
-          } else {
+           }
-            this.$message.error("查询数据失败：" + res.msg);
+           this.loading=false;
-          }
+        }).catch(()=>{
-          this.loading = false;
+           this.loading=false;
         })
-        .catch(() => {
-          this.loading = false;
-        });
     },
-    search() {
+    search(){
-      this.page = 1;
+      this.page=1;
-      this.loadBoeData();
+      this.loadBoeData()
     },
     reset() {
-      this.loading = false;
+       this.loading=false;
-      (this.params.cmtask_name = ""),
+       this.params.cmtask_name = '',
-        (this.params.type = ""),
+       this.params.type = '',
-        (this.params.cmtask_status = "");
+       this.params.cmtask_status = ''
-      this.status = "";
+       this.status = '';
-      this.page = 1;
+       this.page=1;
-      this.loadBoeData();
+       this.loadBoeData();
     },
     handleSizeChange(value) {
       this.size = value;
@@ -258,25 +190,25 @@ export default {
     handleCurrentChange(value) {
       this.page = value;
       this.loadBoeData();
-    },
+    }
-  },
+  }
 };
 </script>
 
 <style scoped lang="scss">
-.progress {
+.progress{
-  width: calc((100% - 100px) / 3);
+  width:calc((100% - 100px) / 3);
   display: flex;
-  .msg {
+  .msg{
-    width: 120px;
+  width:120px;
   }
-  .progressItem {
+  .progressItem{
     margin-left: 20px;
-    width: calc(100% - 160px);
+   width:calc(100% - 160px);
-    height: 10px;
+  height: 10px;
   }
 }
-.zan-wu {
+.zan-wu{
   text-align: center;
   font-size: 20px;
   margin-top: 70px;
@@ -286,19 +218,19 @@ export default {
   display: -webkit-box;
   white-space: pre-wrap;
   overflow: hidden;
-  text-overflow: ellipsis;
+  text-overflow:ellipsis;
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 1;
   box-sizing: border-box;
 }
-.button-class {
+.button-class{
   // height: 42px;
 }
 
-.uc-list {
+.uc-list{
   padding-left: 22px;
 }
-.uc-course-time {
+.uc-course-time{
   color: #666;
   font-size: 14px;
 }
@@ -306,23 +238,23 @@ export default {
   margin-top: 10px;
   margin-right: 40px;
 }
-.spanname {
+ .spanname {
-  position: absolute;
+      position: absolute;
-  background-color: #6a99a4;
+      background-color: #6a99a4;
-  color: #ffffff;
+      color:#ffffff;
-  padding: 4px 10px;
+      padding: 4px 10px;
-  font-size: 12px;
+      font-size: 12px;
-  bottom: 0px;
+      bottom: 0px;
-  z-index: 100;
+      z-index: 100;
-  left: 0px;
+      left: 0px;
-}
+  }
 .uc-course {
   cursor: pointer;
   display: flex;
   justify-content: space-around;
-  border-bottom: 1px solid #e8e8e8;
+  border-bottom: 1px solid #E8E8E8;
   margin-right: 32px;
-  padding: 20px 0px 15px 0px;
+  padding: 20px 0px 15px  0px ;
   .uc-course-img {
     width: 212px;
     height: 119px;
@@ -331,6 +263,7 @@ export default {
       width: 100%;
       height: 100%;
     }
+
   }
   .uc-course-info {
     // width: 50%;
@@ -345,9 +278,10 @@ export default {
     }
     .uc-course-text {
       color: #444;
-      margin-bottom: 3px;
+      margin-bottom:3px;
       font-size: 16px;
       margin-top: 20px;
+
     }
   }
   .uc-course-btns {

vue.config.js

@@ -131,15 +131,13 @@ module.exports = {
       //   changeOrigin: true,
       // },
       "/growth": {
-        // target: 'https://u-pre.boe.com',
+        target: 'https://u-pre.boe.com',
-        target: 'http://10.10.176.17:81',
         // target: 'http://192.168.86.195:32002',
         changeOrigin: true,
       },
       '/manageApi': {
         // 目标代理服务器地址
-        // target: 'https://u-pre.boe.com',
+        target: 'https://u-pre.boe.com',
-        target: 'http://10.10.176.17:81',
         changeOrigin: true,
         secure: false,
         pathRewrite: {
@@ -149,8 +147,7 @@ module.exports = {
       '/systemapi': {
         // 目标代理服务器地址
         // target: 'http://127.0.0.1:9090',
-        // target: 'https://u-pre.boe.com',
+        target: 'https://u-pre.boe.com',
-        target: 'http://10.10.176.17:81',
         changeOrigin: true,
         logLevel: 'debug',
         secure: false,
@@ -160,8 +157,7 @@ module.exports = {
       },
       '/uboeApi': {
         // 目标代理服务器地址
-        // target: 'https://u-pre.boe.com',
+        target: 'https://u-pre.boe.com',
-        target: 'http://10.10.176.17:81',
         changeOrigin: true,
         secure: false,
         pathRewrite: {
@@ -170,8 +166,7 @@ module.exports = {
       },
       '/userbasic': {
         // 目标代理服务器地址
-        // target: 'https://u-pre.boe.com',
+        target: 'https://u-pre.boe.com',
-        target: 'http://10.10.176.17:81',
         changeOrigin: true,
         secure: false,
         pathRewrite: {
@@ -181,8 +176,7 @@ module.exports = {
       '/statApi': {
         // 目标代理服务器地址
         // target: 'http://127.0.0.1:9080',
-        // target: 'https://u-pre.boe.com',
+        target: 'https://u-pre.boe.com',
-        target: 'http://10.10.176.17:81',
         changeOrigin: true,
         logLevel: 'debug',
         secure: false,
@@ -193,8 +187,7 @@ module.exports = {
       '/socialApi': {
         // 目标代理服务器地址
         // target: 'http://127.0.0.1:9081',
-        // target: 'https://u-pre.boe.com',
+        target: 'https://u-pre.boe.com',
-        target: 'http://10.10.176.17:81',
         changeOrigin: true,
         logLevel: 'debug',
         secure: false,
@@ -204,8 +197,7 @@ module.exports = {
       },
       '/report': {
         // 目标代理服务器地址
-        // target: 'https://u-pre.boe.com',
+        target: 'https://u-pre.boe.com',
-        target: 'http://10.10.176.17:81',
         changeOrigin: true,
         secure: false,
         pathRewrite: {
@@ -214,15 +206,13 @@ module.exports = {
       },
       '/infrasApi': {
         // 目标代理服务器地址
-        // target: 'https://u-pre.boe.com',
+        target: 'https://u-pre.boe.com',
-        target: 'http://10.10.176.17:81',
         changeOrigin: true,
         secure: false,
       },
       '/activityApi': {
         // 目标代理服务器地址
-        // target: 'https://u-pre.boe.com',
+        target: 'https://u-pre.boe.com',
-        target: 'http://10.10.176.17:81',
         changeOrigin: true,
         secure: false,
       },