Commit 6617019e authored by 纪泽龙's avatar 纪泽龙

Merge branch 'jzl'

parents 6217bc30 6e9b677f
...@@ -594,7 +594,7 @@ export default { ...@@ -594,7 +594,7 @@ export default {
height: 2px; height: 2px;
float: right; float: right;
background-image: linear-gradient(to left, #47a0ff, #ffffff00); background-image: linear-gradient(to left, #47a0ff, #ffffff00);
margin-top: 10px; margin-top: 2px;
margin-right: 50px; margin-right: 50px;
} }
.rightline2 { .rightline2 {
......
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
<div class="fong-div" style="margin-left: 3px;"></div> <div class="fong-div" style="margin-left: 3px;"></div>
<div class="fong-div" style="margin-left: 3px;"></div> --> <div class="fong-div" style="margin-left: 3px;"></div> -->
<span style="letter-spacing: 1px; color: #fff; float: left"> <span style="letter-spacing: 1px; color: #fff; float: left">
资源统计 预警信息
</span> </span>
<!-- <img src="../../assets/second1/ti-bg.png" alt=""> --> <!-- <img src="../../assets/second1/ti-bg.png" alt=""> -->
<div class="rightline3"></div> <div class="rightline3"></div>
...@@ -1191,7 +1191,7 @@ export default { ...@@ -1191,7 +1191,7 @@ export default {
float: left; float: left;
background-image: linear-gradient(to right, #47a0ff, #ffffff00); background-image: linear-gradient(to right, #47a0ff, #ffffff00);
margin-top: 10px; margin-top: 2px;
margin-left: 50px; margin-left: 50px;
} }
.rightline2 { .rightline2 {
......
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