From 0655db6c424ece1e87335f717982ce8b0ebb2fda Mon Sep 17 00:00:00 2001 From: wyx Date: Wed, 1 Mar 2023 21:41:13 +0800 Subject: [PATCH 1/8] =?UTF-8?q?style:=E5=AE=A1=E6=A0=B8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ProjectAudit.vue | 2 +- src/views/examine/CourseReviewed.vue | 31 +++------------------- src/views/examine/CourseReviewedN.vue | 35 ++++--------------------- src/views/examine/ProjectReviewed.vue | 31 +++------------------- src/views/examine/ProjectReviewedN.vue | 29 ++------------------ 5 files changed, 14 insertions(+), 114 deletions(-) diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue index 6ceb745e..fb835693 100644 --- a/src/components/drawers/ProjectAudit.vue +++ b/src/components/drawers/ProjectAudit.vue @@ -219,7 +219,7 @@
- +
diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue index 01d1d305..02f8b97a 100644 --- a/src/views/examine/CourseReviewed.vue +++ b/src/views/examine/CourseReviewed.vue @@ -104,7 +104,7 @@ @expand="expandTable" :pagination="false" />
-
+
取消
@@ -665,7 +665,7 @@ export default { } .btnText2 { - color: rgba(64, 158, 255, 1); + color: rgb(255, 255, 255); } } @@ -680,39 +680,14 @@ export default { } .btn2 { - background: #ffffff; + background: #4ea6ff; border: 1px solid #4ea6ff; .search { width: 16px; height: 18px; - background-image: url("../../assets/images/courseManage/reset1.png"); - } - } - - .btn1:hover { - background: rgb(255, 255, 255); - border: 1px solid #4ea6ff; - - .search { - background-image: url("../../assets/images/courseManage/search1.png"); - } - - .btnText { - color: rgba(64, 158, 255, 1); - } - } - - .btn2:hover { - background: rgba(64, 158, 255, 1); - - .search { background-image: url("../../assets/images/courseManage/reset0.png"); } - - .btnText { - color: #ffffff; - } } } } diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue index acce8250..2ac34b36 100644 --- a/src/views/examine/CourseReviewedN.vue +++ b/src/views/examine/CourseReviewedN.vue @@ -135,7 +135,7 @@
-
+
取消
@@ -179,7 +179,7 @@
-
+
取消
@@ -231,7 +231,7 @@
-
+
关闭
@@ -1600,7 +1600,7 @@ export default { } .btnText2 { - color: rgba(64, 158, 255, 1); + color: rgb(255, 255, 255); } } @@ -1615,39 +1615,14 @@ export default { } .btn2 { - background: #ffffff; + background: #4ea6ff; border: 1px solid #4ea6ff; .search { width: 16px; height: 18px; - background-image: url("../../assets/images/courseManage/reset1.png"); - } - } - - .btn1:hover { - background: rgb(255, 255, 255); - border: 1px solid #4ea6ff; - - .search { - background-image: url("../../assets/images/courseManage/search1.png"); - } - - .btnText { - color: rgba(64, 158, 255, 1); - } - } - - .btn2:hover { - background: rgba(64, 158, 255, 1); - - .search { background-image: url("../../assets/images/courseManage/reset0.png"); } - - .btnText { - color: #ffffff; - } } } } diff --git a/src/views/examine/ProjectReviewed.vue b/src/views/examine/ProjectReviewed.vue index a18e1fd2..9c86a270 100644 --- a/src/views/examine/ProjectReviewed.vue +++ b/src/views/examine/ProjectReviewed.vue @@ -89,7 +89,7 @@ @expand="expandTable" :pagination="false" />
-
+
取消
@@ -595,7 +595,7 @@ export default { } .btnText2 { - color: rgba(64, 158, 255, 1); + color: rgb(255, 255, 255); } } @@ -610,39 +610,14 @@ export default { } .btn2 { - background: #ffffff; + background: #4ea6ff; border: 1px solid #4ea6ff; .search { width: 16px; height: 18px; - background-image: url("../../assets/images/courseManage/reset1.png"); - } - } - - .btn1:hover { - background: rgb(255, 255, 255); - border: 1px solid #4ea6ff; - - .search { - background-image: url("../../assets/images/courseManage/search1.png"); - } - - .btnText { - color: rgba(64, 158, 255, 1); - } - } - - .btn2:hover { - background: rgba(64, 158, 255, 1); - - .search { background-image: url("../../assets/images/courseManage/reset0.png"); } - - .btnText { - color: #ffffff; - } } } } diff --git a/src/views/examine/ProjectReviewedN.vue b/src/views/examine/ProjectReviewedN.vue index 68936bc7..cccf8fd8 100644 --- a/src/views/examine/ProjectReviewedN.vue +++ b/src/views/examine/ProjectReviewedN.vue @@ -370,7 +370,7 @@ export default { } .btnText2 { - color: rgba(64, 158, 255, 1); + color: rgb(255, 255, 255); } } @@ -385,39 +385,14 @@ export default { } .btn2 { - background: #ffffff; + background: #4ea6ff; border: 1px solid #4ea6ff; .search { width: 16px; height: 18px; - background-image: url("../../assets/images/courseManage/reset1.png"); - } - } - - .btn1:hover { - background: rgb(255, 255, 255); - border: 1px solid #4ea6ff; - - .search { - background-image: url("../../assets/images/courseManage/search1.png"); - } - - .btnText { - color: rgba(64, 158, 255, 1); - } - } - - .btn2:hover { - background: rgba(64, 158, 255, 1); - - .search { background-image: url("../../assets/images/courseManage/reset0.png"); } - - .btnText { - color: #ffffff; - } } } } From 256ad60f95a7cd601e193f98110ad1db979e9ed5 Mon Sep 17 00:00:00 2001 From: lixg Date: Wed, 1 Mar 2023 21:44:29 +0800 Subject: [PATCH 2/8] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E8=AF=84=E4=BC=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAdd.vue | 2 +- src/views/projectcenter/TaskPage.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 670315b3..16576b61 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -2717,7 +2717,7 @@ export default { codeUrl = window.location.protocol + process.env.VUE_APP_H5 + - "/investigatage?courseId=" + + "/investigatpage?courseId=" + item.courseId + "&type=2&id=" + item.id + diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 256d1ece..b7c7e4e6 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -4620,7 +4620,7 @@ export default { codeUrl = window.location.protocol + process.env.VUE_APP_H5 + - "/investigatage?courseId=" + + "/investigatpage?courseId=" + item.courseId + "&type=1&id=" + item.id + From d19b028274309a47afc7e23685f38b03bc57c77f Mon Sep 17 00:00:00 2001 From: lixg Date: Wed, 1 Mar 2023 21:48:17 +0800 Subject: [PATCH 3/8] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BA=8C=E7=BB=B4=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAdd.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 16576b61..d7dc1af8 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -2745,7 +2745,7 @@ export default { codeUrl = window.location.protocol + process.env.VUE_APP_H5 + - "/projectdetails?courseId=" + + "/projectdetails?projectId=" + item.courseId; } state.codevisible = true; From 7e7a71f09548644dcace3eacf16992ddd24c671e Mon Sep 17 00:00:00 2001 From: lpq Date: Wed, 1 Mar 2023 21:49:33 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B7=A5=E5=8F=B7?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/CommonStudent.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index 40f38e6d..bd096ee8 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -14,7 +14,7 @@
- +
@@ -400,7 +400,7 @@ const getStu = () => { let array = []; arr.map((value) => { let obj = { - id: value.id, + id: value.studentId, studentId: value.studentId, realName: value.studentName, userNo: value.studentUserNo, From 2dbfaff2e2783dc4ef61f6d37e6983c5dfdb0f60 Mon Sep 17 00:00:00 2001 From: wyx Date: Wed, 1 Mar 2023 21:51:48 +0800 Subject: [PATCH 5/8] =?UTF-8?q?style:=E5=B7=B2=E5=AE=A1=E6=A0=B8=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/examine/ProjectReviewed.vue | 28 ++++++++++----------------- 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/src/views/examine/ProjectReviewed.vue b/src/views/examine/ProjectReviewed.vue index 9c86a270..fda6a627 100644 --- a/src/views/examine/ProjectReviewed.vue +++ b/src/views/examine/ProjectReviewed.vue @@ -49,13 +49,13 @@
-
+
搜索
-
+
-
重置
+
重置
@@ -89,10 +89,10 @@ @expand="expandTable" :pagination="false" />
-
+
取消
-
+
确定
@@ -482,16 +482,7 @@ export default { } } - .btn1 { - border: 1px solid rgba(64, 158, 255, 1); - color: #4ea6ff; - margin-right: 14px; - } - - .btn2 { - background-color: #4ea6ff; - color: #ffffff; - } + } } } @@ -599,7 +590,7 @@ export default { } } - .btn1 { + .btn11 { background: #4ea6ff; .search { @@ -609,13 +600,14 @@ export default { } } - .btn2 { + .btn22 { background: #4ea6ff; border: 1px solid #4ea6ff; - + color: #ffffff; .search { width: 16px; height: 18px; + color: #ffffff; background-image: url("../../assets/images/courseManage/reset0.png"); } } From 435afa25bc75d9ef83b85b05c98088996efaadb7 Mon Sep 17 00:00:00 2001 From: lixg Date: Wed, 1 Mar 2023 22:17:38 +0800 Subject: [PATCH 6/8] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E6=8A=95=E7=A5=A8?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskPage.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index b7c7e4e6..6c03c91c 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -4631,6 +4631,7 @@ export default { } // 投票 if (item.type == 12) { + // console.log('item',item) codeUrl = window.location.protocol + process.env.VUE_APP_H5 + @@ -4639,7 +4640,7 @@ export default { "&btype=2&id=" + item.id + "&chapterOrStageId=" + - item.chapterId + + item.stageId + "&infoId=" + state.projectId; } From 953939a7c5880e382489a28b740f716562fd119d Mon Sep 17 00:00:00 2001 From: lpq Date: Wed, 1 Mar 2023 22:31:01 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskPage.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index b7c7e4e6..8127b792 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -3925,6 +3925,7 @@ export default { }; //创建小组 const createGroup = async () => { + debugger console.log("state.groupPageList" + state.groupPageList); const id = state.groupInfo.id; const d = state.groupPageList From 38ea005e6629fb7d5a965bc9933c0ed83059f193 Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 2 Mar 2023 09:17:55 +0800 Subject: [PATCH 8/8] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 24fde76b..97e997d7 100644 --- a/src/App.vue +++ b/src/App.vue @@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi"; const store = useStore(); const isLogin = ref(false); -console.log("版本2.1.6------------"); +console.log("版本1.3.5------------"); // 监听关闭浏览器 let time1 = ref(0);