提交 5ee23952 编写于 作者: guangjun.yang's avatar guangjun.yang

样式调整等

上级 c5b43d92
...@@ -63,16 +63,18 @@ ...@@ -63,16 +63,18 @@
</div> </div>
<div class="page-wrapper"> <div class="page-wrapper">
<el-pagination <div class="page">
background <el-pagination
:current-page="searchParam.pageNo" background
:page-sizes="[10, 30, 50, 100]" :current-page="searchParam.pageNo"
:page-size="searchParam.pageSize" :page-sizes="[10, 30, 50, 100]"
layout="total, sizes, prev, pager, next, jumper" :page-size="searchParam.pageSize"
:total="courseList.totalRows" layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange" :total="courseList.totalRows"
@current-change="handleCurrentChange" @size-change="handleSizeChange"
></el-pagination> @current-change="handleCurrentChange"
></el-pagination>
</div>
</div> </div>
<!-- 弹框提示 --> <!-- 弹框提示 -->
<dialog-componet :dialogObj="dialogObj"></dialog-componet> <dialog-componet :dialogObj="dialogObj"></dialog-componet>
...@@ -239,7 +241,6 @@ export default { ...@@ -239,7 +241,6 @@ export default {
flex-direction: row; flex-direction: row;
justify-content: flex-start; justify-content: flex-start;
flex-wrap: wrap; flex-wrap: wrap;
padding-bottom: 30px;
overflow-y: auto; overflow-y: auto;
.course { .course {
user-select: none; user-select: none;
...@@ -343,9 +344,11 @@ export default { ...@@ -343,9 +344,11 @@ export default {
} }
} }
.page-wrapper { .page-wrapper {
float: right; width: 1074px;
margin: 10px 0; .page {
margin-right: 230px; float: right;
margin: 20px 0;
}
} }
.no-list { .no-list {
position: relative; position: relative;
......
<template> <template>
<div> <div>
<div class="custom-select-wrapper" style="overflow:auto;"> <!-- <div class="custom-select-wrapper" style="overflow:auto;">
<div class="department-label" style="width: 1200px;"> <div class="department-label" style="width: 1200px;"> -->
<div class="custom-select-wrapper">
<div class="department-label" style="min-width:1200px;">
<span <span
v-for="(item, index) in allLabelList" v-for="(item, index) in allLabelList"
:key="index" :key="index"
...@@ -259,7 +261,7 @@ export default { ...@@ -259,7 +261,7 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.custom-select-wrapper { .custom-select-wrapper {
width: 1090px; // width: 1090px;
user-select: none; user-select: none;
.department-label { .department-label {
display: flex; display: flex;
...@@ -339,8 +341,8 @@ export default { ...@@ -339,8 +341,8 @@ export default {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
box-sizing: content-box; box-sizing: content-box;
padding: 10px 0; padding: 10px 20px;
padding-left: 20px; // padding-left: 20px;
// margin: 16px 0 16px 20px; // margin: 16px 0 16px 20px;
border-bottom: 1px dashed #e4e7ed; border-bottom: 1px dashed #e4e7ed;
.title { .title {
......
...@@ -23,7 +23,7 @@ export default { ...@@ -23,7 +23,7 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.select-course-wrapper { .select-course-wrapper {
// width: 1300px; min-width: 1200px;
.top-line { .top-line {
// width: 120%; // width: 120%;
height: 10px; height: 10px;
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<div class="add-content screenSet" id="screenSet"> <div class="add-content screenSet" id="screenSet">
<el-row class="step-content"> <el-row class="step-content">
<el-col :span="14"> <el-col style="width: 700px;">
<el-steps :active="active" simple class> <el-steps :active="active" simple class>
<span class="step-num" v-bind:class="{ 'on-step': active==0 }">1</span> <span class="step-num" v-bind:class="{ 'on-step': active==0 }">1</span>
<el-step title="选择项目课程">1</el-step> <el-step title="选择项目课程">1</el-step>
...@@ -19,8 +19,9 @@ ...@@ -19,8 +19,9 @@
<el-step title="选择学员范围">3</el-step> <el-step title="选择学员范围">3</el-step>
</el-steps> </el-steps>
</el-col> </el-col>
<el-col :span="5" :offset="5"> <el-col style="margin-left: 316px; width: 200px;margin-top: 2px;">
<div v-if="!canNext" class="dis-btn">下一步</div> <!-- <el-col :span="5" :offset="5"> -->
<div v-if="!canNext" class="dis-btn">下一步</div>
<el-button class="dis-btn-b" v-if="active != 0 && projectStatus == 1 && isPreview != 1" size="small" @click="save">暂存</el-button> <el-button class="dis-btn-b" v-if="active != 0 && projectStatus == 1 && isPreview != 1" size="small" @click="save">暂存</el-button>
<el-button class="dis-btn-b" v-if="active !== 2 && canNext" size="small" type="primary" @click="nextStep">下一步</el-button> <el-button class="dis-btn-b" v-if="active !== 2 && canNext" size="small" type="primary" @click="nextStep">下一步</el-button>
<el-button class="dis-btn-b" v-if="active == 2" size="small" type="primary" @click="complete">完成</el-button> <el-button class="dis-btn-b" v-if="active == 2" size="small" type="primary" @click="complete">完成</el-button>
...@@ -539,7 +540,7 @@ export default { ...@@ -539,7 +540,7 @@ export default {
top: 125px; top: 125px;
} }
.step-content { .step-content {
// min-width: 1300px; min-width: 1300px;
background: #fff; background: #fff;
z-index: 1001; z-index: 1001;
background: #fff; background: #fff;
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册