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/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue index 4327fe2e..3385642e 100644 --- a/src/components/drawers/AddLevelImportStu.vue +++ b/src/components/drawers/AddLevelImportStu.vue @@ -63,12 +63,18 @@
55%
-
暂停
+
重传
取消
-
下载失败数据
+
+
下载失败数据
+
+
+
+
20条数据导入成功,5条数据导入失败
+
@@ -87,6 +93,10 @@
+
+
+
20条数据导入成功,5条数据导入失败
+
@@ -154,7 +164,7 @@ export default { } } .main { - overflow: scroll; + overflow: scroll; .minatitl { display: flex; .up1 { @@ -220,7 +230,8 @@ export default { height: 173px; border-radius: 4px; border: 1px dashed #eaeaea; - margin-bottom: 30px; + margin-bottom: 10px; + margin-top: 10px; display: flex; align-items: center; .content { @@ -230,10 +241,22 @@ export default { .defeat { position: absolute; left: 46px; - top: 38px; + top: 42px; font-size: 14px; font-weight: 500; - color: #ff7474; + width: 120px; + height: 32px; + border-radius: 2px; + border: 1px solid #387df7; + display: flex; + justify-content: center; + align-items: center; + cursor: pointer; + .detext { + font-size: 14px; + font-weight: 400; + color: #387df7; + } } .img { width: 30px; @@ -316,6 +339,49 @@ export default { } } } + .defeatbox { + width: 500px; + height: 40px; + background: rgba(255, 116, 116, 0.1); + border: 1px solid #ff7474; + display: flex; + align-items: center; + .lefimg { + width: 14px; + height: 14px; + margin-left: 17px; + margin-right: 8px; + background-image: url(../../assets/images/leveladd/nodone.png); + background-size: 100%; + } + .tacl { + font-size: 14px; + font-weight: 400; + color: #ff7474; + } + } + .succebox { + width: 500px; + height: 40px; + background: rgba(53, 174, 105, 0.1); + border: 1px solid #35ae69; + display: flex; + align-items: center; + .lefimg { + width: 14px; + height: 14px; + margin-left: 17px; + margin-right: 8px; + background-image: url(../../assets/images/leveladd/done.png); + background-size: 100%; + } + .tacl { + font-size: 14px; + font-weight: 400; + + color: rgba(0, 0, 0, 0.65); + } + } } } } diff --git a/src/components/drawers/EntryScores.vue b/src/components/drawers/EntryScores.vue index 293861f2..fef7f769 100644 --- a/src/components/drawers/EntryScores.vue +++ b/src/components/drawers/EntryScores.vue @@ -66,155 +66,6 @@ export default { const state = reactive({ value: 1, //成绩是否合格的单选 score: null, //录入的成绩 - pageSize: 10, - currentPage: 1, - tableDataTotal: 100, - projectNameList: [ - { - id: 1, - value: "项目一", - label: "项目一", - }, - { - id: 2, - value: "项目二", - label: "项目二", - }, - { - id: 3, - value: "项目三", - label: "项目三", - }, - { - id: 4, - value: "项目四", - label: "项目四", - }, - ], - tabledata: [ - { - key: 1, - name: "哈哈", - bum: "产品部", - gangw: "产品经理", - time: "-", - state: "未完成", - }, - { - key: 2, - name: "哈哈", - bum: "产品部", - gangw: "产品经理", - time: "2022-10-31 23:12:00", - state: "未完成", - }, - { - key: 3, - name: "哈哈", - bum: "产品部", - gangw: "产品经理", - time: "2022-10-31 23:12:00", - state: "未完成", - }, - { - key: 4, - name: "哈哈", - bum: "产品部", - gangw: "产品经理", - time: "2022-10-31 23:12:00", - state: "未完成", - }, - { - key: 5, - name: "哈哈", - bum: "产品部", - gangw: "产品经理", - time: "2022-10-31 23:12:00", - state: "未完成", - }, - { - key: 6, - name: "哈哈", - bum: "产品部", - gangw: "产品经理", - time: "2022-10-31 23:12:00", - state: "未完成", - }, - { - key: 7, - name: "哈哈", - bum: "产品部", - gangw: "产品经理", - time: "2022-10-31 23:12:00", - state: "未完成", - }, - { - key: 8, - name: "哈哈", - bum: "产品部", - gangw: "产品经理", - time: "2022-10-31 23:12:00", - state: "未完成", - }, - { - key: 9, - name: "哈哈", - bum: "产品部", - gangw: "产品经理", - time: "2022-10-31 23:12:00", - state: "未完成", - }, - { - key: 10, - name: "哈哈", - bum: "产品部", - gangw: "产品经理", - time: "2022-10-31 23:12:00", - state: "未完成", - }, - ], - tablecolumns: [ - { - title: "姓名", - dataIndex: "name", - key: "name", - width: 50, - align: "center", - className: "h", - }, - { - title: "所在部门", - dataIndex: "bum", - key: "bum", - width: 50, - align: "center", - className: "h", - }, - { - title: "所在岗位", - dataIndex: "gangw", - key: "gangw", - width: 50, - align: "center", - className: "h", - }, - { - title: "完成时间", - dataIndex: "time", - key: "time", - width: 50, - align: "center", - className: "h", - }, - { - title: "任务状态", - dataIndex: "state", - key: "state", - width: 50, - align: "center", - className: "h", - }, - ], }); const selectProjectName = (value, index) => { console.log("value", value, index); @@ -246,9 +97,9 @@ export default { // } .EntryScores { .drawerMain { - min-width: 600px; + min-width: 400px; margin: 0px 32px 0px 32px; - overflow-x: scroll; + // overflow-x: scroll; display: flex; flex-direction: column; .header { @@ -269,7 +120,9 @@ export default { } .main { width: 100%; - height: 100%; + // height: 100%; + overflow-y: auto; + margin-bottom: 70px; .sta { width: 10px; height: 10px; @@ -309,6 +162,7 @@ export default { position: absolute; bottom: 0; left: 0; + background-color: #fff; display: flex; align-items: center; justify-content: center; diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue index 7d7c5936..a651eb65 100644 --- a/src/components/drawers/FaceManage.vue +++ b/src/components/drawers/FaceManage.vue @@ -87,7 +87,7 @@ :data-source="tabledata" :loading="tableDataTotal === -1 ? true : false" expandRowByClick="true" - :scroll="{ x: 900, y: 350 }" + :scroll="{ x: 900 }" @expand="expandTable" :pagination="false" :row-selection="{ @@ -514,6 +514,7 @@ export default { // background-color: #bfa; overflow: auto; + padding-right: 10px; .endtime { font-size: 16px; font-weight: 500; diff --git a/src/components/drawers/ProjectScore.vue b/src/components/drawers/ProjectScore.vue index 14b77a9c..9d7d77bc 100644 --- a/src/components/drawers/ProjectScore.vue +++ b/src/components/drawers/ProjectScore.vue @@ -129,26 +129,43 @@
-
- 规则 -
-
-
取消
-
-
-
确定
-
+
+
规则
+
+
+ + 编辑 +
+ +
+
+
+ + 保存 +
-
+ +
- 当前设计下,学员可以获得 10 积分 + 当前设计下,学员可以获得 {{scoresum}}积分
- 完成【必修/选修】获得 5 积分 + 完成【必修/选修】获得 {{score1}} 积分
- 优秀学员可获得 5 积分 + 优秀学员可获得 {{score2}}积分 +
+
+
+
+ 当前设计下,学员可以获得 {{scoresum}}积分 +
+
+ 完成【必修/选修】获得 积分 +
+
+ 优秀学员可获得 积分
@@ -326,6 +343,10 @@ export default { tableDataTotal: 30, stuValue: false, Svisible:false, + score1:5, + score2:5, + edit:true, + }); @@ -351,12 +372,18 @@ export default { state.tabledataStu = datas; }; getTableData(); - + return { ...toRefs(state), }; }, + computed: { + // 计算属性的 getter + scoresum: function () { + return Number(this.score1)+Number(this.score2); + } + } };