Home Esplora Aiuto
Accedi
CocoRoboLabs
/
pbl-teacher-table
3
0
Forka 0
File Problemi 0 Pull Requests 0 Wiki
Sfoglia il codice sorgente

Merge branch 'beta'

SanHQin 3 settimane fa
parent
9e1036befc ce4bfce31a
commit
6c13d266ed
21 ha cambiato i file con 20 aggiunte e 9 eliminazioni
Visualizzazione separata Mostra Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.1b9f7b756c98dcfbe5da4c480c4512c1.css
  3. 0 0
      dist/static/css/app.1b9f7b756c98dcfbe5da4c480c4512c1.css.map
  4. 0 0
      dist/static/css/workPage.502104cdf68fb2f365109812cf489a4b.css
  5. 0 0
      dist/static/css/workPage.502104cdf68fb2f365109812cf489a4b.css.map
  6. 0 0
      dist/static/css/workPage.a84f497911024c8c5b15207ddf11a7a3.css.map
  7. 0 0
      dist/static/js/app.b34811a8f1131b73b7a6.js
  8. 0 0
      dist/static/js/app.b34811a8f1131b73b7a6.js.map
  9. 0 0
      dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map
  10. 0 0
      dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map
  11. 0 0
      dist/static/js/workPage.b45e595068e2e4c71217.js
  12. 0 0
      dist/static/js/workPage.b45e595068e2e4c71217.js.map
  13. 0 0
      dist/static/js/workPage.f47a9ac2a33d9cf48512.js
  14. 0 0
      dist/static/js/workPage.f47a9ac2a33d9cf48512.js.map
  15. 1 1
      dist/workPage.html
  16. 1 1
      src/components/pages/pptEasy/addCourse2.vue
  17. 6 4
      src/components/pages/pptEasy/addCourse3.vue
  18. 1 1
      src/components/pages/pptEasy/dialog/appDialog.vue
  19. 1 0
      src/components/pages/studentManageNew/component/editInterstcla.vue
  20. 5 0
      src/components/pages/studentManageNew/component/table.vue
  21. 4 1
      src/workPage/main.js

+ 1 - 1
dist/index.html
Vedi File 

@@ -37,7 +37,7 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.1f49089c405bb8f719ed9f59102dbb23.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.5baa0df200fd6278c1bf.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.1b9f7b756c98dcfbe5da4c480c4512c1.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.b34811a8f1131b73b7a6.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.1b9f7b756c98dcfbe5da4c480c4512c1.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.1b9f7b756c98dcfbe5da4c480c4512c1.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/workPage.502104cdf68fb2f365109812cf489a4b.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/workPage.502104cdf68fb2f365109812cf489a4b.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/workPage.a84f497911024c8c5b15207ddf11a7a3.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.b34811a8f1131b73b7a6.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.b34811a8f1131b73b7a6.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/workPage.b45e595068e2e4c71217.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/workPage.b45e595068e2e4c71217.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/workPage.f47a9ac2a33d9cf48512.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/workPage.f47a9ac2a33d9cf48512.js.map


+ 1 - 1
dist/workPage.html
Vedi File 

@@ -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.a84f497911024c8c5b15207ddf11a7a3.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.7b2c55096449c94cc8fd.js></script><script type=text/javascript src=./static/js/workPage.f47a9ac2a33d9cf48512.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.502104cdf68fb2f365109812cf489a4b.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.7b2c55096449c94cc8fd.js></script><script type=text/javascript src=./static/js/workPage.b45e595068e2e4c71217.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

+ 1 - 1
src/components/pages/pptEasy/addCourse2.vue
Vedi File 

@@ -3074,7 +3074,7 @@ export default {
 
     // 动态生成PPT iframe的URL
 
     setPptIframeUrl() {
 
       let ppturl = "https://beta.ppt.cocorobo.cn"
 
-      if (this.isBetaEnv) {
 
+      if (this.isBetaEnv()) {
 
         ppturl = "https://beta.ppt.cocorobo.cn"
 
       } else if (this.lang.lang == 'com') {
 
         ppturl = 'https://ppt.cocorobo.com'

+ 6 - 4
src/components/pages/pptEasy/addCourse3.vue
Vedi File 

@@ -3293,7 +3293,7 @@ export default {
 
     // 动态生成PPT iframe的URL
 
     setPptIframeUrl() {
 
       let ppturl = "https://beta.ppt.cocorobo.cn"
 
-      if (this.isBetaEnv) {
 
+      if (this.isBetaEnv()) {
 
         ppturl = "https://beta.ppt.cocorobo.cn"
 
       } else if (this.lang.lang == 'com') {
 
         ppturl = 'https://ppt.cocorobo.com'
 
@@ -3302,7 +3302,7 @@ export default {
 
       } else {
 
         ppturl = 'https://ppt.cocorobo.cn'
 
       }
 
-      this.pptIframeUrl = `${ppturl}/?mode=editor3&courseid=${this.cid}`;
 
+      this.pptIframeUrl = `${ppturl}/?mode=editor3&userid=${this.userid}&courseid=${this.cid}`;
 
     },
 
   },
 
   beforeDestroy() {
 
@@ -5194,13 +5194,15 @@ export default {
 
   display: grid;
 
   grid-template-columns: repeat(3, 1fr);
 
   gap: 15px;
 
-  /* margin-bottom: 20px; */
 
   position: relative;
 
+  height: 250px;
 
+  overflow: auto;
 
+  overflow-x: hidden;
 
 }
 
 
 .image-item {
 
   width: 100%;
 
-  aspect-ratio: 16 / 9;
 
+  height: 100px;
 
   overflow: hidden;
 
   border-radius: 10px;
 
   cursor: pointer;

+ 1 - 1
src/components/pages/pptEasy/dialog/appDialog.vue
Vedi File 

@@ -94,7 +94,7 @@
 
 
 
           <div class="ac_c_typeCard" v-if="showType == ''">
 
-            <div class="ac_c_tc_item" v-for="(item2, index2) in typeList" :key="index2">
 
+            <div class="ac_c_tc_item" v-for="(item2, index2) in typeList" :key="index2"  v-show="dataList.filter(i => i.type == item2.id).length > 0">
 
               <div class="ac_c_tc_i_top">
 
                 <div>{{ item2.name }}</div>

+ 1 - 0
src/components/pages/studentManageNew/component/editInterstcla.vue
Vedi File 

@@ -77,6 +77,7 @@ export default {
 
       let params = {
 
         id: this.clainfo.id,
 
         n: this.clainfo.name,
 
+        pid: this.clainfo.pid,
 
         oid: this.oid,
 
       };
 
       this.ajax

+ 5 - 0
src/components/pages/studentManageNew/component/table.vue
Vedi File 

@@ -722,6 +722,7 @@ export default {
 
       stuEditInfo: {}, // 学生编辑信息
 
       ClaEditvisible: false, // 班级编辑信息
 
       ClaEditInfo: {}, // 班级编辑信息
 
+      claEditLastTriggerAt: 0, // 防止回车和失焦连续触发重复提交
 
       editBtnHovered: false, // 编辑按钮hover状态
 
       deleteBtnHovered: false, // 删除按钮hover状态
 
 
@@ -1764,6 +1765,9 @@ export default {
 
     },
 
     // 修改班级名称
 
     confirmClaEdit() {
 
+      const now = Date.now();
 
+      if (now - this.claEditLastTriggerAt < 250) return;
 
+      this.claEditLastTriggerAt = now;
 
       if (
 
         this.ClaEditInfo.name == "" ||
 
         this.ClaEditInfo.name == this.activeinfo.name
 
@@ -1774,6 +1778,7 @@ export default {
 
       let params = {
 
         id: this.ClaEditInfo.id,
 
         n: this.ClaEditInfo.name,
 
+        pid: this.ClaEditInfo.pid,
 
         oid: this.oid
 
       };
 
       this.ajax

+ 4 - 1
src/workPage/main.js
Vedi File 

@@ -7,7 +7,7 @@ import store from '../config/config'
 
 // 只引入 workPage 需要的 Element UI 组件
 
 import { Loading, Input, Button, Dialog } from 'element-ui'
 
 import 'element-ui/lib/theme-chalk/index.css'
 
-
 
+import hevueImgPreview from '../components/tools/hevue-img-preview'
 
 import { myMessage } from '../components/tools/message'
 
 import ajax from '../common/axios.config'
 
 import VueCookies from 'vue-cookies'
 
@@ -22,6 +22,9 @@ Vue.use(Input)
 
 Vue.use(Button)
 
 Vue.use(Dialog)
 
 Vue.use(VueCookies)
 
+Vue.use(hevueImgPreview)
 
+
 
+
 
 
 Vue.config.productionTip = false
 
 Vue.prototype.$store = store

Some files were not shown because too many files changed in this diff