diff --git a/index.html b/index.html index 370c577..1a52ad6 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,8 @@ - + + 车间物料监控 diff --git a/src/pages/modules/home/index.vue b/src/pages/modules/home/index.vue index 94931df..0fea6f0 100644 --- a/src/pages/modules/home/index.vue +++ b/src/pages/modules/home/index.vue @@ -62,8 +62,12 @@
-

任务号

-

{{ e.task_code }}

+

任务起点

+

{{ e.start_loc }}

+
+
+

任务终点

+

{{ e.target_loc }}

电量

@@ -1405,10 +1409,10 @@ export default { display flex justify-content space-between width 100% - height 40% + height 47% padding-bottom 20px .rgv_wrap - height 60% + height 53% padding-bottom 0 .agv_item display: flex; @@ -1451,9 +1455,8 @@ export default { display: flex; justify-content: space-between; align-items: center; - height 25% + height 20% background bottom center / 100% 3px url('../../../images/screen1/line_1.png') no-repeat - padding 0 10px &:last-child background none .p2 diff --git a/src/style/reset.css b/src/style/reset.css index 1e47e19..7df373c 100644 --- a/src/style/reset.css +++ b/src/style/reset.css @@ -69,8 +69,10 @@ li { } html, body { - width: 1920px; - height: 1080px; + width: 100%; + height: 100%; + /* width: 1920px; + height: 1080px; */ /* min-height: 1080px; */ }