Skip to content

K
kanban-nanjing-11
Commit 7b8171a3 authored by Allencl's avatar Allencl
Browse files
Options

Merge branch 'main' of http://124.222.198.109:34511/caolun/kanban-nanjing-11

parents 79a648d9 5d71a0a4
Hide whitespace changes
Inline Side-by-side
Showing with 141 additions and 62 deletions
css/page1.css
View file @ 7b8171a3
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
position: relative; position: relative;
/* background: url(../img/logistics/box1.png) no-repeat; */ /* background: url(../img/logistics/box1.png) no-repeat; */
border: 1px solid #026d91; border: 1px solid #026d91;
height: 934px; height: 880px;
margin-bottom: 22px;} margin-bottom: 22px;}
.main_f { background: url(../img/logistics/box1.png) no-repeat; height: 864px; } .main_f { background: url(../img/logistics/box1.png) no-repeat; height: 864px; }
...@@ -816,7 +816,7 @@ ...@@ -816,7 +816,7 @@
position: absolute; position: absolute;
width: calc(1181px * 0.9); width: calc(1181px * 0.9);
height: calc(1181px * 0.68); height: calc(1181px * 0.64);
left: 80px; left: 80px;
} }
...@@ -871,3 +871,27 @@ ...@@ -871,3 +871,27 @@
.error{ .error{
color: #e91d1d; color: #e91d1d;
} }
.marquee-container {
width: 50%;
overflow: hidden;
white-space: nowrap;
box-sizing: border-box;
float: left;
}
.marquee {
display: inline-block;
padding-left: 100%;
animation: marquee 15s linear infinite;
}
@keyframes marquee {
from {
transform: translateX(0%);
}
to {
transform: translateX(-100%);
}
}
css/page3.css
View file @ 7b8171a3
...@@ -891,3 +891,27 @@ ...@@ -891,3 +891,27 @@
.error{ .error{
color: #e91d1d; color: #e91d1d;
} }
.marquee-container {
width: 50%;
overflow: hidden;
white-space: nowrap;
box-sizing: border-box;
float: left;
}
.marquee {
display: inline-block;
padding-left: 100%;
animation: marquee 15s linear infinite;
}
@keyframes marquee {
from {
transform: translateX(0%);
}
to {
transform: translateX(-100%);
}
}
page1.html
View file @ 7b8171a3
...@@ -46,8 +46,6 @@ ...@@ -46,8 +46,6 @@
<div class="mainer"> <div class="mainer">
<div class="mainbox"> <div class="mainbox">
<div class="box-right-container box-echarts-body-index1"> <div class="box-right-container box-echarts-body-index1">
<div class="main_t ul-index1"> <div class="main_t ul-index1">
...@@ -92,7 +90,6 @@ ...@@ -92,7 +90,6 @@
</div> </div>
</div> </div>
<div class="box-right-container box-echarts-body-index2"> <div class="box-right-container box-echarts-body-index2">
<div class="main_t ul-index1"> <div class="main_t ul-index1">
...@@ -143,7 +140,16 @@ ...@@ -143,7 +140,16 @@
</div> </div>
</div> </div>
<div class="box-right-container box-echarts-body-index2" id="dialog-entirety-message-id">
<div class="main_b ul-index1 bottom-inex23-box">
<div class="main_b marquee-container">
<span class="marquee text-126 error" id="msgShowWindow" >连接错误，连接错误，连接错误</span>
</div>
<div class="main_b marquee-container">
<span class="marquee text-126 error" id="broadcastShowWindow" style="float: left">通知：---=--=-=</span>
</div>
</div>
</div>
</div> </div>
</div> </div>
...@@ -156,13 +162,7 @@ ...@@ -156,13 +162,7 @@
<img src="./img/close.svg" alt=""> <img src="./img/close.svg" alt="">
</div> </div>
<div class="box-right-container box-echarts-body-index2" id="dialog-entirety-message-id">
<div class="main_b ul-index1 bottom-inex23-box">
<div class="main_b">
<span class="text-126 error" id="msgShowWindow">连接错误，连接错误，连接错误</span>
</div>
</div>
</div>
</div> </div>
...@@ -253,9 +253,17 @@ ...@@ -253,9 +253,17 @@
isNull('is-null-text-6'); isNull('is-null-text-6');
} }
} }
if(_data.type==='statusWarningMag'){
if(_data.status==='异常'){
//TODO 异常报警信息
let warningMsg = _data.warningMsg;
$("#msgShowWindow").text(warningMsg);
$("#msgShowWindow").addClass("error");
}
}
if(_data.type=='broadcast'){ if(_data.type=='broadcast'){
if(_data.message){ if(_data.message){
$("#msgShowWindow").text(_data.message); $("#broadcastShowWindow").text(_data.message);
} }
} }
...@@ -306,6 +314,11 @@ ...@@ -306,6 +314,11 @@
/*height: 448px;*/ /*height: 448px;*/
margin-bottom: 22px; margin-bottom: 22px;
} }
.bottom-inex23-box{
margin-right: 0px !important;
}
.text-126{ .text-126{
text-align: center; text-align: center;
font-size: 60px; font-size: 60px;
......
page2.html
View file @ 7b8171a3
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
</div> </div>
<div class="ibox_m"> <div class="ibox_m">
<p class="text-125"> <p class="text-125">
<span>207</span> <span id="totalProductNum">207</span>
<span style="font-size: 86px;">台</span> <span style="font-size: 86px;">台</span>
</p> </p>
...@@ -349,27 +349,28 @@ $(document).ready(function () { ...@@ -349,27 +349,28 @@ $(document).ready(function () {
if(_data.type==='statusWarningMag'){ if(_data.type==='statusWarningMag'){
$("#equipmentStatus").text(_data.status); $("#equipmentStatus").text(_data.status);
if(_data.status==='异常'){ if(_data.status==='异常'){
$("#equipmentStatus").removeClass("text-124"); $("#equipmentStatus").addClass("error");
$("#equipmentStatus").removeClass("text-124-error");
$("#equipmentStatus").addClass("text-124-error");
//TODO 异常报警信息 //TODO 异常报警信息
let warningMsg = _data.warningMsg; let warningMsg = _data.warningMsg;
$("#msgShowWindow").text(warningMsg); $("#msgShowWindow").text(warningMsg);
$("#msgShowWindow").addClass("error"); $("#msgShowWindow").addClass("error");
}else{ }else{
$("#equipmentStatus").removeClass("text-124");
$("#equipmentStatus").removeClass("text-124-error");
$("#msgShowWindow").removeClass("error"); $("#msgShowWindow").removeClass("error");
$("#equipmentStatus").addClass("text-124"); $("#equipmentStatus").addClass("text-124");
} }
} }
if(_data.type=='broadcast'){ if(_data.type=='broadcast'){
if(_data.message){ if(_data.message){
$("#broadcastShowWindow").text(_data.message); $("#broadcastShowWindow").text(_data.message);
} }
} }
if(_data.type=='info'){
if (_data.message.result){
if(_data.message.result.ALL){
$("#totalProductNum").text(_data.message.result.ALL);
}
}
}
}, false); }, false);
// 初始时关闭提示 // 初始时关闭提示
......
page3.html
View file @ 7b8171a3
...@@ -39,54 +39,58 @@ ...@@ -39,54 +39,58 @@
<div class="mainer"> <div class="mainer">
<div class="mainbox"> <div class="mainbox">
<div class="box-right-container box-echarts-body-index2">
<div class="left-img-box">
<img src="" alt="" id="image">
</div>
<div class="left-img-box"> <div class="right-img-box">
<img src="" alt="" id="image"> <ul>
</div> <li>
<img src="./img/logistics/tit.png" alt="">
<div class="right-img-box"> <div>
<ul> <span>车辆号:</span>
<li> <span id="tps-text"></span>
<img src="./img/logistics/tit.png" alt=""> </div>
<div> </li>
<span>车辆号:</span> <li>
<span id="tps-text"></span> <img src="./img/logistics/tit.png" alt="">
</div> <div>
</li> <span>车型:</span>
<li> <span id="partNo-text"></span>
<img src="./img/logistics/tit.png" alt=""> </div>
<div> </li>
<span>车型:</span> <li>
<span id="partNo-text"></span> <img src="./img/logistics/tit.png" alt="">
</div> <div>
</li> <span id="span-botton-next">下一张</span>
<li> </div>
<img src="./img/logistics/tit.png" alt=""> </li>
<div> <li>
<span id="span-botton-next">下一张</span> <img src="./img/logistics/tit.png" alt="">
</div> <div>
</li> <span id="span-botton-up">上一张</span>
<li> </div>
<img src="./img/logistics/tit.png" alt=""> </li>
<div> </ul>
<span id="span-botton-up">上一张</span> </div>
</div>
</li>
</ul>
</div> </div>
<div class="box-right-container box-echarts-body-index2" id="dialog-entirety-message-id"> <div class="box-right-container box-echarts-body-index2" id="dialog-entirety-message-id">
<div class="main_b ul-index1 bottom-inex23-box"> <div class="main_b ul-index1 bottom-inex23-box">
<div class="main_b"> <div class="main_b marquee-container">
<span class="text-126 error" id="msgShowWindow">连接错误，连接错误，连接错误</span> <span class="marquee text-126 error" id="msgShowWindow" >连接错误，连接错误，连接错误</span>
</div>
<div class="main_b marquee-container">
<span class="marquee text-126 error" id="broadcastShowWindow" style="float: left">通知：---=--=-=</span>
</div> </div>
</div> </div>
</div> </div>
<div class="dialog-entirety-box" id="dialog-entirety-box-id">
<h1>网络连接已断开！</h1>
<img src="./img/close.svg" alt="">
</div>
</div>
</div>
<div class="dialog-entirety-box" id="dialog-entirety-box-id">
<h1>网络连接已断开！</h1>
<img src="./img/close.svg" alt="">
</div>
</div> </div>
</div> </div>
...@@ -115,6 +119,19 @@ ...@@ -115,6 +119,19 @@
$("#image").attr("src", _data.message.imgUrl); $("#image").attr("src", _data.message.imgUrl);
} }
} }
if(_data.type==='statusWarningMag'){
if(_data.status==='异常'){
//TODO 异常报警信息
let warningMsg = _data.warningMsg;
$("#msgShowWindow").text(warningMsg);
$("#msgShowWindow").addClass("error");
}
}
if(_data.type=='broadcast'){
if(_data.message){
$("#broadcastShowWindow").text(_data.message);
}
}
}, false); }, false);
// 初始时关闭提示 // 初始时关闭提示
closeAlert(); closeAlert();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment