Commit d0279067 by zsh

Merge branch '20210819' of 123.207.147.179:vue-project/liangXing/frontEnd into 20210819

parents 8423f3a3 2d308c34
Subproject commit 7b0245cf9cc57dfcee6ccb2874c3fce8d43e3c4e Subproject commit f4746173cf454453e2895964ec3ed3d6a13d0e42
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<div class="item course"> <div class="item course">
<title-line :con="'发展历程'"></title-line> <title-line :con="'发展历程'"></title-line>
<div class="courseModal"> <div class="courseModal">
2021年1月6日成立 2021年1月6日成立<br />
全省民营企业家学习弘扬张謇 全省民营企业家学习弘扬张謇
精神高级研修班同日开班 精神高级研修班同日开班
</div> </div>
...@@ -244,6 +244,7 @@ export default { ...@@ -244,6 +244,7 @@ export default {
padding: 10px 15px; padding: 10px 15px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
box-sizing: border-box;
.item { .item {
width: 50%; width: 50%;
height: 100%; height: 100%;
......
...@@ -418,6 +418,10 @@ export default { ...@@ -418,6 +418,10 @@ export default {
}, },
option: { option: {
base: { base: {
grid: {
left: 10,
right: 10
},
xAxis: { xAxis: {
max: max max: max
}, },
...@@ -607,8 +611,10 @@ export default { ...@@ -607,8 +611,10 @@ export default {
.line{ .line{
width: 5%; width: 5%;
height: 76px; height: 76px;
margin: 10px 0 0 20px; margin-left: 10px;
background:url('../../../static/images/index/3.png') no-repeat center; margin-right: 10px;
background:url('../../../static/images/index/3.png') no-repeat;
background-size: 2px 76px;
} }
.right{ .right{
width: 60%; width: 60%;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment