Skip to content

J
jianchayuan
Commit 80b1628a authored by daisy's avatar daisy
Browse files
Options

Merge branch 'master' into 'master'

Master See merge request !12
parents b7300127 a9d2b1cf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 77 deletions
wgs/beijian.html
View file @ 80b1628a
This diff is collapsed.
wgs/jiaoyu.html
View file @ 80b1628a
......@@ -40,10 +40,10 @@
top: '0.9rem',
left: '0.1rem'
}, {
top: '6.35rem',
top: '73%',
left: '0.1rem'
}, {
top: '5.5rem',
top: '62%',
left: '0.5rem'
},
{
......@@ -101,52 +101,52 @@
top: '2.2rem',
left: '10.1rem'
}, {
top: '3.8rem',
top: '43%',
left: '4.3rem'
}, {
top: '3.65rem',
left: '5.9rem'
top: '42%',
left: '49%'
}, {
top: "3.8rem",
left: "9.6rem"
}, {
top: "5.1rem",
top: "4.8rem",
left: "4.1rem"
}, {
top: "5.1rem",
top: "4.8rem",
left: "6.7rem"
}, {
top: "5.1rem",
top: "4.8rem",
left: "9.6rem"
}, {
top: "5.6rem",
top: "52%",
left: "11.3rem"
}, {
top: "6.4rem",
top: "6.0rem",
left: "4.1rem"
}, {
top: "6.4rem",
top: "6.0rem",
left: "6.7rem"
}, {
top: "6.4rem",
top: "6.0rem",
left: "9.6rem"
}, {
top: "7.3rem",
top: "83%",
left: "5.4rem"
}, {
top: "7.8rem",
top: "89%",
left: "2.8rem"
}, {
top: "7.8rem",
top: "89%",
left: "7.7rem"
}, {
top: "8.3rem",
top: "95%",
left: "2.9rem"
}, {
top: "8.2rem",
left: "5.5rem"
top: "94%",
left: "45.5%"
}, {
top: "8.2rem",
top: "95%",
left: "7.75rem"
}],
'arr2': [{
......@@ -166,22 +166,22 @@
top: '2.8rem',
left: '0.5rem'
}, {
top: '2.4rem',
top: '27%',
left: '5.9rem'
}, {
top: '2rem',
left: '11.2rem'
}, {
top: '7.7rem',
top: '87%',
left: '0.5rem'
}, {
top: '7.7rem',
top: '87%',
left: '1.85rem'
}, {
top: '7.8rem',
top: '89%',
left: '5.1rem'
}, {
top: '7.7rem',
top: '87%',
left: '11.2rem'
}],
'arr3': [{
......@@ -204,37 +204,37 @@
top: '0.6rem',
left: '11.2rem'
}, {
top: '2rem',
top: '22%',
left: '0.5rem'
}, {
top: '3.8rem',
top: '43%',
left: '0.5rem'
}, {
top: '2.3rem',
top: '27%',
left: '1.8rem'
}, {
top: '3.5rem',
top: '40%',
left: '1.8rem'
}, {
top: '4.8rem',
top: '55%',
left: '1.8rem'
}, {
top: '6.2rem',
top: '70%',
left: '1.8rem'
}, {
top: '2.3rem',
top: '27%',
left: '10rem'
}, {
top: '3.5rem',
top: '40%',
left: '10rem'
}, {
top: '4.8rem',
top: '55%',
left: '10rem'
}, {
top: '6.2rem',
top: '70%',
left: '10rem'
}, {
top: '3.8rem',
top: '43%',
left: '11.2rem'
}, {
top: '2.4rem',
......@@ -246,28 +246,28 @@
top: '2.4rem',
left: '6.6rem'
}, {
top: '2rem',
top: '22%',
left: '11.2rem'
}, {
top: '7.7rem',
top: '87%',
left: '0.5rem'
}, {
top: '7.7rem',
top: '87%',
left: '1.85rem'
}, {
top: '7.7rem',
top: '87%',
left: '3.3rem'
}, {
top: '7.7rem',
top: '87%',
left: '6rem'
}, {
top: '7.7rem',
top: '87%',
left: '8.7rem'
}, {
top: '7.7rem',
top: '87%',
left: '10rem'
}, {
top: '7.7rem',
top: '87%',
left: '11.2rem'
}]
}
......
wgs/workshop.html
View file @ 80b1628a
......@@ -48,16 +48,16 @@
top: '28%',
left: '9%'
}, {
top: '3.8rem',
top: '57%',
left: '9%'
}, {
top: '43%',
left: '9%'
}, {
top: '6.3rem',
top: '73%',
left: '9%'
}, {
top: '7.6rem',
top: '87%',
left: '9%'
}, {
top: '1.2rem',
......@@ -69,58 +69,58 @@
top: '9%',
left: '6.9rem'
}, {
top: '9%',
top: '12%',
left: '10.3rem'
}, {
top: '1rem',
left: '11.5rem'
}, {
top: '4.1rem',
top: '48%',
left: '3.5rem'
}, {
top: '4.1rem',
top: '48%',
left: '5rem'
}, {
top: '4.1rem',
top: '48%',
left: '6.45rem'
}, {
top: '4.1rem',
top: '48%',
left: '7.9rem'
}, {
top: '4.1rem',
top: '48%',
left: '9.5rem'
}, {
top: '4.1rem',
top: '48%',
left: '10.95rem'
}, {
top: '6rem',
top: '69%',
left: '3.5rem'
}, {
top: '6rem',
top: '69%',
left: '5rem'
}, {
top: '6rem',
top: '69%',
left: '6.45rem'
}, {
top: '6rem',
top: '69%',
left: '7.9rem'
}, {
top: "6rem",
top: '69%',
left: "9.5rem"
}, {
top: "6rem",
top: '69%',
left: "10.95rem"
}, {
top: "8rem",
top: '92%',
left: "5rem"
}, {
top: "8rem",
top: '92%',
left: "6.45rem"
}, {
top: "8rem",
top: '92%',
left: "7.9rem"
}, {
top: "8rem",
top: '92%',
left: "9.5rem"
}],
'arr2': [{
......@@ -139,25 +139,25 @@
top: '4.3rem',
left: '3.4rem'
}, {
top: '8.2rem',
top: '92%',
left: '1.4rem'
}, {
top: '8.2rem',
top: '92%',
left: '3.4rem'
}, {
top: '6.3rem',
top: '73%',
left: '1.4rem'
}, {
top: '6.3rem',
top: '73%',
left: '3.4rem'
}, {
top: '3.3rem',
left: '5.3rem'
}, {
top: '5.0rem',
top: '58%',
left: '6.6rem'
}, {
top: '5.0rem',
top: '58%',
left: '5.3rem'
}, {
top: '3.3rem',
......@@ -175,20 +175,20 @@
top: '4.3rem',
left: '10.5rem'
}, {
top: '6.3rem',
top: '73%',
left: '8.5rem'
}, {
top: '6.3rem',
top: '73%',
left: '10.5rem'
}, {
top: '8.2rem',
top: '92%',
left: '8.5rem'
}, {
top: '8.2rem',
top: '92%',
left: '10.5rem'
}, {
top: "7rem",
left: "11.65rem"
top: "80%",
left: "96%"
}]
};
var divElement = document.querySelector('.room_box');
......@@ -218,13 +218,13 @@
<ul>
<li class="current">
<div class="flex-box">
<p>一楼</p>
<p class="tabName">一楼</p>
<p class="monitor">监控点<span>28</span></p>
</div>
</li>
<li>
<div class="flex-box">
<p>二楼</p>
<p class="tabName">二楼</p>
<p class="monitor">监控点<span>28</span></p>
</div>
</li>
......
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