Commit a32a5fed372201c047e679e2ed9e355165ac5778

Authored by fengwotao
1 parent e947951a

feat: 规则链中英文翻译

... ... @@ -8,21 +8,10 @@ VITE_GLOB_PUBLIC_PATH = /
8 8 # Please note that no line breaks
9 9
10 10 # 本地
11   -<<<<<<< HEAD
12   -<<<<<<< Updated upstream
13   -VITE_PROXY = [["/api","http://192.168.10.146:8080/api"],["/thingskit-scada","http://localhost:3000/"],["/large-designer", "http://localhost:5555/large-designer/"]]
14   -=======
15 11 VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-scada","http://localhost:5173/thingskit-scada"],["/large-designer", "http://localhost:5555/large-designer/"]]
16   ->>>>>>> main_dev
17 12
18 13 # 实时数据的ws地址
19   -VITE_GLOB_WEB_SOCKET = ws://192.168.10.146:8080/api/ws/plugins/telemetry?token=
20   -=======
21   -VITE_PROXY = [["/api","http://222.180.200.114:48080/api"],["/thingskit-scada","http://192.168.10.115:3000/"],["/large-designer", "http://192.168.10.115:5555/large-designer/"]]
22   -
23   -# 实时数据的ws地址
24   -VITE_GLOB_WEB_SOCKET = ws://222.180.200.114:48080/api/ws/plugins/telemetry?token=
25   ->>>>>>> Stashed changes
  14 +VITE_GLOB_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=
26 15
27 16 # Delete console
28 17 VITE_GLOB_DROP_CONSOLE = true
... ...
... ... @@ -12,17 +12,17 @@
12 12 overlayClassName="app-locale-picker-overlay"
13 13 >
14 14 <span class="cursor-pointer flex items-center" :style="{ color: color }">
15   - <Icon icon="ion:language" />
16   - <span v-if="showText" class="ml-1">{{ getLocaleText }}</span>
  15 + <!-- <Icon icon="ion:language" />
  16 + <span v-if="showText" class="ml-1">{{ getLocaleText }}</span> -->
17 17 </span>
18 18 </Dropdown>
19 19 </template>
20 20 <script lang="ts" setup>
21 21 import type { LocaleType } from '/#/config';
22 22 import type { DropMenu } from '/@/components/Dropdown';
23   - import { ref, watchEffect, unref, computed } from 'vue';
  23 + import { ref, watchEffect, unref } from 'vue';
24 24 import { Dropdown } from '/@/components/Dropdown';
25   - import { Icon } from '/@/components/Icon';
  25 + // import { Icon } from '/@/components/Icon';
26 26 import { useLocale } from '/@/locales/useLocale';
27 27 import { localeList } from '/@/settings/localeSetting';
28 28
... ... @@ -45,13 +45,13 @@
45 45
46 46 const { changeLocale, getLocale } = useLocale();
47 47
48   - const getLocaleText = computed(() => {
49   - const key = selectedKeys.value[0];
50   - if (!key) {
51   - return '';
52   - }
53   - return localeList.find((item) => item.event === key)?.text;
54   - });
  48 + // const getLocaleText = computed(() => {
  49 + // const key = selectedKeys.value[0];
  50 + // if (!key) {
  51 + // return '';
  52 + // }
  53 + // return localeList.find((item) => item.event === key)?.text;
  54 + // });
55 55
56 56 watchEffect(() => {
57 57 selectedKeys.value = [unref(getLocale)];
... ...