diff --git a/src/assets/images/taskpage/QR.png b/src/assets/images/taskpage/QR.png
new file mode 100644
index 00000000..b5c69378
Binary files /dev/null and b/src/assets/images/taskpage/QR.png differ
diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index f1fe0313..bb2481a0 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -52,26 +52,19 @@
: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/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"
>
@@ -77,6 +59,17 @@
+
+
+
@@ -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);