11wqe1 3 months ago
parent
commit
9862628b9e

+ 14 - 0
src/components/components/appStoreC.vue

@@ -47,8 +47,22 @@
             handleClose() {
                 this.urlData = ''
                 this.userId = ''
+                if (document.fullscreenElement) {
+                    this.exitFullScreen();
+                } 
                 this.appDialogVisible = false
             },
+            exitFullScreen() {
+                if (document.exitFullscreen) {
+                    document.exitFullscreen();
+                } else if (document.mozCancelFullScreen) { /* Firefox */
+                    document.mozCancelFullScreen();
+                } else if (document.webkitExitFullscreen) { /* Chrome, Safari and Opera */
+                    document.webkitExitFullscreen();
+                } else if (document.msExitFullscreen) { /* IE/Edge */
+                    document.msExitFullscreen();
+                }
+            },
             uploadWork(){
                 // console.log('window.exposed_outputs',window.exposed_outputs);
                 let _iframe = this.$refs.appStore;

+ 7 - 7
src/components/components/choseWorksDetailDialog.vue

@@ -386,7 +386,7 @@
                   </div>
                 </div>
                 <!-- 思维网格 电子白板 思维导图 -->
-                <div id="loadLi_JieE" v-if="[7,1,3,57,18,21,71,23,24,32,63,28,31,39,66,72].includes(toolType)" style="position: relative; " class="s_b_m_b_i_m_iframe">
+                <div id="loadLi_JieE" v-if="[7,1,3,57,18,21,71,23,24,32,63,28,31,39,66,72].includes(toolType)" style="position: relative;min-height: 850px; " class="s_b_m_b_i_m_iframe">
                   <div style="display: none;
                   position: absolute;
                   height: 100%;
@@ -3105,7 +3105,7 @@ export default {
 }
 
 .s_b_m_b_i_main {
-  width: 80%;
+  width: 90%;
   margin: 0 auto;
   min-width: 1000px;
   padding: 10px 0 30px 0;
@@ -3118,7 +3118,7 @@ export default {
   font-size: 26px;
   font-weight: bold;
   display: block;
-  margin: 30px 0 40px 20px;
+  margin: 20px 0 ;
 
 }
 
@@ -3143,7 +3143,7 @@ export default {
   width: 50px;
   height: 50px;
 	margin: 5px;
-  margin-right: 5px;
+  margin-right: 5px 0;
 }
 
 .titTop > span {
@@ -3152,13 +3152,13 @@ export default {
 }
 
 .s_b_m_b_i_m_title > span {
-  width: calc(100% - 50px);
+  width: 100%;
   padding: 20px;
   display: block;
-  margin: 0 10px;
   background-color: #f3f7fd;
   border-radius: 5px;
   font-size: 16px;
+  box-sizing: border-box;
 }
 
 .s_b_m_b_i_m_choseList {
@@ -4053,7 +4053,7 @@ ol {
   width: 100%;
   height: 100%;
 	box-sizing: border-box;
-	padding-left: 10px;
+	padding-left: 0px;
 }
 
 .s_b_m_b_i_m_iframe>div>iframe{

+ 27 - 32
src/components/components/cocoFlowDia.vue

@@ -8,21 +8,16 @@
             :close-on-click-modal="false"
             :before-close="handleClose">
             <div  style="margin-bottom: 20px;" v-for="(item,index) in listData" :key="index">
-                <div style="margin-bottom: 15px;font-size: x-large;">第{{ index + 1}}阶段</div>
+                <div style="margin-bottom: 15px;font-size: 20px;font-weight: 600;color: #000;">第{{ index + 1}}阶段</div>
                 <div v-for="po in item.messages" :key="item">
                     <div class="left" v-if="po.role == 'assistant'">
-                        <div>
-                            <div class="TName">小可ai助手:</div>
+                            <div class="TName">小可ai助手</div>:
                             <div class="con" v-html="po.content"></div>
-                        </div>
-                      
                     </div>
 
-                    <div class="right" v-if="po.role == 'user'">
-                        <div>
-                            <div class="TName">:{{ po.sender }}</div>
+                    <div class="left" v-if="po.role == 'user'">
+                            <div class="TName">{{ po.sender }}</div>:
                             <div class="con" v-html="po.content"></div>
-                        </div>
                     </div>
                 </div>
             </div>
@@ -99,67 +94,67 @@
                 this.FlowVisible = true;
             },
             handleClose(){
+                this.listData = []
                 this.FlowVisible = false;
-            }
+            },
         },
     }
 </script>
 
 <style scoped>
     .TName{
-        font-size: large;
+        font-size: 14px;
         color: #4472C4;
         margin-bottom: 5px;
         font-weight: 600;
+        width: 80px;
+        flex-shrink: 0;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
     }
     .con{
+        margin-left: 10px;
         font-size: 14px;
         color: #000;
     }
     .left{
         display: flex;
         justify-content: flex-start;
-        margin-bottom: 15px;
-    }
-    .right{
-        display: flex;
-        justify-content: flex-end;
-        margin-bottom: 15px;
+        margin-bottom: 10px;
+        line-height: 25px;
+        flex: 1;
+        border-bottom: 1px  #e7e7e7 solid;
     }
-    .dialog_diy >>> .el-dialog__header,
-    .dialog_diy1 >>> .el-dialog__header {
+
+    .dialog_diy >>> .el-dialog__header {
     background: #454545 !important;
     padding: 15px 20px;
     }
 
-    .dialog_diy >>> .el-dialog__title,
-    .dialog_diy1 >>> .el-dialog__title {
+    .dialog_diy >>> .el-dialog__title{
     color: #fff;
     }
 
-    .dialog_diy >>> .el-dialog__headerbtn,
-    .dialog_diy1 >>> .el-dialog__headerbtn {
+    .dialog_diy >>> .el-dialog__headerbtn {
     top: 19px;
     }
 
-    .dialog_diy >>> .el-dialog__headerbtn .el-dialog__close,
-    .dialog_diy1 >>> .el-dialog__headerbtn .el-dialog__close {
+    .dialog_diy >>> .el-dialog__headerbtn .el-dialog__close{
     color: #fff;
     }
 
-    .dialog_diy >>> .el-dialog__headerbtn .el-dialog__close:hover,
-    .dialog_diy1 >>> .el-dialog__headerbtn .el-dialog__close:hover {
+    .dialog_diy >>> .el-dialog__headerbtn .el-dialog__close:hover {
     color: #fff;
     }
 
-    .dialog_diy1 >>> .el-dialog__body {
-    padding: 0;
-    }
+
 
     .dialog_diy >>> .el-dialog__body,
-    .dialog_diy >>> .el-dialog__footer,
-    .dialog_diy1 >>> .el-dialog__footer {
+    .dialog_diy >>> .el-dialog__footer{
     background: #fafafa;
+    max-height: 850px;
+    overflow: auto;
     }
     
 </style>

+ 17 - 17
src/components/components/studentWorkPreviewDialog.vue

@@ -266,23 +266,17 @@
               </div>
             </div>
             <div class="s_b_m_tool40" v-if="[72].includes(tool)">
-              666
               <div  style="margin-bottom: 20px;" v-for="(item,index) in JSON.parse(studentWork.works)" :key="index">
-                <div style="margin-bottom: 15px;font-size: x-large;">第{{ index + 1}}阶段</div>
+                <div style="margin-bottom: 15px;font-size: 20px;font-weight: 600;color: #000;">第{{ index + 1}}阶段</div>
                 <div v-for="po in item.messages" :key="item">
                     <div class="left" v-if="po.role == 'assistant'">
-                        <div>
-                            <div class="TName">小可ai助手:</div>
+                            <div class="TName">小可ai助手</div>:
                             <div class="con" v-html="po.content"></div>
-                        </div>
-                      
                     </div>
 
-                    <div class="right" v-if="po.role == 'user'">
-                        <div>
-                            <div class="TName">:{{ po.sender }}</div>
+                    <div class="left" v-if="po.role == 'user'">
+                            <div class="TName">{{ po.sender }}</div>:
                             <div class="con" v-html="po.content"></div>
-                        </div>
                     </div>
                 </div>
             </div>
@@ -797,23 +791,29 @@ export default {
   font-size: 18px;
 }
 .TName{
-        font-size: large;
+        font-size: 14px;
         color: #4472C4;
         margin-bottom: 5px;
         font-weight: 600;
+        width: 80px;
+        flex-shrink: 0;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
     }
     .con{
+        margin-left: 10px;
         font-size: 14px;
         color: #000;
     }
     .left{
         display: flex;
         justify-content: flex-start;
-        margin-bottom: 15px;
-    }
-    .right{
-        display: flex;
-        justify-content: flex-end;
-        margin-bottom: 15px;
+        margin-bottom: 10px;
+        line-height: 25px;
+        flex: 1;
+        border-bottom: 1px  #e7e7e7 solid;
     }
+
+
 </style>

+ 6 - 1
src/components/easy2/studyStudent.vue

@@ -23307,6 +23307,9 @@ export default {
           this.$message.error("应用连接为空, 请到课程管理中添加");
           return;
         }
+        if (!document.fullscreenElement) {
+          this.enterFullScreen();
+        } 
         this.$refs.appStoreC.getData(item.url,this.userid) 
 
         // window.parent.postMessage({ tools: "72", data: item }, "*");
@@ -23748,6 +23751,9 @@ export default {
           "*"
         );
       }else if (t == 72) {
+        if (!document.fullscreenElement) {
+          this.enterFullScreen();
+        } 
         let url = this.chapInfoList[this.courseType].chapterInfo[0].taskJson[index].toolChoose[i].appJson.url
         this.$refs.appStoreC.getData(url,this.sStudent.userid) 
       }
@@ -30280,7 +30286,6 @@ div::-webkit-scrollbar {
 .Ovh{
   margin: 5px 0;
   width: 4em;
-  text-align: center;
   -webkit-line-clamp: 2;
   display: -webkit-box;
   -webkit-box-orient: vertical;

+ 6 - 1
src/components/easy3/studyStudent.vue

@@ -18977,6 +18977,9 @@ export default {
           this.$message.error("应用连接为空, 请到课程管理中添加");
           return;
         }
+        if (!document.fullscreenElement) {
+          this.enterFullScreen();
+        } 
         this.$refs.appStoreC.getData(item.url,this.userid) 
 
 
@@ -19420,6 +19423,9 @@ export default {
           "*"
         );
       }else if (t == 72) {
+        if (!document.fullscreenElement) {
+          this.enterFullScreen();
+        } 
         let url = this.chapInfoList[this.courseType].chapterInfo[0].taskJson[index].toolChoose[i].appJson.url
         this.$refs.appStoreC.getData(url,this.sStudent.userid) 
       }
@@ -25811,7 +25817,6 @@ div::-webkit-scrollbar {
   width: 4em;
   -webkit-line-clamp: 2;
   display: -webkit-box;
-  text-align: center;
 
   -webkit-box-orient: vertical;
   overflow: hidden;

+ 6 - 1
src/components/studyStudent.vue

@@ -19122,6 +19122,9 @@ export default {
           this.$message.error("应用连接为空, 请到课程管理中添加");
           return;
         }
+        if (!document.fullscreenElement) {
+          this.enterFullScreen();
+        } 
         this.$refs.appStoreC.getData(item.url,this.userid) 
 
         // window.open(item.url, "_blank");
@@ -19564,6 +19567,9 @@ export default {
           "*"
         );
       }else if (t == 72) {
+        if (!document.fullscreenElement) {
+          this.enterFullScreen();
+        } 
         let url = this.chapInfoList[this.courseType].chapterInfo[0].taskJson[index].toolChoose[i].appJson.url
         this.$refs.appStoreC.getData(url,this.sStudent.userid) 
       }
@@ -25986,7 +25992,6 @@ div::-webkit-scrollbar {
   width: 4em;
   -webkit-line-clamp: 2;
   display: -webkit-box;
-  text-align: center;
 
   -webkit-box-orient: vertical;
   overflow: hidden;

+ 6 - 1
src/components/studySutdentClass/studyStudent.vue

@@ -22709,6 +22709,9 @@ export default {
           this.$message.error("应用连接为空, 请到课程管理中添加");
           return;
         }
+        if (!document.fullscreenElement) {
+          this.enterFullScreen();
+        } 
         this.$refs.appStoreC.getData(item.url,this.userid) 
 
 
@@ -23152,6 +23155,9 @@ export default {
           "*"
         );
       }else if (t == 72) {
+        if (!document.fullscreenElement) {
+          this.enterFullScreen();
+        } 
         let url = this.chapInfoList[this.courseType].chapterInfo[0].taskJson[index].toolChoose[i].appJson.url
         this.$refs.appStoreC.getData(url,this.sStudent.userid) 
       }
@@ -29597,7 +29603,6 @@ div::-webkit-scrollbar {
   display: -webkit-box;
   -webkit-box-orient: vertical;
   overflow: hidden;
-  text-align: center;
 
   text-overflow: ellipsis;           
 }