教师端1期需求

# Conflicts:
#	src/api/modules/course.js
#	src/data/pages.js

.env.development

@@ -41,6 +41,7 @@ VUE_APP_PUBLIC_PATH='/pc'
 VUE_APP_MANAGER_PATH='/manage'
 VUE_APP_STUDENT_PATH='/fe-student'
 VUE_APP_MANAGER_API_PATH='/manageApi'
+VUE_APP_GROWTH_API_PATH=''
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.preview

@@ -37,6 +37,7 @@ VUE_APP_PUBLIC_PATH='/pc-release'
 VUE_APP_MANAGER_PATH='/manage-release'
 VUE_APP_STUDENT_PATH='/fe-student-release'
 VUE_APP_MANAGER_API_PATH='/manageApi-release'
+VUE_APP_GROWTH_API_PATH='/growth'
 
 # 登录地址
 VUE_APP_LOGIN_URL='https://u.boe.com/web-release/'

.env.production

@@ -37,6 +37,7 @@ VUE_APP_PUBLIC_PATH='/pc'
 VUE_APP_MANAGER_PATH='/manage'
 VUE_APP_STUDENT_PATH='/fe-student'
 VUE_APP_MANAGER_API_PATH='/manageApi'
+VUE_APP_GROWTH_API_PATH='/growth'
 
 # 登录地址
 VUE_APP_LOGIN_URL='https://u.boe.com/web/'

.env.testing

@@ -36,6 +36,7 @@ VUE_APP_PUBLIC_PATH='/pc'
 VUE_APP_MANAGER_PATH='/manage'
 VUE_APP_STUDENT_PATH='/fe-student'
 VUE_APP_MANAGER_API_PATH='/manageApi'
+VUE_APP_GROWTH_API_PATH='/growth'
 
 # 登录地址
 VUE_APP_LOGIN_URL='https://u-pre.boe.com/web/'

package.json

@@ -15,6 +15,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
+    "@mermaid-js/parser": "^0.6.3",
     "axios": "^0.21.4",
     "core-js": "^3.6.5",
     "driver.js": "^0.9.8",
@@ -23,9 +24,15 @@
     "element-ui": "^2.15.7",
     "file-saver": "^2.0.5",
     "fuse.js": "^6.4.6",
+    "highlight.js": "^11.11.1",
     "image-conversion": "^2.1.1",
     "jsencrypt": "^3.2.1",
     "json-bigint": "^1.0.0",
+    "katex": "^0.16.25",
+    "markdown-it": "^14.1.0",
+    "markdown-it-highlightjs": "^4.2.0",
+    "markdown-it-mermaid": "^0.2.5",
+    "mermaid": "^8.13.10",
     "mockjs": "^1.1.0",
     "moment": "^2.29.1",
     "nprogress": "^0.2.0",
@@ -43,6 +50,7 @@
     "vue": "^2.6.11",
     "vue-awesome-swiper": "^3.1.3",
     "vue-cookies": "^1.7.4",
+    "vue-katex": "^0.5.0",
     "vue-pdf": "^4.2.0",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "^3.5.2",
@@ -60,6 +68,7 @@
     "html-webpack-plugin": "^5.5.0",
     "less": "^4.1.1",
     "less-loader": "^6.2.0",
+    "null-loader": "^4.0.1",
     "sass": "^1.32.13",
     "sass-loader": "^10.1.0",
     "vue-template-compiler": "^2.6.11"

public/index.html

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

src/App.vue

@@ -1,25 +1,74 @@
 <template>
-  <div id="app">
+  <div id="app" style="width: 100vw">
     <keep-alive :include="['case']">
       <router-view />
+      12312
     </keep-alive>
+    <!-- 添加AI Call组件 -->
+    <AICall
+      :dialogVisible="showAICall"
+      @close="onCloseAICall"
+      @restore="onRestoreAICall"
+    />
   </div>
 </template>
 
 <script>
-  import { mapGetters } from 'vuex';
+  import { mapGetters, mapState } from 'vuex';
+  import AICall from '@/views/portal/case/AICall.vue';
+
   export default{
     name:  'App',
-    computed: {
-      ...mapGetters(['userInfo'])
+    components: {
+      AICall
     },
-  mounted() {
+    computed: {
+      ...mapGetters(['userInfo']),
+      ...mapState('app', ['showAICall', 'showAICallMinimized'])
+    },
+    methods: {
+      onCloseAICall() {
+        // 通过Vuex关闭AI Call组件
+        this.$store.dispatch('app/setShowAICall', false);
+      },
+
+      onRestoreAICall() {
+        // 通过Vuex显示AI Call组件
+        this.$store.dispatch('app/setShowAICall', true);
+      },
+
+      // 检查当前路由是否应该显示AI弹窗
+      checkRouteForAICall() {
+        const currentRoute = this.$route.name;
+        // 只在case或caseDetail路由显示弹窗
+        if (currentRoute === 'case' || currentRoute === 'caseDetail') {
+          // 设置最小化窗口显示状态为true
+          this.$store.dispatch('app/setShowAICallMinimized', true);
+          // 注意：这里不再强制设置showAICall为true，保留用户之前的操作状态
+        } else {
+          // 其他路由关闭弹窗
+          this.$store.dispatch('app/setShowAICall', false);
+          // 设置最小化窗口显示状态为false
+          this.$store.dispatch('app/setShowAICallMinimized', false);
+        }
+      }
+    },
+    mounted() {
       //从状态值中取,因为登录处理，所以移动watch中
       // console.log(this.userInfo);
       // if(this.userInfo && this.userInfo.name!=''){
       //   this.$watermark.set(this.userInfo.name+this.userInfo.loginName);
       // }
+
+      // 初始化检查路由
+      this.checkRouteForAICall();
     },
+    watch: {
+      // 监听路由变化
+      $route(to, from) {
+        this.checkRouteForAICall();
+      }
+    }
     // watch:{
     //   userInfo(newVal,oldVal){
     //     if(newVal && newVal.name!=''){
@@ -39,4 +88,3 @@
     box-shadow: 0px 1px 5px 1px rgba(92,98,111,.3);
 }
 </style>
-

src/api/boe/aiChat.js

@@ -0,0 +1,30 @@
+import ajax from '@/utils/xajax.js'
+
+/**
+ * AI聊天对话接口
+ * @param {Object} data - 请求参数
+ * @param {string} data.conversationId - 会话ID，如果为空则创建新会话
+ * @param {string} data.query - 用户提问内容
+ * @returns {Promise} - 返回SSE流
+ */
+export function aiChat(data) {
+  return ajax.postJson('http://192.168.3.178/xboe/m/boe/case/ai/chat', data)
+}
+
+/**
+ * 查询会话消息记录接口
+ * @param {string} conversationId - 会话ID
+ * @returns {Promise} - 返回会话历史记录
+ */
+export function getChatMessages(conversationId) {
+  return ajax.get('/xboe/m/boe/case/ai/messages?conversationId=' + conversationId)
+}
+
+/**
+ * 案例专家功能入口显示权限判断接口
+ * 判断当前登录用户是否显示"案例专家"功能入口
+ * @returns {Promise} - 返回是否显示功能入口的布尔值
+ */
+export function showCaseAiEntrance() {
+  return ajax.get('/xboe/m/boe/case/ai/show-entrance')
+}

src/api/boe/courseRecord.js

@@ -1,5 +1,6 @@
 /**我的授课记录*/
 import ajax from '@/api/boe/boeApiAjax.js'
+import ajax2 from '@/api/unionAjax.js'
 import axios from 'axios'
 import { getToken } from '@/utils/token'
 const baseURL = process.env.VUE_APP_BOE_BASE_API;
@@ -60,13 +61,63 @@ const exportStudentOfTearcher = function(userId) {
 const courseRecordList = function(data) {
     return ajax.postJson('/b1/system/teacher/teacher-course-list',data);
 }
+const getListByToken = function(data) {
+  return ajax2.get('/manageApi',`/admin/teacherRecord/getListByToken?courseName=${data.courseName}&pageNo=${data.pageNo}&pageSize=${data.pageSize}`);
+}
 
+/**
+ * 导出授课记录
+ *
+ * @param {Object} data
+ */
+const courseRecordExport2 = function(data) {
+  return axios.request({
+    baseURL: "/manageApi",
+    url: '/admin/export/exportInTeacherRecord',
+    method: 'get',
+    data:data,
+    headers:{'Content-Type':'application/json;charset=utf-8'},
+    responseType: 'blob'
+  })
+}
+
+/**
+ * 导出课程下的学员信息
+ *
+ */
+const exportStudentOfCourse2 = function(courseId,courseType) {
+  return axios.request({
+    baseURL: "/manageApi",
+    url: '/admin/export/exportTeacherRecordStudentInfo?courseId='+courseId+'&courseType='+courseType,
+    method: 'get'
+    // headers:{'Content-Type':'application/json;charset=utf-8'},
+    // responseType: 'blob'
+  })
+}
+
+/**
+ * 导出教师下的所有授课记录下的学员信息
+ *
+ */
+const exportStudentOfTearcher2 = function(userId) {
+  return axios.request({
+    baseURL: "/manageApi",
+    url: '/b1/system/teacher/teacher-course-student-export?userId='+userId,
+    method: 'post',
+    headers:{'Content-Type':'application/json;charset=utf-8'},
+    responseType: 'blob'
+  })
+}
 
 
 export default {
     courseRecordExport,
+    courseRecordExport2,
     courseRecordList,
+    getListByToken,
     exportStudentOfCourse,
-    exportStudentOfTearcher
+    exportStudentOfCourse2,
+    exportStudentOfTearcher,
+    exportStudentOfTearcher2,
 
 }

src/api/boe/userbasic.js

@@ -103,6 +103,14 @@ const getUsersByIds = function(ids) {
     return ajax.postJson(baseURL,'/user/getUserMessageToDai',ids);
 }
 
+/**
+ * 根据关键字检索用户（创建人下拉）
+ * @param {string} keyword
+ */
+const selectUser = function(keyword = '') {
+    return ajax.postJson(baseURL,'/user/selectuser',{ keyword });
+}
+
 export default {
     userParentOrg,
     findOrgsByKeyword,
@@ -116,5 +124,6 @@ export default {
     getInAudienceIds,
     getUsersByIds,
     updateUser,
-    logout
+    logout,
+    selectUser
 }

src/api/growth/growthpath.js

@@ -0,0 +1,8 @@
+// import ajax from '@/utils/xajax.js'
+import ajax from '../ajax';
+// const baseURL = process.env.VUE_APP_GROWTH_API_PATH;
+const baseURL = '/growth';
+// 查询专业力必修列表
+export const listData = (obj) => ajax.get(baseURL, '/professional/student/studentGrowthList', { params: obj })
+// 查询专业力统计
+export const getTotalGrowthTaskDetail = (obj) => ajax.get(baseURL, '/professional/student/getTotalGrowthTaskDetail', { params: obj })

src/api/httpAjax.js

@@ -0,0 +1,208 @@
+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/cases.js

@@ -1,6 +1,6 @@
 /* 案例模块的相关处理*/
 import ajax from '@/utils/xajax.js'
-
+import ajaxs from '@/api/ajax.js'
 /**首页查询
  * pageSize
  * orderField
@@ -88,6 +88,12 @@ const usernameList = function (pageSize) {
 const queryPraises = function (pageSize) {
   return ajax.get(`/xboe/m/boe/cases/query-praises?pageSize=${pageSize}`);
 }
+const queryPraisesNew = function (pageSize,rankType) {
+  return ajax.get(`/xboe/m/boe/cases/queryPopularity?pageSize=${pageSize}&rankType=${rankType}`);
+}
+const queryRecommendRank = function (pageSize) {
+  return ajax.get(`/xboe/m/boe/cases/queryRecommendRank?pageSize=${pageSize}`);
+}
 /*
 好评榜
 @param pageSize 长度
@@ -95,6 +101,9 @@ const queryPraises = function (pageSize) {
 const queryComments = function (pageSize) {
   return ajax.get(`/xboe/m/boe/cases/query-comments?pageSize=${pageSize}`);
 }
+const queryCommentsNew = function (pageSize,rankType) {
+  return ajax.get(`/xboe/m/boe/cases/queryHighOpinion?pageSize=${pageSize}&rankType=${rankType}`);
+}
 
 /**
  * 专业分类
@@ -186,11 +195,36 @@ const endReadTimer =  (data)=> ajax.postJson('/xboe/m/boe/cases/recommend/record
 const caseYears = function (query = {}) {
   return ajax.post('/xboe/m/boe/cases/caseYears', query);
 }
-
-
-
-
+//案例推荐榜单
+const getQueryRecommendRank = function (params) {
+  return ajax.get(`/xboe/m/boe/cases/queryRecommendRank?pageSize=${params.pageSize}`)
+}
+//案例上榜
+const riseIntoRank = (data) => ajax.post(`/xboe/m/boe/cases/riseIntoRank?caseId=${data.caseId}`)
+//取消上榜
+const cancelRiseIntoRank = (data) => ajax.post(`/xboe/m/boe/cases/cancelRiseIntoRank?caseId=${data.caseId}`)
+//调整榜单
+const adjustRank = (data) => ajax.post(`/xboe/m/boe/cases/adjustRank?caseIds=${data.caseIds}`)
+//收藏案例
+const queryFavoriteCaseOfIndex = (params) => ajax.get(`/xboe/m/boe/cases/queryFavoriteCaseOfIndex?pageIndex=${params.pageIndex}&pageSize=${params.pageSize}&orderField=${params.orderField}&orderAsc=${params.orderAsc}`)
+//浏览记录
+const queryViewRecord = (data) => ajaxs.post(`/statApi/xboe/m/stat/userdynamic/list?pageIndex=${data.pageIndex}&pageSize=${data.pageSize}&contentType=${data.contentType}&aid=${data.aid}&hidden=${data.hidden}&eventKey=${data.eventKey}`)
+//浏览量TOP榜单
+const queryPopularityOfMajor = (params) => ajax.get(`/xboe/m/boe/cases/queryPopularityOfMajor?pageSize=${params.pageSize}&rankMonth=${params.rankMonth}&majorId=${params.majorId}`)
+//浏览记录新
+const browsingHistory = (params) => ajax.get(`/xboe/m/boe/cases/browsingHistory?pageIndex=${params.pageIndex}&pageSize=5`)
+//获取所有的专业月份
+const queryAllTimePopularityOfMajor = () => ajax.get('/xboe/m/boe/cases/queryAllTimePopularityOfMajor')
 export default {
+  queryAllTimePopularityOfMajor,
+  getQueryRecommendRank,
+  queryPopularityOfMajor,
+  browsingHistory,
+  queryViewRecord,
+  queryFavoriteCaseOfIndex,
+  riseIntoRank,
+  cancelRiseIntoRank,
+  adjustRank,
   indexList,
   queryList,
   queryListV2,
@@ -202,7 +236,10 @@ export default {
   query,
   usernameList,
   queryPraises,
+  queryPraisesNew,
+  queryRecommendRank,
   queryComments,
+  queryCommentsNew,
   majorTypes,
   details,
   ids,

src/api/modules/courseFile.js

@@ -22,7 +22,7 @@ const pageList = function(data) {
 
 /**
  * 选择课件的查询，这里也是分页查询，只是返回的内容，字段会很少，用于课件制作那选择已有课件内容。
- * 
+ *
  * @param {Object} data
  * 查询参数如上面pageList方法
  */
@@ -47,7 +47,9 @@ const findList = function(data) {
  }
  */
 const saveUpload = function(data) {
-    return ajax.post('/xboe/m/course/file/upload/save', data);
+    return ajax.post('/xboe/m/course/file/upload/save', data, {
+      timeout: 60000
+    });
 }
 
 /**
@@ -88,4 +90,4 @@ export default {
     batchUpdate,
     detail,
     delFile
-}
+}

src/api/modules/coursePortal.js

@@ -102,6 +102,24 @@ const courseSearch=function(query){
 const detailStudy = function(courseId,aid) {
   return ajax.get(`/xboe/m/course/portal/detail-study?courseId=${courseId}&aid=${aid}`);
 }
+
+
+/**
+ * 课程学习进度的详细信息-分页
+ * @param {Object} data
+ */
+const detailStudyPage = function(data) {
+  return ajax.get(`/xboe/m/course/portal/detail-study-page?courseId=${data.courseId}&aid=${data.aid}&pageIndex=${data.pageIndex}&pageSize=${data.pageSize}`);
+}
+
+/**
+ * 资源学习情况列列表-分页
+ * @param {Object} data
+ */
+const pageListResource=function(data){
+	return ajax.post('/xboe/school/study/course/pagelist-resource',data);
+}
+
 export default {
     list,
     pageList,
@@ -112,5 +130,7 @@ export default {
     studyCounts,
     courseSearch,
   detailStudy,
-  detailPost
+  detailPost,
+  detailStudyPage,
+  pageListResource
 }

src/api/modules/courseStudy.js

@@ -10,7 +10,7 @@ import ajax from '@/utils/xajax.js'
  * 返回 检查报名状态
  */
 const hasSignup = function(courseId) {
-    return ajax.get('/xboe/school/study/signup/has?cid='+courseId);
+  return ajax.get('/xboe/school/study/signup/has?cid='+courseId);
 }
 
 /**
@@ -25,7 +25,7 @@ const hasSignup = function(courseId) {
  }
  */
 const signup = function(data) {
-    return ajax.post('/xboe/school/study/signup/self', data);
+  return ajax.post('/xboe/school/study/signup/self', data);
 }
 
 /**
@@ -38,7 +38,7 @@ const signup = function(data) {
  }
  */
 const findSignup = function(data) {
-    return ajax.post('/xboe/school/study/signup/pagelist', data);
+  return ajax.post('/xboe/school/study/signup/pagelist', data);
 }
 
 /**
@@ -46,7 +46,7 @@ const findSignup = function(data) {
  * @param {Object} id 报名的id
  */
 const deleteSignup = function(id) {
-    return ajax.post('/xboe/school/study/signup/delete?id='+id);
+  return ajax.post('/xboe/school/study/signup/delete?id='+id);
 }
 
 /**
@@ -55,7 +55,7 @@ const deleteSignup = function(id) {
  * Signup 对象集合， list
  */
 const importSignup = function(data) {
-    return ajax.post('/xboe/school/study/signup/import',data);
+  return ajax.post('/xboe/school/study/signup/import',data);
 }
 
 /**
@@ -63,11 +63,11 @@ const importSignup = function(data) {
  * @param {Object} courseId 课程 的id
  */
 const countSignup = function(courseId) {
-    return ajax.post('/xboe/school/study/signup/count-by-course',{courseId});
+  return ajax.post('/xboe/school/study/signup/count-by-course',{courseId});
 }
 
 const studyIndex = function(courseId) {
-    return ajax.get('/xboe/school/study/course/studyIndex?cid='+courseId+'&addView=true');
+  return ajax.get('/xboe/school/study/course/studyIndex?cid='+courseId+'&addView=true');
 }
 /**
  *
@@ -80,7 +80,7 @@ const studyIndex = function(courseId) {
  * @returns
  */
 const studyIndexPost = function(data) {
-    return ajax.post('/xboe/school/study/course/studyIndex',data);
+  return ajax.post('/xboe/school/study/course/studyIndex',data);
 }
 
 /**
@@ -88,7 +88,7 @@ const studyIndexPost = function(data) {
  * @param {Object} courseId
  */
 const studyInfo = function(courseId) {
-    return ajax.get('/xboe/school/study/course/info?cid='+courseId);
+  return ajax.get('/xboe/school/study/course/info?cid='+courseId);
 }
 
 
@@ -98,7 +98,7 @@ const studyInfo = function(courseId) {
  * @param {Object} contentId
  */
 const getStudyContentItem = function(studyId,contentId) {
-    return ajax.post('/xboe/school/study/course/study-course-content',{studyId,contentId});
+  return ajax.post('/xboe/school/study/course/study-course-content',{studyId,contentId});
 }
 
 /**
@@ -111,7 +111,11 @@ const getStudyContentItem = function(studyId,contentId) {
  * @returns
  */
 const studyVideoTime = function(data) {
-    return ajax.post('/xboe/school/study/course/study-video-time',data);
+  return ajax.post('/xboe/school/study/course/study-video-time',data);
+}
+
+const updateStudyVideoTime = function(data) {
+  return ajax.post('/xboe/school/study/course/updateStudyVideoTime',data);
 }
 
 /**
@@ -119,7 +123,7 @@ const studyVideoTime = function(data) {
  * @returns
  */
 const lastStudy = function() {
-    return ajax.get('/xboe/school/study/course/last-study');
+  return ajax.get('/xboe/school/study/course/last-study');
 }
 
 /**
@@ -136,7 +140,7 @@ const lastStudy = function() {
  *
  */
 const studyContent = function(data) {
-    return ajax.postJson('/xboe/school/study/course/study',data);
+  return ajax.postJson('/xboe/school/study/course/study',data);
 }
 
 /**
@@ -150,7 +154,7 @@ const studyContent = function(data) {
  *
  */
 const appendStudyTime = function(data) {
-    return ajax.post('/xboe/school/study/course/appendtime',data);
+  return ajax.post('/xboe/school/study/course/appendtime',data);
 }
 
 /**
@@ -161,7 +165,7 @@ const appendStudyTime = function(data) {
  * name: 学习人的姓名
  */
 const studyRecords = function(data) {
-    return ajax.post('/xboe/school/study/course/pagelist',data);
+  return ajax.post('/xboe/school/study/course/pagelistEx',data);
 }
 
 /**
@@ -173,7 +177,7 @@ const studyRecords = function(data) {
  * name: 学习人的姓名
  */
 const studyContentRecords = function(data) {
-    return ajax.post('/xboe/school/study/course/contents',data);
+  return ajax.post('/xboe/school/study/course/contents',data);
 }
 
 /**
@@ -185,7 +189,7 @@ const studyContentRecords = function(data) {
  }
  */
 const studyExport = function(data) {
-    return ajax.post('/xboe/school/study/course/export',data);
+  return ajax.post('/xboe/school/study/course/export',data, { responseType: 'blob' });
 }
 
 /**
@@ -200,7 +204,7 @@ const studyExport = function(data) {
  }
  */
 const myStudyList = function(query) {
-    return ajax.post('/xboe/school/study/course/mylist',query);
+  return ajax.post('/xboe/school/study/course/mylist',query);
 }
 /**
  * 当前课程学习记录
@@ -216,7 +220,7 @@ const myStudyList = function(query) {
  }
  */
 const myCourseStudy = function(query) {
-    return ajax.post('/xboe/school/study/course/course-users',query);
+  return ajax.post('/xboe/school/study/course/course-users',query);
 }
 
 
@@ -241,7 +245,7 @@ const myCourseStudy = function(query) {
  * answerJson
  */
 const saveExam = function(data) {
-    return ajax.postJson('/xboe/school/study/exam/save',data);
+  return ajax.postJson('/xboe/school/study/exam/save',data);
 }
 
 /**
@@ -261,7 +265,7 @@ const saveExam = function(data) {
  * hwAnswer： 文本提交的信息
  */
 const saveHomework = function(data) {
-    return ajax.postJson('/xboe/school/study/homework/save',data);
+  return ajax.postJson('/xboe/school/study/homework/save',data);
 }
 
 /**
@@ -279,7 +283,7 @@ const saveHomework = function(data) {
  * asScore：评估得分
  */
 const saveAssess = function(data) {
-    return ajax.postJson('/xboe/school/study/assess/save',data);
+  return ajax.postJson('/xboe/school/study/assess/save',data);
 }
 
 /**
@@ -288,7 +292,7 @@ const saveAssess = function(data) {
  * id:记录的id
  */
 const myHomework = function(id) {
-    return ajax.post('/xboe/school/study/homework/detail?id='+id);
+  return ajax.post('/xboe/school/study/homework/detail?id='+id);
 }
 
 /**
@@ -297,7 +301,7 @@ const myHomework = function(id) {
  * id:记录的id
  */
 const myExamPaper = function(id) {
-    return ajax.get('/xboe/school/study/exam/detail?id='+id);
+  return ajax.get('/xboe/school/study/exam/detail?id='+id);
 }
 
 /**
@@ -306,7 +310,7 @@ const myExamPaper = function(id) {
  * id:记录的id
  */
 const myAssess = function(id) {
-    return ajax.get('/xboe/school/study/assess/detail?id='+id);
+  return ajax.get('/xboe/school/study/assess/detail?id='+id);
 }
 
 /**
@@ -318,7 +322,7 @@ const myAssess = function(id) {
  }
  */
 const myHomeworkList = function(data) {
-    return ajax.post('/xboe/school/study/homework/list-study',data);
+  return ajax.post('/xboe/school/study/homework/list-study',data);
 }
 
 /**
@@ -327,7 +331,7 @@ const myHomeworkList = function(data) {
  * 对应的提交记录的id，
  */
 const myExamList = function(itemId) {
-    return ajax.post('/xboe/school/study/exam/list',{itemId});
+  return ajax.post('/xboe/school/study/exam/list',{itemId});
 }
 
 /**
@@ -338,8 +342,8 @@ const myExamList = function(itemId) {
    contentId:''
  }
  */
- const myExamList2 = function(data) {
-    return ajax.post('/xboe/school/study/exam/list-study',data);
+const myExamList2 = function(data) {
+  return ajax.post('/xboe/school/study/exam/list-study',data);
 }
 
 /**
@@ -351,7 +355,7 @@ const myExamList = function(itemId) {
  }
  */
 const myAssessList = function(data) {
-    return ajax.post('/xboe/school/study/assess/list-study',data);
+  return ajax.post('/xboe/school/study/assess/list-study',data);
 }
 
 /*
@@ -360,7 +364,7 @@ const myAssessList = function(data) {
 @param courseId 课程id 用于删除课程报名信息和修改课程学习人数
  */
 const deleteSignUp=function(id,courseId){
-	return ajax.post(`/xboe/school/study/course/delete-signup?id=${id}&couserId=${courseId}`);
+  return ajax.post(`/xboe/school/study/course/delete-signup?id=${id}&couserId=${courseId}`);
 }
 
 /**
@@ -389,45 +393,80 @@ const followIds=function (data){
 const myStudysFromES=function (data){
   return ajax.post('/xboe/school/study/es/search',data);
 }
-
+//导出作业
+const homeworkExport=function (data){
+  return ajax.get(`/xboe/m/course/portal/export?contentId=${data.contentId}&courseName=${data.courseName}`);
+}
 /**根据id集合查询，传入的是id数组*/
 const findByIds=function (ids){
   return ajax.postJson('/xboe/school/study/es/list-by-ids',ids);
 }
 
+const exportSignup=function (data){
+  return ajax.post('/xboe/school/study/course/export-signup',data, { responseType: 'blob' });
+}
+
+// 作业导出
+const exportHomework=function (data){
+  return ajax.post('/xboe/school/study/course/contents-homework-export',data, { responseType: 'blob' });
+}
+
+// 考试导出
+const exportExam=function (data){
+  return ajax.post('/xboe/school/study/course/contents-exam-export',data, { responseType: 'blob' });
+}
+
+// 评估类型资源
+const contentsAssess=function (data){
+  return ajax.post('/xboe/school/study/course/contents-assess',data);
+}
+
+// 考试类型资源
+const contentsExam=function (data){
+  return ajax.post('/xboe/school/study/course/contents-exam',data);
+}
+
+
 export default {
-    hasSignup,
-    signup,
-    findSignup,
-    deleteSignup,
-    importSignup,
-    countSignup,
-    studyIndex,
-    studyInfo,
-    studyVideoTime,
-    lastStudy,
-    studyContent,
-    appendStudyTime,
-    studyRecords,
-    studyContentRecords,
-    getStudyContentItem,
-    studyExport,
-    myStudyList,
-    saveHomework,
-    saveExam,
-    saveAssess,
-    myHomework,
-    myExamPaper,
-    myAssess,
-    myHomeworkList,
-    myExamList,
-    myAssessList,
-    myExamList2,
-	myCourseStudy,
+  hasSignup,
+  signup,
+  findSignup,
+  deleteSignup,
+  importSignup,
+  countSignup,
+  studyIndex,
+  studyInfo,
+  studyVideoTime,
+  updateStudyVideoTime,
+  lastStudy,
+  studyContent,
+  appendStudyTime,
+  studyRecords,
+  studyContentRecords,
+  getStudyContentItem,
+  studyExport,
+  myStudyList,
+  saveHomework,
+  saveExam,
+  saveAssess,
+  myHomework,
+  myExamPaper,
+  myAssess,
+  myHomeworkList,
+  myExamList,
+  myAssessList,
+  myExamList2,
+  myCourseStudy,
   myStudysFromES,
+  homeworkExport,
   findByIds,
-	deleteSignUp,
+  deleteSignUp,
   ids,
   followIds,
-  studyIndexPost
+  studyIndexPost,
+  exportSignup,
+  exportHomework,
+  exportExam,
+  contentsAssess,
+  contentsExam
 }

src/api/modules/courseTag.js

@@ -0,0 +1,64 @@
+/**课程标签模块的相关处理*/
+import ajax from '@/utils/xajax.js'
+
+/**
+ * 分页查询：标签列表
+ * @param {Object} query
+ */
+const portalPageList = function(query) {
+  return ajax.post('/xboe/m/coursetag/page', query);
+}
+
+//改变标签的公共属性
+const changeTagPublic = function (row){
+  // 返回 Promise 的 API 调用
+  return ajax.post('/xboe/m/coursetag/changePublicStatus', {
+    id: row.id,
+    isPublic: row.isPublic
+  });
+}
+
+//改变标签的热点属性
+const changeTagHot = function (row){
+  // 返回 Promise 的 API 调用
+  return ajax.post('/xboe/m/coursetag/changeHotStatus', {
+    id: row.id,
+    isHot: row.isHot
+  });
+}
+
+//查询指定id的标签关联的所有课程
+const showCourseByTag = function (query){
+  return ajax.post('/xboe/m/coursetag/showCourseByTag', query);
+}
+
+//解除指定id的课程和某个标签之间的关联关系
+const unbindCourseTagRelation = function (params){
+  return ajax.post('/xboe/m/coursetag/unbind', params);
+}
+
+//编辑课程：标签模糊查询
+const searchTags = function (params){
+  return ajax.post('/xboe/m/coursetag/searchTags', params);
+}
+
+//编辑课程：创建标签(与当前课程关联)
+const createTag = function (params){
+  return ajax.post('/xboe/m/coursetag/createTag', params);
+}
+
+//获取最新前10个热点标签
+const getHotTagList = function (params){
+  return ajax.post('/xboe/m/coursetag/getHotTagList', params);
+}
+
+export default {
+  portalPageList,
+  changeTagPublic,
+  changeTagHot,
+  showCourseByTag,
+  unbindCourseTagRelation,
+  searchTags,
+  createTag,
+  getHotTagList
+}

src/api/modules/paper.js

@@ -72,6 +72,9 @@ const querypaper = function(data) {
 const getPaperContent = function(id) {
     return ajax.get('/xboe/m/exam/paper/paper-content?id=' + id);
 }
+const newPaperContent = function(id){
+    return ajax.get('/xboe/m/course/content/exam/paper-content?courseExamId='+id);
+}
 export default {
     detail,
     update,
@@ -80,6 +83,7 @@ export default {
     querylist,
     querypaper,
     getPaperContent,
+    newPaperContent,
     batchImportCount,
     batchImportData
 }

src/api/modules/teacher.js

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

src/api/phase2/index.js

@@ -1,5 +1,7 @@
 import ajax from '@/utils/xajax.js'
 import http from '../unionAjax'
+import httpAjax from '../httpAjax'
+
 const baseURL = process.env.VUE_APP_MANAGER_API_PATH;
 
 
@@ -47,6 +49,18 @@ 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',{});
+}
 /**
  * 首页新课程推荐列表
  */
@@ -61,5 +75,7 @@ export default {
   articlelist,
   courselist,
   newCases,
-  getRecommendList
+  getRecommendList,
+  qualitylist,
+  qualityPageList
 }

src/components/AlertPopup.vue

@@ -1,7 +1,7 @@
 <template>
   <!--弹出窗口设置-->
   <div>
-    <div v-for="pop in popupList" :key="pop.id">wwww
+    <div v-for="pop in popupList" :key="pop.id">
       <el-dialog :close-on-press-escape="false" :close-on-click-modal="false"  class="medalbox"  :visible.sync="pop.show"  :append-to-body="true" >
         <div style="text-align: center;position: relative;">
           <!-- <span style="float: right;" @click="pop.show = false"><i style="font-size: 28px;color: #000000;" class="el-icon-close"></i></span> -->

src/components/Case/collectList.vue

@@ -8,7 +8,10 @@
 
           </div>
           <div class="article-info-date">
-            <el-button @click="delItem(item)" type="text" style="color: #8590A6;font-size:14px" icon="el-icon-star-on">取消收藏</el-button>
+            <div class="box">
+              <div class="image"></div>
+              <el-button @click="delItem(item)" type="text" style="color: #8590A6;font-size:14px">取消收藏</el-button>
+            </div>
           </div>
         </div>
         <div class="article-info-tools">
@@ -161,6 +164,26 @@
         line-height: 40px;
         font-weight: 200;
         color: #999999;
+        display: flex;
+        justify-content: end;
+        .box{
+          display: flex;
+          justify-content: end;
+          align-items: center;
+          .image{
+            width: 14px;
+            height: 14px;
+            background: url('../../assets/images/case/Frame(5).png') no-repeat;
+            background-size: 100%;
+            margin-right: 10px;
+          }
+          &:hover{
+            .image{
+              background: url('../../assets/images/case/Frame(12).png') no-repeat;
+              background-size: 100%;
+            }
+          }
+        }
         i {
           margin-right: 5px;
         }

src/components/Course/TopCourseSorter.vue

@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    title="置顶排序"
+    :visible.sync="dialogVisible"
+    custom-class="g-dialog top-course-sorter-dialog"
+    width="820px"
+    :close-on-click-modal="false"
+    @closed="handleClosed"
+    append-to-body
+  >
+    <div class="top-course-sorter" v-loading="loading">
+      <div class="top-course-sorter__table" v-if="topList.length">
+        <div class="sorter-header">
+          <div class="header-cell header-cell--handle"></div>
+          <div class="header-cell header-cell--order">排序</div>
+          <div class="header-cell header-cell--name">课程名称</div>
+          <div class="header-cell header-cell--teacher">授课教师</div>
+        </div>
+        <div
+          class="sorter-row"
+          v-for="(item, index) in topList"
+          :key="item.id"
+          draggable="true"
+          @dragstart="handleDragStart(index, $event)"
+          @dragover.prevent
+          @drop="handleDrop(index)"
+          @dragend="handleDragEnd"
+          :class="{ 'is-dragging': draggingIndex === index }"
+        >
+          <div class="row-cell row-cell--handle">
+            <i class="el-icon-s-operation"></i>
+          </div>
+          <div class="row-cell row-cell--order">{{ index + 1 }}</div>
+          <div class="row-cell row-cell--name" :title="item.name">{{ item.name }}</div>
+          <div class="row-cell row-cell--teacher" :title="item.teacherName || '-'">
+            {{ item.teacherName || '-' }}
+          </div>
+        </div>
+      </div>
+      <el-empty v-else-if="!loading" description="暂无置顶课程"></el-empty>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取消</el-button>
+      <el-button type="primary" :disabled="!topList.length" :loading="saving" @click="handleSave">确定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import apiCourse from '@/api/modules/course.js';
+
+export default {
+  name: 'TopCourseSorter',
+  data() {
+    return {
+      dialogVisible: false,
+      loading: false,
+      saving: false,
+      topList: [],
+      draggingIndex: null,
+    };
+  },
+  methods: {
+    open() {
+      this.dialogVisible = true;
+      this.fetchTopList();
+    },
+    async fetchTopList() {
+      this.loading = true;
+      try {
+        const res = await apiCourse.fetchTopCourseList();
+        if (res.status === 200) {
+          this.topList = Array.isArray(res.result) ? [...res.result] : [];
+        } else {
+          this.$message.error(res.message || '获取置顶课程失败');
+          this.topList = [];
+        }
+      } catch (error) {
+        this.$message.error(error.message || '获取置顶课程失败');
+        this.topList = [];
+      } finally {
+        this.loading = false;
+      }
+    },
+    handleDragStart(index, event) {
+      this.draggingIndex = index;
+      if (event && event.dataTransfer) {
+        event.dataTransfer.effectAllowed = 'move';
+        event.dataTransfer.setData('text/plain', index);
+      }
+    },
+    handleDrop(targetIndex) {
+      if (this.draggingIndex === null || this.draggingIndex === targetIndex) {
+        return;
+      }
+      const movingItem = this.topList.splice(this.draggingIndex, 1)[0];
+      this.topList.splice(targetIndex, 0, movingItem);
+      this.draggingIndex = targetIndex;
+    },
+    handleDragEnd() {
+      this.draggingIndex = null;
+    },
+    async handleSave() {
+      if (!this.topList.length) {
+        this.$message.warning('暂无需要保存的排序');
+        return;
+      }
+      const payload = this.topList.map((item, index) => ({
+        id: item.id,
+        sortWeight: index,
+      }));
+      this.saving = true;
+      try {
+        const res = await apiCourse.updateTopCourseSort(payload);
+        if (res.status === 200) {
+          this.$message.success('排序更新成功');
+          this.$emit('sorted');
+          this.dialogVisible = false;
+        } else {
+          throw new Error(res.message || '排序更新失败');
+        }
+      } catch (error) {
+        this.$message.error(error.message || '排序更新失败');
+      } finally {
+        this.saving = false;
+      }
+    },
+    handleClosed() {
+      this.topList = [];
+      this.draggingIndex = null;
+      this.loading = false;
+      this.saving = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.top-course-sorter {
+  min-height: 200px;
+  padding-top: 8px;
+}
+
+.top-course-sorter__table {
+  border: 1px solid #ebeef5;
+  border-radius: 6px;
+  overflow: hidden;
+}
+
+.sorter-header,
+.sorter-row {
+  display: grid;
+  grid-template-columns: 60px 80px 1fr 160px;
+  align-items: center;
+}
+
+.sorter-header {
+  background-color: #f5f7fa;
+  height: 48px;
+  font-weight: 600;
+  color: #303133;
+  border-bottom: 1px solid #ebeef5;
+}
+
+.sorter-row {
+  min-height: 56px;
+  border-bottom: 1px solid #f2f6fc;
+  cursor: move;
+  transition: background-color 0.2s ease;
+}
+
+.sorter-row:last-child {
+  border-bottom: none;
+}
+
+.sorter-row:hover {
+  background-color: #f9fbff;
+}
+
+.sorter-row.is-dragging {
+  opacity: 0.7;
+  background-color: #ecf5ff;
+}
+
+.header-cell,
+.row-cell {
+  padding: 0 16px;
+  display: flex;
+  align-items: center;
+}
+
+.header-cell--handle,
+.row-cell--handle {
+  justify-content: center;
+}
+
+.header-cell--order,
+.row-cell--order {
+  justify-content: flex-start;
+}
+
+.row-cell--name,
+.row-cell--teacher {
+  color: #303133;
+}
+
+.row-cell--name {
+  font-weight: 500;
+}
+
+.row-cell--teacher {
+  color: #666;
+}
+
+.row-cell--handle i {
+  font-size: 20px;
+  color: #c0c4cc;
+}
+
+.dialog-footer {
+  text-align: right;
+}
+</style>
+
+
+
+
+
+
+
+
+
+
+

src/components/Course/auditCourse1.vue

@@ -637,7 +637,9 @@ export default {
           }
           this.teacherList = rs.result.teachers;
           this.teacherName = rs.result.teachers;
-          this.teacher = rs.result.teachers.map(res => res.teacherName);
+          this.teacher = rs.result.teachers.map(item => {
+            return `${item.teacherName}(${item.userNo})`
+          });
           this.totalContent = rs.result.contents.length; //计算总内容数
           if (this.courseInfo.tags != "") {
             this.showTags = this.courseInfo.tags.split(",");

src/components/Course/auditCourse2.vue

@@ -681,7 +681,9 @@ export default {
           }
           this.teacherList = rs.result.teachers;
           this.teacherName = rs.result.teachers;
-          this.teacher = rs.result.teachers.map(item => item.teacherName);
+          this.teacher = rs.result.teachers.map(item => {
+            return `${item.teacherName}(${item.userNo})`
+          });
           this.showTags = this.courseInfo.tags.split(",");
           if (rs.result.course.resOwner3 == "") {
             this.resOwnerArray = [

src/components/Course/choice.vue

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

src/components/Course/chooseCourseFile.vue

@@ -50,7 +50,7 @@
               <el-input-number v-model="duration" size="mini" :min="1" :max="100"></el-input-number>
             </span>
           </div>
-          <el-upload class="upload-demo" :headers="headers" :data="data" drag :action="uploadFileUrl" :on-success="handleUploadSuccess" :before-upload="handleBeforeUpload">
+          <el-upload ref="uploadRef" class="upload-demo" :headers="headers" :data="data" drag :action="uploadFileUrl" :on-success="handleUploadSuccess" :before-upload="handleBeforeUpload">
             <i class="el-icon-upload"></i>
             <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
             <div class="el-upload__tip" slot="tip">文件大小限制：{{curComType.maxSizeName}},支持的文件类型：{{curComType.fileTypes.join(',')}}</div>
@@ -195,6 +195,7 @@
                 // this.cware.content.content=result.filePath;
               }else{
                 this.$message.error(rs.message);
+                this.$refs.uploadRef.clearFiles();
               }
           });
         }else{

src/components/Course/courseExam.vue

@@ -85,6 +85,28 @@
             <el-form-item label="考试说明">
                <el-input type="textarea" show-word-limit v-model="examInfo.info" placeholder="关于考试的说明(限255字以内)" maxlength="255"></el-input>
             </el-form-item>
+            <el-form-item  label="随机模式">
+              <el-col :span="4">
+                <el-radio-group v-model="examInfo.randomMode">
+                  <el-radio :label="true">是</el-radio>
+                  <el-radio :label="false">否</el-radio>
+                </el-radio-group>
+              </el-col>
+              <el-col :span="20" v-if="examInfo.randomMode&&examInfo.paperType==1">
+                <el-form-item label="数量">
+                    <el-input-number v-model="examInfo.qnum" :min="1" :max="examPaper.items.length" label="数量"></el-input-number>
+                    <span style="margin-left:10px;" v-if="examPaper.items.length==0">先添加试题</span>
+                    <span style="margin-left:10px;" v-if="examPaper.items.length>0">试卷有 {{examPaper.items.length}} 道试题</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="20" v-if="examInfo.randomMode&&examInfo.paperType==2">
+                <el-form-item label="数量">
+                    <el-input-number v-model="examInfo.qnum" :min="1" :max="usePaper.counts" label="数量"></el-input-number>
+                    <span style="margin-left:10px;" v-if="usePaper.counts==0">先选择试卷</span>
+                    <span style="margin-left:10px;" v-if="usePaper.counts>0">试卷有 {{usePaper.counts}} 道试题</span>
+                </el-form-item>
+              </el-col>
+            </el-form-item>
           </el-form>
           </div>
           <div v-if="examInfo.paperType==1">
@@ -285,7 +307,9 @@
              return;
            }
         }
-
+        if(!this.examInfo.randomMode){
+          this.examInfo.qnum = 0
+        }
         this.$emit("save",this.examInfo);
       },
       deleteExam(){ //删除
@@ -294,6 +318,8 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
+          this.examInfo.randomMode = false;
+          this.examInfo.qnum = 0;
           this.$emit("remove",this.examInfo);
         }).catch(() => {
 

src/components/Course/courseTag.vue

@@ -0,0 +1,400 @@
+<template>
+  <div class="tag-container"  @click="handleContainerClick">
+    <el-select style="width: 100%;"
+               v-model="selectedTags"
+               multiple
+               filterable
+               value-key="id"
+               remote
+               reserve-keyword
+               :remote-method="debouncedSearch"
+               :loading="loading"
+               :placeholder="'回车创建新标签'"
+               :no-data-text="'无此标签，按回车键创建'"
+               @remove-tag="handleTagRemove"
+               @change="handleSelectionChange"
+               @keyup.enter.native="handleEnterKey"
+               @keyup.delete.native="handleDeleteKey"
+               @focus="handleFocus"
+               ref="tagSelect"
+    >
+      <el-option
+        v-for="item in searchResults"
+        :key="item.id"
+        :label="item.tagName"
+        :value="item"
+        :disabled="isTagDisabled(item)"
+      />
+    </el-select>
+    <!-- 添加标签计数显示 -->
+    <div class="tag-count">
+      {{ selectedTags.length }}/5
+    </div>
+  </div>
+</template>
+
+<script>
+import { debounce } from 'lodash'
+import apiCourseTag from '@/api/modules/courseTag.js'
+import { mapGetters } from 'vuex';
+
+export default {
+  props: {
+    courseId:{
+      type:String,
+      require:true,
+    },
+    sysTypeList:{
+      type:Array,
+      require:true,
+      default: []
+    },
+    maxTags: {
+      type: Number,
+      default: 5
+    },
+    // 添加：接收初始标签数据的props
+    initialTags: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      selectedTags: [],
+      searchResults: [],
+      loading: false,
+      tagMap: new Map(),
+      inputBuffer: '',
+      params: {},
+      tag: {},
+      // 添加临时存储用于回滚
+      previousTags: []
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+    displayTags() {
+      return this.selectedTags.map(tag =>
+        typeof tag === 'object' ? tag : this.tagMap.get(tag)
+      ).filter(Boolean)
+    }
+  },
+  created() {
+    this.debouncedSearch = debounce(this.doSearch, 500)
+    console.log("----------sysTypeList.length---------->"+this.sysTypeList.length)
+    console.log("----------sysTypeList.length---------->"+(this.sysTypeList.length===0))
+  },
+  // 添加：挂载时初始化标签数据
+  mounted() {
+    if (this.initialTags && this.initialTags.length > 0) {
+      this.selectedTags = this.initialTags;
+      this.searchResults = this.initialTags;
+      // 将初始标签添加到tagMap中，确保删除功能正常
+      this.initialTags.forEach(tag => {
+        if (tag.id) {
+          this.tagMap.set(tag.id, tag);
+        }
+      });
+    }
+  },
+  watch: {
+    // 监听课程ID变化，重置所有状态
+    courseId(newVal) {
+      this.resetTagState();
+    },
+    // 监听初始标签变化，重新加载
+    initialTags(newVal) {
+      this.selectedTags = newVal || [];
+      this.searchResults = newVal || [];
+      this.tagMap.clear(); // 清空旧缓存
+      newVal.forEach(tag => {
+        if (tag.id) this.tagMap.set(tag.id, tag);
+      });
+    },
+    // 监听分类变化，重新加载搜索结果
+    sysTypeList: {
+      handler() {
+        // 只有在已选择分类且有焦点时才重新加载
+        if (this.sysTypeList.length > 0 && this.$refs.tagSelect && this.$refs.tagSelect.visible) {
+          this.doSearch('');
+        }
+      },
+      deep: true
+    }
+  },
+  methods: {
+    // 新增：检查标签是否应该被禁用
+    isTagDisabled(tag) {
+      // 如果标签已经被选中，不应该禁用（允许取消选择）
+      const isSelected = this.selectedTags.some(selectedTag => selectedTag.id === tag.id);
+      if (isSelected) {
+        return false;
+      }
+      // 如果标签未被选中且已达到最大数量，则禁用
+      return this.selectedTags.length >= this.maxTags;
+    },
+    // 新增：处理输入框获得焦点事件
+    async handleFocus() {
+      this.previousTags = [...this.selectedTags];
+      // 当输入框获得焦点时，加载默认的搜索结果
+      if (this.sysTypeList.length > 0) {
+        await this.doSearch('');
+      }
+      this.$emit('focus');
+    },
+    handleContainerClick() {
+      // 容器点击时也触发焦点事件
+      this.$emit('focus');
+    },
+    // 新增：重置标签状态的方法
+    resetTagState() {
+      this.selectedTags = [];
+      this.searchResults = [];
+      this.tagMap.clear();
+      this.loading = false;
+      this.params = {};
+    },
+    handleTagRemove(tagId) {
+      this.selectedTags = this.selectedTags.filter(id => id !== tagId)
+      this.$emit('change', this.displayTags)
+      this.clearInput();
+    },
+    removeTag(tagId) {
+      this.handleTagRemove(tagId)
+    },
+
+    // 新增：处理删除键事件
+    handleDeleteKey(event) {
+      // 如果输入框内容为空，不执行任何搜索
+      if (!event.target.value.trim()) {
+        this.searchResults = []
+      }
+    },
+
+    //按回车键，创建新标签
+    handleEnterKey(event) {
+      const inputVal = event.target.value?.trim()
+      if (!inputVal) return;
+      // 检查是否与已选择的标签重复
+      const isDuplicate = this.selectedTags.some(tag => tag.tagName === inputVal);
+      if (isDuplicate) {
+        this.$message.warning('该标签已存在，无需重复创建');
+        event.target.value = '';
+        return;
+      }
+      if (!isDuplicate && inputVal && this.selectedTags.length < this.maxTags) {
+        this.createNewTag(event.target.value.trim())
+        this.clearInput();
+      } else if (this.selectedTags.length >= this.maxTags) {
+        this.$message.warning('最多只能添加5个标签')
+        this.clearInput();
+      } else {
+        this.clearInput();
+      }
+    },
+
+    // 新增：处理选择变化事件
+    handleSelectionChange(newValues) {
+
+      // 检查每个标签对象是否完整
+      newValues.forEach((tag, index) => {
+        if (!tag.tagName) {
+          console.error(`第${index}个标签缺少tagName:`, tag);
+        }
+      });
+
+      // 检查数量限制
+      if (newValues.length > this.maxTags) {
+        this.$message.warning(`最多只能选择${this.maxTags}个标签`);
+        // 回滚到之前的状态
+        this.selectedTags = [...this.previousTags];
+        return;
+      }
+
+      // 更新前保存当前状态
+      this.previousTags = [...newValues];
+      this.$emit('change', this.displayTags);
+
+      this.clearInput();
+      this.$nextTick(() => {
+        this.$refs.tagSelect.visible = false;
+      });
+    },
+
+    clearInput() {
+      if (this.$refs.tagSelect) {
+        const input = this.$refs.tagSelect.$refs.input;
+        if (input) {
+          input.value = '';
+        }
+      }
+    },
+
+    //创建新标签
+    async createNewTag(tagName) {
+      // 标签不能超过八个字
+      if (tagName.length > 8) {
+        this.$message.error('标签不能超过8个字')
+        return;
+      }
+      // 检查标签是否在下拉框中已存在
+      const isExistInSearch = this.searchResults.some(tag => tag.tagName === tagName);
+      if (isExistInSearch) {
+        this.$message.warning('已存在此标签，请选择');
+        return;
+      }
+      // 首先检查是否与已选择的标签重复
+      const isDuplicate = this.selectedTags.some(tag => tag.tagName === tagName);
+      if (isDuplicate) {
+        this.$message.warning('该标签已存在，无需重复创建');
+        return;
+      }
+      // 标签格式验证：仅支持中文、英文、数字、下划线、中横线
+      const tagPattern = /^[\u4e00-\u9fa5a-zA-Z0-9_-]+$/;
+      if (!tagPattern.test(tagName)) {
+        this.$message.error('标签名称仅支持中文、英文、数字、下划线(_)和中横线(-)，不支持空格、点和特殊字符');
+        return;
+      }
+      // 添加标签数量限制检查
+      if (this.selectedTags.length >= this.maxTags) {
+        this.$message.warning('最多只能添加5个标签')
+        return;
+      }
+      this.loading = true
+      try {
+        this.params.courseId = this.courseId;
+        this.params.tagName = tagName;
+        // 分类
+        if (this.sysTypeList.length > 0) {
+          this.params.sysType1 = this.sysTypeList[0]; //一级的id
+        }
+        if (this.sysTypeList.length > 1) {
+          this.params.sysType2 = this.sysTypeList[1]; //二级的id
+        }
+        if (this.sysTypeList.length > 2) {
+          this.params.sysType3 = this.sysTypeList[2]; //三级的id
+        }
+        const {result:newTag} = await apiCourseTag.createTag(this.params)
+        this.$message.success('标签创建成功',newTag);
+
+        this.selectedTags = [...this.selectedTags, newTag];
+        // 更新搜索结果的逻辑保持不变
+        this.searchResults = [newTag, ...this.searchResults];
+        this.tagMap.set(newTag.id, newTag)
+        this.$emit('change', this.displayTags)
+
+        this.$nextTick(() => {
+          // 强制重新设置selectedTags来触发更新
+          const tempTags = [...this.selectedTags];
+          this.selectedTags = [];
+          this.$nextTick(() => {
+            this.selectedTags = tempTags;
+          });
+          this.$refs.tagSelect.visible = false;
+        });
+      } finally {
+        this.loading = false
+      }
+    },
+    // 修改doSearch方法，添加搜索结果为空时的提示
+    async doSearch(query) {
+      // 不再在空查询时清空搜索结果
+      // if (!query.trim()) {
+      //   this.searchResults = []
+      //   return
+      // }
+      console.log("---- doSearch ------ query = " + query )
+      this.loading = true
+      try {
+        // 获取 typeId：取 sysTypeList 最后一个有效的值
+        const typeId =  this.sysTypeList.length > 2 ? this.sysTypeList[2] :
+          this.sysTypeList.length > 1 ? this.sysTypeList[1] :
+            this.sysTypeList.length > 0 ? this.sysTypeList[0] : null;
+        console.log("---- doSearch searchTags ------ query = " + query + " , typeId = " + typeId )
+        const {result:tags} = await apiCourseTag.searchTags({tagName:query,typeId:typeId})
+        console.log("-- searchTags 查询结果 tags = " + tags )
+
+        tags.forEach(item => {
+          this.tagMap.set(item.id, item)
+        })
+        this.searchResults = tags
+        // 当搜索结果为空时，提示用户可以按回车键创建标签
+        if (tags.length === 0) {
+          // this.$message.info('无此标签，按回车键创建')
+        }
+      } finally {
+        this.loading = false
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.tag-container {
+  position: relative;
+}
+.tag-preview {
+  margin-top: 8px;
+}
+.el-tag {
+  margin-right: 6px;
+  margin-bottom: 6px;
+}
+
+/* 添加标签计数样式 */
+.tag-count {
+  position: absolute;
+  right: 10px;
+  top: 47%;
+  transform: translateY(-40%);
+  font-size: 12px;
+  color: #999;
+  background: white;
+  padding: 0 5px;
+  pointer-events: none;
+  /* 添加高度限制 */
+  height: 25px;
+  line-height: 25px; /* 垂直居中文字 */
+  box-sizing: border-box; /* 确保padding包含在height内 */
+}
+
+
+
+::v-deep(.el-select__tags) {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+/*
+::v-deep(.el-tag) {
+  flex: 0 0 calc(50% - 8px);
+  max-width: calc(50% - 8px);
+  box-sizing: border-box;
+  margin-right: 8px;
+  margin-bottom: 4px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}*/
+
+::v-deep(.el-tag) {
+  flex: 1 1 auto; /* 自动调整宽度 */
+  min-width: 30%; /* 设置最小宽度 */
+  max-width: 48%; /* 设置最大宽度，留出边距 */
+  box-sizing: border-box;
+  margin-right: 8px;
+  margin-bottom: 4px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  justify-content: center;
+  text-align: center;
+}
+
+::v-deep(.el-select__input) {
+  flex: 1;
+  min-width: 60px;
+}
+</style>

src/components/Course/exam.vue

@@ -326,48 +326,91 @@ export default {
         return qitems;
     },
     startTest(){
-      if(this.info.paperType==2){
-        apiExamPaper.getPaperContent(this.info.paperId).then(rs=>{
-          if(rs.status=200){
-             this.examPaper.json=JSON.parse(rs.result);
-             //console.log(this.examPaper.json,'this.examPaper.json');
-             let qitems=this.convertToItems(this.examPaper.json);
+      apiExamPaper.newPaperContent(this.info.id).then(res=>{
+        if(!res.error&&res.result != ''){
+          if(this.info.paperType==2){
+            //TODO1
+            console.log("调用开始考试 if paperType == 2")
+            this.examPaper.json=res.result;
+            let qitems=this.convertToItems(this.examPaper.json);
             this.paper ={items:qitems};
             this.total=qitems.length;
             this.curItem=qitems[this.curIndex];
             this.startTime=new Date();//记录开始时间
             this.timerValue=this.info.testDuration;
+            this.content.status=1;
             this.timer=setInterval(this.changeTimer,60000);
             this.testStart=true;
           }else{
-            this.$message.error('加载试卷内容失败，请与管理员联系，试卷是否已删除');
-          }
-        })
-      }else{
-        let paper= JSON.parse(this.info.paperContent);
-        paper.items.forEach(item=>{
-          //console.log(item);
-          if(item.type==101){
-            item.userAnswer='';
-          }else if(item.type==102){
-            item.userAnswer=[];
-          }else{
-            item.userAnswer=''
-          }
-          item.options.forEach(opt=>{
-            opt.checked=false;
-          })
-        });
-        this.total=paper.items.length;
-        this.paper =paper;
-        //console.log(this.paper);
+            console.log("调用开始考试 else paperType != 2")
+            let paper= {items:res.result};
+            paper.items.forEach(item=>{
+              if(item.type==101){
+                item.userAnswer='';
+              }else if(item.type==102){
+                item.userAnswer=[];
+              }else{
+                item.userAnswer=''
+              }
+              item.options.forEach(opt=>{
+                opt.checked=false;
+              })
+            });
+            this.total=paper.items.length;
+            this.paper =paper;
 
-        this.curItem=paper.items[this.curIndex];
-        this.startTime=new Date();//记录开始时间
-        this.timerValue=this.info.testDuration;
-        this.timer=setInterval(this.changeTimer,60000);
-        this.testStart=true;
-      }
+            this.curItem=paper.items[this.curIndex];
+            this.startTime=new Date();//记录开始时间
+            this.timerValue=this.info.testDuration;
+            this.timer=setInterval(this.changeTimer,60000);
+            this.testStart=true;
+          }
+        }else{
+          this.$message.error('加载试卷内容失败，请与管理员联系，试卷是否已删除');
+        }
+      })
+      // if(this.info.paperType==2){
+      //   apiExamPaper.getPaperContent(this.info.paperId).then(rs=>{
+      //     if(rs.status=200){
+      //        this.examPaper.json=JSON.parse(rs.result);
+      //        //console.log(this.examPaper.json,'this.examPaper.json');
+      //        let qitems=this.convertToItems(this.examPaper.json);
+      //       this.paper ={items:qitems};
+      //       this.total=qitems.length;
+      //       this.curItem=qitems[this.curIndex];
+      //       this.startTime=new Date();//记录开始时间
+      //       this.timerValue=this.info.testDuration;
+      //       this.timer=setInterval(this.changeTimer,60000);
+      //       this.testStart=true;
+      //     }else{
+      //       this.$message.error('加载试卷内容失败，请与管理员联系，试卷是否已删除');
+      //     }
+      //   })
+      // }else{
+      //   let paper= JSON.parse(this.info.paperContent);
+      //   paper.items.forEach(item=>{
+      //     //console.log(item);
+      //     if(item.type==101){
+      //       item.userAnswer='';
+      //     }else if(item.type==102){
+      //       item.userAnswer=[];
+      //     }else{
+      //       item.userAnswer=''
+      //     }
+      //     item.options.forEach(opt=>{
+      //       opt.checked=false;
+      //     })
+      //   });
+      //   this.total=paper.items.length;
+      //   this.paper =paper;
+      //   //console.log(this.paper);
+
+      //   this.curItem=paper.items[this.curIndex];
+      //   this.startTime=new Date();//记录开始时间
+      //   this.timerValue=this.info.testDuration;
+      //   this.timer=setInterval(this.changeTimer,60000);
+      //   this.testStart=true;
+      // }
     },
     chooseOption(opt){
     	if(this.curItem.type==101 || this.curItem.type==103){
@@ -532,7 +575,7 @@ export default {
         randomMode:this.info.randomMode,
         score:testScore,
         paperJson:JSON.stringify(this.paper),//原来是对象，这里要也要对象
-        //startTime:formatDate(this.startTime),//此时间需要格式化,格式化时间可以放在util中
+        startTime:formatDate(this.startTime),//此时间需要格式化,格式化时间可以放在util中
         //endTime:formatDate(now),
       }
       //计划考试的时长
@@ -543,8 +586,15 @@ export default {
       apiStudy.saveExam(postData).then(res=>{
         this.thisTrue = true
          if(res.status == 200) {
+            console.log("获取数据结果 考试 res ==>",res)
             this.records.push(res.result);
-            this.content.status=9;//表已学习完，判断上级的章是否已完成
+            //TODO 评分更改 最终完成
+            if(res.result.score > res.result.passLine){
+              this.content.status=9;//表已学习完，判断上级的章是否已完成
+            }else{
+              this.content.status=1;
+            }
+
             this.studyItemId=res.result.studyItemId;//第一次保存时是没有的，所以这里要赋值
             this.$alert('您本次考试得分：'+this.lastScore, '考试成绩', {
                   confirmButtonText: '确定',

src/components/Course/homework.vue

@@ -37,7 +37,7 @@
            </div>
        </div>
        <div style="text-align: center;padding-bottom: 10px;">
-           <el-button type="primary" @click="submitHomework()">{{records.length>0?'重新提交':'提交'}}</el-button>
+           <el-button type="primary" :disabled="isSubmit" @click="submitHomework()">{{records.length>0?'重新提交':'提交'}}</el-button>
        </div>
      </div>
      <div v-show="showRecord"><!--作业提交记录-->
@@ -87,10 +87,12 @@ export default {
       has:true,
       info:{},
       studyItemId:'',
+      studyItemIdOnce: '',
       filePath:'',
       answer:'',
       close:false,
       records:[],//作业记录
+      isSubmit:false,
     };
   },
   mounted() {
@@ -107,7 +109,7 @@ export default {
          if(res.status==200){
              this.info=res.result;
              //检查是否过期
-            if(res.result.deadTime!=''){
+            if(res.result.deadTime!='' && res.result.deadTime != null){
                var d = new Date(res.result.deadTime);
                var now=new Date();
                if(now.getTime() > d.getTime()){
@@ -134,7 +136,11 @@ export default {
       }
       apiCourseStudy.myHomeworkList(params).then(rs=>{
         if(rs.status==200){
+          this.studyItemId = ''
           this.records=rs.result;
+          if(rs.result.length>0){
+            this.studyItemIdOnce = rs.result[rs.result.length - 1].id;
+          }
         }
       })
     },
@@ -171,9 +177,9 @@ export default {
           return;
         }
       }
-
+      this.isSubmit = true
       let pamars = {
-        studyItemId: this.studyItemId,//学习内容记录id,
+        studyItemId: this.studyItemId || this.studyItemIdOnce,//学习内容记录id,
         studyId: this.studyId,//学习id,
         courseId: this.content.courseId,//课程id,
         contentId: this.content.id,//内容id,
@@ -185,6 +191,7 @@ export default {
         score: 0
       }
       apiCourseStudy.saveHomework(pamars).then(res=>{
+        this.isSubmit = false
          if(res.status==200){
             this.$message.success("作业已提交");
             this.filePath='';