Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

src/components/pages/course.vue

@@ -9,7 +9,7 @@
       </div>
       <div class="student_button">
         <!-- <el-button type="primary" class="bgColor" @click="openCourse">协同编辑</el-button> -->
-        <!-- <el-button type="primary" class="bgColor" @click="goToCourse2()">极简添加</el-button> -->
+        <el-button type="primary" class="bgColor" @click="goToCourse2()">极简添加</el-button>
         <el-button type="primary" class="bgColor" @click="goToCourse()">添加课程</el-button>
       </div>
     </div>
@@ -438,11 +438,7 @@ export default {
       window.parent.postMessage({ cid: cid, screenType: "2" }, "*");
     },
     get(item) {
-      if(item.state == 1){
-        window.parent.postMessage({ cid: item.courseId, screenType: "3" }, "*");
-      }else if(item.state == 2){
-        window.parent.postMessage({ cid: item.courseId, screenType: "3E" }, "*");
-      }
+      window.parent.postMessage({ cid: item.courseId, screenType: "3" }, "*");
     },
     getNT(cid) {
       window.parent.postMessage({ cid: cid, screenType: "3NT" }, "*");

src/components/pages/easy/addCourse.vue

@@ -4,6 +4,28 @@
       <div class="right">
         <!-- <div style="display: flex; margin-top: 20px; position: relative"> -->
         <div style="width: 100%; height: 100%; overflow: auto" ref="stepBox">
+          <div class="courseTop">
+            <div class="stepsNav">
+              <h3 class="info_title" v-if="steps == 1">填写基本信息</h3>
+              <h3 class="info_title" v-if="steps == 4">上传课程</h3>
+              <el-breadcrumb separator-class="el-icon-arrow-right" style="margin-top: 15px">
+                <el-breadcrumb-item :to="{
+                  path:
+                    '/course?userid=' +
+                    userid +
+                    '&oid=' +
+                    oid +
+                    '&org=' +
+                    org +
+                    '&role=' +
+                    role,
+                }">课程管理</el-breadcrumb-item>
+                <el-breadcrumb-item>
+                  <span style="color: rgb(15, 126, 255)">添加课程</span>
+                </el-breadcrumb-item>
+              </el-breadcrumb>
+            </div>
+          </div>
           <div class="rightBox" v-if="this.steps == 1" @mousewheel="scrollChange">
             <div class="updateMask" :style="{
               height: rightBoxHeight ? rightBoxHeight + 'px' : '100%',
@@ -9083,11 +9105,9 @@ ol {
   flex-direction: row;
   justify-content: flex-start;
   align-items: center;
-  /* width: 100%; */
-  width: calc(100% - 20px);
-  /* background: rgb(255, 255, 255); */
-  /* border-radius: 10px; */
+  width: calc(100% - 40px);
   padding: 20px 0;
+  margin:0 auto;
 }
 
 .stepsNav {
@@ -9113,9 +9133,9 @@ ol {
   background: rgb(255, 255, 255);
   border-radius: 10px;
   overflow: auto;
-  height: calc(100% - 80px);
+  height: calc(100% - 160px);
   position: relative;
-  margin: 20px auto 0;
+  margin: 0px auto 0;
 }
 
 .e_add_top {