From 351626701c8f894b113f0ddd3751ffaf9c95d815 Mon Sep 17 00:00:00 2001 From: caozc Date: Wed, 1 Mar 2023 00:23:29 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=E6=8A=95=E7=A5=A8=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=8A=95=E7=A5=A8=E6=97=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=20=20=20=20=20=E9=A1=B9=E7=9B=AE=E5=A4=8D=E5=88=B6=20=E4=B8=80?= =?UTF-8?q?=E7=9B=B4=E8=BD=AC=E5=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/CheckVote.vue | 19 ++++++++----------- src/views/projectcenter/ProjectManage.vue | 7 +++++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/components/drawers/CheckVote.vue b/src/components/drawers/CheckVote.vue index f68db461..cfbde7df 100644 --- a/src/components/drawers/CheckVote.vue +++ b/src/components/drawers/CheckVote.vue @@ -19,7 +19,7 @@
投票题目
-
+
{{ index+1 +"."+ item.voteStemName }}
@@ -50,7 +50,8 @@ import { toRefs,reactive } from '@vue/reactivity'; import {computed} from "vue"; import { useStore } from "vuex"; -import * as api from "../../api/indexTaskManage"; +// import * as api from "../../api/indexTaskManage"; +import {queryStemByStemId} from '@/api/indexVote'; export default { name:"CheckWork", @@ -126,19 +127,15 @@ export default { function getData() { console.log('我是请求的参数', { "courseId": props.courseID, - "studentId": userInfo.value.id, - "voteSubmitId": props.voteID + "userInfo": userInfo.value, + "voteId": props.voteID }) - api.QueryVoteTaskDetailById({ - "courseId": props.courseID, - "studentId": userInfo.value.id, - "voteSubmitId": props.voteID - }).then(res=>{ + queryStemByStemId(props.courseID).then(res=>{ console.log(res) state.voteResource = res.data.data - let choiceArr = [] - let dataQuestion = state.voteResource.ballotVo.voteStemVoList + //2023-02-28 + let dataQuestion = state.voteResource.voteStemDtoList for(let i=0;i getTableDate()); - message.success("复制成功"); + .then(() => { + state.tableLoading = false; + message.success("复制成功"); + getTableDate() + }); }; //打开提交审核弹窗 const showReviewModal = (projectId) => { From 5e5b280d95c8a0baf625fb087b64db8c9e2058a2 Mon Sep 17 00:00:00 2001 From: lixg Date: Fri, 3 Mar 2023 20:14:40 +0800 Subject: [PATCH 2/7] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=85=B1=E4=BA=AB?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAdd.vue | 18 +++++++----------- src/views/projectcenter/LibraryAdd.vue | 19 ++++++++----------- src/views/projectcenter/TaskPage.vue | 16 +++++++--------- 3 files changed, 22 insertions(+), 31 deletions(-) diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 146e6cdb..687b4675 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -2786,17 +2786,13 @@ export default { // 共享文档文件下载 const downloadFile = (url) => { - console.log(url); - let urlNew = url.slice(1); - console.log(urlNew); - if (urlNew) { - window.open( - window.location.protocol + - process.env.VUE_APP_BOE_API_URL + - process.env.VUE_APP_FILE_PATH + - urlNew - ); - } + console.log("url", url); + window.open( + window.location.protocol + + process.env.VUE_APP_BOE_API_URL + + process.env.VUE_APP_FILE_PATH + + url + ); // if(url){ // const filename = '操作指南' // const x = new XMLHttpRequest() diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index 003fbd5b..e7c7649d 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -550,8 +550,7 @@
同步学习记录：
- 同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程） { console.log(url); - let urlNew = url.slice(1); - if (urlNew) { - window.open( - window.location.protocol + - process.env.VUE_APP_BOE_API_URL + - process.env.VUE_APP_FILE_PATH + - urlNew - ); - } + window.open( + window.location.protocol + + process.env.VUE_APP_BOE_API_URL + + process.env.VUE_APP_FILE_PATH + + url + ); + // if (url) { // window.open(url) // } diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 0d079455..17fed061 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -4679,15 +4679,13 @@ export default { // 共享文档文件下载 const downloadFile = (url) => { console.log(url); - let urlNew = url.slice(1); - if (urlNew) { - window.open( - window.location.protocol + - process.env.VUE_APP_BOE_API_URL + - process.env.VUE_APP_FILE_PATH + - urlNew - ); - } + window.open( + window.location.protocol + + process.env.VUE_APP_BOE_API_URL + + process.env.VUE_APP_FILE_PATH + + url + ); + // url && window.open(url); }; function stageChange(item, index) { From fb11f951d90c0027f354d2f5df6245486e0ec58e Mon Sep 17 00:00:00 2001 From: wyx Date: Fri, 3 Mar 2023 20:57:49 +0800 Subject: [PATCH 3/7] =?UTF-8?q?style:=E9=9D=A2=E6=8E=88=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 6e5f4565..ddfc4893 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -5140,7 +5140,7 @@ export default defineComponent({ .btnn { padding: 0px 26px 0px 26px; height: 38px; - background: #ffffff; + background: #4ea6ff; border-radius: 8px; border: 1px solid rgba(64, 158, 255, 1); display: flex; @@ -5157,7 +5157,7 @@ export default defineComponent({ .btnText { font-size: 14px; font-weight: 400; - color: #4ea6ff; + color: #fff; line-height: 36px; margin-left: 5px; } @@ -5170,18 +5170,23 @@ export default defineComponent({ background-image: url("../../assets/images/courseManage/search0.png"); } } - + .btn1:active { + background: #0982ff; + } + .btn2:active { + background: #0982ff; + } .btn2 { .search { width: 16px; height: 18px; - background-image: url("../../assets/images/courseManage/reset1.png"); + background-image: url("../../assets/images/courseManage/reset0.png"); } .daochu { width: 16px; height: 18px; - background-image: url("../../assets/images/coursewareManage/export.png"); + background-image: url("../../assets/images/coursewareManage/export1.png"); } } @@ -5238,7 +5243,9 @@ export default defineComponent({ margin-left: 5px; } } - + .btn3:active { + background: #0982ff; + } .btn3 { .search { width: 17px; From bbfe70a89546ae8cf9960bcfa5e249c956ec6116 Mon Sep 17 00:00:00 2001 From: wyx Date: Fri, 3 Mar 2023 21:10:15 +0800 Subject: [PATCH 4/7] =?UTF-8?q?style:=E8=AF=84=E4=BC=B0=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ViewAssess.vue | 2 +- src/views/research/ManagePage.vue | 10 ++++-- src/views/research/ResearchAdd.vue | 2 ++ src/views/research/ResearchManage.vue | 50 +++++++++++++-------------- 4 files changed, 35 insertions(+), 29 deletions(-) diff --git a/src/components/drawers/ViewAssess.vue b/src/components/drawers/ViewAssess.vue index c79e86c3..d60c4054 100644 --- a/src/components/drawers/ViewAssess.vue +++ b/src/components/drawers/ViewAssess.vue @@ -130,7 +130,7 @@
- +
diff --git a/src/views/research/ManagePage.vue b/src/views/research/ManagePage.vue index 754e329d..764cbcbe 100644 --- a/src/views/research/ManagePage.vue +++ b/src/views/research/ManagePage.vue @@ -485,7 +485,7 @@ export default { .img2 { width: 16px; height: 18px; - background-image: url(../../assets/images/coursewareManage/export.png); + background-image: url(../../assets/images/coursewareManage/export1.png); background-size: 100% 100%; margin-right: 7px; } @@ -498,9 +498,13 @@ export default { } .btn2 { - background: #ffffff; + background: #4ea6ff; - color: #4ea6ff; + color: #fff; border: 1px solid #4ea6ff; } + + .btn2:active { + background: #0982ff; + } } \ No newline at end of file diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue index 8b5fbbaf..a41405a2 100644 --- a/src/views/research/ResearchAdd.vue +++ b/src/views/research/ResearchAdd.vue @@ -82,6 +82,8 @@ height: 40px; margin-left: 14px; border-radius: 8px; + color:#fff; + background-color: #4ea6ff; " @click="handleAllCancel" > diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue index 275eb8b7..21eab1d3 100644 --- a/src/views/research/ResearchManage.vue +++ b/src/views/research/ResearchManage.vue @@ -144,7 +144,7 @@
- + {{ !formData.id ? "下一步" : "确定" }} @@ -589,7 +589,7 @@ const handleNext = async () => { .btnn { padding: 0px 26px 0px 26px; height: 38px; - background: #ffffff; + background: #4ea6ff; border-radius: 8px; border: 1px solid rgba(64, 158, 255, 1); display: flex; @@ -606,7 +606,7 @@ const handleNext = async () => { .btnText { font-size: 14px; font-weight: 400; - color: #4ea6ff; + color: #fff; line-height: 36px; margin-left: 5px; } @@ -624,29 +624,29 @@ const handleNext = async () => { .search { width: 16px; height: 18px; - background-image: url("../../assets/images/courseManage/reset1.png"); + background-image: url("../../assets/images/courseManage/reset0.png"); } } - .btn1:hover { - background: rgba(64, 158, 255, 0.76); + // .btn1:hover { + // background: rgba(64, 158, 255, 0.76); - .search { - background-image: url("../../assets/images/courseManage/search0.png"); - } + // .search { + // background-image: url("../../assets/images/courseManage/search0.png"); + // } - .btnText { - color: #ffffff; - } - } + // .btnText { + // color: #ffffff; + // } + // } .btn1:active { background: #0982ff; } - .btn2:hover { - background: rgba(64, 158, 255, 0.1); - } + // .btn2:hover { + // background: rgba(64, 158, 255, 0.1); + // } .btn2:active { background: rgba(64, 158, 255, 0.2); @@ -692,17 +692,17 @@ const handleNext = async () => { } } - .btn3:hover { - background: rgba(64, 158, 255, 0.76); + // .btn3:hover { + // background: rgba(64, 158, 255, 0.76); - .search { - background-image: url("../../assets/images/courseManage/add0.png"); - } + // .search { + // background-image: url("../../assets/images/courseManage/add0.png"); + // } - .btnText { - color: #ffffff; - } - } + // .btnText { + // color: #ffffff; + // } + // } .btn3:active { background: #0982ff; From ef7fddd6e098c21a3eba2d6165d1c5fb092a3f8f Mon Sep 17 00:00:00 2001 From: wyx Date: Fri, 3 Mar 2023 21:17:15 +0800 Subject: [PATCH 5/7] =?UTF-8?q?style=EF=BC=9A=E4=B8=8B=E8=BD=BD=E4=B8=AD?= =?UTF-8?q?=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/DownLoad.vue | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/src/views/DownLoad.vue b/src/views/DownLoad.vue index 9903a356..b1461e4b 100644 --- a/src/views/DownLoad.vue +++ b/src/views/DownLoad.vue @@ -34,7 +34,7 @@
- +
重置
@@ -290,24 +290,24 @@ export default { margin-left: 10px; } } - .btn1:hover { - background: rgba(64, 158, 255, 0.76); + // .btn1:hover { + // background: rgba(64, 158, 255, 0.76); - .search { - background-image: url("../assets/images/courseManage/search0.png"); - } + // .search { + // background-image: url("../assets/images/courseManage/search0.png"); + // } - .btnText { - color: #ffffff; - } - } + // .btnText { + // color: #ffffff; + // } + // } .btn1:active { background: #0982ff; } - .btn2:hover { - background: rgba(64, 158, 255, 0.1); - } + // .btn2:hover { + // background: rgba(64, 158, 255, 0.1); + // } .btn2:active { background: rgba(64, 158, 255, 0.2); } @@ -317,12 +317,11 @@ export default { display: flex; align-items: center; justify-content: center; - color: #4ea6ff; + color: #fff; font-size: 14px; - background: #ffffff; + background: #4ea6ff; border-radius: 8px; cursor: pointer; - border: 1px solid #4ea6ff; .wz { margin-left: 10px; } From 733ec7b646e204dc5263ad29c95b7260457b6586 Mon Sep 17 00:00:00 2001 From: caozc Date: Fri, 3 Mar 2023 22:09:55 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix=EF=BC=9A=E3=80=90=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=9B=BE-=E5=A4=96=E9=83=A8=E8=80=83?= =?UTF-8?q?=E8=AF=95=E3=80=91=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=AD=A3=E5=B8=B8=E5=AF=BC=E5=87=BA=EF=BC=8C=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawers/router/RouterExaminationExternalManage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/drawers/router/RouterExaminationExternalManage.vue b/src/components/drawers/router/RouterExaminationExternalManage.vue index 830e49af..943992bf 100644 --- a/src/components/drawers/router/RouterExaminationExternalManage.vue +++ b/src/components/drawers/router/RouterExaminationExternalManage.vue @@ -437,7 +437,7 @@ {/* 导出数据 */} function exportData() { - window.open(`${process.env.VUE_APP_BASE_API}/admin/external/exam/manage/exportExternalExam?chapterId=${props.datasource.chapterId}&type=${1}&targetId=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}`) + window.open(`${process.env.VUE_APP_BASE_API}/admin/external/exam/manage/exportExternalExam?chapterId=${props.datasource.chapterId}&type=${1}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}`) } return { ...toRefs(state), From 80778b87d99568d6583b2f828d43ba211dc32fbc Mon Sep 17 00:00:00 2001 From: wyx Date: Fri, 3 Mar 2023 22:28:45 +0800 Subject: [PATCH 7/7] style --- src/App.vue | 4 ++-- src/components/common/CommonAlert.vue | 2 +- src/components/student/TableStudent.vue | 6 +++--- src/views/courselibrary/CoursewareManage.vue | 14 ++++++++------ src/views/research/ResearchAdd.vue | 3 ++- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/App.vue b/src/App.vue index 24fde76b..bc766a13 100644 --- a/src/App.vue +++ b/src/App.vue @@ -155,8 +155,8 @@ const getDictList = (param) => api1.getDictTree({code: param,}).then((res) => re } .white { - background: #fff; - color: #4ea6ff; + // background: #fff; + // color: #4ea6ff; } .cus-input { diff --git a/src/components/common/CommonAlert.vue b/src/components/common/CommonAlert.vue index f2847e0b..ba1f3d55 100644 --- a/src/components/common/CommonAlert.vue +++ b/src/components/common/CommonAlert.vue @@ -22,7 +22,7 @@
{{ content }}
-
+
取消
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index 109c4a77..6a081afa 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -68,7 +68,7 @@ 重置 @@ -104,7 +104,7 @@ 导入学员 @@ -131,7 +131,7 @@ 批量删除 diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index ddfc4893..a52c1421 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -6250,9 +6250,10 @@ export default defineComponent({ .btn { padding: 0px 26px 0px 26px; height: 40px; - background: rgba(64, 158, 255, 0); + background: rgba(64, 158, 255, 1); border-radius: 8px; border: 1px solid rgba(64, 158, 255, 1); + color: #fff; display: flex; align-items: center; justify-content: center; @@ -6266,7 +6267,7 @@ export default defineComponent({ .btnText { font-size: 14px; font-weight: 400; - color: rgba(64, 158, 255, 1); + color: #fff; line-height: 36px; margin-left: 5px; } @@ -6297,7 +6298,7 @@ export default defineComponent({ width: 16px; height: 18px; margin-right: 6px; - background-image: url("../../assets/images/courseManage/reset1.png"); + background-image: url("../../assets/images/courseManage/reset0.png"); } } } @@ -6872,9 +6873,10 @@ export default defineComponent({ .btnn { padding: 0px 26px 0px 26px; height: 38px; - background: #ffffff; + background: #4ea6ff; border-radius: 8px; border: 1px solid rgba(64, 158, 255, 1); + color:#fff; display: flex; align-items: center; justify-content: center; @@ -6889,7 +6891,7 @@ export default defineComponent({ .btnText { font-size: 14px; font-weight: 400; - color: #4ea6ff; + color: #fff; line-height: 36px; margin-left: 5px; } @@ -6907,7 +6909,7 @@ export default defineComponent({ .search { width: 16px; height: 18px; - background-image: url("../../assets/images/courseManage/reset1.png"); + background-image: url("../../assets/images/courseManage/reset0.png"); } } diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue index a41405a2..40f92151 100644 --- a/src/views/research/ResearchAdd.vue +++ b/src/views/research/ResearchAdd.vue @@ -667,7 +667,8 @@ export default { cursor: pointer; width: 80px; height: 40px; - color: #4ea6ff; + color: #fff; + background: #4ea6ff; border: 1px solid #4ea6ff; border-radius: 4px; display: flex;