diff --git a/src/pages/DeviceScreen.vue b/src/pages/DeviceScreen.vue
index 82ddea1..6535a26 100644
--- a/src/pages/DeviceScreen.vue
+++ b/src/pages/DeviceScreen.vue
@@ -151,10 +151,10 @@
@@ -164,10 +164,10 @@
{{e.device_name}}
{{e.workprocedure_name}}
{{e.device_status}}
- {{e.product_qty}}
+
{{e.start_time}}
{{e.end_time}}
- {{e.product_time}}
+
@@ -365,7 +365,7 @@ export default {
// array2: [{material_code: '01'}, {material_code: '01'}, {material_code: '01'}, {material_code: '01'}],
array1: [],
array2: [],
- num: 8
+ num: 800
}
},
computed: {
@@ -468,16 +468,16 @@ export default {
grid: [
{
left: '8%',
- top: '12%',
+ top: '5%',
right: '5%',
- bottom: '8%',
+ bottom: '0%',
containLabel: true
},
{
left: '10%',
- top: '12%',
+ top: '5%',
right: '5%',
- bottom: '8%',
+ bottom: '0%',
containLabel: true
}
],
@@ -1205,7 +1205,7 @@ export default {
show: false, // 为true滚动条出现
type: 'slider', // type:'inside',滚动条在最下面,鼠标点击滚动
startValue: 0, // 从头开始。
- endValue: 6 // end百分比显示范围,endValue具体显示几个数值
+ endValue: 8 // end百分比显示范围,endValue具体显示几个数值
}
],
grid: {
@@ -1645,7 +1645,7 @@ export default {
if (type === 2) {
this.timeOut2 = setInterval(() => {
if (Number(option.dataZoom[0].endValue) === option.series[0].data.length - 1) {
- option.dataZoom[0].endValue = 6
+ option.dataZoom[0].endValue = 8
option.dataZoom[0].startValue = 0
} else {
option.dataZoom[0].endValue = option.dataZoom[0].endValue + 1
@@ -1942,12 +1942,12 @@ header
background center bottom / 1.02rem .03rem url(../assets/images/screen1/line_1.png) no-repeat
.item_content_1_inner_2_p1
float left
- margin 0.26rem 0 0 0.08rem
+ margin 0.17rem 0 0 0.08rem
font-family "SourceHanSansCN"
_font(.14rem, .14rem, #84B0DA, 700, left)
.item_content_1_inner_2_p2
float right
- margin 0.26rem 0.08rem 0 0
+ margin 0.15rem 0.08rem 0 0
font-family "SourceHanSansCN"
_font(.18rem, .18rem, #FFFFFF, 700, right)
.item_wrap_1
@@ -1973,7 +1973,7 @@ header
border-bottom .01rem solid rgba(8,205,248,0.3)
li
float left
- width 12.2%
+ width 15%
_font(.14rem,.4rem,#78B1DE,,center)
word-wrap break-word
word-break break-all
@@ -1981,8 +1981,10 @@ header
padding 0 .02rem
overflow hidden
box-sizing border-box
- &:nth-child(8)
- width 13.2%
+ &:nth-child(5)
+ width 20%
+ &:nth-child(6)
+ width 20%
.scroll_container_1
width 100%
height calc(100% - .4rem)
@@ -1996,7 +1998,7 @@ header
box-shadow inset 0px 1px 0px 0px rgba(13,89,115,0.3)
.scroll-ul_1_div
float left
- _wh(12.2%, .4rem)
+ _wh(15%, .4rem)
_fj(center)
_font(.14rem, .4rem, #fff,,center)
word-wrap break-word
@@ -2004,8 +2006,10 @@ header
white-space nowrap
padding 0 .02rem
overflow hidden
- &:nth-child(8)
- width 13.2%
+ &:nth-child(5)
+ width 20%
+ &:nth-child(6)
+ width 20%
&:nth-child(4)
// text-align left
span