From b417dc5912e77367694095411121fddf665c1d7e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期四, 18 四月 2024 17:51:33 +0800
Subject: [PATCH] 修复因样式导致的登出账号后登录页面样式混乱问题
---
src/views/base/modules/depart/DepartTree.vue | 32 ++++++++++++++------------------
1 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/src/views/base/modules/depart/DepartTree.vue b/src/views/base/modules/depart/DepartTree.vue
index 5be8ef4..d3c42c9 100644
--- a/src/views/base/modules/depart/DepartTree.vue
+++ b/src/views/base/modules/depart/DepartTree.vue
@@ -39,8 +39,8 @@
@click="refreshTree"
>鍒锋柊</a-menu-item>
<a-menu-item
- type="primary"
- key="4"
+ type="primary"
+ key="4"
@click="showDragRegulation"
:style="getEnterpriseOptionStyle('2')"
>缁撶偣鎷栨嫿瑙勫垯</a-menu-item>
@@ -75,7 +75,7 @@
rowKey="id"
:draggable="true"
@drop="onDrop"
- style="padding:20px"
+ style="padding:20px"
>
<svg slot="total" t="1675650355896" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="17715"><path d="M512 128 128 326.4 896 326.4Z" p-id="17716" fill="#707070"></path><path d="M128 832l768 0 0 64-768 0 0-64Z" p-id="17717" fill="#707070"></path><path d="M230.4 384l0 384c0 19.2 12.8 32 32 32s32-12.8 32-32L294.4 384c0-19.2-12.8-32-32-32S230.4 364.8 230.4 384z" p-id="17718" fill="#707070"></path><path d="M390.4 384l0 384c0 19.2 12.8 32 32 32s32-12.8 32-32L454.4 384c0-19.2-12.8-32-32-32S390.4 364.8 390.4 384z" p-id="17719" fill="#707070"></path><path d="M569.6 384l0 384c0 19.2 12.8 32 32 32s32-12.8 32-32L633.6 384c0-19.2-12.8-32-32-32S569.6 364.8 569.6 384z" p-id="17720" fill="#707070"></path><path d="M736 384l0 384c0 19.2 12.8 32 32 32s32-12.8 32-32L800 384c0-19.2-12.8-32-32-32S736 364.8 736 384z" p-id="17721" fill="#707070"></path></svg>
</a-tree>
@@ -163,7 +163,7 @@
getEnterpriseList:"/base/enterprise/mapList",
dropAndChangeNode: '/base/depart/dropAndChangeNode',
checkPositionInfo: '/base/depart/checkPositionInfo',
-
+
},
searchValue: '',
dataList: [],
@@ -173,9 +173,9 @@
currSelected: {},
hiding: false,
dragRugulationVisable:false
-
+
}
-
+
},
created() {
this.cardLoading=true;
@@ -352,12 +352,12 @@
});
}
})
- }
+ }
// else if((posStatus==1||posStatus==-1)&&dropedKey==changeParentId){
- // this.$message.warning("涓嶅彲浠ュ皢鐖跺叕鍙告嫋鑷冲瓙鍏徃鍒�");
+ // this.$message.warning("涓嶅彲浠ュ皢鐖跺叕鍙告嫋鑷冲瓙鍏徃鍒�");
// }
else if((posStatus==1&&oldPosePre==newPosPre&&realPose+1==orgPos)){
- this.$message.warning("璋冩暣鍓嶅悗鏃犲尯鍒�,璇烽噸鏂拌皟鏁�");
+ this.$message.warning("璋冩暣鍓嶅悗鏃犲尯鍒�,璇烽噸鏂拌皟鏁�");
}
else if(posStatus==1){
var that = this;
@@ -370,9 +370,9 @@
that.changePosition(params);
}
});
-
+
}else if(posStatus==-1&&oldPosePre==newPosPre&&realPose==orgPos+1){
- this.$message.warning("璋冩暣鍓嶅悗鏃犲尯鍒�,璇烽噸鏂拌皟鏁�");
+ this.$message.warning("璋冩暣鍓嶅悗鏃犲尯鍒�,璇烽噸鏂拌皟鏁�");
}else if(posStatus==-1){
var that = this;
this.$confirm({
@@ -385,7 +385,7 @@
}
});
}
-
+
},
changePosition(params){
postAction(this.url.dropAndChangeNode,params).then(res=>{
@@ -446,7 +446,7 @@
handler(val){
this.parentId=''
this.queryTreeData(val.enterpriseId,val.version)
-
+
}
},
'departInfo.enterpriseId'(newval,oldval){
@@ -513,10 +513,6 @@
overflow-y: hidden;
}
-#app .desktop {
- height: auto !important;
-}
-
/** Button鎸夐挳闂磋窛 */
.ant-btn {
margin-left: 3px;
@@ -532,6 +528,6 @@
right: 0;
background: #fff;
border-radius: 0 0 2px 2px;
-
+
}
</style>
--
Gitblit v1.9.3