jwyu 1 year ago
parent
commit
406b6a01d7

+ 2 - 1
src/views/dataEntry_manage/databaseList.vue

@@ -1429,6 +1429,7 @@ export default {
 				NextEdbInfoId
 			}
 			console.log(params);
+			return
 			dataBaseInterface.classifyMoveSort(params).then(res=>{
 				if(res.Ret===200){
 					this.$message.success('移动成功!')
@@ -1443,7 +1444,7 @@ export default {
 			console.log(node1);
 			
 			// 被拖拽节点对应的 Node、所进入节点对应的 Node、event
-			if((node1.level>node2.level||node1.data.EdbInfoId>0) && (e.target.childNodes[0].className.includes('el-tree-node__content') 
+			if((node1.level>node2.level||(node1.data.EdbInfoId>0&&!node2.data.EdbInfoId)) && (e.target.childNodes[0].className.includes('el-tree-node__content') 
 			|| e.target.className.includes('el-tree-node__content'))) {
 				// console.log(e.target.childNodes[0])
 				e.target.childNodes[0].className.includes('el-tree-node__content') 

+ 1 - 1
src/views/predictEdb_manage/mixins/mixin.js

@@ -180,7 +180,7 @@ export default {
     /* 拖拽覆盖添加背景色 */
     dropMouseOver(node1, node2, e) {
       // 被拖拽节点对应的 Node、所进入节点对应的 Node、event
-			if((node1.level>node2.level||node1.data.EdbInfoId>0) && (e.target.childNodes[0].className.includes('el-tree-node__content') 
+			if((node1.level>node2.level||(node1.data.EdbInfoId>0&&!node2.data.EdbInfoId)) && (e.target.childNodes[0].className.includes('el-tree-node__content') 
 			|| e.target.className.includes('el-tree-node__content'))) {
 				// console.log(e.target.childNodes[0])
 				e.target.childNodes[0].className.includes('el-tree-node__content')