hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-10 11:26:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yuping
2023-03-02 11:48:28 +08:00
parent 5f1157c028 0859e1f4d2
commit beea2b6c9a
8 changed files with 31 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/drawers/ProjectAudit.vue
View File

@@ -219,7 +219,7 @@
</div>
</div>
<div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer" style="margin-right: 32px;">取消</button>
<button class="btn2" @click="subMit">确定</button>
</div>
</div>

4
src/components/student/CommonStudent.vue
View File

@@ -14,7 +14,7 @@
<div style="display: flex; overflow-x: auto; overflow-y: auto">
<div class="tabs" style="min-width: 800px">
<a-tabs v-model:activeKey="activeKey">
<a-tab-pane v-if="isGroup" :key="4" tab="项目内学员">
<a-tab-pane v-if="isGroup" :key="4" tab="项目内学员1">
<div :style="{ height: screenHeight - 235 + 'px' }">
<div>
<a-form-item label="姓名：">
@@ -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,

31
src/views/examine/CourseReviewed.vue
View File

@@ -104,7 +104,7 @@
@expand="expandTable" :pagination="false" />
</div>
<div class="del_btnbox">
<div class="del_btn btn1" @click="closeProjAuditModal">
<div class="del_btn btn2" @click="closeProjAuditModal" style="margin-right: 32px;">
<div class="btnText">取消</div>
</div>
<div class="del_btn btn2" @click="closeProjAuditModal">
@@ -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;
}
}
}
}

35
src/views/examine/CourseReviewedN.vue
View File

@@ -135,7 +135,7 @@
</div>
</div>
<div class="del_btnbox">
<div class="del_btn btn1" @click="closeCourAuditModal">
<div class="del_btn btn2" @click="closeCourAuditModal" style="margin-right: 32px;">
<div class="btnText">取消</div>
</div>
<div class="del_btn btn2" @click="sureCourAuditModal">
@@ -179,7 +179,7 @@
</div>
</div>
<div class="del_btnbox">
<div class="del_btn btn1" @click="closeInvitationCourAuditModal">
<div class="del_btn btn2" @click="closeInvitationCourAuditModal" style="margin-right: 32px;">
<div class="btnText">取消</div>
</div>
<div class="del_btn btn2" @click="sureInvitationCourAuditModal">
@@ -231,7 +231,7 @@
</div>
</div>
<div class="del_btnbox">
<div class="del_btn btn1" @click="closeTransferInvitationCourAuditModal">
<div class="del_btn btn2" @click="closeTransferInvitationCourAuditModal">
<div class="btnText">关闭</div>
</div>
</div>
@@ -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;
}
}
}
}

55
src/views/examine/ProjectReviewed.vue
View File

@@ -49,13 +49,13 @@
</div>
</div>
<div class="tmplh_btn" style="margin-top:50px;">
<div class="btn btn1" @click="getProjList">
<div class="btn btn11" @click="getProjList">
<div class="search"></div>
<div class="btnText btnText1">搜索</div>
</div>
<div class="btn btn2" @click="reset">
<div class="btn btn22" @click="reset">
<div class="search"></div>
<div class="btnText btnText2">重置</div>
<div class="btnText btnText2" style="color: #fff;">重置</div>
</div>
</div>
</div>
@@ -89,10 +89,10 @@
@expand="expandTable" :pagination="false" />
</div>
<div class="del_btnbox">
<div class="del_btn btn1" @click="closeProjAuditModal">
<div class="del_btn btn22" @click="closeProjAuditModal" style="margin-right: 32px;">
<div class="btnText">取消</div>
</div>
<div class="del_btn btn2" @click="closeProjAuditModal">
<div class="del_btn btn22" @click="closeProjAuditModal">
<div class="btnText">确定</div>
</div>
</div>
@@ -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");
}
}
}

29
src/views/examine/ProjectReviewedN.vue
View File

@@ -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;
}
}
}
}

4
src/views/learningpath/LevelAdd.vue
View File

@@ -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;

6
src/views/projectcenter/TaskPage.vue
View File

@@ -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;
}