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..f1004e56 100644 --- a/src/components/drawers/ActiveAttendance.vue +++ b/src/components/drawers/ActiveAttendance.vue @@ -15,7 +15,7 @@ @click="closeDrawer" /> -
+
起止时间:2022-07-21 14:00 ~ 2022-7-30 14:00 @@ -76,11 +76,11 @@
-
+
批量签到
-
-
批量签退
+
+
批量签退
@@ -137,14 +137,72 @@ />
-->
-
- -
-
- - +
+ + +
+ + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要批量签到吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+
+ + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要批量签退吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index c83ddd74..9032fd8a 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -19,7 +19,8 @@
项目名称
- +
@@ -75,6 +76,7 @@
@@ -120,7 +122,8 @@
@@ -395,12 +398,25 @@ export default { flex: 1; // .ant-radio-wrapper { // } + .ant-input-textarea-show-count { + position: relative; + height: 88px; + } + .ant-input-textarea-show-count::after { + position: absolute; + right: 10px; + bottom: 0px; + } .ant-input { - border-radius: 5px; + border-radius: 8px; // height: 120%; width: 100%; height: 40px; } + .ant-input-affix-wrapper { + padding: 0 11px; + border-radius: 8px; + } .ant-select-selector { border-radius: 5px; // height: 120%; @@ -435,6 +451,11 @@ export default { .name2 { display: flex; align-items: flex-start; + .ant-input-textarea { + .ant-input { + height: 88px; + } + } } } .template { diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index bffcaf1a..e32aefe4 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -142,11 +142,6 @@ display: flex; align-items: center; justify-content: space-between; - background: linear-gradient( - 0deg, - rgba(78, 166, 255, 0) 0%, - rgba(78, 166, 255, 0.2) 100% - ); " >
@@ -228,11 +223,6 @@ display: flex; align-items: center; justify-content: space-between; - background: linear-gradient( - 0deg, - rgba(78, 166, 255, 0) 0%, - rgba(78, 166, 255, 0.2) 100% - ); " >
@@ -324,11 +314,6 @@ display: flex; align-items: center; justify-content: space-between; - background: linear-gradient( - 0deg, - rgba(78, 166, 255, 0) 0%, - rgba(78, 166, 255, 0.2) 100% - ); " >
@@ -437,11 +422,6 @@ display: flex; align-items: center; justify-content: space-between; - background: linear-gradient( - 0deg, - rgba(78, 166, 255, 0) 0%, - rgba(78, 166, 255, 0.2) 100% - ); " >
@@ -2535,6 +2515,13 @@ export default { .doublesonpro { .ant-modal { .ant-modal-body { + .modalHeader { + background: linear-gradient( + 0deg, + rgba(78, 166, 255, 0) 0%, + rgba(78, 166, 255, 0.2) 100% + ); + } padding: 0; .modalMain { display: flex; @@ -2617,6 +2604,13 @@ export default { .doublepro { .ant-modal { .ant-modal-body { + .modalHeader { + background: linear-gradient( + 0deg, + rgba(78, 166, 255, 0) 0%, + rgba(78, 166, 255, 0.2) 100% + ); + } padding: 0; .modalMain { display: flex; @@ -2699,6 +2693,13 @@ export default { .ant-modal { .ant-modal-body { padding: 0 !important; + .modalHeader { + background: linear-gradient( + 0deg, + rgba(78, 166, 255, 0) 0%, + rgba(78, 166, 255, 0.2) 100% + ); + } .modalMain { display: flex; justify-content: center; @@ -2750,6 +2751,13 @@ export default { .ant-modal { .ant-modal-body { padding: 0 !important; + .modalHeader { + background: linear-gradient( + 0deg, + rgba(78, 166, 255, 0) 0%, + rgba(78, 166, 255, 0.2) 100% + ); + } .modalMain { display: flex; flex-direction: column; diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 0ea2da60..2470c57a 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -542,7 +542,7 @@ :data-source="tabledata" :loading="tableDataTotal === -1 ? true : false" expandRowByClick="true" - :scroll="{ x: 1400, y: 350 }" + :scroll="{ x: 1400 }" @expand="expandTable" :pagination="false" :row-selection="{ @@ -794,7 +794,6 @@ -
排行榜
@@ -839,6 +838,7 @@
进度排行 Top10
+
@@ -65,7 +65,7 @@ :data-source="tableData" :loading="tableDataTotal === -1 ? true : false" expandRowByClick="true" - :scroll="{ x: 1500, y: 800 }" + :scroll="{ x: 1500 }" @expand="expandTable" :pagination="false" /> @@ -287,12 +287,6 @@ export default { width: 100, align: "center", className: "h", - // ellipsis: true, - // scopedSlots: { customRender: "action" }, //引入的插槽 - // customRender: (text, record) => { - // console.log(text, record); - // return {text.text}; - // }, }, { title: "名称", @@ -487,10 +481,9 @@ export default { width: 680px; // height: 525px; background-color: #fff; - box-shadow: 0 0 10px rgba(118, 136, 166, 0.21); left: 50%; - top: 20%; + top: 50%; transform: translate(-50%, -50%); .top { width: 100%; @@ -587,9 +580,7 @@ export default { height: 100%; display: flex; flex-direction: column; - //align-items: center; position: relative; - // position: relative; .filter { margin-left: 38px; margin-right: 38px; @@ -607,7 +598,6 @@ export default { } .btns { display: flex; - // flex-wrap: wrap; .btn { padding: 0px 26px 0px 26px; height: 38px; @@ -686,7 +676,6 @@ export default { margin: 20px 38px 30px; display: flex; flex: 1; - //position: relative; flex-direction: column; th.h { @@ -701,11 +690,8 @@ export default { } .pa { width: 100%; - // height: 20px; - // background-color: red; display: flex; justify-content: center; - //position: absolute; margin-bottom: 20px; .pagination { margin-bottom: 20px; @@ -770,7 +756,6 @@ export default { height: 16px; position: relative; margin-right: 10px; - // background-image: url(@/assets/images/coursewareManage/notice.png); img{ width: 100%; height: 100%;