From 6d088e4b4b4e68ceb555a951bf1916a65bea1779 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期六, 11 十二月 2021 16:05:41 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/ASRS-3D into dev
---
views/index.html | 398 ++++++++++++++++----------------------------------------
1 files changed, 113 insertions(+), 285 deletions(-)
diff --git a/views/index.html b/views/index.html
index 2f90c55..05e9182 100644
--- a/views/index.html
+++ b/views/index.html
@@ -5,176 +5,28 @@
<meta charset="utf-8">
<meta name="generator" content="Three.js Editor">
<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
- <style>
-
- body {
- font-family: sans-serif;
- /*font-weight: bold;*/
- font-size: 11px;
- background-color: #000;
- margin: 0;
- }
- 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%;
- left: 1%;
- transform: translateY(-50%);
- width: 20%;
- height: 95%;
- background: rgba(143, 200, 227, 0.2);
- border-radius: 5px;
- backdrop-filter: blur(1px);
- /*display: none;*/
- }
- #sidebar{
- display: none;
- /*瀹氫綅*/
- position: absolute;
- top: 50%;
- left: 1%;
- transform: translateY(-50%);
- width: 20%;
- height: 95%;
- /*鐗规晥*/
- background: rgba(255,255,255,0.3);
- border-radius: 5px;
- color: #ffffff;
- /*display: none;*/
- }
- #sidebar p1{
- height: 24px;
- font-family: FZChaoCuHei-M10S;
- font-weight: 900;
- font-size: 24px;
- text-indent: 2.5%;
- letter-spacing:1px;
- line-height: 25px;
- margin-top: 15px;
- margin-left: 2.5%;
- display: block;
- }
- #sidebar p2{
- height: 10px;
- font-size: 5px;
- font-family: FZChaoCuHei-M10S;
- font-weight: 400;
- letter-spacing:1px;
- line-height: 8px;
- margin-top: 7px;
- transform: scale(0.8,0.8);
- }
- #baobiao1{
- width: 99%;
- height: 280px;
- }
- #baobiao2 {
- width: 99%;
- height: 280px;
- }
- .tablebox {
- height: 25%;
- overflow: hidden;
- position: relative;
- width: 95%;
- margin: 30px auto;
- /*background-color: rgba(6,26,103,1);*/
- }
- .tbl-header {
- width: 100%;
- position: absolute;
- top: 0;
- left: 0;
- z-index: 999;
- }
- .tbl-body {
- width: 100%;
- position: absolute;
- top: 0;
- left: 0;
- }
- .tablebox table {
- width: 100%;
- }
- .tablebox table th,
- .tablebox table td {
- font-size: 12px;
- color: #ffffff;
- line-height: 15px;
- text-align: center;
- }
- .tablebox table tr th {
- background-color: rgba(136,176,226,1);
- cursor: pointer;
- }
- .tablebox table tr td {
- background-color: transparent;
- }
- .tbl-body tr:nth-child(even) td,.tbl-body1 tr:nth-child(even) td {
- background-color: rgba(136, 176, 226, 0.4);
- }
- .tablebox table tr td span,
- .tablebox table tr td span {
- font-size: 24px;
- }
-
-
- </style>
+ <link rel="stylesheet" href="../static/css/main.css">
<script type="text/javascript" src="../static/js/lib/jquery-3.3.1.min.js"></script>
+ <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/echarts@5.2.2/dist/echarts.min.js"></script>
+ <script type="text/javascript" src="../static/js/common.js"></script>
+ <script type="text/javascript" src="../static/js/data/Warehouse.js"></script>
+ <script type="text/javascript" src="../static/js/object/Cube.js"></script>
+ <script type="text/javascript" src="../static/js/object/StoreArea.js"></script>
+ <script type="text/javascript" src="../static/js/object/Store.js"></script>
+ <script type="text/javascript" src="../static/js/object/StoreGroup.js"></script>
+ <script type="text/javascript" src="../static/js/object/StoreShelf.js"></script>
+ <script type="text/javascript" src="../static/js/object/StoreGoods.js"></script>
+ <script type="text/javascript" src="../static/js/lib/btnHide.js"></script>
</head>
<body style="position: relative">
- <div id="maoboli"></div>
- <button id="btn1" onclick="btn1()">灞曞紑</button>
+ <div id="groundglass"></div>
<div id="sidebar">
<p1>涓壃-鏅鸿兘绔嬩綋浠撳簱</p1>
<p2>ZhongYang Intelligent Three-Dimensional Warehouse</p2>
- <div id="baobiao1"></div>
+ <div id="Histogram"></div>
<div id="baobiao2"></div>
- <div id="btn2_m"></div>
- <button id="btn2" onclick="btn2()">闅愯棌</button>
-
+ <div id="btnhide_m"></div>
+ <button id="btnhide" onclick="btnHide()">闅愯棌</button>
<div class="tablebox">
<div class="tbl-header">
<table border="0" cellspacing="0" cellpadding="0" >
@@ -204,101 +56,27 @@
</div>
</div>
</div>
- <script type="text/javascript">
- var MyMarhq = '';
- clearInterval(MyMarhq);
- $('.tbl-body tbody').empty();
- $('.tbl-header tbody').empty();
- var Items = [{"Ranking":"1","City":"淇濆畾","SaleIncome":"2506734.43","An":"53.00",},
- {"Ranking":"2","City":"娌у窞","SaleIncome":"1425935.58","An":"65.00",},
- {"Ranking":"3","City":"绉︾殗宀�","SaleIncome":"1372207.38","An":"34.00",},
- {"Ranking":"4","City":"琛℃按","SaleIncome":"972451.15","An":"15.00",},
- {"Ranking":"5","City":"鐭冲搴�","SaleIncome":"939010.52","An":"-57.00",},
- {"Ranking":"6","City":"閭㈠彴","SaleIncome":"774274.70","An":"-20.00",},
- {"Ranking":"7","City":"鍞愬北","SaleIncome":"680456.79","An":"-29.00",},
- {"Ranking":"8","City":"寮犲鍙�","SaleIncome":"613319.87","An":"2.00",},
- {"Ranking":"9","City":"涓补鍗庡ゥ","SaleIncome":"596575.25","An":"35.00",},
- {"Ranking":"10","City":"鎵垮痉","SaleIncome":"589048.12","An":"30.00",},
- {"Ranking":"11","City":"寤婂潑","SaleIncome":"515448.14","An":"-48.00",},
- {"Ranking":"12","City":"鐟炲窞","SaleIncome":"399875.26","An":"128.00",},
- {"Ranking":"13","City":"鐭冲搴勪腑娌�","SaleIncome":"90543.62","An":"-24.00",},
- {"Ranking":"14","City":"杈涢泦涓补","SaleIncome":"49255.52","An":"19.00",},
- {"Ranking":"15","City":"浜曢檳涓补","SaleIncome":"29682.60","An":"-74.00",},
- {"Ranking":"16","City":"淇濆畾涓补","SaleIncome":"11887.73","An":"-64.00",}]
- $.each(Items,function (i, item) {
- str = '<tr>'+
- '<td>'+item.Ranking+'</td>'+
- '<td>'+item.City+'</td>'+
- '<td>'+(+item.SaleIncome/10000).toFixed(2)+'</td>'+
- '<td>'+(+item.An).toFixed(2)+'</td>'
- // '<td>'+(+item.Mom).toFixed(2)+'</td>'+
- // '<td>'+(item.SalePlan/10000).toFixed(2)+'</td>'+
- // '<td>'+(+item.PlanFinish).toFixed(2)+'</td>'+
- '</tr>'
+ <div id="container"></div>
- $('.tbl-body tbody').append(str);
- $('.tbl-header tbody').append(str);
- });
- if(Items.length > 10){
- $('.tbl-body tbody').html($('.tbl-body tbody').html()+$('.tbl-body tbody').html());
- $('.tbl-body').css('top', '0');
- var tblTop = 0;
- var speedhq = 50; // 鏁板�艰秺澶ц秺鎱�
- var outerHeight = $('.tbl-body tbody').find("tr").outerHeight();
- function Marqueehq(){
- if(tblTop <= -outerHeight*Items.length){
- tblTop = 0;
- } else {
- tblTop -= 1;
- }
- $('.tbl-body').css('top', tblTop+'px');
- }
+ <script type="module">
- MyMarhq = setInterval(Marqueehq,speedhq);
+ import * as THREE from '../static/js/three.module.js';
+ import { APP } from '../static/js/app.js';
- // 榧犳爣绉讳笂鍘诲彇娑堜簨浠�
- $(".tbl-header tbody").hover(function (){
- clearInterval(MyMarhq);
- },function (){
- clearInterval(MyMarhq);
- MyMarhq = setInterval(Marqueehq,speedhq);
- })
+ window.THREE = THREE;
- }
- $.each(Items,function (i, item) {
- str = '<tr>'+
- '<td>'+item.Ranking+'</td>'+
- '<td>'+item.City+'</td>'+
- '<td>'+(+item.SaleIncome/10000).toFixed(2)+'</td>'+
- '<td>'+(+item.An).toFixed(2)+'</td>'+
- '</tr>'
+ var player = new APP.Player();
+ player.start();
- $('.tbl-body tbody').append(str);
- $('.tbl-header tbody').append(str);
- });
- if(Items.length > 10){
- $('.tbl-body tbody').html($('.tbl-body tbody').html()+$('.tbl-body tbody').html());
- $('.tbl-body').css('top', '0');
- var tblTop = 0;
- var speedhq = 50; // 鏁板�艰秺澶ц秺鎱�
- var outerHeight = $('.tbl-body tbody').find("tr").outerHeight();
- function Marqueehq(){
- if(tblTop <= -outerHeight*Items.length){
- tblTop = 0;
- } else {
- tblTop -= 1;
- }
- $('.tbl-body').css('top', tblTop+'px');
- }
+ // document.body.appendChild( player.dom );
+ // window.addEventListener( 'resize', function () {
+ // player.setSize( window.innerWidth, window.innerHeight );
+ // } );
- MyMarhq = setInterval(Marqueehq,speedhq);
- }
</script>
- <div id="container"></div>
- <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/echarts@5.2.2/dist/echarts.min.js"></script>
<script type="text/javascript">
- var dom1 = document.getElementById("baobiao1");
+ var dom1 = document.getElementById("Histogram");
var myChart1 = echarts.init(dom1);
window.addEventListener('resize',function () {
myChart1.resize();
@@ -531,48 +309,98 @@
if (option && typeof option === 'object') {
myChart.setOption(option);
}
-
-
</script>
- <script type="text/javascript" src="../static/js/common.js"></script>
- <script type="text/javascript" src="../static/js/data/Warehouse.js"></script>
- <script type="text/javascript" src="../static/js/object/Cube.js"></script>
- <script type="text/javascript" src="../static/js/object/StoreArea.js"></script>
- <script type="text/javascript" src="../static/js/object/Store.js"></script>
- <script type="text/javascript" src="../static/js/object/StoreGroup.js"></script>
- <script type="text/javascript" src="../static/js/object/StoreShelf.js"></script>
- <script type="text/javascript" src="../static/js/object/StoreGoods.js"></script>
- <script type="module">
+ <script type="text/javascript">
+ var MyMarhq = '';
+ clearInterval(MyMarhq);
+ $('.tbl-body tbody').empty();
+ $('.tbl-header tbody').empty();
+ var Items = [{"Ranking":"1","City":"淇濆畾","SaleIncome":"2506734.43","An":"53.00",},
+ {"Ranking":"2","City":"娌у窞","SaleIncome":"1425935.58","An":"65.00",},
+ {"Ranking":"3","City":"绉︾殗宀�","SaleIncome":"1372207.38","An":"34.00",},
+ {"Ranking":"4","City":"琛℃按","SaleIncome":"972451.15","An":"15.00",},
+ {"Ranking":"5","City":"鐭冲搴�","SaleIncome":"939010.52","An":"-57.00",},
+ {"Ranking":"6","City":"閭㈠彴","SaleIncome":"774274.70","An":"-20.00",},
+ {"Ranking":"7","City":"鍞愬北","SaleIncome":"680456.79","An":"-29.00",},
+ {"Ranking":"8","City":"寮犲鍙�","SaleIncome":"613319.87","An":"2.00",},
+ {"Ranking":"9","City":"涓补鍗庡ゥ","SaleIncome":"596575.25","An":"35.00",},
+ {"Ranking":"10","City":"鎵垮痉","SaleIncome":"589048.12","An":"30.00",},
+ {"Ranking":"11","City":"寤婂潑","SaleIncome":"515448.14","An":"-48.00",},
+ {"Ranking":"12","City":"鐟炲窞","SaleIncome":"399875.26","An":"128.00",},
+ {"Ranking":"13","City":"鐭冲搴勪腑娌�","SaleIncome":"90543.62","An":"-24.00",},
+ {"Ranking":"14","City":"杈涢泦涓补","SaleIncome":"49255.52","An":"19.00",},
+ {"Ranking":"15","City":"浜曢檳涓补","SaleIncome":"29682.60","An":"-74.00",},
+ {"Ranking":"16","City":"淇濆畾涓补","SaleIncome":"11887.73","An":"-64.00",}]
+ $.each(Items,function (i, item) {
+ str = '<tr>'+
+ '<td>'+item.Ranking+'</td>'+
+ '<td>'+item.City+'</td>'+
+ '<td>'+(+item.SaleIncome/10000).toFixed(2)+'</td>'+
+ '<td>'+(+item.An).toFixed(2)+'</td>'
+ // '<td>'+(+item.Mom).toFixed(2)+'</td>'+
+ // '<td>'+(item.SalePlan/10000).toFixed(2)+'</td>'+
+ // '<td>'+(+item.PlanFinish).toFixed(2)+'</td>'+
+ '</tr>'
- import * as THREE from '../static/js/three.module.js';
- import { APP } from '../static/js/app.js';
+ $('.tbl-body tbody').append(str);
+ $('.tbl-header tbody').append(str);
+ });
+ if(Items.length > 10){
+ $('.tbl-body tbody').html($('.tbl-body tbody').html()+$('.tbl-body tbody').html());
+ $('.tbl-body').css('top', '0');
+ var tblTop = 0;
+ var speedhq = 50; // 鏁板�艰秺澶ц秺鎱�
+ var outerHeight = $('.tbl-body tbody').find("tr").outerHeight();
+ function Marqueehq(){
+ if(tblTop <= -outerHeight*Items.length){
+ tblTop = 0;
+ } else {
+ tblTop -= 1;
+ }
+ $('.tbl-body').css('top', tblTop+'px');
+ }
- window.THREE = THREE;
+ MyMarhq = setInterval(Marqueehq,speedhq);
- var player = new APP.Player();
- player.start();
-
- // document.body.appendChild( player.dom );
- // window.addEventListener( 'resize', function () {
- // player.setSize( window.innerWidth, window.innerHeight );
- // } );
-
-
- </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);
+ // 榧犳爣绉讳笂鍘诲彇娑堜簨浠�
+ $(".tbl-header tbody").hover(function (){
+ clearInterval(MyMarhq);
+ },function (){
+ clearInterval(MyMarhq);
+ MyMarhq = setInterval(Marqueehq,speedhq);
+ })
}
+ $.each(Items,function (i, item) {
+ str = '<tr>'+
+ '<td>'+item.Ranking+'</td>'+
+ '<td>'+item.City+'</td>'+
+ '<td>'+(+item.SaleIncome/10000).toFixed(2)+'</td>'+
+ '<td>'+(+item.An).toFixed(2)+'</td>'+
+ '</tr>'
+
+ $('.tbl-body tbody').append(str);
+ $('.tbl-header tbody').append(str);
+ });
+ if(Items.length > 10){
+ $('.tbl-body tbody').html($('.tbl-body tbody').html()+$('.tbl-body tbody').html());
+ $('.tbl-body').css('top', '0');
+ var tblTop = 0;
+ var speedhq = 50; // 鏁板�艰秺澶ц秺鎱�
+ var outerHeight = $('.tbl-body tbody').find("tr").outerHeight();
+ function Marqueehq(){
+ if(tblTop <= -outerHeight*Items.length){
+ tblTop = 0;
+ } else {
+ tblTop -= 1;
+ }
+ $('.tbl-body').css('top', tblTop+'px');
+ }
+
+ MyMarhq = setInterval(Marqueehq,speedhq);
+ }
+
</script>
+
</body>
</html>
--
Gitblit v1.9.1