11wqe1 4 viikkoa sitten
vanhempi
commit
1119872c36

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

@@ -0,0 +1,60 @@
+<template>
+    <div>
+        <el-dialog
+            :visible.sync="appDialogVisible"
+            :append-to-body="true"
+            width="100%"
+            fullscreen
+            :before-close="handleClose"
+            :show-close="false"
+            class="dialog_diyCopy "
+            >
+            <iframe
+                allow= "camera *; microphone *;display-capture;midi;encrypted-media;"
+                allowfullscreen
+                frameborder
+                border= "0"
+                scrolling = "no"
+                :src="urlData"
+                style="width: 100%;height: 90%;"
+            ></iframe>
+            <div style="display: flex;justify-content: flex-end;padding: 0 30px;box-sizing: border-box;">
+                <el-button type="primary" style="margin-right: 20px;" size="medium" @click="handleClose">退出</el-button>
+                <el-button type="primary" size="medium">提交作业</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+                urlData:"",
+                userId: this.$route.query.userid,
+                appDialogVisible: false,
+            }
+        },
+        methods: {
+            getData(val){
+                this.urlData = val
+                this.appDialogVisible = true
+            },
+            handleClose() {
+                this.urlData = ''
+                this.appDialogVisible = false
+            },
+        },  
+    }
+</script>
+
+<style scoped>
+.dialog_diyCopy >>> .el-dialog__header {
+  display: none !important;
+  /* position: relative; */
+}
+.dialog_diyCopy >>> .el-dialog__body {
+  padding: 0 !important;
+  height: 100% !important;
+}
+</style>

+ 1 - 0
src/components/components/choseWorksDetailDialog.vue

@@ -1035,6 +1035,7 @@
                     <el-table :data="item.optionsList" style="width: 800px">
                       <el-table-column prop="label" label="选项">
 												<template slot-scope="scope">
+                          <span>{{ optionTypeList[scope.$index] }}</span>
 													<img  @click.stop="$hevueImgPreview(scope.row.label.src)" class="tableImage" v-if="scope.row.label.imgType && scope.row.label.imgType === 1" :src="scope.row.label.src"></img>
 													<span v-else>{{ scope.row.label }}</span>
 												</template>

+ 26 - 2
src/components/easy2/studyStudent.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="pb_content" style="height: 100%;overflow: unset;">
+    <!-- ai模式 -->
     <div
       class="pb_content_body"
       style="
@@ -1485,6 +1486,7 @@
                           </div>
                           <div v-if="tooC == 72">
                             <img
+                            style="height: 85px;object-fit: cover;"
                               v-if="tool.appJson && tool.appJson.json && tool.appJson.json.icon"
                               @click="addTools(tooC, toolIndex, taskCount)"
                               :src="tool.appJson.json.icon"
@@ -1498,7 +1500,9 @@
                             />
                             <el-tooltip :content="tool.appJson && tool.appJson.name ? tool.appJson.name : '应用中心'" placement="top" effect="dark">
                               <!-- content to trigger tooltip here -->
-                              <div style="margin: 5px 0;width: 85px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{tool.appJson && tool.appJson.name ? tool.appJson.name : '应用中心'}}</div>
+                              <div class="Ovh">
+                              {{tool.appJson && tool.appJson.name ? tool.appJson.name : '应用中心'}}
+                            </div>
                             </el-tooltip>
                           </div>
                           <div v-if="tooC == 65">
@@ -15613,6 +15617,8 @@
       </div>
    
     </el-dialog>
+
+    <appStoreC ref="appStoreC"></appStoreC>
   </div>
 </template>
 
@@ -15656,6 +15662,8 @@ import evaTable from "./commpont/evaTable";
 import { v4 as uuidv4 } from "uuid";
 import statisticalAnalysis from "../components/statisticalAnalysis.vue";
 import choseWorksDetailDialog from "../components/choseWorksDetailDialog.vue";
+import appStoreC from "../components/appStoreC.vue";
+
 import choseWordCloud from '../components/choseWordCloud.vue'
 var OpenCC = require("opencc-js");
 let converter = OpenCC.Converter({
@@ -15743,7 +15751,8 @@ export default {
     markDialog,
     evaTable,
     statisticalAnalysis,
-    choseWorksDetailDialog
+    choseWorksDetailDialog,
+    appStoreC
   },
   data() {
     return {
@@ -22950,10 +22959,15 @@ export default {
           ? this.chapInfoList[this.courseType].chapterInfo[0].taskJson[index]
               .toolChoose[i].appJson
           : "";
+          console.log('item.url',item.url);
+          
+
         if(!item || !item.url){
           this.$message.error("应用连接为空, 请到课程管理中添加");
           return;
         }
+        // return this.$refs.appStoreC.getData(item.url) 
+
         window.parent.postMessage({ tools: "72", data: item }, "*");
         // window.open(item.url, "_blank");
       } else if (t == 69) {
@@ -29918,4 +29932,14 @@ div::-webkit-scrollbar {
     width: 10px;
     height: 6px;
 }
+.Ovh{
+  margin: 5px 0;
+  width: 4em;
+  text-align: center;
+  -webkit-line-clamp: 2;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-overflow: ellipsis;           
+}
 </style>

+ 23 - 2
src/components/easy3/studyStudent.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="pb_content" style="height: 100%;overflow: unset;">
+    <!-- 极简模式 -->
     <div
       class="pb_content_body"
       style="
@@ -1418,6 +1419,7 @@
                           </div>
                           <div v-if="tooC == 72">
                             <img
+                            style="height: 85px;object-fit: cover;"
                               v-if="tool.appJson && tool.appJson.json && tool.appJson.json.icon"
                               @click="addTools(tooC, toolIndex, taskCount)"
                               :src="tool.appJson.json.icon"
@@ -1431,7 +1433,9 @@
                             />
                             <el-tooltip :content="tool.appJson && tool.appJson.name ? tool.appJson.name : '应用中心'" placement="top" effect="dark">
                               <!-- content to trigger tooltip here -->
-                              <div style="margin: 5px 0;width: 85px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{tool.appJson && tool.appJson.name ? tool.appJson.name : '应用中心'}}</div>
+                              <div class="Ovh">
+                                {{tool.appJson && tool.appJson.name ? tool.appJson.name : '应用中心'}}
+                              </div>
                             </el-tooltip>
                           </div>
                           <div v-if="tooC == 65">
@@ -12161,6 +12165,8 @@
       </div>
    
     </el-dialog>
+
+    <appStoreC ref="appStoreC"></appStoreC>
   </div>
 </template>
 
@@ -12204,6 +12210,7 @@ import choseWorksDetailDialog from '../components/choseWorksDetailDialog.vue'
 import { v4 as uuidv4 } from "uuid";
 var OpenCC = require("opencc-js");
 import choseWordCloud from '../components/choseWordCloud.vue'
+import appStoreC from "../components/appStoreC.vue";
 
 let converter = OpenCC.Converter({
   from: "hk",
@@ -12286,7 +12293,8 @@ export default {
 		classRoomHelper,
     scoreZong,
 		statisticalAnalysis,
-		choseWorksDetailDialog
+		choseWorksDetailDialog,
+    appStoreC
   },
   data() {
     return {
@@ -18631,6 +18639,8 @@ export default {
           this.$message.error("应用连接为空, 请到课程管理中添加");
           return;
         }
+        // this.$refs.appStoreC.getData(item.url) 
+
         window.parent.postMessage({ tools: "72", data: item }, "*");
         // window.open(item.url, "_blank");
       } else if (t == 69) {
@@ -25453,4 +25463,15 @@ div::-webkit-scrollbar {
     width: 10px;
     height: 6px;
 }
+.Ovh{
+  margin: 5px 0;
+  width: 4em;
+  -webkit-line-clamp: 2;
+  display: -webkit-box;
+  text-align: center;
+
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-overflow: ellipsis;           
+}
 </style>

+ 22 - 2
src/components/studyStudent.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="pb_content" style="height: 100%;overflow: unset;">
+    <!-- 阶段模式 -->
     <div
       class="pb_content_body"
       style="
@@ -1379,6 +1380,7 @@
                           </div>
                           <div v-if="tooC == 72">
                             <img
+                             style="height: 85px;object-fit: cover;"
                               v-if="tool.appJson && tool.appJson.json && tool.appJson.json.icon"
                               @click="addTools(tooC, toolIndex, taskCount)"
                               :src="tool.appJson.json.icon"
@@ -1392,7 +1394,9 @@
                             />
                             <el-tooltip :content="tool.appJson && tool.appJson.name ? tool.appJson.name : '应用中心'" placement="top" effect="dark">
                               <!-- content to trigger tooltip here -->
-                              <div style="margin: 5px 0;width: 85px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{tool.appJson && tool.appJson.name ? tool.appJson.name : '应用中心'}}</div>
+                              <div class="Ovh">
+                                {{tool.appJson && tool.appJson.name ? tool.appJson.name : '应用中心'}}
+                              </div>
                             </el-tooltip>
                           </div>
                           <div v-if="tooC == 65">
@@ -12094,6 +12098,8 @@
       </div>
 
     </el-dialog>
+
+    <appStoreC ref="appStoreC"></appStoreC>
   </div>
 </template>
 
@@ -12136,6 +12142,7 @@ import choseWorksDetailDialog from './components/choseWorksDetailDialog.vue';
 import { v4 as uuidv4 } from "uuid";
 var OpenCC = require("opencc-js");
 import choseWordCloud from './components/choseWordCloud.vue'
+import appStoreC from "./components/appStoreC.vue";
 
 let converter = OpenCC.Converter({
   from: "hk",
@@ -12218,7 +12225,8 @@ export default {
     classRoomHelper,
     scoreZong,
 		statisticalAnalysis,
-		choseWorksDetailDialog
+		choseWorksDetailDialog,
+    appStoreC
   },
   data() {
     return {
@@ -18616,6 +18624,7 @@ export default {
           this.$message.error("应用连接为空, 请到课程管理中添加");
           return;
         }
+        // this.$refs.appStoreC.getData(item.url) 
         // window.open(item.url, "_blank");
         window.parent.postMessage({ tools: "72", data: item }, "*");
       } else if (t == 69) {
@@ -25470,4 +25479,15 @@ div::-webkit-scrollbar {
     width: 10px;
     height: 6px;
 }
+.Ovh{
+  margin: 5px 0;
+  width: 4em;
+  -webkit-line-clamp: 2;
+  display: -webkit-box;
+  text-align: center;
+
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-overflow: ellipsis;           
+}
 </style>

+ 23 - 2
src/components/studySutdentClass/studyStudent.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="pb_content" style="height: 100%;overflow: unset;">
+    <!-- 上课模式 -->
     <div
       class="pb_content_body"
       style="
@@ -1434,6 +1435,7 @@
                           </div>
                           <div v-if="tooC == 72">
                             <img
+                            style="height: 85px;object-fit: cover;"
                               v-if="tool.appJson && tool.appJson.json && tool.appJson.json.icon"
                               @click="addTools(tooC, toolIndex, taskCount)"
                               :src="tool.appJson.json.icon"
@@ -1447,7 +1449,9 @@
                             />
                             <el-tooltip :content="tool.appJson && tool.appJson.name ? tool.appJson.name : '应用中心'" placement="top" effect="dark">
                               <!-- content to trigger tooltip here -->
-                              <div style="margin: 5px 0;width: 85px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{tool.appJson && tool.appJson.name ? tool.appJson.name : '应用中心'}}</div>
+                              <div class="Ovh">
+                                {{tool.appJson && tool.appJson.name ? tool.appJson.name : '应用中心'}}
+                              </div>
                             </el-tooltip>
                           </div>
                           <div v-if="tooC == 65">
@@ -15163,7 +15167,8 @@
       <div style="text-align: center;">
         <el-button type="primary" style="width: 95%;" @click="confirmOpen">开始学习</el-button>
       </div>
-   
+
+      <appStoreC ref="appStoreC"></appStoreC>
     </el-dialog>
   </div>
 </template>
@@ -15210,6 +15215,8 @@ import markScore from "./commpont/markScore";
 import markDialog from "./commpont/markDialog";
 import evaTable from "./commpont/evaTable";
 import choseWordCloud from '../components/choseWordCloud.vue'
+import appStoreC from "../components/appStoreC.vue";
+
 var OpenCC = require("opencc-js");
 let converter = OpenCC.Converter({
   from: "hk",
@@ -15296,6 +15303,7 @@ export default {
     evaTable,
 		statisticalAnalysis,
 		choseWorksDetailDialog,
+    appStoreC
   },
   data() {
     return {
@@ -22363,6 +22371,8 @@ export default {
           this.$message.error("应用连接为空, 请到课程管理中添加");
           return;
         }
+        // this.$refs.appStoreC.getData(item.url) 
+
         window.parent.postMessage({ tools: "72", data: item }, "*");
         // window.open(item.url, "_blank");
       } else if (t == 69) {
@@ -29238,4 +29248,15 @@ div::-webkit-scrollbar {
     width: 10px;
     height: 6px;
 }
+.Ovh{
+  margin: 5px 0;
+  width: 4em;
+  -webkit-line-clamp: 2;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-align: center;
+
+  text-overflow: ellipsis;           
+}
 </style>