From b417dc5912e77367694095411121fddf665c1d7e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期四, 18 四月 2024 17:51:33 +0800
Subject: [PATCH] 修复因样式导致的登出账号后登录页面样式混乱问题
---
src/views/base/modules/factory/FactoryLeft.vue | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/views/base/modules/factory/FactoryLeft.vue b/src/views/base/modules/factory/FactoryLeft.vue
index 3c8d519..993e89b 100644
--- a/src/views/base/modules/factory/FactoryLeft.vue
+++ b/src/views/base/modules/factory/FactoryLeft.vue
@@ -44,8 +44,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>
@@ -81,7 +81,7 @@
rowKey="id"
:draggable="true"
@drop="onDrop"
- style="padding:20px"
+ style="padding:20px"
>
<svg slot="total" t="1675649233812" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10262"><path d="M839.91992188 863.47460938c-19.42382813 0-35.15625-15.73242188-35.15625001-35.15625001V584.94921875c0-19.42382813-15.73242188-35.15625-35.15625-35.15625H556.6484375v272.19726563c0 19.42382813-15.73242188 35.15625-35.15625 35.15624999s-35.15625-15.73242188-35.15625-35.15625v-533.49609375c0-19.42382813-15.73242188-35.15625-35.15625-35.15625H254.04101562c-19.42382813 0-35.15625 15.73242188-35.15624999 35.15625v533.40820313c0 19.42382813-15.73242188 35.15625-35.15625 35.15625s-35.15625-15.73242188-35.15625-35.15625V288.49414062c0-58.18359375 47.28515625-105.46875 105.46874999-105.46874999h197.13867188c58.18359375 0 105.46875 47.28515625 105.46875 105.46875V479.48046875h212.95898438c58.18359375 0 105.46875 47.28515625 105.46874999 105.46875v243.36914063c0 19.42382813-15.73242188 35.15625-35.15625 35.15624999z" p-id="10263" fill="#8a8a8a"></path><path d="M382.53710937 414.96875h-59.94140624c-9.66796875 0-17.578125-7.91015625-17.578125-17.578125v-59.94140625c0-9.66796875 7.91015625-17.578125 17.578125-17.578125h59.94140625c9.66796875 0 17.578125 7.91015625 17.578125 17.578125v59.94140625c0 9.66796875-7.91015625 17.578125-17.578125 17.578125z m17.57812501 140.625v-59.94140625c0-9.66796875-7.91015625-17.578125-17.578125-17.578125h-59.94140625c-9.66796875 0-17.578125 7.91015625-17.578125 17.578125v59.94140625c0 9.66796875 7.91015625 17.578125 17.578125 17.578125h59.94140625c9.66796875 0 17.578125-7.91015625 17.578125-17.578125zM875.42773438 876.74609375H149.1875c-16.96289063 0-30.76171875-13.79882813-30.76171875-30.76171875s13.79882813-30.76171875 30.76171875-30.76171875h726.24023438c16.96289063 0 30.76171875 13.79882813 30.76171875 30.76171875s-13.79882813 30.76171875-30.76171875 30.76171875zM732.4296875 762.13671875H629.86132813c-16.96289063 0-30.76171875-13.79882813-30.76171876-30.76171875s13.79882813-30.76171875 30.76171875-30.76171875h102.48046876c16.96289063 0 30.76171875 13.79882813 30.76171875 30.76171875s-13.7109375 30.76171875-30.67382813 30.76171875z m0-105.46875H629.86132813c-16.96289063 0-30.76171875-13.79882813-30.76171876-30.76171875s13.79882813-30.76171875 30.76171875-30.76171875h102.48046876c16.96289063 0 30.76171875 13.79882813 30.76171875 30.76171875s-13.7109375 30.76171875-30.67382813 30.76171875z" p-id="10264" fill="#8a8a8a"></path></svg>
</a-tree>
@@ -356,12 +356,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;
@@ -374,9 +374,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({
@@ -389,7 +389,7 @@
}
});
}
-
+
},
changePosition(params){
postAction(this.url.dropAndChangeNode,params).then(res=>{
@@ -521,10 +521,6 @@
.ant-modal-cust-warp .ant-modal-content {
height: 90% !important;
overflow-y: hidden;
-}
-
-#app .desktop {
- height: auto !important;
}
/** Button鎸夐挳闂磋窛 */
--
Gitblit v1.9.3