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/assets/images/taskpage/check.png b/src/assets/images/taskpage/check.png new file mode 100644 index 00000000..53bcd491 Binary files /dev/null and b/src/assets/images/taskpage/check.png differ diff --git a/src/assets/images/taskpage/copper.png b/src/assets/images/taskpage/copper.png new file mode 100644 index 00000000..7cfdaf82 Binary files /dev/null and b/src/assets/images/taskpage/copper.png differ diff --git a/src/assets/images/taskpage/erweima.png b/src/assets/images/taskpage/erweima.png new file mode 100644 index 00000000..b5c69378 Binary files /dev/null and b/src/assets/images/taskpage/erweima.png differ diff --git a/src/assets/images/taskpage/gold.png b/src/assets/images/taskpage/gold.png new file mode 100644 index 00000000..e6df2f66 Binary files /dev/null and b/src/assets/images/taskpage/gold.png differ diff --git a/src/assets/images/taskpage/group.png b/src/assets/images/taskpage/group.png new file mode 100644 index 00000000..0aebd62d Binary files /dev/null and b/src/assets/images/taskpage/group.png differ diff --git a/src/assets/images/taskpage/group0.png b/src/assets/images/taskpage/group0.png new file mode 100644 index 00000000..1af4208b Binary files /dev/null and b/src/assets/images/taskpage/group0.png differ diff --git a/src/assets/images/taskpage/pub0.png b/src/assets/images/taskpage/pub0.png new file mode 100644 index 00000000..ad55b034 Binary files /dev/null and b/src/assets/images/taskpage/pub0.png differ diff --git a/src/assets/images/taskpage/siler.png b/src/assets/images/taskpage/siler.png new file mode 100644 index 00000000..428e9a8a Binary files /dev/null and b/src/assets/images/taskpage/siler.png differ diff --git a/src/assets/images/taskpage/stu.png b/src/assets/images/taskpage/stu.png new file mode 100644 index 00000000..c0d5c21b Binary files /dev/null and b/src/assets/images/taskpage/stu.png differ diff --git a/src/assets/images/taskpage/stu0.png b/src/assets/images/taskpage/stu0.png new file mode 100644 index 00000000..24cd0aaf Binary files /dev/null and b/src/assets/images/taskpage/stu0.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/AddLevelAddStu.vue b/src/components/drawers/AddLevelAddStu.vue index dd233efa..8256fea2 100644 --- a/src/components/drawers/AddLevelAddStu.vue +++ b/src/components/drawers/AddLevelAddStu.vue @@ -98,7 +98,7 @@ +
+ +
@@ -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/components/drawers/FaceStu.vue b/src/components/drawers/FaceStu.vue index e72e2bcc..15148941 100644 --- a/src/components/drawers/FaceStu.vue +++ b/src/components/drawers/FaceStu.vue @@ -78,12 +78,12 @@
-
导入学员
+
导入学员
-
+
批量签到
-
+
批量签退
@@ -149,12 +149,76 @@
+ + + + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要批量签到吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+
+ + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要批量签退吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+
+ \ No newline at end of file diff --git a/src/components/drawers/ProjectScore.vue b/src/components/drawers/ProjectScore.vue new file mode 100644 index 00000000..452c315a --- /dev/null +++ b/src/components/drawers/ProjectScore.vue @@ -0,0 +1,481 @@ + + + + \ No newline at end of file diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue index 3be140a8..61506af6 100644 --- a/src/components/drawers/TestManage.vue +++ b/src/components/drawers/TestManage.vue @@ -54,7 +54,7 @@
-
+
催促考试
@@ -80,12 +80,17 @@
+
+
+
催促学员成功
+
+