Commit 54eb4af2 authored by 王云帆's avatar 王云帆

Merge branch 'feature-new' into dev

parents 312be548 4aa5720c
......@@ -2,6 +2,9 @@
<div class="page-body">
<div class="paint-content">
<!-- 第一行 -->
<div class="paint-row-1-0">
<p>CDA11323</p>
</div>
<div class="paint-row-1-1">
<p>CDA23323</p>
</div>
......@@ -18,6 +21,9 @@
<p>CDA231312</p>
</div>
<!-- 第二行 -->
<div class="paint-row-2-0">
<p>CDA23323</p>
</div>
<div class="paint-row-2-1">
<p>CDA23323</p>
</div>
......@@ -34,6 +40,9 @@
<p>CDA231312</p>
</div>
<!-- 第三行 -->
<div class="paint-row-3-0">
<p>CDA23323</p>
</div>
<div class="paint-row-3-1">
<p>CDA23323</p>
</div>
......@@ -50,6 +59,9 @@
<p>CDA231312</p>
</div>
<!-- 第四行 -->
<div class="paint-row-4-0">
<p>CDA23323</p>
</div>
<div class="paint-row-4-1">
<p>CDA23323</p>
</div>
......@@ -66,6 +78,9 @@
<p>CDA231312</p>
</div>
<!-- 第五行 -->
<div class="paint-row-5-0">
<p>CDA23323</p>
</div>
<div class="paint-row-5-1">
<p>CDA23323</p>
</div>
......@@ -83,6 +98,9 @@
</div>
<!-- 第六行 -->
<div class="paint-row-6-0">
<p>CDA23323</p>
</div>
<div class="paint-row-6-1">
<p>CDA23323</p>
</div>
......@@ -100,6 +118,9 @@
</div>
<!-- 第七行 -->
<div class="paint-row-7-0">
<p>CDA23323</p>
</div>
<div class="paint-row-7-1">
<p>CDA23323</p>
</div>
......@@ -116,6 +137,9 @@
<p>CDA231312</p>
</div>
<!-- 第八行 -->
<div class="paint-row-8-0">
<p>CDA23323</p>
</div>
<div class="paint-row-8-1">
<p>CDA23323</p>
</div>
......@@ -132,6 +156,12 @@
<p>CDA231312</p>
</div>
<!-- 第九行 -->
<div class="paint-row-9-0">
<p>CDA23323</p>
</div>
<div class="paint-row-9-1">
<p>CDA23323</p>
</div>
<div class="paint-row-9-1">
<p>CDA23323</p>
</div>
......@@ -148,6 +178,9 @@
<p>CDA231312</p>
</div>
<!-- 第十行 -->
<div class="paint-row-10-0">
<p>CDA23323</p>
</div>
<div class="paint-row-10-1">
<p>CDA23323</p>
</div>
......@@ -164,6 +197,9 @@
<p>CDA231312</p>
</div>
<!-- 第十一行 -->
<div class="paint-row-11-0">
<p>CDA23323</p>
</div>
<div class="paint-row-11-1">
<p>CDA23323</p>
</div>
......@@ -179,20 +215,35 @@
<div class="paint-row-11-5">
<p>CDA231312</p>
</div>
<!-- 第十一行 -->
<!-- 第十二行 -->
<div class="paint-row-12-0">
<p>CDA2</p>
</div>
<div class="paint-row-12-2">
<p>CDA2</p>
</div>
<div class="paint-row-12-3">
<p>CDA2</p>
</div>
<div class="paint-row-12-4">
<p>CDA2</p>
</div>
<div class="paint-row-12-5">
<p>CDA231312</p>
</div>
<!-- 第十一行 -->
<!-- 第十三行 -->
<div class="paint-row-13-0">
<p>CDA2</p>
</div>
<div class="paint-row-13-1">
<p>CDA2</p>
</div>
<div class="paint-row-13-2">
<p>CDA2</p>
</div>
<div class="paint-row-13-3">
<p>CDA2</p>
</div>
<div class="paint-row-13-5">
<p>CDA231312</p>
</div>
......@@ -226,65 +277,81 @@ export default {
height: 900px;
background: url('../../../assets/images/Monitor/paint-bg.png') no-repeat;
.paint-row-1-0,
.paint-row-1-1,
.paint-row-1-2,
.paint-row-1-3,
.paint-row-1-4,
.paint-row-1-5,
.paint-row-2-0,
.paint-row-2-1,
.paint-row-2-2,
.paint-row-2-3,
.paint-row-2-4,
.paint-row-2-5,
.paint-row-3-0,
.paint-row-3-1,
.paint-row-3-2,
.paint-row-3-3,
.paint-row-3-4,
.paint-row-3-5,
.paint-row-4-0,
.paint-row-4-1,
.paint-row-4-2,
.paint-row-4-3,
.paint-row-4-4,
.paint-row-4-5,
.paint-row-5-0,
.paint-row-5-1,
.paint-row-5-2,
.paint-row-5-3,
.paint-row-5-4,
.paint-row-5-5,
.paint-row-6-0,
.paint-row-6-1,
.paint-row-6-2,
.paint-row-6-3,
.paint-row-6-4,
.paint-row-6-5,
.paint-row-7-0,
.paint-row-7-1,
.paint-row-7-2,
.paint-row-7-3,
.paint-row-7-4,
.paint-row-7-5,
.paint-row-8-0,
.paint-row-8-1,
.paint-row-8-2,
.paint-row-8-3,
.paint-row-8-4,
.paint-row-8-5,
.paint-row-9-0,
.paint-row-9-1,
.paint-row-9-2,
.paint-row-9-3,
.paint-row-9-4,
.paint-row-9-5,
.paint-row-10-0,
.paint-row-10-1,
.paint-row-10-2,
.paint-row-10-3,
.paint-row-10-4,
.paint-row-10-5,
.paint-row-11-0,
.paint-row-11-1,
.paint-row-11-2,
.paint-row-11-3,
.paint-row-11-4,
.paint-row-11-5,
.paint-row-12-0,
.paint-row-12-2,
.paint-row-12-3,
.paint-row-12-4,
.paint-row-12-5,
.paint-row-13-0,
.paint-row-13-1,
.paint-row-13-2,
.paint-row-13-3,
.paint-row-13-5 {
position: absolute;
width: 140px;
......@@ -304,7 +371,25 @@ export default {
white-space: nowrap;
}
}
// ?第0行 left
.paint-row-1-0,
.paint-row-2-0,
.paint-row-3-0,
.paint-row-4-0,
.paint-row-5-0,
.paint-row-6-0,
.paint-row-7-0,
.paint-row-8-0,
.paint-row-9-0,
.paint-row-10-0,
.paint-row-11-0,
.paint-row-12-0,
.paint-row-13-0 {
left: 157px;
}
// ? 第一行 top
.paint-row-1-0,
.paint-row-1-1,
.paint-row-1-2,
.paint-row-1-3,
......@@ -332,7 +417,8 @@ export default {
.paint-row-1-2,
.paint-row-5-2,
.paint-row-7-2,
.paint-row-8-2 {
.paint-row-8-2,
.paint-row-12-2 {
left: 675px;
}
.paint-row-1-3,
......@@ -369,6 +455,7 @@ export default {
}
// ?第二行 top
.paint-row-2-0,
.paint-row-2-1,
.paint-row-2-2,
.paint-row-2-3,
......@@ -396,6 +483,7 @@ export default {
}
// ?第三行 top
.paint-row-3-0,
.paint-row-3-1,
.paint-row-3-2,
.paint-row-3-3,
......@@ -412,11 +500,14 @@ export default {
.paint-row-6-3,
.paint-row-8-3,
.paint-row-9-3,
.paint-row-10-3 {
.paint-row-10-3,
.paint-row-12-3,
.paint-row-13-3 {
left: 848px;
}
// ?第四行 top
.paint-row-4-0,
.paint-row-4-1,
.paint-row-4-2,
.paint-row-4-3,
......@@ -428,6 +519,7 @@ export default {
}
// ?第五行 top
.paint-row-5-0,
.paint-row-5-1,
.paint-row-5-2,
.paint-row-5-3,
......@@ -439,6 +531,7 @@ export default {
}
// ?第六行 top
.paint-row-6-0,
.paint-row-6-1,
.paint-row-6-2,
.paint-row-6-3,
......@@ -450,6 +543,7 @@ export default {
}
// ?第七行 top
.paint-row-7-0,
.paint-row-7-1,
.paint-row-7-2,
.paint-row-7-3,
......@@ -461,6 +555,7 @@ export default {
}
// ?第八行 top
.paint-row-8-0,
.paint-row-8-1,
.paint-row-8-2,
.paint-row-8-3,
......@@ -472,6 +567,7 @@ export default {
}
// ?第九行
.paint-row-9-0,
.paint-row-9-1 {
top: 610px;
}
......@@ -483,6 +579,7 @@ export default {
}
// ?第十行
.paint-row-10-0,
.paint-row-10-1,
.paint-row-10-2,
.paint-row-10-3,
......@@ -492,6 +589,7 @@ export default {
}
// ?第十一行
.paint-row-11-0,
.paint-row-11-1 {
top: 723px;
}
......@@ -505,6 +603,9 @@ export default {
}
// ?第十二行
.paint-row-12-0,
.paint-row-12-2,
.paint-row-12-3,
.paint-row-12-4 {
top: 780px;
}
......@@ -513,7 +614,9 @@ export default {
}
// ?第十三行
.paint-row-13-0,
.paint-row-13-1,
.paint-row-13-3,
.paint-row-13-2 {
top: 816px;
}
......
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