lsc 2 years ago
parent
commit
8d3a0aa99d

+ 1 - 5
dist/index.html

@@ -25,8 +25,4 @@
       height: 100%;
       width: 100%;
       background: #e6eaf0;
-<<<<<<< HEAD
-    }</style><link href=./static/css/app.e18b380ffe12a1e9238578cc226690b7.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.fab7effc7bf6d4290017.js></script><script type=text/javascript src=./static/js/app.21a203d5379d7879a174.js></script></body></html>
-=======
-    }</style><link href=./static/css/app.8b551a1a722d1c4514a8cbeb984500f0.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.fab7effc7bf6d4290017.js></script><script type=text/javascript src=./static/js/app.074db39c08ace06176e3.js></script></body></html>
->>>>>>> 0492fab71e28582708e63632c866e9d42a27f573
+    }</style><link href=./static/css/app.8b2437cc3bb6d19a869bf4969ecdebb3.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.ec6917f8087437e124be.js></script><script type=text/javascript src=./static/js/app.21f77623029bdc5a26e0.js></script></body></html>

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


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


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


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


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


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


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


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


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


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


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


+ 1 - 6
dist/static/js/manifest.ce85731d7c1d072ed0aa.js

@@ -1,7 +1,2 @@
-<<<<<<< HEAD:dist/static/js/manifest.ce85731d7c1d072ed0aa.js
 !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}}([]);
-//# sourceMappingURL=manifest.ce85731d7c1d072ed0aa.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:"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
->>>>>>> 0492fab71e28582708e63632c866e9d42a27f573:dist/static/js/manifest.fed1de90e0941b3846db.js
+//# sourceMappingURL=manifest.ce85731d7c1d072ed0aa.js.map

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


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

@@ -1,7 +0,0 @@
-<<<<<<< HEAD:dist/static/js/manifest.ce85731d7c1d072ed0aa.js
-!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}}([]);
-//# sourceMappingURL=manifest.ce85731d7c1d072ed0aa.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:"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
->>>>>>> 0492fab71e28582708e63632c866e9d42a27f573:dist/static/js/manifest.fed1de90e0941b3846db.js

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


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


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


+ 21 - 17
src/components/pages/Grid.vue

@@ -20,14 +20,14 @@
       <el-button type="text">成员</el-button>
       <el-button type="text" v-if="RoomInfo.userid == userid" @click="dismiss">解散房间</el-button>
     </div>
-    <!-- <draggable
+    <draggable
       element="div"
       v-model="data"
       class="g_body"
       @change="handleDraggableFormItemChange"
       @end="dragEnd"
       :move="checkMove"
-    >-->
+    >
     <div
       v-for="(item,index) in data"
       :key="index"
@@ -87,7 +87,7 @@
         @click="check(index,3)"
       ></el-image>
     </div>
-    <!-- </draggable> -->
+    </draggable>
     <el-dialog
       title="上传文件"
       :visible.sync="dialogVisible"
@@ -309,6 +309,9 @@ export default {
   methods: {
     handleDragStart(e, items) {
       this.dragging = items; //开始拖动时,暂时保存当前拖动的数据。
+      if(!this.data[items]){
+        return;
+      }
     },
     handleDragEnd(e, items) {
        e.dataTransfer.effectAllowed = "move"; //为需要移动的元素设置dragstart事件
@@ -340,24 +343,25 @@ export default {
       // this.updateRoomData();
     },
     handleDraggableFormItemChange(val) {
-      console.log(val);
-      console.log(this.data[val.moved.newIndex]);
-      console.log(this.data[val.moved.oldIndex]);
+      // console.log(val);
+      // console.log(this.data[val.moved.newIndex]);
+      // console.log(this.data[val.moved.oldIndex]);
     },
     dragEnd(val) {
-      if (this.data[val.newIndex].userid != this.userinfo.userid) {
-        this.$message.error("不是您上传的作品不能拖动哦");
-        return;
-      }
-      this.updateRoomData();
+      // if (this.data[val.newIndex].userid != this.userinfo.userid) {
+      //   this.$message.error("不是您上传的作品不能拖动哦");
+      //   return;
+      // }
+      // this.updateRoomData();
     },
     checkMove(evt) {
-      console.log(evt);
-      if (evt.draggedContext.element.userid != this.userinfo.userid) {
-        return false;
-      } else {
-        return true;
-      }
+      // console.log(evt);
+      // if (evt.draggedContext.element.userid != this.userinfo.userid) {
+      //   return false;
+      // } else {
+      //   return true;
+      // }
+      return false;
     },
     copy() {
       this.copyText =

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