Skip to content

K
kanban-nanjing-11
Commit 383206f0 authored by xcc's avatar xcc
Browse files
Options

页面整合一起

parent 0c4b642f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 279 additions and 407 deletions
css/page1.css
View file @ 383206f0
......@@ -862,4 +862,12 @@
font-size: 300px; /* 设置文字大小 */
}
.text-126{
text-align: center;
font-size: 60px;
margin-top: 32px;
width: 50%;
}
.error{
color: #e91d1d;
}
css/page2.css
View file @ 383206f0
......@@ -854,3 +854,25 @@
height: 160px;
}
.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 @ 383206f0
......@@ -3,7 +3,7 @@
.topbox_m .logo { background: url(../img/logistics/logobg.png) center center no-repeat;}
.main_t {
.main_t {
position: relative;
/* background: url(../img/logistics/box1.png) no-repeat; */
border: 1px solid #026d91;
......@@ -20,11 +20,11 @@
.ibox3 { float: right; width: 1192px;}
.ibox4 { }
.ibox_t { position: absolute;
.ibox_t { position: absolute;
/* left: 12px; top: 22px; */
left: -4px;
top: 6px;
background: url(../img/logistics/tit.png) left top no-repeat;
background: url(../img/logistics/tit.png) left top no-repeat;
/* width: 676px; */
width: 100%;
height: 100px; padding: 24px 0 0 46px; box-sizing: border-box; }
......@@ -94,7 +94,7 @@
.ibox_m{
box-sizing: border-box;
height: 100%;
}
.ibox_m .echarts-body{
......@@ -293,7 +293,7 @@
/* 列表文字大小 */
.table-ui-box ul li{
font-size: 32px;
font-size: 32px;
}
/* 列宽 比例 */
......@@ -482,14 +482,14 @@
.box-echarts-body-index2 .main_t.ul-index2 .box-left .echarts-div{
width: 100%;
height: 100%;
}
}
.box-echarts-body-index2 .main_t.ul-index2 .box-right{
flex: 1;
}
.custem-table-index1,
.custem-table-index2,
.custem-table-index5
.custem-table-index5
{
......@@ -561,7 +561,7 @@
.box-echarts-body-index2 .main_t.ul-index3 .box-left .echarts-div{
width: 100%;
height: 100%;
}
}
.box-echarts-body-index2 .main_t.ul-index3 .box-right{
flex: 1;
}
......@@ -618,7 +618,7 @@
.box-echarts-body-index1 .main_t.ul-index3 .box-left .echarts-div{
width: 100%;
height: 100%;
}
}
.box-echarts-body-index1 .main_t.ul-index3 .box-right{
flex: 1;
}
......@@ -844,4 +844,50 @@
top: 8px;
z-index: 998;
font-size: 96px;
}
\ No newline at end of file
}
.dialog-entirety-box{
position: absolute;
top: 700px;
left: calc(50% - 800px);
z-index: 999999;
width: 1600px;
height: 690px;
background-color: #1478d8;
border-radius: 50px;
font-size: 48px;
}
.dialog-entirety-box h1{
margin-top: 250px;
text-align: center;
color: #ee6666;
}
.dialog-entirety-box img{
position: absolute;
top: 50px;
right: 50px;
z-index: 77;
width: 160px;
height: 160px;
}
.main_b {
position: relative;
/* background: url(../img/logistics/box1.png) no-repeat; */
border: 1px solid #026d91;
height: 100px;
/*height: 448px;*/
margin-bottom: 22px;}
.text-126{
text-align: center;
font-size: 60px;
margin-top: 32px;
width: 50%;
}
.error{
color: #e91d1d;
}
index1.html
View file @ 383206f0
......@@ -23,12 +23,15 @@
<!-- <iframe id="myiframe2" style="width: 800px;height: 800px;border: 2px solid red;" src="./index33.html" frameborder="0"></iframe>-->
<iframe id="myiframe2" style="width: 6000px;height: 2200px;border: 2px solid red;" src="./page2.html" frameborder="0"></iframe>
<iframe id="myiframe3" style="width: 6000px;height: 2200px;border: 2px solid red;" src="./page3.html" frameborder="0"></iframe>
</div>
<script>
$(document).ready(function() {
var iframe1 = document.getElementById('myiframe1').contentWindow;
var iframe2 = document.getElementById('myiframe2').contentWindow;
var iframe3 = document.getElementById('myiframe3').contentWindow;
const codeDianshi = '1194168167242801152'
let bwsState = 0; // bwsWebSocket 状态
let wsState = 0; // wsWebSocket 状态
......@@ -48,6 +51,7 @@ $(document).ready(function() {
}
iframe1.postMessage(JSON.stringify(_json1), '*');
iframe2.postMessage(JSON.stringify(_json1), '*');
iframe3.postMessage(JSON.stringify(_json1), '*');
}
// 接听服务器发回的信息并处理展示
ws.onmessage = function (option = {}) {
......@@ -60,6 +64,7 @@ $(document).ready(function() {
console.log(_data);
iframe1.postMessage(JSON.stringify(_data), '*');
iframe2.postMessage(JSON.stringify(_data), '*');
iframe3.postMessage(JSON.stringify(_data), '*');
}
// 监听连接关闭事件
ws.onclose = function () {
......@@ -72,6 +77,7 @@ $(document).ready(function() {
}
iframe1.postMessage(JSON.stringify(_json1), '*');
iframe2.postMessage(JSON.stringify(_json1), '*');
iframe3.postMessage(JSON.stringify(_json1), '*');
}
// 监听并处理error事件
ws.onerror = function (error) {
......@@ -82,6 +88,7 @@ $(document).ready(function() {
}
iframe1.postMessage(JSON.stringify(_json1), '*');
iframe2.postMessage(JSON.stringify(_json1), '*');
iframe3.postMessage(JSON.stringify(_json1), '*');
console.log('错误error' + error);
console.log('错误：ws连接状态：' + ws.readyState);
}
......@@ -100,6 +107,7 @@ $(document).ready(function() {
}
iframe1.postMessage(JSON.stringify(_json1), '*');
iframe2.postMessage(JSON.stringify(_json1), '*');
iframe3.postMessage(JSON.stringify(_json1), '*');
}
// 接听服务器发回的信息并处理展示
broadcastWs.onmessage = function (option = {}) {
......@@ -113,6 +121,7 @@ $(document).ready(function() {
console.log(_data);
iframe1.postMessage(JSON.stringify(_data), '*');
iframe2.postMessage(JSON.stringify(_data), '*');
iframe3.postMessage(JSON.stringify(_data), '*');
}
// 监听连接关闭事件
broadcastWs.onclose = function () {
......@@ -125,6 +134,7 @@ $(document).ready(function() {
}
iframe1.postMessage(JSON.stringify(_json1), '*');
iframe2.postMessage(JSON.stringify(_json1), '*');
iframe3.postMessage(JSON.stringify(_json1), '*');
}
// 监听并处理error事件
broadcastWs.onerror = function (error) {
......@@ -135,6 +145,7 @@ $(document).ready(function() {
}
iframe1.postMessage(JSON.stringify(_json1), '*');
iframe2.postMessage(JSON.stringify(_json1), '*');
iframe3.postMessage(JSON.stringify(_json1), '*');
console.log('错误error' + error);
console.log('错误：bws连接状态：' + broadcastWs.readyState);
}
......
page1.html
View file @ 383206f0
......@@ -34,7 +34,7 @@
<div class="logo">
<b>
<!-- <img src="img/logo.png"> -->
目视化信息系统
MEB系统
</b>
</div>
</div>
......@@ -176,7 +176,6 @@
window.addEventListener('message', function(event={}) {
const _data=JSON.parse( (event.data||"{}") )
console.log(_data);
closeMessage();
if(_data.type==='conStatusChange'){
updateStatus(_data.newStatus);
}
......@@ -249,66 +248,14 @@
$("#output-sum").html(_data.message.result.ALL);
$("#output-text").html("台");
}
// RightTableInit([
// {
// text1: 'ZP11', // 车型
// text2: '207', // 数量
// },
// {
// text1: 'ZP12', // 车型
// text2: '207', // 数量
// },
// {
// text1: 'ZP13', // 车型
// text2: '207', // 数量
// },
// {
// text1: 'ZP14', // 车型
// text2: '207', // 数量
// },
// {
// text1: 'ZP15', // 车型
// text2: '207', // 数量
// },
// {
// text1: 'ZP16', // 车型
// text2: '207', // 数量
// },
// {
// text1: 'ZP17', // 车型
// text2: '207', // 数量
// },
// {
// text1: 'ZP18', // 车型
// text2: '207', // 数量
// },
// {
// text1: 'ZP19', // 车型
// text2: '207', // 数量
// },
// {
// text1: 'ZP20', // 车型
// text2: '207', // 数量
// },
// {
// text1: 'ZP21', // 车型
// text2: '207', // 数量
// },
// {
// text1: 'ZP22', // 车型
// text2: '207', // 数量
// },
// ])
RightTableInit(_data.message.result);
}else {
isNull('is-null-text-6');
}
}
if(_data.type=='broadcast'){
if(_data.message){
$("#msgShowWindow").text(_data.message);
showMessage();
}
}
......
page2.html
View file @ 383206f0
......@@ -34,7 +34,7 @@
<div class="logo">
<b>
<!-- <img src="img/logo.png"> -->
目视化信息系统
MEB系统
</b>
</div>
</div>
......@@ -300,8 +300,11 @@
</div>
<div class="box-right-container box-echarts-body-index2">
<div class="main_b ul-index1 bottom-inex23-box">
<div class="main_b">
<span class="text-126 error" id="msgShowWindow">连接错误，连接错误，连接错误</span>
<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>
......@@ -361,6 +364,12 @@ $(document).ready(function () {
}
}
if(_data.type=='broadcast'){
if(_data.message){
$("#broadcastShowWindow").text(_data.message);
}
}
}, false);
// 初始时关闭提示
......
page3.html
View file @ 383206f0
This diff is collapsed.
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