Skip to content

T
TF-MOM-WEB
Commit 7b370d84 authored by jingnan's avatar jingnan 👀
Browse files
Options

看板增加21站位

parent 3c592cbd
Hide whitespace changes
Inline Side-by-side
Showing with 185 additions and 57 deletions
applications/dee-mes/src/privateComponents/components/Visualization/AssembleKanban.vue
View file @ 7b370d84
...@@ -3347,7 +3347,7 @@ export default { ...@@ -3347,7 +3347,7 @@ export default {
} }
&.s52 { &.s52 {
top: 332px; top: 332px;
left: 110px; left: 90px;
width: 111px; width: 111px;
height: 65px; height: 65px;
z-index: 9; z-index: 9;
...@@ -3402,8 +3402,8 @@ export default { ...@@ -3402,8 +3402,8 @@ export default {
} }
} }
&.s51 { &.s51 {
top: 369px; top: 359px;
left: 249px; left: 189px;
width: 181px; width: 181px;
height: 89px; height: 89px;
> .model { > .model {
...@@ -3457,10 +3457,10 @@ export default { ...@@ -3457,10 +3457,10 @@ export default {
} }
} }
&.s41 { &.s41 {
top: 415px; top: 405px;
left: 453px; left: 330px;
width: 209px; width: 199px;
height: 102px; height: 92px;
> .model { > .model {
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -3487,7 +3487,7 @@ export default { ...@@ -3487,7 +3487,7 @@ export default {
> .stage { > .stage {
width: 215px; width: 215px;
height: 50px; height: 50px;
top: 89px; top: 79px;
left: 11px; left: 11px;
position: absolute; position: absolute;
background-image: url("../../../assets/看板2/站台/41底座.png"); background-image: url("../../../assets/看板2/站台/41底座.png");
...@@ -3497,7 +3497,7 @@ export default { ...@@ -3497,7 +3497,7 @@ export default {
> .tai { > .tai {
width: 157px; width: 157px;
height: 23px; height: 23px;
top: 92px; top: 82px;
left: 41px; left: 41px;
position: absolute; position: absolute;
background-repeat: no-repeat; //不重复 background-repeat: no-repeat; //不重复
...@@ -3511,10 +3511,10 @@ export default { ...@@ -3511,10 +3511,10 @@ export default {
} }
} }
&.s31 { &.s31 {
top: 476px; top: 450px;
left: 714px; left: 524px;
width: 220px; width: 200px;
height: 115px; height: 105px;
> .model { > .model {
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -3532,6 +3532,60 @@ export default { ...@@ -3532,6 +3532,60 @@ export default {
background-image: url("../../../assets/看板2/31灰.png"); background-image: url("../../../assets/看板2/31灰.png");
} }
} }
> .stage {
width: 260px;
height: 75px;
top: 77px;
left: -15px;
position: absolute;
background-image: url("../../../assets/看板2/站台/31底座.png");
background-repeat: no-repeat; //不重复
background-size: 100% 100%; // 满屏
}
> .tai {
width: 196px;
height: 36px;
top: 84px;
left: 25px;
position: absolute;
background-repeat: no-repeat; //不重复
background-size: 100% 100%; // 满屏
&.stage-dong {
background-image: url("../../../assets/看板2/站台/动台.gif");
}
&.stage-jing {
background-image: url("../../../assets/看板2/站台/静台.png");
}
}
> p {
top: -18px;
left: 96px;
width: 62px;
text-align: center;
}
}
&.s21 {
top: 506px;
left: 734px;
width: 220px;
height: 115px;
> .model {
width: 100%;
height: 100%;
z-index: 9;
position: absolute;
background-repeat: no-repeat; //不重复
background-size: 100% 100%; // 满屏
&.New {
background-image: url("../../../assets/看板2/21线.png");
}
&.Run {
background-image: url("../../../assets/看板2/21黄.png");
}
&.Finish {
background-image: url("../../../assets/看板2/21灰.png");
}
}
> .stage { > .stage {
width: 277px; width: 277px;
height: 85px; height: 85px;
...@@ -3564,6 +3618,7 @@ export default { ...@@ -3564,6 +3618,7 @@ export default {
text-align: center; text-align: center;
} }
} }
} }
} }
> footer { > footer {
......
applications/dee-mes/src/privateComponents/components/Visualization/ExperimentKanban.vue
View file @ 7b370d84
...@@ -3154,6 +3154,23 @@ export default { ...@@ -3154,6 +3154,23 @@ export default {
background-image: url("../../../assets/看板/内页飞机切图/31灰内.png"); background-image: url("../../../assets/看板/内页飞机切图/31灰内.png");
} }
} }
&.s21 {
top: 180px;
left: 105px;
width: 570px;
height: 245px;
background-repeat: no-repeat; //不重复
background-size: 100% 100%; // 满屏
&.New {
background-image: url("../../../assets/看板/内页飞机切图/31线内.png");
}
&.Run {
background-image: url("../../../assets/看板/内页飞机切图/31黄内.png");
}
&.Finish {
background-image: url("../../../assets/看板/内页飞机切图/31灰内.png");
}
}
} }
> .stage { > .stage {
width: 651px; width: 651px;
......
applications/dee-mes/src/privateComponents/components/Visualization/ProductionKanban.vue
View file @ 7b370d84
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<div <div
v-for="item in stationData" v-for="item in stationData"
:key="item.serialNumber" :key="item.serialNumber"
:class="stationClass(item.serialNumber, item.extPositionPlans&&item.extPositionPlans[0].planState)" :class="stationClass(item.serialNumber, item.extPositionPlans&&item.extPositionPlans[0].planState||'Run')"
@dblclick="routerExperiment(item)" @dblclick="routerExperiment(item)"
@click="selectStation(item.serialNumber)" @click="selectStation(item.serialNumber)"
> >
...@@ -178,6 +178,12 @@ export default { ...@@ -178,6 +178,12 @@ export default {
name: '', name: '',
progress: 0, progress: 0,
isLogo: false isLogo: false
},
{
serialNumber: '21',
name: '',
progress: 0,
isLogo: false
} }
], ],
JobPlanExecutionQueryParams: {}, JobPlanExecutionQueryParams: {},
...@@ -522,8 +528,8 @@ position: relative; ...@@ -522,8 +528,8 @@ position: relative;
cursor: pointer; cursor: pointer;
z-index: 9; z-index: 9;
&.s54 { &.s54 {
left: 670px; left: 546px;
top: 278px; top: 206px;
width: 127px; width: 127px;
height: 150px; height: 150px;
> .model { > .model {
...@@ -570,10 +576,10 @@ position: relative; ...@@ -570,10 +576,10 @@ position: relative;
} }
} }
&.s53 { &.s53 {
top: 525px; top: 427px;
left: 50px; left: 35px;
width: 394px; width: 374px;
height: 138px; height: 128px;
background-repeat: no-repeat; //不重复 background-repeat: no-repeat; //不重复
background-size: 100% 100%; // 满屏 background-size: 100% 100%; // 满屏
> .model { > .model {
...@@ -596,7 +602,7 @@ position: relative; ...@@ -596,7 +602,7 @@ position: relative;
> .stage { > .stage {
width: 446px; width: 446px;
height: 104px; height: 104px;
top: 110px; top: 94px;
left: -21px; left: -21px;
position: absolute; position: absolute;
background-image: url("../../../assets/看板2/站台/53底座.png"); background-image: url("../../../assets/看板2/站台/53底座.png");
...@@ -606,7 +612,7 @@ position: relative; ...@@ -606,7 +612,7 @@ position: relative;
> .tai { > .tai {
width: 323px; width: 323px;
height: 45px; height: 45px;
top: 120px; top: 110px;
left: 45px; left: 45px;
position: absolute; position: absolute;
background-repeat: no-repeat; //不重复 background-repeat: no-repeat; //不重复
...@@ -620,10 +626,10 @@ position: relative; ...@@ -620,10 +626,10 @@ position: relative;
} }
} }
&.s52 { &.s52 {
top: 325px; top: 268px;
left: 150px; left: 100px;
width: 262px; width: 200px;
height: 153px; height: 116px;
background-repeat: no-repeat; //不重复 background-repeat: no-repeat; //不重复
background-size: 100% 100%; // 满屏 background-size: 100% 100%; // 满屏
> .model { > .model {
...@@ -645,19 +651,19 @@ position: relative; ...@@ -645,19 +651,19 @@ position: relative;
} }
} }
> .stage { > .stage {
width: 391px; width: 321px;
height: 92px; height: 56px;
top: 137px; top: 104px;
left: -55px; left: -52px;
position: absolute; position: absolute;
background-image: url("../../../assets/看板2/站台/52底座.png"); background-image: url("../../../assets/看板2/站台/52底座.png");
background-repeat: no-repeat; //不重复 background-repeat: no-repeat; //不重复
background-size: 100% 100%; // 满屏 background-size: 100% 100%; // 满屏
} }
> .tai { > .tai {
width: 283px; width: 213px;
height: 45px; height: 26px;
top: 140px; top: 110px;
left: 3px; left: 3px;
position: absolute; position: absolute;
background-repeat: no-repeat; //不重复 background-repeat: no-repeat; //不重复
...@@ -671,10 +677,10 @@ position: relative; ...@@ -671,10 +677,10 @@ position: relative;
} }
} }
&.s51 { &.s51 {
top: 395px; top: 326px;
left: 427px; left: 357px;
width: 427px; width: 262px;
height: 210px; height: 133px;
background-repeat: no-repeat; //不重复 background-repeat: no-repeat; //不重复
background-size: 100% 100%; // 满屏 background-size: 100% 100%; // 满屏
> .model { > .model {
...@@ -696,20 +702,20 @@ position: relative; ...@@ -696,20 +702,20 @@ position: relative;
} }
} }
> .stage { > .stage {
width: 450px; width: 391px;
height: 105px; height: 92px;
top: 180px; top: 102px;
left: 20px; left: -55px;
position: absolute; position: absolute;
background-image: url("../../../assets/看板2/站台/51底座.png"); background-image: url("../../../assets/看板2/站台/51底座.png");
background-repeat: no-repeat; //不重复 background-repeat: no-repeat; //不重复
background-size: 100% 100%; // 满屏 background-size: 100% 100%; // 满屏
} }
> .tai { > .tai {
width: 322px; width: 283px;
height: 47px; height: 45px;
top: 190px; top: 110px;
left: 90px; left: 3px;
position: absolute; position: absolute;
background-repeat: no-repeat; //不重复 background-repeat: no-repeat; //不重复
background-size: 100% 100%; // 满屏 background-size: 100% 100%; // 满屏
...@@ -722,10 +728,10 @@ position: relative; ...@@ -722,10 +728,10 @@ position: relative;
} }
} }
&.s41 { &.s41 {
top: 483px; top: 390px;
left: 822px; left: 577px;
width: 493px; width: 397px;
height: 241px; height: 170px;
background-repeat: no-repeat; //不重复 background-repeat: no-repeat; //不重复
background-size: 100% 100%; // 满屏 background-size: 100% 100%; // 满屏
> .model { > .model {
...@@ -745,20 +751,70 @@ position: relative; ...@@ -745,20 +751,70 @@ position: relative;
background-image: url("../../../assets/看板2/41灰.png"); background-image: url("../../../assets/看板2/41灰.png");
} }
} }
> .stage {
width: 450px;
height: 105px;
top: 140px;
left: 10px;
position: absolute;
background-image: url("../../../assets/看板2/站台/41底座.png");
background-repeat: no-repeat; //不重复
background-size: 100% 100%; // 满屏
}
> .tai {
width: 322px;
height: 47px;
top: 150px;
left: 80px;
position: absolute;
background-repeat: no-repeat; //不重复
background-size: 100% 100%; // 满屏
&.stage-dong {
background-image: url("../../../assets/看板2/站台/动台.gif");
}
&.stage-jing {
background-image: url("../../../assets/看板2/站台/静台.png");
}
}
}
&.s31{
top: 470px;
left: 920px;
width: 473px;
height: 221px;
background-repeat: no-repeat; //不重复
background-size: 100% 100%; // 满屏
> .model {
width: 100%;
height: 100%;
z-index: 9;
position: absolute;
background-repeat: no-repeat; //不重复
background-size: 100% 100%; // 满屏
&.New {
background-image: url("../../../assets/看板2/31线.png");
}
&.Run {
background-image: url("../../../assets/看板2/31黄.png");
}
&.Finish {
background-image: url("../../../assets/看板2/31灰.png");
}
}
> .stage { > .stage {
width: 507px; width: 507px;
height: 118px; height: 118px;
top: 209px; top: 189px;
left: 20px; left: 20px;
position: absolute; position: absolute;
background-image: url("../../../assets/看板2/站台/41底座.png"); background-image: url("../../../assets/看板2/站台/31底座.png");
background-repeat: no-repeat; //不重复 background-repeat: no-repeat; //不重复
background-size: 100% 100%; // 满屏 background-size: 100% 100%; // 满屏
} }
> .tai { > .tai {
width: 369px; width: 369px;
height: 54px; height: 54px;
top: 218px; top: 198px;
left: 90px; left: 90px;
position: absolute; position: absolute;
background-repeat: no-repeat; //不重复 background-repeat: no-repeat; //不重复
...@@ -771,8 +827,8 @@ position: relative; ...@@ -771,8 +827,8 @@ position: relative;
} }
} }
} }
&.s31 { &.s21 {
top: 601px; top: 589px;
left: 1358px; left: 1358px;
width: 518px; width: 518px;
height: 269px; height: 269px;
...@@ -786,13 +842,13 @@ position: relative; ...@@ -786,13 +842,13 @@ position: relative;
background-repeat: no-repeat; //不重复 background-repeat: no-repeat; //不重复
background-size: 100% 100%; // 满屏 background-size: 100% 100%; // 满屏
&.New { &.New {
background-image: url("../../../assets/看板2/31线.png"); background-image: url("../../../assets/看板2/21线.png");
} }
&.Run { &.Run {
background-image: url("../../../assets/看板2/31黄.png"); background-image: url("../../../assets/看板2/21黄.png");
} }
&.Finish { &.Finish {
background-image: url("../../../assets/看板2/31灰.png"); background-image: url("../../../assets/看板2/21灰.png");
} }
} }
> .stage { > .stage {
......
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