From b417dc5912e77367694095411121fddf665c1d7e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期四, 18 四月 2024 17:51:33 +0800
Subject: [PATCH] 修复因样式导致的登出账号后登录页面样式混乱问题
---
src/views/base/modules/materialClassification/EnterpriseTree.vue | 46 +++++++++++++++++++++-------------------------
1 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/src/views/base/modules/materialClassification/EnterpriseTree.vue b/src/views/base/modules/materialClassification/EnterpriseTree.vue
index 210cdd3..a036e1a 100644
--- a/src/views/base/modules/materialClassification/EnterpriseTree.vue
+++ b/src/views/base/modules/materialClassification/EnterpriseTree.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>
@@ -67,23 +67,23 @@
@drop="onDrop"
style="padding:20px"
>
- <svg
- t="1675645955769"
- class="icon"
- viewBox="0 0 1024 1024"
- version="1.1"
- xmlns="http://www.w3.org/2000/svg"
- p-id="1603"
+ <svg
+ t="1675645955769"
+ class="icon"
+ viewBox="0 0 1024 1024"
+ version="1.1"
+ xmlns="http://www.w3.org/2000/svg"
+ p-id="1603"
slot="total"
>
- <path
- d="M916.57 891.61H107.43a21.26 21.26 0 1 1 0-42.52h809.14a21.26 21.26 0 1 1 0 42.52z"
- fill="#666666"
+ <path
+ d="M916.57 891.61H107.43a21.26 21.26 0 1 1 0-42.52h809.14a21.26 21.26 0 1 1 0 42.52z"
+ fill="#666666"
p-id="1604">
</path>
- <path
- d="M202.34 886.57a21.26 21.26 0 0 1-21.26-21.26V280.93a71.35 71.35 0 0 1 51.15-68.43l261.33-77.15a71.35 71.35 0 0 1 91.56 68.43V859a21.26 21.26 0 1 1-42.52 0V203.77a28.83 28.83 0 0 0-37-27.65l-261.33 77.15a29 29 0 0 0-20.67 27.65v584.39a21.26 21.26 0 0 1-21.26 21.26z" fill="#666666" p-id="1605"></path><path d="M831.08 891.61a21.26 21.26 0 0 1-21.26-21.26V491.47a28.7 28.7 0 0 0-18.11-26.77L556 370.26a21.26 21.26 0 1 1 15.81-39.47l235.76 94.44a71 71 0 0 1 44.82 66.24v378.88a21.26 21.26 0 0 1-21.31 21.26zM474.09 453.27H270a21.26 21.26 0 1 1 0-42.52h204.09a21.26 21.26 0 1 1 0 42.52zM474.09 551H270a21.26 21.26 0 1 1 0-42.52h204.09a21.26 21.26 0 1 1 0 42.52zM474.09 659.9H270a21.26 21.26 0 1 1 0-42.52h204.09a21.26 21.26 0 1 1 0 42.52z" fill="#666666" p-id="1606"></path><path d="M755.86 597.29H617.31a21.26 21.26 0 1 1 0-42.52h138.55a21.26 21.26 0 1 1 0 42.52zM755.86 697.47H617.31a21.26 21.26 0 1 1 0-42.52h138.55a21.26 21.26 0 1 1 0 42.52z"
- fill="#666666"
+ <path
+ d="M202.34 886.57a21.26 21.26 0 0 1-21.26-21.26V280.93a71.35 71.35 0 0 1 51.15-68.43l261.33-77.15a71.35 71.35 0 0 1 91.56 68.43V859a21.26 21.26 0 1 1-42.52 0V203.77a28.83 28.83 0 0 0-37-27.65l-261.33 77.15a29 29 0 0 0-20.67 27.65v584.39a21.26 21.26 0 0 1-21.26 21.26z" fill="#666666" p-id="1605"></path><path d="M831.08 891.61a21.26 21.26 0 0 1-21.26-21.26V491.47a28.7 28.7 0 0 0-18.11-26.77L556 370.26a21.26 21.26 0 1 1 15.81-39.47l235.76 94.44a71 71 0 0 1 44.82 66.24v378.88a21.26 21.26 0 0 1-21.31 21.26zM474.09 453.27H270a21.26 21.26 0 1 1 0-42.52h204.09a21.26 21.26 0 1 1 0 42.52zM474.09 551H270a21.26 21.26 0 1 1 0-42.52h204.09a21.26 21.26 0 1 1 0 42.52zM474.09 659.9H270a21.26 21.26 0 1 1 0-42.52h204.09a21.26 21.26 0 1 1 0 42.52z" fill="#666666" p-id="1606"></path><path d="M755.86 597.29H617.31a21.26 21.26 0 1 1 0-42.52h138.55a21.26 21.26 0 1 1 0 42.52zM755.86 697.47H617.31a21.26 21.26 0 1 1 0-42.52h138.55a21.26 21.26 0 1 1 0 42.52z"
+ fill="#666666"
p-id="1607">
</path>
</svg>
@@ -364,12 +364,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;
@@ -382,9 +382,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({
@@ -397,7 +397,7 @@
}
});
}
-
+
},
changePosition(params){
postAction(this.url.dropAndChangeNode,params).then(res=>{
@@ -503,10 +503,6 @@
.ant-modal-cust-warp .ant-modal-content {
height: 90% !important;
overflow-y: hidden;
-}
-
-#app .desktop {
- height: auto !important;
}
/** Button鎸夐挳闂磋窛 */
--
Gitblit v1.9.3