From 4c30a5d4e4d35b3d78355f0c2d8edf90b31a1b23 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 23 九月 2020 14:55:29 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index cd971a3..e4f79aa 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -88,18 +88,20 @@
<!----------- 宸﹁緭閫佺嚎 ---------->
<!-- 鍙拌溅杞ㄩ亾 -->
- <div id="car-track-1" class="car-track"></div>
+ <div id="car-track-1" class="car-track">
+ <div></div>
+ </div>
<!-- 鍙拌溅瀹炰緥 -->
<div id="site-8" class="site car">8</div>
<!-- 绗竴鍒楋紙瀹藉害 100px锛� -->
<div class="site-row site-row-1">
- <div id="site-7" class="site" style="height: 40px;line-height: 40px">7</div>
- <div id="site-4" class="site" style="height: 40px;line-height: 40px">4</div>
- <div id="site-3" class="site" style="height: 40px;line-height: 40px;">3</div>
- <div id="site-2" class="site" style="height: 40px;line-height: 40px">2</div>
- <div id="site-1" class="site" style="height: 40px;line-height: 40px">1</div>
+ <div id="site-7" class="site" style="height: 20px;line-height: 20px;margin-bottom: 20px">7</div>
+ <div id="site-4" class="site" style="height: 20px;line-height: 20px;margin-bottom: 20px">4</div>
+ <div id="site-3" class="site" style="height: 20px;line-height: 20px;margin-bottom: 40px">3</div>
+ <div id="site-2" class="site" style="height: 20px;line-height: 20px;margin-bottom: 0px">2</div>
+ <div id="site-1" class="site" style="height: 20px;line-height: 20px;margin-bottom: 20px">1</div>
</div>
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 + 鍑哄簱绔欑偣 -->
@@ -459,7 +461,8 @@
} else if (res.code === 403){
parent.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
+
}
}
});
@@ -486,7 +489,7 @@
} else if (res.code === 403){
parent.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
});
@@ -509,11 +512,14 @@
} else {
siteEl.html(sites[i].siteId);
}
+ if (i===8) {
+ carAnimate(i, Number(sites[i].nearbySta));
+ }
}
} else if (res.code === 403){
parent.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
});
@@ -531,13 +537,15 @@
for (var i = 0; i < crns.length; i++){
var crnEl = $("#crn-"+crns[i].crnId);
crnEl.attr("class", "machine " + crns[i].crnStatus);
- // crnAnimate(crns[i].crnId, crns[i].offset);
- crnEl.animate({left: (crns[i].bay * ($('.item').eq(0).width()+4)) +'px'}, 1000);
+
+ var unit = $('.item').eq(0).width()+4;
+ crnEl.animate({left: (crns[i].bay * unit + 50) +'px'}, 1000);
+ // crnEl.animate({left: (crns[i].bay * ($('.item').eq(0).width()+4)) +'px'}, 1000);
}
} else if (res.code === 403){
parent.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
});
@@ -558,7 +566,7 @@
} else if (res.code === 403){
parent.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
});
@@ -657,7 +665,7 @@
targetTop += 160;
break;
case 2:
- targetTop += 120;
+ targetTop += 140;
break;
case 3:
targetTop += 80;
@@ -687,6 +695,7 @@
alert('涓嶈兘涓虹┖锛�');
} else {
carAnimate(8, Number(value));
+ // $("#site-" + 8).animate({top: (Number(value) + 122) +'px'}, 1000);
}
})
--
Gitblit v1.9.1