diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue index 9c40b824..30d27840 100644 --- a/src/components/drawers/ActiveAttendance.vue +++ b/src/components/drawers/ActiveAttendance.vue @@ -76,11 +76,11 @@
-
+
批量签到
-
-
批量签退
+
+
批量签退
@@ -145,6 +145,66 @@
+ + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要批量签到吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+
+ + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要批量签退吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+
+ + 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 @@ +