From 017886be8a6c07ccaaf6300b8c7652ddbd41d734 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 15 一月 2024 16:50:08 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/modules/shift/ShiftSystem.vue | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/views/mdc/base/modules/shift/ShiftSystem.vue b/src/views/mdc/base/modules/shift/ShiftSystem.vue
index 3d53d7d..7197ad4 100644
--- a/src/views/mdc/base/modules/shift/ShiftSystem.vue
+++ b/src/views/mdc/base/modules/shift/ShiftSystem.vue
@@ -1,11 +1,11 @@
<template>
- <a-card :bordered="false" class="shift_system">
+ <div class="shift_system">
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
<a-button type="primary" @click="handleAdd" icon="plus">鏂板</a-button>
</div>
<!-- table鍖哄煙-begin -->
- <div>
+ <div style="flex: 1;overflow: auto">
<a-table ref="table" bordered size="middle" rowKey="id" :columns="columns"
:dataSource="dataSource" :pagination="false" :loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:'radio'}">
@@ -55,7 +55,7 @@
</div>
<shift-system-model ref="modalForm" @ok="modalFormOk"></shift-system-model>
- </a-card>
+ </div>
</template>
<script>
@@ -195,34 +195,35 @@
</script>
<style lang="less" scoped>
+ .shift_system{
+ overflow: auto;
+ display: flex;
+ flex-direction: column;
+ }
+
@media screen and (min-width: 1920px){
.shift_system{
height: 748px!important;
- overflow: scroll;
}
}
@media screen and (min-width: 1680px) and (max-width: 1920px){
.shift_system{
height: 748px!important;
- overflow: scroll;
}
}
@media screen and (min-width: 1400px) and (max-width: 1680px){
.shift_system{
height: 600px!important;
- overflow: scroll;
}
}
@media screen and (min-width: 1280px) and (max-width: 1400px){
.shift_system{
height: 501px!important;
- overflow: scroll;
}
}
@media screen and (max-width: 1280px){
.shift_system{
height: 501px!important;
- overflow: scroll;
}
}
</style>
--
Gitblit v1.9.3