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

index

lsc 2 years ago
parent
6a1df1eb02
commit
259e750d9a
21 changed files with 87 additions and 27 deletions
Unified View Show Diff Stats
  1. 2 1
      config/index.js
  2. 1 1
      dist/index.html
  3. 0 0
      dist/static/css/app.4ba10bc942b57742c30ed54984494af9.css
  4. 0 0
      dist/static/css/app.4ba10bc942b57742c30ed54984494af9.css.map
  5. 0 0
      dist/static/css/app.d3a28e079d758c34592e5582ca429df2.css.map
  6. 0 0
      dist/static/js/0.495dd6dd7e801967b64f.js
  7. 0 0
      dist/static/js/0.f867c3655b998d260981.js
  8. 0 0
      dist/static/js/0.f867c3655b998d260981.js.map
  9. 0 0
      dist/static/js/1.a8d1c832d7ea6bc9a183.js
  10. 0 0
      dist/static/js/1.a8d1c832d7ea6bc9a183.js.map
  11. 0 0
      dist/static/js/app.6cc47880f39cf0c768b7.js
  12. 0 0
      dist/static/js/app.b911d765140d52ea0497.js
  13. 0 0
      dist/static/js/app.b911d765140d52ea0497.js.map
  14. 1 2
      dist/static/js/manifest.ce85731d7c1d072ed0aa.js
  15. 0 0
      dist/static/js/manifest.fed1de90e0941b3846db.js.map
  16. 0 0
      dist/static/js/vendor.8ea5f719bf3f8f1a1a43.js
  17. 0 0
      dist/static/js/vendor.ec6917f8087437e124be.js
  18. 0 0
      dist/static/js/vendor.ec6917f8087437e124be.js.map
  19. 10 1
      src/common/axios.config.js
  20. 71 21
      src/components/pages/Grid.vue
  21. 2 1
      src/config/config.js

+ 2 - 1
config/index.js
View File 

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

+ 1 - 1
dist/index.html
View File 

@@ -25,4 +25,4 @@
 
       height: 100%;
 
       height: 100%;
 
       width: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
       background: #e6eaf0;
 
-    }</style><link href=./static/css/app.d3a28e079d758c34592e5582ca429df2.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.ec6917f8087437e124be.js></script><script type=text/javascript src=./static/js/app.b911d765140d52ea0497.js></script></body></html>
 
+    }</style><link href=./static/css/app.4ba10bc942b57742c30ed54984494af9.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.8ea5f719bf3f8f1a1a43.js></script><script type=text/javascript src=./static/js/app.6cc47880f39cf0c768b7.js></script></body></html>

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


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


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.d3a28e079d758c34592e5582ca429df2.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/0.f867c3655b998d260981.js


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


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


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


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


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


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


+ 1 - 2
dist/static/js/manifest.fed1de90e0941b3846db.js → dist/static/js/manifest.ce85731d7c1d072ed0aa.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:"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}}([]);
 
-//# sourceMappingURL=manifest.fed1de90e0941b3846db.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:"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}}([]);

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


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


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


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


+ 10 - 1
src/common/axios.config.js
View File 

@@ -15,7 +15,16 @@ axios.interceptors.request.use((config) => {
 
             'Content-Type': 'application/x-www-form-urlencoded'
 
             'Content-Type': 'application/x-www-form-urlencoded'
 
         }
 
         }
 
     }
 
     }
 
-    if (config.method === 'post') {
 
+    // if (config.data && config.data[0].post == '1' && config.method === 'post') {
 
+    //     // config.headers.post['Content-Type'] = 'application/json;charset=UTF-8';
 
+    //     // config.data = config.data//序列化post 参数
 
+    //     config.data = 'mode=' + (Object.values(config.data[0]).join(','))//序列化post 参数
 
+    // } else if (config.method === 'post') {
 
+    //     config.data = qs.stringify(config.data)//序列化post 参数
 
+    // }
 
+    if (config.data && config.data[0].post == '1' && config.method === 'post') {
 
+        config.data = 'mode=' + (Object.values(config.data[0]).join(','))//序列化post 参数
 
+    } else if(config.method === 'post') {
 
         config.data = qs.stringify(config.data)//序列化post 参数
 
         config.data = qs.stringify(config.data)//序列化post 参数
 
     }
 
     }
 
     return config;
 
     return config;

+ 71 - 21
src/components/pages/Grid.vue
View File 

@@ -335,6 +335,16 @@ export default {
 
       // this.data = newItems;
 
       // this.data = newItems;
 
       this.data[this.dragging] = dst;
 
       this.data[this.dragging] = dst;
 
       this.data[this.draggingE] = src;
 
       this.data[this.draggingE] = src;
 
+      let mindinfo = this.mindInfo(
 
+        this.dragging,
 
+        "move",
 
+        this.data[this.gIndex],
 
+        "us.mindNetwork",
 
+        this.userinfo ? this.userinfo.userid : this.userid,
 
+        this.RoomInfo.id,
 
+        this.draggingE
 
+      );
 
+      this.updateSocket(mindinfo);
 
       this.updateRoomData();
 
       this.updateRoomData();
 
       this.dragging = null; //拖动结束后，清除数据
 
       this.dragging = null; //拖动结束后，清除数据
 
       this.draggingE = null;
 
       this.draggingE = null;
 
@@ -424,6 +434,16 @@ export default {
 
       })
 
       })
 
         .then(() => {
 
         .then(() => {
 
           this.data[index] = "";
 
           this.data[index] = "";
 
+          let mindinfo = this.mindInfo(
 
+            this.index,
 
+            "delete",
 
+            this.data[this.index],
 
+            "us.mindNetwork",
 
+            this.userinfo ? this.userinfo.userid : this.userid,
 
+            this.RoomInfo.id,
 
+            ""
 
+          );
 
+          this.updateSocket(mindinfo);
 
           this.updateRoomData();
 
           this.updateRoomData();
 
           this.$forceUpdate();
 
           this.$forceUpdate();
 
         })
 
         })
 
@@ -554,13 +574,14 @@ export default {
 
 
 
       let mindinfo = this.mindInfo(
 
       let mindinfo = this.mindInfo(
 
         this.gIndex,
 
         this.gIndex,
 
-        "us.mindNetwork",
 
+        "update",
 
         this.data[this.gIndex],
 
         this.data[this.gIndex],
 
-        "",
 
+        "us.mindNetwork",
 
         this.userinfo ? this.userinfo.userid : this.userid,
 
         this.userinfo ? this.userinfo.userid : this.userid,
 
-        this.RoomInfo.id
 
+        this.RoomInfo.id,
 
+        ""
 
       );
 
       );
 
-      this.updateSocket(this.mindInfo);
 
+      this.updateSocket(mindinfo);
 
       this.updateRoomData();
 
       this.updateRoomData();
 
       this.dialogVisible = false;
 
       this.dialogVisible = false;
 
       this.$forceUpdate();
 
       this.$forceUpdate();
 
@@ -722,10 +743,11 @@ export default {
 
         .get(this.$store.state.api + "selectRoom", params)
 
         .get(this.$store.state.api + "selectRoom", params)
 
         .then((res) => {
 
         .then((res) => {
 
           if (res.data[0].length) {
 
           if (res.data[0].length) {
 
-            this.RoomInfo = res.data[0][0];
 
-            this.data = JSON.parse(res.data[0][0].data);
 
-            this.dialogVisible3 = false;
 
-            this.dialogVisible2 = true;
 
+            // this.RoomInfo = res.data[0][0];
 
+            // this.data = JSON.parse(res.data[0][0].data);
 
+            // this.dialogVisible3 = false;
 
+            // this.dialogVisible2 = true;
 
+            this.getMindNetwork(res.data[0][0].id, this.userinfo.userid);
 
             // this.data.splice(0,1)
 
             // this.data.splice(0,1)
 
             // this.updateRoomData()
 
             // this.updateRoomData()
 
             // this.timer = setInterval(() => {
 
             // this.timer = setInterval(() => {
 
@@ -748,10 +770,11 @@ export default {
 
         .then((res) => {
 
         .then((res) => {
 
           if (res.data[0].length) {
 
           if (res.data[0].length) {
 
             this.$message.success("加入成功");
 
             this.$message.success("加入成功");
 
-            this.RoomInfo = res.data[0][0];
 
-            this.data = JSON.parse(res.data[0][0].data);
 
+            // this.RoomInfo = res.data[0][0];
 
+            // this.data = JSON.parse(res.data[0][0].data);
 
             this.dialogVisible3 = false;
 
             this.dialogVisible3 = false;
 
             this.dialogVisible2 = true;
 
             this.dialogVisible2 = true;
 
+            this.getMindNetwork(res.data[0][0].id, this.userinfo.userid);
 
             // this.timer = setInterval(() => {
 
             // this.timer = setInterval(() => {
 
             //   this.selectRoom2(uid);
 
             //   this.selectRoom2(uid);
 
             // }, 5000);
 
             // }, 5000);
 
@@ -801,7 +824,6 @@ export default {
 
         })
 
         })
 
         .catch(() => {});
 
         .catch(() => {});
 
     },
 
     },
 
-
 
     /*
 
     /*
 
      * mind 消息类
 
      * mind 消息类
 
      * 参数一 ： 第几个网格
 
      * 参数一 ： 第几个网格
 
@@ -809,15 +831,16 @@ export default {
 
      * 参数三 ： content 行内容
 
      * 参数三 ： content 行内容
 
      * 参数四 ： next 下一行
 
      * 参数四 ： next 下一行
 
      */
 
      */
 
-    mindInfo(id, type, content, next, navid, userid, roomid) {
 
+    mindInfo(id, type, content, navid, userid, roomid, moveIndex) {
 
       var _data = {
 
       var _data = {
 
         sendId: userid, //发送人id
 
         sendId: userid, //发送人id
 
         receiveId: roomid, //文件id
 
         receiveId: roomid, //文件id
 
-        //type: navid ? 'us.nav' : 'us.word',    //消息类型
 
+        type: navid, //消息类型
 
         messageInfo: {
 
         messageInfo: {
 
-          id: id, //操作ID
 
+          moveIndex1: id, //第几个网格
 
+          moveIndex2: moveIndex, //移动到的网格
 
           type: type, //类型
 
           type: type, //类型
 
-          content: content, //内容
 
+          data: content, //内容
 
           docId: roomid, //文档id
 
           docId: roomid, //文档id
 
           // pageId: US.pageId, //当前页面id
 
           // pageId: US.pageId, //当前页面id
 
         },
 
         },
 
@@ -829,10 +852,11 @@ export default {
 
         {
 
         {
 
           type: "send",
 
           type: "send",
 
           mindinfo: JSON.stringify(mindinfo),
 
           mindinfo: JSON.stringify(mindinfo),
 
+          post: 1,
 
         },
 
         },
 
       ];
 
       ];
 
       this.ajax
 
       this.ajax
 
-        .post(this.$store.state.soket, params)
 
+        .post(this.$store.state.socket, params)
 
         .then((res) => {
 
         .then((res) => {
 
           console.log(res);
 
           console.log(res);
 
         })
 
         })
 
@@ -840,31 +864,57 @@ export default {
 
           console.error(err);
 
           console.error(err);
 
         });
 
         });
 
     },
 
     },
 
+    getMindNetwork(id, uid) {
 
+      let params = [
 
+        {
 
+          type: "getMindNetwork",
 
+          docid: id,
 
+          pageid: window.parent.US.pageId,
 
+          userid: uid,
 
+          post: "1",
 
+        },
 
+      ];
 
+      this.ajax
 
+        .post(this.$store.state.socket, params)
 
+        .then((res) => {
 
+          if (res.data[0].length) {
 
+            this.RoomInfo = res.data[0][0];
 
+            this.data = JSON.parse(res.data[0][0].data);
 
+            this.dialogVisible3 = false;
 
+            this.dialogVisible2 = true;
 
+          }
 
+          console.log(res);
 
+        })
 
+        .catch((err) => {
 
+          console.error(err);
 
+        });
 
+    },
 
   },
 
   },
 
   beforeDestroy() {
 
   beforeDestroy() {
 
     // clearInterval(this.timer);
 
     // clearInterval(this.timer);
 
     window.removeEventListener("message");
 
     window.removeEventListener("message");
 
   },
 
   },
 
   created() {
 
   created() {
 
+    document.domain = "cocorobo.cn";
 
     // window.parent.postMessage({ cid: cid, type: "U.MD.O.P.pollingAsyn" }, "*");
 
     // window.parent.postMessage({ cid: cid, type: "U.MD.O.P.pollingAsyn" }, "*");
 
     for (var i = 0; i < 16; i++) {
 
     for (var i = 0; i < 16; i++) {
 
       this.data.push("");
 
       this.data.push("");
 
     }
 
     }
 
-    this.data.push("");
 
     this.getUser();
 
     this.getUser();
 
     window.addEventListener("message", function (e) {
 
     window.addEventListener("message", function (e) {
 
       // 监听 message 事件
 
       // 监听 message 事件
 
       if (e.data.type && e.data.type == "mindNetwork_update") {
 
       if (e.data.type && e.data.type == "mindNetwork_update") {
 
-        this.data[e.data.idnex] = e.data.data;
 
+        this.data[e.data.moveIndex1] = e.data.data;
 
+        this.$forceUpdate();
 
       } else if (e.data.close && e.data.type == "mindNetwork_delete") {
 
       } else if (e.data.close && e.data.type == "mindNetwork_delete") {
 
-        // e.data.info
 
-        this.data.splice(e.data.index, 1);
 
+        this.data.splice(e.data.moveIndex1, 1);
 
+        this.$forceUpdate();
 
       } else if (e.data.close && e.data.type == "mindNetwork_move") {
 
       } else if (e.data.close && e.data.type == "mindNetwork_move") {
 
         var newItems = [...JSON.parse(JSON.stringify(this.data))]; //拷贝一份数据进行交换操作。
 
         var newItems = [...JSON.parse(JSON.stringify(this.data))]; //拷贝一份数据进行交换操作。
 
         this.data[e.data.moveIndex1] = newItems[e.data.moveIndex2];
 
         this.data[e.data.moveIndex1] = newItems[e.data.moveIndex2];
 
         this.data[e.data.moveIndex2] = newItems[e.data.moveIndex1];
 
         this.data[e.data.moveIndex2] = newItems[e.data.moveIndex1];
 
+        this.$forceUpdate();
 
       }
 
       }
 
-      this.$forceUpdate();
 
     });
 
     });
 
   },
 
   },
 
 };
 
 };

+ 2 - 1
src/config/config.js
View File 

@@ -10,7 +10,8 @@ const store = new Vuex.Store({
 
         userInfo: {},
 
         userInfo: {},
 
         nCount: 0,
 
         nCount: 0,
 
         api: 'https://pbl.cocorobo.cn/api/pbl/',
 
         api: 'https://pbl.cocorobo.cn/api/pbl/',
 
-        socket: "http://poll.cocorobo.cn",
 
+        socket: "https://poll.cocorobo.cn",
 
+        // socket: "http://localhost:1473",
 
         // api: 'http://localhost:7003/api/pbl/',
 
         // api: 'http://localhost:7003/api/pbl/',
 
     },
 
     },

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