hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-15 05:46:45 +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>
<div class="btnn"> <div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button> <button class="btn2" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button> <button class="btn2" @click="closeDrawer">确定</button>
</div> </div>
</div> </div>

31
src/views/DownLoad.vue
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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