Merge remote-tracking branch 'origin/cloud' into dev0731

src/components/Course/courseForm.vue

@@ -1484,6 +1484,7 @@ export default {
                 aid:rs.result.id,
                 orgId:rs.result.orgId
               }
+              //下面的机构名称，路径不对，应该取课程的资源归属（机构）的路径
               postData.course.orgName=rs.result.orgNamePath+'/'+rs.result.orgName;
               apiCourse.submitCourse(postData).then(res => {
                   //this.btnLoading=false;

src/components/PortalHeader.vue

@@ -91,7 +91,7 @@
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item><router-link to="/index">学员</router-link></el-dropdown-item>
                     <el-dropdown-item v-if="identity == 2 || identity == 5" @click.native="setCurIdentity(2)"><router-link to="/need/waitaudit">教师</router-link></el-dropdown-item>
-                    <el-dropdown-item v-if="identity == 3 || identity == 5" @click.native="setCurIdentity(3)"><router-link to="/course/manage">管理员</router-link></el-dropdown-item>
+                    <el-dropdown-item v-if="identity == 3 || identity == 5" ><a :href="managerPath+'/learningpath'">管理员</a></el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
              </div>
@@ -171,6 +171,8 @@ export default {
   data() {
     return {
       popupConfig:{},
+      ctx:process.env.VUE_APP_PUBLIC_PATH,
+      managerPath:process.env.VUE_APP_MANAGER_PATH,
       fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
       findType: '1',
       keyword: '',
@@ -296,11 +298,10 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      })
-        .then(() => {
+      }).then(() => {
           this.$store.dispatch('LogOut').then(() => {
             //location.href = this.webBaseUrl + '/login';
-			sessionStorage.setItem('dialog_session_show'+this.userInfo.aid,null); // 清除兴趣采集的"关闭"缓存
+            sessionStorage.setItem('dialog_session_show'+this.userInfo.aid,null); // 清除兴趣采集的"关闭"缓存
             location.href = process.env.VUE_APP_LOGIN_URL;
           });
         })

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>
-                <span v-if="identity == 3 || identity == 5" :class="{identity:true,active:curIdentity==3}" @click="setCurIdentity(3)">管理员</span>
+                 <span v-if="identity == 3 || identity == 5" :class="{identity:true,active:curIdentity==3}" ><a :href="managerPath+'/learningpath'">管理员</a></span>
               </div>
             </div>
          </div>
@@ -103,6 +103,8 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
 		},
     data(){
       return {
+        ctx:process.env.VUE_APP_PUBLIC_PATH,
+        managerPath:process.env.VUE_APP_MANAGER_PATH,
         fileBaseUrl:process.env.VUE_APP_FILE_BASE_URL,
         isTest:false,
         statData:{