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 +-- src/views/base/modules/warehouse/WarehouseFactoryModelLeft.vue | 6 - src/views/eam/modules/precisionParameter/PrecisionParametersCategoryLeft.vue | 4 src/views/system/DepartListSync.vue | 4 src/views/spare/modules/sparePart/SparePartCategoryLeft.vue | 4 src/views/eam/depart/DepartManage.vue | 4 src/views/base/modules/workcenter/BorrowUserLeft.vue | 6 - src/views/mdc/base/modules/DepartList/DepartListTree/DepartTree.vue | 4 src/views/system/DepartList1.vue | 4 src/views/base/modules/client/ClientCategoryLeft.vue | 3 src/views/eam/modules/equipment/EquipmentStructureLeft.vue | 4 src/views/mdc/base/DepartList.vue | 4 src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue | 4 src/views/spare/modules/sparePartInventory/SparePartCategoryLeft.vue | 4 src/views/base/modules/workcenter/WorkCenterTree.vue | 8 - src/views/eam/modules/equipment/EquipmentCategoryLeft.vue | 4 src/views/mdc/base/ProductionManager.vue | 4 src/views/base/modules/productionLineWarehouse/WarehouseFactoryModelLeft.vue | 6 - src/views/eam/modules/shutdownCause/ShutdownCauseCategoryLeft.vue | 4 src/views/base/modules/supplier/SupplierCategoryLeft.vue | 4 src/views/eam/modules/site/SiteAreaLineManagerLeft.vue | 4 src/views/eam/modules/inspectionProject/InspectionProjectCategoryLeft.vue | 4 src/views/eam/modules/siteAreaLine/SiteAreaLineLeft.vue | 4 src/views/eam/modules/faultType/FaultTypeLeft.vue | 4 src/views/eam/modules/processParameters/ProcessParametersCategoryLeft.vue | 4 src/views/eam/modules/equipmentCategory/EquipmentCategoryLeft.vue | 4 src/views/eam/modules/faultCause/FaultCauseLeft.vue | 4 src/views/base/modules/depart/DepartTree.vue | 32 ++--- src/views/system/ProductionManager.vue | 4 src/views/eam/modules/transferMethod/TransferMethodCategoryLeft.vue | 4 src/views/base/modules/warehouse/WarehouseDepartModelLeft.vue | 6 - src/views/mdc/common/BaseTree.vue | 4 src/views/eam/modules/maintenanceProject/MaintenanceProjectCategoryLeft.vue | 4 src/views/system/DepartList.vue | 4 src/views/base/modules/materialClassification/EnterpriseTree.vue | 46 ++++----- src/views/base/modules/enterprise/EnterpriseTree.vue | 46 ++++----- src/views/eam/modules/deteriorationFactor/DeteriorationFactorCategoryLeft.vue | 4 37 files changed, 71 insertions(+), 218 deletions(-) diff --git a/src/views/base/modules/client/ClientCategoryLeft.vue b/src/views/base/modules/client/ClientCategoryLeft.vue index cc00b04..1e8bc47 100644 --- a/src/views/base/modules/client/ClientCategoryLeft.vue +++ b/src/views/base/modules/client/ClientCategoryLeft.vue @@ -421,9 +421,6 @@ overflow-y: hidden; } -#app .desktop { - height: auto !important; -} /** Button鎸夐挳闂磋窛 */ .ant-btn { 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> diff --git a/src/views/base/modules/enterprise/EnterpriseTree.vue b/src/views/base/modules/enterprise/EnterpriseTree.vue index b14c706..b00e9e0 100644 --- a/src/views/base/modules/enterprise/EnterpriseTree.vue +++ b/src/views/base/modules/enterprise/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鎸夐挳闂磋窛 */ 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鎸夐挳闂磋窛 */ 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鎸夐挳闂磋窛 */ diff --git a/src/views/base/modules/productionLineWarehouse/WarehouseFactoryModelLeft.vue b/src/views/base/modules/productionLineWarehouse/WarehouseFactoryModelLeft.vue index 5115841..7ec58a3 100644 --- a/src/views/base/modules/productionLineWarehouse/WarehouseFactoryModelLeft.vue +++ b/src/views/base/modules/productionLineWarehouse/WarehouseFactoryModelLeft.vue @@ -111,7 +111,7 @@ this.currSelected = {}; this.selectedKeys = []; this.fristSelectKeys=[]; - + }, onClearSelectedAnother(){ this.hiding = true; @@ -271,10 +271,6 @@ .ant-modal-cust-warp .ant-modal-content { height: 90% !important; overflow-y: hidden; -} - -#app .desktop { - height: auto !important; } /** Button鎸夐挳闂磋窛 */ diff --git a/src/views/base/modules/supplier/SupplierCategoryLeft.vue b/src/views/base/modules/supplier/SupplierCategoryLeft.vue index 06c0211..220a072 100644 --- a/src/views/base/modules/supplier/SupplierCategoryLeft.vue +++ b/src/views/base/modules/supplier/SupplierCategoryLeft.vue @@ -415,10 +415,6 @@ overflow-y: hidden; } -#app .desktop { - height: auto !important; -} - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px; diff --git a/src/views/base/modules/warehouse/WarehouseDepartModelLeft.vue b/src/views/base/modules/warehouse/WarehouseDepartModelLeft.vue index 222df4d..d4decb4 100644 --- a/src/views/base/modules/warehouse/WarehouseDepartModelLeft.vue +++ b/src/views/base/modules/warehouse/WarehouseDepartModelLeft.vue @@ -115,7 +115,7 @@ this.currSelected = {}; this.selectedKeys = []; this.fristSelectKeys=[]; - + }, onClearSelectedAnother(){ this.hiding = true; @@ -277,10 +277,6 @@ .ant-modal-cust-warp .ant-modal-content { height: 90% !important; overflow-y: hidden; -} - -#app .desktop { - height: auto !important; } /** Button鎸夐挳闂磋窛 */ diff --git a/src/views/base/modules/warehouse/WarehouseFactoryModelLeft.vue b/src/views/base/modules/warehouse/WarehouseFactoryModelLeft.vue index 5115841..7ec58a3 100644 --- a/src/views/base/modules/warehouse/WarehouseFactoryModelLeft.vue +++ b/src/views/base/modules/warehouse/WarehouseFactoryModelLeft.vue @@ -111,7 +111,7 @@ this.currSelected = {}; this.selectedKeys = []; this.fristSelectKeys=[]; - + }, onClearSelectedAnother(){ this.hiding = true; @@ -271,10 +271,6 @@ .ant-modal-cust-warp .ant-modal-content { height: 90% !important; overflow-y: hidden; -} - -#app .desktop { - height: auto !important; } /** Button鎸夐挳闂磋窛 */ diff --git a/src/views/base/modules/workcenter/BorrowUserLeft.vue b/src/views/base/modules/workcenter/BorrowUserLeft.vue index f117f3e..03cfc88 100644 --- a/src/views/base/modules/workcenter/BorrowUserLeft.vue +++ b/src/views/base/modules/workcenter/BorrowUserLeft.vue @@ -117,7 +117,7 @@ this.currSelected = {}; this.selectedKeys = []; this.fristSelectKeys=[]; - + }, onClearSelectedAnother(){ this.hiding = true; @@ -271,10 +271,6 @@ .ant-modal-cust-warp .ant-modal-content { height: 90% !important; overflow-y: hidden; -} - -#app .desktop { - height: auto !important; } /** Button鎸夐挳闂磋窛 */ diff --git a/src/views/base/modules/workcenter/WorkCenterTree.vue b/src/views/base/modules/workcenter/WorkCenterTree.vue index 76a93f3..35a522e 100644 --- a/src/views/base/modules/workcenter/WorkCenterTree.vue +++ b/src/views/base/modules/workcenter/WorkCenterTree.vue @@ -89,7 +89,7 @@ @select="onSelect" @expand="onExpand" rowKey="id" - 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> @@ -123,7 +123,7 @@ loading: false, treeDataSource: [], selectedKeys: [], - expandedKeys: [], + expandedKeys: [], url: { getUsableEnterpriseList:'/base/enterprise/getUsableList', loadTree: '/base/factoryModel/loadTree', //鏍规嵁浼佷笟id鏌ュ伐鍘傛爲 @@ -377,10 +377,6 @@ .ant-modal-cust-warp .ant-modal-content { height: 90% !important; overflow-y: hidden; -} - -#app .desktop { - height: auto !important; } /** Button鎸夐挳闂磋窛 */ diff --git a/src/views/eam/depart/DepartManage.vue b/src/views/eam/depart/DepartManage.vue index b68ec77..2ae337c 100644 --- a/src/views/eam/depart/DepartManage.vue +++ b/src/views/eam/depart/DepartManage.vue @@ -393,10 +393,6 @@ overflow-y: hidden; } -#app .desktop { - height: auto !important; -} - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px; diff --git a/src/views/eam/modules/deteriorationFactor/DeteriorationFactorCategoryLeft.vue b/src/views/eam/modules/deteriorationFactor/DeteriorationFactorCategoryLeft.vue index e766a50..f8cf24b 100644 --- a/src/views/eam/modules/deteriorationFactor/DeteriorationFactorCategoryLeft.vue +++ b/src/views/eam/modules/deteriorationFactor/DeteriorationFactorCategoryLeft.vue @@ -430,10 +430,6 @@ overflow-y: hidden; } -#app .desktop { - height: auto !important; -} - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px; diff --git a/src/views/eam/modules/equipment/EquipmentCategoryLeft.vue b/src/views/eam/modules/equipment/EquipmentCategoryLeft.vue index cbe5b81..75b0b8e 100644 --- a/src/views/eam/modules/equipment/EquipmentCategoryLeft.vue +++ b/src/views/eam/modules/equipment/EquipmentCategoryLeft.vue @@ -287,10 +287,6 @@ overflow-y: hidden; } -#app .desktop { - height: auto !important; -} - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px; diff --git a/src/views/eam/modules/equipment/EquipmentStructureLeft.vue b/src/views/eam/modules/equipment/EquipmentStructureLeft.vue index d4e5b7b..274f35a 100644 --- a/src/views/eam/modules/equipment/EquipmentStructureLeft.vue +++ b/src/views/eam/modules/equipment/EquipmentStructureLeft.vue @@ -462,10 +462,6 @@ overflow-y: hidden; } -#app .desktop { - height: auto !important; -} - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px; diff --git a/src/views/eam/modules/equipmentCategory/EquipmentCategoryLeft.vue b/src/views/eam/modules/equipmentCategory/EquipmentCategoryLeft.vue index f8e4bbe..2eda236 100644 --- a/src/views/eam/modules/equipmentCategory/EquipmentCategoryLeft.vue +++ b/src/views/eam/modules/equipmentCategory/EquipmentCategoryLeft.vue @@ -366,10 +366,6 @@ overflow-y: hidden; } -#app .desktop { - height: auto !important; -} - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px; diff --git a/src/views/eam/modules/faultCause/FaultCauseLeft.vue b/src/views/eam/modules/faultCause/FaultCauseLeft.vue index c292f3f..82b5a9e 100644 --- a/src/views/eam/modules/faultCause/FaultCauseLeft.vue +++ b/src/views/eam/modules/faultCause/FaultCauseLeft.vue @@ -287,10 +287,6 @@ overflow-y: hidden; } -#app .desktop { - height: auto !important; -} - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px; diff --git a/src/views/eam/modules/faultType/FaultTypeLeft.vue b/src/views/eam/modules/faultType/FaultTypeLeft.vue index 8a2a8e4..44d5110 100644 --- a/src/views/eam/modules/faultType/FaultTypeLeft.vue +++ b/src/views/eam/modules/faultType/FaultTypeLeft.vue @@ -287,10 +287,6 @@ overflow-y: hidden; } -#app .desktop { - height: auto !important; -} - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px; diff --git a/src/views/eam/modules/inspectionProject/InspectionProjectCategoryLeft.vue b/src/views/eam/modules/inspectionProject/InspectionProjectCategoryLeft.vue index 67f91f4..01263ce 100644 --- a/src/views/eam/modules/inspectionProject/InspectionProjectCategoryLeft.vue +++ b/src/views/eam/modules/inspectionProject/InspectionProjectCategoryLeft.vue @@ -430,10 +430,6 @@ overflow-y: hidden; } -#app .desktop { - height: auto !important; -} - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px; diff --git a/src/views/eam/modules/maintenanceProject/MaintenanceProjectCategoryLeft.vue b/src/views/eam/modules/maintenanceProject/MaintenanceProjectCategoryLeft.vue index 777bd95..2d16e52 100644 --- a/src/views/eam/modules/maintenanceProject/MaintenanceProjectCategoryLeft.vue +++ b/src/views/eam/modules/maintenanceProject/MaintenanceProjectCategoryLeft.vue @@ -430,10 +430,6 @@ overflow-y: hidden; } -#app .desktop { - height: auto !important; -} - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px; diff --git a/src/views/eam/modules/precisionParameter/PrecisionParametersCategoryLeft.vue b/src/views/eam/modules/precisionParameter/PrecisionParametersCategoryLeft.vue index 630468d..dca30ef 100644 --- a/src/views/eam/modules/precisionParameter/PrecisionParametersCategoryLeft.vue +++ b/src/views/eam/modules/precisionParameter/PrecisionParametersCategoryLeft.vue @@ -430,10 +430,6 @@ overflow-y: hidden; } -#app .desktop { - height: auto !important; -} - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px; diff --git a/src/views/eam/modules/processParameters/ProcessParametersCategoryLeft.vue b/src/views/eam/modules/processParameters/ProcessParametersCategoryLeft.vue index b7ed5ae..70fef43 100644 --- a/src/views/eam/modules/processParameters/ProcessParametersCategoryLeft.vue +++ b/src/views/eam/modules/processParameters/ProcessParametersCategoryLeft.vue @@ -430,10 +430,6 @@ overflow-y: hidden; } -#app .desktop { - height: auto !important; -} - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px; diff --git a/src/views/eam/modules/shutdownCause/ShutdownCauseCategoryLeft.vue b/src/views/eam/modules/shutdownCause/ShutdownCauseCategoryLeft.vue index fdb0529..9af99ca 100644 --- a/src/views/eam/modules/shutdownCause/ShutdownCauseCategoryLeft.vue +++ b/src/views/eam/modules/shutdownCause/ShutdownCauseCategoryLeft.vue @@ -435,10 +435,6 @@ overflow-y: hidden; } -#app .desktop { - height: auto !important; -} - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px; diff --git a/src/views/eam/modules/site/SiteAreaLineManagerLeft.vue b/src/views/eam/modules/site/SiteAreaLineManagerLeft.vue index 6da1fec..1bb94c1 100644 --- a/src/views/eam/modules/site/SiteAreaLineManagerLeft.vue +++ b/src/views/eam/modules/site/SiteAreaLineManagerLeft.vue @@ -329,10 +329,6 @@ overflow-y: hidden; } -#app .desktop { - height: auto !important; -} - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px; diff --git a/src/views/eam/modules/siteAreaLine/SiteAreaLineLeft.vue b/src/views/eam/modules/siteAreaLine/SiteAreaLineLeft.vue index f72d9fe..8e9c21e 100644 --- a/src/views/eam/modules/siteAreaLine/SiteAreaLineLeft.vue +++ b/src/views/eam/modules/siteAreaLine/SiteAreaLineLeft.vue @@ -287,10 +287,6 @@ overflow-y: hidden; } -#app .desktop { - height: auto !important; -} - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px; diff --git a/src/views/eam/modules/transferMethod/TransferMethodCategoryLeft.vue b/src/views/eam/modules/transferMethod/TransferMethodCategoryLeft.vue index e7e8df8..d131c7d 100644 --- a/src/views/eam/modules/transferMethod/TransferMethodCategoryLeft.vue +++ b/src/views/eam/modules/transferMethod/TransferMethodCategoryLeft.vue @@ -404,10 +404,6 @@ overflow-y: hidden; } -#app .desktop { - height: auto !important; -} - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px; diff --git a/src/views/mdc/base/DepartList.vue b/src/views/mdc/base/DepartList.vue index 6e11b6e..1c49bdf 100644 --- a/src/views/mdc/base/DepartList.vue +++ b/src/views/mdc/base/DepartList.vue @@ -579,10 +579,6 @@ overflow-y: hidden } - #app .desktop { - height: auto !important; - } - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px diff --git a/src/views/mdc/base/ProductionManager.vue b/src/views/mdc/base/ProductionManager.vue index c1ea8b7..9d23140 100644 --- a/src/views/mdc/base/ProductionManager.vue +++ b/src/views/mdc/base/ProductionManager.vue @@ -601,10 +601,6 @@ overflow-y: hidden } - #app .desktop { - height: auto !important; - } - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px diff --git a/src/views/mdc/base/modules/DepartList/DepartListTree/DepartTree.vue b/src/views/mdc/base/modules/DepartList/DepartListTree/DepartTree.vue index f6eb2c5..f128940 100644 --- a/src/views/mdc/base/modules/DepartList/DepartListTree/DepartTree.vue +++ b/src/views/mdc/base/modules/DepartList/DepartListTree/DepartTree.vue @@ -360,10 +360,6 @@ overflow-y: hidden; } - #app .desktop { - height: auto !important; - } - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px; diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue index ff78e6b..a5e511a 100644 --- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue +++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue @@ -477,10 +477,6 @@ overflow-y: hidden; } - #app .desktop { - height: auto !important; - } - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px; diff --git a/src/views/mdc/common/BaseTree.vue b/src/views/mdc/common/BaseTree.vue index c94bd5f..445f539 100644 --- a/src/views/mdc/common/BaseTree.vue +++ b/src/views/mdc/common/BaseTree.vue @@ -349,10 +349,6 @@ overflow-y: hidden; } - #app .desktop { - height: auto !important; - } - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px; diff --git a/src/views/spare/modules/sparePart/SparePartCategoryLeft.vue b/src/views/spare/modules/sparePart/SparePartCategoryLeft.vue index 69db93f..43f31f1 100644 --- a/src/views/spare/modules/sparePart/SparePartCategoryLeft.vue +++ b/src/views/spare/modules/sparePart/SparePartCategoryLeft.vue @@ -422,10 +422,6 @@ overflow-y: hidden; } -#app .desktop { - height: auto !important; -} - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px; diff --git a/src/views/spare/modules/sparePartInventory/SparePartCategoryLeft.vue b/src/views/spare/modules/sparePartInventory/SparePartCategoryLeft.vue index c9a2352..2ff6e81 100644 --- a/src/views/spare/modules/sparePartInventory/SparePartCategoryLeft.vue +++ b/src/views/spare/modules/sparePartInventory/SparePartCategoryLeft.vue @@ -348,10 +348,6 @@ overflow-y: hidden; } -#app .desktop { - height: auto !important; -} - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px; diff --git a/src/views/system/DepartList.vue b/src/views/system/DepartList.vue index fedfc25..cb39524 100644 --- a/src/views/system/DepartList.vue +++ b/src/views/system/DepartList.vue @@ -805,10 +805,6 @@ overflow-y: hidden; } -#app .desktop { - height: auto !important; -} - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px; diff --git a/src/views/system/DepartList1.vue b/src/views/system/DepartList1.vue index de37e4c..693bdb6 100644 --- a/src/views/system/DepartList1.vue +++ b/src/views/system/DepartList1.vue @@ -637,10 +637,6 @@ overflow-y: hidden } - #app .desktop { - height: auto !important; - } - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px diff --git a/src/views/system/DepartListSync.vue b/src/views/system/DepartListSync.vue index 834b469..0092d20 100644 --- a/src/views/system/DepartListSync.vue +++ b/src/views/system/DepartListSync.vue @@ -665,10 +665,6 @@ overflow-y: hidden } - #app .desktop { - height: auto !important; - } - /** Button鎸夐挳闂磋窛 */ .drawer-bootom-button { /*position: absolute;*/ diff --git a/src/views/system/ProductionManager.vue b/src/views/system/ProductionManager.vue index 3d43e95..de94956 100644 --- a/src/views/system/ProductionManager.vue +++ b/src/views/system/ProductionManager.vue @@ -628,10 +628,6 @@ overflow-y: hidden } - #app .desktop { - height: auto !important; - } - /** Button鎸夐挳闂磋窛 */ .ant-btn { margin-left: 3px -- Gitblit v1.9.3