Skip to content

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

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

parent 9d7d3653
Expand all Show whitespace changes
Inline Side-by-side
Showing with 275 additions and 405 deletions
src/views/Led/Station/stationFive.vue
View file @ e39a6e32
......@@ -53,6 +53,7 @@
<script>
import { swiper, swiperSlide } from 'vue-awesome-swiper'
import Moment from 'moment'
export default {
name: 'StationFive',
components: {
......@@ -63,7 +64,7 @@
return {
// Data轮询定时器
dataTimer: '',
mockArray: [0, 1, 2, 3, 4, 5, 6, 7],
mockArray: [0, 1, 2, 3, 4, 5],
// 工位实时数据
timmingData: {},
// 报警数据
......@@ -87,94 +88,7 @@
}
},
// 面清漆室实时数据
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'
}
]
roomInfoList: []
}
},
methods: {
......@@ -184,11 +98,7 @@
this.timmingData = _.cloneDeep(res);
this.roomInfoList = _.cloneDeep(res.roomInfoList);
this.warningList = _.cloneDeep(res.warningList)
// console.log(this.warningList)
console.log(this.roomInfoList.length)
console.log(res)
for (let item of this.roomInfoList) {
console.log('item', item)
if (item.stationState === 'USE') {
item.stationState = '使用'
}
......@@ -323,7 +233,6 @@
}
.spray-drying {
width: 1710px;
height: 860px;
background-color: #111;
.title-pack {
......@@ -331,9 +240,9 @@
// height: 100px;
text-align: center;
color: yellow;
line-height: 100px;
line-height: 120px;
font-weight: bold;
font-size: 50px;
font-size: 100px;
}
// .table-pack {
// overflow: hidden;
......@@ -344,15 +253,15 @@
.th-1,.th-2,.th-3,.th-4,.th-5,.th-6 {
width: 600px;
height: 60px;
height: 92px;
border-top: 2px solid yellow;
border-right: 2px solid yellow;
float: left;
text-align: center;
color: yellow;
line-height: 60px;
line-height: 92px;
font-weight: bold;
font-size: 50px;
font-size: 85px;
}
.th-2 {width: 506px;}
.th-3 {
......@@ -420,13 +329,12 @@
.time {
width: 1710px;
height: 100px;
height: 92px;
border-top: 2px solid yellow;
color: yellow;
font-weight: bold;
line-height: 100px;
font-size: 60px;
// }
line-height: 92px;
font-size: 70px;
}
}
}
......
src/views/Led/Station/stationSeven.vue
View file @ e39a6e32
......@@ -15,7 +15,7 @@
</div>
<div class="info">
设备报警信息：
<div>&nbsp;</div>
<div class="line"></div>
<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>
......@@ -63,7 +63,7 @@
return {
// Data轮询定时器
dataTimer: '',
mockArray: [0, 1, 2, 3, 4, 5, 6, 7],
mockArray: [0, 1, 2, 3, 4, 5],
// 工位实时数据
timmingData: {},
// 报警数据
......@@ -166,12 +166,12 @@
.title-pack {
width: 1710px;
height: 100px;
height: 120px;
text-align: center;
color: yellow;
line-height: 100px;
line-height: 120px;
font-weight: bold;
font-size: 60px;
font-size: 100px;
}
.table-pack {
......@@ -191,7 +191,7 @@
color: yellow;
line-height: 100px;
font-weight: bold;
font-size: 60px;
font-size: 90px;
}
.th-r {
......@@ -203,7 +203,7 @@
color: yellow;
line-height: 100px;
font-weight: bold;
font-size: 60px;
font-size: 90px;
}
}
......@@ -214,26 +214,29 @@
border-top: 2px solid yellow;
color: yellow;
font-weight: bold;
font-size: 60px;
font-size: 90px;
.line {
height: 20px;
}
.swiper-slide{
word-wrap: break-word;
word-break: break-all;
font-size: 80px;
}
}
.time {
width: 1710px;
height: 100px;
height: 80px;
border-top: 2px solid yellow;
color: yellow;
font-weight: bold;
line-height: 100px;
font-size: 60px;
line-height: 80px;
font-size: 70px;
}
}
.sprayDrying {
width: 1710px;
height: 860px;
background-color: #111;
.title-pack {
......@@ -241,9 +244,9 @@
// height: 100px;
text-align: center;
color: yellow;
line-height: 100px;
line-height: 120px;
font-weight: bold;
font-size: 50px;
font-size: 100px;
}
// .table-pack {
// overflow: hidden;
......@@ -254,15 +257,15 @@
.th-1,.th-2,.th-3,.th-4,.th-5,.th-6 {
width: 600px;
height: 60px;
height: 92px;
border-top: 2px solid yellow;
border-right: 2px solid yellow;
float: left;
text-align: center;
color: yellow;
line-height: 60px;
line-height: 92px;
font-weight: bold;
font-size: 50px;
font-size: 85px;
}
.th-2 {width: 506px;}
.th-3 {
......@@ -340,12 +343,12 @@
.time {
width: 1710px;
height: 100px;
height: 92px;
border-top: 2px solid yellow;
color: yellow;
font-weight: bold;
line-height: 100px;
font-size: 60px;
line-height: 92px;
font-size: 70px;
// }
}
}
......
src/views/Led/Station/stationSix.vue
View file @ e39a6e32
......@@ -15,7 +15,7 @@
</div>
<div class="info">
设备报警信息：
<div>&nbsp;</div>
<div class="line"></div>
<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>
......@@ -63,7 +63,7 @@
return {
// Data轮询定时器
dataTimer: '',
mockArray: [0, 1, 2, 3, 4, 5, 6, 7],
mockArray: [0, 1, 2, 3, 4, 5],
// 工位实时数据
timmingData: {},
// 报警数据
......@@ -87,94 +87,7 @@
}
},
// 面清漆室实时数据
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'
}
]
roomInfoList: []
}
},
methods: {
......@@ -252,12 +165,12 @@
.title-pack {
width: 1710px;
height: 100px;
height: 120px;
text-align: center;
color: yellow;
line-height: 100px;
line-height: 120px;
font-weight: bold;
font-size: 60px;
font-size: 100px;
}
.table-pack {
......@@ -277,7 +190,7 @@
color: yellow;
line-height: 100px;
font-weight: bold;
font-size: 60px;
font-size: 90px;
}
.th-r {
......@@ -289,7 +202,7 @@
color: yellow;
line-height: 100px;
font-weight: bold;
font-size: 60px;
font-size: 90px;
}
}
......@@ -300,26 +213,29 @@
border-top: 2px solid yellow;
color: yellow;
font-weight: bold;
font-size: 60px;
font-size: 90px;
.line {
height: 20px;
}
.swiper-slide{
word-wrap: break-word;
word-break: break-all;
font-size: 80px;
}
}
.time {
width: 1710px;
height: 100px;
height: 80px;
border-top: 2px solid yellow;
color: yellow;
font-weight: bold;
line-height: 100px;
font-size: 60px;
line-height: 80px;
font-size: 70px;
}
}
.sprayDrying {
width: 1710px;
height: 860px;
background-color: #111;
.title-pack {
......@@ -327,9 +243,9 @@
// height: 100px;
text-align: center;
color: yellow;
line-height: 100px;
line-height: 120px;
font-weight: bold;
font-size: 50px;
font-size: 100px;
}
// .table-pack {
// overflow: hidden;
......@@ -340,15 +256,15 @@
.th-1,.th-2,.th-3,.th-4,.th-5,.th-6 {
width: 600px;
height: 60px;
height: 92px;
border-top: 2px solid yellow;
border-right: 2px solid yellow;
float: left;
text-align: center;
color: yellow;
line-height: 60px;
line-height: 92px;
font-weight: bold;
font-size: 50px;
font-size: 85px;
}
.th-2 {width: 506px;}
.th-3 {
......@@ -426,12 +342,12 @@
.time {
width: 1710px;
height: 100px;
height: 92px;
border-top: 2px solid yellow;
color: yellow;
font-weight: bold;
line-height: 100px;
font-size: 60px;
line-height: 92px;
font-size: 70px;
// }
}
}
......
src/views/Led/WorkShop/paintingWorkShop.vue
View file @ e39a6e32
......@@ -239,7 +239,7 @@
<style lang="scss" scoped>
.container {
background-color: #111;
// background-color: #111;
.page-pack {
width: 1556px;
......@@ -256,7 +256,7 @@
color: yellow;
line-height: 134px;
font-weight: bold;
font-size: 60px;
font-size: 100px;
}
.table-pack {
......@@ -274,7 +274,7 @@
color: yellow;
line-height: 110.625px;
font-weight: bold;
font-size: 48px;
font-size: 49px;
}
.th-2 {width: 20%; font-size:60px }
.th-3 {width: 29.5%;}
......
src/views/Monitor/components/Electrophoresis.vue
View file @ e39a6e32
......@@ -165,7 +165,7 @@
<!-- 第 7 行 -->
<div
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'"
:class="judgeCarTypeAndcarStationstyle(query['STC1-7'].busType, 'STC1-7')"
>
......@@ -423,7 +423,7 @@
v-if="query.hasOwnProperty('HDG1-65') && query['HDG1-65'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-65'].busType, 'HDG1-65')"
>
<p>{{query['HDG1-65'].No}}</p>
<p>{{query['HDG1-65'].busNo}}</p>
</div>
<div
......@@ -464,16 +464,7 @@ export default {
// 电泳作业区域实时信息
query: {},
// 根据车身号获得当前车体信息
BusInformation: {
saleOrderNo: '201905201252',
planOrderNo: '83848484',
code: 'EDSCSFDGVG',
busType: 'car',
orderSize: '20',
unit: 'From China',
shop: '二号车间',
line: '4-25'
}
BusInformation: {}
};
},
mounted () {
......@@ -487,7 +478,6 @@ export default {
methods: {
// 点击车位弹出车体信息
doCarStationClick (row) {
console.log(row);
this.$refs.toolRef.$refs.tooltip.style.visibility = 'visible';
let left = window.event.clientX;
let top = window.event.clientY;
......@@ -495,8 +485,7 @@ export default {
this.$refs.toolRef.$refs.tooltip.style.left = left - 100 + 'px';
this.$fetch('area-controller/busNo-get', { busNo: row })
.then(res => {
console.log('res', res);
// this.BusInformation = _.cloneDeep(res);
this.BusInformation = _.cloneDeep(res);
})
.catch(error => {
reject(error);
......
src/views/Monitor/components/FinishedCar.vue
View file @ e39a6e32
......@@ -165,16 +165,7 @@ export default {
// 车辆定位数据
carPostionInfo: {},
// 根据车身号获得当前车体信息
BusInformation: {
saleOrderNo: '2019-10-11 11:09',
planOrderNo: '83848484',
code: 'EDSCSFDGVG',
busType: 'car',
orderSize: '2222222255555550',
unit: 'From China',
shop: '二号车间',
line: '4-25'
}
BusInformation: {}
};
},
mounted () {
......@@ -203,7 +194,6 @@ export default {
},
// 点击车位弹出车体信息
doCarStationClick (row) {
console.log(row);
this.$refs.toolRef.$refs.tooltip.style.visibility = 'visible';
let left = window.event.clientX;
let top = window.event.clientY;
......@@ -211,7 +201,7 @@ export default {
this.$refs.toolRef.$refs.tooltip.style.left = left - 100 + 'px';
this.$fetch('area-controller/busNo-get', { busNo: row })
.then(res => {
console.log('res', res);
this.BusInformation = _.cloneDeep(res);
})
.catch(error => {
reject(error);
......
src/views/Monitor/components/MiddleCoat.vue
View file @ e39a6e32
......@@ -24,7 +24,7 @@
v-if="query.hasOwnProperty('HDG1-117') && query['HDG1-117'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-117'].busType, 'HDG1-117')"
>
<p>{{query['HDG1-117']}}</p>
<p>{{query['HDG1-117'].busNo}}</p>
</div>
<div
class="coat-row-1-4"
......@@ -32,7 +32,7 @@
v-if="query.hasOwnProperty('HDG1-118') && query['HDG1-118'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-118'].busType, 'HDG1-118')"
>
<p>{{query['HDG1-118']}}</p>
<p>{{query['HDG1-118'].busNo}}</p>
</div>
<div
class="coat-row-1-5"
......@@ -89,7 +89,7 @@
v-if="query.hasOwnProperty('HDG5-18') && query['HDG5-18'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG5-18'].busType, 'HDG5-18')"
>
<p>{{query['HDG5-18']}}</p>
<p>{{query['HDG5-18'].busNo}}</p>
</div>
<!-- 第三行 -->
<div
......@@ -214,16 +214,7 @@ export default {
// 车辆定位数据
carPostionInfo: {},
// 根据车身号获得当前车体信息
BusInformation: {
saleOrderNo: '2019-10-11 11:09',
planOrderNo: '83848484',
code: 'EDSCSFDGVG',
busType: 'car',
orderSize: '2222222255555550',
unit: 'From China',
shop: '二号车间',
line: '4-25'
}
BusInformation: {}
};
},
......@@ -252,7 +243,6 @@ export default {
},
// 点击车位弹出车体信息
doCarStationClick (row) {
console.log(row);
this.$refs.toolRef.$refs.tooltip.style.visibility = 'visible';
let left = window.event.clientX;
let top = window.event.clientY;
......@@ -260,7 +250,7 @@ export default {
this.$refs.toolRef.$refs.tooltip.style.left = left - 100 + 'px';
this.$fetch('area-controller/busNo-get', { busNo: row })
.then(res => {
console.log('res', res);
this.BusInformation = _.cloneDeep(res);
})
.catch(error => {
reject(error);
......
src/views/Monitor/components/Putty.vue
View file @ e39a6e32
......@@ -113,7 +113,7 @@
v-if="query.hasOwnProperty('HDG1-106') && query['HDG1-106'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-106'].busType, 'HDG1-106')"
>
<p>{{query['HDG1-106']}}</p>
<p>{{query['HDG1-106'].busNo}}</p>
</div>
<div
class="putty-row-3-3"
......@@ -280,7 +280,6 @@ export default {
},
// 点击车辆工位
doCarStationClick (busNub) {
console.log(busNub);
let left = window.event.clientX;
let top = window.event.clientY;
console.log('left', left);
......@@ -290,8 +289,7 @@ export default {
this.$refs.toolRef.$refs.tooltip.style.left = `${left}px`;
this.$fetch('area-controller/busNo-get', { busNo: busNub })
.then(res => {
console.log('res', res);
// this.BusInformation = _.cloneDeep(res);
this.BusInformation = _.cloneDeep(res);
})
.catch(error => {
reject(error);
......
src/views/Monitor/components/SheetMetalCar.vue
View file @ e39a6e32
......@@ -174,7 +174,7 @@
v-if="query.hasOwnProperty('HDG1-25') && query['HDG1-25'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-25'].busType, 'HDG1-25')"
>
<p>{{query['HDG1-25']}}</p>
<p>{{query['HDG1-25'].busNo}}</p>
</div>
<div
class="sheet-row-5-2"
......@@ -231,7 +231,7 @@
v-if="query.hasOwnProperty('HDG1-28') && query['HDG1-28'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-28'].busType, 'HDG1-28')"
>
<p>{{query['HDG1-28']}}</p>
<p>{{query['HDG1-28'].busNo}}</p>
</div>
<div
class="sheet-row-6-4"
......@@ -239,7 +239,7 @@
v-if="query.hasOwnProperty('HDG1-27') && query['HDG1-27'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-27'].busType, 'HDG1-27')"
>
<p>{{query['HDG1-27']}}</p>
<p>{{query['HDG1-27'].busNo}}</p>
</div>
<div
class="sheet-row-6-5"
......@@ -315,16 +315,7 @@ export default {
// 钣金车存放区实时信息
query: {},
// 根据车身号获得当前车体信息
BusInformation: {
saleOrderNo: '2019-10-11 11:09',
planOrderNo: '83848484',
code: 'EDSCSFDGVG',
busType: 'car',
orderSize: '2222222255555550',
unit: 'From China',
shop: '二号车间',
line: '4-25'
}
BusInformation: {}
};
},
mounted () {
......@@ -354,7 +345,6 @@ export default {
},
// 点击车辆工位
doCarStationClick (busNub) {
console.log(busNub);
let left = window.event.clientX;
let top = window.event.clientY;
console.log('left', left);
......@@ -364,8 +354,7 @@ export default {
this.$refs.toolRef.$refs.tooltip.style.left = `${left}px`;
this.$fetch('area-controller/busNo-get', { busNo: busNub })
.then(res => {
console.log('res', res);
// this.BusInformation = _.cloneDeep(res);
this.BusInformation = _.cloneDeep(res);
})
.catch(error => {
reject(error);
......
src/views/Monitor/index.vue
View file @ e39a6e32
......@@ -609,27 +609,27 @@
<div
class="line-5-clean-up-1"
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
class="line-5-damping-glue-spray-paint"
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
class="line-5-clean-up-2"
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
class="line-5-foaming-spray"
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
class="line-5-shadow-protection"
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
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