Browse Source

fix: 调整

anxiaoxia 1 month ago
parent
commit
b27600b336

+ 34 - 12
src/locales/en.json

@@ -1,21 +1,42 @@
- 
 {
-    "login": {
-      "title": "Login",
-      "tips": "Welcome back!"
-    },
+   
     "env":{
-        "humidity":"Humidity",
-        "temperature":"Temperature"
+        "湿度":"Humidity",
+        "温度":"Temperature",
+        "良好":"Good",
+        "优秀":"Excellent"
     },
-    "audio":{
-        "title":"Audio"
+    "mode": {
+        "普通模式": "General Mode",
+        "视频会议": "VC Mode",
+        "投影模式": "Projection",
+        "美食评鉴": "Food Tasting",
+        "瑜伽模式": "Yoga Mode",
+        "私人餐厅": "Private Dining",
+        "开放日": "Open House",
+        "路演": "Roadshows",
+        "影院模式": "Cinema Mode"
     },
     "screen":{
-        "title":"Casting"
+        "投屏":"Casting",
+        "切换视频源":"witch Projection Input",
+        "有线投屏":"Wired Casting",
+        "无线投屏":"Wireless Casting"
+},
+    "audio":{
+        "1":"Computer Audio",
+        "3":"Bluetooth",
+        "音响":"Audio",
+        "已静音":"Muted",
+        "播放中":"Playing"
+
     },
+  
     "lamp":{
-        "title":"Lighting"
+        "光照":"Lighting",
+        "已关闭":"Closed",
+        "已部分开启":"Partially Open",
+        "已开启":"Open"
     },
     "air":{
         "title":"AC"
@@ -23,4 +44,5 @@
     "curtains":{
         "title":"Curtains"
     }
-  }
+   
+} 

+ 33 - 7
src/locales/zh-CN.json

@@ -4,17 +4,42 @@
       "tips": "欢迎回来!"
     },
     "env":{
-        "humidity":"湿度",
-        "temperature":"温度"
+        "湿度":"湿度",
+        "温度":"温度",
+        "良好":"良好",
+        "优秀":"优秀"
     },
-    "audio":{
-        "title":"音响"
+    "mode": {
+        "普通模式": "普通模式",
+        "视频会议": "视频会议",
+        "投影模式": "投影模式",
+        "美食评鉴": "美食评鉴",
+        "瑜伽模式": "瑜伽模式",
+        "私人餐厅": "私人餐厅",
+        "开放日": "开放日",
+        "路演": "路演",
+        "影院模式": "影院模式"
     },
     "screen":{
-        "title":"投屏"
+        "投屏":"投屏",
+        "切换视频源":"切换视频源",
+        "有线投屏":"有线投屏",
+        "无线投屏":"无线投屏"
+
+    },
+    "audio":{
+        "1":"电脑音频",
+        "3":"蓝牙",
+        "音响":"音响",
+        "已静音":"已静音",
+        "播放中":"播放中"
     },
+   
     "lamp":{
-        "title":"照明"
+        "光照":"光照",
+        "已关闭":"已关闭",
+        "已部分开启":"已部分开启",
+        "已开启":"已开启"
     },
     "air":{
         "title":"空调"
@@ -23,4 +48,5 @@
         "title":"窗帘"
     }
 
-  }
+   
+}

+ 3 - 3
src/views/envmonitor/taiguv1/components/Lamp/index.vue

@@ -34,8 +34,8 @@
         <div class="bottom">
             <div class="bottom-box">
                 <div class="bottom-left">
-                    <div class="text">光照</div>
-                    <div class="status">{{ lampData.lampStatusText || '已关闭'}}</div>
+                    <div class="text">{{ $t(`lamp.光照`) }}</div>
+                    <div class="status">{{ $t(`lamp.${lampData.lampStatusText}`) }}</div>
                 </div>
 
                 <div
@@ -202,7 +202,7 @@ const setLampStatus = type => {
     }
     .bottom {
         .bottom-box {
-            margin-bottom: 8px;
+           
             flex: 1;
             display: flex;
             justify-content: space-between;

+ 4 - 4
src/views/envmonitor/taiguv1/components/Screen/index.vue

@@ -6,8 +6,8 @@
                 alt=""
             />
             <div class="top-right">
-                <div class="title">投屏</div>
-                <div class="status">切换视频源</div>
+                <div class="title">{{$t(`screen.投屏`)}}</div>
+                <div class="status">{{$t(`screen.切换视频源`)}}</div>
             </div>
         </div>
         <div class="bottom">
@@ -16,14 +16,14 @@
                 :class="screenData.runStatus == 1 ? 'btn-active' : ''"
                 @click="setScreenStatus('runStatus',1)"
             >
-                有线投屏
+                {{$t(`screen.有线投屏`)}}
             </div>
             <div
                 class="btn"
                 :class="screenData.runStatus == 2 ? 'btn-active' : ''"
                 @click="setScreenStatus('runStatus',2)"
             >
-                无线投屏
+                {{$t(`screen.无线投屏`)}}
             </div>
             <div
                 class="btn"

+ 8 - 4
src/views/envmonitor/taiguv1/components/Volumn/index.vue

@@ -10,9 +10,9 @@
     <div class="bottom">
       <div class="volumn-info">
         <div class="left">
-          <div class="text">音响</div>
+          <div class="text">{{ $t(`audio.音响`) }}</div>
           <div class="status">
-            {{ audioData.isOpen ? `${audioData.onlineStatus ? audioData.onlineStatus : '电脑音频'} 播放中` : '已静音' }}
+            {{ audioData.isOpen ? `${audioData.onlineStatus ? audioData.onlineStatus : $t(`audio.1`)} ${$t(`audio.播放中`)}` : $t(`audio.已静音`) }}
           </div>
         </div>
         <div class="temp" v-if="audioData.isOpen">{{ audioData.runStatus || 0 }}</div>
@@ -32,8 +32,8 @@ import Slider from '@/components/slider/Slider.vue'
 import SwitchButton from '@/components/switch-button/SwitchButton.vue'
 import useDeviceControl from '@/hooks/useDeviceControl'
 import { useStore } from '@/store'
-import { computed, ref, watch } from 'vue'
 import { customRound } from '@/utils'
+import { computed, ref, watch } from 'vue'
 const min = 0
 const max = 100
 const store = useStore()
@@ -55,7 +55,7 @@ const allAudioStatus = computed(() => store.state.taiguv1.audioSwitchStatus)
 
 const audioData = ref({
   isOpen: false,
-  onlineStatus: '电脑音频',
+  onlineStatus: 1,
   volumnSet: 0
 })
 
@@ -93,6 +93,10 @@ const setAudioStatus = type => {
   deviceControl.sendCommands(params)
 }
 const compareStatus = data => {
+    console.log(
+        data,'audio`````````'
+    );
+    
   if (allAudioStatus.value.all) {
     if (allAudioStatus.value.all.lastSwitchStatus == data.isOpen) {
       store.dispatch('taiguv1/setAudioStatus', {

+ 12 - 10
src/views/envmonitor/taiguv1/index.vue

@@ -49,7 +49,7 @@
                         :src="modeType == item.id ? item.activeSvg : item.unActiveSvg"
                         alt=""
                     />
-                    <span>{{ item.chineseName }}</span>
+                    <span>{{ $t(`mode.${item.chineseName}`) }}</span>
                 </div>
             </div>
             <!-- 环境参数 -->
@@ -60,7 +60,7 @@
                 />
                 <div class="env-info">
                     <div class="item">
-                        <div class="title">温度</div>
+                        <div class="title">{{ $t(`env.温度`) }}</div>
                         <div class="num-box">
                             <template v-if="envParams.temperature">
                                 <span>{{ envParams?.temperature }}</span>
@@ -74,7 +74,7 @@
                         <div class="num-box">
                             <template v-if="envParams.co2">
                                 <span>{{ envParams?.co2?.value }}</span>
-                                <span>{{ envParams?.co2?.level }}</span>
+                                <span>{{ $t(`env.${envParams?.co2?.level}`) }}</span>
                             </template>
                             <span v-else>--</span>
                         </div>
@@ -83,7 +83,7 @@
                 <div class="line"></div>
                 <div class="env-info">
                     <div class="item">
-                        <div class="title">湿度</div>
+                        <div class="title">{{ $t(`env.湿度`) }}</div>
                         <div class="num-box">
                             <template v-if="envParams.humidity">
                                 <span>{{ envParams?.humidity }}</span>
@@ -97,7 +97,7 @@
                         <div class="num-box">
                             <template v-if="envParams.TVOC">
                                 <span>{{ envParams?.TVOC?.value }}</span>
-                                <span>{{ envParams?.TVOC?.level }}</span>
+                                <span>{{ $t(`env.${envParams?.TVOC?.level}`) }}</span>
                             </template>
                             <span v-else>--</span>
                         </div>
@@ -110,7 +110,7 @@
                         <div class="num-box">
                             <template v-if="envParams.pm25">
                                 <span>{{ envParams?.pm25?.value }}</span>
-                                <span>{{ envParams?.pm25?.level }}</span>
+                                <span>{{ $t(`env.${envParams?.pm25?.level}`)  }}</span>
                             </template>
                             <span v-else>--</span>
                         </div>
@@ -263,8 +263,9 @@ const envParams = ref({})
 const { locale } = useI18n()
 const checkLanage = item => {
   type.value = item.type
-  locale.value  = item.type
-  localStorage.setItem('lang',  item.type)  // 持久化存储
+//   TODO: 切换语言
+//   locale.value  = item.type
+//   localStorage.setItem('lang',  item.type)  // 持久化存储
 }
 
 const handleChildLampSwitch = (status, text) => {
@@ -280,8 +281,9 @@ const hasExecutedModeScene = ref(false)
 const store = useStore()
 
 onMounted(() => {
-  type.value = localStorage.getItem('lang') || 'zh-CN'
-  locale.value  = type.value
+    //   TODO: 切换语言
+//   type.value = localStorage.getItem('lang') || 'zh-CN'
+//   locale.value  = type.value
     try {
         let roomId = route.query.id || 'room4'