From 030d04d14f00e0a75a09e69fd1498d11c674fb7d Mon Sep 17 00:00:00 2001 From: dongwug Date: Sat, 22 Oct 2022 18:10:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=9B=B4=E6=94=B9=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E4=B8=8B=E9=9D=A2=E7=BF=BB=E9=A1=B5=E5=B1=85=E4=B8=AD=20?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=9B=BE=E7=89=87=20=E5=B0=8F?= =?UTF-8?q?=E5=BC=B9=E7=AA=97z-index=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/taskpage/QR.png | Bin 0 -> 3497 bytes src/components/drawers/AddCase.vue | 69 ++++++--- src/components/drawers/AddOnline.vue | 70 ++++++--- src/components/drawers/CorPowerlist.vue | 69 ++++++--- src/views/courselibrary/CoursewareManage.vue | 152 +++++++++++++------ src/views/projectcenter/TaskPage.vue | 2 +- src/views/research/ResearchManage.vue | 2 +- 7 files changed, 257 insertions(+), 107 deletions(-) create mode 100644 src/assets/images/taskpage/QR.png diff --git a/src/assets/images/taskpage/QR.png b/src/assets/images/taskpage/QR.png new file mode 100644 index 0000000000000000000000000000000000000000..b5c69378e241a47acf953b7cc542ae960aa76270 GIT binary patch literal 3497 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 +
+ +
@@ -316,6 +309,44 @@ } } } + .main_table { + position: relative; + padding-bottom: 80px; + .classify { + margin-left: 10px !important; + padding-left: 9px !important; + } + .ant-checkbox-wrapper { + align-items: center; + margin-top: -2px; + } + .ant-table-selection-column { + padding: 0px !important; + padding-left: 60px !important; + } + .ant-table-thead > tr > th { + background-color: rgba(239, 244, 252, 1); + } + th.h { + background-color: #eff4fc !important; + } + + .ant-table-tbody + > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) + > td { + background: #f6f9fd; + } + .pa { + left: 0; + width: 100%; + // height: 20px; + // background-color: red; + display: flex; + justify-content: center; + position: absolute; + bottom: 20px; + } + } } .main_btns { diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 806c07d2..08a6bc2d 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -78,26 +78,20 @@ :columns="columns1" :data-source="tableData1" :loading="tableDataTotal === -1 ? true : false" - :pagination="{ - showSizeChanger: true, - showQuickJumper: true, - hideOnSinglePage: true, - pageSizeOptions: [], - pageSize: pageSize, - current: currentPage, - total: tableDataTotal, - onChange: (page, pageSize) => { - currentPage = page; - // console.log('page', page) - // 加翻页查找代码 - // this.setState({ - // currentPage: page, - // }, () => { - // this.getMilitaryDeployment() - // }) - }, - }" + this.getMilitaryDeployment() + :pagination="false" /> +
+ +
@@ -417,6 +411,44 @@ export default { cursor: pointer; } } + .main_table { + position: relative; + padding-bottom: 80px; + .classify { + margin-left: 10px !important; + padding-left: 9px !important; + } + .ant-checkbox-wrapper { + align-items: center; + margin-top: -2px; + } + .ant-table-selection-column { + padding: 0px !important; + padding-left: 60px !important; + } + .ant-table-thead > tr > th { + background-color: rgba(239, 244, 252, 1); + } + th.h { + background-color: #eff4fc !important; + } + + .ant-table-tbody + > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) + > td { + background: #f6f9fd; + } + .pa { + left: 0; + width: 100%; + // height: 20px; + // background-color: red; + display: flex; + justify-content: center; + position: absolute; + bottom: 20px; + } + } } .main_btns { diff --git a/src/components/drawers/CorPowerlist.vue b/src/components/drawers/CorPowerlist.vue index 34c4d1e7..081eadc5 100644 --- a/src/components/drawers/CorPowerlist.vue +++ b/src/components/drawers/CorPowerlist.vue @@ -51,25 +51,7 @@ :columns="columns1" :data-source="tableData1" :loading="tableDataTotal === -1 ? true : false" - :pagination="{ - showSizeChanger: true, - showQuickJumper: true, - hideOnSinglePage: true, - pageSizeOptions: [], - pageSize: pageSize, - current: currentPage, - total: tableDataTotal, - onChange: (page, pageSize) => { - currentPage = page; - // console.log('page', page) - // 加翻页查找代码 - // this.setState({ - // currentPage: page, - // }, () => { - // this.getMilitaryDeployment() - // }) - }, - }" + :pagination="false" > +
+ +
@@ -316,6 +309,44 @@ } } } + .main_table { + position: relative; + padding-bottom: 80px; + .classify { + margin-left: 10px !important; + padding-left: 9px !important; + } + .ant-checkbox-wrapper { + align-items: center; + margin-top: -2px; + } + .ant-table-selection-column { + padding: 0px !important; + padding-left: 60px !important; + } + .ant-table-thead > tr > th { + background-color: rgba(239, 244, 252, 1); + } + th.h { + background-color: #eff4fc !important; + } + + .ant-table-tbody + > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) + > td { + background: #f6f9fd; + } + .pa { + left: 0; + width: 100%; + // height: 20px; + // background-color: red; + display: flex; + justify-content: center; + position: absolute; + bottom: 20px; + } + } } .main_btns { diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 021cb7c5..5814c3cd 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1082,26 +1082,19 @@ :scroll="{ x: 700, y: 800 }" expandRowByClick="true" @expand="expandTable" - :pagination="{ - showSizeChanger: true, - showQuickJumper: true, - hideOnSinglePage: true, - pageSizeOptions: [], - pageSize: pageSize, - current: currentPage, - total: tableDataTotal, - onChange: (page, pageSize) => { - currentPage = page; - // console.log('page', page) - // 加翻页查找代码 - // this.setState({ - // currentPage: page, - // }, () => { - // this.getMilitaryDeployment() - // }) - }, - }" + :pagination="false" /> +
+ +
@@ -1439,26 +1432,19 @@ :scroll="{ x: 800 }" expandRowByClick="true" @expand="expandTable" - :pagination="{ - showSizeChanger: true, - showQuickJumper: true, - hideOnSinglePage: true, - pageSizeOptions: [], - pageSize: pageSize, - current: currentPage, - total: tableDataTotal, - onChange: (page, pageSize) => { - currentPage = page; - // console.log('page', page) - // 加翻页查找代码 - // this.setState({ - // currentPage: page, - // }, () => { - // this.getMilitaryDeployment() - // }) - }, - }" + :pagination="false" /> +
+ +
@@ -3753,7 +3739,7 @@ export default defineComponent({ width: 479px !important; .ant-modal-body { .QR { - z-index: 999; + z-index: 9999; width: 520px; background: #ffffff; box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); @@ -3798,12 +3784,14 @@ export default defineComponent({ } .qrm_body { width: 100%; + margin-top: 22px; margin-bottom: 32px; .QR_img { width: 176px; height: 176px; margin: 1px auto; - background-color: red; + background-image: url(@/assets/images/taskpage/QR.png); + background-size: 100% 100%; } } .qrm_footer { @@ -3837,7 +3825,7 @@ export default defineComponent({ // width:679px !important; .ant-modal-body { .recordgrade { - z-index: 999; + z-index: 9999; width: 679px; background: #ffffff; box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); @@ -3939,7 +3927,7 @@ export default defineComponent({ // width:679px !important; .ant-modal-body { .graduate { - z-index: 999; + z-index: 9999; width: 679px; background: #ffffff; box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); @@ -4046,7 +4034,7 @@ export default defineComponent({ // width:679px !important; .ant-modal-body { .agreestudy { - z-index: 999; + z-index: 9999; width: 679px; background: #ffffff; box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); @@ -4851,9 +4839,31 @@ export default defineComponent({ } } .stm_table { - width: 90%; - margin: 30px auto; - border: 1px solid #f0f4fe; + position: relative; + padding-bottom: 80px; + .classify { + margin-left: 10px !important; + padding-left: 9px !important; + } + .ant-checkbox-wrapper { + align-items: center; + margin-top: -2px; + } + .ant-table-selection-column { + padding: 0px !important; + padding-left: 60px !important; + } + .ant-table-thead > tr > th { + background-color: rgba(239, 244, 252, 1); + } + th.h { + background-color: #eff4fc !important; + } + .ant-table-tbody + > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) + > td { + background: #f6f9fd; + } .operation { display: flex; justify-content: center; @@ -4876,6 +4886,16 @@ export default defineComponent({ justify-content: right; } } + .pa { + left: 0; + width: 100%; + // height: 20px; + // background-color: red; + display: flex; + justify-content: center; + position: absolute; + bottom: 20px; + } } } } @@ -5063,7 +5083,33 @@ export default defineComponent({ } } .stmm_i6 { - margin-top: 20px; + position: relative; + padding-top: 15px; + padding-bottom: 80px; + .classify { + margin-left: 10px !important; + padding-left: 9px !important; + } + .ant-checkbox-wrapper { + align-items: center; + margin-top: -2px; + } + .ant-table-selection-column { + padding: 0px !important; + padding-left: 60px !important; + } + .ant-table-thead > tr > th { + background-color: rgba(239, 244, 252, 1); + } + th.h { + background-color: #eff4fc !important; + } + + .ant-table-tbody + > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) + > td { + background: #f6f9fd; + } .operation, .nselect { display: flex; @@ -5076,6 +5122,16 @@ export default defineComponent({ cursor: pointer; } } + .pa { + left: 0; + width: 100%; + // height: 20px; + // background-color: red; + display: flex; + justify-content: center; + position: absolute; + bottom: 20px; + } } } } @@ -5151,7 +5207,7 @@ export default defineComponent({ width: 424px !important; .ant-modal-body { .delete { - z-index: 999; + z-index: 9999; width: 424px; background: #ffffff; box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index a5761b06..62d3012a 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -4389,7 +4389,7 @@ export default { width: 424px !important; .ant-modal-body { .delete { - z-index: 999; + z-index: 9999; width: 424px; background: #ffffff; box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue index 7f573d13..826fc564 100644 --- a/src/views/research/ResearchManage.vue +++ b/src/views/research/ResearchManage.vue @@ -738,7 +738,7 @@ export default { width: 424px !important; .ant-modal-body { .delete { - z-index: 999; + z-index: 9999; width: 424px; background: #ffffff; box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);