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

feat:合并

Browse Source
This commit is contained in:
lixg
2023-03-01 22:18:01 +08:00
parent 435afa25bc 2dbfaff2e2
commit cd3c4d42cc
2 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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,

28
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 btn2" @click="closeProjAuditModal" style="margin-right: 32px;">
<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;
}
}
}
}
@@ -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");
}
}