Переглянути джерело

refactor: adjust some styles and text

Casper Dai 3 роки тому
батько
коміт
53e479d449

+ 2 - 3
src/views/device/detail/components/DeviceInfo.vue

@@ -13,7 +13,7 @@
     </div>
     <div class="l-flex--row c-info__block">
       <div class="l-flex--row l-flex__fill c-info__item">
-        <div class="l-flex__none c-info__title">设备名称</div>
+        <div class="l-flex__none c-info__title">名称</div>
         <div class="l-flex__fill c-info__value">{{ device.name }}</div>
       </div>
       <div class="l-flex--row l-flex__fill c-info__item">
@@ -193,7 +193,6 @@ export default {
 
 <style lang="scss" scoped>
 .o-map {
-  min-height: 300px;
-  max-height: 600px;
+  min-height: 90px;
 }
 </style>

+ 11 - 11
src/views/device/detail/components/LinkState.vue

@@ -226,8 +226,8 @@ export default {
 
 .c-link-state {
   position: relative;
-  min-width: 1024px;
-  min-height: 490px;
+  min-width: 970px;
+  min-height: 410px;
   overflow-x: auto;
 }
 
@@ -264,23 +264,23 @@ export default {
   }
 
   &.l6 {
-    @include getPosition(234px, 209px, 258px, 1px);
+    @include getPosition(234px, 209px, 216px, 1px);
   }
 
   &.l7 {
-    @include getPosition(490px, 209px, 1px, 105px);
+    @include getPosition(448px, 209px, 1px, 95px);
   }
 
   &.l8 {
-    @include getPosition(490px, 314px, 52px, 1px);
+    @include getPosition(448px, 304px, 66px, 1px);
   }
 
   &.l9 {
-    @include getPosition(490px, 209px, 52px, 1px);
+    @include getPosition(448px, 209px, 66px, 1px);
   }
 
   &.l10 {
-    @include getPosition(402px, 369px, 268px, 1px);
+    @include getPosition(360px, 366px, 296px, 1px);
   }
 }
 
@@ -349,11 +349,11 @@ export default {
   }
 
   &.traffic_camera {
-    @include getPosition(528px, 162px, 79px, 79px);
+    @include getPosition(500px, 156px, 79px, 79px);
   }
 
   &.led_camera {
-    @include getPosition(528px, 262px, 79px, 79px);
+    @include getPosition(500px, 252px, 79px, 79px);
   }
 
   &.traffic_camera,
@@ -368,7 +368,7 @@ export default {
   }
 
   &.gateway {
-    @include getPosition(270px, 278px, 138px, 138px);
+    @include getPosition(270px, 250px, 138px, 138px);
 
     &.online {
       background-image: url("~@/assets/linkState/icon_gateway_online.svg");
@@ -380,7 +380,7 @@ export default {
   }
 
   &.led {
-    @include getPosition(670px, 209px, 352px, 198px);
+    @include getPosition(624px, 208px, 352px, 198px);
     background-color: rgba(#000, 0.8);
     background-position: center center;
     background-size: contain;

+ 9 - 11
src/views/device/detail/components/external/Transmitter/index.vue

@@ -24,37 +24,37 @@
             </div>
             <div class="l-flex--row c-info__block">
               <div class="l-flex--row l-flex__fill c-info__item">
-                <div class="l-flex__none c-info__title">设备名称</div>
+                <div class="l-flex__none c-info__title">名称</div>
                 <auto-text
                   class="l-flex__fill c-info__value"
                   :text="transmitter.name"
                 />
               </div>
               <div class="l-flex--row l-flex__fill c-info__item">
-                <div class="l-flex__none c-info__title">厂家名称</div>
+                <div class="l-flex__none c-info__title">厂家</div>
                 <div class="l-flex__fill c-info__value">{{ transmitter.manufacturerName }}</div>
               </div>
             </div>
             <div class="l-flex--row c-info__block">
               <div class="l-flex--row l-flex__fill c-info__item">
-                <div class="l-flex__none c-info__title">设备型号</div>
+                <div class="l-flex__none c-info__title">型号</div>
                 <auto-text
                   class="l-flex__fill c-info__value"
                   :text="transmitter.type"
                 />
               </div>
               <div class="l-flex--row l-flex__fill c-info__item">
-                <div class="l-flex__none c-info__title">设备类型</div>
+                <div class="l-flex__none c-info__title">类型</div>
                 <div class="l-flex__fill c-info__value">{{ type }}</div>
               </div>
             </div>
             <div class="l-flex--row c-info__block">
               <div class="l-flex--row l-flex__fill c-info__item">
-                <div class="l-flex__none c-info__title">支持设备监测</div>
+                <div class="l-flex__none c-info__title">设备监测</div>
                 <div class="l-flex__fill c-info__value">{{ supportDetection }}</div>
               </div>
               <div class="l-flex--row l-flex__fill c-info__item">
-                <div class="l-flex__none c-info__title">支持内容保护</div>
+                <div class="l-flex__none c-info__title">内容保护</div>
                 <div class="l-flex__fill c-info__value">{{ supportContentProtection }}</div>
               </div>
             </div>
@@ -69,7 +69,7 @@
                 class="o-button"
                 @click="onBind"
               >
-                绑定设备
+                绑定发送控制设备
               </button>
             </div>
           </div>
@@ -95,7 +95,6 @@ import {
   unbind
 } from '@/api/external'
 import { Transmitter } from '@/constant'
-import { createListOptions } from '@/utils'
 
 export default {
   name: 'Transmitter',
@@ -110,7 +109,6 @@ export default {
       loading: false,
       error: false,
       info: null,
-      options: createListOptions({ manufacturerKey: void 0 }),
       schema: {
         condition: { manufacturerKey: void 0 },
         filters: [
@@ -134,10 +132,10 @@ export default {
       return this.transmitter && this.transmitter.flag & Transmitter.IS_ASYNC ? '异步盒' : '非异步盒'
     },
     supportDetection () {
-      return this.transmitter && this.transmitter.flag & Transmitter.SUPPORT_DETECTION ? '是' : '否'
+      return this.transmitter && this.transmitter.flag & Transmitter.SUPPORT_DETECTION ? '支持' : '不支持'
     },
     supportContentProtection () {
-      return this.transmitter && this.transmitter.flag & Transmitter.SUPPORT_CONTENT_PROTECTION ? '是' : '否'
+      return this.transmitter && this.transmitter.flag & Transmitter.SUPPORT_CONTENT_PROTECTION ? '支持' : '不支持'
     }
   },
   activated () {

+ 3 - 3
src/views/external/transmitter/index.vue

@@ -43,14 +43,14 @@
             active-color="#13ce66"
             inactive-color="#ff4949"
           />
-          <span class="c-sibling-item far">支持设备监测:</span>
+          <span class="c-sibling-item far">设备监测:</span>
           <el-switch
             v-model="flag.detection"
             class="c-sibling-item"
             active-color="#13ce66"
             inactive-color="#ff4949"
           />
-          <span class="c-sibling-item far">支持内容保护:</span>
+          <span class="c-sibling-item far">内容保护:</span>
           <el-switch
             v-model="flag.contentProtection"
             class="c-sibling-item"
@@ -133,7 +133,7 @@ export default {
   },
   computed: {
     dialogTitle () {
-      return this.transmitter.id ? '添加发送控制设备' : '修改发送控制设备'
+      return this.transmitter.id ? '编辑发送控制设备' : '新增发送控制设备'
     }
   },
   methods: {