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/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, 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..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; - } + } } } @@ -595,11 +586,11 @@ export default { } .btnText2 { - color: rgba(64, 158, 255, 1); + color: rgb(255, 255, 255); } } - .btn1 { + .btn11 { background: #4ea6ff; .search { @@ -609,39 +600,15 @@ export default { } } - .btn2 { - background: #ffffff; + .btn22 { + background: #4ea6ff; border: 1px solid #4ea6ff; - + color: #ffffff; .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; + background-image: url("../../assets/images/courseManage/reset0.png"); } } } 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; - } } } } diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 670315b3..d7dc1af8 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 + @@ -2745,7 +2745,7 @@ export default { codeUrl = window.location.protocol + process.env.VUE_APP_H5 + - "/projectdetails?courseId=" + + "/projectdetails?projectId=" + item.courseId; } state.codevisible = true; diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 256d1ece..5996e071 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 @@ -4620,7 +4621,7 @@ export default { codeUrl = window.location.protocol + process.env.VUE_APP_H5 + - "/investigatage?courseId=" + + "/investigatpage?courseId=" + item.courseId + "&type=1&id=" + item.id + @@ -4631,6 +4632,7 @@ export default { } // 投票 if (item.type == 12) { + // console.log('item',item) codeUrl = window.location.protocol + process.env.VUE_APP_H5 + @@ -4639,7 +4641,7 @@ export default { "&btype=2&id=" + item.id + "&chapterOrStageId=" + - item.chapterId + + item.stageId + "&infoId=" + state.projectId; }