From bd58b80bc48f07efb97ccc05624b13b6c80e92c8 Mon Sep 17 00:00:00 2001
From: xianfuxing <xianfuixng@16.com>
Date: Mon, 25 May 2020 15:27:31 +0800
Subject: [PATCH] =?UTF-8?q?#=20=E8=B0=83=E6=95=B4device=20base=20=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/counter/components/screen.vue | 30 +++++++++++--------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/views/counter/components/screen.vue b/src/views/counter/components/screen.vue
index 06ee523..a54ef5a 100644
--- a/src/views/counter/components/screen.vue
+++ b/src/views/counter/components/screen.vue
@@ -2,11 +2,8 @@
   <div class="app-container">
     <div class="base-wrapper">
       <div class="device-base">
-        <ul>
-          <li>设备: <span>{{deviceID}}</span></li>
-          <li class="region">地区: <span>尖沙咀</span></li>
-          <li>设备名称: <span>香港大学1号机</span></li>
-        </ul>
+        <p class="item"><span class="keyword">{{$t('counter.device')}}: </span><el-tag>{{deviceID}}</el-tag></p>
+        <p class="item"><span class="keyword">{{$t('counter.deviceName')}}: </span><el-tag>{{lastItem.device_name}}</el-tag></p>
       </div>
     </div>
     <div class="screen-wrapper">
@@ -93,18 +90,17 @@ export default {
     overflow: auto;
     .device-base {
       display: flex;
-      justify-content: center;
-      min-width: 600px;      
-      ul {
-        padding: 0;
-        li {
-          font-size: .85rem;
-          list-style-type: none;
-          display: inline-block;
-        }
-        .region {
-          margin: 0 5rem 0 5rem;
-        }
+      flex-direction: column;
+      align-items: center;
+      min-width: 600px;
+      .item {
+        width: 300px;
+        margin: 0 0 5px 0;
+      }
+      .keyword {
+        display: inline-block;
+        width: 90px;
+        font-size: 0.8em;
       }
     }
   }