diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue index 98880036..89b87e35 100644 --- a/src/components/drawers/ActiveAttendance.vue +++ b/src/components/drawers/ActiveAttendance.vue @@ -8,7 +8,7 @@ >
-
【活动】考勤
+
{{ title }}
完成【必修/选修】获得 {{score1}} 积分
-
+
优秀学员可获得 {{score2}}积分
@@ -163,7 +163,7 @@
完成【必修/选修】获得 积分
-
+
优秀学员可获得 积分
@@ -386,6 +386,9 @@ export default { .contentscore { margin-top: 20px; margin-bottom: 100px; + .ant-tabs-nav-wrap{ + border-bottom:1px solid #ededed; + } .ant-tabs-tab-btn { font-size: 18px; font-weight: 700; diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 5ec964d0..9753e23b 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1645,21 +1645,21 @@ const columns1 = [ }, { title: "内容分类", - width: 100, + width: 130, dataIndex: "content", key: "1", align: "center", }, { title: "课程形式", - width: 100, + width: 130, dataIndex: "courseform", key: "2", align: "center", }, { title: " 所属项目", - width: 200, + width: 250, dataIndex: "project", key: "3", align: "center", @@ -1667,21 +1667,21 @@ const columns1 = [ }, { title: "学习人数", - width: 110, + width: 130, dataIndex: "stunum", key: "4", align: "center", }, { title: "评分", - width: 100, + width: 130, dataIndex: "grade", key: "5", align: "center", }, { title: "状态", - width: 100, + width: 130, dataIndex: "status", key: "6", align: "center", @@ -2326,28 +2326,28 @@ export default defineComponent({ // options={state.projectNameList} dropdownClassName="tabledropdown" > - -
{ + { state.corpowerlistvisible = true; - }} - > + }} > +
权限名单
- -
{ state.ownpowervisible = true; - }} - > + }}> +
归属权
- +
查看权
- +
管理权
@@ -2364,10 +2364,8 @@ export default defineComponent({ -
{ + style="padding-left:28px" + onClick={() => { if (value.courseform === "线上") { state.QR_hs = true; state.olQR_hs = true; @@ -2376,7 +2374,8 @@ export default defineComponent({ state.ftQR_hs = true; } }} - > + > +
二维码
@@ -2384,12 +2383,11 @@ export default defineComponent({ value="取消" label="取消" style="padding-left:35px" - > -
{ console.log("点击了"); }} - > + > +
取消
@@ -2427,28 +2425,28 @@ export default defineComponent({ // options={state.projectNameList} dropdownClassName="tabledropdown" > - -
{ + { state.corpowerlistvisible = true; - }} - > + }} > +
权限名单
- -
{ state.ownpowervisible = true; - }} - > + }}> +
归属权
- +
查看权
- +
管理权
@@ -2535,28 +2533,28 @@ export default defineComponent({ // options={state.projectNameList} dropdownClassName="tabledropdown" > - -
{ + { state.corpowerlistvisible = true; - }} - > + }} > +
权限名单
- -
{ state.ownpowervisible = true; - }} - > + }}> +
归属权
- +
查看权
- +
管理权
@@ -2715,13 +2713,12 @@ export default defineComponent({ value="复制" label="复制" style="padding-left:35px" - > -
{ state.delete_hs = true; state.copy_hs = true; }} - > + > +
复制
@@ -2729,27 +2726,25 @@ export default defineComponent({ value="删除" label="删除" style="padding-left:35px" - > -
{ state.delete_hs = true; state.del_hs = true; }} - > + > +
删除
-
{ state.QR_hs = true; state.vipftQR_hs = true; }} - > + > +
二维码
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index deba1aef..a48de0bd 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -158,11 +158,11 @@
归属组织
-
{{ valueE.length }}/20
+
{{ valuecom.length }}/20
@@ -245,11 +245,11 @@
路径图名称
-
{{ valueE.length }}/20
+
{{ valueE2.length }}/20
@@ -262,11 +262,11 @@
归属组织
-
{{ valueE.length }}/20
+
{{ valuecom2.length }}/20
@@ -282,7 +282,7 @@ -->
路径说明
- -
{{ valuei.length }}/150
+ +
{{ valuei2.length }}/150
@@ -715,7 +715,8 @@ export default { source: require("../../assets/images/leveladd/3.png"), }, ], - learnPathBg: null, //选择的路径图背景 + learnPathBg: null, //创建路径选择的路径图背景 + learnPathBg2: null, //编辑路径选择的路径图背景 pub: false, //发布弹窗 checked: false, //发布弹窗switch checkedTeacher: false, //发布弹窗勾选 @@ -739,9 +740,13 @@ export default { pageSize: 10, value1: "", value2: "", - valueE: "", + valueE: "", //创建路径的路径名称 + valuecom: "", //创建路径归属组织 + valueE2: "", //编辑路径的路径名称 + valuecom2: "", //编辑路径归属组织 valueEE: "", - valuei: "", + valuei: "", //创建路径的路径说明 + valuei2: "", //创建路径的路径说明 }); const tableDataFunc = () => { const columns = [ @@ -872,6 +877,10 @@ export default { console.log(id); state.learnPathBg = id; }; + const chooseImg2 = (id) => { + console.log(id); + state.learnPathBg2 = id; + }; const showPub = () => { state.pub = true; }; @@ -1193,6 +1202,7 @@ export default { showPower, tableDataFunc, chooseImg, + chooseImg2, showQuery, showManage, }; @@ -1832,7 +1842,7 @@ export default { } .tableBox { // margin: 20px 38px 30px; - margin: 20px 35px 0px 35px; + margin: 10px 35px 0px 35px; th.h { background-color: #eff4fc !important; diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 38391eaa..6f032080 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -399,7 +399,7 @@
- + @@ -1120,6 +1123,8 @@ export default { showTimeText: "", //考试、测评页面传递参数 showTestText: "", + //直播、活动页面传递参数 + showKaoqinText: "", FSvisible: false, //面授学员 AAvisible: false, //活动/直播考勤 copyModal: false, //面授二维码弹窗 @@ -1396,15 +1401,17 @@ export default { const showFS = () => { state.FSvisible = true; }; - //活动考勤的抽屉 - const showAA = () => { + //考勤的抽屉 + const showAA = (course) => { state.AAvisible = true; + state.showKaoqinText = "【" + course + "】" + "考勤"; + console.log(state.showKaoqinText, 1111); }; // 时间管理 - const showTime = (course, name) => { + const showTime = (course) => { console.log("点击管理"); state.visible = true; - state.showTimeText = "【" + course + "】" + name; + state.showTimeText = "【" + course + "】" + "管理"; // console.log("state.showTimeText", state.showTimeText); }; //考试管理的抽屉 diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index e510b77c..fe662b7c 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -17,7 +17,7 @@ > -->
{ @@ -1507,6 +1507,7 @@ export default { } .active { opacity: 1; + transition:all .5s; } } } diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index 49d3a85e..0c570b97 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -150,12 +150,13 @@
- - + + - 上传附件 + 上传数量已经达到最大值 + 上传附件
@@ -243,14 +244,20 @@ export default { } }; + let uplodaFileCount = false; + const handleChange1 = (info) => { if (info.file.status === 'uploading') { loading.value = true; return; } if (info.file.status === 'done') { - console.log('上传附件返回的信息 %o', info) - + console.log('上传附件返回的信息 %o', info, info.fileList.length, uplodaFileCount) + if (info.fileList.length > 5) { + uplodaFileCount = true; + } else { + uplodaFileCount = false; + } } if (info.file.status === 'error') { loading.value = false; @@ -270,6 +277,16 @@ export default { return isJpgOrPng && isLt2M; }; + const beforeUpload1 = () => { + return new Promise((resovle, reject) => { + if (uplodaFileCount) { + message.info("上传文件数量已达最大数量") + return reject(false); + } + return resovle(true); + }) + }; + const onRangeChange = (value, dateString) => { console.log('Selected Time: ', value); // 项目时间选择函数 @@ -344,7 +361,7 @@ export default { console.log(obj[i]) if (obj[i] === "") { message.destroy() - message.info(errorMsgs[i]) + message.warning(errorMsgs[i]) return } } @@ -368,11 +385,13 @@ export default { handleChange, handleChange1, beforeUpload, + beforeUpload1, onRangeChange, classifyList1, remark, changeChecked, changeChecked1, + uplodaFileCount, createProject }; } diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 00dae6b3..0c25dc6f 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -15,7 +15,7 @@
添加阶段
-
+
{{ item.tit }}
{{ item.name }}
@@ -840,6 +840,8 @@ export default { cC: false, cancelModal: false, //确认取消阶段弹窗 deleteModal: false, //确认删除弹窗 + isactive: -1, + isActive:false, }); const selectProjectName = (value, index) => { console.log("value", value, index); @@ -1061,6 +1063,10 @@ export default { const closeDelete = () => { state.deleteModal = false; }; + const changebgc = (index) => { + state.isactive = index; + state.isActive = !state.isActive; + } return { ...toRefs(state), selectProjectName, @@ -1090,6 +1096,7 @@ export default { closeCancel, showDelete, closeDelete, + changebgc, }; }, }; @@ -1520,6 +1527,10 @@ export default { right: 16px; } } + .bgcactive{ + opacity:1; + transition:all .5s; + } } } } diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index f3573db8..7b360dba 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -353,7 +353,7 @@
@@ -411,7 +415,8 @@ - -
+
@@ -1029,7 +1034,7 @@ - + @@ -1572,6 +1577,62 @@
+ + +
+
+
+
+
+ 直播管理 +
+
+
+
+
+
+
下载二维码
+
200*200
+
400*400
+
800*800
+
+
+
+
+ + +
+
+
+
+
+ 活动管理 +
+
+
+
+
+
+
下载二维码
+
200*200
+
400*400
+
800*800
+
+
+
+