diff --git a/.env.development b/.env.development
index 889821b0..78a7b3f5 100644
--- a/.env.development
+++ b/.env.development
@@ -16,13 +16,13 @@ VUE_APP_CESOURCE_BASE_API = '/socialApi'
 VUE_APP_STAT_BASE_API = '/statApi'
 
 # BOE系统网址
-VUE_APP_BOE_WEB_URL = 'http://192.168.0.11'
+VUE_APP_BOE_WEB_URL = 'http://127.0.0.1'
 
 # BOE 移动端url
-VUE_APP_BOE_MOBILE_URL = 'http://192.168.0.11:8082/mobile'
+VUE_APP_BOE_MOBILE_URL = 'http://127.0.0.1:8082/mobile'
 
 # File路径的基础url
-VUE_APP_FILE_BASE_URL = 'http://192.168.0.11:9090/cdn/upload'
+VUE_APP_FILE_BASE_URL = 'http://127.0.0.1:9090/cdn/upload'
 
 # File路径的基础url的相对路径，加此项是为了不影响之前的路径配置
 VUE_APP_FILE_RELATIVE_PATH = '/upload'
@@ -32,6 +32,12 @@ VUE_APP_LOGIN_URL='/pc/login'
 
 # 虚拟目录的变量
 VUE_APP_PUBLIC_PATH='/pc'
+VUE_APP_MANAGER_PATH='/manage'
+VUE_APP_STUDENT_PATH='/fe-student'
+VUE_APP_MANAGER_API_PATH='/manageApi'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
+
+# scorm课件的播放url地址
+VUE_APP_SCORM_URL = 'http://localhost:9083/scorm-player'
diff --git a/.env.preview b/.env.preview
index a1b96aec..cf0cddd5 100644
--- a/.env.preview
+++ b/.env.preview
@@ -29,6 +29,12 @@ VUE_APP_FILE_RELATIVE_PATH = '/upload'
 
 # 虚拟目录的变量,结尾的/在vue.config.js中添加
 VUE_APP_PUBLIC_PATH='/pc-release'
+VUE_APP_MANAGER_PATH='/manage-release'
+VUE_APP_STUDENT_PATH='/fe-student-release'
+VUE_APP_MANAGER_API_PATH='/manageApi-release'
 
 # 登录地址
 VUE_APP_LOGIN_URL='https://u.boe.com/web-release/'
+
+# scorm课件的播放url地址
+VUE_APP_SCORM_URL = 'https://u.boe.com/newscorm/scorm-player'
diff --git a/.env.production b/.env.production
index b18fe5a4..ee26fd41 100644
--- a/.env.production
+++ b/.env.production
@@ -29,6 +29,12 @@ VUE_APP_FILE_RELATIVE_PATH = '/upload'
 
 # 虚拟目录的变量,结尾的/在vue.config.js中添加
 VUE_APP_PUBLIC_PATH='/pc'
+VUE_APP_MANAGER_PATH='/manage'
+VUE_APP_STUDENT_PATH='/fe-student'
+VUE_APP_MANAGER_API_PATH='/manageApi'
 
 # 登录地址
 VUE_APP_LOGIN_URL='https://u.boe.com/web/'
+
+# scorm课件的播放url地址
+VUE_APP_SCORM_URL = 'https://u.boe.com/newscorm/scorm-player'
diff --git a/.env.testing b/.env.testing
index a0aa5726..2fd85c14 100644
--- a/.env.testing
+++ b/.env.testing
@@ -29,6 +29,12 @@ VUE_APP_FILE_RELATIVE_PATH = '/upload'
 
 # 虚拟目录的变量,结尾的/在vue.config.js中添加
 VUE_APP_PUBLIC_PATH='/pc'
+VUE_APP_MANAGER_PATH='/manage'
+VUE_APP_STUDENT_PATH='/fe-student'
+VUE_APP_MANAGER_API_PATH='/manageApi'
 
 # 登录地址
 VUE_APP_LOGIN_URL='https://u-pre.boe.com/web/'
+
+# scorm课件的播放url地址
+VUE_APP_SCORM_URL = 'https://u-pre.boe.com/newscorm/scorm-player'
diff --git a/public/images/scorm.png b/public/images/scorm.png
new file mode 100644
index 00000000..f907f19d
Binary files /dev/null and b/public/images/scorm.png differ
diff --git a/src/api/boe/boeAjax.js b/src/api/boe/boeAjax.js
index 728435d2..c575e8e7 100644
--- a/src/api/boe/boeAjax.js
+++ b/src/api/boe/boeAjax.js
@@ -47,7 +47,7 @@ const formRequest=axios.create({
       Promise.reject(error)
   });
   formRequest.interceptors.response.use(res => {
-      console.log(res);
+      //console.log(res);
       const code = res.data.status || 200;
        if(code===200){
            return res.data
diff --git a/src/api/boe/courseRecord.js b/src/api/boe/courseRecord.js
new file mode 100644
index 00000000..33dda498
--- /dev/null
+++ b/src/api/boe/courseRecord.js
@@ -0,0 +1,42 @@
+/**我的授课记录*/
+import ajax from '@/api/boe/boeApiAjax.js'
+import axios from 'axios'
+import { getToken } from '@/utils/token'
+const baseURL = process.env.VUE_APP_BOE_BASE_API;
+
+
+
+/**
+ * 导出授课记录
+ *
+ * @param {Object} kid
+ */
+const courseRecordExport = function(data) {
+  return axios.request({
+    baseURL,
+    url: '/b1/system/teacher/teacher-course-export',
+    method: 'post',
+    data:data,
+    headers:{'Content-Type':'application/json;charset=utf-8'},
+    responseType: 'blob'
+  })
+
+  // return ajax.postJson('/b1/system/teacher/teacher-course-export',data);
+}
+
+/**
+ * 授课记录列表
+ *
+ * @param {Object} kid
+ */
+const courseRecordList = function(data) {
+    return ajax.postJson('/b1/system/teacher/teacher-course-list',data);
+}
+
+
+
+export default {
+    courseRecordExport,
+    courseRecordList
+
+}
diff --git a/src/api/boe/teacher.js b/src/api/boe/teacher.js
index 1568a2ca..6d2418d6 100644
--- a/src/api/boe/teacher.js
+++ b/src/api/boe/teacher.js
@@ -136,8 +136,28 @@ const teacherSystem = function(id) {
         return ajax.postJson('/b1/system/teacher/delete-model-teacher',data);
     }
 
+//以下是新增加的两个接口，只是修改4个字段内容
+/**
+ * @param {Object} data
+ * {
+   teacher_user_id:用户的kid,
+   courses:'擅长的课程'，
+   photo:"",
+   expertise:'',
+   work:''
+ }
+ */
+const simpleUpdate = function(data) {
+        return ajax.postJson('/b1/system/teacher/update-teacher',data);
+}
+
+const simpleInfo = function(kid) {
+        return ajax.postJson('/b1/system/teacher/teacher-info',{teacher_user_id:kid});
+}
 
 export default {
+    simpleUpdate,
+    simpleInfo,
     editTeacher,
     teacherSystem,
     teacherInfo,
diff --git a/src/api/login.js b/src/api/login.js
index 0b47d438..ec6c72ee 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -32,7 +32,8 @@ const refreshToken = function(token){
 
 // boe登录
 const boeLogin = function(token){
-  return ajax.post('/xboe/account/boelogin',{token:token});
+  //return ajax.post('/xboe/account/boelogin',{token:token});
+  return ajax.post('/xboe/account/boenewlogin',{token:token});
 }
 
 export default{
diff --git a/src/api/modules/cases.js b/src/api/modules/cases.js
index 1a8cbced..ef3e1b26 100644
--- a/src/api/modules/cases.js
+++ b/src/api/modules/cases.js
@@ -119,6 +119,40 @@ const ids=function (data){
   return ajax.postJson('/xboe/m/boe/cases/ids',data);
 }
 
+/**
+ * 设置和取消优秀案例
+ * @param{
+ *   id   案例id
+ *   excellent   true、设置    false 取消
+ * }
+ * */
+const excellent=function(data){
+  return ajax.post('/xboe/m/boe/cases/excellent',data)
+}
+
+
+/**
+ *我的案例
+ * @param{
+ *   pageIndex
+ *   pageSize
+ * }
+ * */
+const mylist=function (query){
+  return ajax.post('/xboe/m/boe/cases/mylist',query);
+}
+
+/**
+ * 导出
+ * @param{
+ *   pageIndex
+ *   pageSize
+ * }
+ * */
+const exportCases=function (query){
+  return ajax.post('/xboe/m/boe/cases/export',query);
+}
+
 export default {
     indexList,
     queryList,
@@ -133,5 +167,8 @@ export default {
 	queryComments,
   majorTypes,
   details,
-  ids
+  ids,
+  excellent,
+  mylist,
+  exportCases
 }
diff --git a/src/api/modules/course.js b/src/api/modules/course.js
index 22dcd55b..d3bfee07 100644
--- a/src/api/modules/course.js
+++ b/src/api/modules/course.js
@@ -281,6 +281,7 @@ const auditList = function(query) {
     return ajax.post('/xboe/m/course/manage/audit-pagelist', query);
 }
 
+
 /**教师需要审核的课程列表*/
 const teacherAuditList = function(query) {
     return ajax.post('/xboe/m/course/audit/teacher-course', query);
diff --git a/src/api/modules/paper.js b/src/api/modules/paper.js
index 8dc08937..5ed38974 100644
--- a/src/api/modules/paper.js
+++ b/src/api/modules/paper.js
@@ -32,8 +32,8 @@ const update = function(data) {
     }
     /* 编辑详情 */
 const detail = function(id) {
-        return ajax.get('/xboe/m/exam/paper/query?id=' + id);
-    }
+    return ajax.get('/xboe/m/exam/paper/query?id=' + id);
+}
     
     /* 试卷批量导入计算
      * num 数目  
diff --git a/src/api/modules/popup.js b/src/api/modules/popup.js
new file mode 100644
index 00000000..bfcc0571
--- /dev/null
+++ b/src/api/modules/popup.js
@@ -0,0 +1,13 @@
+
+import ajax from '@/utils/xajax.js'
+
+/**
+ * @param {Object} device 不包含的平台， 1表pc, 2表移动端
+ */
+const findByNoDevice=function (device){
+  return ajax.get('/xboe/m/popup/user?device='+device);
+}
+
+export default {
+  findByNoDevice
+}
diff --git a/src/api/modules/teacher.js b/src/api/modules/teacher.js
index f0a1a76d..7939917d 100644
--- a/src/api/modules/teacher.js
+++ b/src/api/modules/teacher.js
@@ -9,6 +9,11 @@ const findByName = function(name) {
     return ajax.get('/xboe/teacher/name?name=' + name);
 }
 
+
+const updateTeacher=function(data){
+    return ajax.postJson('/xboe/teacher/update-teacher',data);
+}
+
 /**
  * 根据id得到教师的显示信息，只是几个基本的显示字段
  * @param {Object} id
@@ -17,6 +22,11 @@ const getInfoById = function(id) {
     return ajax.get('/xboe/teacher/simple?id=' + id);
 }
 
+const detailTeacher=function (id){
+    return ajax.get('/xboe/teacher/detail-teacher?id='+id);
+  }
+
+
 /**
  * 分页查询
  * @param {
@@ -213,5 +223,7 @@ export default {
 	start,
 	end,
 	exports,
-    syncUpdate
+    syncUpdate,
+    detailTeacher,
+    updateTeacher
 }
diff --git a/src/api/modules/test.js b/src/api/modules/test.js
index 068039fc..332efa52 100644
--- a/src/api/modules/test.js
+++ b/src/api/modules/test.js
@@ -54,6 +54,16 @@ const exports=function (query){
   return ajax.post('/xboe/m/exam/alone/answer/export',query,{responseType: 'blob'});
 }
 
+/**
+ * @param{
+ *   id 考试id
+ *   enabled   true 上架   false 下架
+ * }
+ * */
+const enabled=function(query){
+  return ajax.post('/xboe/m/exam/test/enabled',query);
+}
+
 export default {
     detail,
     update,
@@ -61,5 +71,6 @@ export default {
     save,
     querylist,
     pulish,
-  exports
+  exports,
+  enabled
 }
diff --git a/src/api/system/whiteuser.js b/src/api/system/whiteuser.js
new file mode 100644
index 00000000..79e7eff3
--- /dev/null
+++ b/src/api/system/whiteuser.js
@@ -0,0 +1,18 @@
+import ajax from '@/utils/xajax.js'
+
+
+/**
+ * 查询白名单
+ * @param {
+ * env:'开发环境'
+ * } data
+ * @returns
+ */
+const getList =function(env) {
+    return ajax.post('/xboe/sys/whiteuser/codes',env);
+}
+
+
+export default{
+    getList
+}
diff --git a/src/assets/styles/portal.scss b/src/assets/styles/portal.scss
index e21fe7a6..6b6aa53e 100644
--- a/src/assets/styles/portal.scss
+++ b/src/assets/styles/portal.scss
@@ -189,7 +189,7 @@ body {margin: 0px;padding: 0px;}
   .course-card-favorite{
     position: absolute;
     right:25px;
-    bottom: 72px;
+    bottom: 84px;
   }
   // margin-right: 35px;
 
@@ -254,7 +254,7 @@ body {margin: 0px;padding: 0px;}
   .course-title {
     height: 44px;
     // margin: 10px 0;
-    margin: 10px 0 10px 0px;
+    margin: 10px 0 0px 0px;
     line-height: 24px;
     font-size: 16px;
     font-weight: 600;
@@ -383,7 +383,7 @@ body {margin: 0px;padding: 0px;}
     .course-card-favorite{
       position: absolute;
       right:20px;
-      bottom: 72px;
+      bottom: 78px;
   }
     .course-image-box {
       width:218;
diff --git a/src/components/AlertPopup.vue b/src/components/AlertPopup.vue
index 38dc48c5..9fde5fd4 100644
--- a/src/components/AlertPopup.vue
+++ b/src/components/AlertPopup.vue
@@ -1,38 +1,110 @@
 <template>
   <!--弹出窗口设置-->
   <div>
-     <el-dialog :close-on-press-escape="false" :close-on-click-modal="false"  class="medalbox" top="10vh" :visible.sync="showGonggao"  :append-to-body="true" >
-            <div style="text-align: center;position: relative;">
-              <el-image :src="`${webBaseUrl}/images/gonggao/dlg202212.png`"></el-image>
-              <div>
-                <span class="dlg-close" @click="showGonggao = false"><i style="font-size: 28px;color: #ffff;" class="el-icon-close"></i></span>
-              </div>
-            </div>
-          </el-dialog>
+    <div v-for="pop in popupList" :key="pop.id">wwww
+      <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> -->
+          <el-image :src="baseUrl+pop.bgImage"></el-image>
+          <div>
+            <span v-if="pop.closeable" class="dlg-close" @click="pop.show = false"><i style="font-size: 28px;color: #999;" class="el-icon-close"></i></span>
+          </div>
+        </div>
+      </el-dialog>
+    </div>
   </div>
 </template>
-
 <script>
+  import apiPopup from '@/api/modules/popup.js';
   export default{
     props:{
-
+      page: {
+        type:String,
+        default:''
+      }
     },
     data() {
       return {
-        showGonggao:false,
-        sessionKey:'alertpopup1',
+        showGonggao:true,
+        baseUrl:process.env.VUE_APP_FILE_BASE_URL,
+        popupList:[],//需要弹出的窗口
+        sessionKey:'alertpopup',
+        localTimesKey:'popuptimes'
       };
     },
     mounted() {
-       let hasFlag = localStorage.getItem(this.sessionKey);
-       if(!hasFlag){
-           let now=new Date();
-           let max=new Date(2022,12,28,0,0,0);
-           if(now.getTime()<max.getTime()){
-             this.showGonggao=true;
-             localStorage.setItem(this.sessionKey,'1');
-           }
-       }
+      //获取用户需要弱出的窗口信息，放在状态中
+      let has =  sessionStorage.getItem(this.sessionKey);
+      //has=false;
+      if(!has){
+        apiPopup.findByNoDevice(2).then(rs=>{
+          if(rs.status==200){
+              rs.result.forEach(item=>{
+                item.show=true;
+              })
+              this.popupList=rs.result;
+              if(rs.result.length>0){
+                sessionStorage.setItem(this.sessionKey,"1");
+                this.countPopup();
+              }else{
+                sessionStorage.removeItem(this.sessionKey);
+              }
+
+          }
+        });
+      }else{
+          //this.popupList=JSON.parse(has);
+          //this.countPopup();
+      }
+
+
+       // let loadNum =  localStorage.getItem(this.sessionKey);
+       // let hasFlag = sessionStorage.getItem(this.sessionKey);
+       // let $this=this;
+       // if(!hasFlag){
+       //   let times=0;
+       //   if(loadNum){
+       //     times=Number(loadNum);
+       //   }
+       //   if(times<3){
+       //     let now=new Date();
+       //     let min=new Date(2022,10,9,0,0,0);
+       //     let max=new Date(2022,11,1,0,0,0);
+       //     //console.log(now,min,max);
+       //     //console.log(now.getTime(),min.getTime(),max.getTime());
+       //     if(now.getTime()>min.getTime() && now.getTime()<max.getTime()){
+       //        //console.log('open')
+       //        this.showGonggao=true;
+       //        times++;
+       //        localStorage.setItem(this.sessionKey,times);
+       //        sessionStorage.setItem(this.sessionKey,1);
+       //     }
+       //   }
+
+       // }
+    },
+    methods:{
+        countPopup(){
+          //let  newLogin = localStorage.getItem(this.$xpage.constants.newLoginKey);
+          this.popupList.forEach(item=>{
+            //次数检查
+            if(item.times>0){
+              var localKey=this.localTimesKey+item.id;
+              var curLocal=localStorage.getItem(localKey);
+              if(curLocal){
+                 let times=parseInt(curLocal);
+                 if(item.times< times){
+                    item.show=false;
+                 }else{
+                   localStorage.setItem(localKey,curLocal+1);
+                 }
+              }else{
+                 localStorage.setItem(localKey,1);
+              }
+
+            }
+          })
+        }
     }
   }
 </script>
@@ -67,9 +139,11 @@
 
   }
   .dlg-close{
-    padding: 20px 10px 10px 10px;
+    //float: right;
+    //margin-top: -90px;
     border: 1px solid #cccccc;
     border-radius: 50%;
+    padding: 20px 10px 10px 10px;
     cursor: pointer;
   }
   .medalbox {
diff --git a/src/components/Course/auditCourse1.vue b/src/components/Course/auditCourse1.vue
index a9cc71c9..541157d0 100644
--- a/src/components/Course/auditCourse1.vue
+++ b/src/components/Course/auditCourse1.vue
@@ -253,6 +253,7 @@ import apiCourseFile from '@/api/modules/courseFile.js';
 import filecloud from '@/components/FileCloud/index.vue';
 import { mapGetters, mapActions } from "vuex";
 import chooseOrg from '@/components/System/chooseOrg.vue';
+import apiUserBasic from '../../api/boe/userbasic.js';
 // import hyperLink from '@/components/Course/hyperLink.vue';
 export default {
   name: "auditCourse1",
@@ -586,7 +587,7 @@ export default {
       this.courseCoverurl = "";
       this.courseInfo.coverImg = "";
     },
-    getDetail() {
+    getDetail(){
       let $this = this;
       apiCoursePortal.detail(this.id,true).then(rs => {
         if (rs.status == 200) {
@@ -594,23 +595,37 @@ export default {
           //加载所属机构名称
           this.orgKid='';
           if(this.courseInfo.orgId){
-            apiOrg.getSimple(this.courseInfo.orgId).then(rrs=>{
-               if(rrs.status==200){
-                 this.orgName=rrs.result.name;
-                 this.orgKid=rrs.result.kid;
+            apiUserBasic.getOrgInfo(this.courseInfo.orgId).then(rrs=>{
+              if(rs.status==200){
+                  this.orgName=rrs.result.name;
+                  //this.orgKid=rrs.result.kid;
+                  //this.orgNamePath=rrs.result.namePath;
                }
-            })
+            });
+            // apiOrg.getSimple(this.courseInfo.orgId).then(rrs=>{
+            //    if(rrs.status==200){
+            //      this.orgName=rrs.result.name;
+            //      this.orgKid=rrs.result.kid;
+            //    }
+            // })
           }else{
             //根据课程创建者获取机构id
             apiUser.getOrgSimpleByUserId(this.courseInfo.sysCreateAid).then(ors=>{
                if(ors.status==200){
                  $this.courseInfo.orgId=ors.result.id;
-                 apiOrg.getSimple(ors.result.id).then(rrs=>{
-                    if(rrs.status==200){
-                      $this.orgName=rrs.result.name;
-                      $this.orgKid=rrs.result.kid;
+                 apiUserBasic.getOrgInfo(ors.result.id).then(rrs=>{
+                   if(rs.status==200){
+                       $this.orgName=rrs.result.name;
+                       //this.orgKid=rrs.result.kid;
+                       //$this.orgNamePath=rrs.result.namePath;
                     }
-                 })
+                 });
+                 // apiOrg.getSimple(ors.result.id).then(rrs=>{
+                 //    if(rrs.status==200){
+                 //      $this.orgName=rrs.result.name;
+                 //      $this.orgKid=rrs.result.kid;
+                 //    }
+                 // })
                }else{
                  //
                }
diff --git a/src/components/Course/auditCourse2.vue b/src/components/Course/auditCourse2.vue
index caff77d9..6b65ee7e 100644
--- a/src/components/Course/auditCourse2.vue
+++ b/src/components/Course/auditCourse2.vue
@@ -292,6 +292,7 @@ import { mapGetters,mapActions} from 'vuex';
 import hyperLink from '@/components/Course/hyperLink.vue';
 import apiCourseFile from '../../api/modules/courseFile.js';
 import filecloud from '@/components/FileCloud/index.vue';
+import apiUserBasic from '../../api/boe/userbasic.js';
 export default {
   name:"auditCourse2",
   components: {
@@ -634,23 +635,38 @@ export default {
           //加载所属机构名称
           this.orgKid='';
           if(this.courseInfo.orgId){
-            apiOrg.getSimple(this.courseInfo.orgId).then(rrs=>{
-               if(rrs.status==200){
-                 this.orgName=rrs.result.name;
-                 this.orgKid=rrs.result.kid;
+            apiUserBasic.getOrgInfo(this.courseInfo.orgId).then(rrs=>{
+              if(rs.status==200){
+                  this.orgName=rrs.result.name;
+                  //this.orgKid=rrs.result.kid;
+                  //this.orgNamePath=rrs.result.namePath;
                }
-            })
+            });
+            // apiOrg.getSimple(this.courseInfo.orgId).then(rrs=>{
+            //    if(rrs.status==200){
+            //      this.orgName=rrs.result.name;
+            //      this.orgKid=rrs.result.kid;
+            //    }
+            // })
           }else{
             //根据课程创建者获取机构id
             apiUser.getOrgSimpleByUserId(this.courseInfo.sysCreateAid).then(ors=>{
                if(ors.status==200){
                  $this.courseInfo.orgId=ors.result.id;
-                 apiOrg.getSimple(ors.result.id).then(rrs=>{
-                    if(rrs.status==200){
-                      $this.orgName=rrs.result.name;
-                      $this.orgKid=rrs.result.kid;
+
+                 apiUserBasic.getOrgInfo(ors.result.id).then(rrs=>{
+                   if(rs.status==200){
+                       $this.orgName=rrs.result.name;
+                       //this.orgKid=rrs.result.kid;
+                       //$this.orgNamePath=rrs.result.namePath;
                     }
-                 })
+                 });
+                 // apiOrg.getSimple(ors.result.id).then(rrs=>{
+                 //    if(rrs.status==200){
+                 //      $this.orgName=rrs.result.name;
+                 //      $this.orgKid=rrs.result.kid;
+                 //    }
+                 // })
                }else{
                  //
                }
diff --git a/src/components/Course/catalogCourseware.vue b/src/components/Course/catalogCourseware.vue
index 620a127b..29812ada 100644
--- a/src/components/Course/catalogCourseware.vue
+++ b/src/components/Course/catalogCourseware.vue
@@ -19,7 +19,7 @@
        <!--显示内容-->
          <div v-else style="margin: 0px 10px;">
            <!--视频-->
-           <div v-show="content.contentType>0 && content.contentType<41">
+           <div v-show="content.contentType>0 && content.contentType<51">
                <div style="display: flex;justify-content:space-between">
                   <div>
                     <el-input maxlength="50" @change="updateName" v-model="content.contentName" placeholder="内容的名称(限50字以内)"></el-input>
@@ -95,11 +95,17 @@
                     </div>
                     <pdfPreview v-if="content.contentType==40 && curPdfPath!=''" :filePath="fileBaseUrl+curPdfPath"></pdfPreview>
                  </div>
+                 <div v-if="content.contentType==50" style="text-align: center;">
+                      <iframe v-if="scormUrl" :src="scormUrl" frameborder="0" border="0px" style="width:100%;height:400px;border:0px"></iframe>
+                 </div>
                </div>
            </div>
            <!--课件选择或上传的公用组件-->
            <div v-show="content.contentRefId=='' && content.contentType>0 && content.contentType<41">
-              <choose-course-file ref="coursewarePanel" :resType="content.contentType" @choose="chooseFile"></choose-course-file>
+              <choose-course-file :orgId="course.orgId" :orgName="course.orgName" ref="coursewarePanel" :resType="content.contentType" @choose="chooseFile"></choose-course-file>
+           </div>
+           <div v-show="content.contentRefId=='' && content.contentType==50">
+              <choose-course-file :orgId="course.orgId" :orgName="course.orgName" ref="coursewareScormPanel" :resType="content.contentType" @choose="chooseFile"></choose-course-file>
            </div>
            <!--图文-->
            <div v-show="content.contentType==41">
@@ -145,90 +151,16 @@
            </div>
            <!--考试-->
            <div v-if="content.contentType==61">
-              <div style="display: flex;justify-content:space-between">
-                 <div>
-                   <el-input maxlength="50" @change="updateName" v-model="content.contentName" placeholder="内容的名称(限50字以内)"></el-input>
-                 </div>
-                 <div>
-                   <el-checkbox style="margin-right: 10px;" v-model="onlyQuestion">只显示试题</el-checkbox>
-                   <el-button type="primary" @click="saveData()" >保存</el-button>
-                   <el-button type="danger" @click="toReChoose()" >重新选择</el-button>
-                 </div>
-               </div>
-              <div style="padding-top: 10px;overflow: auto;">
-                <div v-if="!onlyQuestion">
-                <el-form size="small" label-width="80px">
-                  <el-form-item label="考试时长">
-                    <el-col :span="6">
-                      <el-input v-model="exam.testDuration" placeholder="20-120">
-                        <template slot="append">分钟</template>
-                      </el-input>
-                    </el-col>
-                    <!-- <el-col :span="9">
-                      <el-form-item label="尝试次数">
-                         <el-input-number v-model="exam.times" :min="0" :max="10" label="0表不限制"></el-input-number>
-                      </el-form-item>
-                    </el-col> -->
-                    <el-col :span="9">
-                      <el-form-item label="及格线">
-                        <el-input placeholder="20-120" v-model="exam.passLine">
-                          <template slot="append">%</template>
-                        </el-input>
-                      </el-form-item>
-                    </el-col>
-                  </el-form-item>
-                  <!-- <el-form-item label="显示">
-                    <el-col :span="10"><el-checkbox v-model="exam.showAnalysis">允许查看解析</el-checkbox> </el-col>
-                    <el-col :span="14"><el-checkbox v-model="exam.showAnswer">允许查看答案</el-checkbox></el-col>
-                  </el-form-item> -->
-                  <!-- <el-form-item label="模式"> -->
-                    <!-- <el-col :span="10"><el-checkbox v-model="exam.randomMode">随机生成试题</el-checkbox></el-col> -->
-                    <!-- <el-col :span="14"> -->
-                     <!-- <el-form-item label="数量">
-                         <el-input-number v-model="exam.qnum" :min="1" :max="10" label="数量"></el-input-number>
-                      </el-form-item> -->
-                    <!-- </el-col> -->
-                  <!-- </el-form-item> -->
-                  <!-- <el-form-item label="试题排列">
-                    <el-col :span="10">
-                      <el-select v-model="exam.arrange">
-                        <el-option :value="0" label="按顺序"></el-option>
-                        <el-option :value="1" label="只题目乱序"></el-option>
-                        <el-option :value="2" label="只选项乱序"></el-option>
-                        <el-option :value="3" label="题目选项全乱序"></el-option>
-                      </el-select>
-                    </el-col>
-                   <el-col :span="14">
-                        <el-form-item label="评分方式">
-                          <el-radio-group v-model="exam.scoringType">
-                              <el-radio :label="1">最高一次</el-radio>
-                              <el-radio :label="2">最后一次</el-radio>
-                          </el-radio-group>
-                        </el-form-item>
-                    </el-col>
-                  </el-form-item> -->
-                  <el-form-item label="评分方式">
-                    <el-col :span="8">
-                        <el-radio-group v-model="exam.scoringType">
-                            <el-radio :label="1">最高一次</el-radio>
-                            <el-radio :label="2">最后一次</el-radio>
-                        </el-radio-group>
-                    </el-col>
-                    <el-col :span="15">
-                      <el-form-item label="百分制">
-                        <el-checkbox v-model="exam.percentScore">按百分制显示成绩（实际成绩*100/实际总分）</el-checkbox>
-                      </el-form-item>
-                    </el-col>
-                  </el-form-item>
-                  <el-form-item label="考试说明">
-                     <el-input type="textarea" show-word-limit v-model="exam.info" placeholder="关于考试的说明(限255字以内)" maxlength="255"></el-input>
-                  </el-form-item>
-                </el-form>
+              <div style="display: flex;justify-content:space-between;padding-bottom: 10px;">
+                <div>
+                  <el-input maxlength="50" @change="updateName" v-model="content.contentName" placeholder="内容的名称(限50字以内)"></el-input>
                 </div>
                 <div>
-                   <simplePaper :data="examPaper" ></simplePaper>
-                 </div>
+                  <el-button type="danger" @click="toReChoose()" >重新选择</el-button>
+                </div>
               </div>
+              <course-exam ref="comExam" :courseId="course.id" :contentId="content.id" @remove="deleteExam" @save="saveExam"></course-exam>
+
            </div>
            <!--作业-->
            <div v-if="content.contentType==60">
@@ -325,7 +257,6 @@
   import chooseCourseFile from '@/components/Course/chooseCourseFile.vue'
   import courseHomework from '@/components/Course/courseHomework.vue'
   import courseExam from '@/components/Course/courseExam.vue'
-  import simplePaper from "@/components/Course/simpleTestPaper.vue";
   import WxEditor from "@/components/Editor/indexCourse.vue";
   import fileUpload from '@/components/FileUpload/index.vue';
   import apiCourse from '../../api/modules/course.js';
@@ -361,14 +292,15 @@
         default:1
       }
     },
-    components:{chooseCourseFile,WxEditor,courseHomework,courseExam,simplePaper,fileUpload,pdfPreview,audioPlayer,videoPlayer},
+    components:{chooseCourseFile,WxEditor,courseHomework,courseExam,fileUpload,pdfPreview,audioPlayer,videoPlayer},
     // inject: [ "informationDetails" ],
     data(){
       return {
         converStatus:4,
-        fileBaseUrl:process.env.VUE_APP_FILE_BASE_URL,
+        fileBaseUrl:this.$xpage.constants.fileBaseUrl,
         curPdfPath:'',
         curCFile:{},//当前课件的内容
+        scormUrl:'',//scormUrl地址
         comTypes:[
            //文件类型,10视频，20音频，30图片， 40 文档，41表图文，50表scrom包,90表其它
            //图文41，连接52，作业60，考试61，评估62
@@ -379,7 +311,8 @@
             {id:'5',type:'link',name:'外部连接',img:'el-icon-link',resType:52},
             {id:'6',type:'exam',name:'考试',img:'el-icon-document-checked',resType:61},
             {id:'7',type:'homework',name:'作业',img:'el-icon-reading',resType:60},
-            {id:'8',type:'assess',name:'评估',img:'el-icon-user',resType:62}
+            {id:'8',type:'assess',name:'评估',img:'el-icon-user',resType:62},
+            {id:'10',type:'scorm',name:'SCORM',img:'el-icon-suitcase',resType: 50},
         ],
         htmlContent:'',
         linkInfo:{
@@ -395,29 +328,6 @@
         },
         homework:{courseId: '', name:'', content:'', file:'', deadTime: '', submitMode: 3},
         homeworkChange:{},
-        exam:{
-          courseId:'',
-          contentId:'',
-          testName:this.course.name,
-          testDuration:30,
-          showAnalysis:false,
-          showAnswer:false,
-          times:1,
-          qnum:0,//试题数量，只是模式是随机生成试题时才会有
-          arrange:0,
-          scoringType:1,
-          passLine:60,
-          randomMode:false,
-          percentScore:true,//默认是百分制
-          paperType:1,//自定义试卷
-          paperId:'',//试卷的id,只有paperType为2的时间才会有值
-          info:'',//考试说明
-          paperContent:'',//试题的json字符串
-        },
-        examChange:{},
-        onlyQuestion:true,
-        examPaperChange:{},
-        examPaper:{items:[]},
         assess:{
           countType:'权重配置',
           countText:'（问题1）*80%+（问题2）*10%+（问题3）*10%',
@@ -433,7 +343,13 @@
 
     },
     created() {
-       //console.log(this.ctype, this.course,'ctype');
+       //console.log(process.env, 'process.env');
+    },
+    mounted(){
+        //this.init();
+        if(process.env.NODE_ENV=='development'){
+          this.fileBaseUrl=process.env.VUE_APP_FILE_BASE_URL;
+        }
     },
     watch:{
         reset(newVal){
@@ -447,6 +363,8 @@
               this.loadPdfFile();
             }else if(newVal.contentType==41){
                this.htmlContent=newVal.content;
+            }else if(newVal.contentType==50){
+               this.loadScormFile();
             }else if(newVal.contentType==52){
               //外部连接
               if(newVal.content!=''){
@@ -461,8 +379,8 @@
               //作业
               this.loadHomeworkInfo();
             }else if(newVal.contentType==61){
-              //考试
-              this.loadExamInfo();
+              //考试,已经移到组件中
+              //this.loadExamInfo();
             }else if(newVal.contentType==62){
               //评估
               this.loadAssessInfo();
@@ -486,15 +404,8 @@
         this.linkInfo.url='';
         this.htmlContent='';
         this.curPdfPath='';
+        this.scormUrl='';
         this.curCFile={};
-        this.exam.contentId='';
-        this.exam.paperContent='';
-        this.exam.info='';
-        this.exam.id='';//一定要重置id
-        this.exam.qnum='';
-        this.exam.paperId='';
-        this.exam.passLine=60;
-        this.examPaper={items:[]};
         this.curriculumData={
           url:'',
           isDrag:true,
@@ -519,6 +430,25 @@
           });
         }
       },
+      loadScormFile(){
+        //对于scorm课件内容，需要再查一下
+        this.scormUrl='';
+        apiCourseFile.detail(this.content.contentRefId).then(rs=>{
+           if(rs.status==200){
+              this.curCFile=rs.result;
+              //this.curPdfPath=rs.result.previewFilePath;
+              this.content.content='scorm';
+              this.scormUrl=process.env.VUE_APP_SCORM_URL+'?r=1&mode=preview&scormId='+this.curCFile.id;//播放的首页
+              console.log(this.scormUrl,'this.scormUrl')
+           }
+        });
+        // let fname=this.content.content;
+        // if(fname && fname.indexOf('.pdf')>-1){
+        //   this.curPdfPath=this.content.content;
+        // }else{
+
+        // }
+      },
       loadHomeworkInfo(){
         apiCourse.getHomework(this.content.id).then(res=>{
            if(res.status==200){
@@ -531,20 +461,6 @@
            }
         })
       },
-      loadExamInfo(){
-          apiCourse.getExam(this.content.id).then(res=>{
-             if(res.status==200){
-                 this.exam=res.result;
-                 this.examPaper=JSON.parse(res.result.paperContent);
-                 this.examChange = deepClone(res.result);
-                 this.examPaperChange = deepClone(JSON.parse(res.result.paperContent));
-             }else if(res.status==404){
-                //没有找到作业信息
-             }else{
-               this.$message.error(res.message);
-             }
-          })
-      },
       loadAssessInfo(){
         if(this.content.content!='' && this.content.content.length>10){
           this.assess=JSON.parse(this.content.content);
@@ -594,31 +510,7 @@
         if(this.content.contentType==60){
           jsonData.homework=this.homework;
         }else if(this.content.contentType==61){
-          //检查内容的完整性
-          if(this.examPaper.items.length==0){
-            this.$message.error("您还没有添加考试的试题");
-            return;
-          }
-          let pass=true;
-          this.examPaper.items.forEach(qitem=>{
-              if(qitem.options.length==0){
-                pass=false;
-              }else{
-                let hasAnswer=qitem.options.some(opt=>{
-                  return opt.answer;
-                });
-                if(!hasAnswer){
-                  pass=false;
-                }
-              }
-          });
-          if(!pass){
-            this.$message.error("试卷试题请填写完整，每个试题必须要有答案");
-            return;
-          }
-
-          this.exam.paperContent=JSON.stringify(this.examPaper);
-          jsonData.exam=this.exam;
+          //考试保存已经独立出去，不在这里处理了
 
         }else if(this.content.contentType==62){
            this.content.content=JSON.stringify(this.assess);
@@ -633,6 +525,47 @@
           }
         })
       },
+      saveExam(examInfo){
+        console.log('保存考试配置');
+        //这里只是61考试
+        this.content.courseId=this.course.id;
+        this.content.sortIndex=this.addOrder;
+        let jsonData={
+          content:this.content,
+          exam:examInfo
+        }
+        apiCourse.saveContent(jsonData).then(rs=>{
+          if(rs.status === 200) {
+             this.$message.success('保存成功！');
+             this.$refs.comExam.reloadExam();
+            //  this.content=rs.result.content;
+             this.$emit('save',rs.result.content);
+          }else{
+             this.$message.error(rs.message)
+          }
+        })
+      },
+      deleteExam(examInfo){
+        if(this.content.id==''){
+          this.content.contentType=0;
+          this.content.content='';
+          return;
+        }
+        let params={
+           id:this.content.id,
+           ctype:this.content.contentType,
+           erasable:this.course.erasable
+         }
+        apiCourse.delContent(params).then(rs=>{
+          if(rs.status === 200) {
+             this.$message.success('删除成功！');
+             this.$emit('remove');
+             this.$refs.comExam.reloadExam();
+          }else{
+             this.$message.error(rs.message)
+          }
+        })
+      },
       delData(id){
         //需要调用外部方法完成
         if(this.content.id==''){
@@ -652,6 +585,7 @@
          }
        })
       },
+
       toReChoose(){
         let $this=this;
         if(this.content.id.length>1){
@@ -681,6 +615,7 @@
           //未初始化会调用失败，所以这里要等vue变化后再调用
           this.$nextTick(function(){
             this.$refs.coursewarePanel.findCourseFile();
+            this.$refs.coursewareScormPanel.findCourseFile();
           })
 
         }
@@ -692,7 +627,9 @@
         // this.content.content.url=cfile.filePath;
         if(this.content.contentType==10 || this.content.contentType==20){
           this.curriculumData.url = cfile.filePath;
-        }else{
+        }else if(this.content.contentType==50){ //scorm课件内容
+          //this.chooseCourseScorm
+        } else{
           if(cfile.previewFilePath){
             this.content.content=cfile.previewFilePath;
           }else{
@@ -708,7 +645,10 @@
           setTimeout(function(){
             $this.loadPdfFile();
           },2000);
-
+        }else if(this.content.contentType==50){
+          setTimeout(function(){
+            $this.loadScormFile();
+          },2000);
         }
       }
     }
diff --git a/src/components/Course/chooseCourseFile.vue b/src/components/Course/chooseCourseFile.vue
index fc9fe2ba..d5252794 100644
--- a/src/components/Course/chooseCourseFile.vue
+++ b/src/components/Course/chooseCourseFile.vue
@@ -44,11 +44,18 @@
       </el-tab-pane>
       <el-tab-pane :label="'上传新'+curComType.name">
         <div v-if="!courseFile.id">
+          <div v-if="resType>20" style="padding-bottom: 10px;">
+            <span style="font-weight: 700;">内容时长（分）：</span>
+            <span>
+              <el-input-number v-model="duration" size="mini" :min="1" :max="100"></el-input-number>
+            </span>
+          </div>
           <el-upload class="upload-demo" :headers="headers" :data="data" drag :action="uploadFileUrl" :on-success="handleUploadSuccess" :before-upload="handleBeforeUpload">
             <i class="el-icon-upload"></i>
             <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
             <div class="el-upload__tip" slot="tip">文件大小限制：{{curComType.maxSizeName}},支持的文件类型：{{curComType.fileTypes.join(',')}}</div>
           </el-upload>
+
         </div>
         <div v-else style="text-align: center;">
            <div style="padding: 20px;">{{courseFile.fileName}} <span style="color: green;">上传成功</span></div>
@@ -68,6 +75,14 @@
         type: String,
         default:'500'
       },
+      orgId:{
+        type: String,
+        default:''
+      },
+      orgName:{
+        type: String,
+        default:''
+      },
       resType:{
         type: Number,
         default:0
@@ -86,11 +101,13 @@
         pageIndex:1,
         count:0,
         keyword: '',
+        duration:1,
         comTypes:[
             {id:'1',type:'video',name:'视频',img:'el-icon-video-camera',resType:10,maxSize:1024,maxSizeName:"1G",fileTypes:['mp4']},
             {id:'2',type:'sound',name:'音频',img:'el-icon-service',resType:20,maxSize:1024,maxSizeName:"1G",fileTypes:['mp3']},
             {id:'3',type:'image',name:'图片',img:'el-icon-picture-outline',resType:30,maxSize:10,maxSizeName:"10M",fileTypes:["png","jpg","gif","bmp"]},
-            {id:'4',type:'doc',name:'文档',img:'el-icon-document',resType:40,maxSize:1024,maxSizeName:"1G",fileTypes:["doc", "xls", "ppt","docx", "xlsx", "pptx","txt","pdf"]}
+            {id:'4',type:'doc',name:'文档',img:'el-icon-document',resType:40,maxSize:1024,maxSizeName:"1G",fileTypes:["doc", "xls", "ppt","docx", "xlsx", "pptx","txt","pdf"]},
+            {id:'5',type:'scorm',name:'SCORM课件',img:'el-icon-suitcase',resType:50,maxSize:1024,maxSizeName:"1G",fileTypes:["zip"]}
         ],
         curComType:{id:'',type:'',name:'',maxSizeName:'',fileTypes:[]},
         findState:1,
@@ -133,6 +150,11 @@
             return false;
           }
         }
+        if(this.resType==50){
+          this.data.dir='scorm';
+        }else{
+          this.data.dir='course';
+        }
         return true;
       },
       // 上传失败
@@ -150,6 +172,9 @@
             fileType:res.result.fileType,
             filePath:res.result.filePath,
             resType:this.resType,
+            orgId:this.orgId,
+            orgName:this.orgName,
+            duration:this.duration,
             remark:'课程中直接上传'
           }
           apiCourseFile.saveUpload(courseWare).then(rs=>{
diff --git a/src/components/Course/chooseCourseScorm.vue b/src/components/Course/chooseCourseScorm.vue
new file mode 100644
index 00000000..6eb648db
--- /dev/null
+++ b/src/components/Course/chooseCourseScorm.vue
@@ -0,0 +1,224 @@
+<template>
+  <!--选择SCORM课件-->
+  <div style="min-height: 500px;">
+    <div style="padding: 5px 5px 10px 5px;display: flex;justify-content: space-between;">
+     <!-- <div>
+        <el-button @click="save" type="primary" size="small">确定</el-button>
+      </div> -->
+    </div>
+    <el-tabs type="border-card" style="min-height: 400px;">
+      <el-tab-pane :label="'选择已有'+curComType.name" >
+          <div style="display: flex;justify-content: flex-start;">
+              <div>
+                <el-input maxlength="50" v-model="keyword" placeholder="名称" size="small"></el-input>
+              </div>
+              <!-- <div><el-input maxlength="50" v-model="params.author" placeholder="上传人" size="small"></el-input></div> -->
+              <div style="padding-left: 10px;">
+                <el-button @click="findCourseFile()" type="primary" >搜索</el-button>
+              </div>
+          </div>
+          <div v-if="findState==2" style="padding-top: 10px;">
+             <el-table style="100%" :data="fileList" border stripe>
+                <el-table-column label="类型" width="60" prop="author"><template slot-scope="scope">{{curComType.name}}</template></el-table-column>
+                <el-table-column label="名称" prop="name"></el-table-column>
+                <el-table-column label="创建" prop="sysCreateBy" width="100"></el-table-column>
+                <el-table-column label="创建时间" prop="sysCreateTime" width="160"></el-table-column>
+                <el-table-column label="选择" width="70" align="center">
+                  <template slot-scope="scope">
+                      <el-button size="mini" @click="chooseCourseFile(scope.row)" type="primary">选择</el-button>
+                  </template>
+                </el-table-column>
+            </el-table>
+          <div style="text-align: center">
+            <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page="pageIndex"
+              :page-sizes="[5, 10,20,50,100]"
+              :page-size="pageSize"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="count">
+              </el-pagination>
+            </div>
+          </div>
+      </el-tab-pane>
+      <el-tab-pane :label="'上传新'+curComType.name">
+        <div v-if="!courseFile.id">
+          <el-upload class="upload-demo" :headers="headers" :data="data" drag :action="uploadFileUrl" :on-success="handleUploadSuccess" :before-upload="handleBeforeUpload">
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+            <div class="el-upload__tip" slot="tip">文件大小限制：{{curComType.maxSizeName}},支持的文件类型：{{curComType.fileTypes.join(',')}}</div>
+          </el-upload>
+        </div>
+        <div v-else style="text-align: center;">
+           <div style="padding: 20px;">{{courseFile.fileName}} <span style="color: green;">上传成功</span></div>
+           <div><el-button @click="chooseCourseFile(courseFile)" type="primary"  size="mini">确定</el-button></div>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+  import { getToken } from "@/utils/token";
+  import apiCourseFile from '../../api/modules/courseFile';
+  export default{
+    props: {
+      minHeight:{
+        type: String,
+        default:'500'
+      },
+      resType:{
+        type: Number,
+        default:0
+      }
+    },
+    data(){
+      return {
+        uploadFileUrl: process.env.VUE_APP_BASE_API + "/xboe/sys/xuploader/file/upload", // 上传的图片服务器地址
+        data:{
+          dir:'course'
+        },
+        headers: {
+          'XBOE-Access-Token': getToken(),
+        },
+        pageSize:10,
+        pageIndex:1,
+        count:0,
+        keyword: '',
+        comTypes:[
+            {id:'1',type:'video',name:'视频',img:'el-icon-video-camera',resType:10,maxSize:1024,maxSizeName:"1G",fileTypes:['mp4']},
+            {id:'2',type:'sound',name:'音频',img:'el-icon-service',resType:20,maxSize:1024,maxSizeName:"1G",fileTypes:['mp3']},
+            {id:'3',type:'image',name:'图片',img:'el-icon-picture-outline',resType:30,maxSize:10,maxSizeName:"10M",fileTypes:["png","jpg","gif","bmp"]},
+            {id:'4',type:'doc',name:'文档',img:'el-icon-document',resType:40,maxSize:1024,maxSizeName:"1G",fileTypes:["doc", "xls", "ppt","docx", "xlsx", "pptx","txt","pdf"]}
+        ],
+        curComType:{id:'',type:'',name:'',maxSizeName:'',fileTypes:[]},
+        findState:1,
+        courseFile:{},
+        fileList:[],
+        radioId:'',
+      }
+    },
+    mounted() {
+      this.courseFile={};
+      let $this=this;
+      this.comTypes.some(ct=>{
+        if(ct.resType==$this.resType){
+          $this.curComType=ct;
+          //this.findCourseFile();
+          return true;
+        }else{
+          return false;
+        }
+      });
+    },
+    methods:{
+      handleBeforeUpload(file) {
+        if(file.name.lastIndexOf(".") ==-1) {
+          this.$message({message:`文件格式不正确!`,type:'error',offset:100})
+          return false;
+        }
+        let fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
+        fileExtension=fileExtension.toLowerCase();
+        // 校检文件类型
+        if(this.curComType.fileTypes.indexOf(fileExtension) == -1){
+            this.$message({message:`文件格式不正确, 请上传正确格式的${this.curComType.name}文件!`,type:'error',offset:100})
+            return false;
+        }
+        // 校检文件大小
+        if(this.curComType.maxSize) {
+          const isLt = file.size / 1024 / 1024 < this.curComType.maxSize;
+          if (!isLt) {
+            this.$message({message:`上传文件大小不能超过 ${this.curComType.maxSizeName} !`,type:'error',offset:100})
+            return false;
+          }
+        }
+        return true;
+      },
+      // 上传失败
+      handleUploadError(err) {
+        this.$message({message:"上传失败, 请重试",type:'error',offset:100});
+      },
+      // 上传成功回调
+      handleUploadSuccess(res, file) {
+        //console.log(res);
+        if(res.status == 200) {
+          //上传到课件库
+          //console.log(res.result);
+          let courseWare={
+            fileName:res.result.displayName,
+            fileType:res.result.fileType,
+            filePath:res.result.filePath,
+            resType:this.resType,
+            remark:'课程中直接上传'
+          }
+          apiCourseFile.saveUpload(courseWare).then(rs=>{
+              if(rs.status==200){
+                this.courseFile=rs.result;
+                this.$message({message:"上传成功",type:'success',offset:100});
+                // this.cware.content.contentRefId=rs.result.id;
+                // this.cware.content.contentName=result.displayName;
+                // this.cware.content.content=result.filePath;
+              }
+          });
+        }else{
+           this.$message({message:"上传失败："+res.message,type:'error',offset:100});
+        }
+
+        //this.$emit("success", res);
+      },
+      // 删除文件
+      handleDelete(index) {
+        this.fileList.splice(index, 1);
+        //注意删除处理
+        //this.$emit("remove", '');
+      },
+      // 获取文件名称
+      getFileName(name) {
+        if (name.lastIndexOf("/") > -1) {
+          return name.slice(name.lastIndexOf("/") + 1).toLowerCase();
+        } else {
+          return "";
+        }
+      },
+      handleSizeChange(val) {
+        this.pageSize = val;
+        this.pageIndex = 1;
+        this.findCourseFile();
+      },
+      handleCurrentChange(val) {
+        this.pageIndex = val;
+        this.findCourseFile();
+      },
+     findCourseFile(){
+        this.findState=2;
+         let data = {
+          name: this.keyword,
+          resOwner1: '',//this.params.resOwner1, //资源归属一级的id
+          resOwner2: '',//this.params.resOwner2, // 资源归属二级的id
+          resOwner3: '',//this.params.resOwner3, // 资源归属三级的id
+          resType: this.resType, //this.params.type,
+          pageSize: this.pageSize,
+          pageIndex: this.pageIndex,
+          self:true,//只是查询自己的
+        }
+        apiCourseFile.pageList(data).then(rs=>{
+          if(rs.status === 200) {
+            this.fileList = rs.result.list;
+            this.count = rs.result.count;
+          }else{
+            this.$message.error(rs.message);
+          }
+        })
+
+      },
+      chooseCourseFile(ccfile){
+        this.$emit('choose', ccfile);
+      }
+    }
+  }
+</script>
+
+<style>
+  
+</style>
diff --git a/src/components/Course/courseExam.vue b/src/components/Course/courseExam.vue
index baa00ae2..c4f5423d 100644
--- a/src/components/Course/courseExam.vue
+++ b/src/components/Course/courseExam.vue
@@ -1,200 +1,366 @@
 <template>
   <div>
-    <div v-if="exam.show==1">
-        <div style="padding: 10px; text-align: center;">
-          <el-button @click="changeExamShow(3)" type="primary" size="small">自定义考试</el-button>
-          <el-button @click="changeExamShow(2)" type="primary" size="small">选择已有考试</el-button>
+    <div v-if="showTab==1">
+        <div style="padding: 10px; text-align: center;margin-top: 20px;">
+          <el-button @click="openCusExam()" type="primary" >自定义考试</el-button>
+          <el-button @click="openChoosePaper()" type="primary">选择已有考试</el-button>
         </div>
     </div>
-    <div v-if="exam.show==2">
+    <div v-if="showTab==2">
         <div  style="display: flex;justify-content: flex-start;">
-          <!--需求原型中没有按知识点选择
-          <div>
-            <el-select v-model="exam.type" style="width: 140px;" clearable placeholder="选择知识点">
-            </el-select>
-          </div>
-          -->
-          <div><el-input maxlength="50" placeholder="名称"></el-input></div>
-          <div><el-input maxlength="50" placeholder="创建人"></el-input></div>
-          <div style="padding-left: 10px;"><el-button type="primary" size="small">搜索已有考试</el-button></div>
+          <div><el-input v-model="usePaper.keyword" maxlength="50" placeholder="名称"></el-input></div>
+          <div style="padding-left: 10px;"><el-button @click="findExamPapers()" type="primary" >查询</el-button></div>
+          <div style="padding-left: 10px;"><el-button @click="changeExamShow(1)" type="danger" >返回</el-button></div>
         </div>
         <div>
-          <div style="text-align: center;padding-top: 10px;">
-            <el-table style="100%" :data="exam.findhas.list" border stripe>
-              <el-table-column label="考试名称" prop="author"><template>考试名称</template></el-table-column>
-              <el-table-column label="创建时间" prop="author">
+          <div style="text-align: center;padding-top: 10px; overflow-y: auto;">
+            <el-table style="100%" height="480" :data="usePaper.list" border stripe>
+              <el-table-column prop="testName" label="试卷"></el-table-column>
+              <el-table-column prop="sysCreateTime" label="创建时间"></el-table-column>
+              <el-table-column prop="sysCreateBy" label="创建人" width="80px" ></el-table-column>
+              <el-table-column label="选择" width="60px">
                 <template slot-scope="scope">
-                  2022-02-03
-                </template>
-              </el-table-column>
-              <el-table-column label="创建人" prop="content">
-                <template>
-                   XXX
-                </template>
-              </el-table-column>
-              <el-table-column label="选择" width="80px">
-                <template slot-scope="scope">
-                    <el-button @click="changeExamShow(9)" type="primary"  size="mini">选择</el-button>
+                    <el-button size="mini" @click="chooseExamPaper(scope.row)" type="primary"  >选择</el-button>
                 </template>
               </el-table-column>
             </el-table>
             <!--分页功能-->
+            <div v-if="usePaper.total >10" style="text-align: center; margin-top:10px">
+              <el-pagination background
+                @current-change="changePaperPage"
+                :current-page="usePaper.pageIndex"
+                :page-sizes="[10, 20, 30, 40]"
+                :page-size="usePaper.pageSize"
+                layout="total,pager"
+                :total="usePaper.total"
+              ></el-pagination>
+            </div>
           </div>
         </div>
     </div>
-    <div v-if="exam.show==3">
-        <div style="display: flex;justify-content: space-between;padding:5px 10px;line-height: 30px; border: 1px solid #e7e7e7;">
-          <div>自定义考试</div>
+    <div v-if="showTab==3">
+        <div style="display: flex;justify-content: space-between;padding:5px 10px;line-height: 30px; border-bottom: 1px solid #e7e7e7;">
+          <div>{{examInfo.paperType==1? '自定义考试':'使用独立考试试卷'}} </div>
           <div>
-            <el-checkbox v-model="exam.onlyQuestion">只显示试题</el-checkbox>
-            <el-button style="margin-left: 10px;" @click="changeExamShow(1)" type="info" size="mini" >重新选择</el-button>
+            <el-checkbox v-model="onlyQuestion">只显示试题</el-checkbox>
+            <el-button :loading="loading" style="margin-left: 10px;" @click="saveExam()" type="primary"  > 保 存 </el-button>
+            <el-button style="margin-left: 10px;" @click="deleteExam()" type="danger"  > 删 除 </el-button>
           </div>
         </div>
         <div style="padding-top: 10px;overflow: auto;">
-          <div v-if="!exam.onlyQuestion">
-          <el-form size="mini" label-width="80px">
+          <div v-if="!onlyQuestion">
+          <el-form size="small" label-width="80px">
+            <!-- 课程内考虑不需要名辽
             <el-form-item label="考试名称">
-              <el-input v-model="exam.info.name" placeholder="请输入名称"></el-input>
+              <el-input v-model="examInfo.testName" placeholder="请输入名称"></el-input>
             </el-form-item>
+            -->
             <el-form-item label="考试时长">
-              <el-col :span="10">
-                <el-input v-model="exam.info.passScore" placeholder="20-120">
+              <el-col :span="8">
+                <el-input size="mini" v-model="examInfo.testDuration" placeholder="20-120">
                   <template slot="append">分钟</template>
                 </el-input>
               </el-col>
-              <el-col :span="14">
+              <el-col :span="12">
                 <el-form-item label="及格线">
-                  <el-input placeholder="20-100">
+                  <el-input size="mini" placeholder="20-100" :maxlength="3" v-model="examInfo.passLine">
                     <template slot="append">%</template>
                   </el-input>
                 </el-form-item>
               </el-col>
             </el-form-item>
-            <el-form-item label="显示">
-              <el-col :span="10">
-                <el-checkbox v-model="exam.info.showJieXi">允许查看解析</el-checkbox>
-              </el-col>
-              <el-col :span="14">
-                <el-checkbox v-model="exam.info.showAnswer">允许查看答案</el-checkbox>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="试题试卷">
-              <el-col :span="10">
-                <el-checkbox v-model="exam.info.randomType">随机试题</el-checkbox>
-              </el-col>
-              <el-col :span="14">
-                <el-checkbox-group v-model="exam.info.qorder">
-                    <el-checkbox :label="1">题目乱序</el-checkbox>
-                    <el-checkbox :label="2">选项乱序</el-checkbox>
-                </el-checkbox-group>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="尝试次数">
-              <el-col :span="10">
-                <el-input placeholder="0代表不限制"></el-input>
-              </el-col>
-              <el-col :span="14">
-                <el-form-item label="评分方式">
-                  <el-radio-group v-model="exam.info.randomType">
+            <el-form-item label="评分方式">
+              <el-col :span="8">
+                  <el-radio-group v-model="examInfo.scoringType">
                       <el-radio :label="1">最高一次</el-radio>
                       <el-radio :label="2">最后一次</el-radio>
                   </el-radio-group>
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="百分制">
+                  <el-checkbox v-model="examInfo.percentScore">实际成绩*100/实际总分</el-checkbox>
                 </el-form-item>
               </el-col>
             </el-form-item>
-          </el-form>
-          </div>
-          <div style="padding: 10px;text-align: center;">
-              <el-button type="primary">导入</el-button>
-              <el-button type="primary">添加</el-button>
-              <el-button @click="changeExamShow(9)" type="primary">提交</el-button>
-          </div>
-          <div>
-              <el-table :data="exam.info.questions" style="100%" border stripe>
-                <el-table-column label="题干" prop="body">
-                  <template>试题11</template>
-                </el-table-column>
-                <el-table-column label="设置得分" prop="score" width="80px">
-                  <template slot-scope="scope">10</template>
-                </el-table-column>
-                <el-table-column label="操作" width="80px">
-                  <template slot-scope="scope">
-                      <el-button icon="el-icon-edit" type="text"  size="mini"></el-button>
-                      <el-button icon="el-icon-close" type="text"  size="mini"></el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-           </div>
-        </div>
-    </div>
-    <div v-if="exam.show==9">
-        <div style="display: flex;justify-content: space-between;padding:5px 10px;line-height: 30px; border: 1px solid #e7e7e7;">
-          <div>考试信息</div><div><el-button @click="changeExamShow(1)" type="info" size="mini" >重新设置考试</el-button> </div>
-        </div>
-        <div style="padding-top: 10px;">
-          <el-form size="mini" label-width="80px">
-            <el-form-item label="考试名称">XXXXXXXXXXXXXXX</el-form-item>
-            <el-form-item label="考试时长">60分钟</el-form-item>
-            <el-form-item label="显示解析">允许查看</el-form-item>
-            <el-form-item label="显示答案">不允许查看</el-form-item>
-            <el-form-item label="随机模式">是</el-form-item>
-            <el-form-item label="尝试次数">不限制</el-form-item>
-            <el-form-item label="试题排列">题目乱序</el-form-item>
-            <el-form-item label="评分方式">最高一次</el-form-item>
-            <el-form-item label="及格线">60%</el-form-item>
-            <el-form-item label="">
-              <el-button  type="primary">编辑试卷</el-button>
-              <el-button @click="exam.paperShow=true" type="primary">预览试卷</el-button>
+            <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>
-          <div style="color: #ff0000;">只限于自定义考试，才会有编辑试卷</div>
+          </div>
+          <div v-if="examInfo.paperType==1">
+             <simplePaper :data="examPaper"></simplePaper>
+           </div>
+           <div v-if="examInfo.paperType==2">
+                <div style="font-size: 20px;padding: 10px;" >试卷： {{usePaper.paperName}}</div>
+            </div>
         </div>
     </div>
-    <el-dialog title="查看试卷" append-to-body :visible.sync="exam.paperShow" width="800px" custom-class="g-dialog">
+    <div v-if="showTab==9">
+        <div style="display: flex;justify-content: space-between;padding:5px 10px;line-height: 30px; border: 1px solid #e7e7e7;">
+          <div>考试信息</div><div> </div>
+        </div>
+        <div style="padding-top: 10px;">
+          <el-form size="small" label-width="80px">
+              <el-form-item label="试卷类型">
+                  {{examInfo.paperType==1? '自定义试卷':'使用考试试卷: '+usePaper.paperName}}
+              </el-form-item>
+              <el-form-item label="考试时长">
+                <el-col :span="6">{{examInfo.passScore}}分钟</el-col>
+                <el-col :span="9">
+                  <el-form-item label="及格线">{{examInfo.passLine}}%</el-form-item>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="评分方式">
+                <el-col :span="6">
+                    <span v-if="examInfo.scoringType==1">最高一次</span>
+                    <span v-if="examInfo.scoringType==2">最后一次</span>
+                </el-col>
+                <el-col :span="10">
+                  <el-form-item label="考试成绩">
+                    <span v-if="examInfo.percentScore">按百分制显示</span>
+                    <span v-else>按实际得分显示</span>
+                  </el-form-item>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="考试说明">{{examInfo.info}}</el-form-item>
+
+            <el-form-item label="">
+              <el-button  type="primary" @click="changeExamShow(3)"> 修 改 </el-button>
+              <el-button  type="danger" @click="deleteExam(3)"> 删 除 </el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+    </div>
+    <el-dialog title="查看试卷" append-to-body :visible.sync="paperShow" width="800px" custom-class="g-dialog">
           <div>
             <img :src="`${webBaseUrl}/temp/exampaper.png`">
           </div>
           <span slot="footer" class="dialog-footer">
-            <el-button @click="exam.paperShow= false">关闭</el-button>
+            <el-button @click="paperShow= false">关闭</el-button>
           </span>
     </el-dialog>
   </div>
 </template>
-
 <script>
+  import simplePaper from "@/components/Course/simpleTestPaper.vue";
+  import apiCourse from '../../api/modules/course.js';
+  import apiExamPaper from '../../api/modules/paper.js';
+  import { deepClone } from "../../utils";
   export default{
+    components:{simplePaper},
+    props:{
+      courseId:{
+        type: String,
+        default:'',
+      },
+      contentId:{
+        type: String,
+        default:'',
+      }
+    },
     data(){
       return {
-        exam:{
-          show:1,
-          paperShow:false,
-          customerShow:false,
-          has:false,
-          onlyQuestion:false,
-          info:{
-            name:'',
-            limitTimes:1,
-            passScore:60,
-            showJieXi:true,
-            showAnswer:false,
-            randomType:1,
-            qorder:[],
-            examTime:60,
-            questions:[
-              {body:'试题1',score:10},
-              {body:'试题2',score:10}
-            ],
-
-          },
-          findhas:{
-            list:[{},{}]
-          }
+        loading:false,
+        examChange:{}, //用于保存，检查是否改变
+        showTab:0, //显示哪个
+        onlyQuestion:false, //只显示问题
+        paperShow:false, //查看试卷
+        examPaper:{items:[]}, //试题列表的对象
+        examInfo:{
+          id:'',
+          name:'',
+          testDuration:30,
+          testName:'',
+          courseId:this.courseId,
+          contentId:'',
+          paperType:1,//默认是自定义
+          paperId:'',
+          arrange:0,
+          qnum:0,
+          times:1,
+          passScore:60,
+          showAnswer:false,
+          showAnalysis:false,
+          randomType:1,
+          scoringType:1,
+          passLine:60,
+          randomMode:false,
+          percentScore:true,//默认是百分制
+          paperContent:'',
+          info:''
         },
+        usePaper:{ //使用考试试卷
+          pageIndex:1,
+          pageSize:10,
+          total:0,
+          list:[],
+          keyword:'',
+          paperId:'',//选择的试卷的id
+          paperName:'',//选择的试卷的名称
+          paperJson:{items:[]},
+        }
+      }
+    },
+    mounted() {
+      if(this.contentId){
+        this.reloadExam();
+      }else{
+        this.showTab=1;
+      }
+    },
+    watch:{
+      contentId(newVal,oldVal){
+        if(newVal!=oldVal){
+          this.reloadExam();
+        }
       }
     },
     methods:{
+      reloadExam(){
+        console.log('contentId='+this.contentId);
+        this.examPaper={items:[]};
+        this.examInfo.id='';
+        this.examInfo.paperType=1;
+        this.examInfo.paperId='';
+        this.examInfo.paperContent="{}";
+        if(this.contentId){
+          apiCourse.getExam(this.contentId).then(res=>{
+             if(res.status==200){
+                 this.examInfo=res.result;
+                 if(res.result.paperType==1){
+                   this.examInfo.paperContent=res.result.paperContent;
+                   this.examPaper=JSON.parse(res.result.paperContent);
+                 }else{
+                   apiExamPaper.detail(this.examInfo.paperId).then(rs=>{
+                     if(rs.status==200){
+                         this.usePaper.paperId=rs.result.id;
+                         this.usePaper.paperName=rs.result.testName;
+                         this.usePaper.counts=rs.result.counts;
+                         //this.usePaper.paperJson= rs.result.paperContent;
+                     }
+                   })
+                 }
+                 this.showTab=9;
+                 //this.examChange = deepClone(this.exam);
+             }else if(res.status==404){
+
+             }else{
+               this.$message.error(res.message);
+             }
+          })
+        }else{
+          this.showTab=1;//选择状态
+        }
+      },
+      saveExam(){//保存
+        //检查是否完整
+        if(this.examInfo.paperType==1){
+            if(this.examPaper.items.length==0){
+              this.$message.error("您还没有添加考试的试题");
+              return;
+            }
+            let pass=true;
+            this.examPaper.items.forEach(qitem=>{
+                if(qitem.options.length==0){
+                  pass=false;
+                }else{
+                  let hasAnswer=qitem.options.some(opt=>{
+                    return opt.answer;
+                  });
+                  if(!hasAnswer){
+                    pass=false;
+                  }
+                }
+            });
+            if(!pass){
+              this.$message.error("试卷试题请填写完整，每个试题必须要有答案");
+              return;
+            }
+            this.examInfo.paperContent=JSON.stringify(this.examPaper);
+        }else{
+           if(this.examInfo.paperId==''){
+             this.$message.error("您还未选择任何试卷，请先选择试卷");
+             return;
+           }
+        }
+
+        this.$emit("save",this.examInfo);
+      },
+      deleteExam(){ //删除
+        this.$confirm('您确认要删除此考试内容吗？', '删除提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$emit("remove",this.examInfo);
+        }).catch(() => {
+
+        });
+
+      },
       changeExamShow(idx){
-        this.exam.show=idx;
+        this.showTab=idx;
+      },
+      openCusExam(){ //自定义考试
+        this.showTab=3;
+        this.examInfo.paperType=1;
+        this.examInfo.paperId='';
+        this.usePaper.pageIndex=1;
+        this.usePaper.keyword="";
+      },
+      openChoosePaper(){
+        this.showTab=2;
+        this.examInfo.paperType=2; //选择试卷
+        this.examInfo.paperId='';
+      },
+      findExamPapers(){ //查询已有的考试试卷
+        this.usePaper.pageIndex=1;
+        this.loadExamPapers();
+      },
+      loadExamPapers(){
+        let pars={
+          pageIndex:this.usePaper.pageIndex,
+          pageSize:this.usePaper.pageSize,
+          keyword:this.usePaper.keyword
+        }
+        apiExamPaper.querylist(pars).then(rs=>{
+            if(rs.status==200){
+              this.usePaper.list=rs.result.list;
+              this.usePaper.total=rs.result.count;
+            }else{
+              this.$message.error('查询可用试卷失败');
+            }
+        })
+      },
+      changePaperPage(pindex){
+         this.usePaper.pageIndex=pindex;
+         this.loadExamPapers();
+      },
+      chooseExamPaper(epaper){ //选择试卷后
+        if(epaper.counts==0){
+          this.$message.error('此试卷无试题内容，请重新选择');
+          return;
+        }
+        this.examInfo.paperType=2;// 选择已有试卷
+        this.examInfo.paperId=epaper.id;// 选择已有试卷
+        this.usePaper.paperId=epaper.id;
+        this.usePaper.paperName=epaper.testName;
+        //this.usePaper.paperJson= epaper.paperContent;
+        this.loadExamPaper();
+        this.changeExamShow(3);
+      },
+      loadExamPaper(){
+        if(this.examInfo.paperType!=2){
+          return;
+        }
+        apiExamPaper.detail(this.examInfo.paperId).then(rs=>{
+          if(rs.status==200){
+              this.usePaper.paperId=rs.result.id;
+              this.usePaper.paperName=rs.result.testName;
+              this.usePaper.counts=rs.result.counts;
+              //this.usePaper.paperJson= rs.result.paperContent;
+          }
+        })
       }
     }
   }
diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue
index 9dee4cda..f5f3f242 100644
--- a/src/components/Course/courseForm.vue
+++ b/src/components/Course/courseForm.vue
@@ -259,7 +259,7 @@
               <el-input maxlength="50" v-model="courseInfo.forUsers" show-word-limit placeholder="目标人群(限50字以内)"></el-input>
             </el-form-item>
             <el-form-item label="受众"><!--:disabled="item.disabled"-->
-              <el-select value-key="id" style="width: 100%;" v-model="courseCrowds" filterable multiple  placeholder="请选择">
+              <el-select value-key="id" style="width: 100%;" v-model="courseCrowds" filterable multiple :clearable="false" @remove-tag="removeCrowd"  placeholder="请选择">
                   <el-option v-for="item in userGroupList" :key="item.id"  :label="item.name" :value="item"></el-option>
               </el-select>
             </el-form-item>
@@ -567,6 +567,7 @@ export default {
       this.orgName=orgInfo.name;
       this.orgKid=orgInfo.kid; //kid已不存在
       this.courseInfo.orgId=orgInfo.id;
+      this.courseInfo.orgName=orgInfo.name;
       this.$refs.refChooseOrg.dlgShow = false;
     },
     getTeacherList(res) {
@@ -729,6 +730,7 @@ export default {
           apiUserBasic.getOrgInfo(this.courseInfo.orgId).then(rs=>{
             if(rs.status==200){
                 this.orgName=rs.result.name;
+                this.courseInfo.orgName=rs.result.name;
                 //this.orgKid=rs.result.kid;
                 this.orgNamePath=rs.result.namePath;
              }
@@ -849,6 +851,7 @@ export default {
                  apiUserBasic.getOrgInfo(ors.result.id).then(rrs=>{
                     if(rrs.status==200){
                       $this.orgName=rrs.result.name;
+                      this.courseInfo.orgName=rrs.result.name;
                       //$this.orgKid=rrs.result.kid;
                       $this.orgNamePath=rrs.result.namePath;
                     }else{
@@ -875,6 +878,7 @@ export default {
             apiUserBasic.getOrgInfo(this.courseInfo.orgId).then(rs=>{
               if(rs.status==200){
                   $this.orgName=rs.result.name;
+                  $this.courseInfo.orgName=rs.result.name;
                   //$this.orgKid=rs.result.kid;
                   $this.orgNamePath=rs.result.namePath;
                }else{
diff --git a/src/components/Course/exam.vue b/src/components/Course/exam.vue
index 99cf596e..dc1f10b4 100644
--- a/src/components/Course/exam.vue
+++ b/src/components/Course/exam.vue
@@ -56,13 +56,17 @@
               <div style="font-size: 20px;"><span style="font-size: 40upx;" :class="{'redText':timerValue<5}">{{timerValue}}</span> 分钟</div>
             </div>
             <div class="qitem">
-                <div class="qitem-info">【{{getTypeName(curItem.type)}}】{{curItem.content}}</div>
+                <div class="qitem-info">
+                  <div>【{{getTypeName(curItem.type)}}】{{curItem.content}} </div>
+                  <div class="qimg" v-if="curItem.images"><img class="qimg-fit" :src="imageBaseUrl+curItem.images"/></div>
+                </div>
                 <div v-for="(opt,optIdx) in curItem.options" :key="optIdx">
                     <div class="qitem-opts">
                         <div class="qitem-opt" :class="{check:opt.checked}" @click="chooseOption(opt)">
                             {{toLetter(optIdx+1)}}.{{opt.content}}
                             <i class="el-icon-check" v-if="opt.checked" name="checkbox-mark" color="#00aa00"></i>
                         </div>
+                        <div class="qimg" v-if="opt.images"><img class="qimg-fit" :src="imageBaseUrl+opt.images"/></div>
                     </div>
                 </div>
             </div>
@@ -80,16 +84,22 @@
       <div style="text-align: left;" class="upaper">
         <!--答卷信息-->
         <div v-for="(ditem,didx) in detailItems" :key="didx" class="upaper-item">
-          <div class="upaper-item-q">{{didx +1}}.【{{getTypeName(ditem.type)}}】{{ditem.content}}</div>
+          <div class="upaper-item-q">
+            <div>{{didx +1}}.【{{getTypeName(ditem.type)}}】{{ditem.content}}</div>
+            <div class="qimg" v-if="ditem.images"><img class="qimg-fit" :src="imageBaseUrl+ditem.images"/></div>
+          </div>
           <div class="upaper-item-opts" style="padding-left: 20px;">
-              <div v-for="(opt,optIdx) in ditem.options" :key="optIdx" class="upaper-item-opt" :class="{'upaper-item-opt-user':ditem.userOptIdxs.indexOf(optIdx)>-1}">
-                  <div>
-                      <div>{{toLetter(optIdx+1)}}, {{opt.content}}</div>
-                  </div>
-                  <div>
-                    <span v-if="ditem.userOptIdxs.indexOf(optIdx)>-1 && ditem.correctOptIdxs.indexOf(optIdx)>-1" style="color: #00aa00;font-size: 25px; ">√</span>
-                    <span v-if="ditem.userOptIdxs.indexOf(optIdx)>-1 && ditem.correctOptIdxs.indexOf(optIdx)==-1" style="color: #ff0000;font-size: 25px; ">×</span>
+              <div v-for="(opt,optIdx) in ditem.options" :key="optIdx">
+                  <div class="upaper-item-opt" :class="{'upaper-item-opt-user':ditem.userOptIdxs.indexOf(optIdx)>-1}">
+                    <div>
+                        <div>{{toLetter(optIdx+1)}}, {{opt.content}}</div>
+                    </div>
+                    <div>
+                      <span v-if="ditem.userOptIdxs.indexOf(optIdx)>-1 && ditem.correctOptIdxs.indexOf(optIdx)>-1" style="color: #00aa00;font-size: 25px; ">√</span>
+                      <span v-if="ditem.userOptIdxs.indexOf(optIdx)>-1 && ditem.correctOptIdxs.indexOf(optIdx)==-1" style="color: #ff0000;font-size: 25px; ">×</span>
+                    </div>
                   </div>
+                  <div class="qimg" v-if="opt.images"><img class="qimg-fit" :src="imageBaseUrl+opt.images"/></div>
               </div>
           </div>
           <div class="upaper-item-answer" style="display: flex;">
@@ -119,6 +129,7 @@
 <script>
 import apiStudy from '@/api/modules/courseStudy.js';
 import apiCourse from '@/api/modules/course.js';
+import apiExamPaper from '@/api/modules/paper.js';
 import {formatDate,formatSeconds} from '@/utils/datetime.js';
 import {testType,correctJudgment,numberToLetter} from '@/utils/tools.js';
 export default {
@@ -146,6 +157,7 @@ export default {
   data() {
     return {
       viewTest:[],
+      imageBaseUrl:process.env.VUE_APP_FILE_BASE_URL,
       correctJudgment:correctJudgment,
       toLetter:numberToLetter,
       formatSeconds:formatSeconds,
@@ -168,7 +180,11 @@ export default {
       records:[] ,//考试记录
       allowSubmit:true,//是否允许考试，尝试次数达到后不能再考试，暂时未使用
       detailShow:false,
-      detailItems:[]
+      detailItems:[],
+      examPaper:{
+        json:{},//试题的json格式
+        items:[],//试题内容
+      }
     };
   },
   mounted() {
@@ -217,8 +233,6 @@ export default {
                       this.total=paper.items.length;
                       this.paper =paper;
                       //console.log(this.paper);
-
-
                       this.viewTest =paper.items;
                }
                if(!this.showTest && this.showRecord){
@@ -260,30 +274,99 @@ export default {
         })
       }
     },
-    startTest(){
-      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);
+    //独立考试的试题转化为课内考试的试题
+    convertToItems(questions){
+        let qitems=[];
+        questions.forEach(item=>{
+             let q={
+                id:item.id,
+                type:item.type==1? 101:item.type==2? 102:103,
+                score:item.defaultScore,
+                checked:false,
+                userAnswer:'',
+                optShow:true,
+                content:item.title,
+                images:item.images,
+                options:[]
+             }
+             if(item.type==3){
+               q.options.push({
+                 id:item.id+'1',
+                 images:'',
+                 content:"正确",
+                 answer:item.answer=='true'? true:false,
+                 checked:false
+               });
+               q.options.push({
+                 id:item.id+'2',
+                 images:'',
+                 content:"错误",
+                 answer:item.answer=='true'? false:true,
+                 checked:false
+               })
+             }else{
+               item.optionList.forEach(opt=>{
+                  q.options.push({
+                    id:opt.id,
+                    images:opt.images,
+                    content:opt.content,
+                    answer:opt.isAnswer,
+                    checked:false
+                  })
+               });
+             }
 
-      this.curItem=paper.items[this.curIndex];
-      this.startTime=new Date();//记录开始时间
-      this.timerValue=this.info.testDuration;
-      this.timer=setInterval(this.changeTimer,60000);
-      this.testStart=true;
+             if(q.type==102){
+               q.userAnswer=[];
+             }
+             qitems.push(q);
+        });
+        console.log(qitems,'qitems')
+        return qitems;
+    },
+    startTest(){
+      if(this.info.paperType==2){
+        apiExamPaper.getPaperContent(this.info.paperId).then(rs=>{
+          if(rs.status=200){
+             this.examPaper.json=JSON.parse(rs.result);
+             //console.log(this.examPaper.json,'this.examPaper.json');
+             let qitems=this.convertToItems(this.examPaper.json);
+            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){
@@ -328,7 +411,7 @@ export default {
     present(){ //提交前处理
     	let $this=this;
     	let score=this.countTest();
-
+      console.log('score='+score);
     	if(this.noAnswers.length>0){
          this.$confirm('还有未答试题,您确定要提交吗?', '提示', {
                   confirmButtonText: '确定',
@@ -349,6 +432,7 @@ export default {
         let totalScore=0;
         this.paper.items.forEach(item => {
           item.score=parseInt(item.score);
+          //console.log(item.score,'item.score');
           totalScore+=item.score;//加到总分中
           if(item.type != 102){
             item.userAnswer='';
@@ -366,6 +450,7 @@ export default {
             });
           }
         });
+        //console.log(totalScore,'totalScore');
         let scoreNum = 0;//用户得分
         let noAnswers=[];//是否都已答
         this.paper.items.forEach((item,idx) => {
@@ -456,6 +541,8 @@ export default {
                   }
             });
             this.testStart = false;
+            //获取最新的成绩
+            this.loadStudyItemId();
             this.$emit('submit',this.lastScore);//考试提交回调处理
          } else {
             this.$message.error(res.message);
@@ -570,4 +657,14 @@ export default {
     margin-bottom: 10px;
   }
 }
+.qimg{
+  padding-left: 30px;
+  width:100%;
+  text-align: left;
+  .qimg-fit{
+    width:100%;
+
+    object-fit:scale-down
+  }
+}
 </style>
diff --git a/src/components/Course/weikeContent.vue b/src/components/Course/weikeContent.vue
index 67b8447a..b3010947 100644
--- a/src/components/Course/weikeContent.vue
+++ b/src/components/Course/weikeContent.vue
@@ -24,15 +24,26 @@
             </div>
             <!--内容区-->
             <div style="margin-top: 10px;">
-                <div v-if="cware.content.contentType<41 && !cware.findShow">
+                <div v-if="cware.content.contentType<51 && !cware.findShow">
                   <div v-if="cware.content.contentRefId==''">
-                        <div style="display: flex;justify-content: center;padding-top: 50px;">
-                          <div>
-                              <file-upload :fileType="getFileTypes(cware.content.contentType)" dir="course" :isShowTip="false" :showList="true" size="small" :text="'上传新'+getType(cware.content.contentType)" @success="handleUploadSuccess" @remove="handleRemoveSuccess"></file-upload>
-                          </div>
+                        <div style="padding-top: 0px;">
+                          <!-- <div> -->
+                            <choose-course-file :orgId="course.orgId" :orgName="course.orgName" ref="coursewarePanel" :resType="cware.content.contentType" @choose="chooseFile"></choose-course-file>
+
+                             <!-- <file-upload
+                                :fileType="getFileTypes(cware.content.contentType)"
+                                dir="course"
+                                :isShowTip="false"
+                                :showList="true"
+                                size="small"
+                                :text="'上传新'+getType(cware.content.contentType)"
+                                @success="handleUploadSuccess"
+                                @remove="handleRemoveSuccess">
+                              </file-upload> -->
+                         <!-- </div>
                           <div style="margin-left: 10px;">
                               <el-button  type="primary" size="small" @click="toFindCWare()" >选择已有{{getType(cware.content.contentType)}}</el-button>
-                          </div>
+                          </div> -->
                         </div>
                   </div>
                   <div v-else>
@@ -116,6 +127,9 @@
                                 <pdfPreview v-if="cware.content.contentType == 40 && cware.content.pdfPath!=''" :filePath="fileBaseUrl+cware.content.pdfPath"></pdfPreview>
                               </div>
                           </div>
+                          <div v-if="cware.content.contentType==50" style="text-align: center;">
+                               <iframe v-if="scormUrl" :src="scormUrl" frameborder="0" border="0px" style="width:100%;height:400px;border:0px"></iframe>
+                          </div>
                       </div>
 
                   </div>
@@ -263,8 +277,8 @@
     <el-tab-pane label="考试" name="exam">
       <div v-if="exam.show==1">
           <div style="padding: 10px; text-align: center;">
-            <el-button @click="changeExamShow(3)" type="primary" >自定义考试</el-button>
-            <!-- <el-button @click="changeExamShow(2)" type="primary" size="small">选择已有考试</el-button> -->
+            <el-button @click="openCusExam()" type="primary" >自定义考试</el-button>
+            <el-button @click="openChoosePaper()" type="primary">选择已有考试</el-button>
           </div>
       </div>
       <div v-if="exam.show==2">
@@ -275,37 +289,39 @@
               </el-select>
             </div>
             -->
-            <div><el-input maxlength="50" placeholder="名称"></el-input></div>
-            <div><el-input maxlength="50" placeholder="创建人"></el-input></div>
-            <div style="padding-left: 10px;"><el-button type="primary" >搜索已有考试</el-button></div>
+            <div><el-input v-model="usePaper.keyword" maxlength="50" placeholder="名称"></el-input></div>
+            <div style="padding-left: 10px;"><el-button @click="findExamPapers()" type="primary" >查询</el-button></div>
+            <div style="padding-left: 10px;"><el-button @click="changeExamShow(1)" type="danger" >返回</el-button></div>
           </div>
           <div>
-            <div style="text-align: center;padding-top: 10px;">
-              <el-table style="100%" :data="hasCWare.list" border stripe>
-                <el-table-column label="考试名称" prop="author"><template>考试名称</template></el-table-column>
-                <el-table-column label="创建时间" prop="author">
+            <div style="text-align: center;padding-top: 10px; overflow-y: auto;">
+              <el-table style="100%" height="480" :data="usePaper.list" border stripe>
+                <el-table-column prop="testName" label="考试名称"></el-table-column>
+                <el-table-column prop="sysCreateTime" label="创建时间"></el-table-column>
+                <el-table-column prop="sysCreateBy" label="创建人" width="80px" ></el-table-column>
+                <el-table-column label="选择" width="60px">
                   <template slot-scope="scope">
-                    2022-02-03
-                  </template>
-                </el-table-column>
-                <el-table-column label="创建人" prop="content">
-                  <template>
-                     XXX
-                  </template>
-                </el-table-column>
-                <el-table-column label="选择" width="80px">
-                  <template slot-scope="scope">
-                      <el-button @click="changeExamShow(9)" type="primary"  >选择</el-button>
+                      <el-button size="mini" @click="chooseExamPaper(scope.row)" type="primary"  >选择</el-button>
                   </template>
                 </el-table-column>
               </el-table>
               <!--分页功能-->
+              <div v-if="usePaper.total >10" style="text-align: center; margin-top:10px">
+                <el-pagination background
+                  @current-change="changePaperPage"
+                  :current-page="usePaper.pageIndex"
+                  :page-sizes="[10, 20, 30, 40]"
+                  :page-size="usePaper.pageSize"
+                  layout="total,pager"
+                  :total="usePaper.total"
+                ></el-pagination>
+              </div>
             </div>
           </div>
       </div>
       <div v-if="exam.show==3">
           <div style="display: flex;justify-content: space-between;padding:5px 10px;line-height: 30px; border-bottom: 1px solid #e7e7e7;">
-            <div>自定义考试</div>
+            <div>{{exam.paperType==1? '自定义考试':'使用独立考试试卷'}} </div>
             <div>
               <el-checkbox v-model="exam.onlyQuestion">只显示试题</el-checkbox>
               <el-button :loading="loading" style="margin-left: 10px;" @click="saveContent(3)" type="primary"  > 保 存 </el-button>
@@ -387,9 +403,12 @@
               </el-form-item>
             </el-form>
             </div>
-            <div>
+            <div v-if="exam.info.paperType==1">
                <simplePaper :data="exam.paperJson"></simplePaper>
              </div>
+             <div v-if="exam.info.paperType==2">
+                  <div style="font-size: 20px;padding: 10px;" >试卷： {{usePaper.paperName}}</div>
+              </div>
           </div>
       </div>
       <div v-if="exam.show==9">
@@ -398,7 +417,11 @@
           </div>
           <div style="padding-top: 10px;">
             <el-form size="small" label-width="80px">
-              <el-form-item label="考试时长">
+                <el-form-item label="试卷类型">
+                    {{exam.info.paperType==1? '自定义试卷':'使用考试试卷: '+usePaper.paperName}}
+
+                </el-form-item>
+                <el-form-item label="考试时长">
                   <el-col :span="6">{{exam.info.passScore}}分钟</el-col>
                   <!-- <el-col :span="9">
                     <el-form-item label="尝试次数">{{exam.info.times}}</el-form-item>
@@ -497,7 +520,6 @@
           <el-button type="primary" v-if="!assess.content.id || assess.content.id==''" @click="saveContent(4)">保 存</el-button>
           <el-button type="danger" @click="deleteContent(4)">删 除</el-button>
         </div>
-
       </div>
     </el-tab-pane>
   </el-tabs>
@@ -521,17 +543,19 @@
   </div>
 </template>
 <script>
+  import chooseCourseFile from '@/components/Course/chooseCourseFile.vue'
   import WxEditor from "@/components/Editor/indexCourse.vue";
   import simplePaper from "@/components/Course/simpleTestPaper.vue";
   import FileUpload from '@/components/FileUpload/index.vue';
   import pdfPreview from "@/components/PdfPreview/index.vue";
   import apiCourse from '../../api/modules/course.js';
   import apiCourseFile from '../../api/modules/courseFile.js';
+  import apiExamPaper from '../../api/modules/paper.js';
   import audioPlayer from '@/components/AudioPlayer/index.vue';
   import {getType} from '../../utils/tools.js';
   import { deepClone } from "../../utils";
   export default{
-    components:{WxEditor,simplePaper,FileUpload,pdfPreview,audioPlayer},
+    components:{WxEditor,simplePaper,FileUpload,pdfPreview,audioPlayer,chooseCourseFile},
     props: {
       contents:{
         type:Array,
@@ -566,6 +590,7 @@
         curCFile:{},//当前课件的内容
         fileBaseUrl:this.$xpage.constants.fileBaseUrl,
         imageShowUrl: '',
+        scormUrl:'',//scorm课件对应的url地址
         activeName: 'courseware',
         getType: getType,
         cwareTypes:[
@@ -575,7 +600,7 @@
           {id:'2',type:'sound',name:'音频',img:'el-icon-service',resType: 20},
           {id:'3',type:'html',name:'图文',img:'el-icon-document-copy',resType: 41},
           {id:'4',type:'doc',name:'文档',img:'el-icon-document',resType: 40},
-          // {id:'5',type:'scorm',name:'SCORM(Q2)',img:'el-icon-suitcase',resType: 50},
+          {id:'5',type:'scorm',name:'SCORM',img:'el-icon-suitcase',resType: 50},
           {id:'6',type:'link',name:'外部连接',img:'el-icon-link', resType: 52}
         ],
         cwareChange:{
@@ -648,7 +673,7 @@
           paperJson:{items:[]},
           paperShow:false,
           customerShow:false,
-          onlyQuestion:true,
+          onlyQuestion:false,
           info:{
             courseId:'',
             contentId:'',
@@ -670,13 +695,23 @@
 
           }
         },
+        usePaper:{ //使用考试试卷
+          pageIndex:1,
+          pageSize:10,
+          total:0,
+          list:[],
+          keyword:'',
+          paperId:'',//选择的试卷的id
+          paperName:'',//选择的试卷的名称
+          paperJson:{items:[]},
+        },
         exam:{
           show:1,
           content:{id:'',contentType:61,sortIndex:3},
           paperJson:{items:[]},
           paperShow:false,
           customerShow:false,
-          onlyQuestion:true,
+          onlyQuestion:false,
           info:{
             courseId:'',
             contentId:'',
@@ -696,7 +731,6 @@
             paperId:'',//试卷的id,只有paperType为2的时间才会有值
             info:'',//考试说明
             paperContent:'',//试题的json字符串
-
           }
         },
         assess:{
@@ -718,6 +752,9 @@
     },
     mounted(){
         //this.init();
+        if(process.env.NODE_ENV=='development'){
+          this.fileBaseUrl=process.env.VUE_APP_FILE_BASE_URL;
+        }
     },
     watch:{
       reset(newVal){
@@ -731,6 +768,7 @@
   methods:{
       init(){
         this.activeName='courseware';
+        this.scormUrl='';//scorm的路径
         this.curCFile={},//当前课件的内容
         this.cware.content={id:'',contentType:0,sortIndex:1,contentRefId:'',pdfPath:''};
         this.cware.show=1;
@@ -759,6 +797,12 @@
                if(con.contentType==40){
                  //console.log('加载pdf文件内容');
                  $this.loadPdfFile();
+               }else if(con.contentType==50){
+                  //console.log('加载pdf文件内容');
+                 if(!this.scormUrl){
+                   $this.loadScormFile();
+                 }
+
                }
                if(con.contentType==52){
                  if(con.content.startsWith('\{')){
@@ -815,6 +859,22 @@
           });
         }
       },
+      loadScormFile(){
+        //对于scorm课件内容，需要再查一下
+        //this.scormUrl='';
+        if(this.scormUrl){
+          return;
+        }
+        apiCourseFile.detail(this.cware.content.contentRefId).then(rs=>{
+           if(rs.status==200){
+              this.curCFile=rs.result;
+              //this.curPdfPath=rs.result.previewFilePath;
+              this.cware.content.content='scorm';
+              this.scormUrl=process.env.VUE_APP_SCORM_URL+'?r=1&mode=preview&scormId='+this.curCFile.id;//播放的首页
+              //console.log(this.scormUrl,'this.scormUrl')
+           }
+        });
+      },
       loadHomeworkInfo(){
         apiCourse.getHomework(this.homework.content.id).then(res=>{
            if(res.status==200){
@@ -834,7 +894,18 @@
           apiCourse.getExam(this.exam.content.id).then(res=>{
              if(res.status==200){
                  this.exam.info=res.result;
-                 this.exam.paperJson=JSON.parse(res.result.paperContent);
+                 if(res.result.paperType==1){
+                   this.exam.paperJson=JSON.parse(res.result.paperContent);
+                 }else{
+                   apiExamPaper.detail(this.exam.info.paperId).then(rs=>{
+                     if(rs.status==200){
+                         this.usePaper.paperId=rs.result.id;
+                         this.usePaper.paperName=rs.result.testName;
+                         this.usePaper.counts=rs.result.counts;
+                         //this.usePaper.paperJson= rs.result.paperContent;
+                     }
+                   })
+                 }
                  this.exam.show=9;
                  this.examChange = deepClone(this.exam);
              }else if(res.status==404){
@@ -920,6 +991,7 @@
       resetContent(index){
         if(index==1){
           this.cware.content.id='';
+          this.scormUrl='';
           this.cware.content.contentRefId='';
           this.cware.content.contentName='';
           this.cware.content.content='';
@@ -978,29 +1050,38 @@
           this.homeworkChange = deepClone(this.homework)
         }else if(index==3){
           postData.content=this.exam.content;
-          //检查是不是所有的试题都有了答案
-          if(this.exam.paperJson.items.length==0){
-            this.$message.error("您还没有添加考试的试题");
-            return;
-          }
-          let pass=true;
-          this.exam.paperJson.items.forEach(qitem=>{
-              if(qitem.options.length==0){
-                pass=false;
-              }else{
-                let hasAnswer=qitem.options.some(opt=>{
-                  return opt.answer;
-                });
-                if(!hasAnswer){
+          //console.log(this.exam,'this.exam');
+          if(this.exam.info.paperType==2){
+            if(!this.exam.info.paperId){
+               this.$message.error("您还未选择任何试卷");
+               return;
+            }
+          }else{
+            //检查是不是所有的试题都有了答案
+            if(this.exam.paperJson.items.length==0){
+              this.$message.error("您还没有添加考试的试题");
+              return;
+            }
+            let pass=true;
+            this.exam.paperJson.items.forEach(qitem=>{
+                if(qitem.options.length==0){
                   pass=false;
+                }else{
+                  let hasAnswer=qitem.options.some(opt=>{
+                    return opt.answer;
+                  });
+                  if(!hasAnswer){
+                    pass=false;
+                  }
                 }
-              }
-          });
-          if(!pass){
-            this.$message.error("试卷试题请填写完整，每个试题必须要有答案");
-            return;
+            });
+            if(!pass){
+              this.$message.error("试卷试题请填写完整，每个试题必须要有答案");
+              this.loading=false;
+              return;
+            }
+            this.exam.info.paperContent=JSON.stringify(this.exam.paperJson);
           }
-          this.exam.info.paperContent=JSON.stringify(this.exam.paperJson);
           postData.exam=this.exam.info;
           this.examChange = deepClone(this.exam);
         }else if(index==4){
@@ -1084,6 +1165,36 @@
             }
           })
       },
+      chooseFile(cfile){
+        this.cware.content.contentRefId=cfile.id;
+        //如果是非pdf文档 ，这里需要使用cfile.id再去获取
+        this.cware.content.contentName=cfile.name;
+        if(this.cware.content.resType === 10 || this.cware.content.resType ==20) {
+           this.cware.curriculumData.url = cfile.filePath;
+        }else if(this.cware.content.resType === 50){
+
+        }else{
+          if(cfile.previewFilePath){
+            this.cware.curriculumData.url = cfile.previewFilePath;
+          }else{
+            this.cware.curriculumData.url = cfile.filePath;
+          }
+        }
+
+        this.cware.content.duration=cfile.duration;//时长
+        this.saveContent(1);
+
+        let $this=this;
+        if(this.cware.content.contentType==40){
+          setTimeout(function(){
+            $this.loadPdfFile();
+          },1000);
+        }else if(this.cware.content.contentType==50){
+          setTimeout(function(){
+            $this.loadScormFile();
+          },500);
+        }
+      },
       getCoursewareList() {
         //  name:查询的名称的关键字
         //  self:true/false,默认是true,是否只查询自己上传的课件
@@ -1169,15 +1280,75 @@
     changeHomeworkShow(idx){
         this.homework.show=idx;
     },
-    changeExamShow(idx){
-
-        this.exam.show=idx;
-    },
     assessmentHandle(){
         this.assess.show=2;
+    },
+    changeExamShow(idx){
+      this.exam.show=idx;
+    },
+    openCusExam(){ //自定义考试
+      this.exam.show=3;
+      this.exam.info.paperType=1;
+      this.exam.info.paperId='';
+      this.usePaper.pageIndex=1;
+      this.usePaper.keyword="";
+    },
+    openChoosePaper(){
+      this.exam.show=2;
+      this.exam.info.paperType=2; //选择试卷
+      this.exam.info.paperId='';
+    },
+    findExamPapers(){ //查询已有的考试试卷
+      this.usePaper.pageIndex=1;
+      this.loadExamPapers();
+    },
+    loadExamPapers(){
+      let pars={
+        pageIndex:this.usePaper.pageIndex,
+        pageSize:this.usePaper.pageSize,
+        keyword:this.usePaper.keyword
       }
+      apiExamPaper.querylist(pars).then(rs=>{
+          if(rs.status==200){
+            this.usePaper.list=rs.result.list;
+            this.usePaper.total=rs.result.count;
+          }else{
+            this.$message.error('查询可用试卷失败');
+          }
+      })
+    },
+    changePaperPage(pindex){
+       this.usePaper.pageIndex=pindex;
+       this.loadExamPapers();
+    },
+    chooseExamPaper(epaper){ //选择试卷后
+      if(epaper.counts==0){
+        this.$message.error('此试卷无试题内容，请重新选择');
+        return;
+      }
+      this.exam.info.paperType=2;// 选择已有试卷
+      this.exam.info.paperId=epaper.id;// 选择已有试卷
+      this.usePaper.paperId=epaper.id;
+      this.usePaper.paperName=epaper.testName;
+      //this.usePaper.paperJson= epaper.paperContent;
+      this.loadExamPaper();
+      this.changeExamShow(3);
+    },
+    loadExamPaper(){
+      if(this.exam.info.paperType!=2){
+        return;
+      }
+      apiExamPaper.detail(this.exam.info.paperId).then(rs=>{
+        if(rs.status==200){
+            this.usePaper.paperId=rs.result.id;
+            this.usePaper.paperName=rs.result.testName;
+            this.usePaper.counts=rs.result.counts;
+            //this.usePaper.paperJson= rs.result.paperContent;
+        }
+      })
     }
   }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/Exam/EditPaper.vue b/src/components/Exam/EditPaper.vue
new file mode 100644
index 00000000..023c20d9
--- /dev/null
+++ b/src/components/Exam/EditPaper.vue
@@ -0,0 +1,333 @@
+<template>
+  <!--编辑试卷-->
+  <div >
+    <el-dialog title="修改试卷" :visible.sync="editShow" width="800px" >
+      <!--试卷的标题，可以编辑-->
+      <div class="paper-title">
+         <div>{{title}}</div>
+      </div>
+      <!--查询项-->
+      <!-- <div>
+        <el-form :inline="true" size="mini">
+          <el-form-item>
+            <el-select clearable v-model="qpaper.qtype" placeholder="请选择题型" class="search-width-120">
+              <el-option label="单选题" :value="1"></el-option>
+              <el-option label="多选题" :value="2"></el-option>
+              <el-option label="判断题" :value="3"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item><el-input class="search-width-120" v-model="qpaper.keyword" clearable placeholder="题干"></el-input></el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="selectQuery()">搜索</el-button>
+            <el-button type="primary" @click="resetQuery()">重置</el-button>
+          </el-form-item>
+          <el-form-item></el-form-item>
+        </el-form>
+      </div> -->
+      <div style="display: flex;justify-content: space-between;line-height:30px;">
+        <div>
+          <el-checkbox v-model="optionShow">显示选项</el-checkbox>
+        </div>
+        <div>
+          双击题干或选项编辑
+        </div>
+        <div style="text-align: right;font-size: 14px;">
+          本卷共
+          <span class="bigred">{{paperLength}}</span>
+          题, 总分
+          <span class="bigred">{{totalScore}}</span>
+          分
+        </div>
+      </div>
+      <!--试卷内容-->
+      <div class="paper-box">
+        <div v-if="qitems.length>0" v-for="(item,idx) in qitems" :key="idx">
+          <div v-if="item.type < 900">
+            <div style="display: flex;justify-content: space-between;background-color: #dcf1ff;padding: 5px;">
+              <div>
+                <!-- <span style="padding-right: 5px;" v-if="paperQEdit"><el-checkbox v-model="item.checked"  @change="checkedChange"></el-checkbox></span> -->
+                <span v-if="item.type == 1">单选题</span>
+                <span v-if="item.type == 2">多选题</span>
+                <span v-if="item.type == 3">判断题</span>
+                <span style="padding-left: 5px;">难度[{{item.difficulty == 1? '简单' : item.difficulty == 2? '中等': '困难'}}]</span>
+                <!-- <span style="padding-left: 5px;">知识点[{{item.analysis}}]</span> -->
+              </div>
+              <div>
+                <el-input @input="changeInput($event)" v-model="item.defaultScore" style="width: 120px;"   size="mini"  placeholder="分数" @blur="paperCalculation()">
+                  <template slot="append">分</template>
+                </el-input>
+                <el-button v-if="paperQEdit" icon="el-icon-delete" @click="checkDelete(idx)" size="mini"></el-button>
+              </div>
+            </div>
+            <div style="padding: 15px;">
+              <div style="font-weight: 700px;padding-bottom: 10px;cursor: pointer;" @dblclick="showCellEdit(idx,-1)">
+                  <div> {{ item.title }}</div>
+                  <div v-if="item.images" class="qimg"><img class="qimg-fit" :src="imageBaseUrl + item.images" alt=""> </div>
+              </div>
+              <div v-if="optionShow">
+                <div v-if="item.type == 3">
+                    <div class="opt" @click="setJudgeAnswer(item,'true')" :class="{optanswer:item.answer=='true'}"><span class="optanswer-span">{{item.answer=='true'? '√':''}}  </span> 1. 正确 </div>
+                    <div class="opt" @click="setJudgeAnswer(item,'false')" :class="{optanswer:item.answer=='false'}"><span class="optanswer-span">{{item.answer=='false'? '√':''}}  </span> 2. 错误 </div>
+                </div>
+                <div v-else v-for="(opt, optIdx) in item.optionList" :key="optIdx" class="opt" @click="setOptAnswer(item,opt)" @dblclick="showCellEdit(idx,optIdx)">
+                  <div :class="{optanswer:opt.isAnswer}"><span class="optanswer-span">{{opt.isAnswer? '√':''}}  </span> {{ optIdx + 1 }}, {{ opt.content }}</div>
+                  <div v-if="opt.images" class="qimg"><img class="qimg-fit" :src="imageBaseUrl + opt.images" alt=""> </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div v-if="item.type > 900">
+            <div style="height: 25px;">
+              <span style="float: right;margin-top: -5px;cursor: pointer;" class="el-icon-delete" @click="checkDelete(idx)"></span>
+              <div style="border-bottom: 2px dotted #000000;margin-right: 50px;"></div>
+            </div>
+          </div>
+        </div>
+      </div>
+    <span slot="footer" class="dialog-footer">
+       <el-button :loading="loading" type="primary" @click="save()"> 保 存 </el-button>
+       <el-button @click="cancel()"> 取消 </el-button>
+    </span>
+    </el-dialog>
+    <el-dialog :title="cellData.title" :visible.sync="cellData.show" width="500px">
+        <div>
+          <div><el-input type="textarea" rows="2" v-model="cellData.text"></el-input> </div>
+          <div style="height: 160px;padding-top: 10px;">
+            <imgupload :value="cellData.img" @success="cellImageSuccss" @remove="cellImageRemove"></imgupload>
+          </div>
+        </div>
+        <span slot="footer" class="dialog-footer">
+           <el-button :loading="loading" type="primary" @click="cellConfirm()"> 确定 </el-button>
+           <el-button @click="cellCancel()"> 取消 </el-button>
+        </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import apiPaper from '@/api/modules/paper.js';
+  import imgupload from '@/components/ImageUpload/single.vue';
+  import apiExamTask from '@/api/modules/examTask.js';
+  import examQuestionApi from "@/api/modules/question";
+  import {numberToLetter, deepCopy} from '../../utils/tools.js';
+  export default {
+    name: 'comEditPaper',
+    components:{imgupload},
+    props:{
+       id:{
+         type:String,
+         default:''
+       }
+    },
+    data() {
+      return {
+        editShow:false,
+        loading:false,
+        paperId:'',
+        imageBaseUrl:process.env.VUE_APP_FILE_BASE_URL,
+        title:'',
+        optionShow:true,
+        qpaper:{qtype:'',keyword:''},
+        paperLength:0,
+        totalScore:0,
+        qitems:[],
+        tempItems:[],
+        paper: {
+          id:'',
+          testName: '',
+          remark: '',
+          difficulty: ''
+        },
+        paperQEdit:false,
+        cellData:{
+           show:false,
+           title:'修改题干',
+           item:null,
+           optIndex:-1,
+           text:'',
+           img:''
+        }
+      }
+    },
+    mounted() {
+        if(this.id){
+          this.paperId=this.id;
+        }
+    },
+    methods:{
+        loadTestPaper(){
+          if(this.paperId){
+            this.editShow=true;
+            this.loading=true;
+            apiPaper.detail(this.paperId).then(res=>{
+              if(res.status === 200) {
+                  this.paper=res.result;
+                  //转化试题
+                  this.qitems=JSON.parse(res.result.paperContent);
+                  //console.log(this.qitems,this.qitems)
+                  this.tempItems=this.qitems;
+                  this.paperCalculation();
+              } else {
+                  this.$message.error(res.message);
+              }
+              this.loading=false;
+            })
+          }
+        },
+        show(paperId){
+          this.paperId=paperId;
+          this.editShow=true;
+          this.loadTestPaper();
+        },
+        selectQuery(){
+            this.qitems=this.tempItems;
+            if(this.qpaper.qtype == '' && this.qpaper.keyword == '') {
+              this.$forceUpdate();
+              return
+            }
+            // let data = deepCopy(this.paperData);
+            if(this.qpaper.qtype) {
+              this.qitems=this.qitems.filter(item=>{
+                if(item.type === this.qpaper.qtype){
+                  return true;
+                }else{
+                  return false;
+                }
+              })
+            }
+            if(this.qpaper.keyword) {
+                this.qitems = this.qitems.filter(item => {
+                  return item.title.toLowerCase().indexOf(this.qpaper.keyword.toLowerCase()) > -1;
+                });
+            }
+            //this.paper.data = data;
+            this.$forceUpdate();
+        },
+        resetQuery(){
+          this.qpaper.qtype='';
+          this.qpaper.keyword='';
+          this.qitems=this.tempItems;
+        },
+        checkedChange(){
+          this.$forceUpdate();
+        },
+        changeInput(e){
+          this.$forceUpdate();
+        },
+        setJudgeAnswer(item,flag){
+           item.answer=flag;
+        },
+        setOptAnswer(item,opt){
+          if(item.type!=2){//单选的情况，先清空
+            item.optionList.forEach(op=>{
+              op.isAnswer=false;
+            })
+          }
+          if(opt.isAnswer){
+             opt.isAnswer=false;
+          }else{
+             opt.isAnswer=true;
+          }
+        },
+        paperCalculation() {
+          this.totalScore=0;
+          this.paperLength=0;
+          this.qitems.forEach(item=>{
+                if(item.type < 900) {
+                  this.paperLength++;
+                  this.totalScore += Number(item.defaultScore);
+                }
+              })
+        },
+        save(){
+            this.loading=true;
+            this.paper.paperContent=JSON.stringify(this.qitems);
+            apiPaper.update(this.paper).then((res)=>{
+                if(res.status === 200) {
+                  this.$message.success('保存成功！')
+                  this.editShow=false;
+                } else {
+                  this.$message.error(res.message);
+                }
+                this.loading=false;
+            })
+        },
+        cancel(){
+            this.editShow=false;
+        },
+        showCellEdit(itemIdx,optIdx){
+            this.cellData.item=this.qitems[itemIdx];
+            this.cellData.optIndex=optIdx;
+            this.cellData.img='';
+            if(optIdx==-1){
+               this.cellData.text=this.cellData.item.title;
+               this.cellData.img=this.cellData.item.images;
+               this.cellData.title="修改题干";
+            }else{
+               this.cellData.text=this.cellData.item.optionList[this.cellData.optIndex].content;
+               this.cellData.img=this.cellData.item.optionList[this.cellData.optIndex].images;
+               this.cellData.title="修改选项";
+            }
+            //console.log(this.cellData,'this.cellData');
+            this.cellData.show=true;
+        },
+        cellConfirm(){
+            if(this.cellData.optIndex==-1){
+               this.cellData.item.title=this.cellData.text;
+               this.cellData.item.images=this.cellData.img;
+            }else{
+               this.cellData.item.optionList[this.cellData.optIndex].content=this.cellData.text;
+               this.cellData.item.optionList[this.cellData.optIndex].images=this.cellData.img;
+            }
+            this.cellData.show=false;
+        },
+        cellCancel(){
+          this.cellData.show=false;
+        },
+        cellImageSuccss(res){
+          //console.log(res,'res');
+          this.cellData.img=res.result.filePath;
+        },
+        cellImageRemove(){
+          this.cellData.img='';
+        }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+
+  .paper-title{
+      text-align: center;
+      font-size: 18px;
+  }
+  .paper-box{
+     max-height: 500px;
+     overflow-y: auto;
+  }
+  .bigred {
+    color: red;
+    font-size: 20px;
+  }
+  .opt{
+    padding-top:10px;cursor: pointer;
+  }
+  .optanswer{
+    color: green;
+    background-color: #fffaf7;
+  }
+  .optanswer-span{
+    color: green;
+    display: inline-block;
+    width: 20px;
+  }
+
+  .qimg{
+    padding-left: 30px;
+    max-width: 200px;
+    .qimg-fit{
+      width:100%;
+      object-fit:scale-down
+    }
+  }
+</style>
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 59822244..a84bbd49 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -46,6 +46,10 @@ export default {
   props: {
     // 值
     value: [String, Object, Array],
+    beforeMsg:{
+      type: String,
+      default:''
+    },
     showList: {
       type: Boolean,
       default: false
@@ -75,10 +79,14 @@ export default {
       type: Number,
       default: 1024,
     },
+    scorm:{
+      type:String,
+      default:''
+    },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
       type: Array,
-      default: () => ["doc", "xls", "ppt","docx", "xlsx", "pptx","png","txt", "pdf","jpg","gif","bmp","mp4","mp3"],
+      default: () => ["doc", "xls", "ppt","docx", "xlsx", "pptx","png","txt", "pdf","jpg","gif","bmp","mp4","mp3","zip"],
     },
     // 是否显示提示
     isShowTip: {
@@ -131,6 +139,10 @@ export default {
   methods: {
     // 上传前校检格式和大小
     handleBeforeUpload(file) {
+      if(this.beforeMsg){
+        this.$message({message:this.beforeMsg,type:'error',offset:100})
+        return false;
+      }
       // 校检文件类型
       if (this.fileType) {
         let fileExtension = "";
@@ -148,6 +160,13 @@ export default {
           //this.$message.error(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
           return false;
         }
+
+        //console.log(this.scorm,fileExtension,'upload');
+        if(this.scorm && this.scorm==fileExtension){
+           this.data.dir="scorm";
+        }
+        //console.log(this.data,'this.data');
+
       }
       // 校检文件大小
       if (this.fileSize) {
@@ -158,6 +177,7 @@ export default {
           return false;
         }
       }
+
       if(this.loading) {
         this.isLoading = true;
       }
@@ -200,7 +220,7 @@ export default {
     }
   },
   created() {
-   
+
     this.fileList = this.list;
   },
 };
@@ -215,14 +235,14 @@ export default {
   line-height: 2;
   margin-bottom: 10px;
   position: relative;
- 
+
 }
 .upload-file-list .ele-upload-list__item-content {
   display: flex;
   justify-content: space-between;
   align-items: center;
   color: inherit;
- 
+
 }
 .ele-upload-list__item-content-action .el-link {
   margin-right: 10px;
diff --git a/src/components/HomePage/homePage.vue b/src/components/HomePage/homePage.vue
index 672aa133..67988eaf 100644
--- a/src/components/HomePage/homePage.vue
+++ b/src/components/HomePage/homePage.vue
@@ -22,6 +22,7 @@
                       <!-- <div style="float:right"> -->
                        <router-link v-if="pageId == userInfo.aid" to="/user/Setting"><span class="content-one-info pointer" style="line-height: 30px;">个人设置</span></router-link>
                       <span v-if="pageId == userInfo.aid"   style="margin-left:10px;line-height: 30px;" class="content-one-info" ><router-link to="/uc/study/courses" class="pointer" style="color:#0060FF;">个人中心</router-link></span>
+                      <span @click="dialogVisible = true" v-if="teaechswich"  style="margin-left:10px;line-height: 30px;" class="content-one-info">教师简介</span>
                       <span class="content-one-info"  v-if="pageId != userInfo.aid && !isFollowHas" @click="toFollow()">关注TA</span>
                       <span class="Followed"  @click="cancelFollow()" v-if="isFollowHas">已关注</span>
                       <el-button type="text" round  class="btn-user"  >  <router-link :to="'/home/'+pageId+'/leaving'">{{pageId == userInfo.aid ? '留言板':'去留言'}}<i class="el-icon-arrow-right"></i> </router-link> </el-button>
@@ -65,7 +66,7 @@
            <div class="learning-border" ></div>
            <div class="learning-info" style="margin-left:22px">
              <div class="learning-qus">{{pageId == userInfo.aid? '我的U币（累计）':'TA的U币（累计）'}}</div>
-             <div class="learning-an"><span>{{statData.uvalue}}</span></div>
+             <div class="learning-an"><span>{{statData.uvalue < 0 ? 0 : statData.uvalue}}</span></div>
           </div>
 		  <!--
           <div class="learning-info" v-if="userInfo.aid == pageId">
@@ -74,25 +75,58 @@
 		  -->
         </div>
       </div>
+      <el-dialog  title="教师信息"   :visible.sync="dialogVisible"  width="42%"   class="teardiabox">
+        <div class="teachphoto">
+          <h6>教师职业照</h6>
+          <img :src="tearchUrl" alt="">
+        </div>
+        <div class="teachphoto">
+           <h6>教师经历</h6>
+           {{ teachtext.workExperience }}
+        </div>
+        <div class="teachphoto" style="height:70px">
+          <h6>擅长课程</h6>
+          <div>
+            {{ teachtext.courses }}
+          </div>
+
+        </div>
+        <div class="teachphoto" style="height:70px">
+          <h6>专长</h6>
+          <div v-for="(item,idx) in workname" :key="idx" class="teachexcel">
+            {{ item }}
+          </div>
+
+
+        </div>
+      </el-dialog>
     </div>
   </template>
 
   <script>
   import {userAvatarText,cutFullName} from "@/utils/tools.js";
-    import { mapGetters } from 'vuex'
+    import { mapGetters,mapActions } from 'vuex'
+    import apiTeach from '@/api/modules/teacher.js';
     import apiStart from '@/api/phase2/stat.js';
     import apiFollow from "@/api/phase2/userfollow.js"
     import apiUser from "@/api/system/user.js";
+    import apiBoeTeahcer from "@/api/boe/teacher.js"
     export default {
       name: 'UcHeader',
       computed:{
-        ...mapGetters(['curIdentity','identity','userInfo']),
+        ...mapGetters(['curIdentity','identity','sysTypeMap','userInfo']),
               avatarText(){
                   return userAvatarText(this.userInfo.name);
               }
           },
       data(){
         return {
+          workname:[],
+          childData:[],
+          sysTypeListtear:[],
+          teachtext:{},
+          dialogVisible: false,
+          teaechswich:false,
           fileBaseUrl:process.env.VUE_APP_FILE_BASE_URL,
           statData:{
             evalue: 0,//经验值
@@ -103,6 +137,7 @@
             totalStudyDays:0, //累计学习天数
             uvalue:0 //U币数量
           },
+          tearchUrl:'',
           orgInfo:'',
           sex:'',
           pageId:'',
@@ -119,7 +154,6 @@
         }
       },
       mounted() {
-        
         this.pageId = this.$xpage.getHomeId(this.$route);
         this.sex = this.userInfo.sex;
         // 判断路由是进入的学员默认页面就重置setCurIdentity
@@ -127,14 +161,70 @@
           this.setCurIdentity(1);
         }
         this.orgInfo=cutFullName(this.userInfo.departFullName,1);
-
+        this.getSysTypeTree().then(rs => {
+        this.sysTypeListtear = rs;
+      });
         this.loadUserStat();
         if(this.pageId !== this.userInfo.aid) {
           this.followHas();
         }
-       
+       this.Teacherprofile();
+       this.Teacherinfo();
       },
+
       methods:{
+        ...mapActions({
+            getResOwnerTree: 'resOwner/getResOwnerTree',
+            loadResOwners: 'resOwner/loadResOwners',
+            getSysTypeTree: 'sysType/getSysTypeTree',
+            loadSysTypes: 'sysType/loadSysTypes'
+        }),
+        Teacherinfo(){
+          apiTeach.detailTeacher(this.userInfo.aid).then(res =>{
+            this.teachtext.workExperience = res.result.workExperience;
+            this.teachtext.courses = res.result.courses;
+            this.tearchUrl = this.fileBaseUrl + res.result.photo;
+
+            apiBoeTeahcer.simpleInfo(this.userInfo.sysId).then(sinfo=>{
+               if(sinfo.status=='200'){
+                    if(sinfo.result.courses){
+                      this.teachtext.courses = sinfo.result.courses;
+                    }
+                    if(sinfo.result.work){
+                      this.teachtext.workExperience = sinfo.result.work;
+                    }
+                    if(sinfo.result.photo){
+                      this.teachtext.photo = sinfo.result.photo;
+                      this.tearchUrl = this.fileBaseUrl + sinfo.result.photo;
+                    }
+               }
+            })
+
+            this.teachtext.expertise = res.result.expertise.split( ',' );
+            //console.log(this.teachtext);
+            this.sysTypeListtear.forEach(nm =>{
+                nm.children.forEach(lk =>{
+                  this.childData.push(lk);
+                })
+              });
+              this.teachtext.expertise.forEach(item =>{
+              this.childData.forEach(it =>{
+                if(item == it.id){
+                  console.log(item)
+                  this.workname.push(it.name);
+
+
+                }
+
+              })
+            })
+          })
+        },
+        Teacherprofile(){
+          apiTeach.has(this.userInfo.aid).then(res =>{
+            this.teaechswich = res.result.isTeacher;
+          })
+        },
         cancelFollow() {
           apiFollow.remove(this.pageId).then(res=>{
             if(res.status == 200) {
@@ -200,6 +290,52 @@
   </script>
 
 <style lang="scss" scoped>
+  ::v-deep .el-dialog__body{
+    padding: 30px 50px  !important;
+  }
+  .teardiabox{
+    padding: 20px 30px;
+  }
+  .teachexcel{
+    padding: 5px 10px;
+    margin-right: 10px;
+    border: 1px solid #588afc;
+    border-radius: 20px;
+    color: #588afc;
+    float: left;
+  }
+  .teachphoto{
+    margin-top: 20px;
+    h6{
+      margin: 0;
+      font-size: 18px;
+      color: #000;
+      padding-bottom: 20px;
+    }
+    img{
+      width: 200px;
+      height: 200px;
+    }
+  }
+  .teachbox{
+    span{
+      line-height: 60px;
+      margin-left: 10px;
+      font-size: 24px;
+      font-weight: 500;
+      color: #000;
+    }
+  }
+  .tearch-img{
+    float: left;
+    width: 80px;
+    height: 80px;
+    img{
+      width: 100%;
+      height: 100%;
+      border-radius: 50%;
+    }
+  }
   .level{
     float: left;
     width: 57px;
diff --git a/src/components/ImageUpload/single.vue b/src/components/ImageUpload/single.vue
new file mode 100644
index 00000000..9f5c693b
--- /dev/null
+++ b/src/components/ImageUpload/single.vue
@@ -0,0 +1,188 @@
+<template>
+  <div class="component-upload-image">
+    <el-upload
+      :action="uploadImgUrl"
+      list-type="picture-card"
+      :on-success="handleUploadSuccess"
+      :before-upload="handleBeforeUpload"
+      :on-error="handleUploadError"
+      name="file"
+      :data="data"
+      :show-file-list="false"
+      :headers="headers"
+      style="display: inline-block; vertical-align: top;">
+      <div v-if="!imageUrl">
+          <div class="image-slot">
+            <i class="el-icon-plus" />
+          </div>
+      </div>
+      <div v-else class="image">
+        <el-image :src="imageUrl" :style="`width:148px;height:148px;`" fit="fill"/>
+        <div class="mask">
+          <div class="actions">
+            <span title="预览" @click.stop="dialogVisible = true">
+              <i class="el-icon-zoom-in" />
+            </span>
+            <span title="移除" @click.stop="removeImage">
+              <i class="el-icon-delete" />
+            </span>
+          </div>
+        </div>
+      </div>
+    </el-upload>
+    <el-dialog :visible.sync="dialogVisible" title="预览" width="800" append-to-body>
+      <img :src="imageUrl" style="display: block; max-width: 100%; margin: 0 auto;">
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getToken } from "@/utils/token";
+export default {
+  data() {
+    return {
+      dialogVisible: false,
+      uploadImgUrl: process.env.VUE_APP_BASE_API + "/xboe/sys/xuploader/file/upload", // 上传的图片服务器地址
+      fileBaseUrl:process.env.VUE_APP_FILE_BASE_URL,
+      imageUrl:'',
+      headers: {
+        'XBOE-Access-Token': getToken(),
+      },
+      data:{
+        dir:this.dir
+      }
+    };
+  },
+  props: {
+    text:{
+      type:String,
+      default:'上传图片'
+    },
+    dir:{
+      type:String,
+      default:''
+    },
+    value: {
+      type: String,
+      default: "",
+    },
+  },
+  mounted() {
+    if(this.value){
+      if(this.value.startsWith('http')){
+        this.imageUrl=this.value;
+      }else{
+        this.imageUrl=this.fileBaseUrl+this.value;
+      }
+    }else{
+      this.imageUrl='';
+    }
+    //console.log(this.imageUrl,'this.imageUrl');
+  },
+  watch:{
+    value(newVal,oldVal){
+       //console.log(newVal,'newVal');
+       if(newVal){
+         if(newVal.startsWith('http')){
+           this.imageUrl=newVal;
+         }else{
+           this.imageUrl=this.fileBaseUrl+newVal;
+         }
+       }else{
+         this.imageUrl='';
+       }
+       //console.log(this.imageUrl,'this.imageUrl');
+    },
+    immediate: true
+  },
+  methods: {
+    removeImage() {
+      this.imageUrl="";
+      this.$emit("remove",this.value);
+    },
+    handleUploadSuccess(res) {
+      this.imageUrl=res.result.httpPath;
+      this.$emit("success", res);
+      this.loading.close();
+    },
+    handleBeforeUpload() {
+      this.loading = this.$loading({
+        lock: true,
+        text: "上传中",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+    },
+    handleUploadError() {
+      this.$message({
+        type: "error",
+        message: "上传失败",
+      });
+      this.loading.close();
+    },
+  }
+};
+</script>
+
+<style scoped lang="scss">
+  .image-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .image-uploader .el-upload--picture-card{
+    width: 200px;
+    background-color: #fbfdff;
+    border: 1px dashed #c0ccda;
+    border-radius: 6px;
+    box-sizing: border-box;
+    width: 148px;
+    height: 148px;
+    cursor: pointer;
+    line-height: 146px;
+    vertical-align: top;
+  }
+  .image-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .image-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    text-align: center;
+    margin-top: 50px;
+    display: block;
+  }
+  .icon-text{
+    font-size: 14px;
+    display: block;
+    height: 30px;
+    line-height: 35px;
+  }
+  .avatar {
+    width: 250px;
+    height: 178px;
+    display: block;
+  }
+  .image-slot{
+    width: 148px;
+    height: 148px;
+    line-height: 148px;
+  }
+.image {
+  position: relative;
+  .mask {
+    opacity: 0;
+    position: absolute;
+    top: 0;
+    width: 100%;
+    height: 148px;
+    line-height: 148px;
+    background-color: rgba(0, 0, 0, 0.5);
+    transition: all 0.3s;
+  }
+  &:hover .mask {
+    opacity: 1;
+  }
+}
+</style>
diff --git a/src/components/Portal/course/couresinteract.vue b/src/components/Portal/course/couresinteract.vue
new file mode 100644
index 00000000..f56ce58f
--- /dev/null
+++ b/src/components/Portal/course/couresinteract.vue
@@ -0,0 +1,709 @@
+<template>
+  <div class="interact-bar ranking-interactBar">
+   <div>
+    <el-tooltip effect="light" content="评分" placement="top" :visible-arrow="false" popper-class="text-tooltip">
+          <svg-icon style="margin-right: 0px;font-size: 18px;" icon-class="pingfen"></svg-icon>
+    </el-tooltip>
+    <span class="interact-bar-value"> {{ toScore(data.score) }}分 </span>
+   </div>
+   <div>
+      <el-tooltip effect="light" content="学习人数" placement="top" :visible-arrow="false" popper-class="text-tooltip">
+      <svg-icon style="margin-right: 0px;font-size: 18px;" icon-class="xuexirenshu"></svg-icon>
+    </el-tooltip>
+   <span class="interact-bar-value"> {{ data.studys }} </span>
+   </div>
+    <div  :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: 18px;" icon-class="dianzan"></svg-icon>
+        </el-tooltip>
+        <span class="interact-bar-value"> {{ data.praises>0? data.praises:0}}</span>
+      </div>
+
+      <div  :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="font-size: 18px;margin-right: 0;" icon-class="xihuan"></svg-icon>
+        </el-tooltip>
+        <span class="interact-bar-value"> {{ data.favorites>0? data.favorites:0}}</span>
+      </div>
+
+
+
+
+  </div>
+</template>
+
+<script>
+  import { toScore }  from '@/utils/tools.js';
+  import apiPraises from '@/api/modules/praises.js'
+  import apiShares from '@/api/modules/shares.js'
+  import apiFavorites from '@/api/modules/favorites.js'
+  import apiUser from '@/api/system/user.js'
+  import apiMessage from '@/api/system/message.js'
+  import { mapGetters } from 'vuex';
+  import { formatUserNumber } from '@/utils/tools.js';
+export default {
+  props: {
+    data:{
+      type:Object,
+      default(){
+        return{
+            id:'',
+            answers:0,
+            favorites:0,
+            comments:0,
+            shares:0,
+            praises:0,
+            views:0,
+          }
+      }
+    },
+    size:{
+      type:Number,
+      default:14
+    },
+    nodeWidth:{
+      type:String,
+      default:'40px'
+    },
+    readonly:{
+      type:Boolean,
+      default:false
+    },
+    align:{
+      type:String,
+      default:'right'
+    },
+    answers:{
+      type:Boolean,
+      default:false
+    },
+    clickAnswer:{
+      type:Boolean,
+      default:false
+    },
+    comments:{
+      type:Boolean,
+      default:true
+    },
+    favorites:{
+      type:Boolean,
+      default:true
+    },
+    courseExclusive:{
+      type:Boolean,
+      default:false
+    },
+    shares:{
+      type:Boolean,
+      default:true
+    },
+    couseViews:{
+      type:Boolean,
+      default:false
+    },
+    praises:{
+      type:Boolean,
+      default:true
+    },
+    views:{
+      type:Boolean,
+      default:true
+    },
+    type:{
+      type:Number,
+      default:0
+    },
+    theme:{
+      type:Number,
+      default:1
+    },
+    unicom:{
+      type:Boolean,
+      default:false
+    },
+    pageType:{
+      type:Number,
+      default:0
+    },
+    pageParams:{
+      type:String,
+      default:''
+    }
+  },
+  data(){
+    return {
+      toScore,
+      formatNum:formatUserNumber,
+      msgPageType:0,
+      loading:false,
+      isPraise:false,
+      isFavorite:false,
+      shareShow:false,
+      shareUsers:[],
+      shareInfo:{
+        name:'',
+        load:false,
+        list:[]
+      }
+    }
+  },
+
+  computed:{
+      ...mapGetters(['userInfo','praisesUnicom','favoritesUnicom']),
+
+    showAlign(){
+      if(this.align=='left'){
+        return 'flex-start';
+      }else if(this.align=='right'){
+        return 'flex-end';
+      }
+    }
+  },
+  watch:{
+    praisesUnicom(newVal){
+      this.isPraise = newVal;
+    },
+    favoritesUnicom(newVal){
+      this.isFavorite = newVal;
+    },
+    data(newVal,oldVal){
+      if(newVal && newVal.id!=''){
+         this.checkHas();
+      }
+    }
+  },
+  created(){
+  },
+  mounted() {
+    if(this.data && this.data.id && !this.readonly){
+       this.checkHas();
+    }
+
+    if(this.pageType==0){
+      this.msgPageType=this.type;
+    }else{
+      this.msgPageType=this.pageType;
+    }
+
+
+  },
+  methods:{
+    addAnswers() {
+      this.$emit('addAnswers');
+    },
+    messageSave(refId,title,sendName,acceptName,acceptId,typeText){
+        // let typeText
+        // if(type=='share'){
+        //   typeText='分享给我'
+        // }
+        // if(type=='favorite'){
+        //   typeText='收藏了我发布的'
+        // }
+        // if(type=='praise'){
+        //   typeText='点赞了我的'
+        // }
+        let content;
+        let conType;
+        if(this.type==1){
+          content='课程';
+          conType = this.data.type;
+        }
+        if(this.type==2){
+          content='文章'
+        }
+        if(this.type==3){
+          content='案例'
+        }
+        if(this.type==4){
+          content='提问'
+        }
+        if(this.type==5){
+          content='回答';
+        }
+        if(this.type==6){
+          content='课程笔记'
+        }
+        if(this.type==60){
+          content='课程笔记评论'
+        }
+// 点赞type
+        if(this.type==10){
+          content='课程评论'
+        }
+        if(this.type==20){
+          content='文章评论'
+        }
+        if(this.type==30){
+          content='案例评论'
+        }
+        // 评论点赞通知没有关联id,评论通知暂时关闭
+        // 设置了主信息的关联，再把这个判断去掉
+        if(this.type==60 || this.type==10 || this.type==20 || this.type==30 || this.type == 6) {
+          //return;
+        }
+
+        if(title){
+          content=sendName+typeText+content+'-'+title
+        }else{
+          content=sendName+typeText+content
+        }
+      let msgPageParams=this.pageParams;
+      if(!msgPageParams){
+        msgPageParams=this.data.id;
+      }
+      let message={
+        content,
+        refId,
+        refType:this.type,
+        source:1,
+        pageType:this.msgPageType,
+        pageParams:msgPageParams,
+        pageUrl:location.href,
+        sendAid:this.userInfo.aid,
+        sendName,
+        acceptName,
+        acceptId,
+        title:'系统消息',
+        sendType:1,
+        conType,
+      }
+      apiMessage.save(message).then(res=>{
+        if(res.status!=200){ console.log('发送消息失败') }
+      })
+    },
+    checkHas(){
+      if(this.type>0 && !this.readonly && this.data.id){
+        if(this.favorites){
+          apiFavorites.has(this.type,this.data.id).then(rs=>{
+            if(rs.status==200 && rs.result){
+              this.isFavorite=true;
+            }else{
+              this.isFavorite=false;
+            }
+          })
+        }
+        if(this.praises){
+          apiPraises.has(this.type,this.data.id).then(rs=>{
+            if(rs.status==200 && rs.result){
+              this.isPraise=true;
+            }else{
+              this.isPraise=false;
+            }
+          });
+        }
+      }
+    },
+    addShare(){
+      if(this.readonly){
+        return
+      }
+      this.shareShow=true;
+    },
+    addPraise(){
+     if(this.type==0){
+       console.log('未设置type值,1表课程,2表文章，3表案例，4表问答,6笔记')
+       return;
+      }
+      //需要判断是否已点赞，已点赞的不再加
+      if(!this.readonly){
+        let postData={
+          objType:this.type,
+          objId:this.data.id,
+          title:'',
+
+        }
+        if(this.type==1){
+          postData.title=this.data.name;
+        }else if(this.type == 5){
+          postData.title=this.data.content;
+        } else {
+          postData.title=this.data.title;
+        }
+        if(this.loading) {
+          return;
+        }
+        this.loading=true;
+        if(this.isPraise) {// 已经点赞，取消点赞
+          apiPraises.remove(this.type,this.data.id).then(res=>{
+             this.loading = false;
+            if(res.status==200){
+              if(res.result){
+                this.data.praises--;
+              }
+              this.isPraise=false;
+              if(this.unicom) {
+                this.$store.dispatch("unicomPraises",false)
+              }
+              //自己给自己点赞不算
+              let authorId=this.data.sysCreateAid;
+              if(this.type==3){ //案例取作者id
+                 authorId=this.data.authorId;
+              }else if(this.type==1){ //课程取老师的id
+                // 目前页面上没有点赞的地方，课程有多个老师，也要给每个老师加吗？
+                 //console.log(this.data,'点赞中课程的传的数据')
+              }
+              if(this.userInfo.aid!=authorId){
+                let event = {
+                  key: "CancelPraise",//
+                  title: "取消点赞",//事件的标题
+                  parameters:"author:"+authorId,//用户自定义参数 name:value,name:value
+                  content: "取消点赞"+postData.title,//事件的内容
+                  objId: this.data.id,//关联的id
+                  objType: this.type,//关联的类型
+                  objInfo: this.data.title,
+                  aid: this.userInfo.aid, //当前登录人的id
+                  aname: this.userInfo.name,//当前人的姓名
+                  status: 1 //状态，直接写1
+                }
+                this.$store.dispatch("userTrigger", event);
+              }
+              this.$message({message:'取消点赞',type:'success'})
+            }else{
+              console.log('取消失败：'+res.message);
+            }
+          })
+        } else {
+          apiPraises.save(postData).then(res=>{
+            this.loading = false;
+            if(res.status==200){
+              if(res.result){
+                this.data.praises++;
+              }
+              if(this.unicom) {
+                this.$store.dispatch("unicomPraises",true)
+              }
+              //console.log('点选了我的 pageType='+this.msgPageType+','+this.pageParams)
+              //if(this.type!=1&&this.type!=5){
+              this.messageSave(this.data.id,this.data.title,this.userInfo.name,this.data.sysCreateBy,this.data.sysCreateAid,'点赞了我的');
+              //}
+              // if(this.type==5){
+              //   this.messageSave(this.data.id,this.data.content,this.userInfo.name,this.data.sysCreateBy,this.data.sysCreateAid,'评论了我的');
+              // }
+              this.isPraise=true;
+              this.$message({message:'点赞成功',type:'success'})
+              let contentText = '';
+              if(this.type==1){
+                  contentText='课程';
+                  // conType = this.data.type;
+                }
+                if(this.type==2){
+                  contentText='文章'
+                }
+                if(this.type==3){
+                  contentText='案例'
+                }
+                if(this.type==4){
+                  contentText='提问'
+                }
+                if(this.type==5){
+                  contentText='回答'
+                }
+                if(this.type==6){
+                  contentText='课程笔记'
+                }
+                if(this.type==60){
+                  contentText='课程笔记评论'
+                }
+        // 点赞type
+                if(this.type==10){
+                  contentText='课程评论'
+                }
+                if(this.type==20){
+                  contentText='文章评论'
+                }
+                if(this.type==30){
+                  contentText='案例评论'
+                }
+              if(this.userInfo.aid!=this.data.sysCreateAid){
+                let event = {
+                  key: "Praise",//后台的事件key  发布文章且审核通过
+                  title: "点赞",//事件的标题
+                  parameters:"author:"+this.data.sysCreateAid,//用户自定义参数 name:value,name:value
+                  content: "点赞了"+contentText,//事件的内容
+                  objId: this.data.id,//关联的id
+                  objType: this.type,//关联的类型
+                  objInfo: this.data.title,
+                  aid: this.userInfo.aid, //当前登录人的id
+                  aname: this.userInfo.name,//当前人的姓名
+                  status: 1 //状态，直接写1
+                }
+                this.$store.dispatch("userTrigger", event);
+              }
+            }else{
+              console.log('点赞失败：'+res.message);
+            }
+          })
+        }
+
+      }
+    },
+    addFavorite(){
+
+      if(this.readonly){
+        return
+      }
+      if(this.type==0){
+        console.log('未设置type值,1表课程,2表文章，3表案例，4表问答')
+        return;
+       }
+      //需要判断是否已点赞，已点赞的不再加
+      let postData={
+        objType:this.type,
+        objId:this.data.id,
+        title:'',
+      }
+      if(this.loading) {
+          return;
+        }
+        this.loading=true;
+      if(this.type==1){
+        postData.title=this.data.name;
+      }else if(this.type==60){
+        postData.title=this.data.content;
+      } else if(this.type==5){
+        postData.title='收藏回答';
+      } else {
+        postData.title=this.data.title;
+      }
+      if(this.isFavorite) {// 已经收藏，再次点击取消收藏
+        apiFavorites.remove(this.type,this.data.id).then(res=>{
+          this.loading=false;
+        if(res.status==200){
+          this.isFavorite=false;
+          if(res.result){
+            this.data.favorites--;
+          }
+          if(this.unicom) {
+            this.$store.dispatch("unicomFavorites",false)
+          }
+          this.$message({message:'已取消收藏',type:'success'});
+          //this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功，false代表已存在
+        }else{
+          console.log('取消收藏失败：'+res.message);
+        }
+      })
+      } else {
+        apiFavorites.save(postData).then(res=>{
+          this.loading=false;
+        if(res.status==200){
+          this.isFavorite=true;
+          if(res.result){
+            this.data.favorites++;
+          }
+          if(this.unicom) {
+            this.$store.dispatch("unicomFavorites",true)
+          }
+          //if(this.type===2||this.type===4){
+            this.messageSave(this.data.id,this.data.title,this.userInfo.name,this.data.sysCreateBy,this.data.sysCreateAid,'收藏了我发布的');
+          //}
+          this.$message({message:'已加入收藏',type:'success'});
+          //this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功，false代表已存在
+        }else{
+          console.log('加入收藏失败：'+res.message);
+        }
+      })
+      }
+      //
+
+    },
+    jumpRouter(){
+      //此跳转不行
+      if(this.type==2){
+        this.$router.push({path:'/article/detail?id='+this.data.id})
+      }
+      if(this.type==3){
+        this.$router.push({path:'/case/detail?id='+this.data.id})
+      }
+      if(this.type==1){
+        this.$router.push({path:'/course/detail?id='+this.data.id})
+      }
+      if(this.type==4){
+        this.$router.push({path:'/qa/answer?id='+this.data.id})
+      }
+    },
+    keyupEnter(){
+       this.findUser();
+       return false;
+    },
+    findUser(){
+       this.shareInfo.load=false;
+       this.shareInfo.list=[];
+       this.shareUsers=[];
+       var name=this.shareInfo.name;
+       var regPos = /^\d+(\.\d+)?$/; //非负浮点数
+       if(regPos.test(name)){
+            //console.log("数字");
+            apiUser.getByLoginName(name).then(rs=>{
+              if(rs.status==200){
+                //因为根据工号查询，只会是一个人，所有会有null情况，而json会返回空字符串
+                if(rs.result!=''){
+                  this.shareInfo.list.push(rs.result);
+                }else{
+                  this.$message.error("查无此用户")
+                }
+                this.shareInfo.load=true;
+              }else{
+                this.$message.error(rs.message);
+              }
+            })
+        }else{
+            // console.log("非数字");
+            apiUser.findByName(name).then(rs=>{
+              if(rs.status==200){
+                if(rs.result.length==0){
+                  return this.$message.error(rs.message);
+                }
+                this.shareInfo.list=rs.result;
+                this.shareInfo.load=true;
+              }else{
+                this.$message.error(rs.message);
+              }
+            })
+        }
+    },
+    submitShare(){
+      if(this.shareUsers.length==0){
+        this.$message.error('请选择分享人');
+        return;
+      }
+      let conType;
+      if(this.type == 1) {
+        conType = this.data.type;
+      }
+
+      let postData={
+        objType:this.type,
+        objId:this.data.id,
+        content:this.data.title,
+        isRead:false,
+        toAid:'',
+        toAname:'',
+        conType: conType,
+      }
+      let $this=this;
+      this.shareUsers.forEach(u=>{
+        var curUser=null;
+         $this.shareInfo.list.some(item=>{
+           if(item.aid==u){
+             curUser=item;
+             return true;
+           }else{
+             return false;
+           }
+         });
+         if(curUser!=null){
+           postData.toAid=curUser.aid;
+           postData.toAname=curUser.name;
+           if(this.userInfo.aid==postData.toAid){
+             return this.$message.warning("不能分享给自己")
+           }
+           apiShares.save(postData).then(rs=>{
+             $this.shareShow=false;
+             if(rs.status!=200){
+               this.$message.error("分享失败")
+             }else{
+               if(rs.result){
+                 $this.data.shares++;
+                 this.$message.success("分享成功")
+                 //if(this.type!=3){
+                   if(this.type==1){
+                     this.messageSave(this.data.id,this.data.name,this.userInfo.name,curUser.name,curUser.aid,'分享给我的');
+                   }else{
+                     this.messageSave(this.data.id,this.data.title,this.userInfo.name,curUser.name,curUser.aid,'分享给我的');
+                   }
+                 //}
+                 let event = {
+                  key: "Share",//分享
+                  title: "分享",//分享
+                  parameters:"author:"+this.data.sysCreateAid,//内容的作者
+                  content: '分享',//事件的内容
+                  objId: this.data.id,//关联的id
+                  objType: this.type,//关联的类型
+                  objInfo: this.data.title,
+                  aid: this.userInfo.aid, //当前登录人的id
+                  aname: this.userInfo.name,//当前人的姓名
+                  status: 1 //状态，直接写1
+                }
+                this.$store.dispatch("userTrigger", event);
+               }else{
+                 this.$message.warning("您已分享给对方，分享失败")
+               }
+             }
+           })
+         }
+      })
+
+    }
+  }
+
+};
+</script>
+
+<style lang="scss" scoped>
+.ranking-interactBar{
+  display: flex;
+  justify-content: space-between;
+  div{
+    span{
+        color: #999;
+    }
+  }
+
+}
+// .eyes-view{
+  // color: #000;
+  // position: fixed;
+  // line-height: 40px;
+// }
+::v-deep .g-dialog .el-dialog__header{
+  text-align: left !important;
+}
+::v-deep .g-dialog .el-dialog__body{
+  text-align: left !important;
+}
+
+.interact-bar{
+  // height: 30px;
+  .interact-bar-btns {
+    // line-height: 30px;
+    display: flex;
+    justify-content: flex-end;
+    .interact-bar-btn {
+      margin: 0 0 0 15px;
+    }
+    .interact-bar-value{
+      //  color:#6E7B84; ui图给的颜色，但是效果于ui图效果不一样，也没有透明度，所以找一个相近的和谐的颜色
+       color:#999;
+    }
+  }
+}
+.cursor{
+  cursor: pointer;
+}
+.bottom-btn{
+  padding: 10px 50px;
+      text-align: center;
+      .btn{
+        width: 104px;
+        height: 42px;
+        color: #fff;
+         img{
+         width: 16px;
+         height: 15px;
+         vertical-align: bottom;
+         margin-right: 5px;
+        }
+      }
+      .fen-xiang{
+        background: #2ab28b;
+
+      }
+      .dian-zan{
+        background: #f56262;
+
+      }
+      .shou-cang{
+        background: #ff8e00;
+      }
+}
+</style>
diff --git a/src/components/Portal/interactBar.vue b/src/components/Portal/interactBar.vue
index a97719d8..599a56ec 100644
--- a/src/components/Portal/interactBar.vue
+++ b/src/components/Portal/interactBar.vue
@@ -38,7 +38,7 @@
       <div v-if="favorites"  @click="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+'px'}" :icon-class="isFavorite?'collected':'collection'"></svg-icon>
+          <svg-icon v-else style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}" :icon-class="isFavorite?'scactive2':'xihuan'"></svg-icon>
         </el-tooltip>
         <span v-if="!courseExclusive" class="interact-bar-value"> {{ data.favorites? data.favorites:0}}</span>
       </div>
diff --git a/src/components/PortalFloatTools.vue b/src/components/PortalFloatTools.vue
index 2cdbf9bf..b119eb9b 100644
--- a/src/components/PortalFloatTools.vue
+++ b/src/components/PortalFloatTools.vue
@@ -118,6 +118,7 @@
               <el-select v-model="feedback.type" placeholder="请选择意见类型">
                 <el-option label="关于内容" value="关于内容"></el-option>
                 <el-option label="关于平台操作" value="关于平台操作"></el-option>
+                <el-option label="其他" value="其他"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="描述" prop="content">
diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue
index f9262ee4..1db706ad 100644
--- a/src/components/PortalHeader.vue
+++ b/src/components/PortalHeader.vue
@@ -181,8 +181,10 @@ export default {
     this.sex = this.userInfo.sex;
     this.$store.dispatch('refrashMsg');
     this.loadBoeData();
+    //this.loadPopupConfig();
   },
   methods: {
+    
     setCurIdentity(iden){
         this.$store.dispatch('SetCurIdentity',iden);
       },
diff --git a/src/components/Scorm/preview.vue b/src/components/Scorm/preview.vue
new file mode 100644
index 00000000..2c5b25db
--- /dev/null
+++ b/src/components/Scorm/preview.vue
@@ -0,0 +1,9 @@
+<template>
+  <!--scorm的预览-->
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/components/UcHeader/Index.vue b/src/components/UcHeader/Index.vue
index dce50813..1fd0ebef 100644
--- a/src/components/UcHeader/Index.vue
+++ b/src/components/UcHeader/Index.vue
@@ -48,7 +48,7 @@
               <div style="margin-top:10px">
                 <router-link to="/study/index"><span :class="{identity:true,active:curIdentity==1}" @click="setCurIdentity(1)">学员</span></router-link>
                 <router-link to="/teacher/index"><span v-if="identity == 2 || identity == 5" :class="{identity:true,active:curIdentity==2}" @click="setCurIdentity(2)">教师</span></router-link>
-                <router-link to="/manager/index"><span v-if="identity == 3 || identity == 5" :class="{identity:true,active:curIdentity==3}" @click="setCurIdentity(3)">管理员</span></router-link>
+                <span v-if="identity == 3 || identity == 5" :class="{identity:true,active:curIdentity==3}" @click="setCurIdentity(3)">管理员</span>
               </div>
             </div>
          </div>
@@ -74,13 +74,13 @@
          <div class="learning-border" ></div>
          <div class="learning-info">
            <div class="learning-qus">我的U币（累计）</div>
-           <div class="learning-an"><span>{{statData.uvalue}}</span></div>
+           <div class="learning-an"><span>{{statData.uvalue < 0 ? 0 : statData.uvalue}}</span></div>
         </div>
 
         <div class="learning-info">
-          
+
             <div @click="jumrank" style="cursor: pointer;" class="ranking-link"> BOE 排行榜 >></div>
-            
+
         </div>
 
       </div>
@@ -92,6 +92,7 @@
 import {userAvatarText,cutFullName} from "@/utils/tools.js";
   import { mapGetters } from 'vuex'
   import apiStart from '@/api/phase2/stat.js'
+  import testUser from '@/utils/testUsers.js'
   export default {
     name: 'UcHeader',
     computed:{
@@ -103,6 +104,7 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
     data(){
       return {
         fileBaseUrl:process.env.VUE_APP_FILE_BASE_URL,
+        isTest:false,
         statData:{
           evalue: 0,//经验值
           level: "LV1",//级别
@@ -130,8 +132,11 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
       this.loadUserStat();
       this.$bus.$on('u-Currency',(num)=>{
            this.statData.uvalue = num;
-        })
-
+      })
+      //console.log(this.userInfo.loginName,'this.userInfo.loginName')
+      if(testUser.isTest(this.userInfo.loginName)){
+        this.isTest=true;
+      }
     },
     methods:{
       loadUserStat(){//获取经验值和等级
@@ -157,6 +162,13 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
 
       setCurIdentity(iden){
         this.$store.dispatch('SetCurIdentity',iden);
+        this.$router.push('/manager/index');
+        // if(this.isTest){
+        //   //this.$router.push('/manage/learningpath');
+        //   location.href='/manage/learningpath';
+        // }else{
+        //   this.$router.push('/manager/index');
+        // }
       },
       jumrank(){
         this.$router.push('/user/ranking');
diff --git a/src/components/UserCenter/menu.vue b/src/components/UserCenter/menu.vue
index 984161cb..aed1edff 100644
--- a/src/components/UserCenter/menu.vue
+++ b/src/components/UserCenter/menu.vue
@@ -14,7 +14,7 @@
         :default-active="activeMenu"
         router
         active-text-color="#3379FB"
-        :default-openeds="['manageTodo','manageFinish','teacherTodo','teacherFinish','myqa','notice','mystudy', 'course', 'exam', 'u001', 'u002', 'u003', 'u004']"
+        :default-openeds="['manageTodo','manageFinish','teacherTodo','teacherFinish','myqa','notice','mystudy', 'course', 'exam', 'u001', 'u002', 'u003', 'u004','mylecnotes','mycaseRecord']"
         class="el-menu-vertical"
         @open="handleOpen"
         @close="handleClose"
@@ -99,12 +99,12 @@
             <span><a href="/resource/index.html" target="_blank" style="color:#303133;">旧版管理员界面</a></span>
           </template>
         </el-menu-item>
-        <!-- <el-menu-item v-show="curIdentity == 3">
+        <el-menu-item v-show="curIdentity == 3 && isTest">
           <template slot="title">
             <svg-icon icon-class="administrator" style="font-size:17px"></svg-icon>
-            <span><a href="/manage/learningpath" target="_blank" style="color:#303133;">新版管理员界面</a></span>
+            <span><a :href="managerPath+'/learningpath'" target="_blank" style="color:#303133;">新版管理员界面</a></span>
           </template>
-        </el-menu-item> -->
+        </el-menu-item>
         <el-menu-item v-show="curIdentity == 3">
           <template slot="title">
             <svg-icon icon-class="management" style="font-size:16px"></svg-icon>
@@ -176,6 +176,14 @@
             <!-- <i class="el-icon-menu"></i> -->
             <span slot="title" class="textl">我开发的课程</span>
           </el-menu-item>
+          <el-menu-item index="/need/mylecnotes">
+            <!-- <i class="el-icon-menu"></i> -->
+            <span slot="title" class="textl">我的授课记录</span>
+          </el-menu-item>
+           <el-menu-item index="/need/mycaseRecord">
+            <!-- <i class="el-icon-menu"></i> -->
+            <span slot="title" class="textl">我的案例记录</span>
+          </el-menu-item>
           <!--
                 <el-menu-item index="u0032">
                   <i class="el-icon-menu"></i>
@@ -244,9 +252,16 @@
           </el-menu-item>
            <el-menu-item index="/exam/mytask">
             <!-- <i class="el-icon-menu"></i> -->
-            <!-- <span slot="title" class="textl">自主学习</span> -->
             <span slot="title" class="textl">我的考试</span>
           </el-menu-item>
+          <el-menu-item index="/uc/study/path"  v-show="isTest">
+            <!-- <i class="el-icon-menu"></i> -->
+            <span slot="title" class="textl">学习路径图</span>
+          </el-menu-item>
+          <el-menu-item index="/uc/study/project"  v-show="isTest">
+            <!-- <i class="el-icon-menu"></i> -->
+            <span slot="title" class="textl">学习项目</span>
+          </el-menu-item>
           <!-- <el-menu-item index="/uc/study/history"> -->
           <!-- <i class="el-icon-menu"></i> -->
           <!-- <span slot="title" class="textl">历史记录</span>
@@ -364,13 +379,14 @@ import { mapGetters } from 'vuex';
 import apiCourse from '../../api/modules/course.js';
 import apicourseStudy from "../../api/modules/courseStudy.js"
 import courseImage from "@/components/Course/courseImage.vue"
+import testUser from '@/utils/testUsers.js'
 export default {
   name: 'UcMenu',
     components: {
     courseImage,
   },
   computed: {
-    ...mapGetters(['curIdentity', 'messagesBeReviewed', 'studyTaskCount']),
+    ...mapGetters(['curIdentity', 'messagesBeReviewed', 'studyTaskCount','userInfo']),
     activeMenu() {
       const route = this.$route;
       const { meta, path } = route;
@@ -385,6 +401,8 @@ export default {
   },
   data() {
     return {
+      isTest:false,
+      managerPath:process.env.VUE_APP_MANAGER_PATH,
       badge: 0,
       isCollapse: false,
       lastStudy:{},
@@ -396,6 +414,16 @@ export default {
     this.$store.dispatch('refrashStudyTaskCount');
     this.getLastStudy();
   },
+  mounted() {
+    console.log(this.userInfo.loginName,'this.userInfo.loginName');
+    let flag=testUser.isTest(this.userInfo.loginName);
+    console.log(flag,'this.isTest22');
+    this.isTest=flag;
+    // if(testUser.isTest(this.userInfo.loginName)){
+    //   console.log(this.isTest,'this.isTest');
+    //   this.isTest=true;
+    // }
+  },
   methods: {
     toCourseDetail(item){
       if(isNaN(item.courseType)){
diff --git a/src/data/pages.js b/src/data/pages.js
index 4938a832..b2e7252f 100644
--- a/src/data/pages.js
+++ b/src/data/pages.js
@@ -55,6 +55,8 @@ export const pages=[
     {title:'待回答问题',path:'qareply',component:'qa/NeedReplys',hidden:false},
     {title:'已回答问题',path:'qafinish',component:'qa/TeacherList',hidden:false},
     {title:'我开发课程',path:'course',component:'course/TeacherList',hidden:false},
+    {title:'我的授课记录',path:'mylecnotes',component:'course/Mylecnotes',hidden:false},
+    {title:'我的案例记录',path:'mycaseRecord',component:'course/MycaseRecord',hidden:false},
     {title:'待审核的课程',path:'waitaudit',component:'course/WaitAudit',hidden:true},
     {title:'已审核的课程',path:'waitaudited',component:'course/WaitAudited',hidden:true},
   ]},
@@ -64,7 +66,9 @@ export const pages=[
   {title:'学习',path:'/uc/study',hidden:false,children:[
     {title:'学习任务',path:'task',component:'study/TaskList',hidden:false},
     {title:'正在学习',path:'courses',component:'study/Courses',hidden:false},
-    {title:'历史记录',path:'history',component:'study/FinishCourses',hidden:false}
+    {title:'历史记录',path:'history',component:'study/FinishCourses',hidden:false},
+    {title:'学习路径图',path:'path',component:'study/StudyPath',hidden:false},
+    {title:'学习项目',path:'project',component:'study/StudyProject',hidden:false}
   ]},
   {title:'个人中心',path:'/uc',hidden:false,children:[
     {title:'首页',path:'index',component:'StudyIndex',hidden:false}
@@ -86,7 +90,8 @@ export const pages=[
     {title:'我的U币',path:'ucurrency',component:'ucurrency/Index',hidden:true},
     {title:'我的勋章',path:'medal',component:'medal/Index',hidden:true},
     {title:'勋章规则',path:'urules',component:'medal/urules',hidden:true},
-    {title:'排行榜',path:'ranking',component:'user/ranking',hidden:true}
+    {title:'排行榜',path:'ranking',component:'user/ranking',hidden:true},
+
   ]},
   {title:'消息中心',path:'/message/center',hidden:false,children:[
     {title:'消息中心',path:'index',component:'portal/user/Message',hidden:false}
diff --git a/src/icons/svg/Scoreicon.svg b/src/icons/svg/Scoreicon.svg
new file mode 100644
index 00000000..7d51740d
--- /dev/null
+++ b/src/icons/svg/Scoreicon.svg
@@ -0,0 +1 @@
+<svg t="1671028831851" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3466" width="200" height="200"><path d="M511 724.7c-79.5 0-154.3-31-210.5-87.2-56.2-56.2-87.2-131-87.2-210.5s31-154.3 87.2-210.5 131-87.2 210.5-87.2 154.3 31 210.5 87.2 87.2 131 87.2 210.5-31 154.3-87.2 210.5c-56.2 56.3-131 87.2-210.5 87.2z m0-545.4c-136.6 0-247.7 111.1-247.7 247.7S374.4 674.7 511 674.7 758.7 563.6 758.7 427 647.6 179.3 511 179.3z" p-id="3467" fill="#8a8a8a"></path><path d="M243 895.5l59.4-266 48.8 10.9L310.7 822l194.8-60.8 206.4 61.1L663 632.5l48.4-12.5 71 275.3-276.5-81.8zM512 268.8l46.9 94.9L663.7 379l-75.9 73.9 17.9 104.4L512 508l-93.7 49.3 17.9-104.4-75.9-73.9 104.8-15.3z" p-id="3468" fill="#8a8a8a"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/collectedCourse.svg b/src/icons/svg/collectedCourse.svg
index c0a09eca..d97b4362 100644
--- a/src/icons/svg/collectedCourse.svg
+++ b/src/icons/svg/collectedCourse.svg
@@ -1,15 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="32px" height="20px" viewBox="0 0 32 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="1.首页备份" transform="translate(-387.000000, -954.000000)">
-            <g id="编组-6备份" transform="translate(116.000000, 954.000000)">
-                <g id="编组-18备份" transform="translate(271.000000, 0.000000)">
-                    <path d="M10,0 L22,0 C27.5228475,-1.01453063e-15 32,4.4771525 32,10 C32,15.5228475 27.5228475,20 22,20 L10,20 C4.4771525,20 6.76353751e-16,15.5228475 0,10 C-6.76353751e-16,4.4771525 4.4771525,1.01453063e-15 10,0 Z" id="矩形" fill="#FF5100" opacity="0.05"></path>
-                    <g id="shoucang" transform="translate(10.000000, 4.000000)" fill="#FE5C11" fill-rule="nonzero" opacity="0.737776802">
-                        <path d="M3.51111722,11.8358841 C3.00606047,12.157725 2.34560166,11.9912662 2.03884758,11.4672748 C1.89342872,11.2184847 1.84823239,10.9213787 1.91284589,10.6389807 L2.56655461,7.77979671 C2.58241634,7.71199121 2.5606958,7.64072905 2.51000386,7.59426129 L0.370225308,5.6819849 C-0.0742306183,5.28506832 -0.125531303,4.59092584 0.254423758,4.12816419 C0.437033108,3.90516747 0.698955059,3.76625534 0.981933462,3.74232435 L3.79012094,3.5077128 C3.85132176,3.50248211 3.90607248,3.46109818 3.93112283,3.39817613 L5.01308726,0.684220572 C5.23854026,0.118845213 5.86554864,-0.151150366 6.41260593,0.0862303529 C6.67350855,0.199948757 6.87993807,0.414928183 6.98681359,0.684220572 L8.06877804,3.3980223 C8.09382837,3.46109818 8.14857911,3.50263596 8.20977992,3.5077128 L11.0182674,3.74247818 C11.6071753,3.79170814 12.0432311,4.3260071 11.9965805,4.93261256 C11.9746663,5.22209277 11.8429987,5.49123316 11.6298256,5.68229258 L9.49004701,7.59456897 C9.44024635,7.63902978 9.41774605,7.7110286 9.43349624,7.77995054 L10.087205,10.6391345 C10.2225068,11.2306633 9.87120209,11.8266535 9.29774444,11.9692666 C9.02158512,12.0380065 8.73007522,11.9899974 8.48878365,11.836038 L6.08440156,10.3037554 C6.03276544,10.2705141 5.96713542,10.2705141 5.9154993,10.3037554 L3.51096721,11.836038 L3.51111722,11.8358841 Z" id="路径"></path>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="64px" height="40px" viewBox="0 0 64 40" enable-background="new 0 0 64 40" xml:space="preserve">  <image id="image0" width="64" height="40" x="0" y="0"
+    href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAoCAMAAAB5EAzbAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
+AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABKVBMVEUAAAD/+Pj/+Pb/9/T/
++PT/+PT/+PX/////9/X/+PT/////+fX/+fb/9/T/////+PX/////+PX/9/X/+PT/9/T/9vP/8+//
+6N//u6D/on//kWj/lnD/q4z/0b//9fH/zbr/pIL/jGH/h1r/i1//rY//5Nr/wqz/il//lW7/1sf/
+0cD/k2r/iV3/war/q4v/v6f/2cr/1cb/nnn/mXP/3dD/1sb/vKP/vKL/poX/spX/nXj/uJ7/p4b/
+yrb/xK7/6eH/8u3/j2b/zbv/3M//qor/sZP/8Ov/l3H/lW3/7+n/5tz/jmT/i2D/4tj/3dH/2Mn/
+iFz/08P/il7/iFv/2sv/3tL/j2X/jWL/4db/6eL/mHL/lm//7uj/n3r/7eb/9PD/zLn/zLj////r
+SAPTAAAAFHRSTlMAI3Klv9nzFoLTDH9S6AH+CaqD8iL1SmAAAAABYktHRAcWYYjrAAAAB3RJTUUH
+5gwcBw4ofY/E6AAAAbtJREFUSMetVudawkAQPFKB0DlEsRIBFbGhKPbesSH2gr7/S5iESMnuftT5
+dd/ezORus7d3jLXAJYiSrHACiiyJgouRUN0e3gE8bhWVezWlE7m1Es0L9T5/p3ITfp9DHtCC3eg5
+D2qBZn0o3J3cRDjU9P0e9IZDYw1aO25sCItq9fzB/ceHRxKjY+MxczwxOZXUp1NpmAc7k16Y/8yM
+bmF2jvPsfG2cy8B/4SU2sKDXkVpsjJfwTaigfpZ1AitOpmLWZAT45imD1ZiT6jYMQP2v6SQKTq7H
+OH9gAeu0wQYgu5gAYkXaYBOQBSaC2BZtsA3IIpNAbIc22AVkickgtkcb7AOyzGAXOTik9EXA5QqL
+wuARZXAMuVFkC5yf4PpThCojSeT87BzTX1wiVAn5jQaurqG+dIMxRaSQTNyWnPpcASUKSClbuMu1
+6u8fcJ4LOUw1FMrN+scszjIOE3PjU7ySbOjLxPet46xSF9LT87/+pUJQrIZC9+S03Q0TrxRDo5qq
+jbd3U/8Rp+btpoq1dRufX7qe/6Zmg772F0v157dKTmqDu9r6vlz7v977f2AM4Ilj1mSkr0dWj8+8
+P+Wm0GT+SFi7AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDIyLTEyLTI4VDA3OjE0OjQwKzAwOjAwpWzq
+VQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAyMi0xMi0yOFQwNzoxNDo0MCswMDowMNQxUukAAAAASUVO
+RK5CYII=" />
+</svg>
diff --git a/src/icons/svg/collectionCourse.svg b/src/icons/svg/collectionCourse.svg
index a4acad1f..9824f1c5 100644
--- a/src/icons/svg/collectionCourse.svg
+++ b/src/icons/svg/collectionCourse.svg
@@ -1,15 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="32px" height="20px" viewBox="0 0 32 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="2.课程页" transform="translate(-387.000000, -876.000000)" fill="#04243C">
-            <g id="编组-12备份-11" transform="translate(86.000000, 562.000000)">
-                <g id="收藏" transform="translate(301.000000, 314.000000)">
-                    <path d="M10,0 L22,0 C27.5228475,-1.01453063e-15 32,4.4771525 32,10 C32,15.5228475 27.5228475,20 22,20 L10,20 C4.4771525,20 6.76353751e-16,15.5228475 0,10 C-6.76353751e-16,4.4771525 4.4771525,1.01453063e-15 10,0 Z" id="矩形" opacity="0.05"></path>
-                    <g id="shoucang" transform="translate(10.000000, 4.000000)" fill-rule="nonzero" opacity="0.1">
-                        <path d="M3.51111722,11.8358841 C3.00606047,12.157725 2.34560166,11.9912662 2.03884758,11.4672748 C1.89342872,11.2184847 1.84823239,10.9213787 1.91284589,10.6389807 L2.56655461,7.77979671 C2.58241634,7.71199121 2.5606958,7.64072905 2.51000386,7.59426129 L0.370225308,5.6819849 C-0.0742306183,5.28506832 -0.125531303,4.59092584 0.254423758,4.12816419 C0.437033108,3.90516747 0.698955059,3.76625534 0.981933462,3.74232435 L3.79012094,3.5077128 C3.85132176,3.50248211 3.90607248,3.46109818 3.93112283,3.39817613 L5.01308726,0.684220572 C5.23854026,0.118845213 5.86554864,-0.151150366 6.41260593,0.0862303529 C6.67350855,0.199948757 6.87993807,0.414928183 6.98681359,0.684220572 L8.06877804,3.3980223 C8.09382837,3.46109818 8.14857911,3.50263596 8.20977992,3.5077128 L11.0182674,3.74247818 C11.6071753,3.79170814 12.0432311,4.3260071 11.9965805,4.93261256 C11.9746663,5.22209277 11.8429987,5.49123316 11.6298256,5.68229258 L9.49004701,7.59456897 C9.44024635,7.63902978 9.41774605,7.7110286 9.43349624,7.77995054 L10.087205,10.6391345 C10.2225068,11.2306633 9.87120209,11.8266535 9.29774444,11.9692666 C9.02158512,12.0380065 8.73007522,11.9899974 8.48878365,11.836038 L6.08440156,10.3037554 C6.03276544,10.2705141 5.96713542,10.2705141 5.9154993,10.3037554 L3.51096721,11.836038 L3.51111722,11.8358841 Z" id="路径"></path>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="64px" height="40px" viewBox="0 0 64 40" enable-background="new 0 0 64 40" xml:space="preserve">  <image id="image0" width="64" height="40" x="0" y="0"
+    href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAoCAMAAAB5EAzbAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
+AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABBVBMVEUAAAAAgIAAKlUAOTkA
+M00AKkAAJzsASUkALkYA//8AJEkAMzOqtbrS2NrY3N/Y3eHX3d/T2N2zvcJAUGDJ0dTW297a3+Hb
+3+LY3uDR2dt6hY8kN0nQ2Nrb3+LY3N+orrnJ0dPa3uLa3+LCyc/T2N3b4OPR19vBy9HL0tWirrRZ
+ZoDV2t/K0tTb4OOhqK7W293Kz9La3uLO1dnb4OPO1dfZ3+LAx87V2t7a4ONVY3G2vsfU2dzU2d7a
+3+Kos7jZ3+HQ1tzb4OPa4OOmrLjByNDR1trS1tvCy9LDytHO1de8xMjI0NPa3+K0ucPDydDZ3eGd
+qrG7w8fX3OCAiZvR19ra3+L///8XAzeHAAAAVXRSTlMAAgYJCgwNBwsBBwUwgrbSwZA2EGSz6PDY
+hRkOg/i1LGPj5EuW9YBOZykUpWb9Jq9g4Xj2beVJrPQSO5ug+S/gif7sK0aKjk9Nc0Fi+jNR1SdA
+xByL+4UbJgAAAAFiS0dEVgoN6YkAAAAHdElNRQfmDBwHDxKimCwbAAABlElEQVRIx61W51oCMRDM
+tVxBxF5QUEBUsCFYwC5W7C3v/yrC3cEn7KyCx/zKt5kZbpfNJkJ0QdMN05IsLNPQNcFCsx3ZBxwb
+e7heP+oAnkv1Mat/fTOXWISfRx/hGoPqpTTcaPouh4G/P8yiUz+6NxIfTYyNT/jryanpmdm5+SRl
+hZV0Sf0XFlPKR3pJyuVMsM7miIHlMgmsqDbyq+nOOrWGk9BIeF1h5AuE2upJuzdYzDIGaoMY2E0D
+0v+bnF5tbfdyHZTBDmugSiAHncR2eYMyIeuCNmGFN9gjZEOYJLbPGxwQsinoKT5k9dUaIVuChOQR
+a3BMyRIYyBNGf3qGDMAgSp5jgwugt0ARm0nAPyJRBFRTwFlSuqT6+hViGqCRWigTff4aEnXQyj5u
+evSVHOZp4DAFuO3Sp+4wy0HHOUT8ZwfdMyQbDpQQjU4l6w8cR/t1Jj8+BfrMM8fwmKHaxku1pX99
+4/bDoYrGeoj3ulIfn+x27O+LpfDVqLGb3vCutsiXa/TrPfoDYwhPnOiPrH8+874Bg2PFFM1zJS0A
+AAAldEVYdGRhdGU6Y3JlYXRlADIwMjItMTItMjhUMDc6MTU6MTgrMDA6MDAxocFoAAAAJXRFWHRk
+YXRlOm1vZGlmeQAyMDIyLTEyLTI4VDA3OjE1OjE4KzAwOjAwQPx51AAAAABJRU5ErkJggg==" />
 </svg>
diff --git a/src/icons/svg/dianzan.svg b/src/icons/svg/dianzan.svg
new file mode 100644
index 00000000..d52e6a9e
--- /dev/null
+++ b/src/icons/svg/dianzan.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">  <image id="image0" width="28" height="28" x="0" y="0"
+    href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAMAAABF0y+mAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
+AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAwFBMVEUAAAC2vcW0vsWzvsS0
+vcW1v8W229uzvcWzvcX///+0w8u1vsWzwMazvcW/v/+0vsS3wMWzvsW1v8a0vsW2wMe1w8m0vcW0
+vsT///+0v8azvcW0vsW1vcW1wcb///+0vsS0vsTMzMyzvsW0vcW0wMSzvcW/v9+0vsS0vcazvcW0
+vsW0vsSzvsWzvsW1vcWzwcizvcWzvsWzv8a0vsi0vcS0vsa0vsW3wsi0vsa0vsSzvcWzvsS0vsWz
+vsazvcT///+3QmwLAAAAPnRSTlMAI8XzvmAHyq8DIolR7AR+OahI000mjOoBY/3LPi0CepgFufE9
+9QjMVc3659ieYSXorG8zun3jLoGggOLceTaJ0IEAAAABYktHRAnx2aXsAAAAB3RJTUUH5gwVCA8V
+SqixDwAAAKZJREFUKM990dcOwjAMhWGXUqCMslcZbdl77+H3fyxCGgmJOP6vLH13xwC/rISddFJA
+l0ZRxiUti7IcifkYCx6FxRixRGFZYYXCqsIaYXVlaBHYUNbUqdX2FXa6sl5f7hKEYQQD/G/oAIzG
+4pjAFPVm8WY0zmFhxiWgGVccrjnccLhlcAcM7jk8cHhk0HYZPAGDZ4EXE14F3gx4//7aezx19F/v
+SNgHPuR7NzvxnYAAAAAldEVYdGRhdGU6Y3JlYXRlADIwMjItMTItMjFUMDg6MTU6MjErMDA6MDDQ
+vVizAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDIyLTEyLTIxVDA4OjE1OjIxKzAwOjAwoeDgDwAAAABJ
+RU5ErkJggg==" />
+</svg>
diff --git a/src/icons/svg/pingfen.svg b/src/icons/svg/pingfen.svg
new file mode 100644
index 00000000..37765de0
--- /dev/null
+++ b/src/icons/svg/pingfen.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">  <image id="image0" width="28" height="28" x="0" y="0"
+    href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAMAAABF0y+mAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
+AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAvVBMVEUAAAC1v8SzvcW0vcW1
+v8a3wMW0vsW0vcW0vsS2ws6zvcWzvsW1vsT///+0vcW2vcW0wMSzvsW2yMi2vcWzvsa0v8W1vsWz
+vsWzvcW0vsWzv8ezvsW0vcW0vcW0vcW0w9K0vsS0vcXMzMy0vsW/v/+0vsS0vsS1v8azv8a4wsy1
+v8qzwMa0vcWzvcW/v9+2vsezvsW2vsazvsW0vsa0vsW229uzvsW4vsq1vcW0vsS0vcS0vsX///+z
+vcT///8kTae6AAAAPXRSTlMAaOXkZzn+qqkV+XZ1AdpCQagORl5ziZ6zy0Dy0vGnEcjJCrQEnIJr
+bBkYUYzGCDvXP9iO+geNK3zq3WoCaxbP8gAAAAFiS0dEDfa0YfUAAAAHdElNRQfmDBUIDgLQYAWJ
+AAAA2UlEQVQoz3XSWRuBQBQG4GMLyVJElLJU1iJkSfP//xbVVGPMfFfnnPfqm2cAiFSqtTpw0hAQ
+EhocbKJvWmxriwmKbSZ2UBqJZd1ehr0uA/sIZ8BAOUeZOCrDkTqeaFNUZKpNxupoqADMdMSJPgAD
+cWOAzsc5mHw0wVrwbGkBrNZsW6+SLrbDMsfGVd1/c8uH2NC2JV5pR+OewAONBwKPNB4J9Gj0SvNF
+GkW/wNN/lVOBEr6cg+CCx/InXdP95oYAoXtLl/tvE++RLQ+P6vJ8Re84X+J39Hqm0wew+mf4tSaW
+sgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAyMi0xMi0yMVQwODoxNDowMiswMDowMEyyLm0AAAAldEVY
+dGRhdGU6bW9kaWZ5ADIwMjItMTItMjFUMDg6MTQ6MDIrMDA6MDA975bRAAAAAElFTkSuQmCC" />
+</svg>
diff --git a/src/icons/svg/scactive2.svg b/src/icons/svg/scactive2.svg
new file mode 100644
index 00000000..3c3efd5c
--- /dev/null
+++ b/src/icons/svg/scactive2.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">  <image id="image0" width="30" height="30" x="0" y="0"
+    href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAMAAAAM7l6QAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
+AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABfVBMVEX////vv0DvwEHvujzv
+uDrvtTjvtDjvtzrvszbvwkPvuz3vsTbvwULvtzvvsjbvuTzvszfvxETvvT/vtTrvtjvvuTvvuj3v
+tznvuD3vuDzvuz7vuT3vwkLvwUHvsjXvuDvvtDfvtTnvtjnvtDjvszfvszfvtDfvtTjvtjjvszfv
+szbvszfvtjnvtjjvszbvszbvtDfvtTjvszbvtDfvtDfvtjjvszbvtjrvvD3vsTXvszfvtDjvsjbv
+wEHvtDfvtDfvtjnvtTjvszbvtDjvuz3vtjjvtTjvtDjvszbvsjbvszbvszbvszbvszbvszbvszbv
+tDfvszfvtjrvtDjvtTjvtDfvtjnvsTXvszfvuDvvtzrvtjnvtDjvtTjvtDfvsjXvsTTvvD7vszbv
+vj/vtTnvsDTvuTvvtjjvtTjvtDjvtjnvtDfvuDrvsjXvtDfvtjjvtTjvszbvszbvtDfvtDjvszbv
+szbvtTjvszbvsTTvsjXvsTXvsjbvszX///+Ch+i/AAAAeHRSTlMAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAABJbknAvO4qeZy1Pzet/c/XpfZvZOBbGvohLD+ynM2LIJwSohkD5qWm7
+hr5xsUuUCrpaTAXXnicRfnCqx7XhBbkWot4PiroHX4MsydU/buD+22xdgli6X5AWAAAAAWJLR0QA
+iAUdSAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB+YMGwgGEuXR6NYAAAEwSURBVCjPtdFX
+U8JAFAVgsiRZgiEgFgRUsPeKvXex9957722zif/dS6KSDNknx/O0Z757ntbl+tdwHHLzZeUVlVWC
+iD285M3C1TW1dfU8RpzBsrehkRDS1Cz6Uqy0tEJLtPllgxFqV4mRjs4An93VTY2i9QQl4JzcXrOn
+0pfXP6B/v9XBfGD/kEbSGR5J32qjwGPj1MK6pdAJ4MkkYWUKeJqpZAZ4ls1zwPNsXgBeZPMS8PIK
+k1eBhTWWJteBFc8GgzcDwG7vFnVCnWyHgGVZ2lEdmO4WhM3/RnuZe7ofjEQM5uToQYYeHhUiZDIK
+K8f2PU2cFAH8cLF4avXPs3OJs3H0wrK9vArJdo7Frn/5xidmMI7d3hnT+wcBOzEff3x6fnnFIWfG
+8ZK3949SO/8lX3yA5zI33rZMAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDIyLTEyLTI3VDA4OjA2OjE4
+KzAwOjAwsoIXpAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAyMi0xMi0yN1QwODowNjoxOCswMDowMMPf
+rxgAAAAASUVORK5CYII=" />
+</svg>
diff --git a/src/icons/svg/xihuan.svg b/src/icons/svg/xihuan.svg
new file mode 100644
index 00000000..1f51983f
--- /dev/null
+++ b/src/icons/svg/xihuan.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="30px" viewBox="0 0 28 30" enable-background="new 0 0 28 30" xml:space="preserve">  <image id="image0" width="28" height="30" x="0" y="0"
+    href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAeCAMAAAAIG46tAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
+AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABR1BMVEUAAACqu8Szv8WyvMOz
+vcOzvcSyvcSyusCzs7+zu8GyvsOzvcS0v8W0vcK2wMe1v8W0vsP///+A//+zwMW1v8ayvMX/AP+z
+vMO1v8a1wMeyvcSzvMS0wMe2wMe0vcL/AACzvsS2v8a/v8y0vcOzvcW1vcW1v8W0vsW0vcWyvcSy
+vMSzvcWzvcSyvsazvMW2vcSzusSvv8+zvcOvv7+zvcK3wciqqv+zvcS0w8OzvMSzvsSwucGzvcW2
+v7+xsbyzvcO2tsKzvcW1vcS/v7+zvcS0vsTExMSzvMOzvcSxxMS5udGyvMSyvMSiubmqqqqzvcOy
+vMO2tra2ttuzvcS0vcSqqtW/v7+1vsaqqqqyvcOyvMS3wci0vsWzvcS1v8a4wsm2wMi2wMe0vsa0
+v8a4w8q5w8q5xMu5w8u4wsq3wcm3wsm2wcj////YxNOMAAAAW3RSTlMAHnzV9/G2WRRat9R7aeDT
+ZgICZdNqAXL8/aOh/fxwAVr4FNbWYGCxsdTUysqcnUlKENEQZfoDmxG/vR3AHBe8FbOyEK6tDael
+DQujnwsJnpkHB5OPBgT9A6moIGUMhAAAAAFiS0dEEeK1PboAAAAHdElNRQfmDBUIEBGAn3uIAAAB
+HUlEQVQoz2NgoAgwMjGzsLKxc4DYHJxcrCzcPIwwOV6+6JjY2Lg4fgFBIWGRuLjY2JhoPlGwlJi4
+RHQsGMRLSknLxEPY0bJy8kBJBcW4WCiIiQYZAQFxigoMDErK8bFYQbyKEoNqQiwOkKjGoJ6ESzJZ
+g0EzBpdkjBaDNm5JHQbdOFyScXoM+rglDRgMjVKwy6UYGTMwmJhitTXG1AQYQmbmqdgkU83NQIFr
+YZmGKZduZQGJFWsbDGtTbGxhcWZnn46mz94OEdsOjhkoYe7kgJwWnF1S4G6OyXA1Rk0pbu6ZUNmY
+aA9P9HTk5R0Plo3J8vHFTGV+/tlA2ZjEgEBsaTAoODEmJjEkFHsKDQsJDw8Jw5V+IyKjIijLAUQB
+AJ4fqMMCTZgrAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDIyLTEyLTIxVDA4OjE2OjE3KzAwOjAw1tXR
+aQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAyMi0xMi0yMVQwODoxNjoxNyswMDowMKeIadUAAAAASUVO
+RK5CYII=" />
+</svg>
diff --git a/src/icons/svg/xuexirenshu.svg b/src/icons/svg/xuexirenshu.svg
new file mode 100644
index 00000000..1fe45cd2
--- /dev/null
+++ b/src/icons/svg/xuexirenshu.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="28px" height="32px" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g><path style="opacity:0.925" fill="#b7c1c7" d="M 9.5,-0.5 C 12.1667,-0.5 14.8333,-0.5 17.5,-0.5C 19.463,2.51798 19.963,5.85132 19,9.5C 10,14.1667 6.33333,11.5 8,1.5C 8.71719,0.955796 9.21719,0.28913 9.5,-0.5 Z"/></g>
+<g><path style="opacity:0.958" fill="#b3bdc4" d="M 16.5,31.5 C 14.5,31.5 12.5,31.5 10.5,31.5C 2.86207,31.0163 0.0287378,27.0163 2,19.5C 4.60857,15.278 8.44191,13.278 13.5,13.5C 23.0321,13.5293 26.8654,18.196 25,27.5C 22.4362,29.6243 19.6029,30.9576 16.5,31.5 Z"/></g>
+</svg>
diff --git a/src/router/index.js b/src/router/index.js
index 8bbc5bb2..6abb9bea 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -39,6 +39,13 @@ export const constantRoutes = [{
     name: 'index',
     meta: { title: '首页', icon: 'dashboard', noCache: true, affix: false },
 },
+{
+    path: '/forward',
+    hidden: true,
+    component: (resolve) => require(['@/views/Forward'], resolve),
+    name: 'forward',
+    meta: { title: '详细信息', icon: 'dashboard', noCache: true, affix: false },
+},
 {
     path: '/course',
     hidden: true,
diff --git a/src/security.js b/src/security.js
index f414634e..194a9258 100644
--- a/src/security.js
+++ b/src/security.js
@@ -6,6 +6,7 @@ import 'nprogress/nprogress.css'
 import { getToken } from '@/utils/token'
 import { routers } from "@/data/pages"
 import watermark from './utils/warterMark.js'
+import testUser from './utils/testUsers.js'
 import xpage from '@/utils/xpage'
 
 NProgress.configure({ showSpinner: false })
@@ -37,6 +38,8 @@ router.beforeEach((to, from, next) => {
           if (!store.getters.init) {
             // 判断当前控制台是否已拉取完数据
             store.dispatch('InitData').then(res => {
+              //加载白名单信息
+              testUser.init();
               //加载信息资源归属，系统分类信息
               store.dispatch('resOwner/loadResOwners');
               store.dispatch('sysType/loadSysTypes');
diff --git a/src/utils/testUsers.js b/src/utils/testUsers.js
new file mode 100644
index 00000000..4bfb12fb
--- /dev/null
+++ b/src/utils/testUsers.js
@@ -0,0 +1,49 @@
+import apiWhiteuser from '@/api/system/whiteuser'
+/**测试人员名单*/
+const userCodes=[
+  '12345601',
+  '12345603',
+  '00004409',
+  'boeutest',
+  '10181457'
+]
+
+const init=function(){
+  let data=sessionStorage.getItem('whiteuser-session');
+  if(!data){
+    apiWhiteuser.getList({}).then(rs=>{
+       if(rs.status==200){
+         if(rs.result && rs.result.length>0){
+           data = JSON.stringify(rs.result);
+           sessionStorage.setItem('whiteuser-session',data);
+         }
+       }else{
+         console.log('获取白名单错误:'+rs.message);
+       }
+    })
+  }
+}
+
+/**是否是测试人员*/
+const isTest= function(code){
+  return true;
+   // let data=sessionStorage.getItem('whiteuser-session');
+   // var flag=false;
+   // if(data){
+   //    var codes=JSON.parse(data);
+   //    flag=codes.some(item=>{
+   //       return (item==code);
+   //    })
+   // }else{
+   //   //如果没有，就使用程序中写死的
+   //   flag=userCodes.some(item=>{
+   //      return (item==code);
+   //   })
+   // }
+   // return flag;
+}
+
+export default {
+  init,
+  isTest
+}
diff --git a/src/utils/tools.js b/src/utils/tools.js
index 00b7fdd6..185fb2cc 100644
--- a/src/utils/tools.js
+++ b/src/utils/tools.js
@@ -37,7 +37,7 @@ export const cutOrgNamePath = (namePath) => {
            newName=names[0]
          }
       }
-      
+
       // if(names.length>1){
       //    newName=names[1];
       //     if(num==2){
@@ -72,7 +72,7 @@ const contentTypeMaps = {
     30: '图片',
     40: '文档',
     41: '图文',
-    50: 'scrom包',
+    50: 'scorm',
     52: '外链',
     60: '作业',
     61: '考试',
@@ -99,6 +99,8 @@ export function toContentType(fileType) {
      type = 30;
    } else if (docTypes.indexOf(fileType)>-1){
      type = 40;
+   } else if(fileType === "zip"){
+     type = 50;
    } else {
      type = 90;
    }
@@ -154,6 +156,29 @@ export function formatDate(date){
 
 }
 
+export function formatDateByFmt(date,fmt) {
+    if(/(y+)/.test(fmt)){
+      fmt = fmt.replace(RegExp.$1,(date.getFullYear()+'').substr(4-RegExp.$1.length));
+    }
+    let o = {
+      'M+':date.getMonth() + 1,
+      'd+':date.getDate(),
+      'h+':date.getHours(),
+      'm+':date.getMinutes(),
+      's+':date.getSeconds()
+    };
+
+    // 遍历这个对象
+    for(let k in o){
+      if(new RegExp(`(${k})`).test(fmt)){
+        // console.log(`${k}`)
+        let str = o[k] + '';
+        fmt = fmt.replace(RegExp.$1,(RegExp.$1.length===1)?str:('00'+str).substr(str.length));
+      }
+    }
+    return fmt;
+}
+
 /**
  * 把日期格式化为显示时间，yyyy-MM-dd
  * @param {Object} date
diff --git a/src/views/Forward.vue b/src/views/Forward.vue
new file mode 100644
index 00000000..4e596d08
--- /dev/null
+++ b/src/views/Forward.vue
@@ -0,0 +1,42 @@
+<template>
+  <div class="box">
+    <portal-header style="background: #387DF7;" :hideSearch="true" textColor="#ffffff"></portal-header>
+        <iframe :src="url" style="width: 100%;height: 100%;" frameborder="0"></iframe>
+    <portal-footer></portal-footer>
+  </div>
+</template>
+<script>
+import portalHeader from "@/components/PortalHeader.vue";
+import portalFooter from "@/components/PortalFooter.vue";
+  export default {
+    components: {
+      portalHeader,
+      portalFooter
+    },
+    data(){
+      return {
+       url: "",
+       boeUrl:process.env.VUE_APP_BOE_WEB_URL
+      }
+    },
+    mounted() {
+      let params = this.$route.query.params;// 跳转的参数 encodeURIComponent 之后的
+      let to = this.$route.query.to;//跳转的地址，以 /开头的地址
+      let urlPre=window.location.protocol+'//'+window.location.host;
+      this.url=urlPre+to
+      if(params){
+         this.url=this.url+'?'+params;
+      }
+    },
+    methods:{
+
+    }
+  }
+</script>
+<style lang="scss" >
+.box{
+    // width: 100%;
+    //background: #387DF7;
+    height: 100%;
+}
+</style>
diff --git a/src/views/Index.vue b/src/views/Index.vue
index 3c3d6dfe..5c110545 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -189,7 +189,9 @@
                     </div>
                   </div>
                   <div class="list-bottom">
-                    <interactBar :type="1" :data="item" :couseViews="false" :shares="false" :views="false"></interactBar>
+                    <couresinteract :type="1" :data="item" ></couresinteract>
+                    
+                    <!-- <interactBar :type="1" :data="item" :couseViews="false" :shares="false" :views="false"></interactBar> -->
                   </div>
                 </div>
 				</a>
@@ -467,6 +469,7 @@
   import apiUser from '@/api/system/user.js';
   import apiCoursePortal from '@/api/modules/coursePortal.js';
   import interactBar from '@/components/Portal/interactBar.vue';
+  import couresinteract from '@/components/Portal/course/couresinteract.vue';
   import ad from '@/components/Portal/adFloat.vue';
   import courseImage from '@/components/Course/courseImage.vue';
   import articleImage from '@/components/Article/articleImage.vue';
@@ -491,6 +494,7 @@
       portalFloatTools,
       authorInfo,
       interactBar,
+      couresinteract,
       courseImage,
       InterestCollection,
       GuideBox,
diff --git a/src/views/case/ManageList.vue b/src/views/case/ManageList.vue
index f38078b4..dda96068 100644
--- a/src/views/case/ManageList.vue
+++ b/src/views/case/ManageList.vue
@@ -19,6 +19,8 @@
           <el-button @click="getData(1)" icon="el-icon-search" type="primary" >搜索</el-button>
           <!-- <el-button @click="showRecords()" icon="el-icon-tickets" type="info" >推荐记录</el-button> -->
           <el-button icon="el-icon-refresh-right" type="primary"  @click="reset">重置</el-button>
+          <el-checkbox style="margin-left:10px" v-model="queryObj.excellent" @change="getData()">只查看我上传的</el-checkbox>
+
         </div>
       </div>
     </div>
@@ -32,13 +34,15 @@
       </el-table-column> -->
       <el-table-column label="作者" width="80px" prop="authorName"></el-table-column>
       <el-table-column label="导入时间" prop="sysCreateTime"></el-table-column>
+      <el-table-column label="设置优秀时间" prop="excellentTime"></el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button-group>
             <!-- <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" type="text" @click="setTop(scope.row)"  icon="el-icon-top">置顶</el-button>
             <el-button style="margin:0 5px" v-if="scope.row.isTop"  type="text" @click="setTop(scope.row)"  icon="el-icon-bottom">取消置顶</el-button>
-            <el-button type="text" @click="delItem(scope.row)"  icon="el-icon-delete">删除</el-button>
+            <el-button type="text" icon="el-icon-medal" v-if="scope.row.filePath" ><span @click="cancal(scope.row)" v-if="scope.row.excellent">取消优秀</span><span @click="open(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-group>
         </template>
       </el-table-column>
@@ -116,17 +120,18 @@ export default {
   name: 'articleItems',
   data() {
     return {
+      excellent:false,
       queryObj: {
         pageIndex:1,
         pageSize:10,
-        isTop:''
+        isTop:'',
+        excellent:'',
       }, //查询对象
       caseList: [], //案例列表
       count:0,
       recommend: {
         dlgShow: false,
-        records: [
-        ]
+        records: []
       },
       shareInfo:{
         name:'',
@@ -136,7 +141,6 @@ export default {
       shareShow: false,
       shareUsers:[],
       shareItemData:{},
-
       timeout: null,
       params: { name: '', type: '' },
       typeList: [],
@@ -158,6 +162,66 @@ export default {
     this.getData();
   },
   methods: {
+    // getSearch(){
+    //   this.queryObj.excellent = !this.queryObj.excellent;
+    //   this.getData();
+    // },
+    cancal(item){
+      this.$confirm('是否取消该案例为优秀案例?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.excellent = false;
+          let data = {
+            id:item.id,
+            excellent:this.excellent
+          }
+          console.log(data)
+          apiCase.excellent(data).then(res => {
+            if(res.status == 200){
+               this.$message({
+                 type: 'success',
+                  message: '取消成功!'
+                  });
+              this.getData()
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已撤回取消推荐'
+          });
+        });
+    },
+    open(item) {
+        this.$confirm('是否推荐该案例为优秀案例?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.excellent = true;
+          let data = {
+            id:item.id,
+            excellent:this.excellent
+          }
+          console.log(data)
+          apiCase.excellent(data).then(res => {
+            if(res.status == 200){
+               this.$message({
+                 type: 'success',
+                  message: '推荐成功!'
+                  });
+              this.getData()
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消推荐'
+          });
+        });
+      },
     inputOn() {
       this.$forceUpdate();
     },
@@ -165,6 +229,7 @@ export default {
       this.queryObj.isTop = '';
       this.queryObj.keyWord = '';
       this.queryObj.pageIndex = 1;
+      this.queryObj.excellent = null;
       this.getData()
     },
     //获取案例列表数据
diff --git a/src/views/course/Courseware.vue b/src/views/course/Courseware.vue
index b56216a0..551c68c0 100644
--- a/src/views/course/Courseware.vue
+++ b/src/views/course/Courseware.vue
@@ -12,12 +12,13 @@
             </el-col> -->
           <!-- </el-row> -->
           <el-row :gutter="20">
-
-            <!-- <el-col :span="6">
+            <!--
+            <el-col :span="6">
               <div class="grid-content bg-purple">
                 <el-cascader style="margin-left: 0px" placeholder="资源归属" :options="resOwnerListMap" :props="defaultProps" v-model="resOwner" clearable></el-cascader>
               </div>
-            </el-col> -->
+            </el-col>
+            -->
             <el-col :span="4">
               <div class="grid-content bg-purple"><el-input v-model="params.name" placeholder="名称" clearable></el-input></div>
             </el-col>
@@ -129,48 +130,51 @@
         </el-main>
       </el-container>
     </el-container>
-    <el-dialog title="上传课件" :close-on-click-modal="false" width="700px" :visible.sync="upload.show" custom-class="g-dialog">
+    <el-dialog title="上传课件" :close-on-click-modal="false" width="800px" :visible.sync="upload.show" custom-class="g-dialog">
       <div>
         <div style="line-height: 30px;">
           <div>请在当前面板选择需要上传的课件</div>
-          <div>提示：课件大小超过1G时，无法上传，请先压缩视频，或剪切成多个再上传。</div>
+          <div style="">提示：课件大小超过1G时，无法上传，请先压缩视频，或剪切成多个再上传。</div>
         </div>
         <div>
-          <!-- <div>
-            资源归属：
-            <el-cascader clearable v-model="projectOwnership" :options="resOwnerListMap" :props="defaultProps" @change="handleChange"></el-cascader>
-          </div> -->
+          <div style="display: flex;line-height: 30px;">
+           <span style="font-weight: 600;">资源归属：</span>
+            <el-input placeholder="请选择" v-model="upload.orgName" style="width: 300px;">
+                <el-button v-if="identity==3 || identity==5" @click="showChooseOrg()" size="small" slot="append" icon="el-icon-search">选择</el-button>
+            </el-input>
+           <!-- <el-cascader clearable v-model="projectOwnership" :options="resOwnerListMap" :props="defaultProps" @change="handleChange"></el-cascader> -->
+          </div>
           <!-- <div style="margin-top: 10px" v-if="isUpload"><el-button type="primary" size="mini" @click="isUploadHandle()">选择文件并上传</el-button></div> -->
           <div style="margin-top: 10px">
-            <file-upload dir="files" :showList="true" :value="imageShowUrl" :limit="5" @success="handleUploadSuccess" @remove="handleRemoveSuccess"></file-upload>
+            <file-upload scorm="zip" dir="files" :beforeMsg="needOrg" :showList="true" :value="imageShowUrl" :limit="5" @success="handleUploadSuccess" @remove="handleRemoveSuccess"></file-upload>
           </div>
         </div>
         <div style="margin-top: 10px">
           <el-table border stripe :data="fileList" style="width: 100%" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55"></el-table-column>
+            <el-table-column type="selection" width="40"></el-table-column>
             <el-table-column prop="fileName" label="文件名称"></el-table-column>
             <el-table-column prop="name" label="课件名称">
               <template slot-scope="scope">
                 <el-input type="text" v-model="scope.row.name"></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="duration" label="时长(秒)">
+            <el-table-column prop="duration" label="时长(分)"  width="100">
               <template slot-scope="scope">
-                <el-input type="number" v-model="scope.row.duration"></el-input>
+                <el-input type="number" size="small" v-model="scope.row.minute"></el-input>
               </template>
             </el-table-column>
-            <el-table-column label="可见性">
+            <el-table-column label="可见性" width="100">
               <template slot-scope="scope">
                 <el-checkbox label="移动端" v-model="fileList[scope.$index].device1"></el-checkbox>
                 <el-checkbox label="pc端" v-model="fileList[scope.$index].device2"></el-checkbox>
               </template>
             </el-table-column>
-            <el-table-column label="是否允许下载" width="200">
+            <el-table-column label="允许下载" width="80" align="center">
               <template slot-scope="scope">
                 <el-checkbox v-model="fileList[scope.$index].down"></el-checkbox>
               </template>
             </el-table-column>
-            <el-table-column label="操作" width="80">
+            <el-table-column label="操作" width="60">
               <template slot-scope="scope">
                 <el-button type="text" @click="deleteFile(scope.row)">删除</el-button>
               </template>
@@ -184,35 +188,38 @@
         <el-button type="primary" @click="saveUpload()">保存</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="预览课件" :close-on-click-modal="false" :visible.sync="coursewareShow" custom-class="g-dialog">
+    <el-dialog title="预览课件" :close-on-click-modal="false" width="800px" :visible.sync="coursewareShow" custom-class="g-dialog">
       <div>
-        <div class="courseware-title">{{ fileUrl.fileName }}</div>
+        <div class="courseware-title">{{ fileInfo.name }}</div>
         <div class="courseware-icon">
-          <div v-if="fileUrl.resType == 10" style="position: relative;">
+          <div v-if="fileInfo.resType == 10" style="position: relative;">
             <videoPlayer
-              :src="fileBaseUrl + fileUrl.filePath"
+              :src="fileBaseUrl + fileInfo.filePath"
               @onPlayerPlaying="onPlayerPlaying"
               @onPlayerPlay="onPlayerPlay"
               @onPlayerPause="onPlayerPause"
               @onPlayerEnded="onPlayerEnded"
             ></videoPlayer>
-            <!-- <video :src="fileBaseUrl + fileUrl.filePath" controls controlslist="nodownload" style="width: 100%; height: 100%; object-fit: fill"></video> -->
+            <!-- <video :src="fileBaseUrl + fileInfo.filePath" controls controlslist="nodownload" style="width: 100%; height: 100%; object-fit: fill"></video> -->
           </div>
-          <div v-if="fileUrl.resType == 20">
+          <div v-if="fileInfo.resType == 20">
             <audioPlayer
-              :url="fileBaseUrl + fileUrl.filePath"
-              :name="fileUrl.fileName"
+              :url="fileBaseUrl + fileInfo.filePath"
+              :name="fileInfo.fileName"
               @onPlaying="audioPlaying"
               @onPlay="audioPlay"
               @onPause="audioPause"
-              @onPlayEnd="audioEnd"
-            ></audioPlayer>
-            <!-- <audio width="100%" controls :src="fileBaseUrl+fileUrl.filePath">
+              @onPlayEnd="audioEnd">
+            </audioPlayer>
+            <!-- <audio width="100%" controls :src="fileBaseUrl+fileInfo.filePath">
                    您的浏览器不支持 audio 标签。
               </audio> -->
           </div>
-          <div v-if="fileUrl.resType == 30"><img style="width:100%;height:100%" :src="fileBaseUrl + fileUrl.filePath" alt="图片" /></div>
-          <div v-if="fileUrl.resType == 40"><pdfPreview :filePath="fileBaseUrl + fileUrl.previewFilePath"></pdfPreview></div>
+          <div v-if="fileInfo.resType == 30"><img style="width:100%;height:100%" :src="fileBaseUrl + fileInfo.filePath" alt="图片" /></div>
+          <div v-if="fileInfo.resType == 40"><pdfPreview :filePath="fileBaseUrl + fileInfo.previewFilePath"></pdfPreview></div>
+          <div v-if="fileInfo.resType == 50"> <!--scorm课件预览-->
+              <iframe v-if="scormUrl" :src="scormUrl" frameborder="0" border="0px" style="width:100%;height:600px;border:0px"></iframe>
+          </div>
         </div>
       </div>
       <span slot="footer"><el-button type="primary" @click="coursewareShow = false">关闭</el-button></span>
@@ -224,45 +231,43 @@
             <el-cascader v-model="projectOwnership1" :options="resOwnerListMap" :props="defaultProps" @change="handleChange"></el-cascader>
           </el-form-item> -->
           <!-- <el-form-item label="编号">{{}}</el-form-item> -->
+          <el-form-item label="资源归属">{{ form.orgName }}</el-form-item>
           <el-form-item label="文件名称">{{ form.fileName }}</el-form-item>
           <el-form-item label="课件名称"><el-input v-model="form.name"  maxlength="50" show-word-limit></el-input></el-form-item>
           <el-form-item label="课件类型">{{ getType(form.resType) }}</el-form-item>
-          <el-form-item label="时长">
+          <el-form-item label="时长(分)">
             <!-- <el-input v-model="form.duration"></el-input> -->
-            <el-input
-              type="number"
-              placeholder="请输入数字"
-             :maxlength="32"
-              show-word-limit
-              v-model="form.duration"
-            >
-            </el-input>
+            <el-input type="number" placeholder="请输入数字" :maxlength="32" show-word-limit v-model="form.minute"></el-input>
             <!-- <el-input-number max="" v-model="form.duration" controls-position="right"></el-input-number> -->
           </el-form-item>
           <el-form-item label="可见性">
             <el-checkbox label="移动端" v-model="form.device1"></el-checkbox>
             <el-checkbox label="pc端" v-model="form.device2"></el-checkbox>
           </el-form-item>
+          <el-form-item label="允许下载">
+            <el-checkbox label="移动端" v-model="form.down"></el-checkbox>
+          </el-form-item>
         </el-form>
       </div>
       <span slot="footer"><el-button :loading="loading" type="primary" @click="saveUpdate()">保存</el-button></span>
     </el-dialog>
+    <chooseOrg ref="refChooseOrg" @confirm="confirmChooseOrg"></chooseOrg>
   </div>
 </template>
-
 <script>
-import coueseFile from '../../api/modules/courseFile';
+import coueseFile from '@/api/modules/courseFile';
 import FileUpload from '@/components/FileUpload/index.vue';
 import { getType, deepCopy, toContentType } from '../../utils/tools.js';
 import pdfPreview from '@/components/PdfPreview/index.vue';
 import { mapGetters, mapActions } from 'vuex';
 import videoPlayer from '@/components/VideoPlayer/index.vue';
 import audioPlayer from '@/components/AudioPlayer/index.vue';
-
+import chooseOrg from '@/components/System/chooseOrg.vue';
+import apiUserBasic from '@/api/boe/userbasic.js';
 export default {
-  components: { FileUpload, pdfPreview, videoPlayer, audioPlayer },
+  components: { FileUpload, pdfPreview, videoPlayer, audioPlayer,chooseOrg},
   computed: {
-    ...mapGetters(['resOwnerMap', 'sysTypeMap'])
+    ...mapGetters(['resOwnerMap', 'sysTypeMap','identity','userInfo'])
   },
   data() {
     return {
@@ -277,7 +282,7 @@ export default {
       },
       // resOwnerName: resOwnerIndexName,
       isUpload: true,
-      fileUrl: {},
+      fileInfo: {},
       device1: 1,
       device2: 2,
       projectOwnership1: '',
@@ -301,14 +306,19 @@ export default {
         { value: 10, label: '视频' },
         { value: 20, label: '音频' },
         { value: 30, label: '图片' },
-        { value: 40, label: '文档' }
-        // { value: 41, label: "图文" },
-        // { value: 50, label: "scrom包" },
-        // { value: 90, label: "其他" }
+        { value: 40, label: '文档' },
+        { value: 50, label: "scrom" }
       ],
       form: {
+        id:'',
         device1:false,
         device2:false,
+        fileName:'',
+        name:'',
+        resType:'',
+        duration:0,
+        minute:0,
+        down:false
       },
       editCoursewareShow: false,
       currentPage4: 4,
@@ -320,10 +330,14 @@ export default {
       data: [],
       // defaultProps: { children: 'children', label: 'label' },
       upload: {
-        show: false
+        show: false,
+        orgId:'',
+        orgName:''
       },
+      needOrg:'请先选择资源归属',
       fileList: [],
       courseShow: false,
+      scormUrl:'',//scorm的播放地址
       multipleSelection: []
     };
   },
@@ -348,6 +362,15 @@ export default {
     }
   },
   mounted() {
+    this.upload.orgId=this.userInfo.departId;
+    //console.log(this.upload.orgId,'this.upload.orgId')
+    if(this.upload.orgId){
+       apiUserBasic.getOrgInfo(this.upload.orgId).then(rs=>{
+         if(rs.status==200){
+             this.upload.orgName=rs.result.name;
+          }
+       });
+    }
     this.loadResOwners();
     this.getResOwnerTree().then(rs => {
       this.resOwnerListMap = rs;
@@ -355,6 +378,25 @@ export default {
     this.search();
   },
   methods: {
+    beforeCheck(){
+      if(!this.upload.orgId ||!this.upload.orgName){
+          return false;
+      }
+      return true;
+    },
+    showChooseOrg(){
+       this.$refs.refChooseOrg.dlgShow = true;
+    },
+    confirmChooseOrg(orgInfo){
+      //console.log(orgInfo,'orgInfo');
+      this.upload.orgId=orgInfo.id;
+      this.upload.orgName=orgInfo.name;
+      this.needOrg='';
+      this.$refs.refChooseOrg.dlgShow = false;
+      // this.orgName=orgInfo.name;
+      // this.courseInfo.orgId=orgInfo.id;
+      // this.$refs.refChooseOrg.dlgShow = false;
+    },
     search(){
       //this.params.pageIndex = 1;
       this.page.pageIndex=1;
@@ -427,6 +469,8 @@ export default {
       } else if (this.form.device2 === true) {
         this.form.device = 2;
       }
+      //时长，秒与分钟的转化
+      //if(this.form.)
       try {
         const { status,message} = await coueseFile.batchUpdate([this.form]);
         if (status === 200) {
@@ -472,6 +516,8 @@ export default {
           return;
         }
         const data = {
+          orgId:this.upload.orgId,
+          orgName:this.upload.orgName,
           fileName: rs.result.displayName,
           fileType: rs.result.fileType.toLowerCase(), //文件的后缀名，比如：mp4
           filePath: rs.result.filePath, // 文件的保存路径
@@ -486,6 +532,11 @@ export default {
           if (status === 200) {
             result.device1 = true;
             result.device2 = true;
+            result.minute='';
+            if(result.duration){
+              result.minute=Math.round(result.duration/60); //四舍五入
+            }
+
             this.fileList.push(result);
           } else {
             this.$message.error(error);
@@ -508,6 +559,11 @@ export default {
         } else if (item.device2 === true) {
           item.device = 2;
         }
+        //转化为秒
+        if(item.minute){
+           item.duration=parseFloat(item.minute)*60;
+        }
+
       });
       this.loading = true;
       coueseFile.batchUpdate(this.fileList).then(rs => {
@@ -529,6 +585,9 @@ export default {
         this.params.pageIndex = this.page.pageIndex;
         const { result, error, status } = await coueseFile.pageList(this.params, this.page);
         if (status === 200) {
+          result.list.forEach(item=>{
+            item.minute=Math.round(item.duration/60);//转化为分钟
+          })
           this.tableData = result.list;
           this.page.count = result.count;
           this.page.pageSize = result.pageSize;
@@ -542,22 +601,34 @@ export default {
     editFile(row) {
       coueseFile.detail(row.id).then(res=>{
         if(res.status == 200) {
-          this.form = res.result;
-           if (res.result.resOwner3 == '') {
-            this.projectOwnership1 = [res.result.resOwner1, res.result.resOwner2];
-          } else {
-            this.projectOwnership1 = [res.result.resOwner1, res.result.resOwner2, res.result.resOwner3];
-          }
-          if (res.result.device === 1) {
-            this.form.device1 = true;
-          } else if (res.result.device === 2) {
-            this.form.device2 = true;
-          } else if (res.result.device === 3) {
-            this.form.device1 = true;
-            this.form.device2 = true;
-          }
+            this.form = res.result;
+            if(this.form.duration){
+               this.form.minute=Math.round(res.result.duration/60);//转化为分钟
+            }else{
+               this.form.minute=0;
             }
-          })
+            if (res.result.resOwner3 == '') {
+              this.projectOwnership1 = [res.result.resOwner1, res.result.resOwner2];
+            } else {
+              this.projectOwnership1 = [res.result.resOwner1, res.result.resOwner2, res.result.resOwner3];
+            }
+            if (res.result.device === 1) {
+              this.form.device1 = true;
+            } else if (res.result.device === 2) {
+              this.form.device2 = true;
+            } else if (res.result.device === 3) {
+              this.form.device1 = true;
+              this.form.device2 = true;
+            }
+            if(!res.result.orgName && res.result.orgId){
+                apiUserBasic.getOrgInfo(res.result.orgId).then(rs=>{
+                  if(rs.status==200){
+                      this.form.orgName=rs.result.name;
+                   }
+                });
+            }
+          }
+      })
       this.editCoursewareShow = true;
     },
     handleSizeChange(val) {
@@ -630,8 +701,24 @@ export default {
       console.log(data);
     },
     viewTopic(row) {
-      this.fileUrl = row;
-      console.log(row, 'row');
+      this.fileInfo = row;//这里的fileInfo 相当于内容对象
+      if(row.resType==50){
+        if(!row.content){
+          this.$message({type: 'error',message: '无SCORM内容，SCORM包解析失败'});
+          return;
+        }
+        //scorm课件的内容，取第一个sco
+        var scorm=JSON.parse(row.content);
+        //console.log(scorm,'scorm')
+        if(scorm){
+          //这里需要提取的到配置文件中，实际中只需要传 rowId就可以了
+          this.scormUrl=process.env.VUE_APP_SCORM_URL+'?mode=preview&scormId='+row.id;//播放的首页
+        }else{
+          this.$message({type: 'error',message: 'SCORM包解析失败'});
+        }
+
+      }
+      //console.log(row, 'row');
       this.coursewareShow = true;
     }
   }
diff --git a/src/views/course/MycaseRecord.vue b/src/views/course/MycaseRecord.vue
new file mode 100644
index 00000000..df55e649
--- /dev/null
+++ b/src/views/course/MycaseRecord.vue
@@ -0,0 +1,142 @@
+<template>
+     <div style="padding: 12px 32px 10px 12px;">
+      <div style="display: flex;justify-content: flex-start;">
+        <div style="margin-left:10px"><el-input v-model="caseData.keyWord"  placeholder="名称关键字" clearable></el-input></div>
+        <div style="padding-left: 10px;"><el-button type="primary" icon="el-icon-search" @click="getsearch()">搜索</el-button></div>
+        <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary" @click="reset">重置</el-button></div>
+        <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary" @click="Export">导出</el-button></div>
+      </div>
+     
+      <div style="margin-top:20px;">
+        <el-table :data="params" border stripe >
+            <el-table-column 
+            label="案例名称" 
+            prop="title"  
+            width="200px">
+            </el-table-column>
+            <el-table-column 
+            label="状态" 
+            prop="status" 
+            
+            width="100px">
+          <template slot-scope="scope">
+          <span v-if="scope.row.status == 0">草稿</span>
+          <span v-if="scope.row.status == 1">待审核</span>
+          <span v-if="scope.row.status == 2">未通过</span>
+          <span v-if="scope.row.status == 3">已发布</span>
+          </template>
+            </el-table-column>
+            <el-table-column 
+            label="审批完成时间" 
+            prop="endTime"
+            width="200px">
+            </el-table-column>
+            <el-table-column 
+            label="公开范围" 
+            prop="caseScope" 
+            width="100px">
+            </el-table-column>
+            <el-table-column 
+            label="浏览量" 
+            prop="views"
+            ></el-table-column>
+            <el-table-column 
+            label="点赞量" 
+            prop="praises"
+            width="100px" 
+            ></el-table-column>
+            <el-table-column 
+            label="分享量" 
+            prop="shares" 
+            width="100px"
+            ></el-table-column>
+            <el-table-column 
+            label="收藏量" 
+            width="100px" 
+            prop="favorites" 
+            ></el-table-column>
+           
+        </el-table>
+      </div>
+      <div v-if="count > 0" style="text-align: center; margin-top:57px">
+      <el-pagination
+      background
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="caseData.pageIndex"
+        :page-sizes="[10, 20, 30, 40]"
+        :page-size="caseData.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="count"
+      ></el-pagination>
+    </div>
+    </div>
+</template>
+
+<script>
+import aipCase from '../../api/modules/cases.js';
+import { mapGetters,mapActions } from 'vuex';
+export default {
+computed: {
+      ...mapGetters(['userInfo']),
+  },
+  data(){
+    return {
+        count:0,
+        caseData:{
+            pageIndex:1,
+            pageSize:10,
+            keyWord:'',
+            status:0,
+            },
+        params:[],
+    }
+  },
+  mounted(){
+    this.getcaseData();
+  },
+  
+  methods:{
+    Export(){
+      let data = {
+        keyWord:this.caseData.keyWord,
+      }
+      aipCase.exportCases(data).then(res =>{
+
+      })
+    },
+    getsearch(){
+      this.caseData.pageIndex = 1;
+      this.getcaseData();
+    },
+    handleSizeChange(val) {
+      this.caseData.pageSize = val;
+      this.caseData.pageIndex = 1;
+      this.getcaseData();
+    },
+    handleCurrentChange(val) {
+     this.caseData.pageIndex = val;
+      this.getcaseData();
+    },
+    getcaseData(){
+        aipCase.mylist(this.caseData).then(res =>{
+            console.log(res);
+            this.count = res.result.count;
+            this.params = res.result.list
+        })
+    },
+
+    reset(){
+      this.caseData.keyWord = '';
+      this.getcaseData();
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.Export{
+  display: flex;
+  padding-top: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/course/Mylecnotes.vue b/src/views/course/Mylecnotes.vue
new file mode 100644
index 00000000..c39bd6ad
--- /dev/null
+++ b/src/views/course/Mylecnotes.vue
@@ -0,0 +1,171 @@
+<template>
+     <div style="padding: 12px 32px 10px 12px;">
+      <div style="display: flex;justify-content: flex-start;">
+
+        <div><el-input v-model="keyword" placeholder="输入课程名称搜索" clearable></el-input></div>
+        <div style="padding-left: 10px;"><el-button @click="recordList()" type="primary" icon="el-icon-search">搜索</el-button></div>
+        <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" @click="keyword = ''" type="primary" >重置</el-button></div>
+        <div style="padding: 0px 5px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div>
+      </div>
+      <div class="Export">
+        <!-- <div style="padding-left: 10px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div> -->
+        <!-- <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary" size="small" round>导出学员信息</el-button></div> -->
+      </div>
+      <div style="margin-top:20px;">
+        <el-table :data="pageData" border stripe>
+            <el-table-column
+            label="课程时间"
+            prop="courseTime"
+            width="200px">
+            </el-table-column>
+            <el-table-column
+            label="课程名称"
+            prop="courseName"
+            width="200px">
+            </el-table-column>
+            <el-table-column
+            label="开课场地"
+            prop="address"
+            width="240px">
+            </el-table-column>
+            <el-table-column
+            label="所属课程"
+            prop="parentCourse"
+            width="120px">
+            </el-table-column>
+            <el-table-column
+            label="所属项目"
+            prop="parentProject"
+            ></el-table-column>
+            <el-table-column
+            label="所属路径"
+            prop="parentRoute"
+            width="200px"
+            ></el-table-column>
+            <el-table-column
+            label="学习总人数"
+            prop="studentNumber"
+            width="100px"
+            ></el-table-column>
+            <el-table-column
+            label="时长(分钟)"
+            width="100px"
+            prop="period"
+            ></el-table-column>
+            <el-table-column
+            label="评分"
+            width="100px"
+            prop="score"
+             ></el-table-column>
+            <!-- <el-table-column
+            label="操作"
+            align="center"
+            width="150px"
+            prop="cz"
+            fixed="right"
+             >
+             <template v-slot="scope">
+              <el-button type="primary" size="small">导出学员信息</el-button>
+            </template>
+          </el-table-column> -->
+        </el-table>
+      </div>
+
+    <div style="text-align: center; margin-top:57px">
+     <el-pagination
+      background
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="pageInfo.page"
+        :page-sizes="[10, 20, 30, 40]"
+        :page-size="pageInfo.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="pageInfo.total"
+      ></el-pagination>
+      </div>
+
+    </div>
+</template>
+
+<script>
+import apiCourse from '../../api/boe/courseRecord.js';
+import { mapGetters } from 'vuex';
+export default {
+  data(){
+    return {
+        pageData:[],
+        keyword:'',
+        pageInfo:{},
+    }
+  },
+
+  mounted() {
+    this.recordList(1);
+
+  },
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+
+  methods: {
+
+      exportFile(){
+        let req = {
+          teacherId: this.userInfo.sysId
+          // teacherId:"70F80F4E-34BA-10AB-894A-8FA812B19637"
+        }
+        apiCourse.courseRecordExport(req).then(res=>{
+            const link = document.createElement('a');// 创建a标签
+            let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); // 设置文件类型
+            link.style.display = "none";
+            link.href = URL.createObjectURL(blob); // 创建URL
+            link.setAttribute("download", "授课记录.xls");
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+        })
+      },
+
+      recordList(pageIndex){
+        let req = {
+        //     teacherId:"70F80F4E-34BA-10AB-894A-8FA812B19637",
+            teacherId: this.userInfo.sysId,
+            keyword:this.keyword,
+            page:pageIndex,
+            pageSize:10
+        }
+        apiCourse.courseRecordList(req).then(res=>{
+          if(res.status == 200) {
+            this.pageData = res.result.list;
+            this.pageInfo = res.result.pageInfo;
+          } else {
+             this.$message({
+              type: 'error',
+              message: res.message
+            });
+          }
+        })
+      },
+
+      // 每页显示的条数事件
+      handleSizeChange(val){
+        this.pageInfo.pageSize = val;
+        this.recordList(1);
+      },
+      // 显示制定页的数据
+      handleCurrentChange(val){
+        this.pageInfo.pageIndex = val;
+        this.recordList(this.pageInfo.pageIndex);
+      },
+
+  },
+
+}
+</script>
+
+<style lang="scss" scoped>
+.Export{
+  display: flex;
+  padding-top: 10px;
+}
+</style>
diff --git a/src/views/exam/ExamList.vue b/src/views/exam/ExamList.vue
index f3886a8d..f6e67f13 100644
--- a/src/views/exam/ExamList.vue
+++ b/src/views/exam/ExamList.vue
@@ -58,22 +58,36 @@
                 {{ scope.row.published ? '已发布' : '未发布' }}
               </template>
             </el-table-column>
+            <el-table-column label="上下架" prop="collectNumber">
+              <template slot-scope="scope">
+              <!--  {{ scope.row.enabled ? '已上架' : '已下架' }} -->
+                <span v-if="scope.row.enabled">已上架</span>
+                <span v-else style="color:red">已下架</span>
+              </template>
+            </el-table-column>
             <el-table-column label="创建人" prop="sysCreateBy"></el-table-column>
             <el-table-column label="操作" width="250px" fixed="right">
               <template slot-scope="scope">
                 <!-- v-if="scope.row.collectNumber === 0" -->
                 <el-button type="text" v-if="!scope.row.published" @click="releaseData(scope.row,true)">发布</el-button>
+
                   <!-- // 成绩控制需要结束状态 -->
                 <el-button type="text" v-if="scope.row.published" @click="viewResults(scope.row)">成绩</el-button>
                 <el-button type="text" v-if="scope.row.published" @click="pushResults(scope.row)">推送</el-button>
-                <el-button type="text" v-if="scope.row.published" @click="creatQrCode(scope.row)">二维码</el-button>
+                <!-- <el-button type="text" v-if="scope.row.published" @click="creatQrCode(scope.row)">二维码</el-button> -->
                 <el-button type="text" v-if="scope.row.published" @click="releaseData(scope.row,false)">取消发布</el-button>
-                <el-dropdown type="text" v-if="!scope.row.published" style="margin-left:10px">
-                  <el-button type="text" > 考试 <i class="el-icon-arrow-down el-icon--right"></i> </el-button>
+                <el-dropdown type="text"  style="margin-left:10px">
+                  <el-button type="text" > 更多 <i class="el-icon-arrow-down el-icon--right"></i> </el-button>
                   <el-dropdown-menu slot="dropdown">
                     <!-- <el-dropdown-item command="a">查看</el-dropdown-item> -->
                     <el-dropdown-item command="b" @click.native="editData(scope.row)">编辑</el-dropdown-item>
+                    <el-dropdown-item command="b" @click.native="editPaper(scope.row)">修改试卷</el-dropdown-item>
                     <el-dropdown-item command="c" @click.native="deleteData(scope.row)">删除</el-dropdown-item>
+                    <el-dropdown-item command="a" @click.native="creatQrCode(scope.row)">二维码</el-dropdown-item>
+                    <div v-if="scope.row.published">
+                     <el-dropdown-item command="d" v-if="scope.row.enabled == false" @click.native="enableddata(scope.row,true)">上架</el-dropdown-item>
+                     <el-dropdown-item  command="e" v-if="scope.row.enabled == true" @click.native="open(scope.row,false)">下架</el-dropdown-item>
+                  </div>
                   </el-dropdown-menu>
                 </el-dropdown>
               </template>
@@ -108,33 +122,32 @@
                       </el-cascader>
                     </el-form-item> -->
                   </el-col>
-                  <el-col :span="12">
+                  <el-col :span="12" >
                     <el-form-item label="模式" prop="testType">
-                      <el-select v-model="examForm.testType">
+                      <el-select :disabled="swichpublished" v-model="examForm.testType">
                         <el-option label="测试模式" :value="1"></el-option>
                         <el-option label="练习模式" :value="2"></el-option>
                       </el-select>
                     </el-form-item>
                   </el-col>
 
-                  <el-col :span="24">
+
+                  <el-col :span="24" >
                     <el-form-item label="考试名称" prop="testName">
-                      <el-input v-model="examForm.testName"  maxlength="50"
-                      show-word-limit placeholder="请输入名称"></el-input>
+                      <el-input :disabled="swichpublished" v-model="examForm.testName"  maxlength="50"  show-word-limit placeholder="请输入名称"></el-input>
                     </el-form-item>
                   </el-col>
 
                   <el-col :span="24">
                     <el-form-item label="考试描述">
-                      <el-input v-model="examForm.testRemark" maxlength="200"
-                      show-word-limit type="textarea" placeholder="请输入考试描述"></el-input>
+                      <el-input :disabled="swichpublished" v-model="examForm.testRemark" maxlength="200"  show-word-limit type="textarea" placeholder="请输入考试描述"></el-input>
                     </el-form-item>
                   </el-col>
 
                   <el-col :span="24">
                     <el-form-item label="考前描述">
                       <el-input
-                        v-model="examForm.testFront"
+                        v-model="examForm.testFront" :disabled="swichpublished"
                         type="textarea"
                         maxlength="200"
                         show-word-limit
@@ -142,18 +155,14 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="24">
-                    <el-form-item label="考后描述"><el-input
-                        v-model="examForm.testUp"
-                        type="textarea"
-                        maxlength="200"
-                        show-word-limit
-                        placeholder="请输入考后描述"></el-input>
+                    <el-form-item label="考后描述">
+                      <el-input   v-model="examForm.testUp" :disabled="swichpublished"   type="textarea"   maxlength="200"  show-word-limit placeholder="请输入考后描述"></el-input>
                     </el-form-item>
                   </el-col>
 
                   <el-col :span="12">
                     <el-form-item label="试卷" prop="paperId">
-                      <el-select v-model="examForm.paperId" placeholder="请选择" @change="changePaper">
+                      <el-select :disabled="swichpublished" v-model="examForm.paperId" placeholder="请选择" @change="changePaper">
                         <el-option
                           v-for="item in questDirOptions"
                           :key="item.id"
@@ -168,13 +177,13 @@
                       <!-- <el-input v-model="examForm.testDuration" placeholder="20-120">
                         <template slot="append"> 分钟 </template>
                       </el-input> -->
-                      <el-input-number v-model="examForm.testDuration" controls-position="right" :min="10" :max="120" placeholder="分钟"></el-input-number>
+                      <el-input-number :disabled="swichpublished" v-model="examForm.testDuration" controls-position="right" :min="10" :max="120" placeholder="分钟"></el-input-number>
                     </el-form-item>
                   </el-col>
 
                   <el-col :span="12">
                     <el-form-item label="显示解析">
-                      <el-radio-group v-model="examForm.showAnalysis">
+                      <el-radio-group :disabled="swichpublished" v-model="examForm.showAnalysis">
                         <el-radio :label="true">允许查看</el-radio>
                         <el-radio :label="false">不允许查看</el-radio>
                       </el-radio-group>
@@ -182,7 +191,7 @@
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="显示答案">
-                      <el-radio-group v-model="examForm.showAnswer">
+                      <el-radio-group :disabled="swichpublished" v-model="examForm.showAnswer">
                         <el-radio :label="true">允许查看</el-radio>
                         <el-radio :label="false">不允许查看</el-radio>
                       </el-radio-group>
@@ -191,8 +200,8 @@
                   </el-row>
                   <el-row :gutter="10">
                     <el-col :span="12">
-                      <el-form-item label="随机模式">
-                        <el-radio-group v-model="examForm.randomMode" @change="changeRandomMode">
+                      <el-form-item  label="随机模式">
+                        <el-radio-group :disabled="swichpublished" v-model="examForm.randomMode" @change="changeRandomMode">
                           <el-radio :label="true">是</el-radio>
                           <el-radio :label="false">否</el-radio>
                         </el-radio-group>
@@ -200,8 +209,7 @@
                     </el-col>
                     <el-col :span="12">
                       <el-form-item  v-if="examForm.randomMode" label="随机数量" required>
-                        <el-input-number v-model="examForm.randomCount" controls-position="right" :min="1" :max="qnum">
-                        </el-input-number>
+                        <el-input-number :disabled="swichpublished" v-model="examForm.randomCount" controls-position="right" :min="1" :max="qnum"></el-input-number>
                         <span style="margin-left:10px;" v-if="qnum==0">先选择试卷</span>
                         <span style="margin-left:10px;" v-if="qnum>0">试卷有 {{qnum}} 道试题</span>
                         <!-- <el-input v-model="examForm.randomCount"><template slot="append"> 不能大于{{qnum}} </template></el-input> -->
@@ -217,10 +225,11 @@
                     </el-col>
                     <el-col :span="12">
                       <el-form-item label="试题排列">
-                        <el-radio-group v-model="examForm.arrange">
-                          <el-radio :label="1">试题乱序</el-radio>
-                          <el-radio :label="2">选项乱序</el-radio>
-                          <el-radio :label="3">全部乱序</el-radio>
+                        <el-radio-group :disabled="swichpublished" v-model="examForm.arrange">
+                          <el-radio :label="1" style="margin-right: 15px">试题乱序</el-radio>
+                          <el-radio :label="2" style="margin-right: 15px">选项乱序</el-radio>
+                          <el-radio :label="3" style="margin-right: 15px">全部乱序</el-radio>
+                          <el-radio :label="4" style="margin-right: 15px">不乱序</el-radio>
                         </el-radio-group>
                       </el-form-item>
                     </el-col>
@@ -228,7 +237,7 @@
                   <el-row :gutter="10">
                   <el-col :span="12">
                     <el-form-item label="评分模式">
-                      <el-radio-group v-model="examForm.scoringType">
+                      <el-radio-group :disabled="swichpublished" v-model="examForm.scoringType">
                         <el-radio :label="1">最高一次</el-radio>
                         <el-radio :label="2">最后一次</el-radio>
                       </el-radio-group>
@@ -236,7 +245,7 @@
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="范围">
-                      <el-radio-group v-model="examForm.rangeType">
+                      <el-radio-group :disabled="swichpublished" v-model="examForm.rangeType">
                         <el-radio :label="1">独立使用</el-radio>
                         <el-radio :label="2" disabled>课程内部</el-radio>
                       </el-radio-group>
@@ -244,10 +253,10 @@
                   </el-col>
 
                   <el-col :span="12">
-                    <el-form-item v-if="examForm.rangeType === 1" label="及格线">
+                    <el-form-item  v-if="examForm.rangeType === 1" label="及格线">
                       <!-- <el-input placeholder="20-120" v-model="examForm.passLine">
                       </el-input> -->
-                       <el-input-number v-model="examForm.passLine" controls-position="right" :min="20" :max="120" placeholder="20-120"></el-input-number>
+                       <el-input-number :disabled="swichpublished" v-model="examForm.passLine" controls-position="right" :min="20" :max="120" placeholder="20-120"></el-input-number>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
@@ -287,7 +296,7 @@
                         {{ resOwnerName(detailInfo.resOwner1) }}/{{resOwnerName(detailInfo.resOwner2)}}{{ detailInfo.resOwner3 ? '/' : ''}}{{ resOwnerName(detailInfo.resOwner3) }}
                       </el-form-item>
                     </el-col> -->
-                    <el-col :span="12">
+                    <el-col :span="12" >
                       <el-form-item label="模式">
                         <span v-if="detailInfo.testType == 1">测试模式</span>
                         <span v-if="detailInfo.testType == 2">练习模式</span>
@@ -652,6 +661,7 @@
         </el-main>
       </el-container>
     </el-container>
+    <editPaper ref="comEditPaper"></editPaper>
   </div>
 </template>
 
@@ -668,13 +678,16 @@ import usergroupApi from "@/api/modules/usergroup";
 import pushRecordApi from "@/api/modules/pushRecord";
 import {toScoreTow} from '@/utils/tools.js'
 import apiUserBasic from '@/api/boe/userbasic.js';
+import editPaper from "@/components/Exam/EditPaper";
 export default {
   name: 'articleItems',
+  components:{editPaper},
   computed: {
      ...mapGetters(['resOwnerMap','sysTypeMap']),
     },
   data() {
     return {
+      swichpublished:false,
       toScoreTow,
       qnum:0,//这里默认是30吧
       examDateTime:[],
@@ -757,6 +770,25 @@ export default {
     this.loadData()
   },
   methods: {
+    editPaper(row){
+      if(!row.paperId){
+        this.$message.error("此考试还未选择试卷");
+        return;
+      }
+      this.$refs.comEditPaper.show(row.paperId);
+    },
+    open(row,flag) {
+        this.$confirm('确定要下架改考试么?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.enableddata(row,flag);
+          this.$message({  type: 'success',  message: '下架成功!' });
+        }).catch(() => {
+          this.$message({ type: 'info',  message: '已取消下架' });
+        });
+      },
     exportsList(){
       if(this.answerData.data.length == 0){
         return this.$message.warning('暂无导出数据！')
@@ -988,6 +1020,7 @@ export default {
       }
     },
     editData(row) {
+      this.swichpublished =  row.published;
       if(this.questDirOptions.length==0){
         this.findPapers();//获取试卷列表
       }
@@ -1040,6 +1073,22 @@ export default {
           })
         })
     },
+    enableddata(row,flag){
+      //console.log(row,flag)
+      let query = {
+        id:row.id,
+        enabled:flag
+      }
+      //console.log(query)
+      apiTest.enabled(query).then(res =>{
+          if(res.status == 200){
+            row.enabled=flag;
+          }else{
+            this.$message({ type: 'error', message: res.message})
+          }
+      })
+
+    },
     releaseData(row,num) {
       let publish = num;
       this.$confirm(`正在${publish? '':'取消'}发布考试, 是否继续?`, '提示', {
diff --git a/src/views/exam/Question.vue b/src/views/exam/Question.vue
index f3ea1bb9..521bfe8d 100644
--- a/src/views/exam/Question.vue
+++ b/src/views/exam/Question.vue
@@ -14,19 +14,11 @@
           </el-col> -->
           <el-col :span="4">
               <el-select v-model="params.type" clearable placeholder="类型" >
-                  <el-option
-                    v-for="item in optionsList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                  </el-option>
-                </el-select>
+                <el-option  v-for="item in optionsList"  :key="item.value"  :label="item.label"   :value="item.value"> </el-option>
+              </el-select>
           </el-col>
           <el-col :span="3">
-              <el-input style="margin-left:10px"
-                  v-model="params.title"
-                  placeholder="题干"
-                  clearable></el-input>
+              <el-input style="margin-left:10px" v-model="params.title" placeholder="题干" clearable></el-input>
           </el-col>
           <el-col :span="17" style="display:flex;justify-content: space-between;">
               <div style="flex: 1;">
@@ -34,15 +26,8 @@
                  <el-button  icon="el-icon-refresh-right" type="primary" @click="reset"> 重置 </el-button>
                  <el-button type="primary" @click="addQuestion(1)" style="margin-left: 10px" icon="el-icon-plus"> 添加 </el-button>
                  <div style="display: inline-block;margin-left: 10px;">
-                   <file-upload
-                    dir="files"
-                    text="导入"
-                    :loading="true"
-                    size="medium"
-                    url="/xboe/m/exam/question/import"
-                    :isShowTip="false"
-                      @success="uploadFile"
-                      @remove="removeFile" >
+                   <file-upload dir="files"  text="导入"  :loading="true"  size="medium"  url="/xboe/m/exam/question/import"
+                    :isShowTip="false"  @success="uploadFile"   @remove="removeFile" >
                   </file-upload>
                  </div>
               </div>
@@ -81,8 +66,7 @@
             </el-table-column>
           </el-table>
           <div v-if="tableData.length > 0" style="text-align: center;margin-top:70px">
-            <el-pagination
-            background
+            <el-pagination  background
              @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
               :current-page="pageIndex"
@@ -93,11 +77,10 @@
               </el-pagination>
           </div>
         </el-main>
-        <el-dialog :title="isAdd ? '新建试题' : '编辑试题'" :visible.sync="addQuestionDialog">
-          <span style=" font-weight: 700; font-size: 14px; margin-left: 42px; margin-right: 10px; ">类型</span>
-          <el-radio-group
-            v-model="question.type"
-            :disabled="question.id != null">
+        <el-dialog :title="isAdd ? '新建试题' : '编辑试题'" :visible.sync="addQuestionDialog" width="750px" top="10vh">
+          <div >
+          <span style="font-weight: 700; font-size: 14px; margin-left: 42px; margin-right: 10px;">类型</span>
+          <el-radio-group  v-model="question.type" :disabled="question.id != null">
             <el-radio :label="1">单选</el-radio>
             <el-radio :label="2">多选</el-radio>
             <el-radio :label="3">判断题</el-radio>
@@ -105,41 +88,58 @@
           <div v-if="question.type == 1 || question.type == 2">
             <div style="padding-top: 10px; overflow: auto">
               <div>
-                <el-form
-                  size="mini"
-                  label-width="80px"
-                  :model="question"
-                  ref="questionForm"
-                  :rules="questionRules">
+                <el-form  size="mini"  label-width="80px"  :model="question" ref="questionForm" :rules="questionRules">
                   <!-- <el-form-item label="资源归属">
                     <el-cascader v-model="ownership" :options="resOwnerListMap" :props="resourceProps"></el-cascader>
                   </el-form-item> -->
                   <el-form-item label="题干" prop="title">
-                    <el-input
-                      type="textarea"
-                      :rows="3"
-                      maxlength="500"
-                      show-word-limit
-                      v-model="question.title"
-                      placeholder="请输入题干"></el-input>
+                    <el-col :span="15">
+                      <el-input  class="inputclass"  type="textarea" :rows="5" maxlength="500" show-word-limit  v-model="question.title" placeholder="请输入题干"></el-input>
+                    </el-col>
+                    <el-col :span="7">
+                      <div v-if="question.images" style="display: flex;padding-left: 10px;">
+                        <el-image :src="imageBaseUrl+question.images" style="width: 100px; height: 80px;margin: 2px;"></el-image>
+                        <el-button @click="deleteQImage" type="text">删除</el-button>
+                      </div>
+                      <div v-else style="padding-left: 10px;">
+                        <el-upload
+                          class="upload-drag"
+                          :action="uploadImgUrl"
+                          :on-success="handleUploadSuccess"
+                          :on-remove="handleRemove"
+                          :limit="1">
+                          <el-button type="text">点击上传图片</el-button>
+                          <div slot="tip" class="el-upload__tip">jpg/png文件不超过500kb</div>
+                        </el-upload>
+                      </div>
+                    </el-col>
                   </el-form-item>
-                  <div v-for="(o, i) in question.optionList" :key="i">
+                  <div v-for="(opt, i) in question.optionList" :key="i" >
                     <el-form-item :label="'选项' + (i + 1)">
-                      <el-input
-                        style="width: 300px; margin-right: 10px"
-                        v-model="question.optionList[i].content"
-                        placeholder="填写选择题的选项内容"></el-input>
+                      <el-input  style="width: 300px; margin-right: 10px"  v-model="opt.content" placeholder="填写选择题的选项内容"></el-input>
                       <!-- <el-input
                         v-if="question.type == 2"
                         style="width: 80px; margin-right: 10px"
                         v-model="question.optionList[i].score"
                         placeholder="得分"></el-input> -->
                          <!-- v-else -->
-                      <el-radio  v-if="question.type == 1" v-model="question.optionList[i].isAnswer" @change="radioChange(i)" :label="true">正确</el-radio>
-                      <el-checkbox
-                        v-else
-                        v-model="question.optionList[i].isAnswer"
-                        style="width: 80px; margin-right: 10px">正确</el-checkbox>
+                         <!-- <div class="optionbox"> -->
+
+                          <el-upload
+                            class="upload-demo Optionsimage"
+                            :action="uploadImgUrl"
+                            :data="opt"
+                            :on-success="(response)=>handleUploadOptionsSuccess(i,response)"
+                            :on-remove="handleRemove"
+                            :before-remove="beforeRemove"
+                            :limit="1"
+                            :file-list="opt.imgList"
+                            list-type="picture">
+                            <el-button style="padding-top:0;"   type="text">点击上传图片</el-button>
+                           </el-upload>
+                         <!-- </div> -->
+                      <el-radio  v-if="question.type == 1" v-model="opt.isAnswer" @change="radioChange(i)" :label="true">正确</el-radio>
+                      <el-checkbox v-else  v-model="opt.isAnswer" style="width: 80px; margin-right: 10px">正确</el-checkbox>
                       <el-button type="text" @click="removeOption(i)">删除</el-button>
                     </el-form-item>
                   </div>
@@ -147,30 +147,24 @@
                     <el-button type="text" @click="addOption">添加选项</el-button>
                   </center>
                   <el-form-item label="难度">
-                    <el-select
-                      v-model="question.difficulty"
-                      placeholder="请选择">
-                      <el-option
-                        v-for="item in difficultyOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"></el-option>
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item label="默认分" prop="defaultScore">
-                    <el-input
-                    type="number"
-                      v-model="question.defaultScore"
-                      placeholder="请输入默认分"></el-input>
+                    <el-col :span="12">
+                      <el-select  v-model="question.difficulty" placeholder="请选择">
+                        <el-option
+                          v-for="item in difficultyOptions"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value"></el-option>
+                      </el-select>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item label="默认分" prop="defaultScore">
+                        <el-input type="number"  v-model="question.defaultScore"  placeholder="请输入默认分"></el-input>
+                      </el-form-item>
+                    </el-col>
                   </el-form-item>
+
                   <el-form-item label="解析">
-                    <el-input
-                      v-model="question.analysis"
-                      placeholder="请输入解析"
-                      type="textarea"
-                      maxlength="200"
-                      show-word-limit
-                      :rows="3"></el-input>
+                    <el-input v-model="question.analysis"  placeholder="请输入解析"  type="textarea"  maxlength="200" show-word-limit  :rows="3"></el-input>
                   </el-form-item>
                 </el-form>
               </div>
@@ -182,61 +176,58 @@
           <div v-if="question.type == 3">
             <div style="padding-top: 10px; overflow: auto">
               <div>
-                <el-form
-                  size="mini"
-                  label-width="80px"
-                  :model="question"
-                  ref="questionForm"
-                  :rules="questionRules">
+                <el-form  size="mini" label-width="80px" :model="question" ref="questionForm" :rules="questionRules">
                   <!-- <el-form-item label="资源归属">
                     <el-cascader v-model="ownership" :options="resOwnerListMap" :props="resourceProps" ></el-cascader>
                   </el-form-item> -->
-                  <el-form-item label="题干" prop="title"
-                    ><el-input
-                    type="textarea"
-                      :rows="3"
-                      v-model="question.title"
-                      placeholder="请输入题干"
-                      maxlength="500"
-                      show-word-limit
-                    ></el-input
-                  ></el-form-item>
+                  <el-form-item label="题干" prop="title">
+                      <el-col :span="15">
+                        <el-input  class="inputclass"  type="textarea" :rows="5" maxlength="500" show-word-limit  v-model="question.title" placeholder="请输入题干"></el-input>
+                      </el-col>
+                      <el-col :span="7">
+                        <div v-if="question.images" style="display: flex;padding-left: 10px;">
+                          <el-image :src="imageBaseUrl+question.images" style="width: 100px; height: 80px;margin: 2px;"></el-image>
+                          <el-button @click="deleteQImage" type="text">删除</el-button>
+                        </div>
+                        <div v-else style="padding-left: 10px;">
+                          <el-upload
+                            class="upload-drag"
+                            :action="uploadImgUrl"
+                            :on-success="handleUploadSuccess"
+                            :on-remove="handleRemove"
+                            :limit="1">
+                            <el-button type="text">点击上传图片</el-button>
+                            <div slot="tip" class="el-upload__tip">jpg/png文件不超过500kb</div>
+                          </el-upload>
+                        </div>
+                      </el-col>
+                  </el-form-item>
                   <el-form-item label="正确/错误">
-                    <el-radio v-model="question.answer" :label="true"
-                      >正确</el-radio>
-                    <el-radio v-model="question.answer" :label="false"
-                      >错误</el-radio>
+                    <el-radio v-model="question.answer" :label="true">正确</el-radio>
+                    <el-radio v-model="question.answer" :label="false">错误</el-radio>
                   </el-form-item>
                   <el-form-item label="难度">
-                    <el-select
-                      v-model="question.difficulty"
-                      placeholder="请选择">
+                    <el-select v-model="question.difficulty" placeholder="请选择">
                       <el-option
                         v-for="item in difficultyOptions"
                         :key="item.value"
                         :label="item.label"
-                        :value="item.value"
-                      ></el-option>
+                        :value="item.value" ></el-option>
                     </el-select>
                   </el-form-item>
                   <!-- <el-form-item label="知识点"><el-input v-model="question.dian" placeholder="请输入知识点"></el-input></el-form-item> -->
-                  <el-form-item label="默认分" prop="defaultScore"
-                    ><el-input
-                    type="number"
-                      v-model="question.defaultScore"
-                      placeholder="请输入默认分"
-                    ></el-input
-                  ></el-form-item>
-                  <el-form-item label="解析"
-                    ><el-input
+                  <el-form-item label="默认分" prop="defaultScore">
+                    <el-input type="number"  v-model="question.defaultScore"placeholder="请输入默认分"></el-input>
+                  </el-form-item>
+                  <el-form-item label="解析">
+                    <el-input
                       v-model="question.analysis"
                       placeholder="请输入解析"
                       type="textarea"
                       :rows="3"
                       maxlength="200"
-                      show-word-limit
-                    ></el-input
-                  ></el-form-item>
+                      show-word-limit></el-input>
+                    </el-form-item>
                 </el-form>
               </div>
               <div style="text-align: right">
@@ -244,28 +235,47 @@
               </div>
             </div>
           </div>
+          </div>
         </el-dialog>
         <el-dialog title="查看试题" append-to-body :visible.sync="viewVolumeShow" width="40%" custom-class="g-dialog">
           <div style="padding: 10px; font-size: 20px">
             <div v-if="question.type == 1">
-              <div>【单选题】{{question.title}}（{{question.defaultScore}}分）</div>
+                <div>
+                  <div>【单选题】{{question.title}}（{{question.defaultScore}}分）</div>
+                  <div v-if="question.images" style="padding-left: 40px;"><el-image :src="imageBaseUrl+question.images" style="width: 60px;height: 50px;"></el-image> </div>
+                </div>
                 <div v-for="(item, i) in question.optionList" :key="i">
-                  <el-radio disabled :value="item.isAnswer" :label="true" style="margin-right: 0px;">&nbsp;</el-radio>
-                  <span>{{numberToLetter(i + 1)}}：</span>
-                  <span>{{question.optionList[i].content}}</span>
+                  <div>
+                    <span style="width: 20px;color:green;display: inline-block;">{{item.isAnswer? '√':''}}  </span>
+                    <span>{{numberToLetter(i + 1)}}：</span>
+                    <span>{{item.content}}</span>
+                  </div>
+                  <div v-if="item.images" style="padding-left: 50px;">
+                    <span ><el-image :src="imageBaseUrl+item.images" style="width: 60px;height: 50px;"></el-image> </span>
+                  </div>
                 </div>
             </div>
             <div v-if="question.type == 2">
-              <div>【多选题】{{question.title}}（{{question.defaultScore}}分）</div>
+                <div>
+                  <div>【多选题】{{question.title}}（{{question.defaultScore}}分）</div>
+                  <div v-if="question.images" style="padding-left: 40px;"><el-image :src="imageBaseUrl+question.images" style="width: 60px;height: 50px;"></el-image> </div>
+                </div>
                 <div v-for="(item, i) in question.optionList" :key="i">
-                    <el-checkbox v-if="item.isAnswer == true" :value="true" disabled>&nbsp;</el-checkbox>
-                    <el-checkbox v-else disabled >&nbsp;</el-checkbox>
-                  <span>{{numberToLetter(i + 1)}}：</span>
-                  <span>{{item.content}}</span>
+                    <div>
+                      <span style="width: 20px;color:green;display: inline-block;">{{item.isAnswer? '√':''}}  </span>
+                      <span>{{numberToLetter(i + 1)}}：</span>
+                      <span>{{item.content}}</span>
+                    </div>
+                    <div v-if="item.images" style="padding-left: 50px;">
+                      <span ><el-image :src="imageBaseUrl+item.images" style="width: 60px;height: 50px;"></el-image> </span>
+                    </div>
                 </div>
             </div>
             <div v-if="question.type == 3">
-              <div>【判断题】{{question.title}}（{{question.defaultScore}}分）</div>
+              <div>
+                  <div>【判断题】{{question.title}}（{{question.defaultScore}}分）</div>
+                  <div v-if="question.images" style="padding-left: 40px;"><el-image :src="imageBaseUrl+question.images" style="width: 60px;height: 50px;"></el-image> </div>
+              </div>    
               <el-radio disabled :value="question.answer" :label="true" style="margin-right: 0px;">&nbsp;</el-radio><span  style="margin-right: 30px;">正确</span>
               <el-radio disabled :value="question.answer" :label="false" style="margin-right: 0px;">&nbsp;</el-radio><span>错误</span>
             </div>
@@ -289,6 +299,7 @@ import { numberToLetter} from "../../utils/tools.js";
 import { mapGetters,mapActions} from 'vuex';
 import fileUpload from '@/components/FileUpload/index.vue';
 import { setTimeout } from 'timers';
+import { getToken } from "@/utils/token";
 // import {resOwnerIndexName} from '@/utils/type.js';
 const questionData = {
   type: 1,
@@ -298,12 +309,13 @@ const questionData = {
   project: "",
   createPerson: "",
   moduel: "",
+  images:"",
   statue: 0,
   optionList: [
-    { content: "", score: "", isAnswer: false },
-    { content: "", score: "", isAnswer: false },
-    { content: "", score: "", isAnswer: false },
-    { content: "", score: "", isAnswer: false },
+    { content: "", score: "", isAnswer: false ,images:"",imgList:[]},
+    { content: "", score: "", isAnswer: false ,images:"",imgList:[]},
+    { content: "", score: "", isAnswer: false ,images:"",imgList:[]},
+    { content: "", score: "", isAnswer: false ,images:"",imgList:[]},
   ],
   // resSysId: [], // 试题目录
   difficulty: "", // 难度
@@ -317,6 +329,13 @@ export default {
     },
   data() {
     return {
+      curOption:[],
+      uploadImgUrl: process.env.VUE_APP_BASE_API + "/xboe/sys/xuploader/file/upload", // 上传的图片服务器地址
+      imageBaseUrl:process.env.VUE_APP_FILE_BASE_URL,
+      headers: {
+        'XBOE-Access-Token': getToken(),
+      },
+      fileList:[],
       resOwnerListMap: [],
       // resOwnerName: resOwnerIndexName,
       ownership: [],
@@ -325,18 +344,9 @@ export default {
       viewVolumeShow: false,
       isAdd: false,
       optionsList: [
-        {
-          value: "1",
-          label: "单选",
-        },
-        {
-          value: "2",
-          label: "多选",
-        },
-        {
-          value: "3",
-          label: "判断",
-        },
+        {value: "1",label: "单选"},
+        {value: "2",label: "多选"},
+        {value: "3",label: "判断"},
       ],
       inputValue: "",
       params: { type: "", resSysId: "", title: "", ownership: [] },
@@ -345,24 +355,12 @@ export default {
       count: 0,
       pageIndex: 1,
       url: `${this.webBaseUrl}/temp/exam.png`,
-      resourceProps: {
-        value: "code",
-        label: "name",
-      },
+      resourceProps: {value: "code",label: "name"},
       question: questionData,
       difficultyOptions: [
-        {
-          value: 1,
-          label: "容易",
-        },
-        {
-          value: 2,
-          label: "中等",
-        },
-        {
-          value: 3,
-          label: "困难",
-        },
+        {value: 1,label: "容易"},
+        {value: 2,label: "中等"},
+        {value: 3,label: "困难"},
       ],
       addQuestionDialog: false,
       questionRules: {
@@ -377,11 +375,32 @@ export default {
     this.loadData(1);
   },
   mounted() {
+
     this.getResOwnerTree().then(rs=>{
       this.resOwnerListMap=rs;
     });
   },
   methods: {
+
+    handleUploadOptionsSuccess(optIdx,res){
+      //console.log(optIdx,'optIdx');
+      //console.log(res,'res');
+      this.question.optionList[optIdx].images=res.result.filePath;
+      this.question.optionList[optIdx].imgList=[
+        {url:res.result.httpPath},
+      ]
+    },
+    handleUploadSuccess(res) {
+      //console.log(res.result.filePath);
+      this.question.images=res.result.filePath;
+    },
+    handleRemove(file, fileList) {
+        console.log(file, fileList);
+        //需要同时删除已上传的图片，后续完善要加上
+    },
+    beforeRemove(file, fileList) {
+      return this.$confirm(`您确定移除图片吗？`);
+    },
     downloadTemplate(){
       let fileName = "试题导入模板.xls";
       let link = document.createElement('a'); //创建a标签
@@ -514,6 +533,7 @@ export default {
               // 判断题没有optionList
               this.question.optionList = [];
             }
+             console.log(questionData,'llkk')
             examQuestionApi
               .save(this.question)
               .then((res) => {
@@ -579,9 +599,8 @@ export default {
     },
     editQuestion(row) {
       this.isAdd = false;
-      examQuestionApi
-        .detail(row.id)
-        .then((res) => {
+      let $this=this;
+      examQuestionApi.detail(row.id).then((res) => {
           if (res.status == 200) {
             this.addQuestionDialog = true;
             this.question = res.result;
@@ -599,9 +618,16 @@ export default {
             if (this.question.optionList == null) {
               this.question.optionList = [];
             }
+            this.question.optionList.forEach(opt=>{
+              if(opt.images){
+                opt.imgList=[{url:this.imageBaseUrl+opt.images}];
+              }else{
+                opt.imgList=[];
+              }
+
+            })
           }
-        })
-        .catch((err) => {
+        }).catch((err) => {
           this.$message({ type: "error", message: err });
         });
     },
@@ -612,9 +638,13 @@ export default {
       this.addQuestionDialog = true;
       this.question.type = type;
     },
+    deleteQImage(){
+       this.question.images='';
+       //同时后吧删除图片，后续要补上
+    },
     addOption() {
       if (this.question.optionList.length < 10) {
-        this.question.optionList.push({ content: "", score: "", isAnswer: 0 });
+        this.question.optionList.push({ content: "", score: "", isAnswer: 0 ,images:""});
       }
     },
     removeOption(i) {
@@ -627,6 +657,47 @@ export default {
 </script>
 
 <style scoped lang="scss">
+::v-deep .el-upload-list__item-name{
+  display: none;
+}
+::v-deep .el-upload-list--picture .el-upload-list__item-thumbnail{
+  width: 60px !important;
+  height: 60px !important;
+}
+::v-deep .el-upload-list--picture .el-upload-list__item.is-success .el-upload-list__item-name{
+  display: none;
+}
+::v-deep .el-upload-list--picture .el-upload-list__item{
+  border: none !important;
+}
+ ::v-deep .el-upload-list__item-status-label{
+  display: none !important;
+}
+::v-deep .el-form-item--mini.el-form-item, .el-form-item--small.el-form-item{
+  margin-bottom: 37px !important;
+}
+.inputclass{
+  position: relative;
+}
+::v-deep .el-upload-list{
+  position: absolute !important;
+  // right: 10px !important;
+  // top:0 !important;
+  // height: 60px;
+  margin-top: -68px !important;
+}
+.optionbox{
+  float: right;
+}
+.Optionsimage{
+ margin-right: 28px;
+ margin-top: 0 !important;
+ display: inline-block;
+ height: 30px;
+}
+.upload-demo{
+  margin-top: 10px;
+}
 .svg-icon {
   margin-right: 8px;
    font-size: 19px;
@@ -654,4 +725,16 @@ export default {
     flex: 12;
   }
 }
+.upload-drag{
+  .el-uoload{
+    .el-upload-dragger{
+      height: 50px;
+      width: 120px
+    }
+  }
+
+}
+::v-deep .el-upload-dragger{
+  height: 50px;
+}
 </style>
diff --git a/src/views/exam/Test.vue b/src/views/exam/Test.vue
index 389309ad..05aba755 100644
--- a/src/views/exam/Test.vue
+++ b/src/views/exam/Test.vue
@@ -11,8 +11,7 @@
               <ul>
                 <li>考试时长:  {{ testPaper.testDuration }}分钟</li>
                 <li>及格线:  {{ testPaper.passLine }}</li>
-                <li v-if="testPaper.entranceTime">开始时间:
-                {{ testPaper.entranceTime }}</li>
+                <li v-if="testPaper.entranceTime">开始时间:{{ testPaper.entranceTime }}</li>
                 <li v-if="testPaper.times">尝试次数:  {{ testPaper.times }}</li>
                 <li v-if="testPaper.deadlineTime">结束时间:  {{ testPaper.deadlineTime }}</li>
               </ul>
@@ -27,7 +26,10 @@
                         <span>{{tipText}}</span>
                     </div>
                     <div v-else>
-                        <el-button type="primary" :disabled="startButton" v-if="testStatus == 1" @click="startTest()">{{btnText}}</el-button>
+                        <span v-if="testPaper.enabled">
+                          <el-button type="primary" :disabled="startButton" v-if="testStatus == 1" @click="startTest()">{{btnText}}</el-button>
+                        </span>
+                        <span v-else style="color: #666666;">此考试已下架</span>
                     </div>
                 </div>
                 <div v-if="examStatus==2" style="text-align: center;color:#6d6d6d; ">考试已结束</div>
@@ -72,7 +74,10 @@
             <div v-if="judge.length > 0">
               <div class="question-type">判断题</div>
               <div v-for="(question, i) in judge" :key="question.id" class="question-info">
-                <div>{{ i + 1 }}、{{ question.title }} （{{question.defaultScore}}分）</div>
+                <div>
+                    <div> {{ i + 1 }}、{{ question.title }} （{{question.defaultScore}}分）</div>
+                    <div v-if="question.images" class="qimg"><img class="qimg-fit" :src="imageBaseUrl+question.images"/> </div>
+                </div>
                 <div>
                   <div class="question-option">
                     <el-radio v-model="question.userAnswer" label="true">正确</el-radio>
@@ -86,12 +91,14 @@
             <div v-if="single.length > 0">
               <div class="question-type">单选题</div>
               <div v-for="(question, i) in single" :key="question.id" class="question-info">
-                <div>{{ i + 1 + judge.length }}、{{ question.title }}（{{question.defaultScore}}分）</div>
+                <div>
+                  <div>{{ i + 1 + judge.length }}、{{ question.title }}（{{question.defaultScore}}分）</div>
+                  <div v-if="question.images" class="qimg"><img class="qimg-fit" object-fit="contain" :src="imageBaseUrl+question.images"/> </div>
+                </div>
                 <div>
                   <div class="question-option" v-for="(option, j) in question.optionList" :key="option.id">
-                    <el-radio v-model="question.userAnswer":label="option.id">
-                      {{ numberToLetter(j+1) }}、{{ option.content }}
-                    </el-radio>
+                    <el-radio v-model="question.userAnswer":label="option.id">{{ numberToLetter(j+1) }}、{{ option.content }}</el-radio>
+                    <div v-if="option.images" class="qimg"><img  class="qimg-fit" object-fit="contain" :src="imageBaseUrl+option.images"/></div>
                   </div>
                 </div>
               </div>
@@ -100,12 +107,14 @@
               <div class="question-type">多选题</div>
               <div v-for="(question, i) in multiple" :key="question.id" class="question-info">
                 <div>
-                  {{ i + 1 + judge.length + single.length }}、{{ question.title }}（{{question.defaultScore}}分）
+                  <div> {{ i + 1 + judge.length + single.length }}、{{ question.title }}（{{question.defaultScore}}分）</div>
+                  <div v-if="question.images"><img  class="img-fit" :src="imageBaseUrl+question.images"/> </div>
                 </div>
                 <div>
                   <el-checkbox-group v-model="question.userAnswer">
                     <div class="question-option" v-for="(option, j) in question.optionList" :key="option.id">
-                    <el-checkbox :label="option.id">{{ numberToLetter(j + 1) }}、{{ option.content }}</el-checkbox>
+                      <el-checkbox :label="option.id">{{ numberToLetter(j + 1) }}、{{ option.content }}</el-checkbox>
+                      <div v-if="option.images" class="qimg"><img  class="qimg-fit" :src="imageBaseUrl+option.images"/></div>
                     </div>
                   </el-checkbox-group>
                 </div>
@@ -122,11 +131,14 @@
                 <el-button  type="primary" @click="closeTest()">关闭</el-button>
             </div>
           </div>
-             <div v-if="showPaperAnser === true">
+            <div v-if="showPaperAnser === true">
             <div v-if="judge.length > 0" style="margin-top:20px">
               <div class="question-type">判断题</div>
               <div v-for="(question, i) in judge" :key="question.id" class="question-info">
-                <div>{{ i + 1 }}、{{ question.title }} （{{question.defaultScore}}分）</div>
+                <div>
+                  <div>{{ i + 1 }}、{{ question.title }} （{{question.defaultScore}}分）</div>
+                  <div v-if="question.images" class="qimg"><img class="qimg-fit" :src="imageBaseUrl+question.images"/> </div>
+                </div>
                 <div>
                   <div class="question-option">
                     <el-radio v-model="question.userAnswer" disabled :label="true">正确</el-radio>
@@ -143,10 +155,15 @@
             <div v-if="single.length > 0">
               <div class="question-type">单选题</div>
               <div v-for="(question, i) in single" :key="question.id" class="question-info">
-                <div>{{ i + 1 + judge.length }}、{{ question.title }}（{{question.defaultScore}}分）</div>
+                <div>
+                    <div> {{ i + 1 + judge.length }}、{{ question.title }}（{{question.defaultScore}}分）</div>
+                    <div v-if="question.images" class="qimg"><img class="qimg-fit" :src="imageBaseUrl+question.images"/> </div>
+                </div>
                 <div>
                   <div class="question-option" v-for="(option, j) in question.optionList" :key="option.id">
-                    <el-radio disabled v-model="question.userAnswer" :label="option.id" >{{ numberToLetter(j+1) }}、{{ option.content }}</el-radio>
+                    <el-radio disabled v-model="question.userAnswer" :label="option.id" >
+                    {{ numberToLetter(j+1) }}、{{ option.content }}</el-radio>
+                    <div v-if="option.images"  class="qimg"> <img class="qimg-fit":src="imageBaseUrl+option.images"/></div>
                   </div>
                 </div>
                 <p v-if="testPaper.showAnswer">正确答案：<span v-for="(item,a) in question.optionList" :key="a">{{item.isAnswer?numberToLetter(a+1):''}}</span></p>
@@ -157,13 +174,14 @@
               <div class="question-type">多选题</div>
               <div v-for="(question, i) in multiple" :key="question.id" class="question-info">
                 <div>
-                  {{ i + 1 + judge.length + single.length }}、{{ question.title }}（{{question.defaultScore}}分）
+                  <div> {{ i + 1 + judge.length + single.length }}、{{ question.title }}（{{question.defaultScore}}分）</div>
+                  <div v-if="question.images" class="qimg"><img class="qimg-fit" :src="imageBaseUrl+question.images"/> </div>
                 </div>
                 <div>
                   <el-checkbox-group v-model="question.userAnswer">
                     <div class="question-option" v-for="(option, j) in question.optionList" :key="option.id">
-                    <el-checkbox disabled
-                      :label="option.id">{{ numberToLetter(j + 1) }}、{{ option.content }}</el-checkbox>
+                    <el-checkbox disabled :label="option.id">{{ numberToLetter(j + 1) }}、{{ option.content }}</el-checkbox>
+                      <div v-if="option.images" class="qimg">  <img class="qimg-fit" :src="imageBaseUrl+option.images"/></div>
                     </div>
                   </el-checkbox-group>
                 </div>
@@ -178,11 +196,15 @@
       <el-dialog title="查看试卷" append-to-body :visible.sync="viewUserPapereShow" width="70%" custom-class="g-dialog">
             <div style="padding: 10px; font-size: 20px" class="upaper">
               <div  v-for="(ditem,didx) in paperDetailData" :key="didx"  class="upaper-item">
-                <div class="upaper-item-q">{{didx +1}}.【{{getTypeName(ditem.type)}}】{{ditem.title}}</div>
+                <div class="upaper-item-q">
+                   <div> {{didx +1}}.【{{getTypeName(ditem.type)}}】{{ditem.title}}</div>
+                   <div v-if="ditem.images" class="qimg"><img class="qimg-fit" :src="imageBaseUrl+ditem.images"/> </div>
+                </div>
                 <div class="upaper-item-opts" style="padding-left: 20px;">
                     <div v-for="(opt,optIdx) in ditem.optionList" :key="optIdx" class="upaper-item-opt" :class="{'upaper-item-opt-user':ditem.userOptIdxs.indexOf(optIdx)>-1}">
                         <div>
                             <div>{{numberToLetter(optIdx+1)}}, {{opt.content}}</div>
+                            <div v-if="opt.images" class="qimg"><img class="qimg-fit" :src="imageBaseUrl+opt.images"/> </div>
                         </div>
                         <div>
                           <span v-if="ditem.userOptIdxs.indexOf(optIdx)>-1 && ditem.correctOptIdxs.indexOf(optIdx)>-1" style="color: #00aa00;font-size: 25px; ">√</span>
@@ -239,6 +261,7 @@ export default {
   data() {
     return {
       loading:0,
+      imageBaseUrl:process.env.VUE_APP_FILE_BASE_URL,
       toScoreTow,
       examId:'',//考试的id
       taskId:'',//考试任务的id
@@ -305,7 +328,7 @@ export default {
     if(this.$route.query.refType){
       this.refType = this.$route.query.refType;
     }
-    
+
     if(this.examId) {
       this.loadData()
     }else{
@@ -966,7 +989,7 @@ export default {
 }
 .test-info {
   // text-align: center;
-  width: 500px;
+  width: 600px;
   margin: 0 auto;
   background: #eee;
   border-radius: 16px;
@@ -986,6 +1009,15 @@ export default {
     margin: 0 20px;
   }
 }
+
+.qimg{
+  padding-left: 30px;
+  width:100%;
+  .qimg-fit{
+    width:100%;
+    object-fit:scale-down
+  }
+}
 .question-type {
   font-weight: 500;
   font-size: 20px;
diff --git a/src/views/exam/TestPaper.vue b/src/views/exam/TestPaper.vue
index 227ebfb0..9c07c24a 100644
--- a/src/views/exam/TestPaper.vue
+++ b/src/views/exam/TestPaper.vue
@@ -48,6 +48,7 @@
             <el-table-column label="操作" width="150px" fixed="right">
               <template slot-scope="scope">
                 <el-button type="text" icon="el-icon-folder-opened"  @click="eidtVolume(scope.row)">编辑</el-button>
+                <!-- <el-button type="text" icon="el-icon-folder-opened"  @click="showEditPaper(scope.row)">编辑试题</el-button> -->
                 <el-button type="text" icon="el-icon-delete"  @click="deleteVolume(scope.row)">删除</el-button>
               </template>
             </el-table-column>
@@ -189,10 +190,16 @@
                       </div>
                     </div>
                     <div style="padding: 15px;">
-                      <div>{{ item.title }}</div>
+                      <div>
+                          <div> {{ item.title }}</div>
+                          <div v-if="item.images" class="xuanxiangimg"><img :src="imageBaseUrl + item.images" alt=""> </div>
+                      </div>
                       <div v-if="qpaper.optShow">
                         <div v-if="item.type == 3">{{item.answer=='true'?'正确':'错误'}}</div>
-                        <div v-else v-for="(opt, optIdx) in item.optionList" :key="optIdx">{{ optIdx + 1 }}, {{ opt.content }}</div>
+                        <div v-else v-for="(opt, optIdx) in item.optionList" :key="optIdx">
+                          <div>{{ optIdx + 1 }}, {{ opt.content }}</div>
+                          <div v-if="opt.images" class="xuanxiangimg"><img :src="imageBaseUrl + opt.images" alt=""> </div>
+                        </div>
                       </div>
                     </div>
                   </div>
@@ -218,18 +225,24 @@
       </span>
     </el-dialog>
 
-    <el-dialog title="【B10】新员工入模培训 基础知识篇" :visible.sync="showPreviewDialog" width="800px">
+    <el-dialog title="试卷预览" :visible.sync="showPreviewDialog" width="800px">
       <div><img :src="`${webBaseUrl}/temp/exam_paper.png`" style="width: 760px" /></div>
       <span slot="footer" class="dialog-footer"><el-button @click="showPreviewDialog = false">关闭</el-button></span>
     </el-dialog>
 	     <el-dialog title="查看试卷" append-to-body :visible.sync="viewVolumeShow" width="40%" custom-class="g-dialog">
             <div style="padding: 10px; font-size: 20px" v-for="(item, index) in viewShowData" :key="item.id">
-              <div class="test-info">{{index+1}}.【{{typeFilter(item.type)}}】{{item.title}}</div>
-                <div style="padding: 10px" v-if="item.type == 3">
+              <div class="test-info">{{index+1}}.【{{typeFilter(item.type)}}】{{item.title}}
+                 <div v-if="item.images" class="tiganimg"><img :src="imageBaseUrl + item.images" alt=""> </div>
+              </div>
+              <div style="padding: 10px" v-if="item.type == 3">
                 <div class="test-info"><span>正确答案：{{item.answer=='true'? '正确': '错误'}}</span></div>
               </div>
               <div style="padding: 10px" v-else>
-                <div class="test-info" v-for="(cc,inx) in item.optionList" :key="inx"><span :class="(cc.isAnswer || cc.score > 0)?'right-key': ''">{{numberToLetter(inx+1)}}：{{cc.content}}</span></div>
+                <div class="test-info" v-for="(cc,inx) in item.optionList" :key="inx">
+                  <span :class="(cc.isAnswer || cc.score > 0)?'right-key': ''">{{numberToLetter(inx+1)}}：{{cc.content}}</span>
+                   <!-- <img :src="imageBaseUrl + cc.images" alt=""> -->
+                   <div v-if="cc.images" class="xuanxiangimg"><img :src="imageBaseUrl + cc.images" alt=""> </div>
+                </div>
               </div>
               <!-- <div style="padding: 10px">
                 <div class="test-info">解析</div>
@@ -275,6 +288,7 @@
       </div>
       <span slot="footer" class="dialog-footer"><el-button @click="queryLise()"> 搜 索 </el-button></span>
     </el-dialog>
+    <editPaper ref="comEditPaper"></editPaper>
   </div>
 </template>
 
@@ -285,10 +299,14 @@ import examQuestionApi from "@/api/modules/question";
 import { deepClone } from '../../utils';
 import {numberToLetter, deepCopy} from '../../utils/tools.js';
 import { mapGetters,mapActions} from 'vuex';
+import editPaper from "@/components/Exam/EditPaper";
 export default {
-  name: 'articleItems',
+  name: 'testPaper',
+  components:{editPaper},
   data() {
     return {
+      imageBaseUrl:process.env.VUE_APP_FILE_BASE_URL,
+      uploadImgUrl: process.env.VUE_APP_BASE_API + "/xboe/sys/xuploader/file/upload", // 上传的图片服务器地址
       keyData:0,
       resOwnerListMap:[],
       numberToLetter:numberToLetter,
@@ -413,8 +431,16 @@ export default {
     //     if(this.resOwnerListMap.length == 0) {
     //   this.$store.dispatch("getList");
     // }
+    //检查是否存在
+    let addnew=this.$route.query.addnew;
+    if(addnew){
+      this.addPaper();
+    }
   },
   methods: {
+    showEditPaper(row){
+      this.$refs.comEditPaper.show(row.id);
+    },
     checkedChange(){
       this.$forceUpdate();
     },
@@ -479,22 +505,22 @@ export default {
         this.$forceUpdate();
         return
       }
-            let data = deepCopy(this.paperData);
-            if(this.qpaper.qtype !== '') {
-               data = data.filter(item => {
-               if(item.type === this.qpaper.qtype){
-                return item;
-              }
-            });
-            }
-            if(this.qpaper.keyword !== '') {
-                  data = data.filter(item => {
-              return item.title.toLowerCase()
-                .indexOf(this.qpaper.keyword.toLowerCase()) > -1;
-            });
-            }
-            this.paper.data = data;
-            this.$forceUpdate();
+      let data = deepCopy(this.paperData);
+      if(this.qpaper.qtype !== '') {
+         data = data.filter(item => {
+         if(item.type === this.qpaper.qtype){
+          return item;
+        }
+      });
+      }
+      if(this.qpaper.keyword !== '') {
+            data = data.filter(item => {
+        return item.title.toLowerCase()
+          .indexOf(this.qpaper.keyword.toLowerCase()) > -1;
+      });
+      }
+      this.paper.data = data;
+      this.$forceUpdate();
     },
     checkDelete(index) {
       this.paper.data.splice(index,1);
@@ -651,6 +677,7 @@ export default {
      apiPaper.detail(row.id).then(res=>{
          if(res.status === 200) {
             this.viewShowData = JSON.parse(res.result.paperContent);
+            console.log(this.viewShowData,'lll')
         } else {
             this.$message.error(res.message);
         }
@@ -719,8 +746,7 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      })
-        .then(() => {
+      }).then(() => {
          apiPaper.del(row.id).then((res)=>{
             if(res.status === 200) {
               this.$message.success('删除成功！');
@@ -729,7 +755,7 @@ export default {
                   this.$message.error(res.message);
               }
          })
-        });
+      });
     },
     handleSizeChange(val) {
       this.params.pageSize = val;
@@ -761,6 +787,24 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.xuanxiangimg{
+   width: 150px;
+  // float: left;
+  height: 150px;
+  img{
+    width: 100%;
+    height: 100%;
+  }
+}
+.tiganimg{
+  width: 200px;
+  // float: left;
+  height: 180px;
+  img{
+    width: 100%;
+    height: 100%;
+  }
+}
 .el-input{
   .el-input__inner{
     padding: 0px 5px;
diff --git a/src/views/manage/AddAudiences.vue b/src/views/manage/AddAudiences.vue
index aaad9774..102e7520 100644
--- a/src/views/manage/AddAudiences.vue
+++ b/src/views/manage/AddAudiences.vue
@@ -121,6 +121,7 @@
   import usergroupApi from "@/api/modules/usergroup";
   import userApi from "@/api/system/user";
   import orgApi from "@/api/system/organiza";
+  import apiUserBasic from "@/api/boe/userbasic";
   export default{
     data(){
       return{
@@ -181,22 +182,45 @@
         if (node.level === 0) {
           resolve([{name:'组织机构树',id:'-1'}]);
         }else{
+          let $this=this;
           if(node.level === 1){
               parentId = '-1';
+              apiUserBasic.findOrgsByKeyword('').then(rs=>{
+                  let treeList=[];
+                  rs.result.forEach(item=>{
+                    let node={
+                      id:item.id,
+                      name:item.name,
+                      hrbpId:item.hrbpId,
+                      children:[]
+                    }
+                    treeList.push(node);
+                  });
+                  resolve(treeList);
+              });
           }else{
               parentId = node.data.id;
+              
+              apiUserBasic.getOrgInfo(parentId).then(rs=>{
+                if(rs.status==200){
+                  let treeList=[];
+                  if(rs.result.directChildList){
+                      rs.result.directChildList.forEach(item=>{
+                        let node={
+                          id:item.id,
+                          name:item.name,
+                          hrbpId:item.hrbpId,
+                          children:[]
+                        }
+                        treeList.push(node);
+                      });
+                    }
+                    resolve(treeList);
+                 }else{
+                   resolve([]);
+                 }
+              });
           }
-          usergroupApi.userOrgs(parentId).then(res =>{
-              if (res.status == 200) {
-                if(res.result != null && res.result.length > 0){
-                  resolve(res.result);
-                }else{
-                  resolve([]);
-                }
-              }else{
-                this.$message.error('查询用户的机构失败');
-              }
-          });
         }
       },
       handleSelectionChange(val) {
diff --git a/src/views/manage/AutoAddAudiences.vue b/src/views/manage/AutoAddAudiences.vue
index 24ec0a5c..be1d09df 100644
--- a/src/views/manage/AutoAddAudiences.vue
+++ b/src/views/manage/AutoAddAudiences.vue
@@ -22,40 +22,15 @@
       <el-button type="success" size="medium">导入</el-button>
       <el-button type="success" size="medium">批量删除</el-button>
     </div>
-    <el-table
-        ref="multipleTable"
-        :data="tableData"
-        tooltip-effect="dark"
-        style="width: 100%"
-        @selection-change="handleSelectionChange">
-        <el-table-column
-          type="selection"
-          width="55">
-        </el-table-column>
-        <el-table-column
-          label="姓名"
-          prop="name"
-          >
+    <el-table   ref="multipleTable"  :data="tableData"  tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange">
+        <el-table-column  type="selection"  width="55"> </el-table-column>
+        <el-table-column label="姓名" prop="name" >
           <template slot-scope="scope">{{ scope.row.date }}</template>
         </el-table-column>
-        <el-table-column
-          prop="name"
-          label="工号"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          label="部门"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="add"
-          label="岗位"
-        >
-        </el-table-column>
-        <el-table-column
-          label="操作"
-        >
+        <el-table-column prop="name" label="工号" > </el-table-column>
+        <el-table-column prop="address"  label="部门" > </el-table-column>
+        <el-table-column prop="add" label="岗位" > </el-table-column>
+        <el-table-column label="操作" >
           <template slot-scope="scope">
             <el-button>操作</el-button>
           </template>
@@ -65,11 +40,8 @@
         <el-button type="success" size="large">暂存</el-button>
         <el-button type="success" size="large">发布</el-button>
       </div>
-      <el-dialog
-        title="组织"
-        custom-class="g-dialog"
-        :visible.sync="dialogVisible">
-        <span>这是一段信息</span>
+      <el-dialog  title="组织"  custom-class="g-dialog"  :visible.sync="dialogVisible">
+        <span></span>
         <span slot="footer" class="dialog-footer">
           <el-button @click="dialogVisible = false">关闭</el-button>
           <el-button type="primary" @click="dialogVisible = false">完成</el-button>
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index d156e4de..050ad8a1 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -7,24 +7,30 @@
       <div class="xcontent2-main" style="margin-right: 30px;">
             <div class="left-div">
               <div class="search-div">
-                <div class="searchbar" v-if="searchTags.length > 0">
+                <div class="searchbar" v-if="tagList.length > 0">
                   <div style="line-height: 30px;">
                     <span class="item-title">搜索条件</span>
-                    <el-tag closable v-for="(tag, tagIdx) in searchTags" :key="tagIdx" @close="tagsClose(tag,tagIdx)">{{ tag.value }}</el-tag>
+                    <el-tag closable v-for="(tag, tagIdx) in tagList" :key="tagIdx" @close="tagsClose(tag,tagIdx)">{{ tag.name }}</el-tag>
                   </div>
                 </div>
                 <div class="search-item">
-                    <div style="margin-top:10px; display: flex;">
+                    <div style="margin-top:10px; display: flex;margin-bottom:24px;">
                       <div style="line-height: 25px;padding-right: 10px;">
                         <!-- <img class="orgaicon" :src="`${webBaseUrl}/images/orgaimg.png`" alt=""> -->
                         <span class="item-title" >组织领域</span>
                         <span class="item-line"></span>
                       </div>
                       <div style="flex:1;">
-                        <el-radio-group v-model="queryCondition.orgDomain" size="mini" @change="search()">
-                          <el-radio-button :label="null">全部</el-radio-button>
-                          <el-radio-button v-for="item in domain" :key="item.code" :label="item.code"> {{ item.name}}</el-radio-button>
-                        </el-radio-group>
+                        <div class="field">
+                           <div style="padding:0;" :class="fielclass ? 'fieldactive' :''  " @click="domainall()">全部</div>
+                            <div class="fieldbox">
+                           <div :class="item.fielclass ? 'fieldactive' :''  " @click="fieldswich(item)" v-for="(item,idx) in domain" :key="'t'+ idx">{{item.name}}</div>
+                            </div>
+                        </div>
+                        <!-- <el-checkbox-group v-model="queryCondition.orgDomain" size="mini" @change="search()">
+                          <el-checkbox-button :label="null">全部</el-checkbox-button>
+                          <el-checkbox-button v-for="item in domain" :key="item.code" :label="item.code"> {{ item.name}}</el-checkbox-button>
+                        </el-checkbox-group> -->
                       </div>
                     </div>
                 </div>
@@ -32,18 +38,25 @@
                   <div class="search-item">
 
                       <div style="margin-top:10px; display: flex;">
-                        <div style="line-height: 25px;padding-right: 10px;">
+                        <div style="line-height: 25px;padding-right: 10px;white-space: nowrap;">
                            <!-- <img class="orgaicon" :src="`${webBaseUrl}/images/specimg.png`" alt=""> -->
                       <span class="item-title" >专业分类</span>
                       <span class="item-line"></span>
                        </div>
-                       <div style="flex:1" id="searchBox">
-                          <el-radio-group style="display:flex;" v-model="queryCondition.majorType" size="mini" @change="search()">
+                       <div style="flex:1;" id="searchBox">
+                         <div class="field">
+                           <div style="padding:0;" :class="fielclassjor ? 'fieldactive' :''  " @click="majorall()">全部</div>
+                           <div class="fieldbox">
+                              <div :class="item.fielclass ? 'fieldactive' :''  " @click="fieldmajor(item)" v-for="(item,idx) in speciData" :key="'d'+idx">{{item.name}}</div>
+                            </div>
+                           
+                        </div>
+                          <!-- <el-radio-group style="display:flex;" v-model="queryCondition.majorType" size="mini" @change="search()">
                             <el-radio-button :label="null">全部</el-radio-button>
                             <div>
                               <el-radio-button v-for="item in speciData" :key="item.code" :label="item.code" > {{ item.name }} </el-radio-button>
                             </div>
-                          </el-radio-group>
+                          </el-radio-group> -->
                        </div>
                       </div>
 
@@ -61,6 +74,8 @@
                 <span class="quyer-tag">
                   <el-button type="text" class="order-class" @click="searchData('views')" :class="{ actice: queryCondition.orderField == 'views' }">最热</el-button>
                   <el-button type="text" class="order-class" @click="searchData('')" :class="{ actice: queryCondition.orderField == '' }">最新</el-button>
+                  <el-button type="text" class="order-class" @click="searchexcellent()" :class="{ actice: queryCondition.orderField =='excellentTime' }">优秀案例</el-button>
+
                   <!-- <el-button type="text" class="order-class" @click="queryCondition.breCommend = queryCondition.breCommend == ture ? true : null" :class="{ actice: queryCondition.breCommend == true }">组织推荐</el-button> -->
                 </span>
               </div>
@@ -84,9 +99,9 @@
                       </div>
                        <router-link :to="'/case/detail?id='+item.id">
                       <div class="keyword-text clearfix">
-                        <div style="color:#2974D6;font-weight: 450;" v-if="item.orgDomain">{{ orgDomainTranslate(item.orgDomain) }}</div>
-                        <div style="color:#2974D6;font-weight: 450;" v-if="item.orgDomain == '' && item.orgDomainParent">{{ orgDomainTranslate(item.orgDomainParent) }}</div>
-                        <div style="color:#2974D6;font-weight: 450;"  v-for="item,idx in item.majorType" :key="idx" >{{ majorTypeTranslate(item) }}</div>
+                        <div style="color:#2974D6;font-weight: 450;" v-if="item.orgDomainParent">{{orgDomainTranslate(item.orgDomainParent) }}</div>
+                        <!-- <div style="color:#2974D6;font-weight: 450;" v-if="item.orgDomain">{{ orgDomainTranslate(item.orgDomain) }}</div> -->
+                        <div style="color:#2974D6;font-weight: 450;"  v-for="(item,idx) in item.majorType" :key="idx" >{{ majorTypeTranslate(item) }}</div>
                         <div v-if="item.keyword1">{{ item.keyword1 }}</div>
                         <div v-if="item.keyword2">{{ item.keyword2 }}</div>
                         <div v-if="item.keyword3">{{ item.keyword3 }}</div>
@@ -105,7 +120,7 @@
                       </div>
                       <div style="display: flex;justify-content: flex-end;">
                        <div style="margin:8px 0;">
-                          <interactBar :type="0" :shares="false"  :data="item" :readonly="true"></interactBar> </div>
+                          <interactBar :type="3"  :data="item" :comments="false" :shares="true" ></interactBar> </div>
                       </div>
                     </div>
                   </div>
@@ -244,29 +259,47 @@ export default {
         isOk = false;
       }
       return isOk;
+    },
+    tagList(){ //列表属性，用于计算
+        let list=[];
+        if(this.keyWord){
+          list.push({ type:'0',  code:'keyword', name:this.keyWord, checked:true})
+        }
+        this.domain.forEach(item=>{
+          if(item.fielclass){
+            list.push(item);
+          }
+        });
+        this.speciData.forEach(item=>{
+          if(item.fielclass){
+            list.push(item);
+          }
+        });
+        return list;
     }
   },
   data() {
     return {
       fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
       resonimg:{},
-      speciData:[],
+      domain: [],//组织领域
+      domainAll:[],//全部的组织领域
+      speciData:[],//专业分类
       moreState: 1, // 1 加载更多 2 加载中 3无数据
       isSeach: false,
       searchwd: false,
       showAll: true, //是否展开全部
       initHeight:40,//原始 高度
-      searchRecords: [],
+      searchRecords: [],//热门搜索词
       caseList: {
         count: 0,
         list: []
       },
-      ankingList: [],
-      Popularity: [],
-      Positive: [],
-      domain: [],
-      Profess: [],
-      optionsList: [], //分类数据
+      ankingList: [],//排行数据1
+      Popularity: [],//排行数据2
+      Positive: [],//排行数据3
+      //Profess: [],
+      //optionsList: [],
       protocolDialogVisible: false,
       protocolConfirmButton: true,
       queryCondition: {
@@ -276,9 +309,10 @@ export default {
         orderField: "views",
         // breCommend:null,
         keyWord: "",
-        majorType:null, //专业分类
-        orgDomain: null, // 组织领域
-        orderAsc: false
+        majorType:'', //专业分类
+        orgDomain: '', // 组织领域
+        orderAsc: false,
+        excellent:false
       },
       keyWord: "",
       anking: 2,
@@ -287,20 +321,27 @@ export default {
       type2: 0,
       type3: 0,
       isFind: false,
-      searchTags: [],
-      orgData: [],
+      //searchTags: [],
+      //orgData: [],
+      fielclass:true,
+      fielclassjor:true,
+      // orgDomainData:'',
+      // orgsto:[],
+      // majorTypeData:'',
+      // majsto:[],
+      // Domarr:[],
+      // majarr:[],
+      // domData:[],
+      // majData:[],
     };
   },
 
   mounted() {
-    if(this.searchTags.length == 0){
-      this.queryCondition.majorType = null;
-      this.queryCondition.orgDomain = null;
-    };
+    // if(this.searchTags.length == 0){
+    //   this.queryCondition.majorType = null;
+    //   this.queryCondition.orgDomain = null;
+    // };
     this.specialized();
-    // this.$nextTick(function() {
-    //   this.closeSearch();
-    // });
     if (!this.portalCase.readProtocol) {
       this.protocolDialogVisible = true;
     }
@@ -312,11 +353,11 @@ export default {
     this.getPopularity();
     this.searchterm();
     this.getPositive();
-    this.getProfess();
+    //this.getProfess();
     this.getdomain();
     // this.getCaseData();
     this.search();
-     this.couresreso();
+    this.couresreso();
     window.addEventListener("scroll", this.handleScroll);
 
   },
@@ -334,6 +375,146 @@ export default {
     window.removeEventListener("scroll", this.handleScroll);
   },
   methods: {
+    majorall(){
+      this.queryCondition.majorType = '';
+      this.fielclassjor=true;
+      this.speciData.forEach(item=>{
+        item.fielclass = false;
+      })
+      // if(this.fielclassjor){
+      //   let narr = this.fieldData;
+      //   this.fieldData = narr.filter(item => {
+      //         if(item.type == 'major_type') {
+      //           console.log(item);
+      //           item.fielclass = false;
+      //           return false;
+      //         }else{
+      //           return true;
+      //         }
+      //       })
+      // }
+      //this.getCaseData();
+      this.search();
+    },
+    domainall(){
+
+       this.queryCondition.orgDomain = '';
+       this.domain.forEach(item=>{
+         item.fielclass = false;
+       })
+       this.fielclass=true;
+
+      //  if(this.fielclass){
+      //   var newArr = this.fieldData;
+      //   this.fieldData = newArr.filter(item => {
+      //         if(item.type == 'org_domain') {
+      //           console.log(item);
+      //           item.fielclass = false;
+      //           return false;
+      //           console.log(this.fieldData)
+      //         }else{
+      //           return true;
+      //         }
+      //       })
+      // }
+      //this.getCaseData();
+      this.search();
+    },
+    fieldmajor(item){//专业分类
+      this.fielclassjor = false;
+      item.fielclass = !item.fielclass;
+      this.search();
+      // if(item.fielclass){
+      //   let has=this.fieldData.some(fd=>{
+      //     return fd.code==item.code;
+      //   });
+      //   if(!has){
+      //     this.fieldData.push(item);
+      //   }
+      // }else{
+      //   let delIdx=-1;
+      //   this.fieldData.some((fd,fdidx)=>{
+      //     if(fd.code==item.code){
+      //       delIdx=fdidx;
+      //       return true;
+      //     }
+      //     return false;
+      //   });
+      //   if(delIdx>-1){
+      //     this.fieldData.splice(delIdx,1);
+      //   }
+      // }
+      // this.majsto.push(item.code);
+      // this.majorTypeData = this.majsto.toString()//传给后端
+      // this.queryCondition.majorType = this.majorTypeData;
+      //this.getCaseData();
+
+      //this.ceshiorg();
+    },
+    // ceshiorg(){//判断专业
+    //   this.majData = [];
+    //    this.fieldData.forEach(itx =>{
+    //     if(itx.type == 'major_type'){
+    //       console.log(typeof itx);
+    //       if(itx.fielclass == true){
+    //         this.majData.push(itx)
+    //       }
+    //     }
+    //    })
+    //    console.log(this.majData);
+    //    let b = JSON.stringify(this.majData);
+    //    if(b == '[]'){
+    //     this.fielclassjor=true;
+    //    }
+    // },
+    // ceshidom(){//判断组织
+    //    this.domData = [];
+    //    this.fieldData.forEach(itx =>{
+    //     if(itx.type == 'org_domain'){
+    //       console.log(typeof itx);
+    //       if(itx.fielclass == true){
+    //         this.domData.push(itx)
+    //       }
+    //     }
+    //    })
+    //    let b = JSON.stringify(this.domData);
+    //    if(b == '[]'){
+    //     this.fielclass=true;
+    //    }
+    // },
+    fieldswich(item){//组织领域
+      this.fielclass=false;
+      item.fielclass = !item.fielclass;
+
+      // if(item.fielclass){
+      //   let has=this.fieldData.some(fd=>{
+      //     return fd.code==item.code;
+      //   });
+      //   //console.log(has,'has')
+      //   if(!has){
+      //     this.fieldData.push(item);
+      //   }
+      // }else{
+      //   let delIdx=-1;
+      //   this.fieldData.some((fd,fdidx)=>{
+      //     if(fd.code==item.code){
+      //       delIdx=fdidx;
+      //       return true;
+      //     }
+      //     return false;
+      //   });
+      //   if(delIdx>-1){
+      //     this.fieldData.splice(delIdx,1);
+      //   }
+      // }
+      // this.orgsto.push(item.code);
+      // this.orgDomainData = this.orgsto.toString()//传给后端
+      // this.queryCondition.orgDomain = this.orgDomainData;
+      //this.getCaseData();
+      this.search();
+      //this.ceshidom();
+    },
+
     banJump() {
       if(this.resonimg.JumpUrl) {
         window.open(this.resonimg.JumpUrl);
@@ -350,7 +531,14 @@ export default {
     let $this=this;
     apiCase.majorTypes().then(res =>{
       if(res.status == 200){
+        if (res.status == 200) {
+          res.result.forEach(item =>{
+            item.fielclass = false;
+            item.type='major_type';
+          })
+        }
         this.speciData = res.result;
+        //this.Profess=res.result;
         this.$nextTick(function() {
           $this.initHeight = document.getElementById("searchBox").offsetHeight;
           $this.closeSearch();
@@ -390,7 +578,7 @@ export default {
       this.showAll = !this.showAll;
       var searchBoxHeght = document.getElementById("searchBox");
       //console.log(this.initHeight,'this.initHeight');
-      if(this.initHeight>80){
+      if(this.initHeight>100){
         this.searchwd = true;
       }
       //console.log(het,'het');
@@ -424,56 +612,60 @@ export default {
         }
       });
     },
-
-    getdomain() {
+    async getdomain() {
       let key = "org_domain";
-      apiDict.items(key).then(res => {
+      await apiDict.items(key).then(res => {
         if (res.status == 200) {
+          res.result.forEach(item =>{
+            item.fielclass = false;
+            item.type=key;
+          })
           this.domain = res.result;
-          if(res.result.length > 0) {
-           this.orgDomainLevel(res.result)
-          }
+          // if(res.result.length > 0) {
+          //  this.orgDomainLevel(res.result)
+          // }
         }
       });
     },
-    getProfess() {
-      let key = "major_type";
-      apiDict.items(key).then(res => {
-        if (res.status == 200) {
-          this.Profess = res.result;
-        }
-      });
-    },
-    orgDomainLevel(organization) {
-     this.orgData = [];
-     organization.forEach(item=>{
-       this.orgData.push(item);
-       if(item.list && item.list != "" && item.list.length > 0){
-            item.list.forEach(it =>{
-              this.orgData.push(it);
-            })
-       }
-     })
-    },
+    //删除，不再使用
+    // getProfess() {
+    //   let key = "major_type";
+    //   apiDict.items(key).then(res => {
+    //     if (res.status == 200) {
+    //       this.Profess = res.result;
+    //     }
+    //   });
+    // },
+    // orgDomainLevel(organization) {
+    //  this.orgData = [];
+    //  organization.forEach(item=>{
+    //    this.orgData.push(item);
+    //    if(item.list && item.list != "" && item.list.length > 0){
+    //         item.list.forEach(it =>{
+    //           this.orgData.push(it);
+    //         })
+    //    }
+    //  })
+    // },
     orgDomainTranslate(code){ // 组织领域翻译
       if(code == '') {
        return
       }
+      //console.log(code,'code')
+      //console.log(this.domain,'this.domain')
      let name = '';
-      let data = this.orgData.find(item => item.code == code);
-      if(data == undefined){
-        name = '';
-      } else {
+      let data = this.domain.find(item => {
+          return item.code == code;
+      });
+      if(data){
         name = data.name;
       }
       return name;
     },
     majorTypeTranslate(code){ // 专业分类翻译
       let name = '';
-      let data = this.Profess.find(item => item.code == code);
-      if(data == undefined){
-        name = '';
-      } else {
+      let data = this.speciData.find(item => item.code == code);
+      if(data){
         name = data.name;
       }
       return name;
@@ -484,7 +676,17 @@ export default {
       this.queryCondition.pageIndex = 1;
       this.search();
     },
+    searchexcellent(){
+        //this.queryCondition.excellent =true;
+        this.queryCondition.orderField='excellentTime';
+        this.search();
+        //this.getCaseData();
+    },
     searchData(num) {
+      // if(num == 1){
+        // this.queryCondition.excellent = !this.queryCondition.excellent;
+        // this.getCaseData();
+      // }
       this.queryCondition.pageIndex = 1;
       this.queryCondition.orderField = num;
       this.getCaseData();
@@ -537,7 +739,9 @@ export default {
       this.queryCondition.pageIndex = item;
     },
     search() {
-      apiSearchterm.save({ keyword: this.keyWord, type: 3 });
+      if(this.keyWord){
+        apiSearchterm.save({ keyword: this.keyWord, type: 3 });
+      }
       if (!this.isFind) {
         this.isFind = true;
       }
@@ -546,24 +750,42 @@ export default {
         this.queryCondition.keyWord = this.keyWord;
       }
       if(this.queryCondition.orgDomain == 0){
-        this.queryCondition.orgDomain = null
+        this.queryCondition.orgDomain = ''
       }
       if(this.queryCondition.majorType == 0){
-        this.queryCondition.majorType = null
+        this.queryCondition.majorType = ''
       }
-
-
       this.getCaseData();
     },
     async getCaseData() {
-      this.getTags();
+      // this.fieldData
+      //this.queryCondition.pageIndex = 1;
+      let orgDomainList=[];
+      let majorTypeList=[];
+      this.tagList.forEach(tag=>{
+         if(tag.type=='0'){
+            this.queryCondition.keyWord=tag.name;
+         }else if(tag.type=='major_type'){
+           majorTypeList.push(tag.code);
+         }else if(tag.type=='org_domain'){
+           orgDomainList.push(tag.code);
+         }
+      });
+      this.queryCondition.orgDomain =orgDomainList.join(',');
+      this.queryCondition.majorType =majorTypeList.join(',');
+
+      if(this.queryCondition.orderField=='excellentTime'){
+        this.queryCondition.excellent=true;
+      }else{
+        this.queryCondition.excellent='';
+      }
+
+      //this.getTags();
       if (this.queryCondition.pageIndex == 1) {
         this.caseList.list = [];
       }
       this.moreState = 2;
-      await apiCase
-        .queryList(this.queryCondition)
-        .then(res => {
+      await apiCase.queryList(this.queryCondition).then(res => {
           if (res.status == 200) {
             if (res.result.list.length > 0) {
               this.isSeach = false;
@@ -596,62 +818,64 @@ export default {
           console.log(err);
         });
     },
-    getTags() {
-      this.searchTags = [];
-      let caseData = deepClone(this.queryCondition);
-      for (let i in caseData) {
-        if (
-          caseData[i] !== "" &&
-          i !== "pageIndex" &&
-          i !== "pageSize" &&
-          i !== "orderField" &&
-          i !== "orderAsc" &&
-          i !== "isTop" &&
-          caseData[i] !== null &&
-          caseData[i] !== undefined
-        ) {
-          if (caseData[i] == "0") {
-            return;
-          }
-          if(i == 'majorType'){
-            this.searchTags.push({ type:'majorType',value:this.majorTypeTranslate(caseData[i])})
-          }
-          if(i == 'orgDomain'){
-            this.searchTags.push({type:'orgDomain',value:this.orgDomainTranslate(caseData[i])})
-          }
-          if(i == 'keyWord'){
-            this.searchTags.push({type:'keyWord',value:caseData[i]})
-          }
-        }
-      }
-    },
+    // getTags() {
+    //   this.searchTags = [];
+    //   let caseData = deepClone(this.queryCondition);
+    //   for (let i in caseData) {
+    //     if (
+    //       caseData[i] !== "" &&
+    //       i !== "pageIndex" &&
+    //       i !== "pageSize" &&
+    //       i !== "orderField" &&
+    //       i !== "orderAsc" &&
+    //       i !== "isTop" &&
+    //       caseData[i] !== null &&
+    //       caseData[i] !== undefined
+    //     ) {
+    //       if (caseData[i] == "0") {
+    //         return;
+    //       }
+    //       if(i == 'majorType'){
+    //         this.searchTags.push({ type:'majorType',value:this.majorTypeTranslate(caseData[i])})
+    //       }
+    //       if(i == 'orgDomain'){
+    //         this.searchTags.push({type:'orgDomain',value:this.orgDomainTranslate(caseData[i])})
+    //       }
+    //       if(i == 'keyWord'){
+    //         this.searchTags.push({type:'keyWord',value:caseData[i]})
+    //       }
+    //     }
+    //   }
+    // },
     tagsClose(tag, index) {
-
-      for (let i in this.queryCondition) {
-
-        if (tag.type === i) {
-          if (i == "majorType") {
-             this.queryCondition.majorType = '';
-          }
-          if (i == "orgDomain") {
-            this.queryCondition.orgDomain = '';
-          }
-          if (i == "keyWord") {
-            this.queryCondition.keyWord = "";
-            this.keyWord = "";
-          }
-          this.queryCondition[i] = "";
-          this.searchTags.splice(index, 1);
-           if (i == "majorType") {
-             this.queryCondition.majorType = null;
-          }
-          if (i == "orgDomain") {
-            this.queryCondition.orgDomain = null;
-          }
-
-          this.getCaseData();
-        }
+      tag.fielclass=false;
+      if(tag.type==0){
+         this.keyWord='';
       }
+      // if(tag.type=='org_domain'){
+      //   console.log(tag)
+      //   this.domain.some((m,idx)=>{
+      //     if(m.code=tag.code){
+      //       m.fielclass=false;
+      //       return true;
+      //     }
+      //     return false;
+      //   })
+      // }else if(tag.type=='major_type'){
+      //   this.speciData.some((m,idx)=>{
+      //     if(m.code=tag.code){
+      //       m.fielclass=false;
+      //       return true;
+      //     }
+      //     return false;
+      //   })
+      // }else if(tag.type=='keyWord'){
+      //   this.queryCondition.keyWord = "";
+      //   this.keyWord = "";
+      // }
+      //this.fieldData.splice(index,1);
+      //this.getCaseData();
+      this.search();
 
     },
     getCaseUserData(caseList) {
@@ -723,6 +947,52 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.fieldbox{
+
+  display: flex;
+  white-space: nowrap;
+  flex-wrap: wrap;
+  div{
+    padding: 0 15px;
+    display: inline-block;
+    font-size: 14px;
+    line-height: 25px;
+    color: #3d3d3d;
+    font-weight: 500;
+  }
+  .fieldactive{
+    color: #387DF7;
+  }
+}
+.field{
+  display: flex;
+  white-space: nowrap;
+  // flex-wrap: wrap;
+  div{
+    padding: 0 15px;
+    // display: inline-block;
+    font-size: 14px;
+    line-height: 25px;
+    color: #3d3d3d;
+    font-weight: 500;
+  }
+  .fieldactive{
+    color: #387DF7;
+  }
+}
+::v-deep .el-checkbox-button.is-checked .el-checkbox-button__inner{
+  box-shadow: none !important;
+}
+::v-deep .el-checkbox-button.is-checked .el-checkbox-button__inner{
+  color: #387df7 !important;
+  background-color: #fff !important;
+}
+::v-deep .el-checkbox-button--mini .el-checkbox-button__inner{
+  font-size: 14px;
+}
+::v-deep .el-checkbox-button .el-checkbox-button__inner{
+  border: none !important;
+}
 .notcoures{
   text-align: center;
   img{
@@ -777,7 +1047,7 @@ export default {
   line-height: 30px;
   display: flex;
   .case-tittext {
-    font-size: 18px;     
+    font-size: 18px;
     font-weight: 600;
     color: #333333;
     width: 67%;
@@ -881,11 +1151,11 @@ export default {
 .portal-content {
   display: flex;
   justify-content: space-between;
-  
+
 }
 .searchbar {
   background-color: #ffffff;
- 
+
 }
 
 .fixed {
@@ -1034,6 +1304,8 @@ export default {
       }
     }
     .search-item {
+      cursor: pointer;
+      // margin-bottom: 10px;
       // padding: 10px 0;
     }
     // .search-item:not(:last-child) {
diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue
index 2685a5e0..e8814861 100644
--- a/src/views/portal/course/Index.vue
+++ b/src/views/portal/course/Index.vue
@@ -7,10 +7,10 @@
       <div class="xcontent2">
         <div class="xcontent2-main content-div">
           <div class="search-div" style="margin-right:36px">
-            <div class="searchbar" v-if="searchTags.length > 0">
+            <div class="searchbar" v-if="stagList.length > 0">
               <div style="line-height: 30px;">
                 <span class="item-title"> 搜索条件</span>
-                <el-tag closable v-for="(tag, tagIdx) in searchTags" :key="tagIdx" @close="tagsClose(tag,tagIdx)">{{ tag.name }}</el-tag>
+                <el-tag closable v-for="(tag, tagIdx) in stagList" :key="'t'+tagIdx" @close="stagClose(tag,tagIdx)">{{ tag.name }}</el-tag>
               </div>
             </div>
             <div class="search-item">
@@ -20,58 +20,60 @@
                   </div>
                   <!-- // 10微课，21在线课(直播)；20:在线课( 录播)；30:面授课；40:学习项目,90:混合式， -->
                   <div>
-                  <el-radio-group v-model="category" size="mini" @change="searchData">
-                    <el-radio-button :label="null">全部</el-radio-button>
-                    <el-radio-button :label="20">录播课</el-radio-button>
-                    <el-radio-button :label="30">线下课 </el-radio-button>
-                    <el-radio-button class="couderbox"> <div class="coures-border"></div> </el-radio-button>
-                    <el-radio-button :label="40">学习项目</el-radio-button>
-                  </el-radio-group>
+                    <a @click="handleTypeAllClick(1)" class="option-item" :class="{'option-active':ctypeTagAll}">全部</a>
+                    <a @click="handleTypeClick(ctypeList[0],ctypeList)"  class="option-item" :class="{'option-active':ctypeList[0].checked}">录播课</a>
+                    <a @click="handleTypeClick(ctypeList[1],ctypeList)" class="option-item" :class="{'option-active':ctypeList[1].checked}">线下课</a>
+                    <a class="option-border"> </a>
+                    <a @click="handleTypeClick(ctypeList[2],ctypeList)" class="option-item" :class="{'option-active':ctypeList[2].checked}">学习项目</a>
                   </div>
                 </div>
             </div>
-            <div :class="queryExpand ? 'search-div-expand' : 'search-div-collapse'">
-              <el-row class="search-item">
-                <el-col :span="24">
-                  <div style="margin-top:10px;display: flex;">
-                    <div style="line-height: 25px;padding-right: 10px;">
-                      <span class="item-title" style="padding-right: 5px;">一级分类:</span>
-                    </div>
-                    <el-radio-group  v-model="types.sysTypes" size="mini" @change="changeType">
-                      <el-radio-button :label="null">全部</el-radio-button>
-                      <el-radio-button v-for="item in optionsList" :key="item.id" :label="item.id">{{item.name}}</el-radio-button>
-                    <el-radio-button class="couderbox"> <div class="coures-border"></div> </el-radio-button>
-                    </el-radio-group>
+            <div class="search-item">
+                <div style="line-height: 25px;margin-top:10px; display: flex;">
+                  <div class="search-item-type">
+                    <span class="item-title" style="padding-right: 5px;">一级分类:</span>
+                  </div>
+                  <div>
+                    <a @click="handleTypeAllClick(11)" class="option-item" :class="{'option-active':oneTagAll}">全部</a>
+                    <a v-for="one in oneList" @click="handleOptionClick(one,oneList)"  class="option-item" :class="{'option-active':one.checked}">{{one.name}}</a>
+                    <a class="option-border"> </a>
+                    <a class="option-item">
                       <span @click="jumUX()" class="Uxtext" style=""> U选小课堂
                           <span class="uxicon">
                             <svg-icon icon-class="hot" style="font-size:22px"></svg-icon>
                           </span>
                       </span>
-                      <!-- <span @click="jumOpen()" class="Uxtext" style="margin-left: 30px;" :style="{'color': course.openCourse==1? '#387DF7':''}"> 公开课
-                      </span> -->
+                    </a>
                   </div>
-                  <div class="search-item-sub" v-if="types.oneSubList.length != 0">
-                    <span class="item-title" style="min-width: 74px;">二级分类:</span>
-                    <div style="margin-top:10px">
-                      <el-radio-group v-model="types.subOne" size="mini"  @change="changeTypeSub">
-                        <el-radio-button label="0">全部</el-radio-button>
-                        <el-radio-button v-for="item in types.oneSubList" :key="item.id" :label="item.id">{{item.name}}</el-radio-button>
-                      </el-radio-group>
-                    </div>
-                  </div>
-                   <div class="search-item-sub" v-if="types.towSubList.length != 0">
-                    <span class="item-title" style="padding-right:13px">三级分类:</span>
-                    <div style="margin-top:10px">
-                      <el-radio-group v-model="types.subTow" size="mini" @change="searchData" >
-                        <el-radio-button label="0">全部</el-radio-button>
-                        <el-radio-button v-for="item in types.towSubList" :key="item.id" :label="item.id">{{item.name}}</el-radio-button>
-                      </el-radio-group>
-                    </div>
-
-                  </div>
-                </el-col>
-              </el-row>
+                </div>
             </div>
+            <div class="search-item" v-if="twoList.length>0">
+                <div style="line-height: 25px;margin-top:10px; display: flex;justify-content: flex-start;">
+                  <div class="search-item-type">
+                    <span class="item-title" style="padding-right: 5px;">二级分类:</span>
+                  </div>
+                  <div style="white-space: nowrap;">
+                    <a @click="handleTypeAllClick(12)" class="option-item" :class="{'option-active':twoTagAll}">全部</a>
+                  </div>
+                  <div>
+                    <a v-for="two in twoList" @click="handleOptionClick(two,twoList)"  class="option-item" :class="{'option-active':two.checked}">{{two.name}}</a>
+                  </div>
+                </div>
+            </div>
+            <div class="search-item" v-if="threeList.length>0">
+                <div style="line-height: 25px;margin-top:10px; display: flex;justify-content: flex-start;">
+                  <div class="search-item-type">
+                    <span class="item-title" style="padding-right: 5px;">三级分类:</span>
+                  </div>
+                  <div style="white-space: nowrap;">
+                    <a @click="handleTypeAllClick(13)" class="option-item" :class="{'option-active':threeTagAll}">全部</a>
+                  </div>
+                  <div>
+                    <a v-for="three in threeList" :key="three.id" @click="handleOptionClick(three,threeList)"  class="option-item" :class="{'option-active':three.checked}">{{three.name}}</a>
+                  </div>
+                </div>
+            </div>
+
           </div>
           <div class="order-div">
             <span class="quyer-tag">
@@ -93,7 +95,14 @@
                     <span v-if="cinfo.type == 30" class="course-type-left">线下课</span>
                     <span v-if="cinfo.type == 40" class="course-type-left">学习项目</span>
                   </div>
-                  <div style="width:80%" class="course-title two-line-ellipsis" :title="cinfo.title"   v-html="cinfo.name"></div>
+                  <div style="width:80%" class="course-title two-line-ellipsis" :title="cinfo.title"   v-html="cinfo.name">
+
+                  </div>
+
+                   <div class="couresstartTime">
+                        <span v-if="cinfo.type == 30 && cinfo.startTime">开课时间：{{ cinfo.startTime }}</span>
+                   </div>
+
                   <div class="course-info">
                     <div class="course-info-user">
                        <!-- <span class="course-info-author"  v-if="cinfo.teacher">{{cinfo.teacher=='BOE教师'? '':cinfo.teacher}}</span> -->
@@ -172,7 +181,9 @@
                            </div>
                          </div>
                          <div class="list-bottom">
-                          <interactBar :type="1" :data="item" :couseViews="true" :shares="false" :views="false"></interactBar>
+                           <couresinteract :type="1" :data="item" ></couresinteract>
+
+                          <!-- <interactBar :type="1" :data="item" :couseViews="true" :shares="false" :views="false"></interactBar> -->
                          </div>
                       </div>
                       </a>
@@ -219,7 +230,9 @@
                            </div>
                          </div>
                          <div class="list-bottom">
-                          <interactBar :type="1" :data="item" :couseViews="true" :shares="false" :views="false"></interactBar>
+                       <couresinteract :type="1" :data="item" ></couresinteract>
+
+                          <!-- <interactBar :type="1" :data="item" :couseViews="true" :shares="false" :views="false"></interactBar> -->
                          </div>
                       </div>
                       </a>
@@ -266,7 +279,8 @@
                            </div>
                          </div>
                          <div class="list-bottom">
-                          <interactBar :type="1" :data="item" :couseViews="true" :shares="false" :views="false"></interactBar>
+                        <couresinteract :type="1" :data="item" ></couresinteract>
+                          <!-- <interactBar :type="1" :data="item" :couseViews="true" :shares="false" :views="false"></interactBar> -->
                          </div>
                       </div>
                       </a>
@@ -287,6 +301,7 @@
 </template>
 <script>
 import { mapGetters, mapActions } from "vuex";
+import couresinteract from '@/components/Portal/course/couresinteract.vue';
 import portalHeader from "@/components/PortalHeader.vue";
 import portalFooter from "@/components/PortalFooter.vue";
 import portalFloatTools from "@/components/PortalFloatTools.vue";
@@ -304,7 +319,7 @@ import scene from "@/api/modules/scene.js";
 import apiUserGroup from "@/api/modules/usergroup.js";
 import interactBar from "@/components/Portal/interactBar.vue";
 import courseImage from "@/components/Course/courseImage.vue";
-import { courseType, getType, toScore,formatDate,formatUserNumber } from "@/utils/tools.js";
+import { courseType, getType, toScore,formatDate,formatUserNumber,formatDateByFmt } from "@/utils/tools.js";
 import { deepClone, param } from "../../../utils";
 import apiSearchterm from "@/api/modules/searchterm.js";
 import apiPlace from "@/api/phase2/place.js"
@@ -317,14 +332,81 @@ export default {
     courseItem,
     courseForm,
     authorInfo,
+    couresinteract,
     courseImage,
     interactBar
   },
   computed: {
-    ...mapGetters(["resOwnerMap", "sysTypeMap", "userInfo", "identity"])
+    ...mapGetters(["resOwnerMap", "sysTypeMap", "userInfo", "identity"]),
+    stagList(){ //计算出选择的内容
+       let list=[];
+       if(this.keyword){
+         list.push({
+           type:0,
+           id:'keyword',
+           name:this.keyword,
+           checked:true
+         })
+       }
+       this.ctypeList.forEach(item=>{
+         if(item.checked){
+           list.push(item);
+         }
+       });
+       this.oneList.forEach(item=>{
+         if(item.checked){
+           list.push(item);
+         }
+       });
+       this.twoList.forEach(item=>{
+         if(item.checked){
+           list.push(item);
+         }
+       });
+       this.threeList.forEach(item=>{
+         if(item.checked){
+           list.push(item);
+         }
+       });
+       //console.log(list,'list');
+       return list;
+    },
+    ctypeTagAll(){
+      let flag=this.ctypeList.some(item=>{
+        return item.checked;
+      });
+      return !flag;
+    },
+    oneTagAll(){
+      let flag=this.oneList.some(item=>{
+        return item.checked;
+      });
+      return !flag;
+    },
+    twoTagAll(){
+      let flag=this.twoList.some(item=>{
+        return item.checked;
+      });
+      return !flag;
+    },
+    threeTagAll(){
+      let flag=this.threeList.some(item=>{
+        return item.checked;
+      });
+      return !flag;
+    }
   },
   data() {
     return {
+      ctypeList:[
+        {type:1,id:20,name:'录播课',checked:false},
+        {type:1,id:30,name:'线下课',checked:false},
+        {type:1,id:40,name:'学习项目',checked:false},
+      ],
+      oneList:[], //一级分类{type:11}
+      twoList:[], //二级分类{type:12}
+      threeList:[],//三级分类{type:13}
+
       resonimg:{},
       formatDate,
       formatNum:formatUserNumber,
@@ -337,26 +419,17 @@ export default {
       columns: 3, //列的数量
       fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
       // 查询信息
-      types: {
-        sysTypesSub: "",
-        subOne: "",
-        subTow: "",
-        sysTypes: null,
-        oneSubList: [],
-        towSubList: []
-      },
       course: {
         orderField: "studys",
+        keyword:'',//关键词
         topOrder: true,
         orderAsc: false,
         pageIndex: 1, // 第几页
         pageSize: 9 ,//每页多少条
         openCourse:0,//增加的公开课查询
       },
-
-      optionsList: [], //分类数据
       sceneList: [], //场景
-      keyword: "",
+      keyword: "",//查询的关键字
       anking: "",
       isFind: false,
       searchbar: {
@@ -364,15 +437,8 @@ export default {
       },
       ankingList: [],
       scorelist: [],
-      searchTags: [],
       queryExpand: true, // true更多，false收起
-      category: null,
-      categorySub: 0,
-      type1: 0,
-      type2: [],
-      type3: 0,
-      type4: 0,
-      status: 1,
+      //status: 1,
       pager: {
         total: 40
       },
@@ -384,6 +450,7 @@ export default {
       totalPages: 1
     };
   },
+
   mounted() {
     let screenWidth = window.screen.availWidth;
     if (screenWidth < 1280) {
@@ -405,11 +472,11 @@ export default {
     this.getAnkingData();
     window.addEventListener("scroll",this.handleScroll);
     if (this.$route.query !== {}) {
-      this.course.keyword = this.$route.query.keyword;
+      this.keyword = this.$route.query.keyword;
     }
-    this.getSceneData();
-    this.getTypeData();
-    if (this.course.keyword != undefined) {
+    this.loadTypeData();//加载分类
+    //this.getSceneData(); //已经没有场景了
+    if (this.keyword) {
       this.totalPages = 4;
     }
 
@@ -441,14 +508,137 @@ export default {
        }
     }
 
-    this.searchterm();
-    this.couresreso();
+    //this.searchterm();//搜索词已经没有了
+    this.couresreso();//广告位
 
   },
   beforeDestroy() {
     window.removeEventListener("scroll", this.handleScroll);
   },
   methods: {
+    stagClose(tag,tagIndex){
+      tag.checked=false;
+      if(tag.type==0){
+         this.keyword='';
+      }
+      this.searchData();
+    },
+    handleTypeAllClick(t){
+      if(t==1){
+        this.ctypeList.forEach(ct=>{
+          ct.checked=false;
+        })
+      }else if(t==11){
+        this.oneList.forEach(ct=>{
+          ct.checked=false;
+        });
+        this.twoList.forEach(ct=>{
+          ct.checked=false;
+        });
+        this.threeList.forEach(ct=>{
+          ct.checked=false;
+        });
+        this.twoList=[];
+        this.threeList=[];
+      }else if(t==12){
+        this.twoList.forEach(ct=>{
+          ct.checked=false;
+        });
+        this.threeList.forEach(ct=>{
+          ct.checked=false;
+        });
+        this.threeList=[];
+      }else if(t==13){
+        this.threeList.forEach(ct=>{
+          ct.checked=false;
+        })
+      }
+      this.searchData();
+    },
+    handleTypeClick(item,list){
+      //item.checked=!item.checked;
+       //使用上面一行是可以多选，使用下面是单选
+      list.forEach(row=>{
+        row.checked=false;
+      })
+      item.checked=true;
+
+      this.searchData();
+    },
+    handleOptionClick(item,list){
+      //item.checked=!item.checked;
+      //使用上面一行是可以多选，使用下面是单选
+      list.forEach(row=>{
+        row.checked=false;
+      })
+      item.checked=true;
+
+      this.handleChangeTypes();
+      this.searchData();
+    },
+    handleChangeTypes(){
+      //重新计算
+      this.twoList=[];
+      this.threeList=[];
+      let $this=this;
+      this.oneList.forEach(one=>{
+        if(one.checked){
+           one.children.forEach(two=>{
+             $this.twoList.push(two);
+             if(two.checked){
+                two.children.forEach(three=>{
+                  $this.threeList.push(three);
+                })
+             }
+           });
+        }
+      })
+    },
+    async loadTypeData() {
+      let $this=this;
+      try {
+        const { result, status } = await apiType.tree(1);
+        if (status === 200) {
+          result.forEach(item=>{
+             let newItem={
+               type:11,
+               id:item.id,
+               name:item.name,
+               children:[],
+               checked:false
+             }
+             if(item.children){
+                item.children.forEach(subItem=>{
+                  let newSubItem={
+                    type:12,
+                    id:subItem.id,
+                    name:subItem.name,
+                    children:[],
+                    checked:false
+                  }
+
+                  if(subItem.children){
+                    subItem.children.forEach(sub=>{
+                      let newSub={
+                        type:13,
+                        id:sub.id,
+                        name:sub.name,
+                        children:[],
+                        checked:false
+                      }
+                      newSubItem.children.push(newSub);
+                    })
+                  }
+                  newItem.children.push(newSubItem);
+                })
+             }
+             $this.oneList.push(newItem);
+          });
+        }
+      } catch (error) {
+        console.log(error);
+      }
+    },
     banJump() {
       if(this.resonimg.JumpUrl) {
         window.open(this.resonimg.JumpUrl);
@@ -472,7 +662,8 @@ export default {
        this.searchData();
     },
     emitInput(val) {
-      this.course.keyword = val;
+      this.keyword = val;
+      //this.stagList;
       this.searchData();
     },
     handleScroll() {
@@ -530,10 +721,6 @@ export default {
       }
       return this.sysTypeMap.get(code);
     },
-    useHotword(item) {
-      this.$set(this.course, "keyword", item.keyword);
-      this.searchData();
-    },
     searchterm() {
       apiSearchterm.list(5, 1).then(res => {
         if (res.status == 200) {
@@ -553,6 +740,18 @@ export default {
          this.$router.push('/course/boeframe?id='+courseId+'&type='+item.type);
         //此处使用window.open有问题
         //window.open(`${this.webBaseUrl}/course/boeframe?id=${item.id}&type=${item.type}`);
+      }else if(item.source == 3){
+         //跳转到管理系统的页面
+         let manageApi=process.env.VUE_APP_MANAGER_API_PATH;
+         let studentPath=process.env.VUE_APP_STUDENT_PATH;
+         if (item.type == 30){ //线下课，面授课
+            let params=encodeURIComponent('courseId='+courseId);
+            this.$router.push('/forward?to='+manageApi+'/stu/project/redirectDetail&params='+params);
+         }else if(item.type==40){ //学习项目
+            let params=encodeURIComponent('projectId='+courseId);
+            this.$router.push('/forward?to='+studentPath+'/projectdetails&params='+params);
+            //this.$router.push('/forward?to='+manageApi+'/stu/project/redirectDetail&params='+params);
+         }
       } else {
          if (item.type == 10) {
             //return this.webBaseUrl + "/course/studyindex?id=" + item.id;
@@ -580,78 +779,6 @@ export default {
       this.totalPages = 1;
       this.search();
     },
-    tagsClose(tag, index) {
-      for (let i in this.course) {
-        if (tag.id === this.course[i]) {
-          this.course[i] = "";
-          if (i === "sysType1") {
-            this.types.sysTypes = "";
-            this.types.subOne = "";
-            this.types.subTow = "";
-            this.types.oneSubList = [];
-            this.types.towSubList = [];
-          }
-          if (i === "sysType2") {
-            this.types.subOne = "";
-            this.types.oneSubList = [];
-          }
-          if (i === "sysType3") {
-            this.types.subTow = "";
-            this.types.towSubList = [];
-          }
-          if (i === "type") {
-            this.category = "";
-            this.categorySub = "";
-          }
-
-          this.searchTags.splice(index, 1);
-           if(i === 'type') {
-            this.category = null;
-            this.categorySub = null;
-          }
-          if (i === "sysType1") {
-            this.types.sysTypes = null;
-          }
-          if (i === "sysType2") {
-            this.types.subOne = null;
-          }
-          if (i === "sysType3") {
-            this.types.subTow = null;
-          }
-        }
-      }
-      this.searchData();
-    },
-
-    // 分类
-    changeType(num) {
-      this.types.oneSubList = [];
-      this.types.subOne = "0";
-      this.types.towSubList = [];
-      let list = {};
-      if (num !== 0) {
-        list = this.optionsList.find(item => {
-          return item.id === num;
-        });
-      }
-      if (list && list.children) {
-        this.types.oneSubList = list.children;
-      }
-      this.searchData();
-    },
-    // 子级分类
-    changeTypeSub(num) {
-      this.types.subTow = "0";
-      let list = {};
-      if (num !== 0) {
-        apiType.list(1, num).then(res => {
-          if (res.status === 200) {
-            this.types.towSubList = res.result;
-          }
-        });
-      }
-      this.searchData();
-    },
     //获取场景，保留
     async getSceneData() {
       try {
@@ -663,17 +790,6 @@ export default {
         console.log(error);
       }
     },
-    //获取分类，此处获取提内容分类
-    async getTypeData() {
-      try {
-        const { result, status } = await apiType.tree(1);
-        if (status === 200) {
-          this.optionsList = result;
-        }
-      } catch (error) {
-        console.log(error);
-      }
-    },
     loadMore() {
       this.course.pageIndex += 1;
       this.search();
@@ -688,8 +804,13 @@ export default {
        }
     },
     async search() {
+      //测试时间格式化
+      // let s=1650973801;
+      // var d = new Date(1650973801*1000);
+      // console.log(formatDateByFmt(d,'yyyy-MM-dd hh:mm'),'data');
+
       let that = this;
-      if (this.course.keyword) {
+      if (this.keyword) {
         apiSearchterm.save({ keyword: this.course.keyword, type: 1 });
       }
 
@@ -698,39 +819,51 @@ export default {
       }
       //console.log(this.userInfo)
       //this.course.companyId=this.userInfo.companyId;
+      this.course.type = "";//不使用单查询了
+      this.course.types = "";
+      this.course.sysType1 = "";
+      this.course.sysType2 = "";
+      this.course.sysType3 = "";
+      this.course.keyword=this.keyword;
 
-       this.isFind = true;
-       this.course.type = this.category;
-      if (this.types.sysTypes == 0 || this.types.sysTypes == null) {
-        this.course.sysType1 = "";
-        this.course.sysType2 = "";
-        this.course.sysType3 = "";
-      } else {
-        this.course.sysType1 = this.types.sysTypes;
-      }
-      this.course.sysType2 = this.types.subOne;
-      this.course.sysType3 = this.types.subTow;
-      if (this.course.sysType2 == 0) {
-        this.course.sysType2 = "";
-      }
-      if (this.course.sysType3 == 0) {
-        this.course.sysType3 = "";
-      }
+      this.stagList.forEach(item=>{
+        if(item.checked){
+
+        }
+        if(item.type==1){
+            if(that.course.types){ that.course.types+='-'; }
+            that.course.types+=item.id;
+        }else if(item.type==11){
+            if(that.course.sysType1){ that.course.sysType1+='-'; }
+            that.course.sysType1+=item.id;
+        }else if(item.type==12){
+            if(that.course.sysType2){ that.course.sysType2+='-'; }
+            that.course.sysType2+=item.id;
+        }else if(item.type==13){
+            if(that.course.sysType3){ that.course.sysType3+='-'; }
+            that.course.sysType3+=item.id;
+        }
+      });
+
+      this.isFind = true;
       this.course.device = 1;
-      this.getTags();
-    //   if(this.course.pageIndex == 1) {
-    //     this.courseList = [];
-    //   }
+      if(this.course.pageIndex == 1) {
+        this.courseList = [];
+      }
 
       let isTopList = [];
       // 隐藏loadMore
       this.moreState = 2;
-        await apiCoursePortal
-          .courseSearch(this.course)
-          .then(res => {
+        await apiCoursePortal.courseSearch(this.course).then(res => {
             if (res.status == 200 && res.result.list.length > 0) {
               this.totalPages = res.result.totalPages;
               res.result.list.forEach(item => {
+                // item.startTime
+                if(item.startTime != '') {
+                  item.startTime=formatDateByFmt(new Date(item.startTime*1000),'yyyy-MM-dd hh:mm')
+                  //let time = item.startTime.split('-');
+                  //item.startTime = `${time[0]}年${time[1]}月${time[2]}日`
+                }
                 //教师转化
                 if(item.teacher){
                    let dotIdx=item.teacher.indexOf(',');
@@ -763,69 +896,18 @@ export default {
           });
 
     },
-    getTags() {
-      this.searchTags = [];
-      let courseData = deepClone(this.course);
-      for (let i in courseData) {
-        if (
-          courseData[i] !== "" &&
-          i !== "pageIndex" &&
-          i !== "pageSize" &&
-          i !== "orderField" &&
-          i !== "orderAsc" &&
-          i !== "topOrder" &&
-          i !== "device" &&
-          i !== "audiences" &&
-          i !== "companyId" &&
-          courseData[i] !== null &&
-          courseData[i] !== undefined
-        ) {
-          let id = courseData[i];
-          if (i == "type" && courseData[i] !== 0) {
-            courseData[i] = courseType(courseData[i]);
-          }
-          if (i == "sysType1" || i == "sysType2" || i == "sysType3") {
-            if (courseData[i] !== "0") {
-              courseData[i] = this.sysTypeName(courseData[i]);
-            }
-          }
-          if (i == "type" && courseData[i] === 0) {
-            courseData[i] = "在线课";
-          }
-          if (i == "openCourse") {
-            if(courseData[i] === 0){
-                courseData[i] = "0";
-            }else{
-              courseData[i] = "公开课";
-            }
-          }
-          if (courseData[i] !== "0") {
-            this.searchTags.push({
-              id: id,
-              name: courseData[i]
-            });
-          }
-        }
-      }
-    },
-    // goTarget(href) {
-    //   window.open(this.webBaseUrl+href, "_blank");
+    // showInApply() {
+    //   this.inapply.show = true;
+    // },
+    // pushEnter(type) {
+    //   this.type1.push(type);
+    // },
+    // deleteOut(type) {
+    //   this.type1 = this.type.filter(item => item != type);
+    // },
+    // chooseShow(type) {
+    //   return this.type1.some(item => item == type);
     // },
-    showInApply() {
-      this.inapply.show = true;
-    },
-    findOrg() {
-      //
-    },
-    pushEnter(type) {
-      this.type1.push(type);
-    },
-    deleteOut(type) {
-      this.type1 = this.type.filter(item => item != type);
-    },
-    chooseShow(type) {
-      return this.type1.some(item => item == type);
-    },
     getAnkingData() {
       apiCourse.ranking().then(res => {
         if (res.status == 200) {
@@ -851,6 +933,7 @@ export default {
             }
           })
           this.scorelist = res.result;
+          // console.log(this.scorelist)
         }
       });
     },
@@ -905,6 +988,21 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.couresstartTime{
+  line-height: 26px;
+  height: 26px;
+  padding-top: 5px;
+  font-size: 14px;
+  color: #666;
+  // position: absolute;
+    // right:2px;
+    // height: 20px;
+    // bottom: 50px;
+}
+.interact-bar-value{
+  color: #999;
+}
+
 .couderbox{
   // width: 5px;
   // padding: 0;
@@ -1291,6 +1389,27 @@ export default {
 //     margin: 10px 0;
 //     color: #999999;
 //   }
-// }
-
+// }]
+.search-item-type{
+  line-height: 25px;
+  padding-right: 10px;width:85px;
+  white-space: nowrap;
+}
+.option-item{
+  font-family:"Menlo", "苹方-简" !important;
+  color:#3d3d3d;
+  display: inline-block;
+  font-size: 14px;
+  margin: 0px 15px;
+}
+.option-border{
+  width: 2px;
+  display: inline-block;
+  height: 15px;
+  margin: 0px 20px -2px 20px;
+  background: #666;
+}
+.option-active{
+  color:#387DF7;
+}
 </style>
diff --git a/src/views/study/StudyPath.vue b/src/views/study/StudyPath.vue
new file mode 100644
index 00000000..a7d12d82
--- /dev/null
+++ b/src/views/study/StudyPath.vue
@@ -0,0 +1,30 @@
+<template>
+  <!--学习路径图-->
+  <div class="box">
+    <iframe id="studyPathFrame" :src="basePath+'/learnpath'" style="width: 100%;height: 800px;" frameborder="0"></iframe>
+  </div>
+</template>
+
+<script>
+  export default{
+    data(){
+      return {
+        basePath:process.env.VUE_APP_STUDENT_PATH
+      }
+    },
+    mounted() {
+      const oIframe = document.getElementById('studyPathFrame');
+      //const deviceWidth = document.documentElement.clientWidth;
+      const deviceHeight = document.documentElement.clientHeight;
+      //oIframe.style.width = (Number(deviceWidth)-220) + 'px'; //数字是页面布局宽度差值
+      //oIframe.style.height = (Number(deviceHeight)-300) + 'px'; //数字是页面布局高度差
+    }
+  }
+</script>
+
+<style lang="scss">
+  .box{
+      // width: 100%;
+      height: 100%;
+  }
+</style>
diff --git a/src/views/study/StudyProject.vue b/src/views/study/StudyProject.vue
new file mode 100644
index 00000000..6f893523
--- /dev/null
+++ b/src/views/study/StudyProject.vue
@@ -0,0 +1,30 @@
+<template>
+  <!--学习项目-->
+  <div class="box">
+    <iframe id="studyPathFrame" :src="basePath+'/projectManage'" style="width: 100%;height: 800px;" frameborder="0"></iframe>
+  </div>
+</template>
+
+<script>
+  export default{
+    data(){
+      return {
+        basePath:process.env.VUE_APP_STUDENT_PATH
+      }
+    },
+    mounted() {
+      const oIframe = document.getElementById('studyPathFrame');
+      //const deviceWidth = document.documentElement.clientWidth;
+      const deviceHeight = document.documentElement.clientHeight;
+      //oIframe.style.width = (Number(deviceWidth)-220) + 'px'; //数字是页面布局宽度差值
+      //oIframe.style.height = (Number(deviceHeight)-300) + 'px'; //数字是页面布局高度差
+    }
+  }
+</script>
+
+<style lang="scss">
+  .box{
+      // width: 100%;
+      height: 100%;
+  }
+</style>
diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue
index 889b987f..c59ad269 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -85,6 +85,9 @@
             <div v-if="resType == 41">
               <div style="padding: 20px;" v-html="contentData.content"></div>
             </div>
+            <div v-if="resType == 50" style="min-height: 500px;">
+              <iframe v-if="scormUrl" :src="scormUrl" frameborder="0" scrolling="no"  border="0px" style="width:100%;height:500px;border:0px;overflow:hidden;"></iframe>
+            </div>
             <div v-if="resType == 52">
               <div v-if="contentData.content != ''">
                 <div class="hyper-link" v-if="conLink.openType == 2">
@@ -317,6 +320,7 @@
     data() {
       return {
         cutOrgNamePath,
+        scormUrl:'',//当前播放的scormUrl
         loading:false,
         controlHeight:400,//左边控制区域的内容高度
         timer: '',
@@ -436,9 +440,8 @@
         this.$router.push({path:this.$xpage.getHomePath(tea.teacherId)})
       },
       noteChange(){
-	    //视频点定位，直接到播放的视频位置
+        //视频点定位，直接到播放的视频位置
          this.timer = new Date().getTime()
-
       },
       //非音视频课学习时长的增加,每一分钟保存一次
       appendStudyOtherTime() {
@@ -592,7 +595,25 @@
             }
           });
           // }
-        } else if (r.contentType == 52) {
+        }else if(r.contentType==50){ //scorm
+          this.scormUrl='';
+          apiCourseFile.detail(r.contentRefId).then(cfrs => {
+             if(cfrs.status==200){
+                this.curCFile = cfrs.result;
+                //this.scormUrl=cfrs
+                let pars='?mode=normal&r='+Math.random();
+                pars+='&scormId='+this.curCFile.id;
+                pars+='&courseId='+this.courseId;
+                pars+='&contentId='+r.id;
+                pars+='&studentId='+this.userInfo.aid;
+                pars+='&studentName='+encodeURIComponent(this.userInfo.name);
+                pars+='&lmsId='+this.studyId;
+                pars+='&scoId=';//不指定，scorm模块自动根据学习记录定位
+                this.scormUrl=process.env.VUE_APP_SCORM_URL+pars;//播放的首页
+             }
+          });
+
+        }else if (r.contentType == 52) {
           this.isAppendTime = false;
           if (r.content.startsWith('\{')) {
             this.conLink = JSON.parse(r.content);
@@ -617,6 +638,7 @@
         if (this.contentData.status < 2) {
           this.contentData.status = 2; //进行中
         }
+        //以下是学习记录
         if (this.contentData.contentType > 20) { //非视频类的
          //用户的学习时长，非音视频课程学习,单独的处理
           this.isAppendTime = false;
@@ -625,9 +647,15 @@
             $this.appendStudyOtherTime();
           }, 1000*60*2); //非音视频课程学习,2分钟后记录，因为一次记录是60秒
           //this.appendStudyTime();
-          this.handleTimeout = setTimeout(function() {
-            $this.saveStudyInfo();
-          }, 5000); //5秒后记录学习完成
+          if (this.contentData.contentType != 50) {
+            this.handleTimeout = setTimeout(function(){
+              $this.saveStudyInfo();
+            }, 5000); //5秒后记录学习完成
+          }else{
+            //scorm课件不记录完成情况，由播放回调记录完成情况
+            //当前先保存学习记录，未学习状态
+            this.saveScormStudy();
+          }
         }
 
 
@@ -1229,6 +1257,34 @@
           }
         }
       },
+      saveScormStudy() {
+        //只记录SCORM课件的学习
+        if (this.contentData.contentType != 50) {
+          return;
+        }
+        if (this.contentData.status == 9) {
+          //已学习完的，不会再记录
+          return;
+        }
+        let params = {
+          studyId: this.studyId, //学习id,
+          courseId: this.courseId, //课程id,
+          contentId: this.contentData.id, //内容id,
+          contentType: this.contentData.contentType,
+          contentName: this.contentData.contentName, //内容名称
+          progress: 0,
+          status: 1,
+          contentTotal: this.totalContent
+        };
+        apiStudy.studyContent(params).then(res => {
+          if (res.status == 200) {
+            this.contentData.status = 2; //进行中
+            this.contentData.studyItemId = res.result; //学习记录id
+          } else {
+            console.log('记录学习失败:' + res.message + '，' + res.error);
+          }
+        });
+      },
       saveStudyInfo() {
         //记录课件学习信息
         if (this.contentData.contentType >= 60) {
diff --git a/src/views/ucurrency/Index.vue b/src/views/ucurrency/Index.vue
index 11504ec0..fba0471b 100644
--- a/src/views/ucurrency/Index.vue
+++ b/src/views/ucurrency/Index.vue
@@ -2,7 +2,7 @@
   <div class="u-currency">
     <div class="myubi">
       <div class="ubi-hear">
-        <h6>我的U币:{{uinfo.uCurrency}}</h6><span class="pointer" @click="dialogVisible = true">U币规则
+        <h6>我的U币:{{uinfo.uCurrency< 0 ? 0 :uinfo.uCurrency}}</h6><span class="pointer" @click="dialogVisible = true">U币规则
           <i class="el-icon-arrow-right"></i> </span>
         <el-button icon="el-icon-document" @click="exportRecord()">导出记录</el-button>
       </div>
diff --git a/src/views/user/Setting.vue b/src/views/user/Setting.vue
index 1e74de98..c1db22d0 100644
--- a/src/views/user/Setting.vue
+++ b/src/views/user/Setting.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="personSetting">
+
     <el-button type="text" class="passWard-btn"  @click="openPassword"><svg-icon icon-class="passWard-edit" style="margin-right: 10px;font-size: 22px;"></svg-icon>修改密码</el-button>
     <div class="avatar" title="修改头像" @click="openAvatar">
       <el-avatar :src="avatar" :size="116" alt=""></el-avatar>
@@ -13,10 +14,93 @@
 
     <!-- <el-form :model="form" label-position="right" label-width="80px"> -->
       <div class="informationItem">
-        <div class="information-header">
-          <h4>基础信息</h4>
+        <div class="info-header">
+          <h4 @click="infoswich=1" :class="infoswich == 1 ? 'h4active' : '' ">基础信息</h4>
+          <h4 v-if="teaechswich" @click="infoswich=0" :class="infoswich == 0 ? 'h4active' : '' ">教师信息</h4>
         </div>
-        <ul class="base-info">
+        <div v-if="infoswich == 0">
+          <el-button type="primary"  size="mini" @click="Edittearch = !Edittearch">教师信息编辑</el-button>
+          <!-- 查看教师 -->
+          <div v-if="Edittearch">
+                <div class="tearchimg">
+                    <h3>教师职业照</h3>
+                    <img :src="tearchUrl" alt="">
+                  </div>
+                  <div class="tearchexperi">
+                    <h3>工作经历</h3>
+                    <span>{{ teachform.workExperience }}</span>
+                  </div>
+                  <div class="tearchexperi" style="height:70px">
+                      <h3>擅长课程</h3>
+                      <span>{{ teachform.courses }}</span>
+
+                   </div>
+                <div class="teachphoto" style="height:70px">
+                      <h3>专长</h3>
+                      <div  v-for="(item,idx) in workname" :key="idx" class="teachexcel">
+                        {{ item.name }}
+                      </div>
+
+                </div>
+          </div>
+          <!-- 编辑教师 -->
+           <div v-else>
+              <div class="tearchimg">
+                    <h3>教师职业照</h3>
+                    <div style="float:left;margin-top:20px">
+                         <imageUpload width="150px" height="150px" :value="tearchUrl" fileSizeLimit="500KB" :compress="0.7" :compressAccurately="20" @success="handtearchUploadSuccess" @remove="removetearchHandle"></imageUpload>
+                    </div>
+              </div>
+              <div class="tearchexperi">
+                    <h3>工作经历</h3>
+                    <div style="float:left;margin-top:10px;width:350px">
+                      <el-input
+                        type="textarea"
+                        :rows="3"
+                        maxlength="80"
+                        placeholder="请输入内容"
+                        show-word-limit
+                        v-model="teachform.workExperience">
+                      </el-input>
+                    </div>
+
+                  </div>
+                 <div class="tearchexperi" style="margin-top:15px">
+                      <h3>擅长课程</h3>
+                       <div style="float:left;margin-top:10px;width:350px">
+                      <el-input
+                        type="textarea"
+                        :rows="2"
+                        placeholder="请输入内容"
+                        v-model="teachform.courses">
+                      </el-input>
+                    </div>
+                 </div>
+                 <div class="tearchexperi">
+                      <h3 >教师专长</h3>
+                       <div style="float:left;margin-top:10px;">
+                        <div>
+                          <div class="interest" v-for="(sys,index) in sysTypeListtear" :key="sys.id">
+                            <span class="interest-title">{{sys.name}}</span>
+                            <div style="width:100%">
+                              <el-checkbox-group v-model="checkboxtearGroup" v-if="sys.children.length > 0">
+                                <el-checkbox size="medium" border v-for="ch in sys.children" :label="ch.id" :key="ch.id">{{ch.name}}</el-checkbox>
+                              </el-checkbox-group>
+                            </div>
+                          </div>
+                        </div>
+                    </div>
+                 </div>
+                 <div>
+                    <div style="text-align: center;margin-top:56px">
+                      <el-button  @click="Edittearch = true">取消</el-button>
+                      <el-button  type="primary" @click="teacherUpdata()">保存</el-button>
+                    </div>
+                 </div>
+           </div>
+        </div>
+        <div v-if="infoswich == 1">
+           <ul class="base-info">
           <li><label class="label" style="width:32px">姓名</label><span class="info-text">{{form.name}}</span></li>
           <li><label class="label" style="width:32px">性别</label><span class="info-text">{{form.gender == 1?'男':'女'}}</span></li>
           <li><label class="label">所属部门</label><span class="info-text">{{form.departName}}</span></li>
@@ -26,8 +110,7 @@
           <li><label class="label">手机号</label><span class="info-text">{{form.account.mobile}}</span></li>
           <li><label class="label">邮箱</label><span class="info-text">{{form.account.email}}</span></li>
         </ul>
-      </div>
-      <div class="informationItem">
+          <div class="informationItem">
         <div class="information-header">
           <h4>个人签名<svg-icon v-show="!signData.isEdit" type="primary" @click="signData.isEdit = true" icon-class="passWard-edit" style="margin-left: 10px;font-size: 18px;cursor: pointer;"></svg-icon></h4>
         </div>
@@ -43,7 +126,8 @@
           <!-- <el-button v-show="!signData.isEdit" style="margin-left:110px" type="primary" @click="signData.isEdit = true"></el-button> -->
         </div>
       </div>
-      <div class="informationItem">
+
+        <div class="informationItem">
         <div class="information-header">
           <h4>个人主页设置<svg-icon v-show="!hideHomeEdit" type="primary" @click="hideHomeEdit = true" icon-class="passWard-edit" style="margin-left: 10px;font-size: 18px;cursor: pointer;"></svg-icon></h4>
         </div>
@@ -56,7 +140,7 @@
            <!-- <el-button v-show="!dynamicData.isEdit" style="margin-left:110px" type="primary" @click="dynamicData.isEdit = true">编辑</el-button> -->
         </div>
       </div>
-      <div class="informationItem">
+        <div class="informationItem">
         <div class="information-header">
           <h4>动态可见范围<svg-icon v-show="!dynamicDataEdit" type="primary" @click="dynamicDataEdit = true" icon-class="passWard-edit" style="margin-left: 10px;font-size: 18px;cursor: pointer;"></svg-icon></h4>
         </div>
@@ -93,6 +177,16 @@
           <el-button v-show="!interestIsEdit" type="primary" @click="interestIsEdit = true">编辑</el-button>
           -->
          </div>
+
+
+
+        </div>
+
+      </div>
+
+
+
+
       <!-- </div> -->
     <!-- </el-form> -->
     <el-dialog
@@ -143,13 +237,14 @@
 </template>
 
 <script>
+  import apiTeach from '@/api/modules/teacher.js';
   import { mapGetters, mapActions } from 'vuex';
   import userApi from "@/api/system/user";
   import accountApi from "@/api/account";
   import apiPassword from '@/api/boe/login.js'
   import imageUpload from '@/components/ImageUpload/index.vue';
   import apiUserhobby from "@/api/phase2/userhobby.js"
-   const cityOptions = ['上海', '北京', '广州', '深圳'];
+  import apiBoeTeahcer from "@/api/boe/teacher.js"
   export default{
     components:{imageUpload},
     data(){
@@ -190,6 +285,12 @@
         }
       };
       return {
+        fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
+        sysTypeListtear:[],
+        teaechswich:false,
+        props: { multiple: true },
+        Edittearch:true,
+        infoswich:1,
         dynamicDataEdit:false,
         hideHomeEdit:false,
         signData:{
@@ -197,15 +298,23 @@
           isEdit:false
         },
         hideHome:false,// 是否隐藏个人主页
-        cities: cityOptions,
         checkboxGroup: [],
+        checkboxtearGroup: [],
         radio: '1',
         form:{
           account:{}
         },
+        teachform:{
+          id:'',
+          photo:'',
+          courses:'',//擅长课程
+          workExperience:'', //工作经历
+          expertise:'',  //专长
+        },
         dialogVisibleAvatar:false,
         dialogVisiblePassword:false,
         avatarUrl:'',
+        tearchUrl:'',
         passwordForm:{},
         rules:{
           newPass: [
@@ -218,6 +327,8 @@
         sysTypeListMap:[],
         interestList:[],//已有兴趣爱好列表
         interestIsEdit:false,
+        childData:[],
+        workname:[],
       }
     },
     computed: {
@@ -250,13 +361,14 @@
         }
       },
 
+      Edittearch(){
+        this.gettearch();
+      },
       // 监听"编辑按钮"事件变化
       interestIsEdit(){
         this.load();
         this.getInfo();
       }
-
-
     },
     mounted(){
       if(this.userInfo.avatar){
@@ -265,11 +377,75 @@
       this.hideHome = !this.userInfo.showHome;
       this.load();
       this.getInfo();
+      this.gettearch();
       this.getSysTypeTree().then(rs => {
         this.sysTypeListMap = rs;
+        // console.log(rs);
+        this.sysTypeListtear = rs;
       });
+      this.Teacherprofile();
+      this.Teacherinfo();
     },
     methods:{
+      gettearch(){
+        // console.log(this.checkboxtearGroup,'lmj');
+      },
+
+      Teacherinfo(){
+          this.workname=[];
+          this.checkboxtearGroup=[];
+          
+          apiTeach.detailTeacher(this.userInfo.aid).then(res =>{
+            if(res.result.courses){
+              this.teachform.courses = res.result.courses;
+            }
+            if(res.result.workExperience){
+              this.teachform.workExperience = res.result.workExperience;
+            }
+            if(res.result.photo){
+              this.teachform.photo = res.result.photo;
+              this.tearchUrl = this.fileBaseUrl + res.result.photo;
+            }
+              
+            apiBoeTeahcer.simpleInfo(this.userInfo.sysId).then(sinfo=>{
+               if(sinfo.status=='200'){
+                    if(sinfo.result.courses){
+                      this.teachform.courses = sinfo.result.courses;
+                    }
+                    if(sinfo.result.work){
+                      this.teachform.workExperience = sinfo.result.work;
+                    }
+                    if(sinfo.result.photo){
+                      this.teachform.photo = sinfo.result.photo;
+                      this.tearchUrl = this.fileBaseUrl + sinfo.result.photo;
+                    }
+               }
+            })
+            
+            this.teachform.expertise = res.result.expertise.split( ',' );
+            let children=[];
+            this.sysTypeListtear.forEach(nm =>{
+                nm.children.forEach(lk =>{
+                  children.push(lk);
+                })
+            });
+            this.childData=children;
+            this.teachform.expertise.forEach(item =>{
+              this.childData.forEach(it =>{
+                if(item == it.id){
+                  this.workname.push(it);
+                  this.checkboxtearGroup.push(it.id);
+                  //console.log(it,'匹配的数据')
+                }
+              })
+            })
+          })
+        },
+      Teacherprofile(){
+          apiTeach.has(this.userInfo.aid).then(res =>{
+            this.teaechswich = res.result.isTeacher;
+          })
+        },
       // 保存个人主页选项的编辑
       saveHideHome(){
          //执行隐藏操作
@@ -334,6 +510,7 @@
               this.checkboxGroup.push(item.refId);
               item.name = this.sysTypeName(item.refId)
             })
+            // console.log(res.result);
             this.interestList = res.result;
           }
         })
@@ -343,6 +520,45 @@
         return this.sysTypeMap.get(code);
       },
 
+      teacherUpdata(){
+        if(this.checkboxtearGroup.length  <1 && this.checkboxtearGroup.length>=1) {
+          this.$message.error('至少选择一个专长！')
+          return;
+        }
+        if(this.checkboxtearGroup.length  >3 && this.checkboxtearGroup.length>=1) {
+          this.$message.error('最多选择三个专长！')
+          return;
+        }
+        //console.log(this.checkboxtearGroup);
+        this.teachform.expertise = this.checkboxtearGroup.toString();
+        //console.log(this.teachform.expertise);
+        this.teachform.id = this.userInfo.aid;
+        apiTeach.updateTeacher(this.teachform).then(res =>{
+          //console.log('编辑成功')
+          if(res.status==200){
+            this.Edittearch = true;
+            this.Teacherinfo();
+            //更新远程
+            let simpleData={
+              teacher_user_id:this.userInfo.sysId,
+              courses:this.teachform.courses,
+              photo:this.teachform.photo,
+              expertise:this.teachform.expertise,
+              work:this.teachform.workExperience
+            }
+            apiBoeTeahcer.simpleUpdate(simpleData).then(rs=>{
+               if(rs.status!='200'){
+                 this.$message.error('同步数据错误');
+
+               }
+
+            })
+          }
+        })
+
+
+      },
+
       // 更新用户与偏好数据
       saveHobby(){
         let data = []
@@ -394,6 +610,14 @@
         this.form.account.avatar = res.result.filePath;
         this.avatarUrl= res.result.httpPath;
       },
+      handtearchUploadSuccess(res){
+        this.teachform.photo = res.result.filePath;
+        this.tearchUrl= res.result.httpPath;
+      },
+      removetearchHandle(){
+         this.avatarUrl='';
+         this.teachform.photo  = '';
+      },
       removeHandle(){
          this.avatarUrl='';
          this.form.account.avatar = '';
@@ -434,6 +658,72 @@
 </script>
 
 <style lang="scss" scoped>
+.teachexcel{
+    padding: 5px 10px;
+    margin-right: 10px;
+    border: 1px solid #588afc;
+    border-radius: 20px;
+    color: #588afc;
+    float: left;
+  }
+.teachphoto{
+    margin-top: 20px;
+    h3{
+      margin: 0;
+      font-size: 16px;
+      font-weight: 450;
+      padding-bottom: 20px;
+    }
+  }
+.tearchexperi{
+  height: 80px;
+  span{
+    display: inline-block;
+    width: 350px;
+    margin-top: 15px;
+    color: #666;
+    font-size: 15px;
+  }
+  h3{
+    float: left;
+     font-size: 16px;
+      font-weight: 450;
+    margin-right: 30px;
+  }
+}
+.tearchimg{
+  height: 180px;
+  h3{
+    float: left;
+     font-size: 16px;
+      font-weight: 450;
+    margin-right: 15px;
+  }
+  img{
+    float: left;
+    width: 150px;
+    height: 150px;
+    margin-top: 20px;
+  }
+}
+.info-header{
+  margin-bottom: 35px;
+  height: 40px;
+  width: 100%;
+  h4{
+    cursor: pointer;
+    float: left;
+    font-weight: 400;
+    margin: 0;
+    line-height: 30px;
+    margin-top: 10px;
+    margin-right: 10px;
+  }
+  .h4active{
+    font-size: 20px;
+    font-weight: bold;
+  }
+}
 .avatarhover{
   width: 116px;
    height: 116px;
@@ -553,9 +843,7 @@
   .personSetting{
     background-color: #fff;
     box-sizing: border-box;
-    // padding: 30px 0px 0px 247px;
     padding: 30px 0 10% 20%;
-    // margin: 0 auto;
     position: relative;
     .avatar{
       width: 116px;