Merge remote-tracking branch 'yx/zcwy_1127_teacher' into master_1202

pc播放器拖动修改

See merge request !124

package-lock.json

@@ -1877,63 +1877,18 @@
         "webpack-merge": "^4.2.2"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
         "big.js": {
           "version": "3.2.0",
           "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
           "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
           "dev": true
         },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
         "emojis-list": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
           "integrity": "sha512-knHEZMgs8BB+MInokmNTg/OyPlAddghe1YBgNwJBc5zsJi/uyIcXoSDsL/W9ymOsBoBGdPIHXYJ9+qKFwRwDng==",
           "dev": true
         },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
         "html-webpack-plugin": {
           "version": "3.2.0",
           "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
@@ -1966,63 +1921,6 @@
             "json5": "^0.5.0",
             "object-assign": "^4.0.1"
           }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "vue-loader-v16": {
-          "version": "npm:vue-loader@16.8.3",
-          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
-          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chalk": "^4.1.0",
-            "hash-sum": "^2.0.0",
-            "loader-utils": "^2.0.0"
-          },
-          "dependencies": {
-            "big.js": {
-              "version": "5.2.2",
-              "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
-              "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-              "dev": true,
-              "optional": true
-            },
-            "emojis-list": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmmirror.com/emojis-list/-/emojis-list-3.0.0.tgz",
-              "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-              "dev": true,
-              "optional": true
-            },
-            "json5": {
-              "version": "2.2.3",
-              "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
-              "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-              "dev": true,
-              "optional": true
-            },
-            "loader-utils": {
-              "version": "2.0.4",
-              "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
-              "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "big.js": "^5.2.2",
-                "emojis-list": "^3.0.0",
-                "json5": "^2.1.2"
-              }
-            }
-          }
         }
       }
     },
@@ -12680,6 +12578,75 @@
         }
       }
     },
+    "vue-loader-v16": {
+      "version": "npm:vue-loader@16.8.3",
+      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
+      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chalk": "^4.1.0",
+        "hash-sum": "^2.0.0",
+        "loader-utils": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "vue-pdf": {
       "version": "4.3.0",
       "resolved": "https://registry.npmmirror.com/vue-pdf/-/vue-pdf-4.3.0.tgz",

src/api/ajax.js

@@ -41,7 +41,7 @@ const formRequest=axios.create({
     }
     return config
   }, error => {
-      // console.log(error)
+      console.log(error)
       Promise.reject(error)
   });
   formRequest.interceptors.response.use(res => {
@@ -66,7 +66,7 @@ const formRequest=axios.create({
        }
     },
     error => {
-      // console.log('err' + error)
+      console.log('err' + error)
       let { message } = error;
       if (message == "Network Error") {
         message = "网络异常，请稍后重试";

src/api/boe/boeAjax.js

@@ -30,7 +30,7 @@ const formRequest=axios.create({
     // axios中请求配置有baseURL选项，表示请求URL公共部分
     // baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
     //超时
-    timeout: 15000,
+    timeout: 10000,
   })
   //发送json对象的拦截器
   formRequest.interceptors.request.use(config => {
@@ -43,7 +43,7 @@ const formRequest=axios.create({
     }
     return config
   }, error => {
-      // console.log(error)
+      console.log(error)
       Promise.reject(error)
   });
   formRequest.interceptors.response.use(res => {
@@ -68,7 +68,7 @@ const formRequest=axios.create({
        }
     },
     error => {
-      // console.log('err',error)
+      console.log('err',error)
       let { message } = error;
       if (message == "Network Error") {
         message = "网络异常，请稍后重试";

src/api/boe/boeApiAjax.js

@@ -28,7 +28,7 @@ const jsonRequest=axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BOE_BASE_API,
   //超时
-  timeout: 15000,
+  timeout: 10000,
 });
 //发送json对象的拦截器
 jsonRequest.interceptors.request.use(config => {
@@ -39,7 +39,7 @@ jsonRequest.interceptors.request.use(config => {
   }
   return config
 }, error => {
-   //  console.log(error)
+    console.log(error)
     Promise.reject(error)
 })
 
@@ -69,7 +69,7 @@ jsonRequest.interceptors.response.use(res => {
      }
   },
   error => {
-   //  console.log('err' + error)
+    console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {
       message = "网络异常，请稍后重试";
@@ -96,7 +96,7 @@ const formRequest=axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BOE_BASE_API,
   //超时
-  timeout: 15000,
+  timeout: 10000,
 })
 //发送json对象的拦截器
 formRequest.interceptors.request.use(config => {
@@ -107,7 +107,7 @@ formRequest.interceptors.request.use(config => {
   }
   return config
 }, error => {
-   //  console.log(error)
+    console.log(error)
     Promise.reject(error)
 });
 formRequest.interceptors.response.use(res => {
@@ -132,7 +132,7 @@ formRequest.interceptors.response.use(res => {
      }
   },
   error => {
-   //  console.log('err' + error)
+    console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {
       message = "网络异常，请稍后重试";

src/api/cesource/index.js

@@ -26,7 +26,7 @@ const jsonRequest=axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
   //超时
-  timeout: 15000,
+  timeout: 10000,
 });
 //发送json对象的拦截器
 jsonRequest.interceptors.request.use(config => {
@@ -37,7 +37,7 @@ jsonRequest.interceptors.request.use(config => {
   }
   return config
 }, error => {
-   //  console.log(error)
+    console.log(error)
     Promise.reject(error)
 })
 
@@ -65,7 +65,7 @@ jsonRequest.interceptors.response.use(res => {
      }
   },
   error => {
-   //  console.log('err' + error)
+    console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {
       message = "网络异常，请稍后重试";
@@ -91,7 +91,7 @@ const formRequest=axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
   //超时
-  timeout: 15000,
+  timeout: 10000,
 })
 //发送json对象的拦截器
 formRequest.interceptors.request.use(config => {
@@ -102,7 +102,7 @@ formRequest.interceptors.request.use(config => {
   }
   return config
 }, error => {
-   //  console.log(error)
+    console.log(error)
     Promise.reject(error)
 });
 formRequest.interceptors.response.use(res => {
@@ -126,7 +126,7 @@ formRequest.interceptors.response.use(res => {
      }
   },
   error => {
-   //  console.log('err' + error)
+    console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {
       message = "网络异常，请稍后重试";

src/api/event/index.js

@@ -26,7 +26,7 @@ const jsonRequest=axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_STAT_BASE_API,
   //超时
-  timeout: 15000,
+  timeout: 10000,
 });
 //发送json对象的拦截器
 jsonRequest.interceptors.request.use(config => {
@@ -37,7 +37,7 @@ jsonRequest.interceptors.request.use(config => {
   }
   return config
 }, error => {
-   //  console.log(error)
+    console.log(error)
     Promise.reject(error)
 })
 
@@ -65,7 +65,7 @@ jsonRequest.interceptors.response.use(res => {
      }
   },
   error => {
-   //  console.log('err' + error)
+    console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {
       message = "网络异常，请稍后重试";
@@ -91,7 +91,7 @@ const formRequest=axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_STAT_BASE_API,
   //超时
-  timeout: 15000,
+  timeout: 10000,
 })
 //发送json对象的拦截器
 formRequest.interceptors.request.use(config => {
@@ -102,7 +102,7 @@ formRequest.interceptors.request.use(config => {
   }
   return config
 }, error => {
-   //  console.log(error)
+    console.log(error)
     Promise.reject(error)
 });
 formRequest.interceptors.response.use(res => {
@@ -126,7 +126,7 @@ formRequest.interceptors.response.use(res => {
      }
   },
   error => {
-   //  console.log('err' + error)
+    console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {
       message = "网络异常，请稍后重试";

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/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,7 @@ 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);
 }
 
 /**
@@ -119,7 +119,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 +136,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 +150,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 +161,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/pagelist',data);
 }
 
 /**
@@ -173,7 +173,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 +185,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);
 }
 
 /**
@@ -200,7 +200,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 +216,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 +241,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 +261,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 +279,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 +288,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 +297,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 +306,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 +318,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 +327,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 +338,8 @@ const myExamList = function(itemId) {
    contentId:''
  }
  */
- const myExamList2 = function(data) {
+const myExamList2 = function(data) {
-    return ajax.post('/xboe/school/study/exam/list-study',data);
+  return ajax.post('/xboe/school/study/exam/list-study',data);
 }
 
 /**
@@ -351,7 +351,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 +360,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,44 +389,48 @@ 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);
 }
 
 export default {
-    hasSignup,
+  hasSignup,
-    signup,
+  signup,
-    findSignup,
+  findSignup,
-    deleteSignup,
+  deleteSignup,
-    importSignup,
+  importSignup,
-    countSignup,
+  countSignup,
-    studyIndex,
+  studyIndex,
-    studyInfo,
+  studyInfo,
-    studyVideoTime,
+  studyVideoTime,
-    lastStudy,
+  lastStudy,
-    studyContent,
+  studyContent,
-    appendStudyTime,
+  appendStudyTime,
-    studyRecords,
+  studyRecords,
-    studyContentRecords,
+  studyContentRecords,
-    getStudyContentItem,
+  getStudyContentItem,
-    studyExport,
+  studyExport,
-    myStudyList,
+  myStudyList,
-    saveHomework,
+  saveHomework,
-    saveExam,
+  saveExam,
-    saveAssess,
+  saveAssess,
-    myHomework,
+  myHomework,
-    myExamPaper,
+  myExamPaper,
-    myAssess,
+  myAssess,
-    myHomeworkList,
+  myHomeworkList,
-    myExamList,
+  myExamList,
-    myAssessList,
+  myAssessList,
-    myExamList2,
+  myExamList2,
-	myCourseStudy,
+  myCourseStudy,
   myStudysFromES,
+  homeworkExport,
   findByIds,
-	deleteSignUp,
+  deleteSignUp,
   ids,
   followIds,
   studyIndexPost

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);
 }
@@ -217,7 +219,7 @@ export default {
     update,
     del,
     detail,
-    findByName,
+    findByNameNew,
     updateSysId,
 	has,
 	start,

src/api/unionAjax.js

@@ -31,7 +31,7 @@ const formRequest = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   // baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
   //超时
-  timeout: 15000,
+  timeout: 10000,
 })
 //发送json对象的拦截器
 formRequest.interceptors.request.use(config => {
@@ -44,7 +44,7 @@ formRequest.interceptors.request.use(config => {
   }
   return config
 }, error => {
-  // console.log(error)
+  console.log(error)
   Promise.reject(error)
 });
 formRequest.interceptors.response.use(res => {
@@ -71,7 +71,7 @@ formRequest.interceptors.response.use(res => {
     }
   },
   error => {
-    // console.log('err', error)
+    console.log('err', error)
     let {message} = error;
     if (message == "Network Error") {
       message = "网络异常，请稍后重试";

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/Breadcrumb/index.vue

@@ -29,7 +29,7 @@ export default {
   created() {
     this.getBreadcrumb();
     this.levelList.forEach(function(one){
-      //  console.log(one);
+       console.log(one);
     })
   },
   methods: {

src/components/Case/caseItems.vue

@@ -100,7 +100,7 @@ export default {
         })
       }
          }
-        //  console.log(item)
+         console.log(item)
       
       this.$router.push({path:'/case/detail',query:{id:item.cases.id}})
      // window.open(`${this.webBaseUrl}/article/detail?id=${item.objId}`)

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">
@@ -65,7 +68,7 @@
       return item.cases.summary;
     },
      changeIsAll(item,idx) {
-      // console.log(item.isAll)
+      console.log(item.isAll)
       item.isAll = !item.isAll;
       this.$set(this.items, idx, item);
     },
@@ -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/auditCourse1.vue

@@ -425,28 +425,28 @@ export default {
       return this.sysTypeMap.get(code);
     },
     onPlayerPlay() {
-      // console.log("开始播放");
+      console.log("开始播放");
     },
     onPlayerPause() {
-      // console.log("暂停");
+      console.log("暂停");
     },
     onPlayerEnded() {
-      // console.log("播放结束");
+      console.log("播放结束");
     },
     onPlayerPlaying(itme) {
-      // console.log("当前播放" + itme);
+      console.log("当前播放" + itme);
     },
     audioPlaying(item) {
-      // console.log("当前播放" + item);
+      console.log("当前播放" + item);
     },
     audioPlay() {
-      // console.log("开始播放");
+      console.log("开始播放");
     },
     audioPause() {
-      // console.log("暂停");
+      console.log("暂停");
     },
     audioEnd() {
-      // console.log("播放结束");
+      console.log("播放结束");
     },
     // 场景过滤
     sceneFilter(forScene) {
@@ -541,7 +541,7 @@ export default {
             this.tagList = result;
           }
         } catch (error) {
-          // console.log(error);
+          console.log(error);
         }
       } else {
         this.tagList = [];
@@ -555,7 +555,7 @@ export default {
           this.sceneList = result;
         }
       } catch (error) {
-        // console.log(error);
+        console.log(error);
       }
     },
     // 教师列标，远程查询
@@ -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

@@ -462,28 +462,28 @@ export default {
       return this.sysTypeMap.get(code);
     },
     onPlayerPlay(){
-      // console.log("开始播放");
+      console.log("开始播放");
     },
     onPlayerPause(){
-      // console.log("暂停");
+      console.log("暂停");
     },
     onPlayerEnded(){
-      // console.log("播放结束");
+      console.log("播放结束");
     },
     onPlayerPlaying(itme){
-      // console.log("当前播放"+itme);
+      console.log("当前播放"+itme);
     },
     audioPlaying(item){
-      // console.log("当前播放"+item);
+      console.log("当前播放"+item);
     },
     audioPlay(){
-      //  console.log("开始播放");
+       console.log("开始播放");
     },
     audioPause(){
-      // console.log("暂停");
+      console.log("暂停");
     },
     audioEnd(){
-      // console.log("播放结束");
+      console.log("播放结束");
     },
     // 场景过滤
     sceneFilter(forScene) {
@@ -583,7 +583,7 @@ export default {
             this.tagList = result;
           }
         } catch (error) {
-          // console.log(error);
+          console.log(error);
         }
       } else {
         this.tagList = [];
@@ -597,7 +597,7 @@ export default {
           this.sceneList = result;
         }
       } catch (error) {
-        // console.log(error);
+        console.log(error);
       }
     },
     // 教师列标，远程查询
@@ -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/auditCourseEdit.vue

@@ -284,7 +284,7 @@
         this.type = 0;
       },
       handleChange(val) {
-        // console.log(val);
+        console.log(val);
       },
       formatChoose(format) {
         let text = '';

src/components/Course/catalogCourseware.vue

@@ -470,13 +470,13 @@
         }
       },
       updateName(value){
-        // console.log(value);
+        console.log(value);
         if(this.content.id==''){
           return;
         }
         apiCourse.updateContentName({id:this.content.id,name:value}).then(rs=>{
           if(rs.status!=200){
-            //  console.log('更新名称失败：'+rs.message);
+             console.log('更新名称失败：'+rs.message);
           }
         })
       },

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
@@ -84,19 +84,19 @@
         },
             // 教师列标，远程查询
         async remoteFindTeacher() {
-          // console.log("2222");
+          console.log("2222");
           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/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/courseForm.vue

@@ -1029,7 +1029,7 @@ export default {
           //this.requireSaveCourse=false;//不需要保存
         }
       } catch (error) {
-        // console.log(error);
+        console.log(error);
       }
     },
     changeTeachers(t) {
@@ -1162,7 +1162,7 @@ export default {
             this.tagList = result;
           }
         } catch (error) {
-          // console.log(error);
+          console.log(error);
         }
       } else {
         this.tagList = [];
@@ -1580,7 +1580,7 @@ export default {
           this.sceneList = result;
         }
       } catch (error) {
-        // console.log(error);
+        console.log(error);
       }
     },
     setCurContent(item) {

src/components/Course/exam.vue

@@ -322,16 +322,15 @@ export default {
              }
              qitems.push(q);
         });
-        // console.log(qitems,'qitems')
+        console.log(qitems,'qitems')
         return qitems;
     },
     startTest(){
-      if(this.info.paperType==2){
+      apiExamPaper.newPaperContent(this.info.id).then(res=>{
-        apiExamPaper.getPaperContent(this.info.paperId).then(rs=>{
+        if(res.error == ''&&res.result != ''){
-          if(rs.status=200){
+          if(this.info.paperType==2){
-             this.examPaper.json=JSON.parse(rs.result);
+            this.examPaper.json=res.result;
-             //console.log(this.examPaper.json,'this.examPaper.json');
+            let qitems=this.convertToItems(this.examPaper.json);
-             let qitems=this.convertToItems(this.examPaper.json);
             this.paper ={items:qitems};
             this.total=qitems.length;
             this.curItem=qitems[this.curIndex];
@@ -340,34 +339,74 @@ export default {
             this.timer=setInterval(this.changeTimer,60000);
             this.testStart=true;
           }else{
-            this.$message.error('加载试卷内容失败，请与管理员联系，试卷是否已删除');
+            let paper= {items:res.result};
-          }
+            paper.items.forEach(item=>{
-        })
+              if(item.type==101){
-      }else{
+                item.userAnswer='';
-        let paper= JSON.parse(this.info.paperContent);
+              }else if(item.type==102){
-        paper.items.forEach(item=>{
+                item.userAnswer=[];
-          //console.log(item);
+              }else{
-          if(item.type==101){
+                item.userAnswer=''
-            item.userAnswer='';
+              }
-          }else if(item.type==102){
+              item.options.forEach(opt=>{
-            item.userAnswer=[];
+                opt.checked=false;
-          }else{
+              })
-            item.userAnswer=''
+            });
-          }
+            this.total=paper.items.length;
-          item.options.forEach(opt=>{
+            this.paper =paper;
-            opt.checked=false;
-          })
-        });
-        this.total=paper.items.length;
-        this.paper =paper;
-        //console.log(this.paper);
 
-        this.curItem=paper.items[this.curIndex];
+            this.curItem=paper.items[this.curIndex];
-        this.startTime=new Date();//记录开始时间
+            this.startTime=new Date();//记录开始时间
-        this.timerValue=this.info.testDuration;
+            this.timerValue=this.info.testDuration;
-        this.timer=setInterval(this.changeTimer,60000);
+            this.timer=setInterval(this.changeTimer,60000);
-        this.testStart=true;
+            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){
@@ -422,7 +461,7 @@ export default {
     present(){ //提交前处理
     	let $this=this;
     	let score=this.countTest();
-      // console.log('score='+score);
+      console.log('score='+score);
     	if(this.noAnswers.length>0){
          this.$confirm('还有未答试题,您确定要提交吗?', '提示', {
                   confirmButtonText: '确定',
@@ -532,7 +571,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),
       }
       //计划考试的时长

src/components/Course/homework.vue

@@ -1,61 +1,61 @@
 <template>
-  <div>
+ <div>
-    <div v-if="has" class="homework-div">
+   <div v-if="has" class="homework-div">
-      <div>
+     <div>
-        <div class="homework-title">作业名称</div>
+       <div class="homework-title">作业名称</div>
-        <div class="homework-content">{{info.name}}</div>
+       <div class="homework-content">{{info.name}}</div>
-      </div>
+     </div>
-      <div>
+     <div>
-        <div class="homework-title">内容</div>
+       <div class="homework-title">内容</div>
-        <div class="homework-content">{{info.content}}</div>
+       <div class="homework-content">{{info.content}}</div>
-      </div>
+     </div>
-      <div v-if="info.file">
+     <div v-if="info.file">
-        <div class="homework-title">附件</div>
+       <div class="homework-title">附件</div>
-        <div class="homework-content" style="color: blue">
+       <div class="homework-content" style="color: blue">
-          <a :href="fileBaseUrl+info.file" target="_blank">下载作业附件</a></div>
+           <a :href="fileBaseUrl+info.file" target="_blank">下载作业附件</a></div>
-      </div>
+     </div>
-      <div>
+     <div>
-        <div class="homework-title">截止时间</div>
+       <div class="homework-title">截止时间</div>
-        <div class="homework-content" :style="{color:close? 'red':''}">{{info.deadTime}}</div>
+       <div class="homework-content" :style="{color:close? 'red':''}">{{info.deadTime}}</div>
-      </div>
+     </div>
-      <div v-show="!close && showSubmit">
+     <div v-show="!close && showSubmit">
-        <div v-if="info.submitMode>1">
+       <div v-if="info.submitMode>1">
-          <div class="homework-title">作业内容</div>
+         <div class="homework-title">作业内容</div>
-          <div class="homework-content">
+         <div class="homework-content">
-            <el-input type="textarea" rows="5" show-word-limit maxlength="255" v-model="answer" placeholder="(限255个字)"></el-input>
+           <el-input type="textarea" rows="5" show-word-limit maxlength="255" v-model="answer" placeholder="(限255个字)"></el-input>
           </div>
-        </div>
+       </div>
-        <div v-if="info.submitMode==1 || info.submitMode==3">
+       <div v-if="info.submitMode==1 || info.submitMode==3">
-          <div class="homework-title">上传作业</div>
+           <div class="homework-title">上传作业</div>
-          <div class="homework-content">
+           <div class="homework-content">
-            <div v-if="filePath!=''">
+               <div v-if="filePath!=''">
-              <el-tag closable type="success" @close="removeHomeworkFile">作业附件</el-tag><span style="margin-left: 10px;">请点击下面的提交</span>
+                 <el-tag closable type="success" @close="removeHomeworkFile">作业附件</el-tag><span style="margin-left: 10px;">请点击下面的提交</span>
-            </div>
+               </div>
-            <div v-else >
+               <div v-else >
-              <file-upload dir="files" :isShowTip="false" @success="uploadHomeworkFile" @remove="removeHomeworkFile"></file-upload>
+                 <file-upload dir="files" :isShowTip="false" @success="uploadHomeworkFile" @remove="removeHomeworkFile"></file-upload>
-            </div>
+               </div>
-          </div>
+           </div>
-        </div>
+       </div>
-        <div style="text-align: center;padding-bottom: 10px;">
+       <div style="text-align: center;padding-bottom: 10px;">
-          <el-button type="primary" :disabled="isSubmit" @click="submitHomework()">{{records.length>0?'重新提交':'提交'}}</el-button>
+           <el-button type="primary" :disabled="isSubmit" @click="submitHomework()">{{records.length>0?'重新提交':'提交'}}</el-button>
-        </div>
+       </div>
-      </div>
+     </div>
-      <div v-show="showRecord"><!--作业提交记录-->
+     <div v-show="showRecord"><!--作业提交记录-->
-        <el-table :data="records" style="width: 100%" border>
+      <el-table :data="records" style="width: 100%" border>
-          <el-table-column prop="endTime" label="提交时间" width="100" align="center"></el-table-column>
+         <el-table-column prop="endTime" label="提交时间" width="100" align="center"></el-table-column>
-          <el-table-column  label="内容">
+         <el-table-column  label="内容">
-            <template slot-scope="scope">
+           <template slot-scope="scope">
-              <div>{{scope.row.hwAnswer}}</div>
+             <div>{{scope.row.hwAnswer}}</div>
-              <div style="padding-top: 5px;" v-if="scope.row.filePath!=''">
+             <div style="padding-top: 5px;" v-if="scope.row.filePath!=''">
-                <a :href="fileBaseUrl+scope.row.filePath" target="_blank">下载上传的作业文件</a>
+               <a :href="fileBaseUrl+scope.row.filePath" target="_blank">下载上传的作业文件</a>
-              </div>
+             </div>
-            </template>
+           </template>
-          </el-table-column>
+         </el-table-column>
-        </el-table>
+       </el-table>
-      </div>
+     </div>
-    </div>
+   </div>
-    <div v-else style="text-align: center;padding-top: 20px;color: red;">此课程无作业</div>
+   <div v-else style="text-align: center;padding-top: 20px;color: red;">此课程无作业</div>
-  </div>
+ </div>
 </template>
 
 <script>
@@ -65,21 +65,21 @@ import FileUpload from '@/components/FileUpload/index.vue';
 export default {
   components: { FileUpload },
   props:{
-    studyId: {
+      studyId: {
-      type: String,
+        type: String,
-    },
+      },
-    showRecord:{
+      showRecord:{
-      type:Boolean,
+        type:Boolean,
-      default:true
+        default:true
-    },
+      },
-    showSubmit:{
+      showSubmit:{
-      type:Boolean,
+        type:Boolean,
-      default:true
+        default:true
-    },
+      },
-    content: {
+      content: {
-      type: Object,
+        type: Object,
-      default:()=>{}
+        default:()=>{}
-    }
+      }
   },
   data() {
     return {
@@ -106,26 +106,26 @@ export default {
   methods: {
     loadHomeworkInfo(){
       apiCourse.getHomework(this.content.id).then(res=>{
-        if(res.status==200){
+         if(res.status==200){
-          this.info=res.result;
+             this.info=res.result;
-          //检查是否过期
+             //检查是否过期
-          if(res.result.deadTime!=''){
+            if(res.result.deadTime!=''){
-            var d = new Date(res.result.deadTime);
+               var d = new Date(res.result.deadTime);
-            var now=new Date();
+               var now=new Date();
-            if(now.getTime() > d.getTime()){
+               if(now.getTime() > d.getTime()){
-              this.close=true;
+                  this.close=true;
-            } else {
+               } else {
-              this.close=false;
+                  this.close=false;
+               }
             }
-          }
+             if(!this.showTest && this.showRecord){
-          if(!this.showTest && this.showRecord){
+               this.loadRecord();
-            this.loadRecord();
+             }
-          }
+         }else if(res.status==404){
-        }else if(res.status==404){
+            //没有找到作业信息
-          //没有找到作业信息
+         }else{
-        }else{
+           this.$message.error(res.message);
-          this.$message.error(res.message);
+         }
-        }
       });
       //
     },
@@ -149,15 +149,15 @@ export default {
       this.filePath = res.result.filePath;
     },
     removeHomeworkFile(){
-      this.$confirm('您确定要删除已上传的附件吗？', '提示', {
+       this.$confirm('您确定要删除已上传的附件吗？', '提示', {
-        confirmButtonText: '确定',
+                confirmButtonText: '确定',
-        cancelButtonText: '取消',
+                cancelButtonText: '取消',
-        type: 'warning'
+                type: 'warning'
-      }).then(() => {
+              }).then(() => {
-        this.filePath='';
+                this.filePath='';
-        //从服务器端删除
+                //从服务器端删除
-        this.$message({ type: 'success',  message: '删除成功!' });
+                this.$message({ type: 'success',  message: '删除成功!' });
-      })
+              })
 
     },
     submitHomework() {//提交作业
@@ -192,16 +192,16 @@ export default {
       }
       apiCourseStudy.saveHomework(pamars).then(res=>{
         this.isSubmit = false
-        if(res.status==200){
+         if(res.status==200){
-          this.$message.success("作业已提交");
+            this.$message.success("作业已提交");
-          this.filePath='';
+            this.filePath='';
-          this.answer='';
+            this.answer='';
-          this.studyItemId=res.result.id;
+            this.studyItemId=res.result.id;
-          this.records=[res.result];
+            this.records=[res.result];
-          this.$emit("submit", this.content);
+            this.$emit("submit", this.content);
-        }else {
+         }else {
-          this.$message.error(res.message);
+            this.$message.error(res.message);
-        }
+         }
 
       })
     },
@@ -210,27 +210,27 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.homework-div {
+  .homework-div {
-  border: 1px solid #dadada;
+    border: 1px solid #dadada;
-  min-height: 500px;
+    min-height: 500px;
-  padding: 20px;
+    padding: 20px;
-  font-size: 14px;
+    font-size: 14px;
-  display: flex;
+    display: flex;
-  flex-direction: column;
+    flex-direction: column;
-  align-items: flex-start;
+    align-items: flex-start;
-  >div{
+    >div{
-    width: 100%;
-    text-align: left;
-    .homework-title {
-      margin-bottom: 10px;
-      font-weight: 600;
-    }
-    .homework-content {
-      color: #666;
-      margin-bottom: 10px;
       width: 100%;
+      text-align: left;
+      .homework-title {
+        margin-bottom: 10px;
+        font-weight: 600;
+      }
+      .homework-content {
+        color: #666;
+        margin-bottom: 10px;
+        width: 100%;
+      }
     }
-  }
 
-}
+  }
 </style>

src/components/Course/myNote.vue

@@ -236,7 +236,7 @@ export default {
             // }, 10000);
         },
         noteEdit(note) {
-            // console.log(note)
+            console.log(note)
             this.isEdit = true;
             this.mynoteData = note;
             this.editNodeOpenType = note.openType;

src/components/Course/weikeContent.vue

@@ -401,6 +401,28 @@
               <el-form-item label="考试说明">
                  <el-input type="textarea" show-word-limit v-model="exam.info.info" placeholder="关于考试的说明(限255字以内)" maxlength="255"></el-input>
               </el-form-item>
+              <el-form-item  label="随机模式">
+                <el-col :span="4">
+                  <el-radio-group v-model="exam.info.randomMode">
+                    <el-radio :label="true">是</el-radio>
+                    <el-radio :label="false">否</el-radio>
+                  </el-radio-group>
+                </el-col>
+                <el-col :span="20" v-if="exam.info.randomMode&&exam.info.paperType==1">
+                  <el-form-item label="数量">
+                     <el-input-number v-model="exam.info.qnum" :min="1" :max="exam.paperJson.items.length" label="数量"></el-input-number>
+                     <span style="margin-left:10px;" v-if="exam.paperJson.items.length==0">先添加试题</span>
+                     <span style="margin-left:10px;" v-if="exam.paperJson.items.length>0">试卷有 {{exam.paperJson.items.length}} 道试题</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="20" v-if="exam.info.randomMode&&exam.info.paperType==2">
+                  <el-form-item label="数量">
+                     <el-input-number v-model="exam.info.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="exam.info.paperType==1">
@@ -1059,12 +1081,14 @@
           if(this.exam.info.paperType==2){
             if(!this.exam.info.paperId){
                this.$message.error("您还未选择任何试卷");
+               this.loading=false;
                return;
             }
           }else{
             //检查是不是所有的试题都有了答案
             if(this.exam.paperJson.items.length==0){
               this.$message.error("您还没有添加考试的试题");
+              this.loading=false;
               return;
             }
             let pass=true;
@@ -1087,6 +1111,9 @@
             }
             this.exam.info.paperContent=JSON.stringify(this.exam.paperJson);
           }
+          if(!this.exam.info.randomMode){
+            this.exam.info.qnum = 0
+          }
           postData.exam=this.exam.info;
           postData.content.contentName='考试';
           this.examChange = deepClone(this.exam);
@@ -1152,6 +1179,8 @@
             postData.id=this.exam.content.id;
             postData.ctype=this.exam.content.contentType;
             curContent=this.exam.content;
+            this.exam.info.randomMode = false;
+            this.exam.info.qnum = 0
           }else if(index==4){
             postData.id=this.assess.content.id;
             postData.ctype=this.assess.content.contentType;

src/components/Editor/index.vue

@@ -164,7 +164,7 @@ export default {
     change(e) {
       let file = e.target.files[0]
       const formData = new FormData()
-      // console.log(file,'file');
+      console.log(file,'file');
       formData.append('file', file)
       upload(formData)
         .then(res => {

src/components/Exam/EditPaper.vue

@@ -285,7 +285,7 @@
             }
 
             if(hasItem!=null){
-              // console.log(hasItem);
+              console.log(hasItem);
               this.$message.error('选择的试题重复：'+hasItem.title)
               return
             }

src/components/FileUpload/index.vue

@@ -217,13 +217,16 @@ export default {
         if(delIdx>-1){
           fileList.splice(delIdx,1);
         }
+        this.$emit("success", res);
       } else {
         this.isLoading = false;
-        //this.fileList = [];
+        if(this.limit == 1){
+          this.fileList = [];
+        }
         this.$message({message:"上传失败",type:'error',offset:100});
       }
 
-      this.$emit("success", res);
+      // this.$emit("success", res);
     },
     // 删除文件
     handleDelete(index) {

src/components/Follow/button.vue

@@ -51,7 +51,7 @@
     watch:{
       has(newVal,oldVal){
          this.has=newVal;
-        //  console.log(newVal,oldVal,'测试问题');
+         console.log(newVal,oldVal,'测试问题');
          this.hasFollow=newVal;
          if(newVal!=oldVal && this.auto){
            this.autoCheck();

src/components/HomePage/caseList.vue

@@ -8,7 +8,10 @@
                     <span style="margin-left:28px">{{item.eventTime}}</span>
                     <span v-if="item.aid == userInfo.aid" class="follow-hide pointer" style="float:right">
                       <span v-if="item.hidden">已隐藏</span>
-                      <span v-else  @click="emitHide(item.id)">  <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 </span>
+                      <span class="span_hidden" v-else  @click="emitHide(item.id)">  
+                        <!-- <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon> -->
+                         <div class="is_hidden"></div>
+                        隐藏 </span>
                     </span>
                   </p>
                   <div class="case-info-cont">
@@ -136,6 +139,22 @@
   </script>
 
   <style lang="scss" scoped>
+  .span_hidden{
+    display: flex;
+    &:hover{
+      .is_hidden{
+        background: url('../../assets/images/case/Frame(12).png');
+        background-size: 100%;
+      }
+    }
+    .is_hidden{
+      width: 18px;
+      height: 18px;
+      background: url('../../assets/images/case/Frame(5).png');
+      background-size: 100%;
+      margin-right: 10px;
+    }
+  }
     .sign-text{
       color: #666666;
       font-size: 14px;

src/components/HomePage/followList.vue

@@ -290,7 +290,7 @@ import apiUser from "@/api/system/user.js";
                //console.log(this.mypageList,'this.mypageList');
                $this.getUserData(res.result.list,2);
             }else{
-              // console.log('加载关注我数据错误:'+res.message);
+              console.log('加载关注我数据错误:'+res.message);
             }
         })
        },

src/components/PdfPreview/view.vue

@@ -102,13 +102,13 @@ export default {
      document.documentElement.scrollTop = 0;
     },
     loadProgress(e){
-      //  console.log(e,'loadProgress');
+       console.log(e,'loadProgress');
     },
     loadedPageHandle(e){
        this.pdfpage = e;
     },
     loadPdfHandle(e){
-      //  console.log(e,'loadPdfHandle');
+       console.log(e,'loadPdfHandle');
     },
     clickMore(){
        if(this.totalPages>this.showPages){

src/components/Portal/authorInfo.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="item-author">
-		<div  @click="toHome()">
+		<div  v-if="userName" @click="toHome()">
       <!-- <el-avatar shape="square" size="small" :src="userAvatar" v-if="userAvatar"></el-avatar> -->
       <!-- <div v-else class="uavatar"><span class="uavatar-text">{{avatarText}}</span></div> -->
       <el-avatar shape="circle" size="small" :src="userAvatar" v-if="userAvatar"></el-avatar>
@@ -12,9 +12,10 @@
         </div>
         </div>
     </div>
-		<div v-if="!onlyAvatar" style="padding-left: 14px;padding-top: 6px;font-size: 14px;">
+		<div v-if="!onlyAvatar&&userName" style="padding-left: 14px;padding-top: 6px;font-size: 14px;">
       <span style="color: #333333;font-weight: 600;font-size: 16px;">{{userName}}</span>
       <span class="author-text" v-if="userInfo && userInfo!=''"> {{userInfo}} </span>
+      <span style="margin-left: 15px;" class="comWords" v-if="authorTags.length != 0" v-for="tag in authorTags">{{tag}}</span>
     </div>
     <slot />
 	</div>
@@ -49,6 +50,12 @@
       onlyAvatar:{
         type:Boolean,
         default:false
+      },
+      authorTags: {
+        type:Array,
+        default(){
+          return []
+        }
       }
 		},
     data(){
@@ -119,6 +126,14 @@
       font-weight: 300;
       margin-left: 4px;
     }
+    .comWords {
+      background: #409EFF;
+      border-radius: 2px;
+      font-weight: 400;
+      font-size: 12px;
+      color: #FFFFFF;
+      padding: 4px 10px;
+    }
     .uavatar{
       // border: 1px solid #73adfe;
       width: 28px;

src/components/Portal/comments.vue

@@ -92,11 +92,19 @@
                       <div class="comment-btns">
 
                          <!-- <a><svg-icon icon-class="like"></svg-icon><span>66</span></a> -->
-                         <div v-show="btnsShowRowId==com.id">
+                         <div style="display: flex" v-show="btnsShowRowId==com.id">
 
-                           <a @click="showReply(com)"><svg-icon icon-class="comment" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>回复</span></a>
+                           <a style="display: flex;align-items: center;" @click="showReply(com)">
+                            <!-- <svg-icon icon-class="comment" style="margin-right: 0px;font-size: 16px;"></svg-icon> -->
+                              <div class="is_comment"></div>
+                              <span>回复</span> 
+                           </a>
                            <!--必须当前登录人是一个人-->
-                           <a v-if="userInfo.aid==com.sysCreateAid" @click="delCommnet(com,comIdx)"><svg-icon icon-class="remove" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>删除</span></a>
+                           <a style="display: flex;align-items: center;" v-if="userInfo.aid==com.sysCreateAid" @click="delCommnet(com,comIdx)">
+                            <!-- <svg-icon icon-class="remove" style="margin-right: 0px;font-size: 16px;"></svg-icon> -->
+                             <div class="is_remove"></div>
+                            <span>删除</span>
+                           </a>
                            <a v-if="com.replyList && com.replyList.length==5" @click="showMoreReply(com)" ><svg-icon icon-class="all" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>全部</span></a>
                          </div>
                       </div>
@@ -423,7 +431,7 @@
               })
             });
           }else{
-            // console.log('加载用户头像信息:'+res.error);
+            console.log('加载用户头像信息:'+res.error);
             //this.$message.error(res.message);
           }
         });
@@ -960,6 +968,28 @@
         line-height: 35px;
         a{
           margin-right:15px;
+          &:hover{
+            .is_comment{
+              background: url('../../assets/images/case/Frame(9).png');
+              background-size: 100%;
+            }
+            .is_remove{
+              background: url('../../assets/images/case/Frame(15).png');
+              background-size: 100%;
+            }
+          }
+          .is_comment{
+            width: 16px;
+            height: 16px;
+            background: url('../../assets/images/case/Frame.png');
+            background-size: 100%;
+          }
+          .is_remove{
+            width: 16px;
+            height: 16px;
+            background: url('../../assets/images/case/Frame(8).png');
+            background-size: 100%;
+          }
           span{
             margin-left: 6px;
             color: #8590A6;

src/components/Portal/course/couresinteract.vue

@@ -268,7 +268,7 @@ export default {
         conType,
       }
       apiMessage.save(message).then(res=>{
-        // if(res.status!=200){ console.log('发送消息失败') }
+        if(res.status!=200){ console.log('发送消息失败') }
       })
     },
     checkHas(){
@@ -301,7 +301,7 @@ export default {
     },
     addPraise(){
      if(this.type==0){
-      //  console.log('未设置type值,1表课程,2表文章，3表案例，4表问答,6笔记')
+       console.log('未设置type值,1表课程,2表文章，3表案例，4表问答,6笔记')
        return;
       }
       //需要判断是否已点赞，已点赞的不再加
@@ -359,7 +359,7 @@ export default {
               }
               this.$message({message:'取消点赞',type:'success'})
             }else{
-              // console.log('取消失败：'+res.message);
+              console.log('取消失败：'+res.message);
             }
           })
         } else {
@@ -430,7 +430,7 @@ export default {
                 this.$store.dispatch("userTrigger", event);
               }
             }else{
-              // console.log('点赞失败：'+res.message);
+              console.log('点赞失败：'+res.message);
             }
           })
         }
@@ -443,7 +443,7 @@ export default {
         return
       }
       if(this.type==0){
-        // console.log('未设置type值,1表课程,2表文章，3表案例，4表问答')
+        console.log('未设置type值,1表课程,2表文章，3表案例，4表问答')
         return;
        }
       //需要判断是否已点赞，已点赞的不再加
@@ -479,7 +479,7 @@ export default {
           this.$message({message:'已取消收藏',type:'success'});
           //this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功，false代表已存在
         }else{
-          // console.log('取消收藏失败：'+res.message);
+          console.log('取消收藏失败：'+res.message);
         }
       })
       } else {
@@ -499,7 +499,7 @@ export default {
           this.$message({message:'已加入收藏',type:'success'});
           //this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功，false代表已存在
         }else{
-          // console.log('加入收藏失败：'+res.message);
+          console.log('加入收藏失败：'+res.message);
         }
       })
       }

src/components/Portal/interactBar.vue

@@ -10,7 +10,8 @@
         <el-tooltip  effect="light" :content="type == 4 || type == 5 ?'回答':'回复'" placement="left" :visible-arrow="false" popper-class="text-tooltip">
           <!-- <svg-icon style="margin-right: 0;"  icon-class="comment"></svg-icon> -->
          <!-- <img style="width:16px;height:14px;vertical-align: middle;" :src="require('@/assets/images/icon/answers.png')"> -->
-         <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon>
+         <!-- <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon> -->
+         <div class="is_comment"></div>
         </el-tooltip>
         <span class="interact-bar-value"> {{ data.answers? data.answers:0}}</span>
       </div>
@@ -23,14 +24,16 @@
       </div>
       <div v-if="comments" class="interact-bar-btn" :style="`min-width: ${nodeWidth};`" :class="{cursor:!readonly}">
         <el-tooltip  effect="light" content="评论" placement="left" :visible-arrow="false" popper-class="text-tooltip">
-          <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon>
+          <!-- <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon> -->
+           <div class="is_comment"></div>
         </el-tooltip>
         <span class="interact-bar-value"> {{data.comments? data.comments:0}}</span>
       </div>
 
       <div v-if="praises" @click="addPraise()" :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">
-          <svg-icon style="margin-right: 0;font-size: 14px;" :icon-class="isPraise?'praised':'like'"></svg-icon>
+          <!-- <svg-icon style="margin-right: 0;font-size: 14px;" :icon-class="isPraise?'praised':'like'"></svg-icon> -->
+           <div class="is_praise" :class="isPraise?'is_praise_a':'is_praise'"></div>
         </el-tooltip>
         <span class="interact-bar-value"> {{ data.praises? data.praises:0}}</span>
       </div>
@@ -38,19 +41,22 @@
       <div v-if="favorites"  @click.stop="addFavorite()" :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">
           <svg-icon v-if="courseExclusive" style="font-size: 32px;margin-right: 0;" :icon-class="isFavorite?'collectedCourse':'collectionCourse'"></svg-icon>
-          <svg-icon v-else style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}" :icon-class="isFavorite?'scactive2':'xihuan'"></svg-icon>
+          <!-- <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: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">
-          <svg-icon icon-class="share" style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}"></svg-icon>
+          <!-- <svg-icon icon-class="share" style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}"></svg-icon> -->
+           <div class="is_share"></div>
         </el-tooltip>
         <span class="interact-bar-value"> {{data.shares}}</span>
       </div>
       <div v-if="views" style="cursor: default;" :style="`min-width: ${nodeWidth};margin-left:${data.views>1000? '20px':'20px'}`" class="interact-bar-btn ese-view" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="浏览量" placement="top" :visible-arrow="false" popper-class="text-tooltip">
-          <svg-icon style="margin-right: 0; font-size:22px;" icon-class="eyes"></svg-icon>
+          <!-- <svg-icon style="margin-right: 0; font-size:22px;" icon-class="eyes"></svg-icon> -->
+           <div class="is_view"></div>
         </el-tooltip>
         <!-- <div style="float:right;margin-left:8px"> -->
         <span  class="interact-bar-value eyes-view" > {{ formatNum(data.views)}}</span>
@@ -321,7 +327,7 @@ export default {
         conType,
       }
       apiMessage.save(message).then(res=>{
-        // if(res.status!=200){ console.log('发送消息失败') }
+        if(res.status!=200){ console.log('发送消息失败') }
       })
     },
     checkHas(){
@@ -354,7 +360,7 @@ export default {
     },
     addPraise(){
      if(this.type==0){
-      //  console.log('未设置type值,1表课程,2表文章，3表案例，4表问答,6笔记')
+       console.log('未设置type值,1表课程,2表文章，3表案例，4表问答,6笔记')
        return;
       }
       //需要判断是否已点赞，已点赞的不再加
@@ -412,7 +418,7 @@ export default {
               }
               this.$message({message:'取消点赞',type:'success'})
             }else{
-              // console.log('取消失败：'+res.message);
+              console.log('取消失败：'+res.message);
             }
           })
         } else {
@@ -483,7 +489,7 @@ export default {
                 this.$store.dispatch("userTrigger", event);
               }
             }else{
-              // console.log('点赞失败：'+res.message);
+              console.log('点赞失败：'+res.message);
             }
           })
         }
@@ -496,7 +502,7 @@ export default {
         return
       }
       if(this.type==0){
-        // console.log('未设置type值,1表课程,2表文章，3表案例，4表问答')
+        console.log('未设置type值,1表课程,2表文章，3表案例，4表问答')
         return;
        }
       //需要判断是否已点赞，已点赞的不再加
@@ -530,9 +536,10 @@ export default {
             this.$store.dispatch("unicomFavorites",false)
           }
           this.$message({message:'已取消收藏',type:'success'});
+          this.$emit('deleteFavorite',true)
           //this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功，false代表已存在
         }else{
-          // console.log('取消收藏失败：'+res.message);
+          console.log('取消收藏失败：'+res.message);
         }
       })
       } else {
@@ -552,7 +559,7 @@ export default {
           this.$message({message:'已加入收藏',type:'success'});
           //this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功，false代表已存在
         }else{
-          // console.log('加入收藏失败：'+res.message);
+          console.log('加入收藏失败：'+res.message);
         }
       })
       }
@@ -713,6 +720,77 @@ export default {
     justify-content: flex-end;
     .interact-bar-btn {
       margin: 0 0 0 15px;
+      display: flex;
+      justify-content: end;
+      align-items: center;
+      &:hover{
+        .is_praise{
+          background: url('../../assets/images/case/Frame\(10\).png');
+        }
+        .is_favorite{
+          background: url('../../assets/images/case/Frame\(11\).png');
+          background-size: 100%;
+        }
+        .is_share{
+          background: url('../../assets/images/case/Frame\(14\).png');
+          background-size: 100%;
+        }
+        .is_view{
+          background: url('../../assets/images/case/Frame\(12\).png');
+        background-size: 100%;
+        }
+        .is_comment{
+          background: url('../../assets/images/case/Frame\(9\).png');
+          background-size: 100%;
+        }
+      }
+      .is_comment{
+        width: 16px;
+        height: 16px;
+        background: url('../../assets/images/case/Frame.png');
+        background-size: 100%;
+        margin-right: 4px;
+      }
+      .is_view{
+        width: 17px;
+        height: 17px;
+        background: url('../../assets/images/case/Frame\(5\).png');
+        background-size: 100%;
+        margin-right: 4px;
+      }
+      .is_share{
+        width: 16px;
+        height: 16px;
+        background: url('../../assets/images/case/Frame\(7\).png');
+        background-size: 100%;
+        margin-right: 4px;
+      }
+      .is_praise{
+        width: 14px;
+        height: 14px;
+        background: url('../../assets/images/case/Frame\(1\).png');
+        margin-right: 4px;
+      }
+      .is_praise_a{
+        width: 14px;
+        height: 14px;
+        background: url('../../assets/images/case/Frame\(10\).png');
+        margin-right: 4px;
+      }
+      .is_favorite{
+        width: 16px;
+        height: 16px;
+        background: url('../../assets/images/case/Frame\(2\).png');
+        background-size: 100%;
+        margin-right: 4px;
+      }
+      .is_favorite_a{
+        width: 16px;
+        height: 16px;
+        background: url('../../assets/images/case/Frame\(11\).png');
+        background-size: 100%;
+        margin-right: 4px;
+      }
     }
     .interact-bar-value{
       //  color:#6E7B84; ui图给的颜色，但是效果于ui图效果不一样，也没有透明度，所以找一个相近的和谐的颜色

src/components/Portal/noteComment.vue

@@ -309,7 +309,7 @@
                 })
               });
             }else{
-              // console.log('加载用户头像信息:'+res.error);
+              console.log('加载用户头像信息:'+res.error);
               //this.$message.error(res.message);
             }
           });

src/components/PortalFloatTools.vue

@@ -245,7 +245,7 @@ export default {
     },
     toNeedCourse(){
       // 需要先切换标签
-      // console.log('this.identity='+this.identity);
+      console.log('this.identity='+this.identity);
       if(this.identity==5 || this.identity==2){
         this.$store.dispatch('SetCurIdentity',2);
         // this.$router.push('/need/course?open=new');

src/components/PortalHeader.vue

@@ -187,7 +187,7 @@ export default {
   },
   watch:{
     keywords(newval){
-      // console.log(newval,9999);
+      console.log(newval,9999);
       if(this.findType == '1'){
         this.keyword = newval
       }
@@ -218,7 +218,7 @@ export default {
         this.$store.dispatch('SetCurIdentity',iden);
       },
     tomy(){
-      // console.log('lll')
+      console.log('lll')
     },
     loadBoeData() {
       if(this.studyTaskCount>0){

src/components/Qa/addQuestion.vue

@@ -95,7 +95,7 @@
         this.askForm.images=file.result.filePath
         this.imageShowUrl= this.fileBaseUrl + file.result.filePath;
         // console.log(this.fileBaseUrl)
-        // console.log(file)
+        console.log(file)
       },
       handleRemoveSuccess(file) {
         this.imageShowUrl=''

src/components/Study/manager.vue

@@ -192,7 +192,7 @@
               </el-table-column>-->
               <el-table-column label="学习人员" width="110">
                 <template slot-scope="scope">
-                  <el-button size="mini" type="info" @click="getCatalogue(scope.row,scope.row.contentName)" >学习人员</el-button>
+                  <el-button size="mini" type="info" @click="getCatalogue(scope.row,scope.row.contentType)" >学习人员</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -292,6 +292,7 @@
         <el-form-item>
           <el-button type="primary" @click="studyContentRecordsSearch">搜索</el-button>
         </el-form-item>
+        <el-button v-if="isHomeWork" :disabled="isTrue" style="padding:10px 15px;margin-bottom: 10px;" type="primary" @click="downLoad">导出全部作业</el-button>
       </el-form>
       <el-table max-height="500" border :data="learningSituation.list" style="width: 100%">
         <el-table-column prop="aname" label="姓名" width="180"></el-table-column>
@@ -335,6 +336,8 @@ import apiCoursePortal from "@/api/modules/coursePortal.js";
 import { mapGetters,mapActions } from 'vuex';
 import apiUser from '@/api/system/user.js';
 import apiStudy from '@/api/modules/courseStudy.js';
+import { getToken } from '@/utils/token'
+import axios from 'axios'
 export default {
   components: {auditCourse1,auditCourse2},
   computed: {
@@ -352,7 +355,10 @@ export default {
   },
   data() {
     return {
+      downParams: {},
       typePress: false,
+      isHomeWork: false,
+      isTrue: false,
       catalogRecordTree:[],
       catalogRecordList:[],
       resOwnerListMap:[],
@@ -377,8 +383,8 @@ export default {
         count: 0,
         type: "",
         list: [],
-        name: '',
         status: '',
+        name: '',
       },
       learningRecords: {
         pageIndex: 1, //第几页
@@ -515,6 +521,7 @@ export default {
         pageIndex: this.learningSituation.pageIndex,
         pageSize: this.learningSituation.pageSize
       };
+      this.downParams = params;
       apicourseStudy.studyContentRecords(params).then(res => {
         if (res.status === 200) {
           this.learningSituation.list = res.result.list;
@@ -524,6 +531,77 @@ export default {
         }
       });
     },
+    downLoad(){
+      if(this.learningSituation.list.length == 0){
+        this.$message.warning('暂无数据');
+        return
+      }
+      this.isTrue = true;
+      let params = {
+        courseName:this.manageStudyData.name,
+        courseId: this.manageStudyData.id,
+        status: this.downParams.status || '',
+        name: this.downParams.name || '',
+        contentId: this.contentId,
+      }
+      // window.open(`/systemapi/xboe/m/course/portal/export?contentId=${params.contentId}&courseName=${params.courseName}&courseId=${params.courseId}&status=${params.status}&name=${params.name}`)
+      const url = `/systemapi/xboe/m/course/portal/export?contentId=${params.contentId}&courseName=${params.courseName}&courseId=${params.courseId}&status=${params.status}&name=${params.name}`
+      axios({
+          method: 'get',
+          url: url,
+          // responseType: 'blob',
+          headers: { 'X-Access-Token': getToken() }
+        }).then((res) => {
+          this.isTrue = false;
+          if(res.data.status == 200){
+            if(res.data.result.includes('upload')){
+              window.open('/upload'+res.data.result.split('upload')[1])
+            }else{
+              this.$message.warning(res.data.result)
+            }
+          }
+        }).catch(err=>{
+          this.isTrue = false;
+          this.$message.error(err.response.data.message)
+        })
+      // axios({
+      //     method: 'get',
+      //     url: url,
+      //     responseType: 'blob',
+      //     headers: { 'X-Access-Token': getToken() }
+      //   }).then((response) => {
+      //       if (response.status === 200) {
+      //         this.isTrue = false;
+      //         if (!(response.headers['content-type']).startsWith('application/json')) {
+      //           this.resolveBlob(response, 'application/zip', `${params.courseName}【作业】`);
+      //         } else {
+      //           console.log(response,'response')
+      //           const reader = new FileReader();
+      //           reader.onload = (e) => {
+      //             const errorData = JSON.parse(e.target.result)
+      //             this.$message.error(errorData.result)
+      //           };
+      //           reader.readAsText(response.data);
+      //         }
+      //       }
+      //     }).catch((error) => {
+      //       this.isTrue = false;
+      //       // 错误处理
+      //       console.log(error);
+      //       this.$message.error(error.data ? error.data.message : error.toString());
+      //     });
+    },
+    resolveBlob(res, mimeType,filename) {
+      const link = document.createElement('a');// 创建a标签
+      let blob = new Blob([res.data], { type: mimeType }); // 设置文件类型
+      link.style.display = "none";
+      link.href = URL.createObjectURL(blob); // 创建URL
+      link.setAttribute("download", `${filename}`);
+      document.body.appendChild(link);
+      link.click();
+      URL.revokeObjectURL(link.href);
+      document.body.removeChild(link);
+    },
     handleSizeChangeSituation(val) {
       this.learningSituation.pageSize = val;
       this.learningSituation.pageIndex = 1;
@@ -722,11 +800,16 @@ export default {
       this.getSignupList();
     },
     getCatalogue(row,type) {
-      if(type=='考试'){
+      if(type==61){
         this.typePress = true
       }else{
         this.typePress = true
       }
+      if(type == 60){
+        this.isHomeWork = true
+      }else{
+        this.isHomeWork = false
+      }
       this.contentId = row.id;
       this.study.catalogueShow = true;
       this.learningSituation.pageIndex = 1;//重置为第一页

src/components/ThemePicker/index.vue

@@ -35,7 +35,7 @@ export default {
       if (typeof val !== 'string') return
       const themeCluster = this.getThemeCluster(val.replace('#', ''))
       const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
-      // console.log(themeCluster, originalCluster)
+      console.log(themeCluster, originalCluster)
 
       const $message = this.$message({
         message: '  Compiling the theme',

src/components/UserCenter/menu.vue

@@ -466,10 +466,10 @@ export default {
 				})
 			},
     handleOpen(key, keyPath) {
-      // console.log(key, keyPath);
+      console.log(key, keyPath);
     },
     handleClose(key, keyPath) {
-      // console.log(key, keyPath);
+      console.log(key, keyPath);
     },
     toPage(url) {
       this.$router.push({ path: url });

src/components/VideoPlayer/index.vue

@@ -40,12 +40,12 @@
             :isPlaying="isPlaying"
             :biBarrageXml="biBarrageXml"
     />
-    <!-- 加载动画 -->
+    <!-- 加载动画(应该当前视频没有缓存时显示加载动画)   && isCrowd && isShowPlayer -->
-    <div v-show="isShowLoading  && isCrowd && isShowPlayer" class="player-loading" @click="videoDom.focus({preventScroll: true})">
+    <div v-show="isShowLoading" class="player-loading" @click="videoDom.focus({preventScroll: true})">
       <img src="@/components/VideoPlayer/images/loading.svg"  alt="loading"/>
     </div>
     <!-- 控制栏 -->
-    <div v-show="!isShowLoading && isCrowd" class="player-controls-container" @click="videoDom.focus({preventScroll: true})">
+    <div v-show="isCrowd" class="player-controls-container" @click="videoDom.focus({preventScroll: true})">
       <div v-show="isShowVolumeHint" class="player-volumeHint">
         <span class="player-volumeHint-text">当前音量:{{volumePercent}}%</span>
       </div>
@@ -71,6 +71,7 @@
       <div :class="{'player-controls': true, 'cursor-lasting-static': isCursorStatic}">
         <div class="player-progress-bar">
           <progressBar
+            :blobId="blobId"
             :currentProgress="currentProgress"
             v-on:updateProgress="updateProgressByClickBar"
             v-on:getMouseDownStatus="getMouseDownStatusOfProgressBar"
@@ -241,6 +242,11 @@ export default {
       type: String,
       default: null,
     },
+    // 视频链接对应的content Id
+    blobId: {
+      type: String,
+      default: null,
+    },
     // 主题色
     primaryColor: {
       type: String,
@@ -266,7 +272,7 @@ export default {
     },
     isDrag:{
       type: Boolean,
-      default: null,
+      default: true,
     },
     isCrowd:{
       type: Boolean,
@@ -312,6 +318,17 @@ export default {
     }
 
     setInterval(() => {
+          //console.log('this.currentProgress::',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.duration)
+          // 视频播放时本地记录视频实时播放时长,视频设置了禁止拖动时执行
+          if(!this.isDrag){
+            var time = localStorage.getItem('videoProgressData')
+            var arr = time&&JSON.parse(time) || {}
+            if(arr[this.blobId] < this.currentProgress || !arr[this.blobId]){
+              arr[this.blobId] = parseFloat((this.currentProgress).toFixed(8))
+              if(arr[this.blobId]) localStorage.setItem('videoProgressData',JSON.stringify(arr))
+            }
+          }
+
       // 定时更新进度条
       if (this.isPlaying && !this.isMousedownProgress) {
         this.currentProgress =
@@ -356,6 +373,17 @@ export default {
       this.isCursorStatic = false;
       this.timeoutControlsHint = 2000;
     });
+    this.videoDom.addEventListener('loadstart', function(){
+      console.log('\x1b[34m%s\x1b[0m','*****************视频加载中**************')
+    })
+
+    this.videoDom.addEventListener('loadeddata', function(){
+      console.log('\x1b[32m%s\x1b[0m','*****************加载完毕*************')
+    })
+
+    this.videoDom.addEventListener('error', function(){
+      console.log('\x1b[31m%s\x1b[0m','*****************加载失败**********')
+    })
     // 监听全屏事件的变化，保存数据
     window.addEventListener("fullscreenchange", () => {
       this.isFullscreen = this.isFullScreen();
@@ -364,12 +392,14 @@ export default {
   methods: {
     //当视频由于需要缓冲下一帧而停止，解决一直计时的问题
     onWaiting(){
-      // console.log('触发了onWairing');
+      console.log('触发了onWairing');
+      this.isShowLoading = true
       this.$emit('onPlayerPause', {})
     },
     //当音频/视频在已因缓冲而暂停或停止后已就绪时
     onPlaying(){
-      // console.log('触发缓存结束onPlaying');
+      console.log('触发缓存结束onPlaying');
+      this.isShowLoading = false
       if(this.videoDom.paused){
         this.$emit('onPlayerPause', {})
       }else{
@@ -390,7 +420,7 @@ export default {
         this.isPlaying = true;
         this.isInit = true;
         this.$emit('onPlayerPlay', {});//播放(播放时会调用)
-        // console.log('播放');
+        console.log('播放');
       } else {
         this.videoDom.pause();
         this.isPlaying = false;

src/components/VideoPlayer/player-barrage-screen.vue

@@ -48,7 +48,7 @@
           
           let info = this.barrageList[this.barragedTag];
           if(info){
-            // console.log(info);
+            console.log(info);
             if (info.start_time < this.videoDom.currentTime) {
               // 标记下一条弹幕的索引
               this.barragedTag++;
@@ -101,7 +101,7 @@
             }
           }
           this.barrageList = array;
-          // console.log( this.barrageList);
+          console.log( this.barrageList);
         });
       },
       /* 新建一个弹幕

src/components/VideoPlayer/progress-bar.vue

@@ -38,6 +38,9 @@ export default {
     isDrag:{
       type: Boolean,
       default: true,
+    },
+    blobId:{
+      type: String,
     }
   },
   data() {
@@ -57,10 +60,12 @@ export default {
     window.addEventListener("mousemove", (e) => {
       if (this.is_mousedown_progress) {
         this.move(e);
+        e.preventDefault();
       }
     });
     window.addEventListener("mouseup", (e) => {
       this.up(e);
+      e.preventDefault();
     });
   },
   beforeDestroy() {
@@ -68,7 +73,7 @@ export default {
   },
   methods: {
     down(e) {
-      if(this.isDrag) {
+      // if(this.isDrag) {
         this.$emit("getMouseDownStatus", true);
         this.is_mousedown_progress = true;
         // 获取完整进度条的clientX（dom左上角）
@@ -76,30 +81,50 @@ export default {
         // 计算调整后的当前进度条的长度
         this.current_width_px = e.clientX - init_clientX;
         // 设置当前的播放进度（同时作用于当前进度条的样式）
-        let current =
+        let current = (e.clientX - init_clientX) / this.dom_full.clientWidth;
-            (e.clientX - init_clientX) / this.dom_full.clientWidth;
+        if(current>1) current = 1;
+        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)
+        // 禁止拖动
+        if(!this.isDrag && time && arr[this.blobId] < current) return;
+
         this.$emit("updateProgress", current);
-      }
+      // }
       
     },
     move(e) {
-      if (this.is_mousedown_progress && this.isDrag) {
+      if (this.is_mousedown_progress) {
         let init_clientX = this.dom_full.getBoundingClientRect().left;
         this.current_width_px = e.clientX - init_clientX;
-        let current =
+        let current = (e.clientX - init_clientX) / this.dom_full.clientWidth;
-          (e.clientX - init_clientX) / this.dom_full.clientWidth;
+        if(current>1) current = 1;
+        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)
+        // 禁止拖动
+        if(!this.isDrag && time && arr[this.blobId] < current) return;
         this.$emit("updateProgress", current);
       }
     },
     up() {
-      if (this.is_mousedown_progress && this.isDrag) {
+      if (this.is_mousedown_progress) {
         // 标记鼠标不处于按下的状态了
         this.is_mousedown_progress = false;
         // 松开鼠标后，即调整进度条后，此时的进度（0-1）
-        let current =
+        let current = this.current_width_px / this.dom_full.clientWidth;
-          this.current_width_px / this.dom_full.clientWidth;
+        if(current>1) current = 1;
-        this.$emit("updateProgress", current);
+        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)
         this.$emit("getMouseDownStatus", false);
+        // 禁止拖动
+        if(!this.isDrag && time && arr[this.blobId] < current) return;
+        this.$emit("updateProgress", current);
+        
       }
     },
   },

src/components/processStatus.vue

@@ -33,7 +33,7 @@ export default {
     teacherId: {
       handler(newVal) {
         if (newVal) {
-          // console.log(newVal)
+          console.log(newVal)
           this.getCertificationProcess()
         }
       }
@@ -108,7 +108,7 @@ export default {
     },
     getCertificationProcess1(){
       getCertificationProcess({teacherId:this.pid}).then(res=>{
-        // console.log(res)
+        console.log(res)
         let data=res.data
         if(data.secondResult==0){
           this.status.secondResult=0

src/layout/index.vue

@@ -85,7 +85,7 @@ export default {
   },
   methods: {
     toggleSideBar(){
-      // console.log(this.aside.collapse);
+      console.log(this.aside.collapse);
       this.aside.collapse=!this.aside.collapse;
     }
   }

src/router/index.js

@@ -193,6 +193,20 @@ export const constantRoutes = [{
     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,

src/security.js

@@ -65,7 +65,7 @@ router.beforeEach((to, from, next) => {
               });
 
             }).catch(err => {
-                // console.log(err);
+                console.log(err);
                 store.commit('app/SET_INITDATA',false);
                 //如果初始化错误，就不再执行了，不然会一直循环下去
                 next({ path: '/500' })

src/store/modules/majorType.js

@@ -80,7 +80,7 @@ const  mutations={
                     sessionStorage.setItem('majorTypeMap',JSON.stringify(res.result));
                     context.commit('setMajorTypeMap', map);
                 } else {
-                    // console.log('专业分类获取失败！');
+                    console.log('专业分类获取失败！');
                 }
               });
           }

src/store/modules/orgDomain.js

@@ -78,7 +78,7 @@ const  mutations={
                     sessionStorage.setItem('OrgDomainMap',JSON.stringify(res.result));
                     context.commit('setOrgDomainMap', map);
                 } else {
-                    // console.log('组织机构获取失败！');
+                    console.log('组织机构获取失败！');
                 }
               });
           }

src/store/modules/resOwner.js

@@ -79,7 +79,7 @@ const  mutations={
                         sessionStorage.setItem('resOwnerMap',JSON.stringify(res.result));
                         context.commit('setResOwnerMap', map);
                     } else {
-                        // console.log('资源归属获取失败！');
+                        console.log('资源归属获取失败！');
                     }
                   });
               }

src/store/modules/sysType.js

@@ -79,7 +79,7 @@ const  mutations={
                     sessionStorage.setItem('sysTypeMap',JSON.stringify(res.result));
                     context.commit('setSysTypeMap', map);
                 } else {
-                    // console.log('内容分类获取失败！');
+                    console.log('内容分类获取失败！');
                 }
               });
           }

src/store/modules/user.js

@@ -71,7 +71,7 @@ const user = {
                 if(res.status==200){
                   commit('SET_Msg',res.result);
                 }else{
-                //   console.log("读取未读消息失败："+res.message);
+                  console.log("读取未读消息失败："+res.message);
                 }
               })
 
@@ -81,7 +81,7 @@ const user = {
               if(res.status==200){
                 commit('SET_MessagesBeReviewed',res.result);
               }else{
-                // console.log("读取待审核消息失败："+res.message);
+                console.log("读取待审核消息失败："+res.message);
               }
             })
        },
@@ -90,7 +90,7 @@ const user = {
              if(res.code==200){
                commit('SET_StudyTaskCount',res.data.todoTaskCounts);
              }else{
-            //    console.log("获取学习任务数失败："+res.msg);
+               console.log("获取学习任务数失败："+res.msg);
              }
           })
             // apiBoeCourse.cmtaskList({page:1,size:1,get_count:1}).then(res=>{

src/utils/request.js

@@ -10,7 +10,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 15000
+  timeout: 10000
 })
 // request拦截器
 service.interceptors.request.use(config => {
@@ -43,7 +43,7 @@ service.interceptors.request.use(config => {
   }
   return config
 }, error => {
-    // console.log(error)
+    console.log(error)
     Promise.reject(error)
 })
 
@@ -80,7 +80,7 @@ service.interceptors.response.use(res => {
     }
   },
   error => {
-    // console.log('err' + error)
+    console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {
       message = "网络异常，请稍后重试";

src/utils/testUsers.js

@@ -18,7 +18,7 @@ const init=function(){
            sessionStorage.setItem('whiteuser-session',data);
          }
        }else{
-        //  console.log('获取白名单错误:'+rs.message);
+         console.log('获取白名单错误:'+rs.message);
        }
     })
   }

src/utils/tools.js

@@ -423,6 +423,7 @@ export function translate(field) {
   let name = '';
   switch (field) {
       case 'total':name = '累计'; break;
+      case 'now':name = '当前'; break;
       case 'weeks':name = '本周'; break;
       case 'months':name = '本月'; break;
       case 'years':name = '本年'; break;

src/utils/xajax.js

@@ -40,7 +40,7 @@ jsonRequest.interceptors.request.use(config => {
   }
   return config
 }, error => {
-   //  console.log(error)
+    console.log(error)
     Promise.reject(error)
 })
 
@@ -79,7 +79,7 @@ jsonRequest.interceptors.response.use(res => {
      }
   },
   error => {
-   //  console.log('err' + error)
+    console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {
       message = "网络异常，请稍后重试";
@@ -106,7 +106,7 @@ const formRequest=axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   //超时
-  timeout: 15000,
+  timeout: 10000,
 })
 //发送json对象的拦截器
 formRequest.interceptors.request.use(config => {
@@ -117,7 +117,7 @@ formRequest.interceptors.request.use(config => {
   }
   return config
 }, error => {
-   //  console.log(error)
+    console.log(error)
     Promise.reject(error)
 });
 formRequest.interceptors.response.use(res => {
@@ -152,7 +152,7 @@ formRequest.interceptors.response.use(res => {
      }
   },
   error => {
-   //  console.log('err' + error)
+    console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {
       message = "网络异常，请稍后重试";

src/views/Index.vue

@@ -1202,7 +1202,7 @@ export default {
               this.userHobby.needShow = true;
             }
           } else {
-            // console.log("兴趣爱好检查失败" + res.message);
+            console.log("兴趣爱好检查失败" + res.message);
           }
           //检查引导页
           this.checkAndShowGuide();
@@ -1311,7 +1311,7 @@ export default {
             }
             localStorage.setItem("user-guide-" + this.userInfo.aid, 1);
           } else {
-            // console.log("获取引导页检查失败" + res.message);
+            console.log("获取引导页检查失败" + res.message);
             //this.$message.error('')
             if (this.userHobby.needShow) {
               this.$refs.userCollection.show();
@@ -1453,7 +1453,7 @@ export default {
     getRecommendList(){
       apiIndex.getRecommendList(1,3).then((res) => {
         if(res.code === 200){
-          // console.log(res.data.records);
+          console.log(res.data.records);
           let courseIds = [];
           res.data.records.forEach((item) => {
             item.authorInfo = {
@@ -1467,7 +1467,7 @@ export default {
             courseIds.push(item.id);
           });
           this.loadCouserTeacher(res.data.records, courseIds);
-          // console.log(res.result,'lalalala');
+          console.log(res.result,'lalalala');
           this.recommendedList.list = res.data.records
         }
       })
@@ -1499,7 +1499,7 @@ export default {
             courseIds.push(item.id);
           });
           this.loadCouserTeacher(res.result, courseIds);
-          // console.log(res.result,'lalalala');
+          console.log(res.result,'lalalala');
 
           this.courseList.list = res.result;
           //this.couname = res.result.list.name;
@@ -1510,7 +1510,7 @@ export default {
 
           // }
         } else {
-          // console.log("加载课程信息失败:" + res.error);
+          console.log("加载课程信息失败:" + res.error);
         }
       });
 
@@ -1561,7 +1561,7 @@ export default {
           }
           // this.caseList.list = res.result;
         } else {
-          // console.log("加载案例错误：" + res.error);
+          console.log("加载案例错误：" + res.error);
         }
       });
     },
@@ -1586,7 +1586,7 @@ export default {
             });
           });
         } else {
-          // console.log("加载用户信息失败:" + res.error);
+          console.log("加载用户信息失败:" + res.error);
           //this.$message.error(res.message);
         }
       });
@@ -1618,7 +1618,7 @@ export default {
             this.loadAuthorInfo(res.result, userIds);
           }
         } else {
-          // console.log("加载文章错误：" + res.error);
+          console.log("加载文章错误：" + res.error);
         }
       });
     },
@@ -1654,7 +1654,7 @@ export default {
             this.loadAuthorInfo(res.result, userIds);
           }
         } else {
-          // console.log("加载问答错误：" + res.error);
+          console.log("加载问答错误：" + res.error);
         }
         //console.log(res)
       });
@@ -1710,7 +1710,7 @@ export default {
             });
           });
         } else {
-          // console.log("加载用户信息失败:" + res.error);
+          console.log("加载用户信息失败:" + res.error);
         }
       });
     },
@@ -1733,7 +1733,7 @@ export default {
             });
           });
         } else {
-          // console.log("加载用户信息失败:" + res.error);
+          console.log("加载用户信息失败:" + res.error);
         }
       });
     },

src/views/ManageIndex.vue

@@ -31,7 +31,7 @@
     },
     methods:{
       lastTabChange(tab,event){
-        // console.log(tab.name);
+        console.log(tab.name);
       }
     }
   }

src/views/StudyIndex.vue

@@ -147,7 +147,7 @@
       })
     },
       lastTabChange(tab,event){
-        // console.log(tab.name);
+        console.log(tab.name);
       }
     }
   }

src/views/case/ManageList.vue

@@ -32,6 +32,9 @@
           </div>
         </div>
       </div>
+      <div style="margin: 5px 0 0 5px;">
+        <el-button type="primary" @click="recoRanking">推荐榜单</el-button>
+      </div>
     </div>
     <el-table style="100%" :data="caseList" border stripe>
       <el-table-column label="标题" prop="title" show-overflow-tooltip>
@@ -49,6 +52,7 @@
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button-group>
+            <el-button style="margin:0 5px" type="text" v-if="scope.row.recommendRank === ''" @click="suggest(scope.row)" icon="el-icon-medal">榜单推荐</el-button>
             <!-- <el-button type="text" @click="shareItem(scope.row)"  icon="el-icon-share" style="margin:0 5px">推荐</el-button> -->
             <el-button style="margin:0 5px" v-if="!scope.row.isTop && scope.row.confidentialityLevel == '内部'" type="text"
               @click="setTop(scope.row)" icon="el-icon-top">置顶</el-button>
@@ -56,8 +60,12 @@
               @click="setTop(scope.row)" icon="el-icon-bottom">取消置顶</el-button>
             <el-button type="text" icon="el-icon-medal"
               v-if="scope.row.filePath && scope.row.confidentialityLevel == '内部'"><span @click="cancal(scope.row)"
-                v-if="scope.row.excellent">取消最佳</span><span @click="open(scope.row)" v-else>最佳案例</span></el-button>
+                v-if="scope.row.excellent">取消最佳</span>
+                <!-- <span @click="open(scope.row)" v-else>最佳案例</span> -->
+                <span @click="theBest(scope.row)" v-else>最佳</span>
+              </el-button>
             <el-button style="margin:0 5px" type="text" @click="delItem(scope.row)" icon="el-icon-delete">删除</el-button>
+            <!-- <el-button style="margin:0 5px" type="text" @click="theBest(scope.row)" icon="el-icon-delete">最佳</el-button> -->
           </el-button-group>
         </template>
       </el-table-column>
@@ -121,16 +129,91 @@
       </div>
       <span slot="footer" class="dialog-footer"><el-button @click="recommend.dlgShow = false">关闭</el-button></span>
     </el-dialog>
+    <el-dialog
+      title="最佳案例"
+      :visible.sync="bestValue"
+      width="36%">
+      <div class="best_card">
+        <div class="card_item">
+          <div class="card_title">
+            <i class="icon"></i>
+            <span class="text">年度</span>
+          </div>
+          <el-input style="width:190px" disabled v-model="bestYear" placeholder="请输入年度"></el-input>
+        </div>
+        <div class="card_item">
+          <div class="card_title">
+            <i class="icon"></i>
+            <span class="text">组织领域</span>
+          </div>
+          <el-input disabled v-model="bestOrg" placeholder="请输入组织领域"></el-input>
+        </div>
+        <div class="card_item">
+          <div class="card_title">
+            <span class="text">最佳理由</span>
+          </div>
+          <el-input type="textarea"
+            placeholder="请输入内容"
+            v-model="bestTextarea"
+            maxlength="200"
+            show-word-limit></el-input>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="notBest">取 消</el-button>
+        <el-button type="primary" @click="parameBest">确 定</el-button>
+      </span>
+    </el-dialog>
+    <el-drawer
+      title="推荐榜单"
+      :visible.sync="RankingShow"
+      size="80%">
+      <div style="padding: 10px 20px 80px">
+        <el-table :data="tableData" border stripe>
+          <el-table-column
+            type="index"
+            width="50"
+            label="排序">
+          </el-table-column>
+          <el-table-column show-overflow-tooltip label="案例标题" prop="caseTitle"></el-table-column>
+          <el-table-column width="150px" label="作者名称" prop="caseAuthor"></el-table-column>
+          <el-table-column width="150px" label="上榜人" prop="caseAuthor"></el-table-column>
+          <el-table-column width="250px" label="上榜时间" prop="recommendRankPusTime"></el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button-group>
+                <el-button style="margin:0 5px" type="text" @click="handleNotRank(scope.row)" icon="el-icon-delete">取消推荐</el-button>
+                <el-button style="margin:0 5px" type="text" @click="moveUp(scope.row,scope.$index)" icon="el-icon-top">上移排序</el-button>
+                <el-button style="margin:0 5px" type="text" @click="moveDown(scope.row,scope.$index)" icon="el-icon-bottom">下移排序</el-button>
+              </el-button-group>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="rank_footer">
+        <el-button @click="closeDrawer" style="width: 130px;height:40px;margin-right: 30px;" type="default">取消</el-button>
+        <el-button @click="queryList" style="width: 130px;height:40px;margin-right: 15px;" type="primary">确定</el-button>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
 <script>
 import apiCase from '@/api/modules/cases.js';
 import apiUser from '@/api/system/user.js'
+import apiType from "@/api/modules/type.js";
 export default {
   name: 'articleItems',
   data() {
     return {
+      adminList: [],
+      caseType: process.env.VUE_APP_CASE_TYPE,
+      RankingShow: false,
+      bestYear: '',
+      bestOrg: '',
+      bestId: '',
+      bestTextarea: '',
+      bestValue: false,
       excellent: false,
       queryObj: {
         pageIndex: 1,
@@ -139,6 +222,8 @@ export default {
         excellent: '',
       }, //查询对象
       caseList: [], //案例列表
+      tableData: [],
+      caseIds: '',
       count: 0,
       recommend: {
         dlgShow: false,
@@ -171,8 +256,153 @@ export default {
   },
   mounted() {
     this.getData();
+    this.getList();
+    apiType.treeList(1,Number(this.caseType ?? 155),1).then(res=>{
+      if(res.code == 200){
+        this.adminList = res.data.records;
+      }
+    })
+  },
+  watch:{
+    RankingShow(val){
+      if(val){
+        this.getList()
+      }
+    }
   },
   methods: {
+    orgDomainTranslate(code) { // 组织领域翻译
+      if (code == '') {
+        return
+      }
+      let name = '';
+      let data = this.adminList.find(item => {
+        return item.code == code;
+      });
+      if (data) {
+        name = data.name;
+      }
+      return name;
+    },
+    suggest(record){
+      if(this.tableData.length == 10){
+        this.$message.error('最多推荐10个')
+        return
+      }
+      this.$confirm('你确认要推荐此案例吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        apiCase.riseIntoRank({caseId:record.id}).then(res=>{
+          if(res.status == 200 ){
+            this.$message.success('推荐成功')
+            this.getData()
+            this.getList()
+          }
+        })
+      })
+    },
+    handleNotRank(record){
+      this.$confirm('你确认要取消推荐吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        apiCase.cancelRiseIntoRank({caseId:record?.caseId}).then(res=>{
+          if(res.status == 200){
+            this.$message.success('取消推荐成功')
+            this.getList()
+            this.getData()
+          }
+        }).catch(()=>{
+          this.$message.error('取消推荐失败')
+        })
+      })
+    },
+    moveUp(row,index){
+      console.log(row,index,'index')
+      if(index == 0){
+        this.$message.error('已经排到第一位了')
+        return
+      }
+      this.swapArray(this.tableData,index,index-1)
+    },
+    moveDown(row,index){
+      if(index == this.tableData.length - 1){
+        this.$message.error('已经排到最后一位了')
+        return
+      }
+      this.swapArray(this.tableData,index,index+1)
+    },
+    swapArray(arr, index1, index2){
+      const temp = arr[index1];
+      arr.splice(index1, 1);
+      arr.splice(index2, 0, temp);
+    },
+    getList(){
+      apiCase.getQueryRecommendRank({pageSize:10}).then(res=>{
+        console.log(res,'res')
+        if(res.status == 200){
+          this.tableData = res.result
+          this.caseIds = res.result.map(item=>item.caseId).join(',')
+        }
+      })
+    },
+    notBest(){
+      this.bestValue = false
+      this.bestYear = ''
+      this.bestOrg = ''
+      this.bestId = ''
+      this.bestTextarea = ''
+    },
+    parameBest(){
+      this.excellent = true;
+      let data = {
+        id: this.bestId,
+        excellent: this.excellent,
+        excellentReason: this.bestTextarea
+      }
+      apiCase.excellent(data).then(res=>{
+        if (res.status == 200) {
+            this.$message({
+              type: 'success',
+              message: '设置最佳案例成功!'
+            });
+            this.getData()
+          }else{
+            this.$message({
+              type: 'error',
+              message: res.message
+            });
+          }
+          this.notBest()
+      })
+    },
+    recoRanking(){
+      this.RankingShow = true
+    },
+    closeDrawer(){
+      this.RankingShow = false
+    },
+    queryList(){
+      if(this.caseIds != this.tableData.map(item=>item.caseId).join(',')){
+        apiCase.adjustRank({caseIds:this.tableData.map(item=>item.caseId).join(',')}).then(res=>{
+          if(res.status == 200){
+            this.$message({
+              message: '调整成功',
+              type: 'success'
+            })
+          }
+        }).catch(()=>{
+          this.$message({
+            message: '调整失败',
+            type: 'error'
+          })
+        })
+      }
+      this.RankingShow = false
+    },
     // 导出
     importList() {
       apiCase.exports(this.queryObj).then(res => {
@@ -180,7 +410,7 @@ export default {
         let blob = new Blob([res], { type: 'application/vnd.ms-excel;charset=UTF-8' }); // 设置文件类型
         link.style.display = "none";
         link.href = URL.createObjectURL(blob); // 创建URL
-        // console.log(link.href);
+        console.log(link.href);
         link.setAttribute("download", "案例.xls");
         document.body.appendChild(link);
         link.click();
@@ -203,7 +433,7 @@ export default {
           id: item.id,
           excellent: this.excellent
         }
-        // console.log(data)
+        console.log(data)
         apiCase.excellent(data).then(res => {
           if (res.status == 200) {
             this.$message({
@@ -211,6 +441,11 @@ export default {
               message: '取消成功!'
             });
             this.getData()
+          }else{
+            this.$message({
+              type: 'error',
+              message: res.message
+            });
           }
         })
       }).catch(() => {
@@ -231,7 +466,7 @@ export default {
           id: item.id,
           excellent: this.excellent
         }
-        // console.log(data)
+        console.log(data)
         apiCase.excellent(data).then(res => {
           if (res.status == 200) {
             this.$message({
@@ -354,6 +589,12 @@ export default {
           this.$message({ type: 'info', message: '已取消删除', offset: 50 });
         });
     },
+    theBest(item){
+      this.bestValue = true
+      this.bestId = item.id
+      this.bestOrg = this.orgDomainTranslate(item.orgDomainParent)
+      this.bestYear = item.sysCreateTime.split('-')[0]
+    },
     //添加推荐
     shareItem(item) {
       this.shareItemData = { ...item }
@@ -431,7 +672,7 @@ export default {
       this.$message({ message: msg, type: 'success', offset: 50 });
     },
     handleSelect(item) {
-      // console.log(item);
+      console.log(item);
     },
     querySearchAsync(queryString, cb) {
       let result = queryString ? this.findList.filter(this.createStateFilter(queryString)) : this.findList;
@@ -467,6 +708,48 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.rank_footer{
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  width: 100%;
+  height: 80px;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  background: #fff;
+  padding-right: 20px;
+}
+::v-deep .el-dialog__header{
+  border-bottom: 1px solid #f0f0f1;
+}
+::v-deep .el-textarea__inner{
+  height: 100px !important;
+}
+.best_card{
+  .card_item{
+    display: flex;
+    justify-content: start;
+    margin-bottom: 20px;
+    .card_title{
+      width: 94px;
+      min-width: 94px;
+      display: flex;
+      align-items: center;
+      justify-content: end;
+      margin-right: 14px;
+      .icon{
+        width:8px;
+        height: 8px;
+        background: url('../../assets/images/asterisk.png') no-repeat;
+        background-size: 100%;
+      }
+      .text{
+
+      }
+    }
+  }
+}
 .article-status1 {
   padding: 3px;
   border: 1px dotted #1ea0fa;

src/views/course/Courseware.vue

@@ -440,28 +440,28 @@ export default {
       return this.resOwnerMap.get(code);
     },
     onPlayerPlay() {
-      // console.log('开始播放');
+      console.log('开始播放');
     },
     onPlayerPause() {
-      // console.log('暂停');
+      console.log('暂停');
     },
     onPlayerEnded() {
-      // console.log('播放结束');
+      console.log('播放结束');
     },
     onPlayerPlaying(itme) {
-      // console.log('当前播放' + itme);
+      console.log('当前播放' + itme);
     },
     audioPlaying(item) {
-      // console.log('当前播放' + item);
+      console.log('当前播放' + item);
     },
     audioPlay() {
-      // console.log('开始播放');
+      console.log('开始播放');
     },
     audioPause() {
-      // console.log('暂停');
+      console.log('暂停');
     },
     audioEnd() {
-      // console.log('播放结束');
+      console.log('播放结束');
     },
     addFile() {
       this.upload.show = true;
@@ -569,7 +569,7 @@ export default {
               this.$message.error(res.message);
             }
           }).catch (error=>{
-            // console.log(error,'error')
+            console.log(error,'error')
             //this.$message.error(error);
           });
           // const { result, status } = coueseFile.saveUpload(data);

src/views/course/ManageList.vue

@@ -448,7 +448,7 @@ export default {
         title:row.name,//课程的名称,
         top:!row.isTop,// top 是否置顶}
       }
-      // console.log(row.isTop);
+      console.log(row.isTop);
        if(row.isTop == false){
         //  console.log('fa')
         this.$confirm('此操作将置顶此课程, 是否继续?', '提示', {
@@ -633,7 +633,7 @@ export default {
 		  row.enabled=!row.enabled
         }
       } catch (error) {
-        // console.log(error);
+        console.log(error);
       }
 
     },
@@ -782,7 +782,7 @@ export default {
           this.searchData();
         }
       } catch (error) {
-        // console.log(error);
+        console.log(error);
       }
 
         })
@@ -862,7 +862,7 @@ export default {
           this.searchData();
         }
       } catch (error) {
-        // console.log(error);
+        console.log(error);
       }
         })
         .catch((err) => {

src/views/course/MycaseRecord.vue

@@ -120,7 +120,7 @@ computed: {
     },
     getcaseData(){
         aipCase.mylist(this.caseData).then(res =>{
-            // console.log(res);
+            console.log(res);
             this.count = res.result.count;
             this.params = res.result.list
         })

src/views/course/OpenCourseAudit.vue

@@ -244,7 +244,7 @@ export default {
          this.loading = false;
       } catch (error) {
         this.loading = false;
-        // console.log(error);
+        console.log(error);
       }
     },
      viewTopic(row) {