diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index 91e33ba6..5a0b5940 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -90,9 +90,16 @@ 活动时长:
- 分钟
@@ -126,18 +133,34 @@
开始前: - + /> 分钟
开始后: - + /> 分钟
@@ -147,10 +170,18 @@
结束前: - + /> 分钟(提前签退则记为早退) @@ -164,9 +195,11 @@
- 仅签到 + 仅签到 签到、签退全部完成签到、签退全部完成
@@ -231,7 +264,7 @@ export default { if (value != "") { state.radioV1 = ""; } - } + }; return { ...toRefs(state), afterVisibleChange, diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index b3017ce9..412dfb7a 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -151,18 +151,20 @@
开始前: - + > 分钟
开始后: - + > 分钟
@@ -172,10 +174,11 @@
结束前: - + > 分钟(提前签退则记为早退) diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 8da74f75..bd7b3dab 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -194,18 +194,20 @@
开始前: - + > 分钟
开始后: - + > 分钟
@@ -215,10 +217,11 @@
结束前: - + > 分钟(提前签退则记为早退) diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index baa65f45..88b9afc6 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -118,9 +118,10 @@
允许重复考试 -
@@ -237,6 +238,7 @@ export default { inputV1: "", inputV2: "", inputV3: "", + inputV4: "60", testV1: "", radioV1: "", radioV2: "", diff --git a/src/components/drawers/CorPowerlist.vue b/src/components/drawers/CorPowerlist.vue index 081eadc5..4a334e1f 100644 --- a/src/components/drawers/CorPowerlist.vue +++ b/src/components/drawers/CorPowerlist.vue @@ -221,10 +221,12 @@ color: #333333; line-height: 25px; margin-left: 24px; + background-color: #ffffff; } } .contentMain { margin-top: 32px; + padding-right: 20px; .main_items { display: flex; justify-content: space-between; diff --git a/src/components/drawers/ProjCheckPower.vue b/src/components/drawers/ProjCheckPower.vue new file mode 100644 index 00000000..8f297843 --- /dev/null +++ b/src/components/drawers/ProjCheckPower.vue @@ -0,0 +1,1219 @@ + + + + + + diff --git a/src/components/drawers/ProjManagePower.vue b/src/components/drawers/ProjManagePower.vue new file mode 100644 index 00000000..f4742451 --- /dev/null +++ b/src/components/drawers/ProjManagePower.vue @@ -0,0 +1,1219 @@ + + + + + + diff --git a/src/components/drawers/ProjPowerList.vue b/src/components/drawers/ProjPowerList.vue index 1aea1e0c..ba60607a 100644 --- a/src/components/drawers/ProjPowerList.vue +++ b/src/components/drawers/ProjPowerList.vue @@ -48,7 +48,7 @@ :loading="tableDataTotal === -1 ? true : false" expandRowByClick="true" @expand="expandTable" - :scroll="{ x: 900, y: 400 }" + :scroll="{ x: 900 }" :pagination="false" :row-selection="{ columnWidth: 30, @@ -345,9 +345,9 @@ export default { } } .drawerMain { - min-width: 600px; + min-width: 550px; margin: 0px 32px 0px 32px; - overflow-x: scroll; + // overflow-x: scroll; display: flex; flex-direction: column; .header { @@ -358,6 +358,7 @@ export default { align-items: center; // background-color: red; margin-bottom: 20px; + flex-shrink: 0; .headerTitle { font-size: 18px; font-weight: 600; @@ -370,7 +371,7 @@ export default { width: 100%; height: 100%; // background-color: #bfa; - // overflow-y: auto; + overflow-y: auto; .search { width: 100%; display: flex; @@ -487,6 +488,12 @@ export default { justify-content: center; // position: absolute; // bottom: 20px; + .ant-pagination-item, + .ant-pagination-prev, + .ant-pagination-next, + .ant-pagination-options { + margin-bottom: 10px; + } } // .tab { // .ant-table-thead > tr > th { diff --git a/src/components/drawers/ProjectOwn.vue b/src/components/drawers/ProjectOwn.vue index 9dd0a596..4fb99c0b 100644 --- a/src/components/drawers/ProjectOwn.vue +++ b/src/components/drawers/ProjectOwn.vue @@ -1,3 +1,4 @@ +