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

Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table

zengyicheng 2 years ago
parent
a1691f7073 bcd1670a6a
commit
68f4d4470a
36 changed files with 92 additions and 17 deletions
Split View Show Diff Stats
  1. 28 0
      dist/beifeng/index.html
  2. 0 0
      dist/beifeng/static/css/app.95a5efa60f4a05ea65d272ebc2b57791.css
  3. 0 0
      dist/beifeng/static/css/app.95a5efa60f4a05ea65d272ebc2b57791.css.map
  4. 0 0
      dist/beifeng/static/css/app.d8607cd5a336df87a0dab25d7baf572a.css
  5. 0 0
      dist/beifeng/static/css/app.d8607cd5a336df87a0dab25d7baf572a.css.map
  6. BIN
      dist/beifeng/static/fonts/element-icons.535877f.woff
  7. BIN
      dist/beifeng/static/fonts/element-icons.732389d.ttf
  8. BIN
      dist/beifeng/static/img/image.11b625a.png
  9. BIN
      dist/beifeng/static/img/kc1.1b8c4f6.png
  10. BIN
      dist/beifeng/static/img/mindNetwork.fe94240.png
  11. BIN
      dist/beifeng/static/img/portal.b3cf7fa.png
  12. BIN
      dist/beifeng/static/img/projectName.8270c53.png
  13. BIN
      dist/beifeng/static/img/sp1.92bfd5a.png
  14. BIN
      dist/beifeng/static/img/tup1.6b2e0bd.png
  15. BIN
      dist/beifeng/static/img/video.9ca79f0.png
  16. BIN
      dist/beifeng/static/img/videoH.3ef9db9.png
  17. BIN
      dist/beifeng/static/img/wheel.a7903d6.png
  18. BIN
      dist/beifeng/static/img/word.76356c6.png
  19. BIN
      dist/beifeng/static/img/yp1.d5f2ef7.png
  20. 0 0
      dist/beifeng/static/js/0.86cbf9c691e3dc53b304.js
  21. 0 0
      dist/beifeng/static/js/0.f867c3655b998d260981.js
  22. 0 0
      dist/beifeng/static/js/1.a8d1c832d7ea6bc9a183.js
  23. 0 0
      dist/beifeng/static/js/app.865120c55703fb7c6251.js
  24. 0 0
      dist/beifeng/static/js/app.dac9835f14b0d5bfdc05.js
  25. 1 0
      dist/beifeng/static/js/manifest.bc767fc24c5df22f150e.js
  26. 1 0
      dist/beifeng/static/js/manifest.fed1de90e0941b3846db.js
  27. 0 0
      dist/beifeng/static/js/vendor.779ee1bbeec2c196af1e.js
  28. BIN
      dist/beifeng/static/logo.ico
  29. 5 1
      dist/index.html
  30. 0 0
      dist/static/css/app.492e1995a8a12bc6e3c810d4d4b1d4b9.css
  31. 0 0
      dist/static/css/app.492e1995a8a12bc6e3c810d4d4b1d4b9.css.map
  32. 0 0
      dist/static/js/0.495dd6dd7e801967b64f.js
  33. 0 0
      dist/static/js/app.fcf91f0e520ea367235b.js
  34. 1 0
      dist/static/js/manifest.ce85731d7c1d072ed0aa.js
  35. 56 16
      src/components/pages/Grid.vue
  36. 0 0
      src/components/pages/components/a.json

+ 28 - 0
dist/beifeng/index.html
View File 

@@ -0,0 +1,28 @@
 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>PBL教师端</title><link rel="shortcut icon" type=image/x-icon href=static/logo.ico><style>@charset "utf-8";
 
+
 
+    div::-webkit-scrollbar {
 
+      /*滚动条整体样式*/
 
+      width: 6px;
 
+      /*高宽分别对应横竖滚动条的尺寸*/
 
+      height: 6px;
 
+    }
 
+
 
+    /*定义滚动条轨道 内阴影+圆角*/
 
+    div::-webkit-scrollbar-track {
 
+      border-radius: 10px;
 
+      background-color: rgba(0, 0, 0, 0.1);
 
+    }
 
+
 
+    /*定义滑块 内阴影+圆角*/
 
+    div::-webkit-scrollbar-thumb {
 
+      border-radius: 10px;
 
+      -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
 
+      background-color: rgba(0, 0, 0, 0.1);
 
+    }
 
+
 
+    html,
 
+    body {
 
+      height: 100%;
 
+      width: 100%;
 
+      background: #e6eaf0;
 
+    }</style><link href=./static/css/app.d8607cd5a336df87a0dab25d7baf572a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.bc767fc24c5df22f150e.js></script><script type=text/javascript src=./static/js/vendor.779ee1bbeec2c196af1e.js></script><script type=text/javascript src=./static/js/app.865120c55703fb7c6251.js></script></body></html>

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


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


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


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


BIN
dist/beifeng/static/fonts/element-icons.535877f.woff
View File


BIN
dist/beifeng/static/fonts/element-icons.732389d.ttf
View File


BIN
dist/beifeng/static/img/image.11b625a.png
View File


BIN
dist/beifeng/static/img/kc1.1b8c4f6.png
View File


BIN
dist/beifeng/static/img/mindNetwork.fe94240.png
View File


BIN
dist/beifeng/static/img/portal.b3cf7fa.png
View File


BIN
dist/beifeng/static/img/projectName.8270c53.png
View File


BIN
dist/beifeng/static/img/sp1.92bfd5a.png
View File


BIN
dist/beifeng/static/img/tup1.6b2e0bd.png
View File


BIN
dist/beifeng/static/img/video.9ca79f0.png
View File


BIN
dist/beifeng/static/img/videoH.3ef9db9.png
View File


BIN
dist/beifeng/static/img/wheel.a7903d6.png
View File


BIN
dist/beifeng/static/img/word.76356c6.png
View File


BIN
dist/beifeng/static/img/yp1.d5f2ef7.png
View File


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


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


File diff suppressed because it is too large
+ 0 - 0
dist/beifeng/static/js/1.a8d1c832d7ea6bc9a183.js


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


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


+ 1 - 0
dist/beifeng/static/js/manifest.bc767fc24c5df22f150e.js
View File 

@@ -0,0 +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:"f867c3655b998d260981",1:"a8d1c832d7ea6bc9a183"}[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}}([]);

+ 1 - 0
dist/beifeng/static/js/manifest.fed1de90e0941b3846db.js
View File 

@@ -0,0 +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:"f867c3655b998d260981",1:"a8d1c832d7ea6bc9a183"}[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/beifeng/static/js/vendor.779ee1bbeec2c196af1e.js


BIN
dist/beifeng/static/logo.ico
View File


+ 5 - 1
dist/index.html
View File 

@@ -25,4 +25,8 @@
 
       height: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
-    }</style><link href=./static/css/app.b724d2e34ff823d6d93303e471fea270.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.fed1de90e0941b3846db.js></script><script type=text/javascript src=./static/js/vendor.779ee1bbeec2c196af1e.js></script><script type=text/javascript src=./static/js/app.060a657fa8d63b5df8be.js></script></body></html>
 
+<<<<<<< HEAD
 
+    }</style><link href=./static/css/app.492e1995a8a12bc6e3c810d4d4b1d4b9.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.ce85731d7c1d072ed0aa.js></script><script type=text/javascript src=./static/js/vendor.779ee1bbeec2c196af1e.js></script><script type=text/javascript src=./static/js/app.fcf91f0e520ea367235b.js></script></body></html>
 
+=======
 
+    }</style><link href=./static/css/app.b724d2e34ff823d6d93303e471fea270.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.fed1de90e0941b3846db.js></script><script type=text/javascript src=./static/js/vendor.779ee1bbeec2c196af1e.js></script><script type=text/javascript src=./static/js/app.060a657fa8d63b5df8be.js></script></body></html>
 
+>>>>>>> 149c90d066c21fd02cb1dc488d0b848b206d500d

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


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


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


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


+ 1 - 0
dist/static/js/manifest.ce85731d7c1d072ed0aa.js
View File 

@@ -0,0 +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:"495dd6dd7e801967b64f",1:"a8d1c832d7ea6bc9a183"}[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}}([]);

+ 56 - 16
src/components/pages/Grid.vue
View File 

@@ -335,14 +335,15 @@ export default {
 
       // this.data = newItems;
 
       this.data[this.dragging] = dst;
 
       this.data[this.draggingE] = src;
 
-      let mindinfo = this.mindInfo(
 
+      let mindinfo = this.mindInfo2(
 
         this.dragging,
 
         "move",
 
-        this.data[this.gIndex],
 
+        dst,
 
         "us.mindNetwork",
 
         this.userinfo ? this.userinfo.userid : this.userid,
 
         this.RoomInfo.id,
 
-        this.draggingE
 
+        this.draggingE,
 
+        src
 
       );
 
       this.updateSocket(mindinfo);
 
       this.updateRoomData();
 
@@ -831,6 +832,15 @@ export default {
 
      * 参数三 ： content 行内容
 
      * 参数四 ： next 下一行
 
      */
 
+    //      messageInfo: {
 
+    //   sendId: userid,
 
+    //   moveIndex1: id, //第几个网格
 
+    //   moveIndex2: moveIndex, //移动到的网格
 
+    //   type: type, //类型
 
+    //   data: content, //内容
 
+    //   docId: roomid, //文档id
 
+    //   // pageId: US.pageId, //当前页面id
 
+    // },
 
     mindInfo(id, type, content, navid, userid, roomid, moveIndex) {
 
       var _data = {
 
         "us.mindNetwork": [
 
@@ -839,13 +849,42 @@ export default {
 
             receiveId: roomid, //文件id
 
             type: navid, //消息类型
 
             messageInfo: {
 
-              sendId: userid,
 
-              moveIndex1: id, //第几个网格
 
-              moveIndex2: moveIndex, //移动到的网格
 
+              id: id, //操作ID
 
+              type: type, //类型
 
+              content: content, //内容
 
+              docId: roomid, //文档id
 
+              pageId: top.US.pageId, //当前页面id
 
+            },
 
+          },
 
+        ],
 
+      };
 
+      return _data;
 
+    },
 
+    mindInfo2(id, type, content, navid, userid, roomid, moveIndex,moveData) {
 
+      var _data = {
 
+        "us.mindNetwork": [
 
+          {
 
+            sendId: userid, //发送人id
 
+            receiveId: roomid, //文件id
 
+            type: navid, //消息类型
 
+            messageInfo: {
 
+              id: id, //操作ID
 
+              type: type, //类型
 
+              content: content, //内容
 
+              docId: roomid, //文档id
 
+              pageId: top.US.pageId, //当前页面id
 
+            },
 
+          },
 
+          {
 
+            sendId: userid, //发送人id
 
+            receiveId: roomid, //文件id
 
+            type: navid, //消息类型
 
+            messageInfo: {
 
+              id: moveIndex, //操作ID
 
               type: type, //类型
 
-              data: content, //内容
 
+              content: moveData, //内容
 
               docId: roomid, //文档id
 
-              // pageId: US.pageId, //当前页面id
 
+              pageId: top.US.pageId, //当前页面id
 
             },
 
           },
 
         ],
 
@@ -919,25 +958,26 @@ export default {
 
         e.data.type &&
 
         e.data.type == "mindNetwork_update" &&
 
         e.data.info.docId == _this.RoomInfo.id &&
 
-        !(e.data.info.sendId == _this.userinfo.userid)
 
+        !(e.data.sendId == _this.userinfo.userid)
 
       ) {
 
-        _this.data[e.data.info.moveIndex1] = e.data.info.data;
 
+        _this.data[e.data.info.id] = e.data.info.content;
 
       } else if (
 
         e.data.type &&
 
         e.data.type == "mindNetwork_delete" &&
 
         e.data.info.docId == _this.RoomInfo.id &&
 
-       !(e.data.info.sendId == _this.userinfo.userid)
 
+        !(e.data.sendId == _this.userinfo.userid)
 
       ) {
 
-        _this.data[e.data.info.moveIndex1] = "";
 
+        _this.data[e.data.info.id] = "";
 
       } else if (
 
         e.data.type &&
 
         e.data.type == "mindNetwork_move" &&
 
         e.data.info.docId == _this.RoomInfo.id &&
 
-        !(e.data.info.sendId == _this.userinfo.userid)
 
+        !(e.data.sendId == _this.userinfo.userid)
 
       ) {
 
-        var newItems = [...JSON.parse(JSON.stringify(_this.data))]; //拷贝一份数据进行交换操作。
 
-        _this.data[e.data.info.moveIndex1] = newItems[e.data.info.moveIndex2];
 
-        _this.data[e.data.info.moveIndex2] = newItems[e.data.info.moveIndex1];
 
+        _this.data[e.data.info.id] = e.data.info.content;
 
+        // var newItems = [...JSON.parse(JSON.stringify(_this.data))]; //拷贝一份数据进行交换操作。
 
+        // _this.data[e.data.info.id] = newItems[e.data.info.moveIndex2];
 
+        // _this.data[e.data.info.moveIndex2] = newItems[e.data.info.moveIndex1];
 
       }
 
       _this.$forceUpdate();
 
     });

+ 0 - 0
src/components/pages/components/a.json
View File


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