###

src/App.vue

@@ -29,7 +29,7 @@
 				</div>
 			</div>
 		</div> -->
-    <div :class="{ liveCss: $route.path == '/liveProjectDetail' }">
+    <div :class="{ liveCss: $route.path == '/liveProjectDetail', oHeight: panRouter.includes($route.path) }">
       <!-- main 内容 -->
       <keep-alive v-if="$route.meta.keepAlive">
         <!-- 这里是会被缓存的视图组件 -->
@@ -77,6 +77,7 @@ export default {
   data() {
     return {
       isShowNav: true, // 是否显示导航 Tab
+      panRouter: ['/studystudentE2','/studystudentE3','/studyStudent','/studySutdentClass']
     };
   },
   components: {},
@@ -477,4 +478,9 @@ html::-webkit-scrollbar-thumb {
     color: #FFF !important;
 }
 
+
+.oHeight{
+  height: 100%;
+  overflow: hidden;
+}
 </style>

src/components/classRoomHelper/component/taskArea.vue

@@ -604,6 +604,10 @@ export default {
       type: Object,
       default: () => {}
     },
+    itemType: {
+      type: Number,
+      default: 0
+    },
     navList: {
       type: Array,
       default: () => []
@@ -1229,7 +1233,6 @@ ${_textData}
         file_ids: this.fileId,
         model: "gpt-4o-2024-11-20"
       };
-
       this.ajax
         // .post("https://gpt4.cocorobo.cn/chat", params)
         // .post("https://claude3.cocorobo.cn/chat", params)
@@ -1237,7 +1240,7 @@ ${_textData}
         .then(res => {
           let _data = res.data.FunctionResponse.message;
           _data = _data.replaceAll("```json", "").replaceAll("```", "");
-          const match = _data.match(/\[\s*\{[\s\S]*?\}\s*\]/);
+          const match = _data.match(/\[\s*\{[\s\S]*?\}\s*\]/);        
           let _result = JSON.parse(match[0]) || [];
           _result.forEach(i => {
             i.answer2 = i.answer.length ? [] : "";
@@ -1251,13 +1254,17 @@ ${_textData}
             this.saveTaskList(1);
             // this.$message.success("一键出题成功");
           } else {
-            this.$message.error("一键出题失败");
+            if (this.itemType == 2) {
+              this.$message.error("一键出题失败");
+            }
           }
           this.aiBoxLoading = false;
         })
         .catch(e => {
           this.aiBoxLoading = false;
-          this.$message.error("一键出题失败");
+          if (this.itemType == 2) {
+              this.$message.error("一键出题失败");
+          }
           console.log(e);
         });
       this.insertMemorandum(

src/components/classRoomHelper/index.vue

@@ -21,6 +21,7 @@
         :taskCount="taskCount"
         :worksStudent="worksStudent"
         :openMegaphone="openMegaphone"
+        :itemType = "itemType"
         ref="taskAreaRef"
         :fileId="fileId"
         v-show="itemType == 2"

src/components/easy2/commpont/markDialog.vue

@@ -1713,7 +1713,6 @@ export default {
   height: 100%;
 }
 .left {
-  overflow: auto;
   width: 316px;
   /* border-right: 1px rgba(231, 231, 231, 1) solid; */
   padding: 20px 20px 0;
@@ -1739,8 +1738,9 @@ export default {
   margin-bottom: 5px;
 }
 .AreaCss >>> .el-textarea__inner {
+  /* height: 150px !important; */
   min-height: 150px !important;
-  /* max-height: 150px; */
+  max-height: 350px !important;
   color: #606266;
   padding-bottom: 20px;
 }

src/components/easy2/studyStudent.vue

@@ -8,6 +8,7 @@
         position: relative;
         padding: 20px 0 20px 20px;
         box-sizing: border-box;
+        overflow: auto;
       "
     >
       <!-- <div class="btnAllNT">
@@ -279,7 +280,7 @@
             width: mlDialog
               ? 'calc(100% - ' +
                 `${!['2'].includes(tType) ? classRoomHelperWidth : '10px'}` +
-                ' - 20% - 40px)'
+                ' - 20% - 47px)'
               : 'calc(100% - ' +
                 `${!['2'].includes(tType) ? classRoomHelperWidth : '10px'}` +
                 ' - 10px)',
@@ -24690,7 +24691,7 @@ export default {
         if (behavior) {
           if (behavior.code === 99) {
             //初始化
-            this.fullDialogVisible = false;
+            this.fullDialogVisible = false;             
 						if(this.$refs.choseWorksDetailDialogRef.show){
 							this.$refs.choseWorksDetailDialogRef.close();
 						}
@@ -25290,6 +25291,7 @@ export default {
   width: 100%;
   height: auto;
   padding-bottom: 20px;
+  margin-left: 2px;
 }
 
 .study_top .checkbox {
@@ -29569,4 +29571,8 @@ ol {
   color: #fff;
   cursor: pointer;
 }
+div::-webkit-scrollbar {
+    width: 10px;
+    height: 6px;
+}
 </style>

src/components/easy3/studyStudent.vue

@@ -9,6 +9,7 @@
         position: relative;
         padding: 20px 0 20px 20px;
         box-sizing: border-box;
+        overflow: auto;
       "
     >
       <!-- <div class="btnAllNT">
@@ -227,7 +228,7 @@
       </div>
       <div class="body_student" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
         <div class="new_topFixed" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }"></div>
-        <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
+        <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 47px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
           <div class="courseIndex" :style="{width: (orgArray.includes(org) || oidArray.includes(oid)) && !['2'].includes(tType) ? '100%' : 'calc(100% - 745px)'}">
             <div>任务{{ taskCount + 1 }}</div>
             <el-tooltip
@@ -20893,6 +20894,7 @@ export default {
   width: 100%;
   height: auto;
   padding-bottom: 20px;
+  margin-left: 2px;
 }
 
 .study_top .checkbox {
@@ -25103,4 +25105,8 @@ ol {
   background: #409eff;
   color: #fff;
 }
+div::-webkit-scrollbar {
+    width: 10px;
+    height: 6px;
+}
 </style>

src/components/studyStudent.vue

@@ -9,6 +9,7 @@
         position: relative;
         padding: 20px 0 20px 20px;
         box-sizing: border-box;
+        overflow: auto;
       "
     >
       <div class="btnAllNT" v-if="false">
@@ -241,7 +242,7 @@
       <!-- :class="{ navLeftCss: !mlDialog }" -->
       <div class="body_student" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog  ? 'calc(20% + 35px)' : '10px' }">
         <div class="new_topFixed" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog  ? 'calc(20% + 35px)' : '10px' }"></div>
-        <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog  ? 'calc(20% + 35px)' : '10px' }">
+        <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 47px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog  ? 'calc(20% + 35px)' : '10px' }">
           <div class="courseIndex" :style="{width: (orgArray.includes(org) || oidArray.includes(oid)) && !['2'].includes(tType) ? '100%' : 'calc(100% - 745px)'}">
             <div>任务{{ taskCount + 1 }}</div>
             <el-tooltip
@@ -20873,6 +20874,7 @@ export default {
   width: 100%;
   height: auto;
   padding-bottom: 20px;
+  margin-left: 2px;
 }
 
 .study_top .checkbox {
@@ -25108,4 +25110,8 @@ ol {
   padding: 0 !important;
   height: 100% !important;
 }
+div::-webkit-scrollbar {
+    width: 10px;
+    height: 6px;
+}
 </style>

src/components/studySutdentClass/commpont/markDialog.vue

@@ -1712,7 +1712,6 @@ export default {
   height: 100%;
 }
 .left {
-  overflow: auto;
   width: 316px;
   /* border-right: 1px rgba(231, 231, 231, 1) solid; */
   padding: 20px 20px 0;
@@ -1738,8 +1737,9 @@ export default {
   margin-bottom: 5px;
 }
 .AreaCss >>> .el-textarea__inner {
+  /* height: 150px !important; */
   min-height: 150px !important;
-  /* max-height: 150px; */
+  max-height: 350px !important;
   color: #606266;
   padding-bottom: 20px;
 }

src/components/studySutdentClass/studyStudent.vue

@@ -8,6 +8,7 @@
         position: relative;
         padding: 20px 0 20px 20px;
         box-sizing: border-box;
+        overflow: auto;
       "
     >
       <!-- <div class="btnAllNT">
@@ -226,7 +227,7 @@
       </div>
       <div class="body_student" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
         <div class="new_topFixed" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }"></div>
-        <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
+        <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 47px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
           <div class="courseIndex" :style="{width: (orgArray.includes(org) || oidArray.includes(oid)) && !['2'].includes(tType) ? '100%' : 'calc(100% - 745px)'}">
             <div>任务{{ taskCount + 1 }}</div>
             <el-tooltip
@@ -24588,6 +24589,7 @@ export default {
   width: 100%;
   height: auto;
   padding-bottom: 20px;
+  margin-left: 2px;
 }
 
 .study_top .checkbox {
@@ -28842,4 +28844,8 @@ ol {
   padding: 0 !important;
   height: 100% !important;
 }
+div::-webkit-scrollbar {
+    width: 10px;
+    height: 6px;
+}
 </style>