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

Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

Browse Source
This commit is contained in:
lpq
2023-03-01 22:31:10 +08:00
parent 953939a7c5 cd3c4d42cc
commit 0859e1f4d2
2 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,13 +49,13 @@
</div> </div>
</div> </div>
<div class="tmplh_btn" style="margin-top:50px;"> <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="search"></div>
<div class="btnText btnText1">搜索</div> <div class="btnText btnText1">搜索</div>
</div> </div>
<div class="btn btn2" @click="reset"> <div class="btn btn22" @click="reset">
<div class="search"></div> <div class="search"></div>
<div class="btnText btnText2">重置</div> <div class="btnText btnText2" style="color: #fff;">重置</div>
</div> </div>
</div> </div>
</div> </div>
@@ -89,10 +89,10 @@
@expand="expandTable" :pagination="false" /> @expand="expandTable" :pagination="false" />
</div> </div>
<div class="del_btnbox"> <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 class="btnText">取消</div>
</div> </div>
<div class="del_btn btn2" @click="closeProjAuditModal"> <div class="del_btn btn22" @click="closeProjAuditModal">
<div class="btnText">确定</div> <div class="btnText">确定</div>
</div> </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; background: #4ea6ff;
.search { .search {
@@ -609,13 +600,14 @@ export default {
} }
} }
.btn2 { .btn22 {
background: #4ea6ff; background: #4ea6ff;
border: 1px solid #4ea6ff; border: 1px solid #4ea6ff;
color: #ffffff;
.search { .search {
width: 16px; width: 16px;
height: 18px; height: 18px;
color: #ffffff;
background-image: url("../../assets/images/courseManage/reset0.png"); background-image: url("../../assets/images/courseManage/reset0.png");
} }
} }

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

@@ -4632,6 +4632,7 @@ export default {
} }
// 投票 // 投票
if (item.type == 12) { if (item.type == 12) {
// console.log('item',item)
codeUrl = codeUrl =
window.location.protocol + window.location.protocol +
process.env.VUE_APP_H5 + process.env.VUE_APP_H5 +
@@ -4640,7 +4641,7 @@ export default {
"&btype=2&id=" + "&btype=2&id=" +
item.id + item.id +
"&chapterOrStageId=" + "&chapterOrStageId=" +
item.chapterId + item.stageId +
"&infoId=" + "&infoId=" +
state.projectId; state.projectId;
} }