From e97e08da74b35f446be66d7fd8c01bb4e56ecce0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期六, 11 十二月 2021 07:57:33 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/ASRS-3D into dev
---
views/index.html | 65 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/views/index.html b/views/index.html
index 3c6e878..2f90c55 100644
--- a/views/index.html
+++ b/views/index.html
@@ -17,6 +17,46 @@
canvas {
display: block;
}
+ #btn1 {
+ background-color: #4CAF50; /* Green */
+ border: none;
+ color: white;
+ padding: 15px 32px;
+ text-align: center;
+ text-decoration: none;
+ display: inline;
+ font-size: 16px;
+ position: absolute;
+ left: 1500px;
+ }
+ #btn2 {
+ position: absolute;
+ top: 45%;
+ left: 100%;
+ transform: translateY(50%);
+ width: 10%;
+ height: 10%;
+ background: rgba(255,255,255,0.3);
+ border: none;
+ color: white;
+ /*padding: 15px 32px;*/
+ text-align: center;
+ text-decoration: none;
+ /*display: none;*/
+ font-size: 16px;
+ border-radius: 0px 5px 5px 0px;
+ }
+ #btn2_m{
+ position: absolute;
+ top: 45%;
+ left: 100%;
+ transform: translateY(50%);
+ width: 10%;
+ height: 10%;
+ border-radius: 0px 5px 5px 0px;
+ background: rgba(143, 200, 227, 0.2);
+ backdrop-filter: blur(1px);
+ }
#maoboli {
position: absolute;
top: 50%;
@@ -27,8 +67,10 @@
background: rgba(143, 200, 227, 0.2);
border-radius: 5px;
backdrop-filter: blur(1px);
+ /*display: none;*/
}
#sidebar{
+ display: none;
/*瀹氫綅*/
position: absolute;
top: 50%;
@@ -40,6 +82,7 @@
background: rgba(255,255,255,0.3);
border-radius: 5px;
color: #ffffff;
+ /*display: none;*/
}
#sidebar p1{
height: 24px;
@@ -63,7 +106,6 @@
margin-top: 7px;
transform: scale(0.8,0.8);
}
-
#baobiao1{
width: 99%;
height: 280px;
@@ -124,13 +166,16 @@
</head>
<body style="position: relative">
<div id="maoboli"></div>
+ <button id="btn1" onclick="btn1()">灞曞紑</button>
<div id="sidebar">
<p1>涓壃-鏅鸿兘绔嬩綋浠撳簱</p1>
<p2>ZhongYang Intelligent Three-Dimensional Warehouse</p2>
<div id="baobiao1"></div>
<div id="baobiao2"></div>
- <div class="tablebox">
+ <div id="btn2_m"></div>
+ <button id="btn2" onclick="btn2()">闅愯棌</button>
+ <div class="tablebox">
<div class="tbl-header">
<table border="0" cellspacing="0" cellpadding="0" >
<thead>
@@ -144,7 +189,6 @@
<tbody style="opacity:0;" ></tbody>
</table>
</div>
-
<div class="tbl-body">
<table border="0" cellspacing="0" cellpadding="0">
<thead>
@@ -515,5 +559,20 @@
</script>
+ <script>
+ function btn1() {
+ $('#sidebar').show(300);
+ $('#maoboli').show(300);
+ // $('#btn1').hide(300);
+ $('#btn2').show(300);
+ }
+ function btn2() {
+ $('#sidebar').hide(300);
+ $('#maoboli').hide(300);
+ // $('#btn2').hide(300);
+ // $('#btn1').show(300);
+
+ }
+ </script>
</body>
</html>
--
Gitblit v1.9.1