diff --git a/src/views/enterpriseLibrary/personnel/components/PersonnelDetail.vue b/src/views/enterpriseLibrary/personnel/components/PersonnelDetail.vue index 3f5e697..e7fdeef 100644 --- a/src/views/enterpriseLibrary/personnel/components/PersonnelDetail.vue +++ b/src/views/enterpriseLibrary/personnel/components/PersonnelDetail.vue @@ -16,6 +16,11 @@ @handle-personnel-position="handlePersonnelPosition" /> + + + + + + + + .app-container { + height: calc(100vh - 84px); + width: 100%; padding: 24px; + box-sizing: border-box; background: linear-gradient(180deg, #F1F6FF 20%, #E5EFFF 100%); - min-height: 100vh; - overflow-y: auto; + display: flex; + flex-direction: column; + overflow: hidden; + position: relative; + margin: 0; } .content-body { + flex: 1; + overflow-y: auto; + overflow-x: hidden; margin-top: 20px; + min-height: 0; // 确保 flex 子元素可以正确收缩 } .content-row { @@ -180,11 +198,11 @@ export default { .pane-right { background: #fff; border-radius: 16px 16px 16px 16px; - min-height: 600px; + min-height: 400px; box-shadow: 0px 4px 20px 0px rgba(31, 35, 55, 0.1); // border: 1px solid #e8f4ff; padding: 0; - margin-bottom: 20px; + margin-bottom: 10px; flex: 1; min-width: 0; } @@ -193,8 +211,8 @@ export default { display: flex; justify-content: flex-end; align-items: center; - margin-bottom: 20px; gap: 12px; + flex-shrink: 0; } .edit-btn { diff --git a/src/views/enterpriseLibrary/personnel/components/PersonnelForm.vue b/src/views/enterpriseLibrary/personnel/components/PersonnelForm.vue index 41dc8e4..6ac1f66 100644 --- a/src/views/enterpriseLibrary/personnel/components/PersonnelForm.vue +++ b/src/views/enterpriseLibrary/personnel/components/PersonnelForm.vue @@ -21,13 +21,15 @@ - + + - + + .app-container { + height: calc(100vh - 84px); + width: 100%; padding: 24px; + box-sizing: border-box; background: linear-gradient(180deg, #F1F6FF 20%, #E5EFFF 100%); - min-height: 100vh; - overflow-y: auto; + display: flex; + flex-direction: column; + overflow: hidden; position: relative; + margin: 0; &.no-pointer-events { pointer-events: none; @@ -414,7 +421,11 @@ export default { } .content-body { + flex: 1; + overflow-y: auto; + overflow-x: hidden; margin-top: 20px; + min-height: 0; // 确保 flex 子元素可以正确收缩 } .content-row { @@ -429,10 +440,10 @@ export default { .pane-right { background: #fff; border-radius: 16px; - min-height: 600px; + min-height: 400px; box-shadow: 0px 4px 20px 0px rgba(31, 35, 55, 0.1); padding: 0; - margin-bottom: 20px; + margin-bottom: 10px; flex: 1; min-width: 0; } @@ -441,8 +452,8 @@ export default { display: flex; justify-content: flex-end; align-items: center; - margin-bottom: 20px; gap: 12px; + flex-shrink: 0; } .search-btn { diff --git a/src/views/enterpriseLibrary/personnel/components/child/BasicInfo.vue b/src/views/enterpriseLibrary/personnel/components/child/BasicInfo.vue index 0bc245e..6ba33a6 100644 --- a/src/views/enterpriseLibrary/personnel/components/child/BasicInfo.vue +++ b/src/views/enterpriseLibrary/personnel/components/child/BasicInfo.vue @@ -5,76 +5,125 @@ 基本信息 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +