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

This commit is contained in:
岳佳鑫
2022-10-22 16:11:08 +08:00

View File

@@ -628,7 +628,7 @@ export default defineComponent({
}, },
}); });
</script> </script>
<style lang="scss" scoped> <style lang="scss">
.clearfix:before, .clearfix:before,
.clearfix:after { .clearfix:after {
content: " "; content: " ";
@@ -858,7 +858,7 @@ export default defineComponent({
} }
.taskSyllabus { .taskSyllabus {
// flex: 1; // flex: 1;
overflow-x: scroll; overflow-x: auto;
.ant-collapse { .ant-collapse {
border: 0px; border: 0px;
@@ -876,7 +876,7 @@ export default defineComponent({
.ant-collapse-header { .ant-collapse-header {
display: flex; display: flex;
height: 49px; height: 49px;
background-color: #fcf0ef; background-color: #eff4fc;
align-items: center; align-items: center;
margin-top: 20px; margin-top: 20px;
margin-left: 38px; margin-left: 38px;
@@ -894,98 +894,98 @@ export default defineComponent({
} }
} }
.course { .course {
//width: 100%; //width: 100%;
flex-shrink: 0; flex-shrink: 0;
margin-right: 24px; margin-right: 24px;
display: flex;
flex-wrap: wrap;
align-items: center;
padding: 25px 0px;
margin-left: 22px;
//margin: 0 12px;
border: 1px solid #f2f6fc;
border-top: 0px;
.first {
//position: relative;
display: flex; display: flex;
flex-grow: 1; flex-wrap: wrap;
align-items: center; align-items: center;
//height: 71px; padding: 25px 0px;
margin-left: 12px; margin-left: 22px;
margin-right: 50px;
.iconame { //margin: 0 12px;
//position: absolute; border: 1px solid #f2f6fc;
color: #4f5156; border-top: 0px;
font-size: 16px; .first {
margin-left: 4px; //position: relative;
} display: flex;
.icontext { flex-grow: 1;
//positipn: absolute; align-items: center;
color: #999ba3; //height: 71px;
font-size: 14px;
margin-left: 12px; margin-left: 12px;
width: 83px; margin-right: 50px;
.iconame {
//position: absolute;
color: #4f5156;
font-size: 16px;
margin-left: 4px;
}
.icontext {
//positipn: absolute;
color: #999ba3;
font-size: 14px;
margin-left: 12px;
width: 83px;
}
} }
} .type {
.type { //height: 71px;
//height: 71px; display: flex;
display: flex; flex-grow: 1;
flex-grow: 1; align-items: center;
align-items: center; margin-right: 50px;
margin-right: 50px; .typename {
.typename { width: 63px;
width: 63px; height: 23px;
height: 23px; color: #5dc988;
color: #5dc988; font-size: 14px;
font-size: 14px; background-color: #f2f6fc;
background-color: #f2f6fc; border-radius: 4px;
border-radius: 4px; text-align: center;
text-align: center; }
.typename1 {
width: 63px;
height: 23px;
color: #f0f4fe;
font-size: 14px;
background-color: #5dc988;
border-radius: 4px;
text-align: center;
}
} }
.typename1 { .time {
width: 63px; //height: 71px;
height: 23px; flex-grow: 1;
color: #f0f4fe; margin-right: 50px;
font-size: 14px; .timetext {
background-color: #5dc988; font-size: 14px;
border-radius: 4px; color: #999ba3;
text-align: center; }
} }
} .progress {
.time { width: 168px;
//height: 71px; margin-left: 10px;
flex-grow: 1; margin-right: 50px;
margin-right: 50px; flex-grow: 1;
.timetext { .progresstext {
font-size: 14px; color: #ffc067;
color: #999ba3; font-size: 14px;
}
} }
} .operations {
.progress { display: flex;
width: 168px; width: 200px;
margin-left: 10px; //flex-grow: 1;
margin-right: 50px; .operation {
flex-grow: 1; color: #4ea6ff;
.progresstext { font-size: 14px;
color: #ffc067; padding: 10px;
font-size: 14px; margin-left: auto;
}
} }
} }
.operations {
display: flex;
width: 200px;
//flex-grow: 1;
.operation {
color: #4ea6ff;
font-size: 14px;
padding: 10px;
margin-left: auto;
}
}
}
.taskbox { .taskbox {
width: 412px; width: 412px;
height: 160px; height: 160px;
@@ -1171,4 +1171,4 @@ export default defineComponent({
} }
} }
} }
</style> </style>