diff --git a/src/assets/images/leveladd/done.png b/src/assets/images/leveladd/done.png
new file mode 100644
index 00000000..6d07bbb0
Binary files /dev/null and b/src/assets/images/leveladd/done.png differ
diff --git a/src/assets/images/leveladd/edit.png b/src/assets/images/leveladd/edit.png
index e319e324..8e9227db 100644
Binary files a/src/assets/images/leveladd/edit.png and b/src/assets/images/leveladd/edit.png differ
diff --git a/src/assets/images/leveladd/info.png b/src/assets/images/leveladd/info.png
new file mode 100644
index 00000000..b3d0708e
Binary files /dev/null and b/src/assets/images/leveladd/info.png differ
diff --git a/src/assets/images/leveladd/nodone.png b/src/assets/images/leveladd/nodone.png
new file mode 100644
index 00000000..6663dfd1
Binary files /dev/null and b/src/assets/images/leveladd/nodone.png differ
diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue
index 2110c4fe..9c40b824 100644
--- a/src/components/drawers/ActiveAttendance.vue
+++ b/src/components/drawers/ActiveAttendance.vue
@@ -505,293 +505,294 @@ export default {
}
.ant-drawer-body {
padding: 0;
- }
- }
- .drawerMain {
- min-width: 600px;
- margin: 0px 32px 0px 32px;
- overflow-x: scroll;
- display: flex;
- flex-direction: column;
- .header {
- height: 73px;
- border-bottom: 1px solid #e8e8e8;
- display: flex;
- justify-content: space-between;
- align-items: center;
- // background-color: red;
- margin-bottom: 20px;
- .headerTitle {
- font-size: 18px;
- font-weight: 600;
- color: #333333;
- line-height: 25px;
- // margin-left: 24px;
- }
- }
- .main {
- width: 100%;
- height: 100%;
- // background-color: #bfa;
- overflow-y: auto;
-
- .titl {
+ .drawerMain {
+ min-width: 600px;
+ margin: 0px 32px 0px 32px;
+ // overflow-x: scroll;
display: flex;
- .endtime {
- font-size: 16px;
- font-weight: 500;
- color: #333333;
- white-space: nowrap;
- }
- }
- .search {
- width: 100%;
- display: flex;
- flex-wrap: wrap;
- margin-top: 20px;
- justify-content: space-between;
- .leftchoose {
+ flex-direction: column;
+ .header {
+ height: 73px;
+ border-bottom: 1px solid #e8e8e8;
display: flex;
- margin-right: 20px;
- flex-wrap: wrap;
- .namecon {
- display: flex;
- flex-wrap: nowrap;
- margin-bottom: 10px;
- .name {
- margin-top: 8px;
- white-space: nowrap;
- }
- // .name {
- // margin-top: 8px;
-
- // color: rgba(0, 0, 0, 0.85);
- // font-size: 14px;
- // font-weight: 400;
- // }
+ justify-content: space-between;
+ align-items: center;
+ // background-color: red;
+ margin-bottom: 20px;
+ flex-shrink: 0;
+ .headerTitle {
+ font-size: 18px;
+ font-weight: 600;
+ color: #333333;
+ line-height: 25px;
+ // margin-left: 24px;
}
}
+ .main {
+ width: 100%;
+ height: 100%;
+ background-color: #bfa;
+ overflow-y: auto;
- .btns {
- display: flex;
- flex-wrap: nowrap;
+ .titl {
+ display: flex;
+ .endtime {
+ font-size: 16px;
+ font-weight: 500;
+ color: #333333;
+ white-space: nowrap;
+ }
+ }
+ .search {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ margin-top: 20px;
+ justify-content: space-between;
+ .leftchoose {
+ display: flex;
+ margin-right: 20px;
+ flex-wrap: wrap;
+ .namecon {
+ display: flex;
+ flex-wrap: nowrap;
+ margin-bottom: 10px;
+ .name {
+ margin-top: 8px;
+ white-space: nowrap;
+ }
+ // .name {
+ // margin-top: 8px;
- .btn {
- cursor: pointer;
- width: 100px;
+ // color: rgba(0, 0, 0, 0.85);
+ // font-size: 14px;
+ // font-weight: 400;
+ // }
+ }
+ }
+
+ .btns {
+ display: flex;
+ flex-wrap: nowrap;
+
+ .btn {
+ cursor: pointer;
+ width: 100px;
+ height: 40px;
+ border-radius: 8px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ .img1 {
+ width: 15px;
+ height: 17px;
+ background-image: url(../../assets/images/courseManage/search0.png);
+ background-size: 100% 100%;
+ margin-right: 7px;
+ }
+ .img2 {
+ width: 16px;
+ height: 18px;
+ background-image: url(../../assets/images/courseManage/reset1.png);
+ background-size: 100% 100%;
+ margin-right: 7px;
+ }
+ }
+
+ .btn1 {
+ background: #388be1;
+
+ color: #ffffff;
+ }
+ .btn2 {
+ background: #ffffff;
+
+ color: #388be1;
+ border: 1px solid #388be1;
+ }
+ }
+ }
+ .btnss {
+ display: flex;
+ flex-wrap: nowrap;
+
+ .btn {
+ cursor: pointer;
+ width: 130px;
+ height: 40px;
+ border-radius: 8px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ .img1 {
+ width: 15px;
+ height: 17px;
+ background-image: url(../../assets/images/courseManage/search0.png);
+ background-size: 100% 100%;
+ margin-right: 7px;
+ }
+ .img2 {
+ width: 17px;
+ height: 16px;
+ background-image: url(../../assets/images/coursewareManage/export.png);
+ background-size: 100% 100%;
+ margin-right: 7px;
+ }
+ }
+
+ .btn1 {
+ background: #388be1;
+ margin-right: 20px;
+ color: #ffffff;
+ }
+ .btn2 {
+ background: #ffffff;
+ margin-right: 20px;
+ color: #388be1;
+ border: 1px solid #388be1;
+ }
+ }
+ .line {
+ width: 100%;
height: 40px;
- border-radius: 8px;
+ background-color: #e9f6fe;
display: flex;
justify-content: center;
align-items: center;
- .img1 {
- width: 15px;
- height: 17px;
- background-image: url(../../assets/images/courseManage/search0.png);
- background-size: 100% 100%;
- margin-right: 7px;
- }
- .img2 {
- width: 16px;
- height: 18px;
- background-image: url(../../assets/images/courseManage/reset1.png);
- background-size: 100% 100%;
- margin-right: 7px;
+ margin-top: 20px;
+ border: 1px solid #c3e6fc;
+ .inline {
+ width: 95%;
+ height: 100%;
+ display: flex;
+ justify-content: space-between;
+ // background-color: #bfa;
+ .left {
+ height: 100%;
+ display: flex;
+ align-items: center;
+ .img {
+ width: 14px;
+ height: 15px;
+ background-image: url(../../assets/images/leveladd/gan.png);
+ background-size: 100% 100%;
+ }
+ .text {
+ color: #999ba3;
+ }
+ .text2 {
+ color: #4ea6ff;
+ margin-left: 5px;
+ margin-right: 5px;
+ }
+ .text3 {
+ color: #999ba3;
+ margin-left: 20px;
+ }
+ }
+ .right {
+ font-size: 14px;
+ font-weight: 400;
+ color: #387df7;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ cursor: pointer;
+ }
}
}
-
- .btn1 {
- background: #388be1;
-
- color: #ffffff;
+ .pad {
+ width: 96%;
+ height: 10px;
+ background-color: #fff;
+ position: absolute;
}
- .btn2 {
- background: #ffffff;
+ .tableBox {
+ // margin-bottom: 80px;
- color: #388be1;
- border: 1px solid #388be1;
+ .classify {
+ // margin-left: 11px !important;
+ // padding-left: 9px !important;
+ padding-left: 0px !important;
+ }
+ .ant-checkbox-wrapper {
+ align-items: center;
+ margin-top: -2px;
+ }
+ .ant-table-selection-column {
+ padding: 0px !important;
+ // padding-left: 45px !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;
+ }
+ .opa {
+ background-color: #bfa;
+ }
}
+ // .tab {
+ // .ant-table-thead > tr > th {
+ // background-color: rgba(239, 244, 252, 1) !important;
+ // }
+
+ // th.h {
+ // background-color: #eff4fc !important;
+ // }
+
+ // .ant-table-tbody
+ // > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+ // > td {
+ // background: #f6f9fd;
+ // }
+ // }
}
}
- .btnss {
+ .botm {
+ width: 100%;
+ height: 90px;
+ // background-color: red;
+ // flex-shrink: 1;
+ }
+ .btnn {
+ height: 72px;
+ width: 100%;
+ position: absolute;
+ background-color: #fff;
+ bottom: 0;
+ left: 0;
display: flex;
- flex-wrap: nowrap;
-
- .btn {
- cursor: pointer;
- width: 130px;
- height: 40px;
- border-radius: 8px;
- display: flex;
- justify-content: center;
- align-items: center;
- .img1 {
- width: 15px;
- height: 17px;
- background-image: url(../../assets/images/courseManage/search0.png);
- background-size: 100% 100%;
- margin-right: 7px;
- }
- .img2 {
- width: 17px;
- height: 16px;
- background-image: url(../../assets/images/coursewareManage/export.png);
- background-size: 100% 100%;
- margin-right: 7px;
- }
- }
-
+ align-items: center;
+ justify-content: center;
+ box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 {
- background: #388be1;
- margin-right: 20px;
- color: #ffffff;
+ width: 100px;
+ height: 40px;
+ border: 1px solid #4ea6ff;
+ border-radius: 8px;
+ color: #4ea6ff;
+ background-color: #fff;
+ cursor: pointer;
}
.btn2 {
- background: #ffffff;
- margin-right: 20px;
- color: #388be1;
- border: 1px solid #388be1;
+ cursor: pointer;
+ width: 100px;
+ height: 40px;
+ background: #4ea6ff;
+ border-radius: 8px;
+ border: 0;
+ margin-left: 15px;
+ color: #fff;
}
}
- .line {
- width: 100%;
- height: 40px;
- background-color: #e9f6fe;
- display: flex;
- justify-content: center;
- align-items: center;
- margin-top: 20px;
- border: 1px solid #c3e6fc;
- .inline {
- width: 95%;
- height: 100%;
- display: flex;
- justify-content: space-between;
- // background-color: #bfa;
- .left {
- height: 100%;
- display: flex;
- align-items: center;
- .img {
- width: 14px;
- height: 15px;
- background-image: url(../../assets/images/leveladd/gan.png);
- background-size: 100% 100%;
- }
- .text {
- color: #999ba3;
- }
- .text2 {
- color: #4ea6ff;
- margin-left: 5px;
- margin-right: 5px;
- }
- .text3 {
- color: #999ba3;
- margin-left: 20px;
- }
- }
- .right {
- font-size: 14px;
- font-weight: 400;
- color: #387df7;
- height: 100%;
- display: flex;
- align-items: center;
- cursor: pointer;
- }
- }
- }
- .pad {
- width: 96%;
- height: 10px;
- background-color: #fff;
- position: absolute;
- }
- .tableBox {
- // margin-bottom: 80px;
-
- .classify {
- // margin-left: 11px !important;
- // padding-left: 9px !important;
- padding-left: 0px !important;
- }
- .ant-checkbox-wrapper {
- align-items: center;
- margin-top: -2px;
- }
- .ant-table-selection-column {
- padding: 0px !important;
- // padding-left: 45px !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;
- }
- .opa {
- background-color: #bfa;
- }
- }
- // .tab {
- // .ant-table-thead > tr > th {
- // background-color: rgba(239, 244, 252, 1) !important;
- // }
-
- // th.h {
- // background-color: #eff4fc !important;
- // }
-
- // .ant-table-tbody
- // > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
- // > td {
- // background: #f6f9fd;
- // }
- // }
- }
- }
- .botm {
- width: 100%;
- height: 90px;
- // background-color: red;
- // flex-shrink: 1;
- }
- .btnn {
- height: 72px;
- width: 100%;
- position: absolute;
- background-color: #fff;
- bottom: 0;
- left: 0;
- display: flex;
- align-items: center;
- justify-content: center;
- box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
- .btn1 {
- width: 100px;
- height: 40px;
- border: 1px solid #4ea6ff;
- border-radius: 8px;
- color: #4ea6ff;
- background-color: #fff;
- cursor: pointer;
- }
- .btn2 {
- cursor: pointer;
- width: 100px;
- height: 40px;
- background: #4ea6ff;
- border-radius: 8px;
- border: 0;
- margin-left: 15px;
- color: #fff;
}
}
}
diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index bb2481a0..86eec845 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -79,11 +79,11 @@
const columns1 = [
{
title: "案例标题",
- width: "35%",
+ width: "40%",
dataIndex: "title",
key: "num",
align: "center",
- ellipsis: true,
+ ellipsis: true,
},
{
title: "作者",
@@ -94,7 +94,7 @@
},
{
title: "导入时间",
- width: "40%",
+ width: "35%",
dataIndex: "time",
key: "time",
align: "center",
diff --git a/src/components/drawers/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue
index fdf9464d..3385642e 100644
--- a/src/components/drawers/AddLevelImportStu.vue
+++ b/src/components/drawers/AddLevelImportStu.vue
@@ -3,7 +3,7 @@
:visible="AddImpStuvisible"
class="drawerStyle AddLevelImpStu"
placement="right"
- width="40%"
+ width="800px"
@after-visible-change="afterVisibleChange"
>
@@ -63,12 +63,18 @@
- 下载失败数据
+
+
+
@@ -132,9 +142,8 @@ export default {
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 1d169846..c5b7548c 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -838,6 +838,7 @@