From 6e8409b56b300c5810c2a772ffa94c384ed81f41 Mon Sep 17 00:00:00 2001
From: fuchengshen <men883234@gmail.com>
Date: 星期一, 20 六月 2022 10:18:37 +0800
Subject: [PATCH] Merge branch 'master' of http://www.shsening.com:10000/r/template/hn_view
---
public/hn3d/example/img/bg_total1.png | 0
public/hn3d/example/00_hn_new.html | 23 ++++-------
public/hn3d/example/css/hn.css | 64 ++++++++++++++++++++++++++++---
public/hn3d/example/css/style.css | 3 -
public/hn3d/example/img/bg_total.png | 0
5 files changed, 66 insertions(+), 24 deletions(-)
diff --git a/public/hn3d/example/00_hn_new.html b/public/hn3d/example/00_hn_new.html
index ecdb05a..ba0bd68 100644
--- a/public/hn3d/example/00_hn_new.html
+++ b/public/hn3d/example/00_hn_new.html
@@ -22,17 +22,6 @@
<link rel="stylesheet" href="./css/time_search.css">
<link rel="stylesheet" href="./js/bootstrap/bootstrap-datepicker/bootstrap-datetimepicker.css">
<style>
- .btn-primary {
- margin: 2px;
- padding: auto 16px
- }
-
- .handle {
- top: 30%;
- width: 120px;
- text-align: center
- }
-
.disable {
pointer-events: none;
}
@@ -79,16 +68,22 @@
<div id="mars3dContainer" class="mars3d-container"></div>
- <div class="infoview">
+ <div class="infoview topWindows">
<div>
- 鍗庤兘鐭虫礊鍙ｄ簩鍘傝瑙掞細
+ 鍗庤兘鐭虫礊鍙ｄ簩鍘傝瑙�
+ </div>
+ </div>
+
+ <div class="infoview bottomWindows">
+ <div>
<input id="changqu_btn" type="button" class="btn btn-primary" value="鍘傚尯" />
<input id="meipeng_btn" type="button" class="btn btn-primary" value="鐓ゆ" />
<input id="pengnei_btn" type="button" class="btn btn-primary" value="妫氬唴" />
</div>
</div>
+
<!-- 鎿嶄綔鎸夐挳鏍� -->
- <div class="infoview handle">
+ <div class="infoview infoWindows handle">
<button type="button" id="meipeng" class="btn btn-primary active" style="width: 100%;">鐓ゆ鏁翠綋</button>
<button type="button" id="meipeng_qiang_ding" class="btn btn-primary" style="width: 100%;">澧欓潰妫氶《</button>
<button type="button" id="meipeng_pati_madao" class="btn btn-primary" style="width: 100%;">鐖椹亾</button>
diff --git a/public/hn3d/example/css/hn.css b/public/hn3d/example/css/hn.css
index 20e3caf..337411e 100644
--- a/public/hn3d/example/css/hn.css
+++ b/public/hn3d/example/css/hn.css
@@ -1,4 +1,4 @@
-.infoview {
+.infoWindows {
position: absolute;
z-index: 9;
border: none;
@@ -10,14 +10,64 @@
box-shadow: 1px 2px 8px rgba(0, 0, 0, 0.5);
overflow: hidden;
}
-.infoview > div{
+.infoWindows > div{
color: #fff;
margin-top: 0;
}
-.btn-primary{
- border-radius: 20px;
- margin-bottom: 0 0 4px!important;
+.topWindows{
+ top: 0;
+ left: 0;
+ right: 0;
+ height: 60px;
+ background: url(../img/bg_total.png) rgba(12, 25, 48, 0.7) no-repeat center top;
+ background-size: auto 100%;
+ border: none;
+ box-shadow: none;
}
-.btn-primary:last-child{
- margin-bottom: 0;
+.topWindows > div{
+ margin: 0 auto;
+ text-align: center;
+ font-size: 24px;
+ font-weight: 400;
+ line-height: 32px;
+ color: #fff;
+}
+.bottomWindows{
+ bottom: 0;
+ left: 0;
+ right: 0;
+ height: 60px;
+}
+.bottomWindows > div{
+ margin: 0 auto;
+ width: 300px;
+ display: flex;
+ justify-content: space-between;
+}
+
+.handle {
+ top: 30%;
+ left: 10px;
+ width: 120px;
+ padding: 15px;
+ text-align: center
+}
+.handle > .btn-primary{
+ margin: 0 0 8px!important;
+}
+.handle > .btn-primary:last-child{
+ margin: 0!important;
+}
+
+.btn-primary{
+ padding: auto 16px;
+ border-radius: 20px;
+ margin: 0;
+}
+
+/*闅愯棌搴曢儴toolbar*/
+.mars3d-distance-legend,
+.mars3d-locationbar{
+ display: none;
+ visibility: hidden;
}
\ No newline at end of file
diff --git a/public/hn3d/example/css/style.css b/public/hn3d/example/css/style.css
index 868cd98..1d43fe3 100644
--- a/public/hn3d/example/css/style.css
+++ b/public/hn3d/example/css/style.css
@@ -341,10 +341,7 @@
/**infoview娴姩闈㈡澘*/
.infoview {
position: absolute;
- top: 10px;
- left: 10px;
padding: 10px 15px;
- border-radius: 4px;
border: 1px solid rgba(128, 128, 128, 0.5);
color: #ffffff;
background: rgba(12, 25, 48, 0.7);
diff --git a/public/hn3d/example/img/bg_total.png b/public/hn3d/example/img/bg_total.png
new file mode 100644
index 0000000..57ed68b
--- /dev/null
+++ b/public/hn3d/example/img/bg_total.png
Binary files differ
diff --git a/public/hn3d/example/img/bg_total1.png b/public/hn3d/example/img/bg_total1.png
new file mode 100644
index 0000000..07e7f17
--- /dev/null
+++ b/public/hn3d/example/img/bg_total1.png
Binary files differ
--
Gitblit v1.9.1