소스 검색

Merge branch 'fix_eltree'

jwyu 11 달 전
부모
커밋
d11e764395
3개의 변경된 파일4개의 추가작업 그리고 16개의 파일을 삭제
  1. 2 9
      src/views/dataEntry_manage/databaseList.vue
  2. 0 6
      src/views/predictEdb_manage/mixins/mixin.js
  3. 2 1
      src/views/predictEdb_manage/predictEdb.vue

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

@@ -65,9 +65,9 @@
 			<!-- <target-tree /> -->
 			<div class="main-left left" id="left" v-show="isMainLeftShow">
 				<div class="tree-cont">
+					<div class="target_tree">
 					<el-tree
 						ref="menuTree"
-						class="target_tree"
 						:data="treeData"
 						node-key="UniqueCode"
 						:props="defaultProp"
@@ -170,6 +170,7 @@
 							</span>
 						</span>
 					</el-tree>
+					</div>
 					<div class="noDepart" @click="addLevelOneHandle" v-if="CanOpClassify&&isEdbBtnShow('editCatalog')">
 						<img
 							src="~@/assets/img/set_m/add_ico.png"
@@ -1505,14 +1506,6 @@ export default {
 				? e.target.childNodes[0].style.backgroundColor = '#409eff' 
 				: e.target.style.backgroundColor = '#409eff';
 			}
-			const dropLine=$('.el-tree__drop-indicator')[0]
-			if(dropLine){
-				// console.log(dropLine);
-				setTimeout(() => {
-					dropLine.style.top=e.layerY+'px'
-					// console.log(e.layerY,dropLine);
-				}, 100);
-			}
 			
 		},
 		/* 拖拽离开/拖拽完成重置背景色 */

+ 0 - 6
src/views/predictEdb_manage/mixins/mixin.js

@@ -189,12 +189,6 @@ export default {
 				? e.target.childNodes[0].style.backgroundColor = '#409eff' 
 				: e.target.style.backgroundColor = '#409eff';
 			}
-      const dropLine=$('.el-tree__drop-indicator')[0]
-			if(dropLine){
-				setTimeout(() => {
-					dropLine.style.top=e.layerY+'px'
-				}, 100);
-			}
     },
 
     /* 拖拽离开/拖拽完成重置背景色 */

+ 2 - 1
src/views/predictEdb_manage/predictEdb.vue

@@ -46,9 +46,9 @@
 						@change="onlyMeHandler">只看我的</el-checkbox>
 				</div>
 				<div class="tree-cont">
+					<div class="target_tree">
 					<el-tree
 						ref="treeRef"
-						class="target_tree"
 						:data="treeData"
 						node-key="UniqueCode"
 						:props="defaultProp"
@@ -148,6 +148,7 @@
 							</span>
 						</span>
 					</el-tree>
+					</div>
 					<div
 						class="noDepart"
 						@click="addLevelOneHandle"