Home Explore Help
Sign In
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

update

lsc 2 years ago
parent
9c1971def3
commit
310ba04170
22 changed files with 111 additions and 53 deletions
Split View Show Diff Stats
  1. 2 2
      config/index.js
  2. 1 1
      dist/index.html
  3. 0 0
      dist/static/css/app.86764b02a0985af28b5171f52f1205b7.css
  4. 0 0
      dist/static/css/app.86764b02a0985af28b5171f52f1205b7.css.map
  5. 0 0
      dist/static/css/app.b3123746398cee8964c9afdceb5ebe8f.css
  6. 0 0
      dist/static/css/app.b3123746398cee8964c9afdceb5ebe8f.css.map
  7. 0 0
      dist/static/js/0.86cbf9c691e3dc53b304.js
  8. 0 0
      dist/static/js/0.86cbf9c691e3dc53b304.js.map
  9. 0 0
      dist/static/js/1.994623639438b244a74c.js
  10. 0 0
      dist/static/js/1.994623639438b244a74c.js.map
  11. 0 0
      dist/static/js/app.33a89cb9ac0a57fab1fb.js
  12. 0 0
      dist/static/js/app.bcf925ca2cb3252ac3d1.js
  13. 0 0
      dist/static/js/app.bcf925ca2cb3252ac3d1.js.map
  14. 1 2
      dist/static/js/manifest.85f48b0184f614b2b8d9.js
  15. 0 0
      dist/static/js/manifest.85f48b0184f614b2b8d9.js.map
  16. 0 0
      dist/static/js/vendor.10e66e02479f48f0abf1.js
  17. 0 0
      dist/static/js/vendor.10e66e02479f48f0abf1.js.map
  18. 0 0
      dist/static/js/vendor.22a004af27240d04b962.js
  19. 21 29
      src/components/pages/components/pdf.vue
  20. 7 2
      src/components/pages/evaluation.vue
  21. 78 16
      src/components/pages/liveRoom.vue
  22. 1 1
      src/components/tools/jsmind.vue

+ 2 - 2
config/index.js
View File 

@@ -51,8 +51,8 @@ module.exports = {
 
 
     productionSourceMap: true,
 
     // https://webpack.js.org/configuration/devtool/#production
 
-    devtool: '#source-map',
 
-    // devtool: 'cheap-module-eval-source-map',
 
+    // devtool: '#source-map',
 
+    devtool: 'cheap-module-eval-source-map',
 
 
     // Gzip off by default as many popular static hosts such as
 
     // Surge or Netlify already gzip all static assets for you.

+ 1 - 1
dist/index.html
View File 

@@ -25,4 +25,4 @@
 
       height: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
-    }</style><link href=./static/css/app.86764b02a0985af28b5171f52f1205b7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.85f48b0184f614b2b8d9.js></script><script type=text/javascript src=./static/js/vendor.10e66e02479f48f0abf1.js></script><script type=text/javascript src=./static/js/app.bcf925ca2cb3252ac3d1.js></script></body></html><script>document.domain = document.domain.split(".").slice(-2).join(".");</script>
 
+    }</style><link href=./static/css/app.b3123746398cee8964c9afdceb5ebe8f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.85f48b0184f614b2b8d9.js></script><script type=text/javascript src=./static/js/vendor.22a004af27240d04b962.js></script><script type=text/javascript src=./static/js/app.33a89cb9ac0a57fab1fb.js></script></body></html><script>document.domain = document.domain.split(".").slice(-2).join(".");</script>

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


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


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


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


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


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


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


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


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


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


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


+ 1 - 2
dist/static/js/manifest.85f48b0184f614b2b8d9.js
View File 

@@ -1,2 +1 @@
 
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var r={},t={4:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"86cbf9c691e3dc53b304",1:"994623639438b244a74c"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
 
-//# sourceMappingURL=manifest.85f48b0184f614b2b8d9.js.map
 
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var r={},t={4:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"86cbf9c691e3dc53b304",1:"994623639438b244a74c"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);

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


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/vendor.10e66e02479f48f0abf1.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/vendor.10e66e02479f48f0abf1.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/vendor.22a004af27240d04b962.js


+ 21 - 29
src/components/pages/components/pdf.vue
View File 

@@ -86,38 +86,30 @@ export default {
 
       background: "rgba(255, 255, 255, 0.7)",
 
       target: document.querySelector(".pdf"),
 
     });
 
+    let dwidth = document.body.offsetWidth;
 
+    let cwidth =
 
+      (document.getElementsByClassName("pdf")[0].offsetHeight - 100) * 1.77;
 
+    let owidth = "";
 
+    if (cwidth > dwidth) {
 
+      owidth = dwidth + "px";
 
+    } else {
 
+      owidth = cwidth + "px";
 
+    }
 
     var a = document.getElementsByClassName("pdf")[0].offsetWidth;
 
     let _this = this;
 
-    this.$refs.pdf.$el.style.width =
 
-      (document.getElementsByClassName("pdf")[0].offsetHeight - 100) * 1.77 +
 
-      "px";
 
-    // if (a < 1300) {
 
-    //   _this.scale = 100;
 
-    //   _this.$refs.pdf.$el.style.width = parseInt(this.scale) + "%";
 
-    // } else if (a > 1300 && a < 1500) {
 
-    //   _this.scale = 80;
 
-    //   _this.$refs.pdf.$el.style.width = parseInt(this.scale) + "%";
 
-    // } else if (a > 1500) {
 
-    //   _this.scale = 69;
 
-    //   _this.$refs.pdf.$el.style.width = parseInt(this.scale) + "%";
 
-    // } else if (a == 1500) {
 
-    //   _this.scale = 69;
 
-    //   _this.$refs.pdf.$el.style.width = parseInt(this.scale) + "%";
 
-    // }
 
-    this.$emit(
 
-      "getWidth",
 
-      (document.getElementsByClassName("pdf")[0].offsetHeight - 100) * 1.77 +
 
-        "px"
 
-    );
 
+    this.$refs.pdf.$el.style.width = owidth;
 
+    this.$emit("getWidth", owidth);
 
     window.addEventListener("resize", () => {
 
-      this.$refs.pdf.$el.style.width =
 
-        (document.getElementsByClassName("pdf")[0].offsetHeight - 100) * 1.77 +
 
-        "px";
 
-      this.$emit(
 
-        "getWidth",
 
-        (document.getElementsByClassName("pdf")[0].offsetHeight - 100) * 1.77 +
 
-          "px"
 
-      );
 
+      dwidth = document.body.offsetWidth;
 
+      cwidth =
 
+        (document.getElementsByClassName("pdf")[0].offsetHeight - 100) * 1.77;
 
+      if (cwidth > dwidth) {
 
+        owidth = dwidth + "px";
 
+      } else {
 
+        owidth = cwidth + "px";
 
+      }
 
+      _this.$refs.pdf.$el.style.width = owidth;
 
+      _this.$emit("getWidth", owidth);
 
       //   var a = document.getElementsByClassName("pdf")[0].offsetWidth;
 
       //   if (a < 1300) {
 
       //     _this.scale = 100;

+ 7 - 2
src/components/pages/evaluation.vue
View File 

@@ -77,9 +77,9 @@
 
       title="添加目标管理"
 
       :visible.sync="dialogVisible"
 
       :append-to-body="true"
 
-      width="1200px"
 
+      width="100%"
 
       :before-close="handleClose"
 
-      class="dialog_diy"
 
+      class="dialog_diy mubiao_diy"
 
     >
 
       <div>
 
         <div class="e_add_top">
 
@@ -684,6 +684,10 @@ export default {
 
   background: #fff;
 
 }
 
 
+.mubiao_diy >>> .el-dialog{
 
+  max-width: 1200px;
 
+}
 
+
 
 .pb_head > span:nth-child(2) {
 
   font-size: 16px;
 
   margin-left: 80px;
 
@@ -927,6 +931,7 @@ export default {
 
 .e_add_list_pbox {
 
   margin: 15px 0 0 0;
 
   width: 500px;
 
+  min-width: 500px;
 
   height: 500px;
 
 }
 
 .e_add_list_pbox_title {

+ 78 - 16
src/components/pages/liveRoom.vue
View File 

@@ -1147,7 +1147,7 @@ export default {
 
   components: { EditorBar, AnswerData, AnswerData2, pdf, ImgDraw, Time },
 
   data() {
 
     return {
 
-      pdfUrl:"",
 
+      pdfUrl: "",
 
       // "https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/%E4%B8%8A%E8%AF%BE%E8%AF%BE%E4%BB%B6---%E4%BA%94%E4%B8%8Bintroduce%20a%20festival%20%28Final%20%29%281%291661829428281.pdf",
 
       pptImgUrl: "",
 
       isLoading: false,
 
@@ -1265,7 +1265,7 @@ export default {
 
       //   { tools: [29] },
 
       //   "",
 
       //   "",
 
-
 
+      handle: {page: 1, type: 0, userid: '', isPlay: 0},
 
       //1、电子白板 2、便签 3、思维导图 4、问卷调查 5、量规评分 6、协同文档 7、思维网格 8、素材库 9、选择题 10、倒计时 11、问答题 12、选人回答 13、分小组 14、老师对提交作业进行评价 15、问答 16、作业提交 17、学习资料 18、训练平台 19、目标管理 20、课程设计 21、编程平台 22、AI体验 23、python 24、AI平台
 
       howTools: 0,
 
       worksDetail: [],
 
@@ -1554,17 +1554,27 @@ export default {
 
       this.dialogVisible = true;
 
     },
 
     pick() {
 
+      this.handle.type = 2;
 
+      this.handle.userid = this.answerStudent.id;
 
       let params = [
 
         {
 
-          h: JSON.stringify({ type: 2, userid: this.answerStudent.id }),
 
+          h: JSON.stringify(this.handle),
 
           cid: this.cid,
 
         },
 
       ];
 
       this.ajax
 
-        .post(this.$store.state.api + "updatePPTHandle", params)
 
+        .post(this.$store.state.api + "updatePptPage", params)
 
         .then((res) => {
 
           this.answerStudent = "";
 
           this.dialogVisible = false;
 
+          let mindinfo = this.setInfo(
 
+            this.cid,
 
+            "us.mindNetwork",
 
+            this.handle,
 
+            "update",
 
+            this.userid
 
+          );
 
+          this.updateSocket(mindinfo)
 
         })
 
         .catch((err) => {
 
           console.error(err);
 
@@ -1575,9 +1585,10 @@ export default {
 
     },
 
     getPage(page) {
 
       console.log(page);
 
+      this.handle.page = page;
 
       let params = [
 
         {
 
-          page: page,
 
+          page: JSON.stringify(this.handle),
 
           id: this.cid,
 
         },
 
       ];
 
@@ -1594,7 +1605,7 @@ export default {
 
           } else {
 
             this.videoBlock = 0;
 
           }
 
-          this.playerH("");
 
+          this.playerH({ type: 0, isPlay: 0, userid: "" });
 
         })
 
         .catch((err) => {
 
           console.error(err);
 
@@ -1609,7 +1620,7 @@ export default {
 
         .then((r) => {
 
           let res = r.data[0][0];
 
           this.pdfUrl = res.url;
 
-          this.tools = JSON.parse(res.content)
 
+          this.tools = JSON.parse(res.content);
 
         })
 
         .catch((err) => {
 
           // this.$message.error("查询失败");
 
@@ -1811,15 +1822,26 @@ export default {
 
       this.playerO = this.playerOptions;
 
     },
 
     playerH(handle) {
 
+      this.handle.type = handle.type;
 
+      this.handle.isPlay = handle.isPlay;
 
       let params = [
 
         {
 
-          h: handle,
 
+          h: JSON.stringify(this.handle),
 
           cid: this.cid,
 
         },
 
       ];
 
       this.ajax
 
-        .post(this.$store.state.api + "updatePPTHandle", params)
 
-        .then((res) => {})
 
+        .post(this.$store.state.api + "updatePptPage", params)
 
+        .then((res) => {
 
+          let mindinfo = this.setInfo(
 
+            this.cid,
 
+            "us.mindNetwork",
 
+            this.handle,
 
+            "update",
 
+            this.userid
 
+          );
 
+          this.updateSocket(mindinfo)
 
+        })
 
         .catch((err) => {
 
           console.error(err);
 
         });
 
@@ -1827,11 +1849,11 @@ export default {
 
     onPlayerPlay() {},
 
     onPlayerPlayZ(player) {
 
       console.log(player);
 
-      this.playerH(JSON.stringify({ type: 1, isPlay: 1 }));
 
+      this.playerH({ type: 1, isPlay: 1 });
 
     }, // 暂停回调
 
     onPlayerPause(player) {
 
       console.log(player);
 
-      this.playerH(JSON.stringify({ type: 1, isPlay: 2 }));
 
+      this.playerH({ type: 1, isPlay: 2 });
 
     },
 
     // 视频播放结束回调
 
     onPlayerEnded(player) {
 
@@ -1932,6 +1954,44 @@ export default {
 
           console.error(err);
 
         });
 
     },
 
+    setInfo(id, navid, content, type, userid) {
 
+      var _data = {
 
+        "us.realTimeClass": [
 
+          {
 
+            sendId: userid, //发送人id
 
+            receiveId: id, //文件id
 
+            type: navid, //消息类型
 
+            messageInfo: {
 
+              id: id, //操作ID
 
+              type: type, //类型
 
+              content: content, //内容
 
+              docId: id, //文档id
 
+              pageId: top.US.pageId, //当前页面id
 
+            },
 
+          },
 
+        ],
 
+      };
 
+      return _data;
 
+    },
 
+    updateSocket(mindinfo) {
 
+      let params = [
 
+        {
 
+          type: "send",
 
+          mindinfo: encodeURIComponent(
 
+            encodeURIComponent(JSON.stringify(mindinfo))
 
+          ),
 
+          post: 1,
 
+        },
 
+      ];
 
+      this.ajax
 
+        .post(this.$store.state.socket, params)
 
+        .then((res) => {
 
+          console.log(res);
 
+        })
 
+        .catch((err) => {
 
+          console.error(err);
 
+        });
 
+    },
 
   },
 
   created() {
 
     this.getData();
 
@@ -1965,7 +2025,8 @@ export default {
 
 
 .imgMiddle {
 
   width: 100%;
 
-  height: calc(100% - 45px);
 
+  /* height: calc(100% - 45px); */
 
+  height: calc(100%);
 
   position: relative;
 
   /* max-height: 920px; */
 
 }
 
@@ -2020,14 +2081,15 @@ export default {
 
 
 .isNoOther {
 
   width: 100%;
 
-  height: 100%;
 
-  /* height: calc(100% - 45px); */
 
+  /* height: 100%; */
 
+  height: calc(100% - 45px);
 
   display: flex;
 
 }
 
 
 .imghalf {
 
   width: 60% !important;
 
-  height: calc(100% - 45px);
 
+  /* height: calc(100% - 45px); */
 
+  height: calc(100%);
 
   /* max-height: 920px; */
 
 }
 
 .answerBox {

+ 1 - 1
src/components/tools/jsmind.vue
View File 

@@ -473,7 +473,7 @@ export default {
 
 .jsmind_layout {
 
   display: flex;
 
   flex-direction: column;
 
-  width: 700px;
 
+  width: 100%;
 
   height: calc(100%);
 
   /* height: 500px; */
 
   /* margin: 15px 5px 0 0; */

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