Skip to content

Z
zhongtong-avi-web
Commit e39a6e32 authored by 李志鸣's avatar 李志鸣
Browse files
Options

fix(AVI PC): 修复PC端AVI bug

parent 9d7d3653
Hide whitespace changes
Inline Side-by-side
Showing with 275 additions and 405 deletions
src/views/Led/Station/stationFive.vue
View file @ e39a6e32
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<div v-if="roomInfoList.length > 8" :class="roomInfoList.length > 8 ? 'nth-6' : 'th-6'">{{ judgeDataRnder(index + 8) ? `${roomInfoList[index+8].workingHours}min`: '' }}</div> <div v-if="roomInfoList.length > 8" :class="roomInfoList.length > 8 ? 'nth-6' : 'th-6'">{{ judgeDataRnder(index + 8) ? `${roomInfoList[index+8].workingHours}min`: '' }}</div>
</div> </div>
<div class="time">时间：{{ timeNow }}</div> <div class="time">时间：{{ timeNow }}</div>
</div> </div>
</swiper-slide> </swiper-slide>
</swiper> </swiper>
</div> </div>
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
<script> <script>
import { swiper, swiperSlide } from 'vue-awesome-swiper' import { swiper, swiperSlide } from 'vue-awesome-swiper'
import Moment from 'moment' import Moment from 'moment'
export default { export default {
name: 'StationFive', name: 'StationFive',
components: { components: {
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
return { return {
// Data轮询定时器 // Data轮询定时器
dataTimer: '', dataTimer: '',
mockArray: [0, 1, 2, 3, 4, 5, 6, 7], mockArray: [0, 1, 2, 3, 4, 5],
// 工位实时数据 // 工位实时数据
timmingData: {}, timmingData: {},
// 报警数据 // 报警数据
...@@ -87,94 +88,7 @@ ...@@ -87,94 +88,7 @@
} }
}, },
// 面清漆室实时数据 // 面清漆室实时数据
roomInfoList: [], roomInfoList: []
reponse: [
{
name: '喷漆飞机1',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机2',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机3',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机4',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机5',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机6',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机7',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机8',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机9',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机10',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机11',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机12',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机13',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机14',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机14',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机15',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机16',
stationState: '工作',
workingHours: '60'
}
]
} }
}, },
methods: { methods: {
...@@ -184,11 +98,7 @@ ...@@ -184,11 +98,7 @@
this.timmingData = _.cloneDeep(res); this.timmingData = _.cloneDeep(res);
this.roomInfoList = _.cloneDeep(res.roomInfoList); this.roomInfoList = _.cloneDeep(res.roomInfoList);
this.warningList = _.cloneDeep(res.warningList) this.warningList = _.cloneDeep(res.warningList)
// console.log(this.warningList)
console.log(this.roomInfoList.length)
console.log(res)
for (let item of this.roomInfoList) { for (let item of this.roomInfoList) {
console.log('item', item)
if (item.stationState === 'USE') { if (item.stationState === 'USE') {
item.stationState = '使用' item.stationState = '使用'
} }
...@@ -323,110 +233,108 @@ ...@@ -323,110 +233,108 @@
} }
.spray-drying { .spray-drying {
width: 1710px; width: 1710px;
height: 860px;
background-color: #111; background-color: #111;
.title-pack { .title-pack {
// width: 1710px; // width: 1710px;
// height: 100px; // height: 100px;
text-align: center; text-align: center;
color: yellow; color: yellow;
line-height: 100px; line-height: 120px;
font-weight: bold; font-weight: bold;
font-size: 50px; font-size: 100px;
} }
// .table-pack { // .table-pack {
// overflow: hidden; // overflow: hidden;
.tr {
width: 1708px;
// height: 30px;
.th-1,.th-2,.th-3,.th-4,.th-5,.th-6 { .tr {
width: 600px; width: 1708px;
height: 60px; // height: 30px;
border-top: 2px solid yellow;
border-right: 2px solid yellow;
float: left;
text-align: center;
color: yellow;
line-height: 60px;
font-weight: bold;
font-size: 50px;
}
.th-2 {width: 506px;}
.th-3 {
width: 598px;
border-right: 0px;
}
.th-4 {width: 17%;}
.th-5 {width: 15%;}
.th-6 {width: 17%;}
.th-r { .th-1,.th-2,.th-3,.th-4,.th-5,.th-6 {
// width: 855px; width: 600px;
height: 100px; height: 92px;
border-top: 2px solid yellow; border-top: 2px solid yellow;
float: left; border-right: 2px solid yellow;
text-align: center; float: left;
color: yellow; text-align: center;
line-height: 100px; color: yellow;
font-weight: bold; line-height: 92px;
font-size: 60px; font-weight: bold;
} font-size: 85px;
}
.th-2 {width: 506px;}
.th-3 {
width: 598px;
border-right: 0px;
}
.th-4 {width: 17%;}
.th-5 {width: 15%;}
.th-6 {width: 17%;}
.th-r {
// width: 855px;
height: 100px;
border-top: 2px solid yellow;
float: left;
text-align: center;
color: yellow;
line-height: 100px;
font-weight: bold;
font-size: 60px;
} }
// 数据量大于8条时
.ntr {
width: 1708px;
// height: 30px;
.nth-1,.nth-2,.nth-3,.nth-4,.nth-5,.nth-6 { }
width: 16%; // 数据量大于8条时
height: 70px; .ntr {
border-top: 2px solid yellow; width: 1708px;
border-right: 2px solid yellow; // height: 30px;
float: left;
text-align: center;
color: yellow;
line-height: 75px;
font-weight: bold;
font-size: 40px;
}
.nth-2 {width: 14%;}
.nth-3 {
width: 19.3%;
border-right: 2px solid yellow;
}
.nth-4 {width: 16%;}
.nth-5 {width: 14%;}
.nth-6 {
width: 19.3%;
border-right: none;
}
.nth-r { .nth-1,.nth-2,.nth-3,.nth-4,.nth-5,.nth-6 {
// width: 855px; width: 16%;
height: 100px; height: 70px;
border-top: 2px solid yellow; border-top: 2px solid yellow;
float: left; border-right: 2px solid yellow;
text-align: center; float: left;
color: yellow; text-align: center;
line-height: 100px; color: yellow;
font-weight: bold; line-height: 75px;
font-size: 60px; font-weight: bold;
} font-size: 40px;
}
.nth-2 {width: 14%;}
.nth-3 {
width: 19.3%;
border-right: 2px solid yellow;
}
.nth-4 {width: 16%;}
.nth-5 {width: 14%;}
.nth-6 {
width: 19.3%;
border-right: none;
} }
.time { .nth-r {
width: 1710px; // width: 855px;
height: 100px; height: 100px;
border-top: 2px solid yellow; border-top: 2px solid yellow;
float: left;
text-align: center;
color: yellow; color: yellow;
font-weight: bold;
line-height: 100px; line-height: 100px;
font-weight: bold;
font-size: 60px; font-size: 60px;
// } }
}
.time {
width: 1710px;
height: 92px;
border-top: 2px solid yellow;
color: yellow;
font-weight: bold;
line-height: 92px;
font-size: 70px;
} }
} }
} }
......
src/views/Led/Station/stationSeven.vue
View file @ e39a6e32
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</div> </div>
<div class="info"> <div class="info">
设备报警信息： 设备报警信息：
<div>&nbsp;</div> <div class="line"></div>
<swiper :options="swiperOption"> <swiper :options="swiperOption">
<swiper-slide v-for="(item, index) in warningList" :key="index">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{warningList[index].name}}：{{warningList[index].info}}</swiper-slide> <swiper-slide v-for="(item, index) in warningList" :key="index">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{warningList[index].name}}：{{warningList[index].info}}</swiper-slide>
</swiper> </swiper>
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
return { return {
// Data轮询定时器 // Data轮询定时器
dataTimer: '', dataTimer: '',
mockArray: [0, 1, 2, 3, 4, 5, 6, 7], mockArray: [0, 1, 2, 3, 4, 5],
// 工位实时数据 // 工位实时数据
timmingData: {}, timmingData: {},
// 报警数据 // 报警数据
...@@ -166,12 +166,12 @@ ...@@ -166,12 +166,12 @@
.title-pack { .title-pack {
width: 1710px; width: 1710px;
height: 100px; height: 120px;
text-align: center; text-align: center;
color: yellow; color: yellow;
line-height: 100px; line-height: 120px;
font-weight: bold; font-weight: bold;
font-size: 60px; font-size: 100px;
} }
.table-pack { .table-pack {
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
color: yellow; color: yellow;
line-height: 100px; line-height: 100px;
font-weight: bold; font-weight: bold;
font-size: 60px; font-size: 90px;
} }
.th-r { .th-r {
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
color: yellow; color: yellow;
line-height: 100px; line-height: 100px;
font-weight: bold; font-weight: bold;
font-size: 60px; font-size: 90px;
} }
} }
...@@ -214,26 +214,29 @@ ...@@ -214,26 +214,29 @@
border-top: 2px solid yellow; border-top: 2px solid yellow;
color: yellow; color: yellow;
font-weight: bold; font-weight: bold;
font-size: 60px; font-size: 90px;
.line {
height: 20px;
}
.swiper-slide{ .swiper-slide{
word-wrap: break-word; word-wrap: break-word;
word-break: break-all; word-break: break-all;
font-size: 80px;
} }
} }
.time { .time {
width: 1710px; width: 1710px;
height: 100px; height: 80px;
border-top: 2px solid yellow; border-top: 2px solid yellow;
color: yellow; color: yellow;
font-weight: bold; font-weight: bold;
line-height: 100px; line-height: 80px;
font-size: 60px; font-size: 70px;
} }
} }
.sprayDrying { .sprayDrying {
width: 1710px; width: 1710px;
height: 860px;
background-color: #111; background-color: #111;
.title-pack { .title-pack {
...@@ -241,9 +244,9 @@ ...@@ -241,9 +244,9 @@
// height: 100px; // height: 100px;
text-align: center; text-align: center;
color: yellow; color: yellow;
line-height: 100px; line-height: 120px;
font-weight: bold; font-weight: bold;
font-size: 50px; font-size: 100px;
} }
// .table-pack { // .table-pack {
// overflow: hidden; // overflow: hidden;
...@@ -254,15 +257,15 @@ ...@@ -254,15 +257,15 @@
.th-1,.th-2,.th-3,.th-4,.th-5,.th-6 { .th-1,.th-2,.th-3,.th-4,.th-5,.th-6 {
width: 600px; width: 600px;
height: 60px; height: 92px;
border-top: 2px solid yellow; border-top: 2px solid yellow;
border-right: 2px solid yellow; border-right: 2px solid yellow;
float: left; float: left;
text-align: center; text-align: center;
color: yellow; color: yellow;
line-height: 60px; line-height: 92px;
font-weight: bold; font-weight: bold;
font-size: 50px; font-size: 85px;
} }
.th-2 {width: 506px;} .th-2 {width: 506px;}
.th-3 { .th-3 {
...@@ -340,12 +343,12 @@ ...@@ -340,12 +343,12 @@
.time { .time {
width: 1710px; width: 1710px;
height: 100px; height: 92px;
border-top: 2px solid yellow; border-top: 2px solid yellow;
color: yellow; color: yellow;
font-weight: bold; font-weight: bold;
line-height: 100px; line-height: 92px;
font-size: 60px; font-size: 70px;
// } // }
} }
} }
......
src/views/Led/Station/stationSix.vue
View file @ e39a6e32
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</div> </div>
<div class="info"> <div class="info">
设备报警信息： 设备报警信息：
<div>&nbsp;</div> <div class="line"></div>
<swiper :options="swiperOption"> <swiper :options="swiperOption">
<swiper-slide v-for="(item, index) in warningList" :key="index">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{warningList[index].name}}：{{warningList[index].info}}</swiper-slide> <swiper-slide v-for="(item, index) in warningList" :key="index">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{warningList[index].name}}：{{warningList[index].info}}</swiper-slide>
</swiper> </swiper>
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
return { return {
// Data轮询定时器 // Data轮询定时器
dataTimer: '', dataTimer: '',
mockArray: [0, 1, 2, 3, 4, 5, 6, 7], mockArray: [0, 1, 2, 3, 4, 5],
// 工位实时数据 // 工位实时数据
timmingData: {}, timmingData: {},
// 报警数据 // 报警数据
...@@ -87,94 +87,7 @@ ...@@ -87,94 +87,7 @@
} }
}, },
// 面清漆室实时数据 // 面清漆室实时数据
roomInfoList: [], roomInfoList: []
reponse: [
{
name: '喷漆飞机1',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机2',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机3',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机4',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机5',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机6',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机7',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机8',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机9',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机10',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机11',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机12',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机13',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机14',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机14',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机15',
stationState: '工作',
workingHours: '60'
},
{
name: '喷漆飞机16',
stationState: '工作',
workingHours: '60'
}
]
} }
}, },
methods: { methods: {
...@@ -252,12 +165,12 @@ ...@@ -252,12 +165,12 @@
.title-pack { .title-pack {
width: 1710px; width: 1710px;
height: 100px; height: 120px;
text-align: center; text-align: center;
color: yellow; color: yellow;
line-height: 100px; line-height: 120px;
font-weight: bold; font-weight: bold;
font-size: 60px; font-size: 100px;
} }
.table-pack { .table-pack {
...@@ -277,7 +190,7 @@ ...@@ -277,7 +190,7 @@
color: yellow; color: yellow;
line-height: 100px; line-height: 100px;
font-weight: bold; font-weight: bold;
font-size: 60px; font-size: 90px;
} }
.th-r { .th-r {
...@@ -289,7 +202,7 @@ ...@@ -289,7 +202,7 @@
color: yellow; color: yellow;
line-height: 100px; line-height: 100px;
font-weight: bold; font-weight: bold;
font-size: 60px; font-size: 90px;
} }
} }
...@@ -300,26 +213,29 @@ ...@@ -300,26 +213,29 @@
border-top: 2px solid yellow; border-top: 2px solid yellow;
color: yellow; color: yellow;
font-weight: bold; font-weight: bold;
font-size: 60px; font-size: 90px;
.line {
height: 20px;
}
.swiper-slide{ .swiper-slide{
word-wrap: break-word; word-wrap: break-word;
word-break: break-all; word-break: break-all;
font-size: 80px;
} }
} }
.time { .time {
width: 1710px; width: 1710px;
height: 100px; height: 80px;
border-top: 2px solid yellow; border-top: 2px solid yellow;
color: yellow; color: yellow;
font-weight: bold; font-weight: bold;
line-height: 100px; line-height: 80px;
font-size: 60px; font-size: 70px;
} }
} }
.sprayDrying { .sprayDrying {
width: 1710px; width: 1710px;
height: 860px;
background-color: #111; background-color: #111;
.title-pack { .title-pack {
...@@ -327,9 +243,9 @@ ...@@ -327,9 +243,9 @@
// height: 100px; // height: 100px;
text-align: center; text-align: center;
color: yellow; color: yellow;
line-height: 100px; line-height: 120px;
font-weight: bold; font-weight: bold;
font-size: 50px; font-size: 100px;
} }
// .table-pack { // .table-pack {
// overflow: hidden; // overflow: hidden;
...@@ -340,15 +256,15 @@ ...@@ -340,15 +256,15 @@
.th-1,.th-2,.th-3,.th-4,.th-5,.th-6 { .th-1,.th-2,.th-3,.th-4,.th-5,.th-6 {
width: 600px; width: 600px;
height: 60px; height: 92px;
border-top: 2px solid yellow; border-top: 2px solid yellow;
border-right: 2px solid yellow; border-right: 2px solid yellow;
float: left; float: left;
text-align: center; text-align: center;
color: yellow; color: yellow;
line-height: 60px; line-height: 92px;
font-weight: bold; font-weight: bold;
font-size: 50px; font-size: 85px;
} }
.th-2 {width: 506px;} .th-2 {width: 506px;}
.th-3 { .th-3 {
...@@ -426,12 +342,12 @@ ...@@ -426,12 +342,12 @@
.time { .time {
width: 1710px; width: 1710px;
height: 100px; height: 92px;
border-top: 2px solid yellow; border-top: 2px solid yellow;
color: yellow; color: yellow;
font-weight: bold; font-weight: bold;
line-height: 100px; line-height: 92px;
font-size: 60px; font-size: 70px;
// } // }
} }
} }
......
src/views/Led/WorkShop/paintingWorkShop.vue
View file @ e39a6e32
...@@ -239,7 +239,7 @@ ...@@ -239,7 +239,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.container { .container {
background-color: #111; // background-color: #111;
.page-pack { .page-pack {
width: 1556px; width: 1556px;
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
color: yellow; color: yellow;
line-height: 134px; line-height: 134px;
font-weight: bold; font-weight: bold;
font-size: 60px; font-size: 100px;
} }
.table-pack { .table-pack {
...@@ -274,7 +274,7 @@ ...@@ -274,7 +274,7 @@
color: yellow; color: yellow;
line-height: 110.625px; line-height: 110.625px;
font-weight: bold; font-weight: bold;
font-size: 48px; font-size: 49px;
} }
.th-2 {width: 20%; font-size:60px } .th-2 {width: 20%; font-size:60px }
.th-3 {width: 29.5%;} .th-3 {width: 29.5%;}
......
src/views/Monitor/components/ComplexionPaint.vue
View file @ e39a6e32
...@@ -43,6 +43,13 @@ ...@@ -43,6 +43,13 @@
> >
<p>{{query['HDG1-168'].busNo}}</p> <p>{{query['HDG1-168'].busNo}}</p>
</div> </div>
<div
class="paint-row-1-5"
@click="doCarStationClick(query['HDG5-21'].busNo)"
v-if="query.hasOwnProperty('HDG5-21') && query['HDG5-21'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG5-21'].busType, 'HDG5-21')">
<p>{{query['HDG5-21'].busNo}}</p>
</div>
<!-- 第二行 --> <!-- 第二行 -->
<div <div
class="paint-row-2-0" class="paint-row-2-0"
...@@ -84,6 +91,13 @@ ...@@ -84,6 +91,13 @@
> >
<p>{{query['HDG1-171'].busNo}}</p> <p>{{query['HDG1-171'].busNo}}</p>
</div> </div>
<div
class="paint-row-2-5"
@click="doCarStationClick(query['HDG5-22'].busNo)"
v-if="query.hasOwnProperty('HDG5-22') && query['HDG5-22'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG5-22'].busType, 'HDG5-22')">
<p>{{query['HDG5-22'].busNo}}</p>
</div>
<!-- 第三行 --> <!-- 第三行 -->
<div <div
class="paint-row-3-0" class="paint-row-3-0"
...@@ -125,6 +139,13 @@ ...@@ -125,6 +139,13 @@
> >
<p>{{query['HDG1-174'].busNo}}</p> <p>{{query['HDG1-174'].busNo}}</p>
</div> </div>
<div
class="paint-row-3-5"
@click="doCarStationClick(query['HDG5-23'].busNo)"
v-if="query.hasOwnProperty('HDG5-23') && query['HDG5-23'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG5-23'].busType, 'HDG5-23')">
<p>{{query['HDG5-23'].busNo}}</p>
</div>
<!-- 第四行 --> <!-- 第四行 -->
<div <div
class="paint-row-4-0" class="paint-row-4-0"
...@@ -166,6 +187,13 @@ ...@@ -166,6 +187,13 @@
> >
<p>{{query['HDG1-177'].busNo}}</p> <p>{{query['HDG1-177'].busNo}}</p>
</div> </div>
<div
class="paint-row-4-5"
@click="doCarStationClick(query['HDG5-24'].busNo)"
v-if="query.hasOwnProperty('HDG5-24') && query['HDG5-24'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG5-24'].busType, 'HDG5-24')">
<p>{{query['HDG5-24'].busNo}}</p>
</div>
<!-- 第五行 --> <!-- 第五行 -->
<div <div
class="paint-row-5-0" class="paint-row-5-0"
...@@ -207,6 +235,13 @@ ...@@ -207,6 +235,13 @@
> >
<p>{{query['HDG1-180'].busNo}}</p> <p>{{query['HDG1-180'].busNo}}</p>
</div> </div>
<div
class="paint-row-5-5"
@click="doCarStationClick(query['HDG5-25'].busNo)"
v-if="query.hasOwnProperty('HDG5-25') && query['HDG5-25'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG5-25'].busType, 'HDG5-25')">
<p>{{query['HDG5-25'].busNo}}</p>
</div>
<!-- 第六行 --> <!-- 第六行 -->
<div <div
class="paint-row-6-0" class="paint-row-6-0"
...@@ -248,6 +283,13 @@ ...@@ -248,6 +283,13 @@
> >
<p>{{query['HDG1-183'].busNo}}</p> <p>{{query['HDG1-183'].busNo}}</p>
</div> </div>
<div
class="paint-row-6-5"
@click="doCarStationClick(query['HDG5-26'].busNo)"
v-if="query.hasOwnProperty('HDG5-26') && query['HDG5-26'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG5-26'].busType, 'HDG5-26')">
<p>{{query['HDG5-26'].busNo}}</p>
</div>
<!-- 第七行 --> <!-- 第七行 -->
<div <div
class="paint-row-7-0" class="paint-row-7-0"
...@@ -289,6 +331,13 @@ ...@@ -289,6 +331,13 @@
> >
<p>{{query['HDG1-186'].busNo}}</p> <p>{{query['HDG1-186'].busNo}}</p>
</div> </div>
<div
class="paint-row-7-5"
@click="doCarStationClick(query['HDG5-27'].busNo)"
v-if="query.hasOwnProperty('HDG5-27') && query['HDG5-27'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG5-27'].busType, 'HDG5-27')">
<p>{{query['HDG5-27'].busNo}}</p>
</div>
<!-- 第八行 --> <!-- 第八行 -->
<div <div
class="paint-row-8-0" class="paint-row-8-0"
...@@ -330,6 +379,13 @@ ...@@ -330,6 +379,13 @@
> >
<p>{{query['HDG1-189'].busNo}}</p> <p>{{query['HDG1-189'].busNo}}</p>
</div> </div>
<div
class="paint-row-8-5"
@click="doCarStationClick(query['HDG5-28'].busNo)"
v-if="query.hasOwnProperty('HDG5-28') && query['HDG5-28'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG5-28'].busType, 'HDG5-28')">
<p>{{query['HDG5-28'].busNo}}</p>
</div>
<!-- 第九行 --> <!-- 第九行 -->
<div <div
class="paint-row-9-0" class="paint-row-9-0"
...@@ -371,6 +427,13 @@ ...@@ -371,6 +427,13 @@
> >
<p>{{query['HDG1-192'].busNo}}</p> <p>{{query['HDG1-192'].busNo}}</p>
</div> </div>
<div
class="paint-row-9-5"
@click="doCarStationClick(query['HDG5-29'].busNo)"
v-if="query.hasOwnProperty('HDG5-29') && query['HDG5-29'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG5-29'].busType, 'HDG5-29')">
<p>{{query['HDG5-29'].busNo}}</p>
</div>
<!-- 第十行 --> <!-- 第十行 -->
<div <div
class="paint-row-10-0" class="paint-row-10-0"
...@@ -382,6 +445,7 @@ ...@@ -382,6 +445,7 @@
</div> </div>
<div <div
class="paint-row-10-1" class="paint-row-10-1"
@click="doCarStationClick(query['HDG1-159'].busNo)"
v-if="query.hasOwnProperty('HDG1-159') && query['HDG1-159'].state !== 'FREE'" v-if="query.hasOwnProperty('HDG1-159') && query['HDG1-159'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-159'].busType, 'HDG1-159')" :class="judgeCarTypeAndcarStationstyle(query['HDG1-159'].busType, 'HDG1-159')"
> >
...@@ -411,6 +475,13 @@ ...@@ -411,6 +475,13 @@
> >
<p>{{query['HDG1-195'].busNo}}</p> <p>{{query['HDG1-195'].busNo}}</p>
</div> </div>
<div
class="paint-row-10-5"
@click="doCarStationClick(query['HDG5-30'].busNo)"
v-if="query.hasOwnProperty('HDG5-30') && query['HDG5-30'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG5-30'].busType, 'HDG5-30')">
<p>{{query['HDG5-30'].busNo}}</p>
</div>
<!-- 第十一行 --> <!-- 第十一行 -->
<div <div
class=" paint-row-11-0" class=" paint-row-11-0"
...@@ -452,9 +523,16 @@ ...@@ -452,9 +523,16 @@
> >
<p>{{query['HDG1-198'].busNo}}</p> <p>{{query['HDG1-198'].busNo}}</p>
</div> </div>
<div
class="paint-row-11-5"
@click="doCarStationClick(query['HDG5-31'].busNo)"
v-if="query.hasOwnProperty('HDG5-31') && query['HDG5-31'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG5-31'].busType, 'HDG5-31')">
<p>{{query['HDG5-31'].busNo}}</p>
</div>
<!-- 第十二行 --> <!-- 第十二行 -->
<div <div
class=" paint-row-12-0" class="paint-row-12-0"
@click="doCarStationClick(query['HDG1-145'].busNo)" @click="doCarStationClick(query['HDG1-145'].busNo)"
v-if="query.hasOwnProperty('HDG1-145') && query['HDG1-145'].state !== 'FREE'" v-if="query.hasOwnProperty('HDG1-145') && query['HDG1-145'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-145'].busType, 'HDG1-145')" :class="judgeCarTypeAndcarStationstyle(query['HDG1-145'].busType, 'HDG1-145')"
...@@ -462,15 +540,14 @@ ...@@ -462,15 +540,14 @@
<p>{{query['HDG1-145'].busNo}}</p> <p>{{query['HDG1-145'].busNo}}</p>
</div> </div>
<div <div
class="paint-row-12-2" class="paint-row-12-1"
@click="doCarStationClick(query['HDG1-161'].busNo)" @click="doCarStationClick(query['HDG1-161'].busNo)"
v-if="query.hasOwnProperty('HDG1-161') && query['HDG1-161'].state !== 'FREE'" v-if="query.hasOwnProperty('HDG1-161') && query['HDG1-161'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-161'].busType, 'HDG1-161')" :class="judgeCarTypeAndcarStationstyle(query['HDG1-161'].busType, 'HDG1-161')">
>
<p>{{query['HDG1-161'].busNo}}</p> <p>{{query['HDG1-161'].busNo}}</p>
</div> </div>
<div <div
class="paint-row-12-3" class="paint-row-12-2"
@click="doCarStationClick(query['HDG1-199'].busNo)" @click="doCarStationClick(query['HDG1-199'].busNo)"
v-if="query.hasOwnProperty('HDG1-199') && query['HDG1-199'].state !== 'FREE'" v-if="query.hasOwnProperty('HDG1-199') && query['HDG1-199'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-199'].busType, 'HDG1-199')" :class="judgeCarTypeAndcarStationstyle(query['HDG1-199'].busType, 'HDG1-199')"
...@@ -478,7 +555,7 @@ ...@@ -478,7 +555,7 @@
<p>{{query['HDG1-199'].busNo}}</p> <p>{{query['HDG1-199'].busNo}}</p>
</div> </div>
<div <div
class="paint-row-12-4" class="paint-row-12-3"
@click="doCarStationClick(query['HDG1-200'].busNo)" @click="doCarStationClick(query['HDG1-200'].busNo)"
v-if="query.hasOwnProperty('HDG1-200') && query['HDG1-200'].state !== 'FREE'" v-if="query.hasOwnProperty('HDG1-200') && query['HDG1-200'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-200'].busType, 'HDG1-200')" :class="judgeCarTypeAndcarStationstyle(query['HDG1-200'].busType, 'HDG1-200')"
...@@ -486,13 +563,20 @@ ...@@ -486,13 +563,20 @@
<p>{{query['HDG1-200'].busNo}}</p> <p>{{query['HDG1-200'].busNo}}</p>
</div> </div>
<div <div
class="paint-row-12-5" class="paint-row-12-4"
@click="doCarStationClick(query['HDG1-201'].busNo)" @click="doCarStationClick(query['HDG1-201'].busNo)"
v-if="query.hasOwnProperty('HDG1-201') && query['HDG1-201'].state !== 'FREE'" v-if="query.hasOwnProperty('HDG1-201') && query['HDG1-201'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-201'].busType, 'HDG1-201')" :class="judgeCarTypeAndcarStationstyle(query['HDG1-201'].busType, 'HDG1-201')"
> >
<p>{{query['HDG1-201'].busNo}}</p> <p>{{query['HDG1-201'].busNo}}</p>
</div> </div>
<div
class="paint-row-12-5"
@click="doCarStationClick(query['HDG5-32'].busNo)"
v-if="query.hasOwnProperty('HDG5-32') && query['HDG5-32'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG5-32'].busType, 'HDG5-32')">
<p>{{query['HDG5-32'].busNo}}</p>
</div>
<!-- 第十三行 --> <!-- 第十三行 -->
<div <div
class="paint-row-13-0" class="paint-row-13-0"
...@@ -527,13 +611,20 @@ ...@@ -527,13 +611,20 @@
<p>{{query['HDG1-203'].busNo}}</p> <p>{{query['HDG1-203'].busNo}}</p>
</div> </div>
<div <div
class="paint-row-13-5" class="paint-row-13-4"
@click="doCarStationClick(query['HDG1-204'].busNo)" @click="doCarStationClick(query['HDG1-204'].busNo)"
v-if="query.hasOwnProperty('HDG1-204') && query['HDG1-204'].state !== 'FREE'" v-if="query.hasOwnProperty('HDG1-204') && query['HDG1-204'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-204'].busType, 'HDG1-204')" :class="judgeCarTypeAndcarStationstyle(query['HDG1-204'].busType, 'HDG1-204')"
> >
<p>{{query['HDG1-204'].busNo}}</p> <p>{{query['HDG1-204'].busNo}}</p>
</div> </div>
<div
class="paint-row-13-5"
@click="doCarStationClick(query['HDG5-33'].busNo)"
v-if="query.hasOwnProperty('HDG5-33') && query['HDG5-33'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG5-33'].busType, 'HDG5-33')">
<p>{{query['HDG5-33'].busNo}}</p>
</div>
<!-- 实时车辆 --> <!-- 实时车辆 -->
<div class="onlineNum"> <div class="onlineNum">
<p>总量 <span>{{ this.onlineNum !== null ? this.onlineNum : '0' }}</span></p> <p>总量 <span>{{ this.onlineNum !== null ? this.onlineNum : '0' }}</span></p>
...@@ -568,16 +659,7 @@ export default { ...@@ -568,16 +659,7 @@ export default {
// 面色/漆作业区域实时信息 // 面色/漆作业区域实时信息
query: {}, query: {},
// 根据车身号获得当前车体信息 // 根据车身号获得当前车体信息
BusInformation: { BusInformation: {}
saleOrderNo: '2019-10-11 11:09',
planOrderNo: '83848484',
code: 'EDSCSFDGVG',
busType: 'car',
orderSize: '2222222255555550',
unit: 'From China',
shop: '二号车间',
line: '4-25'
}
}; };
}, },
...@@ -620,7 +702,6 @@ export default { ...@@ -620,7 +702,6 @@ export default {
} }
}, },
doCarStationClick (busNub) { doCarStationClick (busNub) {
console.log(busNub);
let left = window.event.clientX; let left = window.event.clientX;
let top = window.event.clientY; let top = window.event.clientY;
this.$refs.toolRef.$refs.tooltip.style.visibility = 'visible'; this.$refs.toolRef.$refs.tooltip.style.visibility = 'visible';
...@@ -628,8 +709,7 @@ export default { ...@@ -628,8 +709,7 @@ export default {
this.$refs.toolRef.$refs.tooltip.style.left = left - 100 + 'px'; this.$refs.toolRef.$refs.tooltip.style.left = left - 100 + 'px';
this.$fetch('area-controller/busNo-get', { busNo: busNub }) this.$fetch('area-controller/busNo-get', { busNo: busNub })
.then(res => { .then(res => {
console.log('res', res); this.BusInformation = _.cloneDeep(res);
// this.BusInformation = _.cloneDeep(res);
}) })
.catch(error => { .catch(error => {
reject(error); reject(error);
...@@ -763,6 +843,7 @@ export default { ...@@ -763,6 +843,7 @@ export default {
.paint-row-11-4, .paint-row-11-4,
.paint-row-11-5, .paint-row-11-5,
.paint-row-12-0, .paint-row-12-0,
.paint-row-12-1,
.paint-row-12-2, .paint-row-12-2,
.paint-row-12-3, .paint-row-12-3,
.paint-row-12-4, .paint-row-12-4,
...@@ -771,13 +852,13 @@ export default { ...@@ -771,13 +852,13 @@ export default {
.paint-row-13-1, .paint-row-13-1,
.paint-row-13-2, .paint-row-13-2,
.paint-row-13-3, .paint-row-13-3,
.paint-row-13-4,
.paint-row-13-5 { .paint-row-13-5 {
position: absolute; position: absolute;
width: 105px; width: 105px;
height: 40px; height: 40px;
cursor: pointer; cursor: pointer;
background: url("../../../assets/images/Monitor/monitor_car.png") background: url("../../../assets/images/Monitor/monitor_car.png") no-repeat;
no-repeat;
background-size: 35px 18px; background-size: 35px 18px;
background-position: 0 16px; background-position: 0 16px;
...@@ -831,6 +912,7 @@ export default { ...@@ -831,6 +912,7 @@ export default {
.paint-row-9-1, .paint-row-9-1,
.paint-row-10-1, .paint-row-10-1,
.paint-row-11-1, .paint-row-11-1,
.paint-row-12-1,
.paint-row-13-1 { .paint-row-13-1 {
left: 315px; left: 315px;
} }
...@@ -855,7 +937,8 @@ export default { ...@@ -855,7 +937,8 @@ export default {
.paint-row-9-4, .paint-row-9-4,
.paint-row-10-4, .paint-row-10-4,
.paint-row-11-4, .paint-row-11-4,
.paint-row-12-4 { .paint-row-12-4,
.paint-row-13-4 {
left: 961px; left: 961px;
} }
.paint-row-1-5, .paint-row-1-5,
...@@ -1029,6 +1112,9 @@ export default { ...@@ -1029,6 +1112,9 @@ export default {
.paint-row-12-4 { .paint-row-12-4 {
top: 780px; top: 780px;
} }
.paint-row-12-1 {
top: 770px;
}
.paint-row-12-5 { .paint-row-12-5 {
top: 759px; top: 759px;
} }
...@@ -1037,6 +1123,7 @@ export default { ...@@ -1037,6 +1123,7 @@ export default {
.paint-row-13-0, .paint-row-13-0,
.paint-row-13-1, .paint-row-13-1,
.paint-row-13-3, .paint-row-13-3,
.paint-row-13-4,
.paint-row-13-2 { .paint-row-13-2 {
top: 816px; top: 816px;
} }
......
src/views/Monitor/components/Electrophoresis.vue
View file @ e39a6e32
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
<!-- 第 7 行 --> <!-- 第 7 行 -->
<div <div
class="elect-row-7-1" class="elect-row-7-1"
@click="doCarStationClick(query['SSTC1-7'].busNo)" @click="doCarStationClick(query['STC1-7'].busNo)"
v-if="query.hasOwnProperty('STC1-7') && query['STC1-7'].state !== 'FREE'" v-if="query.hasOwnProperty('STC1-7') && query['STC1-7'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['STC1-7'].busType, 'STC1-7')" :class="judgeCarTypeAndcarStationstyle(query['STC1-7'].busType, 'STC1-7')"
> >
...@@ -423,7 +423,7 @@ ...@@ -423,7 +423,7 @@
v-if="query.hasOwnProperty('HDG1-65') && query['HDG1-65'].state !== 'FREE'" v-if="query.hasOwnProperty('HDG1-65') && query['HDG1-65'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-65'].busType, 'HDG1-65')" :class="judgeCarTypeAndcarStationstyle(query['HDG1-65'].busType, 'HDG1-65')"
> >
<p>{{query['HDG1-65'].No}}</p> <p>{{query['HDG1-65'].busNo}}</p>
</div> </div>
<div <div
...@@ -464,16 +464,7 @@ export default { ...@@ -464,16 +464,7 @@ export default {
// 电泳作业区域实时信息 // 电泳作业区域实时信息
query: {}, query: {},
// 根据车身号获得当前车体信息 // 根据车身号获得当前车体信息
BusInformation: { BusInformation: {}
saleOrderNo: '201905201252',
planOrderNo: '83848484',
code: 'EDSCSFDGVG',
busType: 'car',
orderSize: '20',
unit: 'From China',
shop: '二号车间',
line: '4-25'
}
}; };
}, },
mounted () { mounted () {
...@@ -487,7 +478,6 @@ export default { ...@@ -487,7 +478,6 @@ export default {
methods: { methods: {
// 点击车位弹出车体信息 // 点击车位弹出车体信息
doCarStationClick (row) { doCarStationClick (row) {
console.log(row);
this.$refs.toolRef.$refs.tooltip.style.visibility = 'visible'; this.$refs.toolRef.$refs.tooltip.style.visibility = 'visible';
let left = window.event.clientX; let left = window.event.clientX;
let top = window.event.clientY; let top = window.event.clientY;
...@@ -495,8 +485,7 @@ export default { ...@@ -495,8 +485,7 @@ export default {
this.$refs.toolRef.$refs.tooltip.style.left = left - 100 + 'px'; this.$refs.toolRef.$refs.tooltip.style.left = left - 100 + 'px';
this.$fetch('area-controller/busNo-get', { busNo: row }) this.$fetch('area-controller/busNo-get', { busNo: row })
.then(res => { .then(res => {
console.log('res', res); this.BusInformation = _.cloneDeep(res);
// this.BusInformation = _.cloneDeep(res);
}) })
.catch(error => { .catch(error => {
reject(error); reject(error);
......
src/views/Monitor/components/FinishedCar.vue
View file @ e39a6e32
...@@ -165,16 +165,7 @@ export default { ...@@ -165,16 +165,7 @@ export default {
// 车辆定位数据 // 车辆定位数据
carPostionInfo: {}, carPostionInfo: {},
// 根据车身号获得当前车体信息 // 根据车身号获得当前车体信息
BusInformation: { BusInformation: {}
saleOrderNo: '2019-10-11 11:09',
planOrderNo: '83848484',
code: 'EDSCSFDGVG',
busType: 'car',
orderSize: '2222222255555550',
unit: 'From China',
shop: '二号车间',
line: '4-25'
}
}; };
}, },
mounted () { mounted () {
...@@ -203,7 +194,6 @@ export default { ...@@ -203,7 +194,6 @@ export default {
}, },
// 点击车位弹出车体信息 // 点击车位弹出车体信息
doCarStationClick (row) { doCarStationClick (row) {
console.log(row);
this.$refs.toolRef.$refs.tooltip.style.visibility = 'visible'; this.$refs.toolRef.$refs.tooltip.style.visibility = 'visible';
let left = window.event.clientX; let left = window.event.clientX;
let top = window.event.clientY; let top = window.event.clientY;
...@@ -211,7 +201,7 @@ export default { ...@@ -211,7 +201,7 @@ export default {
this.$refs.toolRef.$refs.tooltip.style.left = left - 100 + 'px'; this.$refs.toolRef.$refs.tooltip.style.left = left - 100 + 'px';
this.$fetch('area-controller/busNo-get', { busNo: row }) this.$fetch('area-controller/busNo-get', { busNo: row })
.then(res => { .then(res => {
console.log('res', res); this.BusInformation = _.cloneDeep(res);
}) })
.catch(error => { .catch(error => {
reject(error); reject(error);
......
src/views/Monitor/components/MiddleCoat.vue
View file @ e39a6e32
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
v-if="query.hasOwnProperty('HDG1-117') && query['HDG1-117'].state !== 'FREE'" v-if="query.hasOwnProperty('HDG1-117') && query['HDG1-117'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-117'].busType, 'HDG1-117')" :class="judgeCarTypeAndcarStationstyle(query['HDG1-117'].busType, 'HDG1-117')"
> >
<p>{{query['HDG1-117']}}</p> <p>{{query['HDG1-117'].busNo}}</p>
</div> </div>
<div <div
class="coat-row-1-4" class="coat-row-1-4"
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
v-if="query.hasOwnProperty('HDG1-118') && query['HDG1-118'].state !== 'FREE'" v-if="query.hasOwnProperty('HDG1-118') && query['HDG1-118'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-118'].busType, 'HDG1-118')" :class="judgeCarTypeAndcarStationstyle(query['HDG1-118'].busType, 'HDG1-118')"
> >
<p>{{query['HDG1-118']}}</p> <p>{{query['HDG1-118'].busNo}}</p>
</div> </div>
<div <div
class="coat-row-1-5" class="coat-row-1-5"
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
v-if="query.hasOwnProperty('HDG5-18') && query['HDG5-18'].state !== 'FREE'" v-if="query.hasOwnProperty('HDG5-18') && query['HDG5-18'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG5-18'].busType, 'HDG5-18')" :class="judgeCarTypeAndcarStationstyle(query['HDG5-18'].busType, 'HDG5-18')"
> >
<p>{{query['HDG5-18']}}</p> <p>{{query['HDG5-18'].busNo}}</p>
</div> </div>
<!-- 第三行 --> <!-- 第三行 -->
<div <div
...@@ -214,16 +214,7 @@ export default { ...@@ -214,16 +214,7 @@ export default {
// 车辆定位数据 // 车辆定位数据
carPostionInfo: {}, carPostionInfo: {},
// 根据车身号获得当前车体信息 // 根据车身号获得当前车体信息
BusInformation: { BusInformation: {}
saleOrderNo: '2019-10-11 11:09',
planOrderNo: '83848484',
code: 'EDSCSFDGVG',
busType: 'car',
orderSize: '2222222255555550',
unit: 'From China',
shop: '二号车间',
line: '4-25'
}
}; };
}, },
...@@ -252,7 +243,6 @@ export default { ...@@ -252,7 +243,6 @@ export default {
}, },
// 点击车位弹出车体信息 // 点击车位弹出车体信息
doCarStationClick (row) { doCarStationClick (row) {
console.log(row);
this.$refs.toolRef.$refs.tooltip.style.visibility = 'visible'; this.$refs.toolRef.$refs.tooltip.style.visibility = 'visible';
let left = window.event.clientX; let left = window.event.clientX;
let top = window.event.clientY; let top = window.event.clientY;
...@@ -260,7 +250,7 @@ export default { ...@@ -260,7 +250,7 @@ export default {
this.$refs.toolRef.$refs.tooltip.style.left = left - 100 + 'px'; this.$refs.toolRef.$refs.tooltip.style.left = left - 100 + 'px';
this.$fetch('area-controller/busNo-get', { busNo: row }) this.$fetch('area-controller/busNo-get', { busNo: row })
.then(res => { .then(res => {
console.log('res', res); this.BusInformation = _.cloneDeep(res);
}) })
.catch(error => { .catch(error => {
reject(error); reject(error);
......
src/views/Monitor/components/Putty.vue
View file @ e39a6e32
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
v-if="query.hasOwnProperty('HDG1-106') && query['HDG1-106'].state !== 'FREE'" v-if="query.hasOwnProperty('HDG1-106') && query['HDG1-106'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-106'].busType, 'HDG1-106')" :class="judgeCarTypeAndcarStationstyle(query['HDG1-106'].busType, 'HDG1-106')"
> >
<p>{{query['HDG1-106']}}</p> <p>{{query['HDG1-106'].busNo}}</p>
</div> </div>
<div <div
class="putty-row-3-3" class="putty-row-3-3"
...@@ -280,7 +280,6 @@ export default { ...@@ -280,7 +280,6 @@ export default {
}, },
// 点击车辆工位 // 点击车辆工位
doCarStationClick (busNub) { doCarStationClick (busNub) {
console.log(busNub);
let left = window.event.clientX; let left = window.event.clientX;
let top = window.event.clientY; let top = window.event.clientY;
console.log('left', left); console.log('left', left);
...@@ -290,8 +289,7 @@ export default { ...@@ -290,8 +289,7 @@ export default {
this.$refs.toolRef.$refs.tooltip.style.left = `${left}px`; this.$refs.toolRef.$refs.tooltip.style.left = `${left}px`;
this.$fetch('area-controller/busNo-get', { busNo: busNub }) this.$fetch('area-controller/busNo-get', { busNo: busNub })
.then(res => { .then(res => {
console.log('res', res); this.BusInformation = _.cloneDeep(res);
// this.BusInformation = _.cloneDeep(res);
}) })
.catch(error => { .catch(error => {
reject(error); reject(error);
......
src/views/Monitor/components/SheetMetalCar.vue
View file @ e39a6e32
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
v-if="query.hasOwnProperty('HDG1-25') && query['HDG1-25'].state !== 'FREE'" v-if="query.hasOwnProperty('HDG1-25') && query['HDG1-25'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-25'].busType, 'HDG1-25')" :class="judgeCarTypeAndcarStationstyle(query['HDG1-25'].busType, 'HDG1-25')"
> >
<p>{{query['HDG1-25']}}</p> <p>{{query['HDG1-25'].busNo}}</p>
</div> </div>
<div <div
class="sheet-row-5-2" class="sheet-row-5-2"
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
v-if="query.hasOwnProperty('HDG1-28') && query['HDG1-28'].state !== 'FREE'" v-if="query.hasOwnProperty('HDG1-28') && query['HDG1-28'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-28'].busType, 'HDG1-28')" :class="judgeCarTypeAndcarStationstyle(query['HDG1-28'].busType, 'HDG1-28')"
> >
<p>{{query['HDG1-28']}}</p> <p>{{query['HDG1-28'].busNo}}</p>
</div> </div>
<div <div
class="sheet-row-6-4" class="sheet-row-6-4"
...@@ -239,7 +239,7 @@ ...@@ -239,7 +239,7 @@
v-if="query.hasOwnProperty('HDG1-27') && query['HDG1-27'].state !== 'FREE'" v-if="query.hasOwnProperty('HDG1-27') && query['HDG1-27'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-27'].busType, 'HDG1-27')" :class="judgeCarTypeAndcarStationstyle(query['HDG1-27'].busType, 'HDG1-27')"
> >
<p>{{query['HDG1-27']}}</p> <p>{{query['HDG1-27'].busNo}}</p>
</div> </div>
<div <div
class="sheet-row-6-5" class="sheet-row-6-5"
...@@ -315,16 +315,7 @@ export default { ...@@ -315,16 +315,7 @@ export default {
// 钣金车存放区实时信息 // 钣金车存放区实时信息
query: {}, query: {},
// 根据车身号获得当前车体信息 // 根据车身号获得当前车体信息
BusInformation: { BusInformation: {}
saleOrderNo: '2019-10-11 11:09',
planOrderNo: '83848484',
code: 'EDSCSFDGVG',
busType: 'car',
orderSize: '2222222255555550',
unit: 'From China',
shop: '二号车间',
line: '4-25'
}
}; };
}, },
mounted () { mounted () {
...@@ -354,7 +345,6 @@ export default { ...@@ -354,7 +345,6 @@ export default {
}, },
// 点击车辆工位 // 点击车辆工位
doCarStationClick (busNub) { doCarStationClick (busNub) {
console.log(busNub);
let left = window.event.clientX; let left = window.event.clientX;
let top = window.event.clientY; let top = window.event.clientY;
console.log('left', left); console.log('left', left);
...@@ -364,8 +354,7 @@ export default { ...@@ -364,8 +354,7 @@ export default {
this.$refs.toolRef.$refs.tooltip.style.left = `${left}px`; this.$refs.toolRef.$refs.tooltip.style.left = `${left}px`;
this.$fetch('area-controller/busNo-get', { busNo: busNub }) this.$fetch('area-controller/busNo-get', { busNo: busNub })
.then(res => { .then(res => {
console.log('res', res); this.BusInformation = _.cloneDeep(res);
// this.BusInformation = _.cloneDeep(res);
}) })
.catch(error => { .catch(error => {
reject(error); reject(error);
......
src/views/Monitor/index.vue
View file @ e39a6e32
...@@ -609,27 +609,27 @@ ...@@ -609,27 +609,27 @@
<div <div
class="line-5-clean-up-1" class="line-5-clean-up-1"
v-if="sealedAnticorrosion.hasOwnProperty('HDG1-85') && sealedAnticorrosion['HDG1-85'].state !== 'FREE'" v-if="sealedAnticorrosion.hasOwnProperty('HDG1-85') && sealedAnticorrosion['HDG1-85'].state !== 'FREE'"
:class="judgeCarTypeAndCarStationStyle(sealedAnticorrosion['DG1-85'].busType, 'DG1-85')"> :class="judgeCarTypeAndCarStationStyle(sealedAnticorrosion['HDG1-85'].busType, 'HDG1-85')">
</div> </div>
<div <div
class="line-5-damping-glue-spray-paint" class="line-5-damping-glue-spray-paint"
v-if="sealedAnticorrosion.hasOwnProperty('HDG1-86') && sealedAnticorrosion['HDG1-86'].state !== 'FREE'" v-if="sealedAnticorrosion.hasOwnProperty('HDG1-86') && sealedAnticorrosion['HDG1-86'].state !== 'FREE'"
:class="judgeCarTypeAndCarStationStyle(sealedAnticorrosion['DG1-86'].busType, 'DG1-86')"> :class="judgeCarTypeAndCarStationStyle(sealedAnticorrosion['HDG1-86'].busType, 'HDG1-86')">
</div> </div>
<div <div
class="line-5-clean-up-2" class="line-5-clean-up-2"
v-if="sealedAnticorrosion.hasOwnProperty('HDG1-87') && sealedAnticorrosion['HDG1-87'].state !== 'FREE'" v-if="sealedAnticorrosion.hasOwnProperty('HDG1-87') && sealedAnticorrosion['HDG1-87'].state !== 'FREE'"
:class="judgeCarTypeAndCarStationStyle(sealedAnticorrosion['DG1-87'].busType, 'DG1-87')"> :class="judgeCarTypeAndCarStationStyle(sealedAnticorrosion['HDG1-87'].busType, 'HDG1-87')">
</div> </div>
<div <div
class="line-5-foaming-spray" class="line-5-foaming-spray"
v-if="sealedAnticorrosion.hasOwnProperty('HDG1-88') && sealedAnticorrosion['HDG1-88'].state !== 'FREE'" v-if="sealedAnticorrosion.hasOwnProperty('HDG1-88') && sealedAnticorrosion['HDG1-88'].state !== 'FREE'"
:class="judgeCarTypeAndCarStationStyle(sealedAnticorrosion['DG1-88'].busType, 'DG1-88')"> :class="judgeCarTypeAndCarStationStyle(sealedAnticorrosion['HDG1-88'].busType, 'HDG1-88')">
</div> </div>
<div <div
class="line-5-shadow-protection" class="line-5-shadow-protection"
v-if="sealedAnticorrosion.hasOwnProperty('HDG1-89') && sealedAnticorrosion['HDG1-89'].state !== 'FREE'" v-if="sealedAnticorrosion.hasOwnProperty('HDG1-89') && sealedAnticorrosion['HDG1-89'].state !== 'FREE'"
:class="judgeCarTypeAndCarStationStyle(sealedAnticorrosion['DG1-89'].busType, 'DG1-89')"> :class="judgeCarTypeAndCarStationStyle(sealedAnticorrosion['HDG1-89'].busType, 'HDG1-89')">
</div> </div>
<div <div
class="line-5-station-1" class="line-5-station-1"
......
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