From b75a3b93bda8fc0a180906a6dbc19edf3d465366 Mon Sep 17 00:00:00 2001 From: wyx Date: Fri, 24 Feb 2023 20:59:03 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=E4=B8=8B=E8=BD=BD=E4=B8=AD=E5=BF=83NAN?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/CommonStudent.vue | 3 ++- src/views/DownLoad.vue | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index fb10da02..9b474053 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -295,7 +295,8 @@ import { AUDIENCE_LIST, ORG_CHILD_LIST, ORG_LIST, - USER_LIST, USER_LIST_PAGE, + // USER_LIST, + USER_LIST_PAGE, } from "@/api/ThirdApi"; import { saveStu, diff --git a/src/views/DownLoad.vue b/src/views/DownLoad.vue index af7fe54b..07ff8bf9 100644 --- a/src/views/DownLoad.vue +++ b/src/views/DownLoad.vue @@ -149,7 +149,7 @@ export default { api.DownLoadTotalSize().then(res=>{ console.log(res) if(res.data.code==200){ - state.capacity = res.data.data; + state.capacity = res.data.data && res.data.data !== {} ? res.data.data : 0; }else{ state.capacity = 0; } From 2e2dac19d4066fa5df1029d1ad45e00b69496c4b Mon Sep 17 00:00:00 2001 From: wyx Date: Fri, 24 Feb 2023 21:13:57 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE/=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=9B=BE-=E8=AF=84=E4=BC=B0=E4=BB=BB=E5=8A=A1=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E8=AF=84=E4=BC=B0=E7=AD=94=E9=A2=98=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ViewAssess.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/drawers/ViewAssess.vue b/src/components/drawers/ViewAssess.vue index 4d29d6dc..7bce6344 100644 --- a/src/components/drawers/ViewAssess.vue +++ b/src/components/drawers/ViewAssess.vue @@ -194,7 +194,7 @@ export default { console.log('我是传递过来的参数', props.datasource) console.log('我是传递过来的参数2', props.basicdata) api.QueryAssessmentDetail({ - "assessmentSubmitId": props.datasource.assessmentSubmitId, + "assessmentSubmitId": props.datasource.assessmentSubmitId?props.datasource.assessmentSubmitId:props.datasource.assessmentResultIds, "courseId": props.basicdata.id, "studentId": props.datasource.studentId }).then(res=>{ From 5c551c79b8b71f8a1d09d22a95d01fe5acfff7cf Mon Sep 17 00:00:00 2001 From: caozc Date: Fri, 24 Feb 2023 21:21:53 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87?= =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E5=B7=B2=E5=AE=A1=E6=A0=B8=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=9A=84=E5=AE=A1=E6=A0=B8=E6=97=A5=E5=BF=97=E6=9F=A5=E5=88=B0?= =?UTF-8?q?=E4=B8=A4=E6=9D=A1=E7=9B=B8=E5=90=8C=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ProjectAudit.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue index fb1a8d15..75c9d5fe 100644 --- a/src/components/drawers/ProjectAudit.vue +++ b/src/components/drawers/ProjectAudit.vue @@ -417,7 +417,7 @@ export default { message.error(`请输入审核意见！`); return; } - + ctx.emit("update:ProjAuditvisible", false); auditView({ createId: props.chooseCreateId, createName: props.chooseCreater, From 48076bbbbb44a59002c5036b01cb3844ea788346 Mon Sep 17 00:00:00 2001 From: lixg Date: Fri, 24 Feb 2023 21:29:32 +0800 Subject: [PATCH 4/7] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=B4=E6=98=8E=E6=8F=90=E7=A4=BA=E6=A1=86=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskPage.vue | 1691 ++++++++++++++++++-------- 1 file changed, 1160 insertions(+), 531 deletions(-) diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index e47063ed..7ad64ebf 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -12,9 +12,9 @@
项目经理：{{ manager }}
起止时间：{{ startTime }}至{{ endTime }}
-
- - + - + - + - + - + -
+
{{ act }}
-
+
{{ act }}
-
+
{{ act }}
-
+
{{ act }}
- +
@@ -83,9 +120,9 @@
- - - + - - - - - @@ -153,14 +195,18 @@
-
+
@@ -175,7 +221,11 @@
快速添加任务/阶段
-
+
@@ -189,9 +239,9 @@ 添加学员
快速添加学员
-
- - +
-
- {{ item.name || "无阶段" }} +
+ {{ item.name || "无阶段" }}
@@ -304,20 +372,34 @@
- +
课程完成率
- +
考试通过率
- +
作业完成率
@@ -326,23 +408,32 @@
阶段任务总数 - +
{{ stageOverviewList[choosedStageIndex]?.totalReqCnt }}
必修课 - +
{{ stageOverviewList[choosedStageIndex]?.totalOptCnt }}
选修课 - +
@@ -354,19 +445,28 @@
任务大纲
- + :template-url="`/admin/project/exportTaskCoursePlan/${projectId}?type=1&taskType=2&thirdType=3`" + > - + - -
- -
+
- +
@@ -552,14 +704,18 @@
-
+
@@ -583,14 +739,24 @@
- + @@ -599,7 +765,10 @@
小组名称：
- +
@@ -624,24 +793,33 @@
导出小组
- +
导入小组长
-
-
+
{{ item.groupName }}
- . . . + . . .
-
+
编辑
@@ -653,17 +831,22 @@
组长：{{ item.leaderName }}
进度
- +
-
-
组员名单 >
- -
+
- +
无证书
@@ -810,54 +1057,77 @@
+添加证书
-
+
- +
获取规则
{{ item.finishType === 1 - ? "完成项目" - : item.finishType === 2 + ? "完成项目" + : item.finishType === 2 ? "完成阶段" : item.finishType === 3 - ? "完成任务" - : item.finishType === 4 - ? "考试合格" - : item.finishType === 5 - ? "获得积分" - : "-" + ? "完成任务" + : item.finishType === 4 + ? "考试合格" + : item.finishType === 5 + ? "获得积分" + : "-" }}
更多 - -
- + +
+ @@ -868,25 +1138,33 @@
- +
- -
+ +
- -
- +
+ -
+
编辑
@@ -899,13 +1177,19 @@
封面图：
- +
项目时间：
- {{ startTime }} ～ {{ endTime }} + {{ startTime }} ～ {{ endTime }}
@@ -924,7 +1208,10 @@
项目级别：
- +
@@ -932,22 +1219,29 @@
培训体系：
- +
同步学习记录：
- 同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程） + 同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）
是否BOEU实施：
- BOEU实施 + BOEU实施
@@ -974,34 +1268,60 @@
上传共享文档
- +
- - 上传 - + + 上传 + -
+
支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip
-
- - +
- +
+ +
+ +
+ -
- +
+ -
- -
- -
- - + " + src="@/assets/images/coursewareManage/zippic.png" + /> +
- {{ item.name }} - 下载 - 删除 + {{ item.name }} + 下载 + 删除
@@ -1082,86 +1442,190 @@
- + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - +
- -
+ +
- - 项目发布 + + 项目发布
- +
管理者进阶-腾飞班1
- 项目时间：2022/08/01-2022/08/30 + 项目时间：2022/08/01-2022/08/30
@@ -1178,8 +1642,12 @@ 发送项目通知
- 发给老师 - 发给学员 + 发给老师 + 发给学员
取消 @@ -1191,53 +1659,89 @@
- -
+ +
{{ !groupInfo?.id ? "创建小组" : "编辑小组" }}
- +
- +
小组名称:
- +
- +
组员人数:
- +
- +
小组长:
- +
@@ -1250,8 +1754,14 @@
- +
@@ -1277,7 +1787,13 @@
- +
@@ -1303,7 +1819,13 @@
- +
@@ -1329,8 +1851,14 @@
- +
@@ -1357,7 +1885,13 @@
- +
@@ -1383,27 +1917,50 @@ - -
+ +
- - 项目发布 + + 项目发布
-
- +
+
{{ releaseProjectName }}
- 项目时间：{{ startTime }}~{{ endTime }} + 项目时间：{{ startTime }}~{{ endTime }}
@@ -1415,9 +1972,9 @@
学员信息
项目共{{ projectStudentsNum }}名学员
+
-
- -
+
- +
@@ -1465,8 +2031,13 @@
- +
@@ -1491,7 +2062,13 @@
- +
@@ -1518,7 +2095,13 @@
- +
@@ -1542,10 +2125,19 @@
- + - +
@@ -1674,7 +2266,7 @@ export default { width: 80, align: "center", className: "h", - ellipsis: true + ellipsis: true, }, { title: "证书数量", @@ -1683,7 +2275,7 @@ export default { width: 80, align: "center", className: "h", - ellipsis: true + ellipsis: true, }, { title: "状态", @@ -1698,8 +2290,8 @@ export default { {record.finishTaskNum == 0 ? "未开始" : record.finishTaskNum == record.totalTaskNum - ? "已完成" - : "进行中"} + ? "已完成" + : "进行中"}
), }, @@ -1828,7 +2420,7 @@ export default { allDelete: false, //批量删除弹窗 pubproject: false, stugroup: false, - isEdit: false, + isEdit: false, canclestu: false, canclestu1: false, deleteOneStu: false, //删除单个学员弹窗 @@ -1848,7 +2440,7 @@ export default { inputValue3: 5, valueaddm: "", //创建小组输入小组长 valueaddg: "", //创建小组输入名称 - groupInfo: { leaderName: '', leaderId: '' }, //创建小组 + groupInfo: { leaderName: "", leaderId: "" }, //创建小组 groupPageList: [], //小组列表 groupNumber: 0, //组员人数 valuestun: "", //学员管理姓名 @@ -2480,7 +3072,7 @@ export default { console.log("点击换组", record.studentId); state.checkgroupStuId = record.studentId; }; - const showModal2 = (item,isEdit) => { + const showModal2 = (item, isEdit) => { state.isEdit = isEdit; state.stugroup = true; state.groupInfo = item || {}; @@ -2918,7 +3510,9 @@ export default {
{ - {/* console.log("点击了111", text); */ } + { + /* console.log("点击了111", text); */ + } showDeleteOne(text.record.studentId); }} > @@ -3113,12 +3707,12 @@ export default { value.source == 0 ? "报名加入" : value.source == 1 - ? "指定添加" - : value.source == 2 - ? "组织添加" - : value.source == 3 - ? "受众添加" - : "-", //加入方式 + ? "指定添加" + : value.source == 2 + ? "组织添加" + : value.source == 3 + ? "受众添加" + : "-", //加入方式 stutime: toDate(value.beginStudyTime, "Y-M-D"), //开始学习时间 }; array.push(obj); @@ -3162,10 +3756,10 @@ export default { state.valuegood == "优秀学员" ? 1 : state.valuegood == "普通学员" - ? 0 - : state.valuegood == "全部" - ? "" - : "", + ? 0 + : state.valuegood == "全部" + ? "" + : "", }; //重新获取列表 getStu(obj); @@ -3307,8 +3901,8 @@ export default { }; getGroupList(objf).then((res) => { state.groupPageList = res.data.data.rows; - setGroupList(res.data.data.rows) - }) + setGroupList(res.data.data.rows); + }); }; //删除小组 const deleteGroupBtn = (projectGroupId) => { @@ -3319,25 +3913,27 @@ export default { }; //创建小组 const createGroup = async () => { - console.log("state.groupPageList" + state.groupPageList) - const d = state.groupPageList.filter(item => item.leaderId === state.groupInfo.leaderId); + console.log("state.groupPageList" + state.groupPageList); + const d = state.groupPageList.filter( + (item) => item.leaderId === state.groupInfo.leaderId + ); const id = state.groupInfo.id; if (state.isEdit) { - if (d.length > 0 && d[0].id !== id ) { + if (d.length > 0 && d[0].id !== id) { return message.warn(d[0].leaderName + "已是小组长，请重新选择"); } - }else{ - if (d.length > 0 ) { + } else { + if (d.length > 0) { return message.warn(d[0].leaderName + "已是小组长，请重新选择"); } } // 过滤掉编辑时候，只修改了组员最大值时候 state.isEdit = false; - await editGroup({ ...state.groupInfo, projectId: state.projectId }) - message.success(id ? '小组编辑成功' : "小组创建成功"); + await editGroup({ ...state.groupInfo, projectId: state.projectId }); + message.success(id ? "小组编辑成功" : "小组创建成功"); getGroup(); - console.log("state.groupPageList:") + console.log("state.groupPageList:"); getStu(); }; //搜索小组重置 @@ -3550,14 +4146,14 @@ export default { state.action == 2 ? "发布" : state.action == 0 - ? "提交审核" - : state.action == 1 - ? "撤回审核" - : state.action == 3 - ? "撤回发布" - : state.action == -1 - ? "" - : "-"; + ? "提交审核" + : state.action == 1 + ? "撤回审核" + : state.action == 3 + ? "撤回发布" + : state.action == -1 + ? "" + : "-"; }); }; //打开发布弹窗 @@ -3840,36 +4436,36 @@ export default { status == -1 ? (isEnd = true) : nowTime > endTime - ? (isEnd = true) - : (isEnd = false); + ? (isEnd = true) + : (isEnd = false); break; case 3: status == -1 ? (isEnd = true) : nowTime > endTime - ? (isEnd = true) - : (isEnd = false); + ? (isEnd = true) + : (isEnd = false); break; case 5: status == -1 ? (isEnd = true) : nowTime > endTime - ? (isEnd = true) - : (isEnd = false); + ? (isEnd = true) + : (isEnd = false); break; case 7: status == -1 ? (isEnd = true) : nowTime > endTime - ? (isEnd = true) - : (isEnd = false); + ? (isEnd = true) + : (isEnd = false); break; case 10: status == -1 ? (isEnd = true) : nowTime > endTime - ? (isEnd = true) - : (isEnd = false); + ? (isEnd = true) + : (isEnd = false); break; } return isEnd; @@ -3888,9 +4484,9 @@ export default { return message.error("该任务无法学习，请联系管理员进行替换。"); window.open( window.location.protocol + - import.meta.env.VUE_APP_BOE_API_URL + - "/mobile/pages/study/courseStudy?id=" + - item.targetId, + import.meta.env.VUE_APP_BOE_API_URL + + "/mobile/pages/study/courseStudy?id=" + + item.targetId, "_top" ); } @@ -4266,16 +4862,20 @@ export default { .ant-modal { .ant-modal-body { .modalHeader { - background: linear-gradient(rgba(78, 166, 255, 0.2) 0%, - rgba(78, 166, 255, 0) 100%); + background: linear-gradient( + rgba(78, 166, 255, 0.2) 0%, + rgba(78, 166, 255, 0) 100% + ); } padding: 0; .modalHeader { - background: linear-gradient(0deg, - rgba(78, 166, 255, 0) 0%, - rgba(78, 166, 255, 0.2) 100%); + background: linear-gradient( + 0deg, + rgba(78, 166, 255, 0) 0%, + rgba(78, 166, 255, 0.2) 100% + ); } .modalMain { @@ -4311,9 +4911,11 @@ export default { .promessage { width: 280px; height: 110px; - background: linear-gradient(180deg, - rgba(254, 243, 221, 1), - rgba(255, 250, 240, 1)); + background: linear-gradient( + 180deg, + rgba(254, 243, 221, 1), + rgba(255, 250, 240, 1) + ); border-radius: 10px; margin-right: 7px; @@ -4335,9 +4937,11 @@ export default { .stumessage { width: 280px; height: 110px; - background: linear-gradient(180deg, - rgba(221, 234, 255, 1), - rgba(240, 248, 254, 1)); + background: linear-gradient( + 180deg, + rgba(221, 234, 255, 1), + rgba(240, 248, 254, 1) + ); border-radius: 10px; .messageme1 { @@ -4466,8 +5070,10 @@ export default { position: absolute; width: calc(100%); height: 68px; - background: linear-gradient(rgba(78, 166, 255, 0.2) 0%, - rgba(78, 166, 255, 0) 100%); + background: linear-gradient( + rgba(78, 166, 255, 0.2) 0%, + rgba(78, 166, 255, 0) 100% + ); } .del_main { @@ -4590,8 +5196,10 @@ export default { position: absolute; width: calc(100%); height: 68px; - background: linear-gradient(rgba(78, 166, 255, 0.2) 0%, - rgba(78, 166, 255, 0) 100%); + background: linear-gradient( + rgba(78, 166, 255, 0.2) 0%, + rgba(78, 166, 255, 0) 100% + ); } .del_main { @@ -4719,8 +5327,10 @@ export default { position: absolute; width: calc(100%); height: 68px; - background: linear-gradient(rgba(78, 166, 255, 0.2) 0%, - rgba(78, 166, 255, 0) 100%); + background: linear-gradient( + rgba(78, 166, 255, 0.2) 0%, + rgba(78, 166, 255, 0) 100% + ); } .del_main { @@ -4817,9 +5427,11 @@ export default { .ant-modal { .ant-modal-body { .modalHeader { - background: linear-gradient(0deg, - rgba(78, 166, 255, 0) 0%, - rgba(78, 166, 255, 0.2) 100%); + background: linear-gradient( + 0deg, + rgba(78, 166, 255, 0) 0%, + rgba(78, 166, 255, 0.2) 100% + ); } padding: 0; @@ -4916,8 +5528,10 @@ export default { padding: 0; .modalHeader { - background: linear-gradient(rgba(78, 166, 255, 0.2) 0%, - rgba(78, 166, 255, 0) 100%); + background: linear-gradient( + rgba(78, 166, 255, 0.2) 0%, + rgba(78, 166, 255, 0) 100% + ); } .modalMain { @@ -4954,9 +5568,11 @@ export default { .promessage { width: 280px; height: 110px; - background: linear-gradient(180deg, - rgba(254, 243, 221, 1), - rgba(255, 250, 240, 1)); + background: linear-gradient( + 180deg, + rgba(254, 243, 221, 1), + rgba(255, 250, 240, 1) + ); border-radius: 10px; margin-right: 7px; @@ -4978,9 +5594,11 @@ export default { .stumessage { width: 280px; height: 110px; - background: linear-gradient(180deg, - rgba(221, 234, 255, 1), - rgba(240, 248, 254, 1)); + background: linear-gradient( + 180deg, + rgba(221, 234, 255, 1), + rgba(240, 248, 254, 1) + ); border-radius: 10px; .messageme1 { @@ -5247,7 +5865,7 @@ export default { .tableBox { margin: 20px 38px 30px; - .ant-table-thead>tr>th { + .ant-table-thead > tr > th { font-size: 14px; font-weight: 400; color: #999ba3; @@ -5264,12 +5882,11 @@ export default { } .content { - //margin: 0 37px; - .ant-tabs-top>.ant-tabs-nav::before, - .ant-tabs-bottom>.ant-tabs-nav::before, - .ant-tabs-top>div>.ant-tabs-nav::before, - .ant-tabs-bottom>div>.ant-tabs-nav::before { + .ant-tabs-top > .ant-tabs-nav::before, + .ant-tabs-bottom > .ant-tabs-nav::before, + .ant-tabs-top > div > .ant-tabs-nav::before, + .ant-tabs-bottom > div > .ant-tabs-nav::before { border-bottom: 0px; } @@ -5545,12 +6162,12 @@ export default { min-width: 1040px; } - .ant-collapse-content>.ant-collapse-content-box { + .ant-collapse-content > .ant-collapse-content-box { padding-top: 0px; padding-bottom: 0px; } - .ant-collapse>.ant-collapse-item { + .ant-collapse > .ant-collapse-item { border: 0px; } @@ -5932,12 +6549,12 @@ export default { } .tab { - .ant-table-thead>tr>th { + .ant-table-thead > tr > th { background-color: rgba(239, 244, 252, 1); color: rgba(0, 0, 0, 0.85); } - .ant-table-tbody>tr>td { + .ant-table-tbody > tr > td { border-bottom: 1px solid #f0f6fc; color: rgba(0, 0, 0, 0.65); } @@ -5946,7 +6563,9 @@ export default { background-color: #eff4fc !important; } - .ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td { + .ant-table-tbody + > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) + > td { background: rgba(250, 250, 250, 1); } @@ -6059,7 +6678,9 @@ export default { margin-left: 8px; display: inline-block; - .ant-select:not(.ant-select-customize-input) .ant-select-selector .ant-select-selection-search-input { + .ant-select:not(.ant-select-customize-input) + .ant-select-selector + .ant-select-selection-search-input { background-color: rgba(255, 255, 255, 0); border: none; } @@ -6069,11 +6690,15 @@ export default { border: none; } - .ant-select-single:not(.ant-select-customize-input) .ant-select-selector { + .ant-select-single:not(.ant-select-customize-input) + .ant-select-selector { padding: 0; } - .ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) .ant-select-selector { + .ant-select-focused:not(.ant-select-disabled).ant-select:not( + .ant-select-customize-input + ) + .ant-select-selector { box-shadow: none; } @@ -6490,7 +7115,9 @@ export default { background-color: #eff4fc !important; } - .ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td { + .ant-table-tbody + > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) + > td { background: #f6f9fd; } } @@ -7222,8 +7849,10 @@ export default { position: absolute; width: calc(100%); height: 40px; - background: linear-gradient(rgba(78, 166, 255, 0.2) 0%, - rgba(78, 166, 255, 0) 100%); + background: linear-gradient( + rgba(78, 166, 255, 0.2) 0%, + rgba(78, 166, 255, 0) 100% + ); } .del_main { From 85eeceff3d0066ab31175eb183fa618bbcdf4136 Mon Sep 17 00:00:00 2001 From: lpq Date: Fri, 24 Feb 2023 21:35:13 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/DownLoad.vue | 1 + vue.config.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/DownLoad.vue b/src/views/DownLoad.vue index af7fe54b..e9a79873 100644 --- a/src/views/DownLoad.vue +++ b/src/views/DownLoad.vue @@ -177,6 +177,7 @@ export default { } function formatCapacityGB(data) { + debugger let num = Number(data); let CMB = (num / (1048576*1024)).toFixed(2); return CMB diff --git a/vue.config.js b/vue.config.js index 56f9b80f..4c22a764 100644 --- a/vue.config.js +++ b/vue.config.js @@ -15,8 +15,8 @@ module.exports = defineConfig({ port: 8070, proxy: { "/manageApi": { - target: 'http:' + process.env.VUE_APP_PROXY_URL, - // target: 'http://localhost:30001', + //target: 'http:' + process.env.VUE_APP_PROXY_URL, + target: 'http://localhost:30001', changeOrigin: true, //表示是否改变原域名 pathRewrite: { "^/manageApi": "", From fe37c6e2735467b829561b3fe15a9951543e619f Mon Sep 17 00:00:00 2001 From: lixg Date: Fri, 24 Feb 2023 21:53:46 +0800 Subject: [PATCH 6/7] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ProjectAudit.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue index 75c9d5fe..0f035ae4 100644 --- a/src/components/drawers/ProjectAudit.vue +++ b/src/components/drawers/ProjectAudit.vue @@ -437,7 +437,8 @@ export default { }); }; const getDictList = async (param) => - api1.getDict({ + api1 + .getDict({ pageNo: 1, pageSize: 20, setCode: param, @@ -648,7 +649,6 @@ export default { background-color: #fafafa; } .reworkCon { - height: 56px; display: flex; align-items: center; border-bottom: 1px solid #f0f6fc; From a663f4711d17db61440d8dff6c79b5843abdb846 Mon Sep 17 00:00:00 2001 From: lpq Date: Fri, 24 Feb 2023 22:39:03 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=8D=A2=E7=BB=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/ChangeGroupModal.vue | 10 +++++++--- src/components/student/TableStudent.vue | 6 +++++- src/views/projectcenter/TaskPage.vue | 9 ++++++--- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/components/student/ChangeGroupModal.vue b/src/components/student/ChangeGroupModal.vue index 4d5f770d..ab4fa38f 100644 --- a/src/components/student/ChangeGroupModal.vue +++ b/src/components/student/ChangeGroupModal.vue @@ -48,6 +48,10 @@ const props = defineProps({ type: Boolean, default: false, }, + checkBatch: { + type: Boolean, + default: false, + }, groupList: { type: Array, default: () => [], @@ -56,10 +60,10 @@ const props = defineProps({ type: Number, default: null, }, + }); const option = computed(() => { - debugger console.log("props.groupList", props.groupList); return props.groupList.map((e) => ({ label: e.groupName, @@ -81,13 +85,13 @@ const selectGroup = (e, v) => { }; //确认换组 const changeGroup = (item) => { - // debugger + debugger console.log("换组", selectGroupId.value, item); props.checkgroupStuId.forEach(stu => { let obj = { groupId: selectGroupId.value, groupName: selectGroupName.value, - studentId: stu, + id: stu, }; console.log("换组obj", obj); api diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index da45de94..e6ce26d4 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -164,7 +164,7 @@ - @@ -407,6 +407,7 @@ const checkgroupParam = ref({ changegroupV: false, //学员名称 checkgroupList: "", //学员小组 checkgroupStuId: null, + checkBatch: true }); const stuSelectKeys = ref([]); @@ -426,10 +427,13 @@ const stuRowSelection = computed(() => ({ //显示学员换组弹窗 function showChangeGroupModal() { + debugger + console.log("批量") const d = props.groupList console.log("d" + d) // debugger checkgroupParam.value.changegroupV = true; + checkgroupParam.value.checkBatch = true; } // 导出数据 diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 7ad64ebf..d0d28411 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -2356,6 +2356,7 @@ export default { ], //小组信息列表 groupList: [], + isBatch: false, // 批量 // stuName: "", //搜索的学员姓名 // stuGroup: "", //搜索的学员小组名称 // stuBum: "", //搜索的学员小组部门 @@ -3068,9 +3069,12 @@ export default { }; //显示学员换组弹窗 const showChangeGroupModal = (record) => { + debugger + console.log("单个") state.changegroupV = true; - console.log("点击换组", record.studentId); - state.checkgroupStuId = record.studentId; + console.log("点击换组", record.id); + state.checkgroupStuId = []; + state.checkgroupStuId.push(record.id) ; }; const showModal2 = (item, isEdit) => { state.isEdit = isEdit; @@ -3147,7 +3151,6 @@ export default { } //考勤的抽屉 const showAA = (course, a, data) => { - // debugger; state.AAvisible = true; state.liveData = data; state.showKaoqinText = "直播";