lsc 1 yıl önce
ebeveyn
işleme
d0b1e98a2a

+ 43 - 21
src/components/pages/addCourse.vue

@@ -43,13 +43,13 @@
                 <div style="margin: 5px 10px 0 0; width: 2rem">
                   <img src="../../assets/icon/second.png" alt />
                 </div>
-                <div>选择课程模</div>
+                <div>选择课程模</div>
               </div>
               <div v-else-if="cidType === 0 && isStepDisplay" class="secondNo" @click="navSteps(2)">
                 <div>
                   <img src="../../assets/icon/secondNo.png" alt />
                 </div>
-                <div>选择课程模</div>
+                <div>选择课程模</div>
               </div>
               <div v-if="isStepDisplay" class="stepBorder" :class="{ 'border-active': steps > 2 }"></div>
               <div v-if="steps > 2 && isStepDisplay" class="third" @click="navSteps(3)">
@@ -312,7 +312,7 @@
                 请选择合适的课程模板
               </div>
               <div class="wordbox">
-                <div class="wordTeacher" v-for="(aa, indexF) in templateArray" :key="indexF" @click="checkTemplate(aa)">
+                <div class="wordTeacher" @click="checkTemplate2()">
                   <div class="wordPic">
                     <img src="../../assets/icon/wordMub.png" alt />
                   </div>
@@ -325,10 +325,10 @@
                       white-space: nowrap;
                       padding: 0 20px;
                     ">
-                    {{ aa.title }}
+                    空白模板
                   </div>
                 </div>
-                <div class="wordTeacher" @click="checkTemplate2()">
+                <div class="wordTeacher" v-for="(aa, indexF) in templateArray" :key="indexF" @click="checkTemplate(aa)">
                   <div class="wordPic">
                     <img src="../../assets/icon/wordMub.png" alt />
                   </div>
@@ -341,10 +341,10 @@
                       white-space: nowrap;
                       padding: 0 20px;
                     ">
-                    任务模式
+                    {{ aa.title }}
                   </div>
                 </div>
-                <div class="wordTeacher" @click="checkTemplate3()">
+                <div class="wordTeacher" @click="checkTemplate3()" v-if="oid == '69893dca-1d47-11ed-8c78-005056b86db5'">
                   <div class="wordPic">
                     <img src="../../assets/icon/wordMub.png" alt />
                   </div>
@@ -440,6 +440,16 @@
                 <div class="stepsBottom">
                   <!-- <div class="navTop">辅助导航</div> -->
                   <div class="navBottom">
+                    <div class="navTask" v-if="unitJson[unitIndex].dyName">
+                      <div class="nt_taskBox" style="width: 100%;">
+                        <div class="nt_taskTitle">阶段 {{ unitIndex + 1 }}</div>
+                        <div class="nt_taskName">
+                          <el-tooltip effect="light" :content="unitJson[unitIndex].dyName" placement="top">
+                            <span>{{ unitJson[unitIndex].dyName }}</span>
+                          </el-tooltip>
+                        </div>
+                      </div>
+                    </div>
                     <div class="navTask" :class="{
                       isNavTask: isClickColor > 0 && isClickColor == tIndex + 1,
                     }" v-for="(t, tIndex) in unitJson[unitIndex].chapterInfo[0]
@@ -465,7 +475,7 @@
                 <!-- <div class="rb_c_box_btn">
                   <button class="c_pub_button_add pub_btn_paste_img" @click="pasteTask" v-if="steps == 3">智能粘贴</button>
                 </div> -->
-                <div class="basic_box">
+                <div class="basic_box" ref="unitBox">
                   <div style="
                   display: flex;
                   flex-direction: row;
@@ -512,7 +522,7 @@
                       <div class="chapter_contentbox">
                         <!-- <div>第{{ unitIndex + 1 }}阶段</div> -->
                         <div class="cc_input">
-                          <input type="text" placeholder="阶段标题" class="binfo_input"
+                          <input ref="dyInput" type="text" placeholder="阶段标题" class="binfo_input"
                             v-model="unitJson[unitIndex].dyName" />
                         </div>
                         <div class="remove" v-if="unitJson.length > 1 &&
@@ -1510,7 +1520,7 @@
                                     </div>
                                   </div>
                                 </div>
-                                <div class="tool">
+                                <!-- <div class="tool">
                                   <div class="whiteBIcon" @click="addTools(22, itemTaskIndex, toolIndex)">
                                     <img src="../../assets/icon/fourthToolList/AIprogram2.png" alt />
                                     <div style="margin: 5px 0">AI体验</div>
@@ -1521,7 +1531,7 @@
                                       <img src="../../assets/icon/checkedIs.png" alt /><span>已选择</span>
                                     </div>
                                   </div>
-                                </div>
+                                </div> -->
                                 <div class="tool">
                                   <div class="whiteBIcon" @click="addTools(23, itemTaskIndex, toolIndex)">
                                     <img src="../../assets/icon/fourthToolList/Pythonprogram.png" alt />
@@ -2783,7 +2793,8 @@
             justify-content: center;
           ">
           <div style="margin-bottom: 20px; font-size: 20px">问题:</div>
-          <el-input v-model="answerQ" placeholder="请输入您要问的问题"></el-input>
+          <!-- <el-input v-model="answerQ" placeholder="请输入您要问的问题"></el-input> -->
+          <textarea rows="1" v-autoHeight="40" type="text" placeholder="请输入您要问的问题" class="binfo_input" style="width: 100% !important;border:1px solid #DCDFE6" v-model="answerQ"></textarea>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -3747,14 +3758,14 @@ export default {
           if (this.steps == 1) {
             setTimeout(() => {
               this.checkEva(this.checkId);
-            }, 0);
+            }, 100);
           }
         } else {
           if (this.steps == 3) {
             this.steps = 1;
             setTimeout(() => {
               this.checkEva(this.checkId);
-            }, 0);
+            }, 100);
           }
         }
       }
@@ -3780,7 +3791,7 @@ export default {
           this.steps = 1;
           setTimeout(() => {
             this.checkEva(this.checkId);
-          }, 0);
+          }, 100);
         }
         if (s == 2) {
           this.steps = 2;
@@ -3809,7 +3820,7 @@ export default {
           this.steps = 1;
           setTimeout(() => {
             this.checkEva(this.checkId);
-          }, 0);
+          }, 100);
         }
         if (s == 3) {
           this.cTemplate = this.templateC.content;
@@ -3921,6 +3932,7 @@ export default {
     unitSet(i) {
       this.unitIndex = i;
       // this.$refs.rightboxR.scrollTop = 0;
+      this.$refs.unitBox.scrollTop = 0
     },
     time() {
       if (!this.now) {
@@ -4922,6 +4934,10 @@ export default {
 
       setTimeout(() => {
         this.unitIndex = this.unitJson.length - 1;
+        setTimeout(() => {
+          console.log(this.$refs.dyInput)
+          this.$refs.dyInput[0].focus()
+        }, 100);
         this.unitSet(this.unitIndex);
       }, 0);
     },
@@ -4961,6 +4977,10 @@ export default {
         checkJson: [{ checkCount: [], checkPerent: [] }],
         homeworkList: [],
       });
+
+      setTimeout(() => {
+            this.checkEva(this.checkId);
+          }, 100);
     },
     add(e, i) {
       var el = e.currentTarget;
@@ -7341,7 +7361,7 @@ export default {
       this.typeMode = type;
       setTimeout(() => {
         this.checkEva(this.checkId);
-      }, 0);
+      }, 100);
     },
     openMember() {
       this.searchTN = "";
@@ -9884,7 +9904,7 @@ ol {
   border: 1px solid #CAD1DC;
   border-radius: 10px;
   margin-top: 20px;
-  min-height: 1160px;
+  min-height: 670px;
   position: relative;
   background: #F0F4FA;
   padding: 20px 20px 0;
@@ -10037,7 +10057,7 @@ ol {
 
 /* 评价样式 */
 .elist_css {
-  padding-bottom: 60px !important;
+  padding-bottom: 75px !important;
 }
 
 .elist_title {
@@ -10082,6 +10102,8 @@ ol {
 .elist_input .elist_input_box .remove {
   height: 20px;
   width: 20px;
+  min-height: 20px;
+  min-width: 20px;
   background-size: 100% 100%;
   background-position: unset;
   margin-left: 5px;
@@ -10977,8 +10999,8 @@ ol {
 .navTask .nt_taskName {
   /* color: #fff; */
   /* max-width: 130px; */
-  /* width: 100%; */
-  max-width: calc(100% - 50px);
+  width: 100%;
+  /* max-width: calc(100% - 50px); */
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;

+ 12 - 5
src/components/pages/easy/addCourse.vue

@@ -999,7 +999,7 @@
                                     </div>
                                   </div>
                                 </div>
-                                <div class="tool">
+                                <!-- <div class="tool">
                                   <div class="whiteBIcon" @click="
                                     addTools(22, itemTaskIndex, toolIndex)
                                     ">
@@ -1015,7 +1015,7 @@
                                       <img src="../../../assets/icon/checkedIs.png" alt /><span>已选择</span>
                                     </div>
                                   </div>
-                                </div>
+                                </div> -->
                                 <div class="tool">
                                   <div class="whiteBIcon" @click="
                                     addTools(23, itemTaskIndex, toolIndex)
@@ -1050,7 +1050,7 @@
                                     </div>
                                   </div>
                                 </div>
-                                <!-- <div class="tool">
+                                <div class="tool">
                                   <div class="whiteBIcon" @click="
                                     addTools(32, itemTaskIndex, toolIndex)
                                     ">
@@ -1066,7 +1066,7 @@
                                       <img src="../../../assets/icon/checkedIs.png" alt /><span>已选择</span>
                                     </div>
                                   </div>
-                                </div> -->
+                                </div>
                                 <div class="tool">
                                   <div class="whiteBIcon" @click="openTools(itemTaskIndex, 57, toolIndex)">
                                     <img src="../../../assets/icon/fourthToolList/cocopi.png" alt />
@@ -3791,7 +3791,8 @@
             justify-content: center;
           ">
           <div style="margin-bottom: 20px; font-size: 20px">问题:</div>
-          <el-input v-model="answerQ" placeholder="请输入您要问的问题"></el-input>
+          <!-- <el-input v-model="answerQ" placeholder="请输入您要问的问题"></el-input> -->
+          <textarea rows="1" v-autoHeight="40" type="text" placeholder="请输入您要问的问题" class="binfo_input" style="width: 100% !important;border:1px solid #DCDFE6" v-model="answerQ"></textarea>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -5872,6 +5873,12 @@ export default {
       } else {
         this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].isFold2 = true;
       }
+      setTimeout(() => {
+        this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].taskDetail += '*0*%*'
+        setTimeout(() => {
+          this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].taskDetail = this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].taskDetail.replaceAll('*0*%*','')
+        }, 0);
+      }, 0);
       this.$forceUpdate();
     },
     fold3(i,ti) {

+ 13 - 6
src/components/pages/task/addCourse.vue

@@ -1443,7 +1443,7 @@
                                     </div>
                                   </div>
                                 </div>
-                                <div class="tool">
+                                <!-- <div class="tool">
                                   <div
                                     class="whiteBIcon"
                                     @click="
@@ -1474,7 +1474,7 @@
                                       /><span>已选择</span>
                                     </div>
                                   </div>
-                                </div>
+                                </div> -->
                                 <div class="tool">
                                   <div
                                     class="whiteBIcon"
@@ -1539,7 +1539,7 @@
                                     </div>
                                   </div>
                                 </div>
-                                <!-- <div class="tool">
+                                <div class="tool">
                                   <div
                                     class="whiteBIcon"
                                     @click="
@@ -1570,7 +1570,7 @@
                                       /><span>已选择</span>
                                     </div>
                                   </div>
-                                </div> -->
+                                </div>
                                 <div class="tool">
                                   <div
                                     class="whiteBIcon"
@@ -6099,10 +6099,11 @@
           "
         >
           <div style="margin-bottom: 20px; font-size: 20px">问题:</div>
-          <el-input
+          <!-- <el-input
             v-model="answerQ"
             placeholder="请输入您要问的问题"
-          ></el-input>
+          ></el-input> -->
+          <textarea rows="1" v-autoHeight="40" type="text" placeholder="请输入您要问的问题" class="binfo_input" style="width: 100% !important;border:1px solid #DCDFE6" v-model="answerQ"></textarea>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -8440,6 +8441,12 @@ export default {
       } else {
         this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].isFold2 = true;
       }
+      setTimeout(() => {
+        this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].taskDetail += '*0*%*'
+        setTimeout(() => {
+          this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].taskDetail = this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].taskDetail.replaceAll('*0*%*','')
+        }, 0);
+      }, 0);
       this.$forceUpdate();
     },
     fold3(i,ti) {

+ 2 - 2
src/components/pages/teacherSource/dialog.vue

@@ -164,7 +164,7 @@ export default {
                 }else{
                     if(this.typea == 'b107f98f-1dc4-4ede-80b4-178ba22b6a59'){
                         return this.CourseTypeJson[tid].filter(e => {
-                            return ['fd7fc4a9-e934-47d5-9edf-f478a59010f0','5143a350-b20f-4a07-9d19-5ad305fefaac','3777ef66-96ff-4f08-8e6d-a7b6acc6c789'].indexOf(e.id) != -1 
+                            return ['fd7fc4a9-e934-47d5-9edf-f478a59010f0','5143a350-b20f-4a07-9d19-5ad305fefaac'].indexOf(e.id) != -1 
                         })
                     }else if(this.typea == '3b12e8d9-866f-46bb-aa22-76cb3b7788b3'){
                         return this.CourseTypeJson[tid].filter(e => {
@@ -180,7 +180,7 @@ export default {
                         })
                     }else if(this.typea == '8b21473c-eac2-4a40-8fb5-ac38985e8952'){
                         return this.CourseTypeJson[tid].filter(e => {
-                            return  ['e3365b81-49bb-4de9-a1c2-060e9dc593f3','5670c02b-7cbc-4788-8241-cf6e53dd61fd','25b66132-a125-4c51-8bbe-2653f8be4f0a','da94e547-ba90-4fd5-b95e-d13efca1e248','ba1db98a-0613-4568-92d2-59d53b600675'].indexOf(e.id) != -1 
+                            return  ['e3365b81-49bb-4de9-a1c2-060e9dc593f3','5670c02b-7cbc-4788-8241-cf6e53dd61fd','25b66132-a125-4c51-8bbe-2653f8be4f0a','da94e547-ba90-4fd5-b95e-d13efca1e248','ba1db98a-0613-4568-92d2-59d53b600675','3777ef66-96ff-4f08-8e6d-a7b6acc6c789'].indexOf(e.id) != -1 
                         })
                     }else if(this.typeE.indexOf('e4cb3395-5602-4441-801c-f380e8935a74') != -1){
                         return this.CourseTypeJson[tid]

+ 2 - 2
src/components/pages/teacherSource/index.vue

@@ -166,7 +166,7 @@ export default {
                 }else{
                     if(this.typea == 'b107f98f-1dc4-4ede-80b4-178ba22b6a59'){
                         return this.CourseTypeJson[tid].filter(e => {
-                            return ['fd7fc4a9-e934-47d5-9edf-f478a59010f0','5143a350-b20f-4a07-9d19-5ad305fefaac','3777ef66-96ff-4f08-8e6d-a7b6acc6c789'].indexOf(e.id) != -1 
+                            return ['fd7fc4a9-e934-47d5-9edf-f478a59010f0','5143a350-b20f-4a07-9d19-5ad305fefaac'].indexOf(e.id) != -1 
                         })
                     }else if(this.typea == '3b12e8d9-866f-46bb-aa22-76cb3b7788b3'){
                         return this.CourseTypeJson[tid].filter(e => {
@@ -182,7 +182,7 @@ export default {
                         })
                     }else if(this.typea == '8b21473c-eac2-4a40-8fb5-ac38985e8952'){
                         return this.CourseTypeJson[tid].filter(e => {
-                            return  ['e3365b81-49bb-4de9-a1c2-060e9dc593f3','5670c02b-7cbc-4788-8241-cf6e53dd61fd','25b66132-a125-4c51-8bbe-2653f8be4f0a','da94e547-ba90-4fd5-b95e-d13efca1e248','ba1db98a-0613-4568-92d2-59d53b600675'].indexOf(e.id) != -1 
+                            return  ['e3365b81-49bb-4de9-a1c2-060e9dc593f3','5670c02b-7cbc-4788-8241-cf6e53dd61fd','25b66132-a125-4c51-8bbe-2653f8be4f0a','da94e547-ba90-4fd5-b95e-d13efca1e248','ba1db98a-0613-4568-92d2-59d53b600675','3777ef66-96ff-4f08-8e6d-a7b6acc6c789'].indexOf(e.id) != -1 
                         })
                     }else if(this.typeE.indexOf('e4cb3395-5602-4441-801c-f380e8935a74') != -1){
                         return this.CourseTypeJson[tid]