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

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

Browse Source
This commit is contained in:
caozc
2023-03-03 22:08:41 +08:00
parent 2f64a6c0cf ef7fddd6e0
commit 95dc0daf11
9 changed files with 85 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,7 +130,7 @@
</div>
<div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
</div>
</div>

31
src/views/DownLoad.vue
View File

@@ -34,7 +34,7 @@
</div>
<div class="btn2" @click="reseatDownloadList">
<div class="img2">
<img src="../assets/images/courseManage/reset1.png" />
<img src="../assets/images/courseManage/reset0.png" />
</div>
<div class="wz">重置</div>
</div>
@@ -290,24 +290,24 @@ export default {
margin-left: 10px;
}
}
.btn1:hover {
background: rgba(64, 158, 255, 0.76);
// .btn1:hover {
// background: rgba(64, 158, 255, 0.76);
.search {
background-image: url("../assets/images/courseManage/search0.png");
}
// .search {
// background-image: url("../assets/images/courseManage/search0.png");
// }
.btnText {
color: #ffffff;
}
}
// .btnText {
// color: #ffffff;
// }
// }
.btn1:active {
background: #0982ff;
}
.btn2:hover {
background: rgba(64, 158, 255, 0.1);
}
// .btn2:hover {
// background: rgba(64, 158, 255, 0.1);
// }
.btn2:active {
background: rgba(64, 158, 255, 0.2);
}
@@ -317,12 +317,11 @@ export default {
display: flex;
align-items: center;
justify-content: center;
color: #4ea6ff;
color: #fff;
font-size: 14px;
background: #ffffff;
background: #4ea6ff;
border-radius: 8px;
cursor: pointer;
border: 1px solid #4ea6ff;
.wz {
margin-left: 10px;
}

19
src/views/courselibrary/CoursewareManage.vue
View File

@@ -5140,7 +5140,7 @@ export default defineComponent({
.btnn {
padding: 0px 26px 0px 26px;
height: 38px;
background: #ffffff;
background: #4ea6ff;
border-radius: 8px;
border: 1px solid rgba(64, 158, 255, 1);
display: flex;
@@ -5157,7 +5157,7 @@ export default defineComponent({
.btnText {
font-size: 14px;
font-weight: 400;
color: #4ea6ff;
color: #fff;
line-height: 36px;
margin-left: 5px;
}
@@ -5170,18 +5170,23 @@ export default defineComponent({
background-image: url("../../assets/images/courseManage/search0.png");
}
}
.btn1:active {
background: #0982ff;
}
.btn2:active {
background: #0982ff;
}
.btn2 {
.search {
width: 16px;
height: 18px;
background-image: url("../../assets/images/courseManage/reset1.png");
background-image: url("../../assets/images/courseManage/reset0.png");
}
.daochu {
width: 16px;
height: 18px;
background-image: url("../../assets/images/coursewareManage/export.png");
background-image: url("../../assets/images/coursewareManage/export1.png");
}
}
@@ -5238,7 +5243,9 @@ export default defineComponent({
margin-left: 5px;
}
}
.btn3:active {
background: #0982ff;
}
.btn3 {
.search {
width: 17px;

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

@@ -2786,17 +2786,13 @@ export default {
// 共享文档文件下载
const downloadFile = (url) => {
console.log(url);
let urlNew = url.slice(1);
console.log(urlNew);
if (urlNew) {
window.open(
window.location.protocol +
process.env.VUE_APP_BOE_API_URL +
process.env.VUE_APP_FILE_PATH +
urlNew
);
}
console.log("url", url);
window.open(
window.location.protocol +
process.env.VUE_APP_BOE_API_URL +
process.env.VUE_APP_FILE_PATH +
url
);
// if(url){
// const filename = '操作指南'
// const x = new XMLHttpRequest()

19
src/views/projectcenter/LibraryAdd.vue
View File

@@ -550,8 +550,7 @@
<div class="set_content">
<div class="setc_name"><span>同步学习记录：</span></div>
<div class="setc_main">
<a-radio
v-model:checked="projectInfo.courseSyncFlag"
<a-radio v-model:checked="projectInfo.courseSyncFlag"
><span style="color: #333333"
>同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
></a-radio
@@ -1436,15 +1435,13 @@ export default defineComponent({
// 共享文档文件下载
const downloadFile = (url) => {
console.log(url);
let urlNew = url.slice(1);
if (urlNew) {
window.open(
window.location.protocol +
process.env.VUE_APP_BOE_API_URL +
process.env.VUE_APP_FILE_PATH +
urlNew
);
}
window.open(
window.location.protocol +
process.env.VUE_APP_BOE_API_URL +
process.env.VUE_APP_FILE_PATH +
url
);
// if (url) {
// window.open(url)
// }

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

@@ -4679,15 +4679,13 @@ export default {
// 共享文档文件下载
const downloadFile = (url) => {
console.log(url);
let urlNew = url.slice(1);
if (urlNew) {
window.open(
window.location.protocol +
process.env.VUE_APP_BOE_API_URL +
process.env.VUE_APP_FILE_PATH +
urlNew
);
}
window.open(
window.location.protocol +
process.env.VUE_APP_BOE_API_URL +
process.env.VUE_APP_FILE_PATH +
url
);
// url && window.open(url);
};
function stageChange(item, index) {

10
src/views/research/ManagePage.vue
View File

@@ -485,7 +485,7 @@ export default {
.img2 {
width: 16px;
height: 18px;
background-image: url(../../assets/images/coursewareManage/export.png);
background-image: url(../../assets/images/coursewareManage/export1.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -498,9 +498,13 @@ export default {
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
.btn2:active {
background: #0982ff;
}
}</style>

2
src/views/research/ResearchAdd.vue
View File

@@ -82,6 +82,8 @@
height: 40px;
margin-left: 14px;
border-radius: 8px;
color:#fff;
background-color: #4ea6ff;
"
@click="handleAllCancel"
>

50
src/views/research/ResearchManage.vue
View File

@@ -144,7 +144,7 @@
</div>
</div>
<div class="btn">
<button class="samtn btn1" @click="handleCancel">取消</button>
<button class="samtn btn2" @click="handleCancel">取消</button>
<a-button class="samtn btn2" @click="handleNext" :loading="formData.validated===1">
{{ !formData.id ? "下一步" : "确定" }}
</a-button>
@@ -589,7 +589,7 @@ const handleNext = async () => {
.btnn {
padding: 0px 26px 0px 26px;
height: 38px;
background: #ffffff;
background: #4ea6ff;
border-radius: 8px;
border: 1px solid rgba(64, 158, 255, 1);
display: flex;
@@ -606,7 +606,7 @@ const handleNext = async () => {
.btnText {
font-size: 14px;
font-weight: 400;
color: #4ea6ff;
color: #fff;
line-height: 36px;
margin-left: 5px;
}
@@ -624,29 +624,29 @@ const handleNext = async () => {
.search {
width: 16px;
height: 18px;
background-image: url("../../assets/images/courseManage/reset1.png");
background-image: url("../../assets/images/courseManage/reset0.png");
}
}
.btn1:hover {
background: rgba(64, 158, 255, 0.76);
// .btn1:hover {
// background: rgba(64, 158, 255, 0.76);
.search {
background-image: url("../../assets/images/courseManage/search0.png");
}
// .search {
// background-image: url("../../assets/images/courseManage/search0.png");
// }
.btnText {
color: #ffffff;
}
}
// .btnText {
// color: #ffffff;
// }
// }
.btn1:active {
background: #0982ff;
}
.btn2:hover {
background: rgba(64, 158, 255, 0.1);
}
// .btn2:hover {
// background: rgba(64, 158, 255, 0.1);
// }
.btn2:active {
background: rgba(64, 158, 255, 0.2);
@@ -692,17 +692,17 @@ const handleNext = async () => {
}
}
.btn3:hover {
background: rgba(64, 158, 255, 0.76);
// .btn3:hover {
// background: rgba(64, 158, 255, 0.76);
.search {
background-image: url("../../assets/images/courseManage/add0.png");
}
// .search {
// background-image: url("../../assets/images/courseManage/add0.png");
// }
.btnText {
color: #ffffff;
}
}
// .btnText {
// color: #ffffff;
// }
// }
.btn3:active {
background: #0982ff;