lsc 2 年之前
父节点
当前提交
bcd1670a6a

文件差异内容过多而无法显示
+ 0 - 0
dist/beifeng/static/css/app.d8607cd5a336df87a0dab25d7baf572a.css


+ 1 - 1
dist/beifeng/static/js/manifest.bc767fc24c5df22f150e.js

@@ -1 +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:"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}}([]);
+!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}}([]);

+ 5 - 1
dist/index.html

@@ -25,4 +25,8 @@
       height: 100%;
       width: 100%;
       background: #e6eaf0;
-    }</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>
+<<<<<<< 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

文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/app.b724d2e34ff823d6d93303e471fea270.css


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/app.b724d2e34ff823d6d93303e471fea270.css.map


二进制
dist/static/img/checkNo.7203312.png


二进制
dist/static/img/checkedIs.a486b96.png


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/0.f867c3655b998d260981.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.060a657fa8d63b5df8be.js


+ 1 - 0
dist/static/js/manifest.fed1de90e0941b3846db.js

@@ -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}}([]);

二进制
src/assets/icon/checkNo.png


二进制
src/assets/icon/checkedIs.png


二进制
src/assets/icon/expand.png


二进制
src/assets/icon/fold.png


+ 18 - 16
src/components/pages/Grid.vue

@@ -338,11 +338,12 @@ export default {
       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,15 +832,15 @@ export default {
      * 参数三 : content 行内容
      * 参数四 : next 下一行
      */
-            //      messageInfo: {
-            //   sendId: userid,
-            //   moveIndex1: id, //第几个网格
-            //   moveIndex2: moveIndex, //移动到的网格
-            //   type: type, //类型
-            //   data: content, //内容
-            //   docId: roomid, //文档id
-            //   // pageId: US.pageId, //当前页面id
-            // },
+    //      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": [
@@ -859,7 +860,7 @@ export default {
       };
       return _data;
     },
-    mindInfo2(id, type, content, navid, userid, roomid, moveIndex) {
+    mindInfo2(id, type, content, navid, userid, roomid, moveIndex,moveData) {
       var _data = {
         "us.mindNetwork": [
           {
@@ -874,14 +875,14 @@ export default {
               pageId: top.US.pageId, //当前页面id
             },
           },
-           {
+          {
             sendId: userid, //发送人id
             receiveId: roomid, //文件id
             type: navid, //消息类型
             messageInfo: {
               id: moveIndex, //操作ID
               type: type, //类型
-              content: content, //内容
+              content: moveData, //内容
               docId: roomid, //文档id
               pageId: top.US.pageId, //当前页面id
             },
@@ -959,7 +960,7 @@ export default {
         e.data.info.docId == _this.RoomInfo.id &&
         !(e.data.sendId == _this.userinfo.userid)
       ) {
-        _this.data[e.data.info.id] = e.data.info.data;
+        _this.data[e.data.info.id] = e.data.info.content;
       } else if (
         e.data.type &&
         e.data.type == "mindNetwork_delete" &&
@@ -973,7 +974,8 @@ export default {
         e.data.info.docId == _this.RoomInfo.id &&
         !(e.data.sendId == _this.userinfo.userid)
       ) {
-        var newItems = [...JSON.parse(JSON.stringify(_this.data))]; //拷贝一份数据进行交换操作。
+        _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];
       }

文件差异内容过多而无法显示
+ 377 - 170
src/components/pages/addCourse.vue


部分文件因为文件数量过多而无法显示