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

src/components/pages/aiEasy/addCourse.vue

@@ -2354,12 +2354,12 @@
                     <!-- <span class="button-toggle" @click="stepShow = !stepShow">{{ stepShow ? '收缩' : '展开' }}</span> -->
                   </div>
                   <div class="stepsBottom" v-if="stepsNav == 1" :style="{
-                    height:istemplate == 1 ? 'calc(100vh - 300px)' : 'calc(100% - 55px - 60px)',
+                    height:istemplate == 1 ? 'calc(100vh - 300px)' : 'calc(100% - 40px)',
                     position: istemplate == 1 ? 'sticky' : 'unset',
                     top: istemplate == 1 ? '0' : 'unset'
                   }">
-                    <!-- <div class="navTop">辅助导航</div> -->
-                    <div class="navBottom" v-if="courseState == 6"  :style="{ height: heightPx }">
+                    <!-- <div class="navTop">辅助导航</div>  :style="{ height: heightPx }"-->
+                    <div class="navBottom" v-if="courseState == 6" >
                       <!-- <div class="navTask noImage" v-if="unitJson[unitIndex].dyName">
                         <div class="nt_taskBox" style="width: 100%;">
                           <div class="nt_taskTitle"
@@ -7909,7 +7909,7 @@ export default {
           }
         }
         if (cPan == 2) {
-          this.unitIndex = oldValue;
+          // this.unitIndex = oldValue;
           return;
         }
         for (var i = 0; i < this.unitJson.length; i++) {
@@ -7987,7 +7987,7 @@ export default {
         }
         this.inputShow = true;
         if (cPan == 2) {
-          this.steps = old;
+          // this.steps = old;
           return;
         }
         this.goTo(
@@ -10461,6 +10461,9 @@ ${_this.unitJson[0].chapterInfo[0].taskJson[index].taskDetail3.replaceAll('#',''
                 if(fileid && fileid != 1){
                   _this.knowFileids.push(fileid)
                 }
+                if(!_this.courseName){
+                  _this.courseName = fileName.split('.').slice(0, -1).join('.')
+                }
                 console.log(data.Location);
               }
             });
@@ -12518,7 +12521,7 @@ ${_this.unitJson[0].chapterInfo[0].taskJson[index].taskDetail3.replaceAll('#',''
       }
       this.inputShow = true;
       if (cPan == 2) {
-        this.steps--;
+        // this.steps--;
         return;
       }
       let params = [
@@ -12589,7 +12592,7 @@ ${_this.unitJson[0].chapterInfo[0].taskJson[index].taskDetail3.replaceAll('#',''
       }
       this.inputShow = true;
       if (cPan == 2) {
-        this.steps--;
+        // this.steps--;
         return;
       }
       let params = [
@@ -12654,7 +12657,7 @@ ${_this.unitJson[0].chapterInfo[0].taskJson[index].taskDetail3.replaceAll('#',''
       }
       this.inputShow = true;
       if (cPan == 2) {
-        this.steps--;
+        // this.steps--;
         return;
       }
       for (var i = 0; i < this.unitJson.length; i++) {

src/components/pages/newCourse/addCourse.vue

@@ -17757,6 +17757,7 @@ ol {
   height: 100%;
   overflow: auto;
   padding: 10px 0;
+  box-sizing: border-box;
 }
 
 .navStage {