From 9fa82135f46592776883a9913dc2f3d126ccf1c2 Mon Sep 17 00:00:00 2001
From: fuchengshen <men883234@gmail.com>
Date: 星期三, 22 六月 2022 16:26:08 +0800
Subject: [PATCH] Merge branch 'master' of http://www.shsening.com:10000/r/template/hn_view
---
public/hn3d/example/img/bg_top.png | 0
public/hn3d/example/00_hn_new.html | 5 ++---
public/hn3d/example/css/hn.css | 8 ++++++--
public/hn3d/example/img/bg_bottom.png | 0
src/cool/modules/base/views/hn_model.vue | 6 ++++++
5 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/public/hn3d/example/00_hn_new.html b/public/hn3d/example/00_hn_new.html
index 330878b..a6c9270 100644
--- a/public/hn3d/example/00_hn_new.html
+++ b/public/hn3d/example/00_hn_new.html
@@ -14,13 +14,12 @@
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
<!--绗笁鏂筶ib-->
- <script type="text/javascript" src="../lib/include-lib.js" libpath="../lib/"
- include="jquery,font-awesome,bootstrap,layer,haoutil,mars3d"></script>
+ <script type="text/javascript" src="../lib/include-lib.js" libpath="../lib/" include="jquery,font-awesome,bootstrap,layer,haoutil,mars3d"></script>
<link href="./css/style.css" rel="stylesheet" />
- <link href="./css/hn.css" rel="stylesheet" />
<link rel="stylesheet" href="./css/time_search.css">
<link rel="stylesheet" href="./js/bootstrap/bootstrap-datepicker/bootstrap-datetimepicker.css">
+ <link href="./css/hn.css" rel="stylesheet" />
<style>
.disable {
pointer-events: none;
diff --git a/public/hn3d/example/css/hn.css b/public/hn3d/example/css/hn.css
index 337411e..49783a0 100644
--- a/public/hn3d/example/css/hn.css
+++ b/public/hn3d/example/css/hn.css
@@ -18,8 +18,8 @@
top: 0;
left: 0;
right: 0;
- height: 60px;
- background: url(../img/bg_total.png) rgba(12, 25, 48, 0.7) no-repeat center top;
+ height: 107px;
+ background: url(../img/bg_top.png) no-repeat center top;
background-size: auto 100%;
border: none;
box-shadow: none;
@@ -37,6 +37,10 @@
left: 0;
right: 0;
height: 60px;
+ background: url(../img/bg_bottom.png) no-repeat center bottom;
+ background-size: auto 100%;
+ border: none;
+ box-shadow: none;
}
.bottomWindows > div{
margin: 0 auto;
diff --git a/public/hn3d/example/img/bg_bottom.png b/public/hn3d/example/img/bg_bottom.png
new file mode 100644
index 0000000..c3bf880
--- /dev/null
+++ b/public/hn3d/example/img/bg_bottom.png
Binary files differ
diff --git a/public/hn3d/example/img/bg_top.png b/public/hn3d/example/img/bg_top.png
new file mode 100644
index 0000000..f48f822
--- /dev/null
+++ b/public/hn3d/example/img/bg_top.png
Binary files differ
diff --git a/src/cool/modules/base/views/hn_model.vue b/src/cool/modules/base/views/hn_model.vue
index d1cb03f..b8523dd 100644
--- a/src/cool/modules/base/views/hn_model.vue
+++ b/src/cool/modules/base/views/hn_model.vue
@@ -5,6 +5,7 @@
<iframe src="http://localhost:9100/public/hn3d/example/00_hn_new.html"
id="ifr1"
name="ifr1"
+ frameborder="0"
scrolling="yes">
<p>Your browser does not support iframes.</p>
</iframe>
@@ -48,6 +49,11 @@
}
});
</script>
+<style lang="scss" scoped>
+.cl-crud{
+ padding: 0;
+}
+</style>
<style lang="scss">
#ifr1 {
width: 100%;
--
Gitblit v1.9.1