diff --git a/src/api/index.js b/src/api/index.js index 8e94511..a682184 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -19,8 +19,8 @@ const service = axios.create({ // baseURL: 'https://submission.tmrjournals.com/', //正式 记得切换 // baseURL: 'http://www.tougao.com/', //测试本地 记得切换 // baseURL: 'http://192.168.110.110/tougao/public/index.php/', - // baseURL: '/api', //本地 - baseURL: '/', //正式 + baseURL: '/api', //本地 + // baseURL: '/', //正式 }); diff --git a/src/components/page/GenerateCharts.vue b/src/components/page/GenerateCharts.vue index fc5f5c1..c6cb09e 100644 --- a/src/components/page/GenerateCharts.vue +++ b/src/components/page/GenerateCharts.vue @@ -3320,13 +3320,14 @@ 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 +3354,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 +3387,8 @@ export default { this.$message.error(err.msg); }); }); + }else{ + } }, getCommentList() {