SanHQin 2 дней назад
Родитель
Сommit
81b37f30a3

+ 1 - 1
dist/index.html

@@ -37,7 +37,7 @@
       width: 100%;
       background: #e6eaf0;
       font-family: '黑体';
-    }</style><link href=./static/css/app.1138a1e0a1f433942daa3dd96683907e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.23ea04dc469b57e2b4f8.js></script><script type=text/javascript src=./static/js/vendor.714ff2bfc93f2f096b79.js></script><script type=text/javascript src=./static/js/app.6b7119cb39c55deb3a6a.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.dbb38b9d544d3b0b38d5732ce4f082a1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.23ea04dc469b57e2b4f8.js></script><script type=text/javascript src=./static/js/vendor.714ff2bfc93f2f096b79.js></script><script type=text/javascript src=./static/js/app.0042e4c0ea8b7da83666.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/static/css/app.1138a1e0a1f433942daa3dd96683907e.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/static/css/app.dbb38b9d544d3b0b38d5732ce4f082a1.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/static/css/app.dbb38b9d544d3b0b38d5732ce4f082a1.css.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/static/js/app.0042e4c0ea8b7da83666.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/static/js/app.0042e4c0ea8b7da83666.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/static/js/workPage.337ae04ad10f92152958.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/static/js/workPage.337ae04ad10f92152958.js.map


+ 1 - 1
dist/workPage.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>工作页面 - CocoFlow</title><link rel=icon href=../static/logo.ico><link href=./static/css/workPage.056421ef26c31f5e230cfb83ae266086.css rel=stylesheet></head><body><noscript><strong>We're sorry but this app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script type=text/javascript src=./static/js/workPage-manifest.2ece51fa34be51c8610a.js></script><script type=text/javascript src=./static/js/workPage-vendor.e1fc95e471d70a1519e8.js></script><script type=text/javascript src=./static/js/workPage.3d646a0166e907598d22.js></script></body></html><script>function stopSafari() {
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>工作页面 - CocoFlow</title><link rel=icon href=../static/logo.ico><link href=./static/css/workPage.056421ef26c31f5e230cfb83ae266086.css rel=stylesheet></head><body><noscript><strong>We're sorry but this app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script type=text/javascript src=./static/js/workPage-manifest.2ece51fa34be51c8610a.js></script><script type=text/javascript src=./static/js/workPage-vendor.e1fc95e471d70a1519e8.js></script><script type=text/javascript src=./static/js/workPage.337ae04ad10f92152958.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

+ 7 - 0
src/assets/see.svg

@@ -0,0 +1,7 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M4 5C4 4.44772 4.44772 4 5 4H19C19.5523 4 20 4.44772 20 5V15C20 15.5523 19.5523 16 19 16H5C4.44772 16 4 15.5523 4 15V5Z" stroke="#5F6368" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  
+  <path d="M8 20L12 16L16 20" stroke="#5F6368" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  
+  <path d="M10 8L15 10L10 12V8Z" fill="#5F6368"/>
+</svg>

+ 40 - 6
src/components/pages/course.vue

@@ -1,5 +1,6 @@
 <template>
-  <div class="pb_content" style="height: auto; width: 94%; margin: 10px auto;background: unset;"
+  <div class="pb_content" style="width: 94%; background: unset;"
+  :style="{height: courseUrl ? '100vh' : 'auto', margin: courseUrl ? '0' : '10px auto', overflow: courseUrl ? 'hidden' : 'auto'}"
   :class="[gotype? 'liyuan':'']"
   >
 
@@ -39,7 +40,7 @@
               <!-- <div type="primary" @click="goToCourse()">阶段式课程</div> -->
               <div type="primary" @click="goToCourse4()">{{ lang.MultistageCourse }}</div>
               <div type="primary" @click="goToPptEasy()" v-show="pptArrayOrg.includes(org) || pptArrayOid.includes(oid)">{{ lang.PPTmode }}</div>
-              
+
               <!-- v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5' || org == '884c5665-a453-46f3-b7b6-01d575290aa9'" -->
               <div type="primary" @click="oepnTemplate()" v-show="orgArray.includes(org) || oidArray.includes(oid)">{{ lang.AIMode }}</div>
               <div type="primary" @click="oepnTemplate2()" v-show="orgArray.includes(org) || oidArray.includes(oid)">{{ lang.Classroommode }}</div>
@@ -107,7 +108,7 @@
               </div>
             </div>
           </template>
-         
+
 
           <div class="all_choose" v-if="role == '1'">
             <span><span>{{ lang.Owner }}</span></span>
@@ -227,10 +228,11 @@
             <div class="three_bottom">
 							<el-tooltip effect="dark" :content="lang.Preview" placement="top">
     					  <div class="t_b_Item" @click="get(item)">
-									<img style="height: 90%;width: 90%;" src="../../assets/icon/course/lookeye.svg">
+									<!-- <img style="height: 90%;width: 90%;" src="../../assets/icon/course/lookeye.svg"> -->
+									<img style="height: 90%;width: 90%;" src="../../assets/see.svg">
 								</div>
     					</el-tooltip>
-							<el-tooltip effect="dark" v-show="orgArray.includes(org) || oidArray.includes(oid)" :content="lang.AiEdit" placement="top">
+							<el-tooltip effect="dark" v-show="(orgArray.includes(org) || oidArray.includes(oid)) && item.state != 7" :content="lang.AiEdit" placement="top">
     					  <div v-if="lang.lang == 'cn'" class="t_b_Item" @click="aiCourse(item.courseId)">
 									<img src="../../assets/icon/course/aiEdit.svg">
 								</div>
@@ -424,6 +426,7 @@
 		<shareDialog ref="shareDialogRef"/>
     <templateDialog :dialogVisibleTemplate.sync="dialogVisibleTemplate" :userid="userid" :org="org" :oid="oid" @goToCourseTemplate="goToCourseTemplate" @goToCourseTemplate2="goToCourseTemplate2"></templateDialog>
     <templateDialogE :dialogVisibleTemplate.sync="dialogVisibleTemplate2" :userid="userid" :org="org" :oid="oid" @goToCourseTemplate="goToCourseTemplateE" @goToCourseTemplate2="goToCourseTemplate2E"></templateDialogE>
+    <iframe :src="courseUrl" class="courseIframe" v-if="courseUrl"></iframe>
   </div>
 </template>
 
@@ -498,6 +501,7 @@ export default {
       oidArray:[],
       pptArrayOrg:[],
       pptArrayOid:[],
+      courseUrl: "",
 
     };
   },
@@ -940,7 +944,21 @@ export default {
       }
       this.addOp3('1', "", { courseid: item.courseId, type: _str }, "success")
 
-       window.topU.postMessage({ cid: item.courseId, screenType: "3" }, "*");
+      //  window.topU.postMessage({ cid: item.courseId, screenType: "3" }, "*");
+      let url = 'https://beta.pbl.cocorobo.cn'
+      if (window.location.href.includes('beta')) {
+        url = url
+      }
+      else if (this.lang.lang === 'cn') {
+        url = 'https://pbl.cocorobo.cn'
+      }
+      else if (this.lang.lang === 'hk') {
+        url = 'https://pbl.cocorobo.hk'
+      }
+      else if (this.lang.lang === 'en') {
+        url = 'https://pbl.cocorobo.com'
+      }
+      this.courseUrl = url + "/pbl-student-table/dist/#/courseDetail?userid=" + this.userid + "&oid=" + this.oid + "&org=" + this.org + "&courseId=" + item.courseId + "&tType=1&cid=&screenType=2"
     },
     getNT(cid) {
        window.topU.postMessage({ cid: cid, screenType: "3NT" }, "*");
@@ -1582,6 +1600,12 @@ export default {
       _this.goToCourse()
     }
   },
+  mounted() {
+    let _this = this
+    window.setCourseUrl = function(){
+      _this.courseUrl = ''
+    }
+  }
 };
 </script>
 
@@ -2378,4 +2402,14 @@ export default {
     padding: 0 90px !important;
     box-sizing: border-box !important;
 }
+
+.courseIframe{
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  z-index: 99999;
+  top: 0;
+  left: 0;
+  border: none;
+}
 </style>

+ 1 - 1
src/components/pages/pptEasy/addCourse3.vue

@@ -2880,7 +2880,7 @@ export default {
       else if (this.lang.lang === 'hk') {
         url = 'https://pbl.cocorobo.hk'
       }
-      else if (this.lang.lang === 'en') {
+      else if (this.lang.lang === 'com') {
         url = 'https://pbl.cocorobo.com'
       }
 

+ 1 - 1
src/components/pages/pptEasy/addCoursePS.vue

@@ -2880,7 +2880,7 @@ export default {
       else if (this.lang.lang === 'hk') {
         url = 'https://pbl.cocorobo.hk'
       }
-      else if (this.lang.lang === 'en') {
+      else if (this.lang.lang === 'com') {
         url = 'https://pbl.cocorobo.com'
       }
 

+ 1 - 1
src/lang/cn.json

@@ -220,7 +220,7 @@
   "OthersCourse": "他人课程",
   "Owner": "所有者",
   "PleaseEnterKeyword": "请输入关键字",
-  "Preview": "预览",
+  "Preview": "授课",
   "AiEdit": "Ai一下",
   "Share": "分享",
   "CreationDate": "创建日期",

+ 1 - 1
src/lang/en.json

@@ -219,7 +219,7 @@
   "OthersCourse": "Others Course",
   "Owner": "Owner",
   "PleaseEnterKeyword": "Please enter keywords",
-  "Preview": "Preview",
+  "Preview": "Teaching",
   "AiEdit": "AI Polish",
   "Share": "Share",
   "CreationDate": "Creation Date",

+ 1 - 1
src/lang/hk.json

@@ -220,7 +220,7 @@
   "OthersCourse": "他人課程",
   "Owner": "所有者",
   "PleaseEnterKeyword": "請輸入關鍵字",
-  "Preview": "預覽",
+  "Preview": "授课",
   "AiEdit": "Ai一下",
   "Share": "分享",
   "CreationDate": "創建日期",

Некоторые файлы не были показаны из-за большого количества измененных файлов