+
+
+
+
+
+
@@ -250,30 +255,30 @@
-
+
-
+
+
-
@@ -344,22 +337,19 @@
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
@@ -344,22 +337,19 @@
+
-
+
-
-
-
-
-
+
@@ -408,7 +398,7 @@
+
@@ -487,7 +477,7 @@ export default {
conveyorLine: [],
gantryRobot: [],
kiln: [],
- emptyVehicleConveyorLine: {},
+ // emptyVehicleConveyorLine: {},
coolingConveyorLine: [],
trayStacker: {},
vconveyorLine: [],
@@ -517,14 +507,15 @@ export default {
res.press.palletizingRobot.map((e, i) => {
let loadLocation1 = res.press.loadLocation[2 * i].status
let loadLocation2 = res.press.loadLocation[2 * i + 1].status
- let pressMachine1 = res.press.pressMachine[2 * i].status
- let pressMachine2 = res.press.pressMachine[2 * i + 1].status
- let unloadLocation1 = res.press.unloadLocation[4 * i]
- let unloadLocation2 = res.press.unloadLocation[4 * i + 1]
- let unloadLocation3 = res.press.unloadLocation[4 * i + 2]
- let unloadLocation4 = res.press.unloadLocation[4 * i + 3]
- this.press.push({equipment: e.equipment, status: e.status, palletizingRobot: e.palletizingRobot, loadLocation1: loadLocation1, loadLocation2: loadLocation2, pressMachine1: pressMachine1, pressMachine2: pressMachine2, unloadLocation: [unloadLocation1, unloadLocation2, unloadLocation3, unloadLocation4]})
+ let pressMachine1 = i < 3 ? res.press.pressMachine[2 * i].status : res.press.pressMachine[i + 3].status
+ let pressMachine2 = i < 3 ? res.press.pressMachine[2 * i + 1].status : ''
+ let unloadLocation1 = i < 3 ? res.press.unloadLocation[4 * i] : res.press.unloadLocation[4 * i - (i - 3) * 2]
+ let unloadLocation2 = i < 3 ? res.press.unloadLocation[4 * i + 1] : res.press.unloadLocation[4 * i - (i - 3) * 2 + 1]
+ let unloadLocation3 = i < 3 ? res.press.unloadLocation[4 * i + 2] : {}
+ let unloadLocation4 = i < 3 ? res.press.unloadLocation[4 * i + 3] : {}
+ this.press.push({equipment: e.equipment, status: e.status, palletizingRobot: e.palletizingRobot, loadLocation1: loadLocation1, loadLocation2: loadLocation2, pressMachine1: pressMachine1, pressMachine2: pressMachine2, unloadLocation: i < 3 ? [unloadLocation1, unloadLocation2, unloadLocation3, unloadLocation4] : [unloadLocation1, unloadLocation2]})
})
+ console.log(this.press)
// 窑前货架
this.frontWarehouse = [...res.frontWarehouse.storageLocation]
// 窑后货架
@@ -533,7 +524,7 @@ export default {
this.conveyorLine = [...res.dry.conveyorLine]
this.gantryRobot = [...res.dry.gantryRobot]
this.kiln = [...res.dry.kiln]
- this.emptyVehicleConveyorLine = [...res.dry.emptyVehicleConveyorLine][0]
+ // this.emptyVehicleConveyorLine = [...res.dry.emptyVehicleConveyorLine][0]
this.coolingConveyorLine = [...res.dry.coolingConveyorLine]
// 托盘输送线
this.trayStacker = [...res.vehicleConveyorLine.trayStacker][0]
@@ -662,6 +653,9 @@ export default {
_wh(calc(100% + 10px), 90%)
.yao_1
left 3%
+ opacity 0.2
+ .yao_layer3
+ background-color #bfbfbf
.yao_2
left 14%
.yao_3
@@ -817,24 +811,29 @@ export default {
position absolute
left: 5%;
top 3%
- _wh(28%, 36%)
+ _wh(28%, 32%)
.yj_1600_block_2
left 38%
.weilan_1600_wrap
_wh(100%, 66%)
top auto
bottom 0
-.slw_1600_wrap_1
+.slw_1600_wrap
_wh(19%, auto)
- left: -13%;
+.slw_1600_wrap_1
+ left: -9%;
top: 7%;
- transform: rotate(90deg);
.slw_1600_wrap_2
- top 26%
+ left 9%
+ top 7%
+.slw_1600_wrap_3
+ left: -9%;
+ top: 23%;
+.slw_1600_wrap_4
+ left 9%
+ top 23%
.yj_1600_wrap_1
- _wh(45%, 26%)
- left 5%
-.yj_1600_wrap_2
+ _wh(69%, auto)
left auto
right 0
.qzj_1600_wrap
@@ -849,8 +848,8 @@ export default {
top 10%
.robot_1600_wrap
_wh(1%, 1%)
- left: 52%;
- top: 70%;
+ left: 49%;
+ top: 73%;
img
position: absolute;
width: 5000%;
@@ -861,21 +860,15 @@ export default {
_wh(17%, auto)
.ktp_1600_wrap_1
left: 10%;
- top: 37%;
+ top: 60%;
.ktp_1600_wrap_2
left: auto;
right: 10%;
- top: 37%;
-.ktp_1600_wrap_3
- left: 10%;
- top: 74%;
-.ktp_1600_wrap_4
- left: auto;
- right: 10%;
- top: 74%;
+ top: 60%;
.yj_1250_block
left auto
right 1%
+ opacity 0.2
.yj_2500_block
_wh(34%, 52%)
left auto
@@ -883,7 +876,9 @@ export default {
right 9%
bottom 6%
.weilan_2500_wrap
- _wh(100%, 66%)
+ _wh(80%, 66%)
+ left auto
+ right 0
.slw_2500_wrap
_wh(16%, auto)
top auto
@@ -899,15 +894,15 @@ export default {
_fj(flex-start)
flex-wrap wrap
top: 33%;
- left: 10%;
+ left: -1%;
.ktp_yyj_wrap_2
width: 9.5%;
top: 76%;
- left: 20%;
+ left: 8%;
.ktp_yyj_wrap_3
width: 13%;
top: 88%;
- left: 30%;
+ left: 18%;
.ktp_yyj_1
width 50%
img
@@ -923,8 +918,8 @@ export default {
top 22%
.robot_2500_wrap
_wh(1%, 1%)
- left: 52%;
- top: 17%;
+ left: 60%;
+ top: 13%;
transform: rotate(227deg)
img
position: absolute;
@@ -933,13 +928,13 @@ export default {
top: -600%;
left: -3200%;
.ktp_2500_wrap
- _wh(12%,auto)
+ _wh(14%,auto)
.ktp_2500_wrap_1
- left 10%
+ left 26%
top 3%
.ktp_2500_wrap_2
left auto
- right 10%
+ right 5%
top 3%
.ktp_2500_wrap_3
left 10%
@@ -1031,14 +1026,14 @@ export default {
left: 61%;
top: 57%;
box-shadow -5px 5px 8px rgba(0,135,172,0.6)
- _wh(18.5%, 16%)
+ _wh(18.5%, 13%)
border-bottom-right-radius 0
.blue_line_2
left: auto
right 0
- top: 73%
+ top: 70%
box-shadow -5px 5px 8px rgba(0,135,172,0.6)
- _wh(20.5%, 16%)
+ _wh(20.5%, 19%)
border-top-left-radius 0
.rotate_1
animation rotate_1 1.5s linear 1.5s infinite alternate-reverse
diff --git a/src/pages/shunhe/LogisticsProcess.vue b/src/pages/shunhe/LogisticsProcess.vue
index 6c8d613..015ad35 100644
--- a/src/pages/shunhe/LogisticsProcess.vue
+++ b/src/pages/shunhe/LogisticsProcess.vue
@@ -267,6 +267,8 @@ export default {
computed: {
defaultOption1 () {
return {
+ timer1: null,
+ timer2: null,
step: 0.4, // 数值越大速度滚动越快
limitMoveNum: 9, // 开始无缝滚动的数据量 this.dataList.length
hoverStop: true, // 是否开启鼠标悬停stop
@@ -279,14 +281,14 @@ export default {
}
},
mounted () {
+ clearInterval(this.timer1)
+ clearInterval(this.timer2)
this.refresh()
},
beforeDestroy () {
this.$once('hook:beforeDestroy', () => {
clearInterval(this.timer1)
clearInterval(this.timer2)
- clearInterval(this.interTime)
- clearInterval(this.timeOut1)
})
},
methods: {
@@ -635,11 +637,8 @@ export default {
}
var count = 0
- var timer = null
-
- var dataLength = option.series[1].data.length
- timer && clearInterval(timer)
- timer = setInterval(() => {
+ clearInterval(this.timer1)
+ this.timer1 = setInterval(() => {
this.myCharts2.dispatchAction({
type: 'downplay',
seriesIndex: 1
@@ -647,14 +646,20 @@ export default {
this.myCharts2.dispatchAction({
type: 'highlight',
seriesIndex: 1,
- dataIndex: count % dataLength
+ dataIndex: count
})
this.myCharts2.dispatchAction({
type: 'showTip',
seriesIndex: 1,
- dataIndex: count % dataLength
+ dataIndex: count
})
count++
+ if (count >= option.series[0].data.length) {
+ count = 0
+ }
+ if (count >= option.series[1].data.length) {
+ count = 0
+ }
}, 3000)
},
async _homepageData () {