diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts
index 69ad355..375d313 100644
--- a/src/locales/lang/en.ts
+++ b/src/locales/lang/en.ts
@@ -264,6 +264,11 @@ export default {
'duration':'duration',
'IoT_System':'IoT Management System',
'environment_dust':'Environment-Dust Real-time Monitoring System',
- '加载更多':'Load More',
+ '加载更多':'Load More',
+ '已调试':'Debugged',
+ '未调试':'No Debugged',
+ '服务器机房':'server room',
+ '料场':'Raw Material Area',
+ '危废暂存间':'dangerous waste temporary storage room',
}
}
\ No newline at end of file
diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts
index 6b7503e..97ce3da 100644
--- a/src/locales/lang/zh.ts
+++ b/src/locales/lang/zh.ts
@@ -265,5 +265,10 @@ export default {
'IoT_System':'物联管理系统',
'environment_dust':'环境-粉尘 实时监测系统',
'加载更多':'加载更多',
+ '已调试':'已调试',
+ '未调试':'未调试',
+ '服务器机房':'服务器机房',
+ '料场':'料场',
+ '危废暂存间':'危废暂存间',
}
}
\ No newline at end of file
diff --git a/src/store/module/Mechanics.ts b/src/store/module/Mechanics.ts
index 7603ccb..7bb8520 100644
--- a/src/store/module/Mechanics.ts
+++ b/src/store/module/Mechanics.ts
@@ -11,6 +11,11 @@ import { defineStore } from "pinia";
import { Names } from "@/store/storeName";
import { development, production } from "@/utils/devSever";
import { formatter } from "element-plus";
+import { getStoredLanguage, saveStoredLanguage } from "@/utils/languageStorage";
+import zhMessages from "@/locales/lang/zh";
+import enMessages from "@/locales/lang/en";
+let language = getStoredLanguage() || "简体中文";
+let messages = language == "简体中文" ? zhMessages.messages : enMessages.messages;
export const useMechanicsStore = defineStore(Names.Mechanics, {
// 使用方式
// const Index= useIndexStore()
@@ -28,7 +33,7 @@ export const useMechanicsStore = defineStore(Names.Mechanics, {
id: null,
index: 1,
title: "精加",
- titleChild: "机械分厂设备物联图-精加车间",
+ titleChild: messages.DevDiagram_JingJia,
titleI18n:'messages.DevDiagram_JingJia',
type: "精加车间",
num: null,
@@ -41,7 +46,7 @@ export const useMechanicsStore = defineStore(Names.Mechanics, {
id: null,
index: 2,
title: "机加",
- titleChild: "机械分厂设备物联图-机加车间",
+ titleChild: messages.DevDiagram_JiJia,
titleI18n:'messages.DevDiagram_JiJia',
type: "机加车间",
num: null,
@@ -54,7 +59,7 @@ export const useMechanicsStore = defineStore(Names.Mechanics, {
id: null,
index: 3,
title: "大件",
- titleChild: "机械分厂设备物联图-大件车间",
+ titleChild: messages.DevDiagram_DaJian,
titleI18n:'messages.DevDiagram_DaJian',
type: "大件车间",
num: null,
@@ -67,7 +72,7 @@ export const useMechanicsStore = defineStore(Names.Mechanics, {
id: null,
index: 4,
title: "精饰",
- titleChild: "机械分厂设备物联图-精饰车间",
+ titleChild: messages.DevDiagram_JingShi,
titleI18n:'messages.DevDiagram_JingShi',
type: "精饰车间",
num: null,
@@ -80,7 +85,7 @@ export const useMechanicsStore = defineStore(Names.Mechanics, {
id: null,
index: 5,
title: "焊接",
- titleChild: "机械分厂设备物联图-焊接车间",
+ titleChild: messages.DevDiagram_HanJie,
titleI18n:'messages.DevDiagram_HanJie',
type: "焊接车间",
num: null,
diff --git a/src/views/InPlantProducts/child/component/axle.vue b/src/views/InPlantProducts/child/component/axle.vue
index cbbe7d1..efdf41a 100644
--- a/src/views/InPlantProducts/child/component/axle.vue
+++ b/src/views/InPlantProducts/child/component/axle.vue
@@ -14,8 +14,8 @@
- - 已调试
- - 未调试
+ - {{t('messages.已调试')}}
+ - {{t('messages.未调试')}}
diff --git a/src/views/InPlantProducts/child/component/sensor2.vue b/src/views/InPlantProducts/child/component/sensor2.vue
index 8db438c..49e5679 100644
--- a/src/views/InPlantProducts/child/component/sensor2.vue
+++ b/src/views/InPlantProducts/child/component/sensor2.vue
@@ -14,8 +14,8 @@
- - 已调试
- - 未调试
+ - {{t('messages.已调试')}}
+ - {{t('messages.未调试')}}
diff --git a/src/views/Offsite/child/childContent/chart/devImage.vue b/src/views/Offsite/child/childContent/chart/devImage.vue
index 97e96f9..deb163a 100644
--- a/src/views/Offsite/child/childContent/chart/devImage.vue
+++ b/src/views/Offsite/child/childContent/chart/devImage.vue
@@ -30,7 +30,7 @@
}"
:autoplay="{ delay: 3000, disableOnInteraction: false,}"
@progress="onProgress"
- @slidechange="onSlideChange">
+ @slidechange="onSlideChange" style="width: 97%;">
diff --git a/src/views/Offsite/child/childContent/chart/offsitegateway.vue b/src/views/Offsite/child/childContent/chart/offsitegateway.vue
index 912a4d3..b8243c3 100644
--- a/src/views/Offsite/child/childContent/chart/offsitegateway.vue
+++ b/src/views/Offsite/child/childContent/chart/offsitegateway.vue
@@ -11,27 +11,24 @@
-
-
-
{{ props.title }}
+
+
+
+
{{ props.title }}
-
{{t('messages.onLine')}}
-
{{t('messages.offline')}}
-
+
+ {{ t('messages.onLine') }}
+
+ {{ t('messages.offline') }}
+
@@ -46,7 +43,7 @@ import { getCurrentInstance, onMounted, reactive, ref } from "vue";
import { gatewayType } from "@/type/InPlantProducts";
import border6 from "@/components/borderBox/border6.vue";
import { useI18n } from 'vue-i18n'
-let {t} = useI18n();
+let { t } = useI18n();
let props = defineProps<{
title: string;
}>();
@@ -66,7 +63,7 @@ let boxWH = reactive({
});
// let gateway=ref()
// let fontSize=ref()
-onMounted(() => {});
+onMounted(() => { });
function setchartWH(width: any, height: any) {
marginbox.value.style.height = height + "px";
@@ -76,7 +73,7 @@ function setchartWH(width: any, height: any) {
refborder6.value.resetWH();
}
const setData = (value?: any) => {
- data=reactive([...value])
+ data = reactive([...value])
keynum.value++;
// data.value='设备名称'
@@ -91,18 +88,19 @@ defineExpose({
+}
diff --git a/src/views/generalEnvironment/content/right.vue b/src/views/generalEnvironment/content/right.vue
index e3131c0..72afffe 100644
--- a/src/views/generalEnvironment/content/right.vue
+++ b/src/views/generalEnvironment/content/right.vue
@@ -96,7 +96,7 @@ const threebox=(width:any,height:any)=>{
const onebox=(width:any,height:any)=>{
let a=calcWH(height,width,3,1,0)
//修改高度
- Refhumiture.value.setchartWH(a.oWidth,a.oHeight*2-40)
+ Refhumiture.value.setchartWH(a.oWidth,a.oHeight*2-49)
}
watch(
() => store.humiture,
diff --git a/src/views/generalEnvironmentjixiefenchang/content/right.vue b/src/views/generalEnvironmentjixiefenchang/content/right.vue
index 7356d49..eb0a4d5 100644
--- a/src/views/generalEnvironmentjixiefenchang/content/right.vue
+++ b/src/views/generalEnvironmentjixiefenchang/content/right.vue
@@ -96,7 +96,7 @@ const threebox=(width:any,height:any)=>{
const onebox=(width:any,height:any)=>{
let a=calcWH(height,width,3,1,0)
//修改高度
- Refhumiture.value.setchartWH(a.oWidth,a.oHeight*2-40)
+ Refhumiture.value.setchartWH(a.oWidth,a.oHeight*2-49)
}
watch(
() => store.humiture,
diff --git a/src/views/pmData/index.vue b/src/views/pmData/index.vue
index dfad439..be5a365 100644
--- a/src/views/pmData/index.vue
+++ b/src/views/pmData/index.vue
@@ -12,11 +12,11 @@
-
+
@@ -81,6 +81,7 @@ function getWebsocket(val) {
let data = JSON.parse(val);
if (data.type == "dust") {
+ console.log(data.msg, "pm2.5/10");
let index = pmData.findIndex(item => item.title == data.msg.name + "(PM2.5/PM10)")
if (index != -1) {