Merge branch 'master' of https://git.nuttyreading.com/wangjinlei/tougao_web into Editorial-Board

src/components/page/GenerateCharts.vue

@@ -3320,13 +3320,13 @@ export default {
         },
 
         async onDrop(event, dataId) {
-            const loading = this.$loading({
+            if (event.dataTransfer.getData('image')) {
+                const loading = this.$loading({
                 lock: true,
                 text: 'Loading...',
                 spinner: 'el-icon-loading',
                 background: 'rgba(0, 0, 0, 0.7)'
             });
-            if (event.dataTransfer.getData('image')) {
                 const draggedImage = JSON.parse(event.dataTransfer.getData('image'));
                 const draggedImageIndex = JSON.parse(event.dataTransfer.getData('imageIndex'));
                 this.$nextTick(async () => {
@@ -3353,7 +3353,13 @@ export default {
                             this.$message.error(err.msg);
                         });
                 });
-            } else {
+            } else if(event.dataTransfer.getData('table')) {
+                const loading = this.$loading({
+                lock: true,
+                text: 'Loading...',
+                spinner: 'el-icon-loading',
+                background: 'rgba(0, 0, 0, 0.7)'
+            });
                 const draggedtable = JSON.parse(event.dataTransfer.getData('table'));
 
                 this.$nextTick(async () => {
@@ -3380,6 +3386,8 @@ export default {
                             this.$message.error(err.msg);
                         });
                 });
+            }else{
+               
             }
         },
         getCommentList() {