From 164f30c793b06c95eb7423201b8725513afecb54 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 7 Mar 2023 17:43:51 +0800 Subject: [PATCH 01/14] -- fix bug --- src/views/projectcenter/TaskPage.vue | 41 +++++++++++++++------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 40c114b6..5211570b 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -23,25 +23,25 @@
@@ -50,7 +50,7 @@
{{ act }} @@ -59,7 +59,7 @@
{{ act }} @@ -68,7 +68,7 @@
{{ act }} @@ -77,7 +77,7 @@
{{ act }} @@ -185,7 +185,7 @@
快速创建项目详情
-
+
批量面授报名 -->
-
+
-
+
{{ record.topFlag ? "取消优秀" : "优秀学员" }} 换组 @@ -795,7 +795,7 @@
-
+
创建小组 @@ -832,7 +832,7 @@ style="color: rgba(0, 0, 0, 0.45); cursor: pointer" >. . . -
+
编辑
@@ -1072,7 +1072,7 @@
+添加证书
@@ -1181,7 +1181,7 @@
-->
@@ -1299,7 +1299,7 @@ v-if="docChecked == true" v-model:file-list="fileList" name="file" - :action="process.env.VUE_APP_BASE_API + '/file/uploadunlimit'" + :action="baseUrl + '/file/uploadunlimit'" @change="handleChange" > Date: Tue, 7 Mar 2023 18:04:55 +0800 Subject: [PATCH 02/14] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE=E6=92=A4=E5=9B=9E?= =?UTF-8?q?=E7=BB=93=E6=9D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/ProjectManage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 45a48f7d..76b91291 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -199,7 +199,7 @@ >结束 撤回 Date: Tue, 7 Mar 2023 18:30:12 +0800 Subject: [PATCH 03/14] =?UTF-8?q?fix:=20=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/components/seeModal.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/courselibrary/components/seeModal.vue b/src/views/courselibrary/components/seeModal.vue index fe44b6f8..d0475ddb 100644 --- a/src/views/courselibrary/components/seeModal.vue +++ b/src/views/courselibrary/components/seeModal.vue @@ -95,7 +95,7 @@
Date: Tue, 7 Mar 2023 20:45:28 +0800 Subject: [PATCH 04/14] =?UTF-8?q?fix:=E6=9F=A5=E7=9C=8B=E6=8A=95=E7=A5=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/CheckVote.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/drawers/CheckVote.vue b/src/components/drawers/CheckVote.vue index 28c93747..3d9335a1 100644 --- a/src/components/drawers/CheckVote.vue +++ b/src/components/drawers/CheckVote.vue @@ -31,6 +31,8 @@ > {{items.optionName}} +
+
@@ -151,9 +153,8 @@ export default { } } } + console.log(choiceArr) state.currentChoice = choiceArr - - }).catch(err=>{ console.log(err) }) From 4ae03e9cc732b070ed662e9a32993952bb6c9c38 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Tue, 7 Mar 2023 21:29:07 +0800 Subject: [PATCH 05/14] =?UTF-8?q?fix:=E8=AF=84=E4=BC=B0=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=AD=A6=E5=91=98=E6=83=85=E5=86=B5-=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/research/ManagePage.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/research/ManagePage.vue b/src/views/research/ManagePage.vue index 1991b9bf..39ed0052 100644 --- a/src/views/research/ManagePage.vue +++ b/src/views/research/ManagePage.vue @@ -52,7 +52,7 @@
-
学员情况1
+
学员情况
导出信息
@@ -144,7 +144,7 @@ export default { // 导出学员信息 function exportStudentInfo() { - window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?assessmentId=${router.currentRoute.value.params.id}`) + window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?courseId=${router.currentRoute.value.params.id}`) } //分页 From 7fd172679b00b5ad987bbed3fc40a790e9b21c51 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Tue, 7 Mar 2023 22:19:37 +0800 Subject: [PATCH 06/14] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE=E8=80=83=E8=AF=95?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=82=AC=E4=BF=83=E8=80=83=E8=AF=95=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/project/ProjectExamManage.vue | 6 +++--- .../drawers/project/ProjectExternalExamManage.vue | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue index d856d88a..c983fe8c 100644 --- a/src/components/drawers/project/ProjectExamManage.vue +++ b/src/components/drawers/project/ProjectExamManage.vue @@ -370,10 +370,10 @@ export default { 'courseId': props.datasource.courseId,//任务的Id 'courseName': props.title,//任务的名称 'logo': '1',//项目或径的标识 1-项目 2-路径图 3面授课 - 'routerTaskId': props.datasource.routerId,//任务的routerTaskld或projectTaskld - 'targetId': props.datasource.routerId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话 + 'routerTaskId': props.datasource.projectId,//任务的routerTaskld或projectTaskld + 'targetId': props.datasource.projectId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话 'taskType': props.datasource.type,//催促的任务的类型 - 'chapterId': props.datasource.chapterId,//阶段或关卡Id + 'chapterId': props.datasource.stageId,//阶段或关卡Id }; batchSendMessage(obj).then(res => { console.log(res) diff --git a/src/components/drawers/project/ProjectExternalExamManage.vue b/src/components/drawers/project/ProjectExternalExamManage.vue index d1925f05..a7909ceb 100644 --- a/src/components/drawers/project/ProjectExternalExamManage.vue +++ b/src/components/drawers/project/ProjectExternalExamManage.vue @@ -366,10 +366,10 @@ 'courseId': props.datasource.courseId,//任务的Id 'courseName': props.title,//任务的名称 'logo': '1',//项目或径的标识 1-项目 2-路径图 3面授课 - 'routerTaskId': props.datasource.routerId,//任务的routerTaskld或projectTaskld - 'targetId': props.datasource.routerId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话 + 'routerTaskId': props.datasource.projectId,//任务的routerTaskld或projectTaskld + 'targetId': props.datasource.projectId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话 'taskType': props.datasource.type,//催促的任务的类型 - 'chapterId': props.datasource.chapterId,//阶段或关卡Id + 'chapterId': props.datasource.stageId,//阶段或关卡Id }; batchSendMessage(obj).then(res => { message.success("催促" + props.title + "成功"); From b25d07e59229dcd363693973ed4f102e497e83cd Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Tue, 7 Mar 2023 23:52:41 +0800 Subject: [PATCH 07/14] =?UTF-8?q?fix:=E6=9F=A5=E7=9C=8B=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E9=A2=98=E7=9B=AE=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ViewAssess.vue | 58 ++++++++++++++++++++------- 1 file changed, 44 insertions(+), 14 deletions(-) diff --git a/src/components/drawers/ViewAssess.vue b/src/components/drawers/ViewAssess.vue index d60c4054..fe707fd7 100644 --- a/src/components/drawers/ViewAssess.vue +++ b/src/components/drawers/ViewAssess.vue @@ -41,17 +41,22 @@
-
-
选择{{indexss+1}}：
-
-
-
+
+
+
选择{{indexss+1}}：
+
+
+
+
+
+ {{itteems.singleOptionName}}
-
- {{itteems.singleOptionName}}
+ +
+
@@ -68,15 +73,19 @@
-
-
选择{{indexss+1}}：
-
-
-
+
+
+
选择{{indexss+1}}：
+
+
+
+
+
+ {{itteems.multipleOptionName}}
-
- {{itteems.multipleOptionName}}
+ +
@@ -217,10 +226,31 @@ export default { } }; + // 判断当前题目中是否有的选项有图片有的没有 + const isExistImg = (data, index) => { + let exist = false; + data.forEach((i,n)=>{ + console.log(i,n) + if(index==1){ + if(i.singleOptionPictureAddress){ + exist = true; + return exist; + } + }else{ + if(i.multipleOptionPictureAddress){ + exist = true; + return exist; + } + } + }) + return exist; + } + return { ...toRefs(state), afterVisibleChange, closeDrawer, + isExistImg // change, }; }, From 5299c44ceb086d2a100f62877ee67686870f9295 Mon Sep 17 00:00:00 2001 From: wuxt Date: Wed, 8 Mar 2023 00:46:34 +0800 Subject: [PATCH 08/14] =?UTF-8?q?fix:EQG-1081=20=E5=B0=8F=E7=BB=84?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9F=A5=E8=AF=A2=E6=98=BE=E7=A4=BA=E5=B0=8F?= =?UTF-8?q?=E7=BB=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 3 ++- src/views/projectcenter/TaskPage.vue | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.env b/.env index 37fbf395..02fee926 100644 --- a/.env +++ b/.env @@ -5,7 +5,8 @@ VUE_APP_BASE_API=/manageApi #文件路径 VUE_APP_FILE_PATH=/upload/ # 代理url 本地调试，不可以用在其他地方 -VUE_APP_PROXY_URL=//43.143.139.204/manageApi +#VUE_APP_PROXY_URL=//43.143.139.204/manageApi +VUE_APP_PROXY_URL=//127.0.0.1:30001 # 登录url VUE_APP_LOGIN_URL=//u-pre.boe.com/web # boe域名 diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index a1eb0ecc..3e4403fa 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -2820,7 +2820,7 @@ export default { startTime: state.rankStartTime ? state.rankStartTime : 0, // 数据查询的起始时间 10位时间戳 endTime: state.rankEndTime ? state.rankEndTime : 0, stageId: state.valuestu2, // 阶段ID - type: Number(state.valuestu3), // 查询类型 0 学员积分榜 1 小组积分榜 + type: Number(state.valuestu1), // 查询类型 0 学员积分榜 1 小组积分榜 }; console.log("我是获取得项目进度排行榜--》", obj); api From deb721bc88cac78e5761a864a36a371598e1f113 Mon Sep 17 00:00:00 2001 From: wuxt Date: Wed, 8 Mar 2023 00:51:27 +0800 Subject: [PATCH 09/14] =?UTF-8?q?fix:=E8=BF=98=E5=8E=9F=20.env?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.env b/.env index df36dccb..df7550eb 100644 --- a/.env +++ b/.env @@ -5,8 +5,7 @@ VUE_APP_BASE_API=/manageApi #文件路径 VUE_APP_FILE_PATH=/upload/ # 代理url 本地调试，不可以用在其他地方 -#VUE_APP_PROXY_URL=//43.143.139.204/manageApi -VUE_APP_PROXY_URL=//127.0.0.1:30001 +VUE_APP_PROXY_URL=//43.143.139.204/manageApi # 登录url VUE_APP_LOGIN_URL=//u-pre.boe.com/web # boe域名 From 44dd643f41eff91161f163787b403798654fdbca Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 8 Mar 2023 01:07:03 +0800 Subject: [PATCH 10/14] =?UTF-8?q?--=20fix=20=E6=9D=83=E9=99=90=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/MemberList.vue | 18 +++++++++++++--- .../student/TableCertificateStudent.vue | 16 +++++++++++--- src/views/learningpath/LevelAdd.vue | 2 ++ src/views/projectcenter/TaskPage.vue | 21 +++++++++++++------ 4 files changed, 45 insertions(+), 12 deletions(-) diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue index e2049235..6ba67c16 100644 --- a/src/components/drawers/MemberList.vue +++ b/src/components/drawers/MemberList.vue @@ -48,6 +48,7 @@
添加组员
--> -
+
批量删除
-
+
导出组员
@@ -192,6 +193,7 @@ import { toDate } from "../../api/method"; import { message } from "ant-design-vue"; // import AddGroupMembers from "./AddGroupMembers.vue"; import CommonStudent from "@/components/student/CommonStudent"; +import {checkPer} from "@/utils/utils"; export default { name: "MemberList", components: { @@ -220,6 +222,14 @@ export default { type: Number, default: null, }, + createId: { + type: Number, + default: null, + }, + permissions: { + type: String, + default: null, + }, }, setup(props, ctx) { @@ -293,13 +303,14 @@ export default { scopedSlots: { customRender: "action" }, //引入的插槽 customRender: (value) => { return ( + checkPer(props.permissions,props.createId)?
{ deleteOne(value.record.key,value.record); }} > 删除 -
+
:'' ); }, }, @@ -556,6 +567,7 @@ export default { return { ...toRefs(state), closeDrawer, + checkPer, showModal, closeModal, showStuAdd, diff --git a/src/components/student/TableCertificateStudent.vue b/src/components/student/TableCertificateStudent.vue index 680187d5..0f26babb 100644 --- a/src/components/student/TableCertificateStudent.vue +++ b/src/components/student/TableCertificateStudent.vue @@ -56,7 +56,7 @@ 重置
-
批量取消证书
+
批量取消证书
{ // console.log(text.record.checked1); return ( -
+ checkPer(props.permissions,props.createId)?
{record.record.status === -1 ? (
证书已取消 @@ -186,7 +195,7 @@ export default { 取消证书
)} -
+
:'' ); }, }, @@ -323,6 +332,7 @@ export default { stuCertList, search, reset, + checkPer, onSelectChange, changePaginationStu, returnClick, diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 93d1f95a..61ad79aa 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -499,6 +499,7 @@
+
考勤
@@ -640,6 +640,7 @@
-
上传共享文档
-
+
上传共享文档
+
@@ -1437,6 +1442,7 @@ > 删除 Date: Wed, 8 Mar 2023 01:11:33 +0800 Subject: [PATCH 11/14] =?UTF-8?q?fix:=E8=B7=AF=E5=BE=84=E5=9B=BE=E5=92=8C?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BC=96=E8=BE=91=E6=97=B6=E5=8E=9F=E5=90=8D?= =?UTF-8?q?=E5=AD=97=E6=98=BE=E7=A4=BA=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/project/NameInput.vue | 26 +++++++++++++++++++---- src/views/learningpath/LearningPath.vue | 5 +++++ src/views/projectcenter/ProjectManage.vue | 8 ++++++- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/src/components/project/NameInput.vue b/src/components/project/NameInput.vue index efd00ba2..d7f2c3c9 100644 --- a/src/components/project/NameInput.vue +++ b/src/components/project/NameInput.vue @@ -5,12 +5,12 @@ :show-count="showCount" :maxlength="maxlength" /> -
+
名称重复，请重新输入