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

feat：解决冲突，补回样式

Browse Source
This commit is contained in:
dongwug
2022-10-11 17:28:57 +08:00
parent 52585f781e
commit 731204574a
4 changed files with 121 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/images/coursewareManage/gan.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 352 B

BIN
src/assets/images/coursewareManage/reset0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 486 B

BIN
src/assets/images/coursewareManage/reset1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 598 B

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

@@ -580,19 +580,20 @@
<div class="gpm_inputbtn"> <div class="gpm_inputbtn">
<a-input <a-input
v-model:value="value" v-model:value="value"
style="width: 270px; height: 40px; border-radius: 8px;margin-right: 14px;" style="width: 270px; height: 40px; border-radius: 8px; margin-right: 14px;"
placeholder="请输入姓名"
/> />
<div class="gpm_btn btn1"> <div class="gpm_btn btn1">
<div class="search"></div> <div class="search"></div>
<div class="btnText">搜索</div> <div class="btnText">搜索</div>
</div> </div>
<div class="gpm_btn btn2"> <div class="gpm_btn btn2">
<div class="search"></div> <div class="reset"></div>
<div class="btnText">重置</div> <div class="btnText">重置</div>
</div> </div>
</div> </div>
<div class="gpm_notice"> <div class="gpm_notice">
<div class="th_icon"><div class="th_text">i</div></div> <div class="th_icon"></div>
<div class="textarea">已选择 <span style="color: #4EA6FF;">1</span> 项</div> <div class="textarea">已选择 <span style="color: #4EA6FF;">1</span> 项</div>
<div class="textarea"><span style="color:#999BA3;">列表选项总计：</span><span>5条</span></div> <div class="textarea"><span style="color:#999BA3;">列表选项总计：</span><span>5条</span></div>
</div> </div>
@@ -628,7 +629,7 @@
</template> </template>
</a-table> </a-table>
</div> </div>
</div>
</div> </div>
<!--操作授权页面 --> <!--操作授权页面 -->
@@ -665,12 +666,12 @@
<div class="btnText">搜索</div> <div class="btnText">搜索</div>
</div> </div>
<div class="stm_btn btn2"> <div class="stm_btn btn2">
<div class="search"></div> <div class="reset"></div>
<div class="btnText">重置</div> <div class="btnText">重置</div>
</div> </div>
<div class="stm_btn btn3" style="width: 130px;"> <div class="stm_btn3 btn3" >
<div class="search"></div> <div class="add"></div>
<div class="btnText" @click="createkk">新建开课</div> <div class="btnText" @click="createkk"><span style="color:#ffffff;">新建开课</span> </div>
</div> </div>
</div> </div>
<div class="stm_table"> <div class="stm_table">
@@ -707,10 +708,7 @@
<!--开课页面 --> <!--开课页面 -->
<!--新建开课页面 --> <!--新建开课页面 -->
<div <div class="createschooltime" :style="{ display: cstm_hs ? 'block' : 'none' }">
class="createschooltime"
:style="{ display: cstm_hs ? 'block' : 'none' }"
>
<div class="cst_header"></div> <div class="cst_header"></div>
<div class="cst_main"> <div class="cst_main">
<div class="cstm_header"> <div class="cstm_header">
@@ -864,7 +862,7 @@
<div class="btnText">搜索</div> <div class="btnText">搜索</div>
</div> </div>
<div class="stmm_btn btn2"> <div class="stmm_btn btn2">
<div class="search"></div> <div class="reset"></div>
<div class="btnText">重置</div> <div class="btnText">重置</div>
</div> </div>
</div> </div>
@@ -915,7 +913,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<!--新建开课学员管理页面页面 --> <!--新建开课学员管理页面页面 -->
</div> </div>
</template> </template>
@@ -2499,32 +2496,82 @@ export default defineComponent({
background-size: 100% 100%; background-size: 100% 100%;
} }
} }
.b_sub { .gpm_inputbtn{
width: 90%;
margin: 20px auto;
display: flex; display: flex;
margin-bottom: 10px; .gpm_btn {
.bs_type { width: 100px;
color: #999ba3; height: 40px;
margin-right: 14px;
background: #ffffff;
border: 1px solid #4EA6FF;
border-radius: 8px;
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
cursor: pointer;
.btnText {
color: #4EA6FF;
font-size: 14px;
font-weight: 400;
line-height: 40px;
}
} }
.bs_left { .btn1 {
color: #999ba3; .search {
margin-left: 35px; width: 15px;
height: 17px;
margin-right: 6px;
background-image: url("../../assets/images/courseManage/search1.png");
}
} }
.bs_right { .btn2 {
color: #4f5156; .reset {
width: 16px;
height: 18px;
margin-right: 6px;
background-image: url("../../assets/images/courseManage/reset1.png");
}
}
.btn1:hover {
background: #4EA6FF;
.search {
background-image: url("@/assets/images/coursewareManage/search0.png");
}
.btnText {
color: #ffffff;
}
}
.btn2:hover {
background: #4EA6FF;
.reset {
background-image: url("@/assets/images/coursewareManage/reset0.png");
}
.btnText {
color: #ffffff;
}
} }
} }
.b_menu { .gpm_notice{
width: calc(100%);
}
.b_menunav {
display: flex; display: flex;
margin-top: 20px; background: rgba(78,166,255,0.25);
margin-bottom: 20px; border: 1px solid #4EA6FF;
.bm_select { width: 90%;
margin-right: 20px; height: 62px;
margin:20px auto;
align-items: center;
line-height: 64px;
.th_icon{
width: 16px;
height: 16px;
background-image: url(@/assets/images/coursewareManage/gan.png);
background-size: 100% 100%;
margin: auto 13px auto 37px;
} }
.bm_input { .textarea{
margin-right: 20px; margin-right: 33px;
} }
} }
.gpm_table{ .gpm_table{
@@ -2605,52 +2652,64 @@ export default defineComponent({
.search { .search {
width: 15px; width: 15px;
height: 17px; height: 17px;
background-image: url("../../assets/images/courseManage/search1.png"); margin-right: 6px;
background-image: url("@/assets/images/coursewareManage/search1.png");
} }
} }
.btn2 { .btn2 {
.search { .reset {
width: 16px; width: 16px;
height: 18px; height: 18px;
background-image: url("../../assets/images/courseManage/reset1.png"); margin-right: 6px;
} background-image: url("@/assets/images/coursewareManage/reset1.png");
}
.btn3 {
.search {
width: 17px;
height: 18px;
background-image: url("../../assets/images/courseManage/add1.png");
margin-right: 5px;
} }
} }
.btn1:hover { .btn1:hover {
background: rgba(64, 158, 255, 1); background: #4EA6FF;
.search { .search {
background-image: url("../../assets/images/courseManage/search0.png"); background-image: url("@/assets/images/coursewareManage/search0.png");
} }
.btnText { .btnText {
color: #ffffff; color: #ffffff;
} }
} }
.btn2:hover { .btn2:hover {
background: rgba(64, 158, 255, 1); background: #4EA6FF;
.search { .reset {
background-image: url("../../assets/images/courseManage/reset0.png"); background-image: url("@/assets/images/coursewareManage/reset0.png");
}
.btnText {
color: #ffffff;
}
}
.btn3:hover {
background: rgba(64, 158, 255, 1);
.search {
background-image: url("../../assets/images/courseManage/add0.png");
} }
.btnText { .btnText {
color: #ffffff; color: #ffffff;
} }
} }
} }
.stm_btn3{
width: 130px;
height: 40px;
border: 1px solid #4EA6FF;
background-color: #4EA6FF;
border-radius: 8px;
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
cursor: pointer;
.btnText {
font-size: 14px;
font-weight: 400;
line-height: 40px;
}
.btn3 {
.add {
width: 17px;
height: 18px;
background-image: url("@/assets/images/coursewareManage/add0.png");
background-size: 100% 100%;
margin-right: 6px;
}
}
}
.stm_table{ .stm_table{
width: 90%; width: 90%;
margin:30px auto; margin:30px auto;
@@ -2891,13 +2950,15 @@ export default defineComponent({
.search { .search {
width: 15px; width: 15px;
height: 17px; height: 17px;
margin-right: 6px;
background-image: url("../../assets/images/courseManage/search1.png"); background-image: url("../../assets/images/courseManage/search1.png");
} }
} }
.btn2 { .btn2 {
.search { .reset {
width: 16px; width: 16px;
height: 18px; height: 18px;
margin-right: 6px;
background-image: url("../../assets/images/courseManage/reset1.png"); background-image: url("../../assets/images/courseManage/reset1.png");
} }
} }
@@ -2912,7 +2973,7 @@ export default defineComponent({
} }
.btn2:hover { .btn2:hover {
background: rgba(64, 158, 255, 1); background: rgba(64, 158, 255, 1);
.search { .reset {
background-image: url("../../assets/images/courseManage/reset0.png"); background-image: url("../../assets/images/courseManage/reset0.png");
} }
.btnText { .btnText {