diff --git a/src/assets/images/projectadd/nopro.png b/src/assets/images/projectadd/nopro.png new file mode 100644 index 00000000..e14d35d6 Binary files /dev/null and b/src/assets/images/projectadd/nopro.png differ diff --git a/src/components/drawers/TaskFaceIn.vue b/src/components/drawers/TaskFaceIn.vue new file mode 100644 index 00000000..babf1784 --- /dev/null +++ b/src/components/drawers/TaskFaceIn.vue @@ -0,0 +1,354 @@ + + + + + \ No newline at end of file diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index cc7cc8b6..97914d79 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -468,6 +468,36 @@ + + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要删除此任务吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+
@@ -795,6 +825,7 @@ export default { confirmModal: false, //确认添加阶段弹窗 cC: false, cancelModal: false, //确认取消阶段弹窗 + deleteModal: false, //确认删除弹窗 }); const selectProjectName = (value, index) => { console.log("value", value, index); @@ -915,7 +946,14 @@ export default { > 编辑 - 删除 + { + showDelete(); + }} + > + 删除 + ); @@ -1003,7 +1041,12 @@ export default { const closeCancel = () => { state.cancelModal = false; }; - + const showDelete = () => { + state.deleteModal = true; + }; + const closeDelete = () => { + state.deleteModal = false; + }; return { ...toRefs(state), selectProjectName, @@ -1031,6 +1074,8 @@ export default { closeConfirm, showCancel, closeCancel, + showDelete, + closeDelete, }; }, }; diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index d07a0114..42c81a65 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -209,154 +209,220 @@ -
-
-
任务大纲
- - - - 编辑 - -
-
+
+
+ + +
+
任务大纲
+ + + + 编辑 + +
+ +
+ + + -
-
- +
+ +
+
+
+ +
+
+
+
「{{ item.course }}」
+
{{ item.name }}
+
-
-
「{{ item.course }}」
-
{{ item.name }}
-
-
-
-
- {{ item.classify }} -
-
-
-
开始时间
-
{{ item.beginTime }}
-
-
-
- {{ item.complete }}/{{ item.total }}人 -
-
- - {{ item.percent }}% +
+ {{ item.classify }} +
-
-
-
- 学员 +
+
开始时间
+
{{ item.beginTime }}
-
- 考勤 +
+
+ {{ item.complete }}/{{ item.total }}人 +
+
+ + {{ item.percent }}% +
-
+
+ 学员 +
+
+ 考勤 +
+
+ 二维码 +
+
- 二维码 -
-
- 管理 + item.course === '调研' || + item.course === '投票' || + item.course === '活动' + ? showTime(item.course, item.name) + : item.course === '考试' || item.course === '测评' + ? showTest(item.course, item.name) + : item.course === '面授' + ? showFace(item.course) + : item.course === '作业' + ? showWork(item.course) + : null + " + > + 管理 +
-
- - - -
+ + +
@@ -372,9 +438,10 @@
点击创建项目任务
- + +
+
-
@@ -750,9 +817,7 @@
- - Content of Tab Pane 3 - + Content of Tab Pane 3
排行榜
@@ -987,6 +1052,8 @@ + +
@@ -1235,8 +1302,8 @@
- + - 添加图片 + + + 添加图片
@@ -1411,6 +1478,7 @@ import StuAdd from "../../components/drawers/StuAdd"; import ImportStu from "../../components/drawers/ImportStu"; import SeeStu from "../../components/drawers/SeeStu"; import ChangeGroup from "../../components/drawers/ChangeGroup"; +import TaskImpStu from "../../components/drawers/TaskFaceIn"; export default { name: "taskPage", components: { @@ -1427,6 +1495,7 @@ export default { ImportStu, SeeStu, ChangeGroup, + TaskImpStu, }, setup() { const state = reactive({ @@ -1612,6 +1681,7 @@ export default { valueDate: "", //排行榜输入日期 noticeChecked: true, noticeContent: "请输入要发布的公告", + TaskFaceImpStuvisible: false, //批量面授报名 //进度排行表 jindutabledata: [ @@ -2080,6 +2150,9 @@ export default { const closeModal2 = () => { state.stugroup = false; }; + const showFaceIn = () => { + state.TaskFaceImpStuvisible = true; + }; //新增 const showTime = (course, name) => { console.log("点击管理"); @@ -2177,6 +2250,7 @@ export default { showImportStu, showSeeStu, showChangeGroup, + showFaceIn, edit_hShow, edit_exit, cloradio1, @@ -2734,7 +2808,6 @@ export default { background-color: #edf0f5; } .content { - //display: flex; //margin: 0 37px; .ant-tabs-top > .ant-tabs-nav::before, .ant-tabs-bottom > .ant-tabs-nav::before, @@ -2746,6 +2819,55 @@ export default { margin-left: 30px; margin-top: 10px; } + .notable { + width: 100%; + height: 100%; + display: flex; + justify-content: center; + .notablebox { + width: 412px; + height: 212px; + background: linear-gradient(180deg, #fef3dd 0%, #fffaf0 100%); + border-radius: 10px; + display: flex; + justify-content: center; + text-align: center; + margin-top: 77px; + margin-bottom: 109px; + cursor: pointer; + position: relative; + .smallleft { + position: absolute; + top: 18px; + left: 0px; + width: 8px; + height: 21px; + border-radius: 0px 4px 4px 0px; + background-color: #ffb64e; + } + .smallright { + position: absolute; + bottom: 18px; + right: 0px; + width: 8px; + height: 21px; + border-radius: 4px 0px 0px 4px; + background-color: #ffb64e; + } + .boxbody { + .boximg { + width: 72px; + height: 72px; + margin: 32px auto 20px auto; + background-image: url(@/assets/images/coursewareManage/nostate.png); + background-size: 100% 100%; + } + .boxtitle { + margin-bottom: 4px; + } + } + } + } .onerow { //width: 100%; display: flex; @@ -2968,10 +3090,15 @@ export default { } } .taskSyllabus { + // flex: 1; + overflow-x: scroll; + .ant-collapse { border: 0px; background-color: rgba(255, 255, 255, 0); + min-width: 1040px; } + .ant-collapse-content > .ant-collapse-content-box { padding-top: 0px; padding-bottom: 0px; @@ -3000,45 +3127,45 @@ export default { } } .taskbox { - width: 412px; - height: 160px; - border-radius: 10px; - position: relative; - margin-left: 68px; - margin-bottom: 40px; - margin-top: 32px; - cursor: pointer; - .leftt { - position: absolute; - top: 18px; - left: 0; - } - .photo { - position: absolute; - top: 42px; - left: 37px; - } - .rightt { - position: absolute; - top: 69px; - right: 26px; - } - .centerbox { - position: absolute; - top: 52px; - left: 145px; - font-size: 20px; - font-weight: 700; - //line-height: 36px; - } - .centermain { - color: rgba(135, 139, 146, 1); - font-size: 14px; - position: absolute; - left: 144px; - bottom: 49px; - } + width: 412px; + height: 160px; + border-radius: 10px; + position: relative; + margin-left: 68px; + margin-bottom: 40px; + margin-top: 32px; + cursor: pointer; + .leftt { + position: absolute; + top: 18px; + left: 0; } + .photo { + position: absolute; + top: 42px; + left: 37px; + } + .rightt { + position: absolute; + top: 69px; + right: 26px; + } + .centerbox { + position: absolute; + top: 52px; + left: 145px; + font-size: 20px; + font-weight: 700; + //line-height: 36px; + } + .centermain { + color: rgba(135, 139, 146, 1); + font-size: 14px; + position: absolute; + left: 144px; + bottom: 49px; + } + } .stage { display: flex; height: 49px; @@ -3059,12 +3186,15 @@ export default { } .course { //width: 100%; + flex-shrink: 0; + margin-right: 24px; + display: flex; flex-wrap: wrap; align-items: center; padding: 25px 0px; margin-left: 22px; - margin-right: 24px; + //margin: 0 12px; border: 1px solid #f2f6fc; border-top: 0px; @@ -3081,12 +3211,13 @@ export default { //position: absolute; color: #4f5156; font-size: 16px; + margin-left: 4px; } .icontext { //positipn: absolute; color: #999ba3; font-size: 14px; - margin-left: 8px; + margin-left: 12px; width: 83px; } } @@ -3708,7 +3839,7 @@ export default { .set_edit { .ant-modal { width: 866px !important; - height: 870px !important; + height: 870px !important; .ant-modal-body { .modalHeader { background: linear-gradient( @@ -3782,15 +3913,15 @@ export default { margin-right: 5px; } } - .lodalimg{ - width:120px; - height:120px; - border:1px dashed #387DF7; + .lodalimg { + width: 120px; + height: 120px; + border: 1px dashed #387df7; display: flex; justify-content: center; align-items: center; cursor: pointer; - .lodalimg{ + .lodalimg { display: flex; white-space: nowrap; } diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue index f63bcd8a..84a62738 100644 --- a/src/views/research/ResearchManage.vue +++ b/src/views/research/ResearchManage.vue @@ -21,8 +21,8 @@ v-model:value="projectName" style="width: 270px" placeholder="请选择状态" - :options="projectNameList" - @change="selectProjectName" + :options="projectStateList" + @change="selectProjectState" allowClear showSearch > @@ -149,6 +149,23 @@ export default { label: "项目四", }, ], + projectStateList: [ + { + id: 1, + value: "已发布", + label: "已发布", + }, + { + id: 2, + value: "待发布", + label: "待发布", + }, + { + id: 3, + value: "已结束", + label: "已结束", + }, + ], out: false, number: null, selectTime: null, @@ -327,6 +344,9 @@ export default { const selectProjectName = (value, index) => { console.log("value", value, index); }; + const selectProjectState = (value, index) => { + console.log("value", value, index); + }; const expandTable = (e, a) => { // console.log("惦记了"); console.log("e", e, a); @@ -340,6 +360,7 @@ export default { return { ...toRefs(state), selectProjectName, + selectProjectState, expandTable, handleOut, tableDataFunc,