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

src/assets/icon/course/confirmOpenDig.svg

@@ -0,0 +1,3 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11 21.5C16.799 21.5 21.5 16.799 21.5 11C21.5 5.20101 16.799 0.5 11 0.5C5.20101 0.5 0.5 5.20101 0.5 11C0.5 16.799 5.20101 21.5 11 21.5ZM10.0999 5H11.8998V6.79993H10.0999V5ZM10.2584 8.75H11.7584V16.9996H10.2584V8.75Z" fill="#0052D9"/>
+</svg>

src/components/components/choseWorksDetailDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="choseWorksDetailDialog">
+  <div class="choseWorksDetailDialog" v-if="show">
     <el-dialog
       :visible.sync="show"
       width="100%"
@@ -885,7 +885,7 @@ export default {
 		},
     cy(){
       let _result = ''
-      if(this.toolType===15){
+      if(this.toolType==15){
         this.worksStudent.forEach(e=>{
           _result += JSON.parse(e.works)[0].answer+','
         })
@@ -1096,8 +1096,10 @@ export default {
 			if(data.showStatisticsType!==undefined){
 				this.showStatisticsType = data.showStatisticsType;
 			}
-			if(data.toolType!==undefined){
+			if(data.toolType!==undefined &&this.toolType != data.toolType){
 				this.toolType = data.toolType;
+        this.setData();
+        this.$forceUpdate();
 			}
 
 			if(data.lookWorks !== undefined){

src/components/components/statisticalAnalysis.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="statisticalAnalysis">
+  <div class="statisticalAnalysis" v-if="show">
     <el-dialog
       :visible.sync="show"
       width="100%"

src/components/easy2/studyStudent.vue

@@ -283,7 +283,7 @@
                 ' - 20% - 47px)'
               : 'calc(100% - ' +
                 `${!['2'].includes(tType) ? classRoomHelperWidth : '10px'}` +
-                ' - 10px)',
+                ' - 18px)',
             left: mlDialog ? 'calc(20% + 35px)' : '10px'
           }"
         >
@@ -15477,6 +15477,27 @@
 			@openScore="openScore"
       @changeSplitScreenBehavior="changeSplitScreenBehavior"
     />
+    <el-dialog
+      :visible.sync="confirmOpenDig"
+      width="500px"
+      :modal="false"
+      class="confirmOpenDigCss dialog_diyCopy"
+      :before-close="handleClose">
+      <div style="display: flex;align-items: center;">
+        <img src="../../assets/icon/course/confirmOpenDig.svg" alt="">
+        <span>“{{ courseDetail.title }}”开课啦</span>
+      </div>
+      <div style="margin: 20px 0 35px;">
+        <div style="margin-bottom: 10px;">接下来你将跟随老师一起开始今天的学习！ </div>
+        <div>要认真听讲哦～</div>
+      </div>
+      
+
+      <div style="text-align: center;">
+        <el-button type="primary" style="width: 95%;" @click="confirmOpen">开始学习</el-button>
+      </div>
+   
+    </el-dialog>
   </div>
 </template>
 
@@ -16010,7 +16031,9 @@ export default {
         myUid: "",
         loading: false,
         behavior: null
-      }
+      },
+      confirmOpenDig:false,
+      confirmOpenDigData:''
     };
   },
   methods: {
@@ -16930,19 +16953,6 @@ export default {
           );
         }
       }
-      // this.changeSplitScreenBehavior({
-      //   code: 1,
-      //   form: {
-			// 		toolType:tooc,
-      //     toolIndex: toolIndex,
-      //     courseType: this.courseType,
-      //     taskCount: this.taskCount,
-      //     type: 2
-      //   }
-      // });
-
-      // var b = this.$refs["bz" + k][0];
-      // a.scrollTop = b.offsetTop;
     },
     addTools2(i) {
       if (i == 4) {
@@ -24625,6 +24635,15 @@ export default {
         }
       }
     },
+    confirmOpen(){
+      this.splitScreenData.isOpen = true;
+      this.splitScreenData.uid = this.confirmOpenDigData.uid;
+      this.splitScreenData.userId = this.confirmOpenDigData.userId;
+      this.splitScreenData.behavior = this.confirmOpenDigData.behavior;
+      this.confirmOpenDig = false
+
+      this.$message.success("分屏模式已开启");
+    },
     getSplitScreenData() {
       // return;
       if (this.tType != 1) return;
@@ -24649,11 +24668,9 @@ export default {
               this.splitScreenData.behavior = null;
               await this.updateSplitScreenData(1);
             } else if (!this.splitScreenData.isOpen && data.isOpen) {
-              this.splitScreenData.isOpen = true;
-              this.splitScreenData.uid = data.uid;
-              this.splitScreenData.userId = data.userId;
-              this.splitScreenData.behavior = data.behavior;
-              this.$message.success("分屏模式已开启");
+              this.confirmOpenDig = true
+              this.confirmOpenDigData = data
+             
             } else if (this.splitScreenData.isOpen && !data.isOpen) {
               this.splitScreenData.isOpen = false;
               this.splitScreenData.userId = "";
@@ -25292,6 +25309,7 @@ export default {
   height: auto;
   padding-bottom: 20px;
   margin-left: 2px;
+  min-height: 90%;
 }
 
 .study_top .checkbox {
@@ -26184,6 +26202,21 @@ export default {
   height: 100% !important;
 }
 
+.confirmOpenDigCss > div{
+  font-size: 14px;
+  color: rgba(0, 0, 0, 0.6);
+}
+.confirmOpenDigCss >>> .el-dialog{
+  border-radius: 6px;
+}
+.confirmOpenDigCss >>> .el-dialog__body{
+  padding: 25px !important;
+}
+.confirmOpenDigCss > span{
+  font-size: 16px;
+  font-weight: 600;
+  color: rgba(0, 0, 0, 0.8);
+}
 .dialog_diy >>> .el-dialog__header,
 .dialog_diy1 >>> .el-dialog__header {
   background: #454545 !important;

src/components/easy3/studyStudent.vue

@@ -227,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% - 47px)' : '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'}`+' - 18px)', 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
@@ -12026,6 +12026,27 @@
 			@openScore="openScore"
       @changeSplitScreenBehavior="changeSplitScreenBehavior"
     />
+    <el-dialog
+      :visible.sync="confirmOpenDig"
+      width="500px"
+      :modal="false"
+      class="confirmOpenDigCss dialog_diyCopy"
+      :before-close="handleClose">
+      <div style="display: flex;align-items: center;">
+        <img src="../../assets/icon/course/confirmOpenDig.svg" alt="">
+        <span>“{{ courseDetail.title }}”开课啦</span>
+      </div>
+      <div style="margin: 20px 0 35px;">
+        <div style="margin-bottom: 10px;">接下来你将跟随老师一起开始今天的学习！ </div>
+        <div>要认真听讲哦～</div>
+      </div>
+      
+
+      <div style="text-align: center;">
+        <el-button type="primary" style="width: 95%;" @click="confirmOpen">开始学习</el-button>
+      </div>
+   
+    </el-dialog>
   </div>
 </template>
 
@@ -12514,13 +12535,15 @@ export default {
 			orgArray:[],
       oidArray:[],
 			splitScreenData:{
-			isOpen:false,
-			userId:"",
-			uid:"",
-			myUid:"",
-			loading:false,
-			behavior:null,
-		}
+        isOpen:false,
+        userId:"",
+        uid:"",
+        myUid:"",
+        loading:false,
+        behavior:null,
+      },
+      confirmOpenDig:false,
+      confirmOpenDigData:''
     };
   },
   methods: {
@@ -20247,6 +20270,15 @@ export default {
         }
       }
     },
+    confirmOpen(){
+      this.splitScreenData.isOpen = true;
+      this.splitScreenData.uid = this.confirmOpenDigData.uid;
+      this.splitScreenData.userId = this.confirmOpenDigData.userId;
+      this.splitScreenData.behavior = this.confirmOpenDigData.behavior;
+      this.confirmOpenDig = false
+
+      this.$message.success("分屏模式已开启");
+    },
     getSplitScreenData() {
       // return;
       if (this.tType != 1) return;
@@ -20271,11 +20303,8 @@ export default {
               this.splitScreenData.behavior = null;
               await this.updateSplitScreenData(1);
             } else if (!this.splitScreenData.isOpen && data.isOpen) {
-              this.splitScreenData.isOpen = true;
-              this.splitScreenData.uid = data.uid;
-              this.splitScreenData.userId = data.userId;
-              this.splitScreenData.behavior = data.behavior;
-              this.$message.success("分屏模式已开启");
+              this.confirmOpenDig = true
+              this.confirmOpenDigData = data
             } else if (this.splitScreenData.isOpen && !data.isOpen) {
               this.splitScreenData.isOpen = false;
               this.splitScreenData.userId = "";
@@ -20894,6 +20923,7 @@ export default {
   height: auto;
   padding-bottom: 20px;
   margin-left: 2px;
+  min-height: 90%;
 }
 
 .study_top .checkbox {
@@ -25098,6 +25128,21 @@ ol {
   padding: 0 !important;
   height: 100% !important;
 }
+.confirmOpenDigCss > div{
+  font-size: 14px;
+  color: rgba(0, 0, 0, 0.6);
+}
+.confirmOpenDigCss >>> .el-dialog{
+  border-radius: 6px;
+}
+.confirmOpenDigCss >>> .el-dialog__body{
+  padding: 25px !important;
+}
+.confirmOpenDigCss > span{
+  font-size: 16px;
+  font-weight: 600;
+  color: rgba(0, 0, 0, 0.8);
+}
 .correctCss{
   position: absolute;
   bottom: -70px;

src/components/studyStudent.vue

@@ -241,7 +241,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% - 47px)' : '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'}`+' - 18px)', 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
@@ -11967,6 +11967,27 @@
 			@openScore="openScore"
       @changeSplitScreenBehavior="changeSplitScreenBehavior"
     />
+    <el-dialog
+      :visible.sync="confirmOpenDig"
+      width="500px"
+      :modal="false"
+      class="confirmOpenDigCss dialog_diyCopy"
+      :before-close="handleClose">
+      <div style="display: flex;align-items: center;">
+        <img src="../assets/icon/course/confirmOpenDig.svg" alt="">
+        <span>“{{ courseDetail.title }}”开课啦</span>
+      </div>
+      <div style="margin: 20px 0 35px;">
+        <div style="margin-bottom: 10px;">接下来你将跟随老师一起开始今天的学习！ </div>
+        <div>要认真听讲哦～</div>
+      </div>
+      
+
+      <div style="text-align: center;">
+        <el-button type="primary" style="width: 95%;" @click="confirmOpen">开始学习</el-button>
+      </div>
+   
+    </el-dialog>
   </div>
 </template>
 
@@ -12498,7 +12519,9 @@ export default {
 			myUid:"",
 			loading:false,
 			behavior:null,
-		}
+    },
+      confirmOpenDig:false,
+      confirmOpenDigData:''
     };
   },
   methods: {
@@ -20234,6 +20257,15 @@ export default {
         }
       }
     },
+    confirmOpen(){
+      this.splitScreenData.isOpen = true;
+      this.splitScreenData.uid = this.confirmOpenDigData.uid;
+      this.splitScreenData.userId = this.confirmOpenDigData.userId;
+      this.splitScreenData.behavior = this.confirmOpenDigData.behavior;
+      this.confirmOpenDig = false
+
+      this.$message.success("分屏模式已开启");
+    },
     getSplitScreenData() {
       // return;
       if (this.tType != 1) return;
@@ -20258,11 +20290,8 @@ export default {
               this.splitScreenData.behavior = null;
               await this.updateSplitScreenData(1);
             } else if (!this.splitScreenData.isOpen && data.isOpen) {
-              this.splitScreenData.isOpen = true;
-              this.splitScreenData.uid = data.uid;
-              this.splitScreenData.userId = data.userId;
-              this.splitScreenData.behavior = data.behavior;
-              this.$message.success("分屏模式已开启");
+              this.confirmOpenDig = true
+              this.confirmOpenDigData = data
             } else if (this.splitScreenData.isOpen && !data.isOpen) {
               this.splitScreenData.isOpen = false;
               this.splitScreenData.userId = "";
@@ -20874,6 +20903,7 @@ export default {
   height: auto;
   padding-bottom: 20px;
   margin-left: 2px;
+  min-height: 90%;
 }
 
 .study_top .checkbox {
@@ -25109,6 +25139,21 @@ ol {
   padding: 0 !important;
   height: 100% !important;
 }
+.confirmOpenDigCss > div{
+  font-size: 14px;
+  color: rgba(0, 0, 0, 0.6);
+}
+.confirmOpenDigCss >>> .el-dialog{
+  border-radius: 6px;
+}
+.confirmOpenDigCss >>> .el-dialog__body{
+  padding: 25px !important;
+}
+.confirmOpenDigCss > span{
+  font-size: 16px;
+  font-weight: 600;
+  color: rgba(0, 0, 0, 0.8);
+}
 div::-webkit-scrollbar {
     width: 10px;
     height: 6px;

src/components/studySutdentClass/studyStudent.vue

@@ -227,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% - 47px)' : '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'}`+' - 18px)', 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
@@ -15032,6 +15032,27 @@
       @openTools="openTools"
       @changeSplitScreenBehavior="changeSplitScreenBehavior"
     />
+    <el-dialog
+      :visible.sync="confirmOpenDig"
+      width="500px"
+      :modal="false"
+      class="confirmOpenDigCss dialog_diyCopy"
+      :before-close="handleClose">
+      <div style="display: flex;align-items: center;">
+        <img src="../../assets/icon/course/confirmOpenDig.svg" alt="">
+        <span>“{{ courseDetail.title }}”开课啦</span>
+      </div>
+      <div style="margin: 20px 0 35px;">
+        <div style="margin-bottom: 10px;">接下来你将跟随老师一起开始今天的学习！ </div>
+        <div>要认真听讲哦～</div>
+      </div>
+      
+
+      <div style="text-align: center;">
+        <el-button type="primary" style="width: 95%;" @click="confirmOpen">开始学习</el-button>
+      </div>
+   
+    </el-dialog>
   </div>
 </template>
 
@@ -15533,6 +15554,9 @@ export default {
         loading:false,
         behavior:null,
       },
+      confirmOpenDig:false,
+      confirmOpenDigData:'',
+      
       refreshKey: 0,
       AIloading: [],
       worksStudentCopy: [],
@@ -23981,6 +24005,15 @@ export default {
         }
       }
     },
+    confirmOpen(){
+      this.splitScreenData.isOpen = true;
+      this.splitScreenData.uid = this.confirmOpenDigData.uid;
+      this.splitScreenData.userId = this.confirmOpenDigData.userId;
+      this.splitScreenData.behavior = this.confirmOpenDigData.behavior;
+      this.confirmOpenDig = false
+
+      this.$message.success("分屏模式已开启");
+    },
     getSplitScreenData() {
       // return;
       if (this.tType != 1) return;
@@ -24005,11 +24038,8 @@ export default {
               this.splitScreenData.behavior = null;
               await this.updateSplitScreenData(1);
             } else if (!this.splitScreenData.isOpen && data.isOpen) {
-              this.splitScreenData.isOpen = true;
-              this.splitScreenData.uid = data.uid;
-              this.splitScreenData.userId = data.userId;
-              this.splitScreenData.behavior = data.behavior;
-              this.$message.success("分屏模式已开启");
+              this.confirmOpenDig = true
+              this.confirmOpenDigData = data
             } else if (this.splitScreenData.isOpen && !data.isOpen) {
               this.splitScreenData.isOpen = false;
               this.splitScreenData.userId = "";
@@ -24590,6 +24620,7 @@ export default {
   height: auto;
   padding-bottom: 20px;
   margin-left: 2px;
+  min-height: 90%;
 }
 
 .study_top .checkbox {
@@ -28844,6 +28875,21 @@ ol {
   padding: 0 !important;
   height: 100% !important;
 }
+.confirmOpenDigCss > div{
+  font-size: 14px;
+  color: rgba(0, 0, 0, 0.6);
+}
+.confirmOpenDigCss >>> .el-dialog{
+  border-radius: 6px;
+}
+.confirmOpenDigCss >>> .el-dialog__body{
+  padding: 25px !important;
+}
+.confirmOpenDigCss > span{
+  font-size: 16px;
+  font-weight: 600;
+  color: rgba(0, 0, 0, 0.8);
+}
 div::-webkit-scrollbar {
     width: 10px;
     height: 6px;