From 059270c12f452fcc3344b826f35295fd7c20906e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 21 三月 2023 08:31:37 +0800
Subject: [PATCH] #
---
static/js/data/sidebar.js | 78 +++++++++++++--------------------------
1 files changed, 26 insertions(+), 52 deletions(-)
diff --git a/static/js/data/sidebar.js b/static/js/data/sidebar.js
index 0c38bfa..34118e9 100644
--- a/static/js/data/sidebar.js
+++ b/static/js/data/sidebar.js
@@ -136,29 +136,29 @@
$('.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",}
+ {"Type":"鏉＄爜鎵弿鍣�","Id":"3","Msg":"##80001201","Time":"12.01",},
+ {"Type":"鍫嗗灈鏈�","Id":"12","Msg":"{id: 12, row: 4, bay: 12, lev: 2, mode: 3}","Time":"12.02",},
+ {"Type":"鏈烘鑷�","Id":"2","Msg":"{task_id: 3, from: 229, to: 230, weight: 378.9, sku_num: 1}","Time":"12.03",},
+ {"Type":"杈撻�佺嚎","Id":"308","Msg":"{autoing: true, loading: true, emptyMk: false, offset: 2}","Time":"14:21",},
+ {"Type":"纾呯Г","Id":"5","Msg":"10.52","Time":"14:22",},
+ {"Type":"鏃犱汉灏忚溅","Id":"6","Msg":"{agv: 1, task: 4, online: true, heart: 1, timeout: 5000}","Time":"14:31",},
+ {"Type":"鏉＄爜鎵弿鍣�","Id":"2","Msg":"##80001222","Time":"14:51",},
+ {"Type":"鍫嗗灈鏈�","Id":"10","Msg":"{id: 2, row: 1, bay: 60, lev: 5, mode: 2}","Time":"15:21",},
+ {"Type":"鏈烘鑷�","Id":"3","Msg":"{task_id: 2, from: 120, to: 125, weight: 692.9, sku_num: 2}","Time":"15:34",},
+ {"Type":"纾呯Г","Id":"2","Msg":"6.3","Time":"15:38",},
+ {"Type":"鏃犱汉灏忚溅","Id":"1","Msg":"{agv: 2, task: 3, online: true, heart: 1, timeout: 5000}","Time":"15:58",},
+ {"Type":"鏉＄爜鎵弿鍣�","Id":"8","Msg":"##80001259","Time":"16:12",},
+ {"Type":"鍫嗗灈鏈�","Id":"3","Msg":"{id: 9, row: 18, bay: 42, lev: 1, mode: 1}","Time":"16:12",},
+ {"Type":"鏈烘鑷�","Id":"6","Msg":"{task_id: 1, from: 183, to: 188, weight: 125.3, sku_num: 1}","Time":"16:15",},
+ {"Type":"纾呯Г","Id":"5","Msg":"6.6","Time":"17:28",},
+ {"Type":"鏃犱汉灏忚溅","Id":"3","Msg":"{agv: 3, task: 2, online: true, heart: 1, timeout: 5000}",Time:"7:41",}
]
$.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>'
+ let str = '<tr>'+
+ '<td>'+item.Type+'</td>'+
+ '<td>'+item.Id+'</td>'+
+ '<td>'+item.Msg+'</td>'+
+ '<td>'+item.Time+'</td>'
'</tr>';
$('.tbl-body tbody').append(str);
@@ -168,51 +168,25 @@
$('.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){
+ if(tblTop <= -outerHeight*Items.length/2){
tblTop = 0;
} else {
tblTop -= 1;
}
$('.tbl-body').css('top', tblTop+'px');
}
-
+ var speedhq = 50; // 鏁板�艰秺澶ц秺鎱�
MyMarhq = setInterval(Marqueehq,speedhq);
// 榧犳爣绉讳笂鍘诲彇娑堜簨浠�
$(".tbl-header tbody").hover(function (){
clearInterval(MyMarhq);
- },function (){
+ }, 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);
}
--
Gitblit v1.9.1