Skip to content

K
kanban-nanjing-11
Commit 05d13dd0 authored by xcc's avatar xcc
Browse files
Options

Merge remote-tracking branch 'origin/main'

parents b6422f0a e3f8316a
Show whitespace changes
Inline Side-by-side
Showing with 260 additions and 120 deletions
css/common.css
View file @ 05d13dd0
......@@ -68,10 +68,13 @@ a,a:hover,.btn,.btn:hover{ transition:all 300ms ease; user-select:none; }
top: 36px;
color: #fff;
top: 72px;
right: 357px;
}
.toptime span{
font-size: 36px;
font-size: 46px;
}
......@@ -108,12 +111,12 @@ a,a:hover,.btn,.btn:hover{ transition:all 300ms ease; user-select:none; }
.dilog-iframe-index{
width: 2000px;
height: 1500px;
width: 1200px;
height: 500px;
position: absolute;
top: 200px;
left: calc(50% - 1000px);
z-index: 999;
top: 60px;
left: calc(50% - 600px);
z-index: 999999;
background: #fff;
border-radius: 30px;
}
......@@ -126,37 +129,38 @@ a,a:hover,.btn,.btn:hover{ transition:all 300ms ease; user-select:none; }
.dilog-iframe-index ul{
list-style: none;
margin-top: 60px;
margin-top: 20px;
overflow: scroll;
height: 976px;
height: 307px;
min-height: 307px;
}
.dilog-iframe-index h1{
text-align: center;
margin-top: 66px;
font-size: 76px;
margin-top: 12px;
font-size: 24px;
}
.dilog-iframe-index li{
display: inline-block;
border: 1px solid #868585a6;
border-radius: 12px;
padding: 28px 86px;
padding: 4px 26px;
cursor: pointer;
user-select: none;
position: relative;
margin-right: 26px;
margin-bottom: 36px;
margin-right: 17px;
margin-bottom: 13px;
}
.dilog-iframe-index li img{
width: 50px;
height: 50px;
width: 14px;
height: 14px;
display: inline-block;
position: absolute;
top: 10px;
right:10px;
top: 6px;
right:6px;
z-index: 111;
visibility: hidden;
}
......@@ -164,7 +168,9 @@ a,a:hover,.btn,.btn:hover{ transition:all 300ms ease; user-select:none; }
display: inline-block;
padding: 0px;
margin: 0px;
font-size: 46px;
font-size: 16px;
position: relative;
top: -3px;
}
......@@ -185,12 +191,69 @@ a,a:hover,.btn,.btn:hover{ transition:all 300ms ease; user-select:none; }
}
.dilog-iframe-index .bottom-btn .v-btn{
font-size: 76px;
width: 500px;
height: 166px;
border-radius: 18px;
font-size: 26px;
width: 112px;
height: 60px;
border-radius: 12px;
}
body{
user-select: none;
}
.change-btn-left{
/* width: 100px;
height: 100%;
position: absolute;
top: 0px;
left: 0px;
z-index: 999991;
background-color: red; */
}
.top-bar-click-box{
width: 100%;
position: absolute;
top: 0px;
left: 0px;
z-index: 99991;
height: 100px;
/* background: red; */
}
.top-bar-click-box{
display: flex;
}
.top-bar-click-box img{
width: 60px;
height: 60px;
cursor: pointer;
margin-top: 20px;
/* display: none; */
}
.top-bar-click-box div:nth-child(1){
display: inline-block;
flex: 2;
/* background-color: #00ccff; */
text-align: left;
padding-left: 16px;
}
.top-bar-click-box div:nth-child(2){
display: inline-block;
flex: 4;
cursor: pointer;
/* background-color: #f2ca63; */
}
.top-bar-click-box div:nth-child(3){
display: inline-block;
flex: 2;
padding-right: 16px;
/* background-color: greenyellow; */
text-align: right;
}
\ No newline at end of file
css/page2.css
View file @ 05d13dd0
......@@ -775,7 +775,7 @@
.text-126{
text-align: center;
font-size: 60px;
margin-top: 32px;
margin-top: 0px;
}
.error{
color: #e91d1d;
......
css/page3.css
View file @ 05d13dd0
......@@ -915,3 +915,20 @@
transform: translateX(-100%);
}
}
.bottom-inex23-box{
border: none;
margin-left: 31px;
/* padding-left: 70px; */
position: absolute;
padding-left: 16px;
width: 98%;
bottom: -16px;
}
.bottom-inex23-box .text-126{
margin-top: 0px;
}
\ No newline at end of file
img/left-btn.svg 0 → 100644
View file @ 05d13dd0
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1717488133848" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4529" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 97.52381c228.912762 0 414.47619 185.563429 414.47619 414.47619s-185.563429 414.47619-414.47619 414.47619S97.52381 740.912762 97.52381 512 283.087238 97.52381 512 97.52381z m0 73.142857C323.486476 170.666667 170.666667 323.486476 170.666667 512s152.81981 341.333333 341.333333 341.333333 341.333333-152.81981 341.333333-341.333333S700.513524 170.666667 512 170.666667z m48.761905 118.954666L612.473905 341.333333l-170.666667 170.666667 170.666667 170.666667L560.761905 734.378667 338.383238 512 560.761905 289.621333z" p-id="4530" fill="#ffffff"></path></svg>
\ No newline at end of file
img/right-btn.svg 0 → 100644
View file @ 05d13dd0
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1717490209956" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5565" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 97.52381c228.912762 0 414.47619 185.563429 414.47619 414.47619s-185.563429 414.47619-414.47619 414.47619S97.52381 740.912762 97.52381 512 283.087238 97.52381 512 97.52381z m0 73.142857C323.486476 170.666667 170.666667 323.486476 170.666667 512s152.81981 341.333333 341.333333 341.333333 341.333333-152.81981 341.333333-341.333333S700.513524 170.666667 512 170.666667z m-48.761905 118.954666L685.616762 512 463.238095 734.378667 411.526095 682.666667l170.666667-170.666667-170.666667-170.666667L463.238095 289.621333z" p-id="5566" fill="#ffffff"></path></svg>
\ No newline at end of file
index.html
View file @ 05d13dd0
......@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="renderer" content="webkit" />
<title>精工底盘运营管理</title>
<title>南京汽车集团有限公司MEB系统</title>
<link rel="stylesheet" type="text/css" href="css/common.css" />
<link rel="stylesheet" type="text/css" href="css/animate.css" />
<link rel="stylesheet" type="text/css" href="css/index.css" />
......
index1.html
View file @ 05d13dd0
......@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="renderer" content="webkit" />
<!-- <title>精工底盘运营管理</title> -->
<title>南京汽车集团有限公司MEB系统</title>
<link rel='stylesheet' href='css/materialdesignicons.min.css' type='text/css' media='all' />
......@@ -30,14 +30,25 @@
</head>
<body>
<div id="app">
<v-app>
<div class="wrap-custem" style="height:100%;">
<div @click="clickshowBox" class="top-bar-click-box">
<div>
<img v-if="showIMg" @click="lastClick" src="./img/left-btn.svg" alt="">
</div>
<div @dblclick="handleDoubleClick"></div>
<div>
<img v-if="showIMg" @click="nextClick" src="./img/right-btn.svg" alt="">
</div>
</div>
<div class="wrap wrap-custem">
<iframe id="myiframe1" class="iframe-custem hidden" src="./page1.html" frameborder="0"></iframe>
<iframe id="myiframe2" class="iframe-custem hidden" src="./page2.html" frameborder="0"></iframe>
<iframe id="myiframe3" class="iframe-custem hidden" src="./page3.html" frameborder="0"></iframe>
<iframe id="myiframe1" :class="`iframe-custem ${numMark==1?'':'hidden'}`" src="./page1.html" frameborder="0"></iframe>
<iframe id="myiframe2" :class="`iframe-custem ${numMark==2?'':'hidden'}`" src="./page2.html" frameborder="0"></iframe>
<iframe id="myiframe3" :class="`iframe-custem ${numMark==3?'':'hidden'}`" src="./page3.html" frameborder="0"></iframe>
<div v-if="showDilog" class="dilog-iframe-index">
......@@ -64,87 +75,22 @@
el: '#app',
vuetify: new Vuetify(),
data: () => ({
numMark: 0,
showIMg:false,
showDilog:true,
gongweiList:[
{
lable:"工位111",
active:false
},
{
lable:"工位111",
active:false
},
{
lable:"工位111",
active:false
},
{
lable:"工位111",
active:false
},
{
lable:"工位111",
active:false
},
{
lable:"工位111",
active:false
},
{
lable:"工位111",
active:false
},
{
lable:"工位111",
active:false
},
{
lable:"工位111",
active:false
},
{
lable:"工位111",
active:false
},
{
lable:"工位111",
active:false
},
{
lable:"工位111",
active:false
},
{
lable:"工位111",
active:false
},
{
lable:"工位111",
active:false
},
{
lable:"工位111",
active:false
},
{
lable:"工位111",
active:false
},
{
lable:"工位111",
active:false
},
{
lable:"工位111",
active:false
},
{
lable:"工位111",
active:false
},
// {
// lable:"工位111",
// active:false
// },
// {
// lable:"工位111",
// active:false
// },
......@@ -155,6 +101,53 @@
this.getSite();
},
methods: {
// 上一个
lastClick(){
if(this.numMark<=1){
this.$nextTick(()=>{
this.numMark=3
})
}else{
this.$nextTick(()=>{
this.numMark=this.numMark-1
})
}
},
// 下一个
nextClick(){
if(this.numMark>=3){
this.$nextTick(()=>{
this.numMark=1
})
}else{
this.$nextTick(()=>{
this.numMark=this.numMark+1
})
}
},
// 显示按钮
clickshowBox(){
if( !this.showDilog ){
this.showIMg=true
//清除interval定时器
if(window.IntervalItemRight1){
clearInterval(window.IntervalItemRight1)
}
window.IntervalItemRight1=setInterval(()=>{
this.showIMg=false
},15000)
}
},
getSite(){
fetch('http://127.0.0.1:8180/stage-api/base/site/selectListSite',
{method: 'GET', headers: {'Authorization': 'Bearer_8aa1151b-dcff-47d7-8d6a-4bec3cb2041d'}})
......@@ -165,7 +158,7 @@
.catch(error => console.error('Error:', error));
},
initWebSocket(){
console.log('1111+++='+codeDianshi)
// console.log('1111+++='+codeDianshi)
var iframe1 = document.getElementById('myiframe1').contentWindow;
var iframe2 = document.getElementById('myiframe2').contentWindow;
var iframe3 = document.getElementById('myiframe3').contentWindow;
......@@ -336,15 +329,78 @@
},
// 确定
submit1(){
const that=this
const _data=JSON.parse(JSON.stringify(this.gongweiList)).filter(o=>o.active)
codeDianshi=_data[0].tmBasSiteId;
this.initWebSocket();
this.showDilog=false;
this.$nextTick(()=>{
that.requestFullscreenFunc()
setTimeout(()=>{
// 显示第一个 ifream
$("#myiframe1").removeClass("hidden")
// $("#myiframe1").removeClass("hidden")
this.numMark=1
},300)
})
},
// 全屏 函数
requestFullscreenFunc(){
// 全屏
var docElm = document.body;
/*W3C*/
if (docElm.requestFullscreen) {
docElm.requestFullscreen();
}/*FireFox */ else if (docElm.mozRequestFullScreen) {
docElm.mozRequestFullScreen();
}/*Chrome等 */ else if (docElm.webkitRequestFullScreen) {
docElm.webkitRequestFullScreen();
}/*IE11*/ else if (docElm.msRequestFullscreen) {
docElm.msRequestFullscreen();
}
},
// 判断全屏
checkFull(){
var isFull = false;
if (document.fullscreenEnabled || document.msFullscreenEnabled ) {
isFull = window.fullScreen || document.webkitIsFullScreen;
if (isFull === undefined) {
isFull = false;
}
}
this.isFullscreen=isFull
return isFull;
},
// 退出全屏
outRequestFullscreenFunc(){
// if(! this.checkFull() ) return
if (document.fullscreenElement !== null) {
document.exitFullscreen();
}
else if (document.mozCancelFullScreen) {
document.mozCancelFullScreen()
}
else if (document.webkitCancelFullScreen) {
document.webkitCancelFullScreen()
}
else if (document.msExitFullscreen) {
document.msExitFullscreen()
}
},
handleDoubleClick(){
if( !this.checkFull() ){
this.requestFullscreenFunc()
}else{
this.outRequestFullscreenFunc()
}
}
}
})
......
index22.html
View file @ 05d13dd0
......@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="renderer" content="webkit" />
<!-- <title>精工底盘运营管理</title> -->
<!-- <title>南京汽车集团有限公司MEB系统</title> -->
<link rel="stylesheet" type="text/css" href="css/common.css" />
<link rel="stylesheet" type="text/css" href="css/animate.css" />
<link rel="stylesheet" type="text/css" href="css/index.css" />
......
index33.html
View file @ 05d13dd0
......@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="renderer" content="webkit" />
<!-- <title>精工底盘运营管理</title> -->
<!-- <title>南京汽车集团有限公司MEB系统</title> -->
<link rel="stylesheet" type="text/css" href="css/common.css" />
<link rel="stylesheet" type="text/css" href="css/animate.css" />
<link rel="stylesheet" type="text/css" href="css/index.css" />
......
page1.html
View file @ 05d13dd0
......@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="renderer" content="webkit" />
<title>看板</title>
<title>南京汽车集团有限公司MEB系统</title>
<link rel="stylesheet" type="text/css" href="css/common.css" />
<link rel="stylesheet" type="text/css" href="css/animate.css" />
<link rel="stylesheet" type="text/css" href="css/liMarquee.css">
......@@ -19,7 +19,7 @@
<script>new WOW().init();</script>
</head>
<body>
<body style="transform: scaleY(0.397) scaleX(0.406);transform-origin: 0px 0px;">
<div class="wrap wow fadeIn" data-wow-duration="1s" data-wow-delay="0s">
......@@ -322,7 +322,7 @@
.text-126{
text-align: center;
font-size: 60px;
margin-top: 32px;
margin-top: 2px;
}
.error{
color: #e91d1d;
......
page2.html
View file @ 05d13dd0
......@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="renderer" content="webkit" />
<title>看板</title>
<title>南京汽车集团有限公司MEB系统</title>
<link rel="stylesheet" type="text/css" href="css/common.css" />
<link rel="stylesheet" type="text/css" href="css/animate.css" />
<link rel="stylesheet" type="text/css" href="css/liMarquee.css">
......@@ -19,7 +19,8 @@
<script>new WOW().init();</script>
</head>
<body>
<body style="transform: scaleY(0.397) scaleX(0.406);transform-origin: 0px 0px;">
<div class="wrap wow fadeIn" data-wow-duration="1s" data-wow-delay="0s">
......
page3.html
View file @ 05d13dd0
......@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="renderer" content="webkit"/>
<title>看板</title>
<title>南京汽车集团有限公司MEB系统</title>
<link rel="stylesheet" type="text/css" href="css/common.css"/>
<link rel="stylesheet" type="text/css" href="css/animate.css"/>
<link rel="stylesheet" type="text/css" href="css/liMarquee.css">
......@@ -19,7 +19,8 @@
<script>new WOW().init();</script>
</head>
<body>
<body style="transform: scaleY(0.397) scaleX(0.406);transform-origin: 0px 0px;">
<div class="wrap wow fadeIn" data-wow-duration="1s" data-wow-delay="0s">
......
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