Merge branch 'paris_france_app' of http://1.95.131.171:3000/zzkj/smart_storage_app into paris_france_app

# Conflicts:
#	common/locales/homePage/ar.js
#	common/locales/homePage/de.js
#	common/locales/homePage/en.js

common/http.api.js

@@ -176,7 +176,9 @@ const install = (Vue, vm) => {
 			getStationListByStatus: (params = {}) =>
 				vm.$u.post(config.adminPath + "/business/station/findListByStationStatus ", params),
 			getStationPostionData: (params = {}) =>
-				vm.$u.post(config.adminPath + "/business/dynamicConfig/pointListData", params)
+				vm.$u.post(config.adminPath + "/business/dynamicConfig/pointListData", params),
+			getStationPostionSn: (params = {}) =>
+				vm.$u.post(config.adminPath + "/business/point/getSN", params)
 		},
 
 		//设备

common/lang.js

@@ -0,0 +1,47 @@
+export const Langlist = [{
+			label: '中文',
+			prop: 'zh',
+			disabled: false,
+			value: 'zh_CN'
+		},
+		{
+			label: 'English',
+			prop: 'en',
+			disabled: false,
+			value: 'en_US'
+		},
+		{
+			label: 'German',
+			prop: 'gr',
+			disabled: false,
+			value: 'de_DE'
+		},
+		{
+			label: 'French',
+			prop: 'fr',
+			disabled: false,
+			value: 'fr_FR'
+		},
+		{
+			label: 'Arabic',
+			prop: 'al',
+			disabled: false,
+			value: 'ar_EG'
+		},
+		{
+			label: 'Spanish',
+			prop: 'es',
+			disabled: false,
+			value: 'es_ES'
+		},
+		{
+			label: 'Polish',
+			prop: 'bl',
+			disabled: false,
+			prop: 'pl_PL'
+		}
+		
+	]
+	
+	
+	

common/locales/homePage/ar.js

@@ -29,6 +29,7 @@ export default {
 	    quit: 'غير موافق',
 	    guestLogin: 'تسجيل دخول الضيف',
 	    checkFirst: 'يرجى أولاً وضع علامة للموافقة على اتفاقية المستخدم وسياسة الخصوصية',
+		emsControl: 'تحكم EMS',
 	    stationType: [
 	      {
 	        name: 'موقع الصين'
@@ -38,21 +39,21 @@ export default {
 	      }
 	    ],
 	    useElecPrice: 'سعر الكهرباء',
-	    workStatus: 'حالة التشغيل: ',
+	    workStatus: 'الحالة:',
 	    standing: 'خامل',
 	    activePowerpcs: 'الطاقة النشطة: ',
-	    operatingPower: 'طاقة التشغيل',
+	    operatingPower: 'قوة',
-	    accumulatedElectricityConsumption: 'الاستهلاك التراكمي للكهرباء',
+	    accumulatedElectricityConsumption: 'الطاقة الإجمالية',
 	    pvKpi: 'KPI للطاقة الكهروضوئية',
 	    saveStandardCoal: 'توفير الفحم القياسي (طن)',
 	    equivalentCo2Reduction: 'انبعاثات CO2 المخفضة (طن)',
 	    equivalentTreePlantings: 'الأشجار المزروعة المكافئة (شجرة)',
 	    dailyPowerGeneration: 'التوليد اليومي',
-	    cumulativePowerGeneration: 'التوليد التراكمي',
+	    cumulativePowerGeneration: 'إجمالي التوليد',
 	    socialContribution: 'المساهمة الاجتماعية',
 	    energyStorageRevenueReport: 'تقرير إيرادات تخزين الطاقة',
 	    pvStorageRevenueReport: 'تقرير إيرادات الألواح الكهروضوئية',
-	    projectMonthlyPower: 'حجم التوليد الشهري للمشروع',
+	    projectMonthlyPower: 'التوليد الشهري',
 	    powerGeneration: 'حجم التوليد',
 	    mpptTopu: 'مخطط طوبولوجيا MPPT',
 	    powerGenerationCapacity: 'طاقة التوليد',
@@ -62,20 +63,20 @@ export default {
 	    busCurrent: 'تيار BAT',
 	    dc: 'تيار التيار المستمر',
 	    dcVoltage: 'جهد التيار المستمر',
-	    operatingPower: 'طاقة التشغيل',
+	    operatingPower: 'قوة',
 	    pvPower: 'الطاقة',
-	    enmonthTotalChargePrice: 'إجمالي المبلغ الإجمالي لإجمالي حجم الشحن الشهري (يوان صيني)',
+	    enmonthTotalChargePrice: 'تكلفة الشحن الشهرية',
-	    enmonthTotalDisChargePrice: 'إجمالي المبلغ الإجمالي لحجم التفريغ الشهري (يوان صيني)',
+	    enmonthTotalDisChargePrice: 'إيراد التفريغ الشهري',
 	    enearnings: 'الإيرادات (يوان صيني)',
 	    pvSwitch: 'مفتاح PV',
 		stationDatacom: 'بيانات محطة توليد الكهرباء',
-		sevenDaycom:'أسابيع',
+		sevenDaycom:'أسبوع',
-		todayEarning: 'مكاسب اليوم ( EGP )',
+		todayEarning: 'مكاسب اليوم (EGP)',
 		totalRevenue: 'الدخل التراكمي(EGP)',
 		ratedPower: 'تصنيف السلطة(kW)',
-		currentMonthlyPowerGeneration: 'توليد الطاقة في هذا الشهر',
+		currentMonthlyPowerGeneration: 'التوليد الشهري',
 		ratedPowernokw: 'تصنيف السلطة',
-		powerGenerationStatus: 'مشروع توليد الطاقة',
+		powerGenerationStatus: 'نظرة عامة على التوليد',
 		monthlyIncome: 'دخل الشهر(EGP)',
 		lowV:'الجهد المنخفض الجانب',
 		lowI:'الجانب المنخفض الحالي',
@@ -129,7 +130,7 @@ export default {
 		standby: 'الاستعداد',
 		run: 'التشغيل',
 		allActivePower: 'إجمالي الطاقة النشطة (كيلوواط): ',
-		cabinet: 'خزانة تخزين الطاقة',
+		cabinet: 'خزانة',
 		gridMeter: 'عداد جانب الشبكة',
 		photovoltaic: 'الطاقة الكهروضوئية',
 		battery: 'البطارية',
@@ -143,27 +144,27 @@ export default {
 		policy: 'استراتيجية',
 		stationTopo: 'توبولوجيا محطة الطاقة',
 		deviceMonitor: 'مراقبة المعدات',
-		runCurve: 'منحنيات التشغيل',
+		runCurve: 'منحنى التشغيل',
 		chargeDisData: 'بيانات الشحن والتفريغ',
 		stationData: 'بيانات محطة الطاقة',
 		environmentalData: 'بيانات التحكم البيئي',
-		sevenDay: 'آخر سبعة أيام',
+		sevenDay: 'أسبوع',
-		monthDay: 'آخر شهر',
+		monthDay: 'شهر',
 		monthThree: 'آخر ثلاثة أشهر',
-		yearDay: 'العام الماضي',
+		yearDay: 'سنة',
 		tip: 'تنبيه',
 		loading: 'تحميل الموارد...',
 		power: 'الطاقة (كيلوواط)',
-		photovoltaicCharge: 'الشحن الكهروضوئي',
+		photovoltaicCharge: 'شحن شمسي',
-		chargingandDischarging: 'حجم الشحن والتفريغ',
+		chargingandDischarging: 'شحن وتفريغ',
-		safeDaysUnit: 'أيام التشغيل الآمن (أيام)',
+		safeDaysUnit: 'أيام التشغيل الآمن',
-		totalCapacity: 'إجمالي السعة المركبة',
+		totalCapacity: 'السعة الإجمالية',
 		systemConversionEfficiency: 'كفاءة تحويل النظام',
 		currentPower: 'الطاقة الحالية',
-		totalCharge: 'إجمالي حجم الشحن',
+		totalCharge: 'إجمالي الشحن',
-		totalDischarge: 'إجمالي حجم التفريغ',
+		totalDischarge: 'إجمالي التفريغ',
-		dailyCharge: 'حجم الشحن اليومي',
+		dailyCharge: 'الشحن اليومي',
-		dailyDischarge: 'حجم التفريغ اليومي',
+		dailyDischarge: 'التفريغ اليومي',
 		dayPhotovoltaic: 'حجم التوليد الكهروضوئي',
 		noData: 'لا توجد بيانات متاحة',
 		station: 'محطة طاقة',
@@ -270,6 +271,7 @@ export default {
 	    cancel: 'الغاء',
 	    messageDetail: 'تفاصيل الرسالة',
 	    operateSuccess: 'نجح العملية',
+	    operateFail: 'فشل العملية',
 	    messageReaded: 'تمت قراءة هذه الرسالة، لا داعي لتكرار الإجراء'
 	},
 	device: {
@@ -294,10 +296,10 @@ export default {
 	    DCVol: 'جهد التيار المستمر',
 	    DCCurrent: 'تيار التيار المستمر',
 	    acbreaker: 'قطع زرارة التيار المتردد',
-	    dcbreaker: 'قطع زرارة التيار المستمر',
+	    dcbreakerCom: 'قطع زرارة التيار المستمر',
 	    runState: 'حالة التشغيل',
 	    rsState: 'حالة التوصيل عن بعد أو بالقرب من الشبكة',
-	    gridMode: 'حالة التوصيل والانفصال عن الشبكة',
+	    gridModeCom: 'حالة الشبكة',
 	    deviceState: 'حالة الجهاز',
 	    totalActivePower: 'إجمالي الطاقة النشطة',
 	    totalReactivePower: 'إجمالي الطاقة التفاعلية',
@@ -351,8 +353,8 @@ export default {
 	    },
 	    clusterTotalVol: 'مستوى الجهد الكلي للبطارية / SOC',
 	    runData: 'بيانات التشغيل',
-	    cumCharge: 'الشحن التراكمي',
+	    cumCharge: 'إجمالي الشحن',
-	    cumDischarge: 'التفريغ التراكمي',
+	    cumDischarge: 'إجمالي التفريغ',
 	    avgTem: 'متوسط درجة الحرارة',
 	    avgVol: 'متوسط الجهد',
 	    maxCellVol: 'الجهد الأقصى للخلية',
@@ -371,10 +373,10 @@ export default {
 	    bvol: 'جهد فاز B',
 	    cvol: 'جهد فاز C',
 	    zxygzdl: 'إجمالي الطاقة النشطة الأمامية',
-	    dlj: 'الطاقة (ذروة)',
+	    dlj: 'ذروة حرجة',
-	    dlf: 'الطاقة (قمة)',
+	    dlf: 'ذروة',
-	    dlp: 'الطاقة (عادية)',
+	    dlp: 'مستوى متوسط',
-	    dlg: 'الطاقة (وادي)',
+	    dlg: 'خارج الذروة',
 	    fxygzdl: 'إجمالي الطاقة النشطة العكسية',
 	    hxyggl: 'الطاقة النشطة للطور المركب',
 	    hxwggl: 'الطاقة التفاعلية للطور المركب',
@@ -427,7 +429,7 @@ export default {
 	    stackTotalCurrent: 'تيار التجميع الكلي',
 	    stackSoc: 'SOC للتجميع',
 	    CumulativeCharge: 'الشحن التراكمي',
-	    CumulativeDischarge: 'التفريغ التراكمي',
+	    CumulativeDischarge: 'إجمالي التفريغ',
 	    zdz: 'مقاومة العزل الموجبة',
 	    fdz: 'مقاومة العزل السالبة',
 	    rechargeCapacity: 'الطاقة الممكنة للشحن',
@@ -441,17 +443,17 @@ export default {
 	    historyData: 'البيانات التاريخية'
 	},
 	earning: {
-	    changeDischargePro: 'نظرة عامة على شحن وتفريغ المشروع',
+	    changeDischargePro: 'نظرة عامة للشحن والتفريغ',
-	    capacity: 'السعة المركبة',
+	    capacity: 'السعة',
-	    monthTotalCharge: 'إجمالي طاقة الشحن لهذا الشهر',
+	    monthTotalCharge: 'الشحن الشهري',
-	    monthTotalDischarge: 'إجمالي طاقة التفريغ لهذا الشهر',
+	    monthTotalDischarge: 'التفريغ الشهري',
-	    monthEff: 'كفاءة تحويل النظام الشهرية',
+	    monthEff: 'كفاءة النظام الشهرية',
-	    chargeVol: 'الشحن التراكمي',
+	    chargeVol: 'إجمالي الشحن',
-	    dischargeVol: 'التفريغ التراكمي',
+	    dischargeVol: 'إجمالي التفريغ',
-	    totalEff: 'كفاءة تحويل النظام التراكمية',
+	    totalEff: 'الكفاءة الإجمالية للنظام',
 	    projectRevenue: 'حالة إيرادات المشروع',
-	    monthTotalChargePrice: 'إجمالي المبلغ لإجمالي حجم الشحن الشهري (يوان صيني)',
+	    monthTotalChargePrice: 'تكلفة الشحن الشهرية',
-	    monthTotalDisChargePrice: 'إجمالي المبلغ لإجمالي حجم التفريغ الشهري (يوان صيني)',
+	    monthTotalDisChargePrice: 'إيراد التفريغ الشهري',
 	    earnings: 'الإيرادات (يوان صيني)',
 	    earningsDetail: 'تفاصيل الإيرادات',
 	    charge: 'الشحن',
@@ -468,15 +470,15 @@ export default {
 	    second: 'ثانية'
 	},
 	policy: {
-	    planCurve: 'منحنى الجدول الزمني',
+		planCurve: 'منحنى الجدول الزمني',
-	    planCurveTem: 'قالب منحنى الجدول الزمني',
+	    planCurveTem: 'قالب الجدول',
-	    IssueDevice: 'جهاز إصدار الأوامر',
+	    IssueDevice: 'الجهاز المستهدف',
-	    operateOrNot: 'سواء في التشغيل',
+	    operateOrNot: 'قيد التشغيل',
-	    socUplimit: 'الحد الأعلى لـ SOC',
+	    socUplimit: 'الحد الأعلى SOC',
-	    socDownlimit: 'الحد الأدنى لـ SOC',
+	    socDownlimit: 'الحد الأدنى SOC',
-	    effectiveTime: 'وقت السريان',
+	    effectiveTime: 'وقت البدء',
-	    selectEffectiveTime: 'يرجى تحديد وقت السريان',
+	    selectEffectiveTime: 'اختر الوقت',
-	    distributeResult: 'نتيجة الإصدار',
+	    distributeResult: 'نتيجة الأمر',
 	    notDelivered: 'لم يتم الإصدار',
 	    commandDistribution: 'إصدار الأوامر',
 	    controlDistribution: 'إصدار التحكم',
@@ -495,15 +497,15 @@ export default {
 	    ],
 	    radioList: [
 	      {
-	        name: 'تشغيل',
+	        name: 'نعم',
 	        disabled: false
 	      },
 	      {
-	        name: 'عدم تشغيل',
+	        name: 'لا',
 	        disabled: false
 	      }
 	    ],
-	    selectIssueDevice: 'يرجى تحديد جهاز إصدار الأوامر',
+	    selectIssueDevice: 'اختر الجهاز',
 	    deliverErrorNewTip: 'خطأ في تكوين التعيين أو لم يتم التكوين، يرجى التحقق وإعادة المحاولة!',
 	    passwordSuccess: 'كلمة المرور صحيحة',
 	    passwordError: 'كلمة المرور غير صحيحة',
@@ -515,9 +517,10 @@ export default {
 	    saveSuccess: 'نجح الحفظ',
 	    saveError: 'فشل الحفظ',
 	    delivered: 'اكتمل الإصدار',
-	    selectPlanCurveTem: 'يرجى تحديد قالب منحنى الجدول الزمني',
+	    selectPlanCurveTem: 'اختر قالب الجدول',
 	    deliverErrorTip: 'تجاوز طاقة الشحن والتفريغ الطاقة المقدرة، يرجى التحقق من إعدادات منحنى الجدول الزمني!',
 	    deliverTip: 'سواء تأكيد إصدار الأمر?'
+		policyTitle: 'إصدار الاستراتيجية'
 	}
 
 }

common/locales/homePage/de.js

@@ -9,6 +9,7 @@ export default {
 	    loadAmmeter: 'Lastzähler',
 	    dieselGeneratorMeter: 'Dieselerzeugungszähler',
 	    energyStorageMeter: 'Energiespeicherzähler',
+		emsControl: 'EMS-Kontrolle',
 	    alarmTypeList: [
 	      {
 	        name: 'Echtzeit-Alarm'
@@ -38,21 +39,21 @@ export default {
 	      }
 	    ],
 	    useElecPrice: 'Strompreis',
-	    workStatus: 'Betriebsstatus: ',
+	    workStatus: 'Status: ',
 	    standing: 'Ruhezustand',
 	    activePowerpcs: 'Wirkleistung: ',
-	    operatingPower: 'Betriebsleistung',
+	    operatingPower: 'Leistung',
-	    accumulatedElectricityConsumption: 'Kumulierte Strommenge',
+	    accumulatedElectricityConsumption: 'Gesamtenergie',
 	    pvKpi: 'Photovoltaik-KPI',
 	    saveStandardCoal: 'Eingesparte Standardkohle (Tonnen)',
 	    equivalentCo2Reduction: 'CO₂-Reduktion (Tonnen)',
 	    equivalentTreePlantings: 'Equivalent gepflanzt Bäume (Stück)',
 	    dailyPowerGeneration: 'Täglicher Stromertrag',
-	    cumulativePowerGeneration: 'Kumulierter Stromertrag',
+	    cumulativePowerGeneration: 'Gesamterzeugung',
 	    socialContribution: 'Gesellschaftlicher Beitrag',
 	    energyStorageRevenueReport: 'Energiespeicher-Ertragsbericht',
 	    pvStorageRevenueReport: 'Photovoltaik-Ertragsbericht',
-	    projectMonthlyPower: 'Monatlicher Stromertrag des Projekts',
+	    projectMonthlyPower: 'Monatserzeugung',
 	    powerGeneration: 'Stromertrag',
 	    mpptTopu: 'MPPT-Topologiediagramm',
 	    powerGenerationCapacity: 'Erzeugungsleistung',
@@ -62,10 +63,10 @@ export default {
 	    busCurrent: 'BAT-Strom',
 	    dc: 'Gleichstrom',
 	    dcVoltage: 'Gleichspannung',
-	    operatingPower: 'Betriebsleistung',
+	    operatingPower: 'Leistung',
 	    pvPower: 'Leistung',
-	    enmonthTotalChargePrice: 'Gesamtwert der monatlichen Ladungsmenge (EUR)',
+	    enmonthTotalChargePrice: 'Monatliche Ladekosten(EUR)',
-	    enmonthTotalDisChargePrice: 'Gesamtwert der monatlichen Entladungsmenge (EUR)',
+	    enmonthTotalDisChargePrice: 'Monatliche Entladeerlöse(EUR)',
 	    enearnings: 'Ertrag (EUR)',
 	    pvSwitch: 'PV-Schalter',
 	    stationDatacom: 'Kraftwerksdaten',
@@ -73,36 +74,36 @@ export default {
 	    todayEarning: 'Heutiger Gewinn (EUR)',
 	    totalRevenue: 'Gesamtgewinn (EUR)',
 	    ratedPower: 'Nennleistung (kW)',
-	    currentMonthlyPowerGeneration: 'Stromerzeugung in diesem Monat',
+	    currentMonthlyPowerGeneration: 'Monatserzeugung',
 	    ratedPowernokw: 'Nennleistung',
-	    powerGenerationStatus: 'Projekterzeugung',
+	    powerGenerationStatus: 'Erzeugungsübersicht',
 	    monthlyIncome: 'Gewinn in diesem Monat (EUR)',
 	    lowV: 'Niederspannung Seitenspannung',
 	    lowI: 'Niederspannungs-Seitenstrom',
 	    highV: 'Hochspannung Seitenspannung',
 	    timesArr: [
 	      {
-	        text: '1 Minute',
+	        text: '1 min',
 	        value: 1
 	      },
 	      {
-	        text: '5 Minuten',
+	        text: '5 min',
 	        value: 5
 	      },
 	      {
-	        text: '10 Minuten',
+	        text: '10 min',
 	        value: 10
 	      },
 	      {
-	        text: '15 Minuten',
+	        text: '15 min',
 	        value: 15
 	      },
 	      {
-	        text: '20 Minuten',
+	        text: '20 min',
 	        value: 20
 	      },
 	      {
-	        text: '30 Minuten',
+	        text: '30 min',
 	        value: 30
 	      }
 	    ],
@@ -130,7 +131,7 @@ export default {
 		standby: 'Standby',
 		run: 'Betrieb',
 		allActivePower: 'Gesamtwirkleistung (kW):',
-		cabinet: 'Energiespeicherschrank',
+		cabinet: 'Schrank',
 		gridMeter: 'Netzseitiger Zähler',
 		photovoltaic: 'Photovoltaik',
 		battery: 'Batterie',
@@ -144,27 +145,27 @@ export default {
 		policy: 'Strategie',
 		stationTopo: 'Kraftwerkstopologie',
 		deviceMonitor: 'Geräteüberwachung',
-		runCurve: 'Betriebskurve',
+		runCurve: 'Laufkurve',
 		chargeDisData: 'Lade- und Entladedaten',
 		stationData: 'Kraftwerksdaten',
 		environmentalData: 'Umgebungskontrollsl Daten',
-		sevenDay: 'Letzte 7 Tage',
+		sevenDay: 'Woche',
-		monthDay: 'Letzter Monat',
+		monthDay: 'Monat',
 		monthThree: 'Letzte 3 Monate',
-		yearDay: 'Letztes Jahr',
+		yearDay: 'Jahr',
 		tip: 'Hinweis',
 		loading: 'Ressourcen werden geladen...',
 		power: 'Leistung (kW)',
-		photovoltaicCharge: 'Photovoltaik-Ladung',
+		photovoltaicCharge: 'PV-Ladung',
-		chargingandDischarging: 'Lade- und Entlademenge',
+		chargingandDischarging: 'Laden/Entladen',
-		safeDaysUnit: 'Tage des sicheren Betriebs (Tage)',
+		safeDaysUnit: 'Sichere Tage(Tage)',
-		totalCapacity: 'Installierte Gesamtkapazität',
+		totalCapacity: 'Gesamtkapazität',
 		systemConversionEfficiency: 'Systemumwandlungseffizienz',
 		currentPower: 'Aktuelle Leistung',
-		totalCharge: 'Gesamtladungsmenge',
+		totalCharge: 'Gesamtladung',
-		totalDischarge: 'Gesamtentladungsmenge',
+		totalDischarge: 'Gesamtentladung',
-		dailyCharge: 'Tägliche Ladungsmenge',
+		dailyCharge: 'Tagesladung',
-		dailyDischarge: 'Tägliche Entladungsmenge',
+		dailyDischarge: 'Tagesentladung',
 		dayPhotovoltaic: 'Photovoltaik-Stromerzeugung',
 		noData: 'Keine Daten verfügbar',
 		station: 'Kraftwerk',
@@ -271,6 +272,7 @@ export default {
 	    cancel: 'Abbrechen',
 	    messageDetail: 'Nachrichtendetails',
 	    operateSuccess: 'Aktion erfolgreich',
+	    operateFail: 'Aktion fehlgeschlagen',
 	    messageReaded: 'Diese Nachricht wurde bereits gelesen, keine Wiederholung der Aktion erforderlich'
 	},
 	device: {
@@ -295,10 +297,10 @@ export default {
 	    DCVol: 'Gleichspannung',
 	    DCCurrent: 'Gleichstrom',
 	    acbreaker: 'Wechselstromschalter',
-	    dcbreaker: 'Gleichstromschalter',
+	    dcbreakerCom: 'Gleichstromschalter',
 	    runState: 'Betriebsstatus',
 	    rsState: 'Fern-/Vor-Ort-Status',
-	    gridMode: 'Netzparallel-/Inselbetriebsstatus',
+	    gridModeCom: 'Netzstatus',
 	    deviceState: 'Gerätestatus',
 	    totalActivePower: 'Gesamtwirkleistung',
 	    totalReactivePower: 'Gesamtblindleistung',
@@ -317,27 +319,27 @@ export default {
 	    localManual: 'Lokal manuell',
 	    timesArr: [
 	      {
-	        label: '1 Minute',
+	        label: '1 min',
 	        value: 1
 	      },
 	      {
-	        label: '5 Minuten',
+	        label: '5 min',
 	        value: 5
 	      },
 	      {
-	        label: '10 Minuten',
+	        label: '10 min',
 	        value: 10
 	      },
 	      {
-	        label: '15 Minuten',
+	        label: '15 min',
 	        value: 15
 	      },
 	      {
-	        label: '20 Minuten',
+	        label: '20 min',
 	        value: 20
 	      },
 	      {
-	        label: '30 Minuten',
+	        label: '30 min',
 	        value: 30
 	      }
 	    ],
@@ -352,8 +354,8 @@ export default {
 	    },
 	    clusterTotalVol: 'Bundesamtsspannung/SOC',
 	    runData: 'Betriebsdaten',
-	    cumCharge: 'Kumulierte Ladungsmenge',
+	    cumCharge: 'Gesamtladung',
-	    cumDischarge: 'Kumulierte Entladungsmenge',
+	    cumDischarge: 'Gesamtentladung',
 	    avgTem: 'Durchschnittstemperatur',
 	    avgVol: 'Durchschnittsspannung',
 	    maxCellVol: 'Maximale Einzelzellenspannung',
@@ -372,10 +374,10 @@ export default {
 	    bvol: 'B-Phasenspannung',
 	    cvol: 'C-Phasenspannung',
 	    zxygzdl: 'Vorwärts-Wirkgesamtenergie',
-	    dlj: 'Energie (Spitzenspitze)',
+	    dlj: 'Spitzenlast',
-	    dlf: 'Energie (Spitze)',
+	    dlf: 'Spitze',
-	    dlp: 'Energie (Normal)',
+	    dlp: 'Mittel',
-	    dlg: 'Energie (Talast)',
+	    dlg: 'Niedrig',
 	    fxygzdl: 'Rückwärts-Wirkgesamtenergie',
 	    hxyggl: 'Gesamtwirkleistung',
 	    hxwggl: 'Gesamtblindleistung',
@@ -428,7 +430,7 @@ export default {
 	    stackTotalCurrent: 'Stapelgesamtstrom',
 	    stackSoc: 'Stapel-SOC',
 	    CumulativeCharge: 'Kumulierte Ladungsmenge',
-	    CumulativeDischarge: 'Kumulierte Entladungsmenge',
+	    CumulativeDischarge: 'Gesamtentladung',
 	    zdz: 'Isolationspositivwiderstand',
 	    fdz: 'Isolationsnegativwiderstand',
 	    rechargeCapacity: 'Ladelfähige Menge',
@@ -442,17 +444,17 @@ export default {
 	    historyData: 'Verlaufsdaten'
 	},
 	earning: {
-	    changeDischargePro: 'Projekt-Lade- und Entladeübersicht',
+	    changeDischargePro: 'Lade/Entlade Übersicht',
-	    capacity: 'Installierte Kapazität',
+	    capacity: 'Kapazität',
-	    monthTotalCharge: 'Monatliche Gesamtladungsmenge',
+	    monthTotalCharge: 'Monatsladung',
-	    monthTotalDischarge: 'Monatliche Gesamtentladungsmenge',
+	    monthTotalDischarge: 'Monatsentladung',
-	    monthEff: 'Monatliche Systemumwandlungseffizienz',
+	    monthEff: 'Monatseffizienz',
-	    chargeVol: 'Kumulierte Ladungsmenge',
+	    chargeVol: 'Gesamtladung',
-	    dischargeVol: 'Kumulierte Entladungsmenge',
+	    dischargeVol: 'Gesamtentladung',
-	    totalEff: 'Kumulierte Systemumwandlungseffizienz',
+	    totalEff: 'Gesamteffizienz',
 	    projectRevenue: 'Projektertragssituation',
-	    monthTotalChargePrice: 'Gesamtwert der monatlichen Ladungsmenge (EUR)',
+	    monthTotalChargePrice: 'Monatliche Ladekosten(EUR)',
-	    monthTotalDisChargePrice: 'Gesamtwert der monatlichen Entladungsmenge (EUR)',
+	    monthTotalDisChargePrice: 'Monatliche Entladeerlöse(EUR)',
 	    earnings: 'Ertrag (EUR)',
 	    earningsDetail: 'Ertragsdetails',
 	    charge: 'Laden',
@@ -506,14 +508,14 @@ export default {
 	},
 	policy: {
 	    planCurve: 'Plan-Kurve',
-	    planCurveTem: 'Plan-Kurvenvorlage',
+	    planCurveTem: 'Planvorlage',
-	    IssueDevice: 'Befehlszielgerät',
+	    IssueDevice: 'Zielgerät',
 	    operateOrNot: 'In Betrieb',
-	    socUplimit: 'SOC-Obergrenze',
+	    socUplimit: 'SOC Obergrenze',
-	    socDownlimit: 'SOC-Untergrenze',
+	    socDownlimit: 'SOC Untergrenze',
-	    effectiveTime: 'Gültigkeitszeit',
+	    effectiveTime: 'Startzeit',
-	    selectEffectiveTime: 'Bitte wählen Sie die Gültigkeitszeit',
+	    selectEffectiveTime: 'Zeit wählen',
-	    distributeResult: 'Übertragungsergebnis',
+	    distributeResult: 'Befehlsergebnis',
 	    notDelivered: 'Nicht übertragen',
 	    commandDistribution: 'Befehlssendung',
 	    controlDistribution: 'Steuerungssendung',
@@ -532,15 +534,15 @@ export default {
 	    ],
 	    radioList: [
 	      {
-	        name: 'In Betrieb',
+	        name: 'Ja',
 	        disabled: false
 	      },
 	      {
-	        name: 'Außer Betrieb',
+	        name: 'Nein',
 	        disabled: false
 	      }
 	    ],
-	    selectIssueDevice: 'Bitte wählen Sie das Befehlssendegerät',
+	    selectIssueDevice: 'Gerät wählen',
 	    deliverErrorNewTip: 'Zuordnungskonfiguration fehlerhaft oder nicht konfiguriert, bitte überprüfen und erneut versuchen!',
 	    passwordSuccess: 'Passwort korrekt',
 	    passwordError: 'Passwort falsch',
@@ -552,8 +554,9 @@ export default {
 	    saveSuccess: 'Speichern erfolgreich',
 	    saveError: 'Speichern fehlgeschlagen',
 	    delivered: 'Bereits gesendet',
-	    selectPlanCurveTem: 'Bitte wählen Sie eine Plan-Kurvenvorlage',
+	    selectPlanCurveTem: 'Planvorlage wählen',
 	    deliverErrorTip: 'Lade-/Entladeleistung größer als Nennleistung, bitte überprüfen Sie die Plan-Kurven-Einstellungen!',
 	    deliverTip: 'Befehlssendung wirklich bestätigen?'
+		policyTitle: 'Strategieübertragung'
 	}
 };

common/locales/homePage/en.js

@@ -9,6 +9,7 @@ export default {
 		loadAmmeter: 'Load electric meter',
 		dieselGeneratorMeter: 'Diesel generator electric meter',
 		energyStorageMeter: 'Energy storage electric meter',
+		emsControl: 'EMS Control',
 		alarmTypeList: [{
 		  name: 'Real-time alarms'
 		}, {
@@ -32,21 +33,21 @@ export default {
 		  name: 'Overseas site'
 		}],
 		useElecPrice: 'Electricity price',
-		workStatus: 'Operating status:',
+		workStatus: 'Status:',
 		standing: 'Standby',
 		activePowerpcs: 'Active power:',
-		operatingPower: 'Operating power',
+		operatingPower: 'Power',
-		accumulatedElectricityConsumption: 'Cumulative electricity',
+		accumulatedElectricityConsumption: 'Total Energy',
 		pvKpi: 'PV KPI',
 		saveStandardCoal: 'Standard coal saved (ton)',
 		equivalentCo2Reduction: 'CO2 emission reduction (ton)',
 		equivalentTreePlantings: 'Equivalent trees planted (tree)',
 		dailyPowerGeneration: 'Daily power generation',
-		cumulativePowerGeneration: 'Cumulative power generation',
+		cumulativePowerGeneration: 'Total Generation',
 		socialContribution: 'Social contribution',
 		energyStorageRevenueReport: 'Energy storage revenue report',
 		pvStorageRevenueReport: 'PV revenue report',
-		projectMonthlyPower: 'Monthly project power generation',
+		projectMonthlyPower: 'Monthly Generation',
 		powerGeneration: 'Power generation',
 		mpptTopu: 'MPPT Topology Diagram',
 		powerGenerationCapacity: 'Generation power',
@@ -57,8 +58,8 @@ export default {
 		dc: 'DC current',
 		dcVoltage: 'DC voltage',
 		pvPower: 'Power',
-		enmonthTotalChargePrice: 'Total charging capacity & price this month (EUR)',
+		enmonthTotalChargePrice: 'Monthly Charge Cost(EUR)',
-		enmonthTotalDisChargePrice: 'Total discharging capacity & price this month',
+		enmonthTotalDisChargePrice: 'Monthly Discharge Revenue(EUR)',
 		enearnings: 'Revenue (EUR)',
 		pvSwitch: 'PV switch',
 		stationDatacom: 'Station Data',
@@ -66,30 +67,30 @@ export default {
 		todayEarning: 'Today Earning(EUR)',
 		totalRevenue: 'Cumulative Earnings(EUR)',
 		ratedPower: 'Rated Power(kW)',
-		currentMonthlyPowerGeneration: 'Current monthly power generation',
+		currentMonthlyPowerGeneration: 'Monthly Generation',
 		ratedPowernokw: 'Rated Power',
-		powerGenerationStatus: 'power Generation Status',
+		powerGenerationStatus: 'Generation Overview',
 		monthlyIncome: 'Monthly income(EUR)',
 		lowV: 'low-side voltage',
 		lowI: 'low-side current',
 		highV: 'high-side voltage',
 		timesArr: [{
-			text: '1 minute',
+			text: '1 min',
 			value: 1
 		}, {
-			text: '5 minutes',
+			text: '5 min',
 			value: 5
 		}, {
-			text: '10 minutes',
+			text: '10 min',
 			value: 10
 		}, {
-			text: '15 minutes',
+			text: '15 min',
 			value: 15
 		}, {
-			text: '20 minutes',
+			text: '20 min',
 			value: 20
 		}, {
-			text: '30 minutes',
+			text: '30 min',
 			value: 30
 		}],
 		esiCab: 'Integrated energy storage cabinet',
@@ -116,7 +117,7 @@ export default {
 		standby: 'Standby',
 		run: 'Running',
 		allActivePower: 'Total active power (kW):',
-		cabinet: 'Energy storage cabinet',
+		cabinet: 'Canibet',
 		gridMeter: 'Grid-side electric meter',
 		photovoltaic: 'Photovoltaic (PV)',
 		battery: 'Battery',
@@ -130,27 +131,27 @@ export default {
 		policy: 'Strategy',
 		stationTopo: 'Power station topology',
 		deviceMonitor: 'Equipment monitoring',
-		runCurve: 'Operation curve',
+		runCurve: 'Run Time Curve',
 		chargeDisData: 'Charging/Discharging data',
 		stationData: 'Power station data',
 		environmentalData: 'Environmental control data',
-		sevenDay: 'Last 7 days',
+		sevenDay: 'Week',
-		monthDay: 'Last month',
+		monthDay: 'Month',
 		monthThree: 'Last 3 months',
-		yearDay: 'Last year',
+		yearDay: 'Year',
 		tip: 'Prompt',
 		loading: 'Resource loading...',
 		power: 'Power (kW)',
 		photovoltaicCharge: 'PV charging',
-		chargingandDischarging: 'Charging/Discharging capacity',
+		chargingandDischarging: 'Charge/Discharge Energy',
-		safeDaysUnit: 'Safe operation days',
+		safeDaysUnit: 'Safe Days',
-		totalCapacity: 'Total installed capacity',
+		totalCapacity: 'Total capacity',
 		systemConversionEfficiency: 'System conversion efficiency',
 		currentPower: 'Current power',
-		totalCharge: 'Total charging capacity',
+		totalCharge: 'Total Charge',
-		totalDischarge: 'Total discharging capacity',
+		totalDischarge: 'Total Discharge',
-		dailyCharge: 'Daily charging capacity',
+		dailyCharge: 'Daily Charge',
-		dailyDischarge: 'Daily discharging capacity',
+		dailyDischarge: 'Daily Discharge',
 		dayPhotovoltaic: 'PV power generation',
 		noData: 'No data available',
 		station: 'Power station',
@@ -182,7 +183,7 @@ export default {
 	    eleLevel: 'Electricity price level',
 	    fsdd: 'Time-of-use electricity price',
 	    useElecPrice: 'Electricity price',
-	    dietailUnit: '(RMB/kWh)',
+	    dietailUnit: '(EUR/kWh)',
 	    eleprice: 'Electricity energy price',
 	    nonTime: 'Non-time-of-use electricity price',
 	    proxyPrice: 'Agent purchasing electricity price',
@@ -256,6 +257,7 @@ export default {
 	    sureRead: 'Confirm as read',
 	    cancel: 'Cancel',
 	    operateSuccess: 'Operation successful',
+	    operateFail: 'Operation failed',
 	    messageReaded: 'This message has been read. No need to repeat the'
 	},
 	device: {
@@ -280,10 +282,10 @@ export default {
 	    DCVol: 'DC voltage',
 	    DCCurrent: 'DC current',
 	    acbreaker: 'AC circuit breaker',
-	    dcbreaker: 'DC circuit breaker',
+	    dcbreakerCom: 'DC circuit breaker',
 	    runState: 'Operating status',
 	    rsState: 'Remote/Local status',
-	    gridMode: 'Grid-connected/Off-grid status',
+	    gridModeCom: 'Grid Status',
 	    deviceState: 'Equipment status',
 	    totalActivePower: 'Total active power',
 	    totalReactivePower: 'Total reactive power',
@@ -301,22 +303,22 @@ export default {
 	    localAutomatic: 'Local auto',
 	    localManual: 'Local manual',
 	    timesArr: [{
-	      label: '1 Minute',
+	      label: '1 Min',
 	      value: 1
 	    }, {
-	      label: '5 Minutes',
+	      label: '5 Min',
 	      value: 5
 	    }, {
-	      label: '10 Minutes',
+	      label: '10 Min',
 	      value: 10
 	    }, {
-	      label: '15 Minutes',
+	      label: '15 Min',
 	      value: 15
 	    }, {
-	      label: '20 Minutes',
+	      label: '20 Min',
 	      value: 20
 	    }, {
-	      label: '30 Minutes',
+	      label: '30 Min',
 	      value: 30
 	    }],
 	    yx: 'Telesignaling',
@@ -330,8 +332,8 @@ export default {
 	    },
 	    clusterTotalVol: 'Total cluster voltage/SOC',
 	    runData: 'Operation data',
-	    cumCharge: 'Cumulative charging capacity',
+	    cumCharge: 'Total Charge',
-	    cumDischarge: 'Cumulative discharging capacity',
+	    cumDischarge: 'Total Discharge',
 	    avgTem: 'Average temperature',
 	    avgVol: 'Average voltage',
 	    maxCellVol: 'Max. cell voltage',
@@ -350,10 +352,10 @@ export default {
 	    bvol: 'Phase B voltage',
 	    cvol: 'Phase C voltage',
 	    zxygzdl: 'Total forward active electricity',
-	    dlj: 'Electricity (sharp)',
+	    dlj: 'Critical Peak',
-	    dlf: 'Electricity (peak)',
+	    dlf: 'Peak',
-	    dlp: 'Electricity (shoulder)',
+	    dlp: 'Shoulder',
-	    dlg: 'Electricity (valley)',
+	    dlg: 'Off-peak',
 	    fxygzdl: 'Total reverse active electricity',
 	    hxyggl: 'Combined phase active power',
 	    hxwggl: 'Combined phase reactive power',
@@ -404,7 +406,7 @@ export default {
 	    stackTotalCurrent: 'Total stack current',
 	    stackSoc: 'Stack SOC',
 	    CumulativeCharge: 'Cumulative charging capacity',
-	    CumulativeDischarge: 'Cumulative discharging capacity',
+	    CumulativeDischarge: 'Total Discharge',
 	    zdz: 'Positive insulation resistance',
 	    fdz: 'Negative insulation resistance',
 	    rechargeCapacity: 'Chargeable capacity',
@@ -418,22 +420,22 @@ export default {
 	    historyData: 'Historical data'
 	},
 	earning: {
-	    changeDischargePro: 'Project charging/discharging overview',
+	    changeDischargePro: 'Charge/Discharge Overview',
-	    capacity: 'Installed capacity',
+	    capacity: 'Capacity',
-	    monthTotalCharge: 'Total charging capacity this month',
+	    monthTotalCharge: 'Monthly Charge',
-	    monthTotalDischarge: 'Total discharging capacity this month',
+	    monthTotalDischarge: 'Monthly Discharge',
-	    monthEff: 'Monthly system conversion efficiency',
+	    monthEff: 'Monthly Efficiency',
-	    chargeVol: 'Cumulative charging capacity',
+	    chargeVol: 'Total Charge',
-	    dischargeVol: 'Cumulative discharging capacity',
+	    dischargeVol: 'Total Discharge',
-	    totalEff: 'Cumulative system conversion efficiency',
+	    totalEff: 'Total System Efficiency',
 	    projectRevenue: 'Project revenue status',
-	    monthTotalChargePrice: 'Total charging capacity & price this month (RMB)',
+	    monthTotalChargePrice: 'Monthly Charge Cost(EUR)',
-	    monthTotalDisChargePrice: 'Total discharging capacity & price this month',
+	    monthTotalDisChargePrice: 'Monthly Discharge Revenue(EUR)',
-	    earnings: 'Revenue (RMB)',
+	    earnings: 'Revenue (EUR)',
 	    earningsDetail: 'Revenue details',
 	    charge: 'Charging',
 	    ele: 'Electricity (kWh)',
-	    expend: 'Expense (RMB)',
+	    expend: 'Expense (EUR)',
 	    noChargeData: 'No charging data available',
 	    disCharge: 'Discharging',
 	    noDisChargeData: 'No discharging data available',
@@ -479,14 +481,14 @@ export default {
 	},
 	policy: {
 	    planCurve: 'Planned curve',
-	    planCurveTem: 'Planned curve template',
+	    planCurveTem: 'Schedule Template',
-	    IssueDevice: 'Command issuance equipment',
+	    IssueDevice: 'Target Device',
-	    operateOrNot: 'Commission or not',
+	    operateOrNot: 'In Operation',
 	    socUplimit: 'SOC upper limit',
 	    socDownlimit: 'SOC lower limit',
-	    effectiveTime: 'Effective time',
+	    effectiveTime: 'Effective Time',
-	    selectEffectiveTime: 'Please select effective time',
+	    selectEffectiveTime: 'Select time',
-	    distributeResult: 'Issuance result',
+	    distributeResult: 'Command Result',
 	    notDelivered: 'Not issued',
 	    commandDistribution: 'Command issuance',
 	    controlDistribution: 'Control issuance',
@@ -501,13 +503,13 @@ export default {
 	      name: 'General Settings'
 	    }],
 	    radioList: [{
-	      name: "In Operation",
+	      name: "Yes",
 	      disabled: false
 	    }, {
-	      name: "Not In Operation",
+	      name: "No",
 	      disabled: false
 	    }],
-	    selectIssueDevice: 'Please select command issuance equipment',
+	    selectIssueDevice: 'Select device',
 	    deliverErrorNewTip: 'Mapping configuration error or not configured. Please confirm and try again!',
 	    passwordSuccess: 'Password correct',
 	    passwordError: 'Password incorrect',
@@ -519,8 +521,9 @@ export default {
 	    saveSuccess: 'Save successful',
 	    saveError: 'Save failed',
 	    delivered: 'Issued',
-	    selectPlanCurveTem: 'Please select planned curve template',
+	    selectPlanCurveTem: 'Select schedule template',
 	    deliverErrorTip: 'Charging/discharging power exceeds rated power. Please confirm the planned curve.',
 	    deliverTip: 'Confirm command issuance?'
+		policyTitle: 'Strategy Issuance'
 	}
 }

common/locales/homePage/es.js

@@ -9,6 +9,7 @@ export default {
 	    loadAmmeter: 'Medidor de carga',
 	    dieselGeneratorMeter: 'Medidor de generador diésel',
 	    energyStorageMeter: 'Medidor de almacenamiento de energía',
+		emsControl: 'Control Ems',
 	    alarmTypeList: [{
 	      name: 'Alertas en tiempo real'
 	    }, {
@@ -32,21 +33,21 @@ export default {
 	      name: 'Sitio internacional'
 	    }],
 	    useElecPrice: 'Tarifa de energía',
-	    workStatus: 'Estado de funcionamiento:',
+	    workStatus: 'Estado:',
 	    standing: 'En reposo',
 	    activePowerpcs: 'Potencia activa:',
-	    operatingPower: 'Potencia operativa',
+	    operatingPower: 'Potencia',
-	    accumulatedElectricityConsumption: 'Energía acumulada',
+	    accumulatedElectricityConsumption: 'Energía total',
 	    pvKpi: 'KPI fotovoltaico',
 	    saveStandardCoal: 'Carbón estándar ahorrado (t)',
 	    equivalentCo2Reduction: 'Reducción de CO₂ (t)',
 	    equivalentTreePlantings: 'Árboles equivalentes plantados',
 	    dailyPowerGeneration: 'Generación diaria',
-	    cumulativePowerGeneration: 'Generación acumulada',
+	    cumulativePowerGeneration: 'Generación total',
 	    socialContribution: 'Contribución social',
 	    energyStorageRevenueReport: 'Informe de ingresos del almacenamiento de energía',
 	    pvStorageRevenueReport: 'Informe de ingresos fotovoltaicos',
-	    projectMonthlyPower: 'Generación mensual del proyecto',
+	    projectMonthlyPower: 'Generación mensual',
 	    powerGeneration: 'Generación de energía',
 	    mpptTopu: 'Diagrama de topología MPPT',
 	    powerGenerationCapacity: 'Potencia de generación',
@@ -57,8 +58,8 @@ export default {
 	    dc: 'Corriente de DC',
 	    dcVoltage: 'Tensión de DC',
 	    pvPower: 'Potencia',
-	    enmonthTotalChargePrice: 'Precio total de la carga del mes (EUR)',
+	    enmonthTotalChargePrice: 'Costo carga mensual(EUR)',
-	    enmonthTotalDisChargePrice: 'Precio total de la descarga del mes (EUR)',
+	    enmonthTotalDisChargePrice: 'Ingreso descarga mensual(EUR)',
 	    enearnings: 'Ingresos (EUR)',
 	    pvSwitch: 'Interruptor PV',
 	    stationDatacom: 'datos de la central eléctrica',
@@ -66,30 +67,30 @@ export default {
 	    todayEarning: 'Ingresos de hoy (EUR)',
 	    totalRevenue: 'Beneficio acumulado (EUR)',
 	    ratedPower: 'Potencia nominal (kW)',
-	    currentMonthlyPowerGeneration: 'Producción de electricidad de este mes',
+	    currentMonthlyPowerGeneration: 'Generación mensual',
 	    ratedPowernokw: 'potencia nominal',
-	    powerGenerationStatus: 'Situación de generación de energía del proyecto',
+	    powerGenerationStatus: 'Resumen generación',
 	    monthlyIncome: 'Ingresos del mes (EUR)',
 	    lowV: 'tensión del lado de baja tensión',
 	    lowI: 'corriente del lado de baja tensión',
 	    highV: 'tensión del lado de alta tensión',
 	    timesArr: [{
-	      text: '1 minuto',
+	      text: '1 min',
 	      value: 1
 	    }, {
-	      text: '5 minutos',
+	      text: '5 min',
 	      value: 5
 	    }, {
-	      text: '10 minutos',
+	      text: '10 min',
 	      value: 10
 	    }, {
-	      text: '15 minutos',
+	      text: '15 min',
 	      value: 15
 	    }, {
-	      text: '20 minutos',
+	      text: '20 min',
 	      value: 20
 	    }, {
-	      text: '30 minutos',
+	      text: '30 min',
 	      value: 30
 	    }],
 		esiCab: 'Gabinete integrado de almacenamiento de energía',
@@ -116,7 +117,7 @@ export default {
 		standby: 'En espera',
 		run: 'En funcionamiento',
 		allActivePower: 'Potencia activa total (kW):',
-		cabinet: 'Gabinete de almacenamiento de energía',
+		cabinet: 'Gabinete',
 		gridMeter: 'Medidor del lado de la red',
 		photovoltaic: 'Fotovoltaico',
 		battery: 'Batería',
@@ -134,22 +135,22 @@ export default {
 		chargeDisData: 'Datos de carga y descarga',
 		stationData: 'Datos de la planta',
 		environmentalData: 'Datos de control ambiental',
-		sevenDay: 'Últimos 7 días',
+		sevenDay: 'Semana',
-		monthDay: 'Último mes',
+		monthDay: 'Mes',
 		monthThree: 'Últimos 3 meses',
-		yearDay: 'Último año',
+		yearDay: 'Año',
 		tip: 'Aviso',
 		loading: 'Cargando recursos...',
 		power: 'Potencia (kW)',
-		photovoltaicCharge: 'Carga fotovoltaica',
+		photovoltaicCharge: 'Carga PV',
-		chargingandDischarging: 'Energía de carga y descarga',
+		chargingandDischarging: 'Carga/Descarga',
-		safeDaysUnit: 'Días de operación segura (días)',
+		safeDaysUnit: 'Días seguros(días)',
-		totalCapacity: 'Capacidad total instalada',
+		totalCapacity: 'Capacidad total',
 		systemConversionEfficiency: 'Eficiencia de conversión del sistema',
 		currentPower: 'Potencia actual',
-		totalCharge: 'Energía de carga total',
+		totalCharge: 'Carga total',
 		totalDischarge: 'Descarga total',
-		dailyCharge: 'Energía de carga diaria',
+		dailyCharge: 'Carga diaria',
 		dailyDischarge: 'Descarga diaria',
 		dayPhotovoltaic: 'Generación fotovoltaica',
 		noData: 'Sin datos',
@@ -182,7 +183,7 @@ export default {
 	    eleLevel: 'Nivel de tarifa eléctrica',
 	    fsdd: 'Tarifa de energía por franjas horarias',
 	    useElecPrice: 'Tarifa de energía',
-	    dietailUnit: '(yuanes/kWh)',
+	    dietailUnit: '(EUR/kWh)',
 	    eleprice: 'Tarifa de energía eléctrica',
 	    nonTime: 'Tarifa sin discriminación horaria',
 	    proxyPrice: 'Precio de compra de electricidad por intermediario',
@@ -256,6 +257,7 @@ export default {
 	    sureRead: 'Confirmar como leído',
 	    cancel: 'Cancelar',
 	    operateSuccess: 'Operación realizada con éxito',
+	    operateFail: 'Operación fallida',
 	    messageReaded: 'Este mensaje ya fue leído; no es necesario repetir la operación'
 	},
 	device: {
@@ -280,10 +282,10 @@ export default {
 	    DCVol: 'Tensión de DC',
 	    DCCurrent: 'Corriente de DC',
 	    acbreaker: 'Interruptor de AC',
-	    dcbreaker: 'Interruptor de DC',
+	    dcbreakerCom: 'Interruptor de DC',
 	    runState: 'Estado de operación',
 	    rsState: 'Estado remoto/local',
-	    gridMode: 'Estado de conexión/desconexión de la red',
+	    gridModeCom: 'Estado red',
 	    deviceState: 'Estado del equipo',
 	    totalActivePower: 'Potencia activa total',
 	    totalReactivePower: 'Potencia reactiva total',
@@ -301,22 +303,22 @@ export default {
 	    localAutomatic: 'Automático local',
 	    localManual: 'Manual local',
 	    timesArr: [{
-	      label: '1 minuto',
+	      label: '1 min',
 	      value: 1
 	    }, {
-	      label: '5 minutos',
+	      label: '5 min',
 	      value: 5
 	    }, {
-	      label: '10 minutos',
+	      label: '10 min',
 	      value: 10
 	    }, {
-	      label: '15 minutos',
+	      label: '15 min',
 	      value: 15
 	    }, {
-	      label: '20 minutos',
+	      label: '20 min',
 	      value: 20
 	    }, {
-	      label: '30 minutos',
+	      label: '30 min',
 	      value: 30
 	    }],
 	    yx: 'Teleindicación',
@@ -330,8 +332,8 @@ export default {
 	    },
 	    clusterTotalVol: 'Tensión total del clúster / SOC',
 	    runData: 'Datos de operación',
-	    cumCharge: 'Energía de carga acumulada',
+	    cumCharge: 'Carga total',
-	    cumDischarge: 'Energía de descarga acumulada',
+	    cumDischarge: 'Descarga total',
 	    avgTem: 'Temperatura promedio',
 	    avgVol: 'Tensión promedia',
 	    maxCellVol: 'Tensión máxima de celda',
@@ -350,10 +352,10 @@ export default {
 	    bvol: 'Tensión de fase B',
 	    cvol: 'Tensión de fase C',
 	    zxygzdl: 'Energía activa total en sentido directo',
-	    dlj: 'Energía (punta)',
+	    dlj: 'Pico crítico',
-	    dlf: 'Energía (pico)',
+	    dlf: 'Pico',
-	    dlp: 'Energía (llano)',
+	    dlp: 'Medio',
-	    dlg: 'Energía (valle)',
+	    dlg: 'Valle',
 	    fxygzdl: 'Energía activa total en sentido inverso',
 	    hxyggl: 'Potencia activa de fase combinada',
 	    hxwggl: 'Potencia reactiva de fase combinada',
@@ -404,7 +406,7 @@ export default {
 	    stackTotalCurrent: 'Corriente total de la pila',
 	    stackSoc: 'SOC de la pila',
 	    CumulativeCharge: 'Energía de carga acumulada',
-	    CumulativeDischarge: 'Energía de descarga acumulada',
+	    CumulativeDischarge: 'Descarga total',
 	    zdz: 'Resistencia de aislamiento positiva',
 	    fdz: 'Resistencia de aislamiento negativa',
 	    rechargeCapacity: 'Energía disponible para carga',
@@ -418,22 +420,22 @@ export default {
 	    historyData: 'Datos históricos'
 	},
 	earning: {
-	    changeDischargePro: 'Resumen de carga y descarga del proyecto',
+	    changeDischargePro: 'Resumen carga/descarga',
-	    capacity: 'Capacidad instalada',
+	    capacity: 'Capacidad',
-	    monthTotalCharge: 'Energía total de carga del mes',
+	    monthTotalCharge: 'Carga mensual',
-	    monthTotalDischarge: 'Descarga total del mes',
+	    monthTotalDischarge: 'Descarga mensual',
-	    monthEff: 'Eficiencia mensual de conversión del sistema',
+	    monthEff: 'Eficiencia mensual',
-	    chargeVol: 'Energía de carga acumulada',
+	    chargeVol: 'Carga total',
-	    dischargeVol: 'Energía de descarga acumulada',
+	    dischargeVol: 'Descarga total',
-	    totalEff: 'Eficiencia acumulada de conversión del sistema',
+	    totalEff: 'Eficiencia total',
 	    projectRevenue: 'Ingresos del proyecto',
-	    monthTotalChargePrice: 'Precio total de la carga del mes (yuanes)',
+	    monthTotalChargePrice: 'Costo carga mensual(EUR)',
-	    monthTotalDisChargePrice: 'Precio total de la descarga del mes (yuanes)',
+	    monthTotalDisChargePrice: 'Ingreso descarga mensual(EUR)',
-	    earnings: 'Ingresos (yuanes)',
+	    earnings: 'Ingresos (EUR)',
 	    earningsDetail: 'Detalles de ingresos',
 	    charge: 'Carga',
 	    ele: 'Energía (kWh)',
-	    expend: 'Gastos (yuanes)',
+	    expend: 'Gastos (EUR)',
 	    noChargeData: 'No hay datos de carga',
 	    disCharge: 'Descarga',
 	    noDisChargeData: 'No hay datos de descarga',
@@ -478,15 +480,16 @@ export default {
 	    confirmTime: 'Hora de confirmación'
 	},
 	policy: {
+	    policyTitle: 'Estrategia de envío',
 	    planCurve: 'Curva planificada',
-	    planCurveTem: 'Plantilla de curva planificada',
+	    planCurveTem: 'Plantilla programa',
-	    IssueDevice: 'Equipo para emitir el comando',
+	    IssueDevice: 'Equipo destino',
-	    operateOrNot: 'Activar/desactivar',
+	    operateOrNot: 'En operación',
-	    socUplimit: 'Límite superior de SOC',
+	    socUplimit: 'Límite SOC sup.',
-	    socDownlimit: 'Límite inferior de SOC',
+	    socDownlimit: 'Límite SOC inf.',
-	    effectiveTime: 'Hora de entrada en vigor',
+	    effectiveTime: 'Hora inicio',
-	    selectEffectiveTime: 'Seleccione la hora de entrada en vigor',
+	    selectEffectiveTime: 'Seleccionar hora',
-	    distributeResult: 'Resultado de la emisión',
+	    distributeResult: 'Resultado comando',
 	    notDelivered: 'No emitido',
 	    commandDistribution: 'Emisión de comando',
 	    controlDistribution: 'Emisión de control',
@@ -501,13 +504,13 @@ export default {
 	      name: 'Configuración general'
 	    }],
 	    radioList: [{
-	      name: "Activar",
+	      name: "Sí",
 	      disabled: false
 	    }, {
-	      name: "Desactivar",
+	      name: "No",
 	      disabled: false
 	    }],
-	    selectIssueDevice: 'Seleccione el equipo para emitir el comando',
+	    selectIssueDevice: 'Seleccionar equipo',
 	    deliverErrorNewTip: 'La configuración de mapa es incorrecta o no está configurada. Verifíquelo e inténtelo nuevamente!',
 	    passwordSuccess: 'Contraseña correcta',
 	    passwordError: 'Contraseña incorrecta',
@@ -519,7 +522,7 @@ export default {
 	    saveSuccess: 'Guardado con éxito',
 	    saveError: 'Error al guardar',
 	    delivered: 'Emitido',
-	    selectPlanCurveTem: 'Seleccione una plantilla de curva planificada',
+	    selectPlanCurveTem: 'Seleccionar plantilla',
 	    deliverErrorTip: 'La potencia de carga/descarga supera la potencia nominal. Verifique la configuración de la curva planificada!',
 	    deliverTip: '¿Confirma la emisión del comando?'
 	}

common/locales/homePage/fr.js

@@ -9,6 +9,7 @@ export default {
 		loadAmmeter: 'Compteur de charge',
 		dieselGeneratorMeter: 'Compteur de générateur diesel',
 		energyStorageMeter: "Compteur de stockage d'énergie",
+		emsControl: 'Contrôle EMS',
 		alarmTypeList: [{
 		  name: 'Alarmes en temps réel'
 		}, {
@@ -32,21 +33,21 @@ export default {
 		  name: 'Site international'
 		}],
 		useElecPrice: 'Tarif',
-		workStatus: 'État de service :',
+		workStatus: 'Statut:',
 		standing: 'Inactif',
 		activePowerpcs: 'Puissance active :',
-		operatingPower: 'Puissance de service',
+		operatingPower: 'puissance',
-		accumulatedElectricityConsumption: 'Électricité cumulée',
+		accumulatedElectricityConsumption: 'Énergie totale',
 		pvKpi: 'Indicateurs clés de performance photovoltaïque',
 		saveStandardCoal: 'Économies de charbon standard (en tonne)',
 		equivalentCo2Reduction: 'Réduction des émissions de CO2 (en tonne))',
 		equivalentTreePlantings: "Plantation d'arbres équivalente (U)",
 		dailyPowerGeneration: 'Production journalière',
-		cumulativePowerGeneration: "Quantité cumulative de production d'électricité",
+		cumulativePowerGeneration: "Production totale",
 		socialContribution: 'Contribution sociale',
 		energyStorageRevenueReport: "Bilan de gains du stockage d'énergie",
 		pvStorageRevenueReport: 'Bilan de gains photovoltaïques',
-		projectMonthlyPower: 'Production mensuelle du projet',
+		projectMonthlyPower: 'Production mensuelle',
 		powerGeneration: "Production d'électricité",
 		mpptTopu: 'Schéma de topologie MPPT',
 		powerGenerationCapacity: 'Puissance de production en électricité',
@@ -57,8 +58,8 @@ export default {
 		dc: 'Courant continu',
 		dcVoltage: 'Tension continue',
 		pvPower: 'Puissance',
-		enmonthTotalChargePrice: 'Tarif mensuel total de chargement (EUR)',
+		enmonthTotalChargePrice: 'Coût charge mois(EUR)',
-		enmonthTotalDisChargePrice: 'Tarif mensuel total de déchargement (EUR)',
+		enmonthTotalDisChargePrice: 'Revenu décharge mois(EUR)',
 		enearnings: 'Gain (EUR)',
 		pvSwitch: 'Interrupteur photovoltaïque',
 		stationDatacom: 'Données de la centrale électrique',
@@ -66,30 +67,30 @@ export default {
 		todayEarning: "Revenus d'aujourd'hui (EUR)",
 		totalRevenue: 'Bénéfices cumulés (EUR)',
 		ratedPower: 'Puissance nominale (kW)',
-		currentMonthlyPowerGeneration: "Production d'électricité ce mois-ci",
+		currentMonthlyPowerGeneration: "Production mensuelle",
 		ratedPowernokw: 'Puissance nominale',
-		powerGenerationStatus: "Situation de production d'électricité du projet",
+		powerGenerationStatus: "Aperçu de la production",
 		monthlyIncome: 'Revenus du mois (EUR)',
 		lowV: 'Tension côté basse tension',
 		lowI: 'Courant côté basse tension',
 		highV: 'Tension côté haute tension',
 		timesArr: [{
-		  text: '1 minute',
+		  text: '1 min',
 		  value: 1
 		}, {
-		  text: '5 minutes',
+		  text: '5 min',
 		  value: 5
 		}, {
-		  text: '10 minutes',
+		  text: '10 min',
 		  value: 10
 		}, {
-		  text: '15 minutes',
+		  text: '15 min',
 		  value: 15
 		}, {
-		  text: '20 minutes',
+		  text: '20 min',
 		  value: 20
 		}, {
-		  text: '30 minutes',
+		  text: '30 min',
 		  value: 30
 		}],
 		esiCab: "Armoire intégrée de stockage d'énergie",
@@ -116,7 +117,7 @@ export default {
 		standby: 'Veille',
 		run: 'Marche',
 		allActivePower: 'Puissance active totale (kW) :',
-		cabinet: "Armoire de stockage d'énergie",
+		cabinet: "Armoire",
 		gridMeter: 'Compteur du côté de secteur',
 		photovoltaic: 'Photovoltaïque',
 		battery: 'Batterie',
@@ -130,27 +131,27 @@ export default {
 		policy: 'Stratégie',
 		stationTopo: 'Schéma topologique du poste',
 		deviceMonitor: 'Surveillance des équipements',
-		runCurve: 'Courbes opérationnelles',
+		runCurve: 'Courbes de fonctionnement',
 		chargeDisData: 'Données de chargement/déchargement',
 		stationData: 'Données du poste',
 		environmentalData: 'Données de contrôle environnemental',
-		sevenDay: '7 derniers jours',
+		sevenDay: 'Semaine',
-		monthDay: '1 dernier mois',
+		monthDay: '1 mois',
 		monthThree: '3 derniers mois',
-		yearDay: '1 dernière année',
+		yearDay: '1 an',
 		tip: 'Indications',
 		loading: 'Chargement en cours...',
 		power: 'Puissance (kW)',
-		photovoltaicCharge: 'Chargement PV',
+		photovoltaicCharge: 'Charge PV',
-		chargingandDischarging: 'Énergie chargée et de déchargement',
+		chargingandDischarging: 'Charge/Décharge',
-		safeDaysUnit: 'Nombre de jour de service en sécurité (jour)',
+		safeDaysUnit: 'Jours sans incident(jour)',
-		totalCapacity: 'Puissance installée totale',
+		totalCapacity: 'Capacité totale',
 		systemConversionEfficiency: 'Efficacité de conversion du système',
 		currentPower: 'Puissance actuelle',
-		totalCharge: 'Énergie chargée totale',
+		totalCharge: 'Énergie chargée',
-		totalDischarge: 'Énergie déchargée totale',
+		totalDischarge: 'Énergie déchargée',
-		dailyCharge: 'Énergie chargée journalière',
+		dailyCharge: 'Charge journalière',
-		dailyDischarge: 'Énergie déchargée journalière',
+		dailyDischarge: 'Décharge journalière',
 		dayPhotovoltaic: 'Énergie de production photovoltaïque',
 		noData: 'Aucune donnée disponible',
 		station: 'Poste',
@@ -182,7 +183,7 @@ export default {
 	    eleLevel: 'Tarif',
 	    fsdd: 'Tarif horaire hors heures pleines',
 	    useElecPrice: 'Tarif',
-	    dietailUnit: '(RMB/kWh)',
+	    dietailUnit: '(EUR/kWh)',
 	    eleprice: 'Tarif hors heures pleines',
 	    nonTime: 'Tarif non horaire',
 	    proxyPrice: "Prix d'achat d'électricité par procuration",
@@ -256,6 +257,7 @@ export default {
 	    sureRead: 'Confirmer la lecture',
 	    cancel: 'Annuler',
 	    operateSuccess: 'Opération réussie',
+	    operateFail: 'Opération échouée',
 	    messageReaded: "La lecture du message a été effectuée. Aucune répétition n'est nécessaire !"
 	},
 	device: {
@@ -280,10 +282,10 @@ export default {
 	    DCVol: 'Tension continue',
 	    DCCurrent: 'Courant continu',
 	    acbreaker: 'Disjoncteur CA',
-	    dcbreaker: 'Disjoncteur CC',
+	    dcbreakerCom: 'Disjoncteur CC',
 	    runState: 'État de service',
 	    rsState: 'État distant/local',
-	    gridMode: 'État connecté/déconnecté',
+	    gridModeCom: 'Statut réseau',
 	    deviceState: 'État de périphérique',
 	    totalActivePower: 'Puissance active totale',
 	    totalReactivePower: 'Puissance réactive totale',
@@ -301,22 +303,22 @@ export default {
 	    localAutomatic: 'Local automatique',
 	    localManual: 'Local manuel',
 	    timesArr: [{
-	      label: '1 minute',
+	      label: '1 min',
 	      value: 1
 	    }, {
-	      label: '5 minutes',
+	      label: '5 min',
 	      value: 5
 	    }, {
-	      label: '10 minutes',
+	      label: '10 min',
 	      value: 10
 	    }, {
-	      label: '15 minutes',
+	      label: '15 min',
 	      value: 15
 	    }, {
-	      label: '20 minutes',
+	      label: '20 min',
 	      value: 20
 	    }, {
-	      label: '30 minutes',
+	      label: '30 min',
 	      value: 30
 	    }],
 	    yx: 'Télésignalisation',
@@ -330,8 +332,8 @@ export default {
 	    },
 	    clusterTotalVol: 'Tension totale de cluster/état de charge',
 	    runData: 'Données de service',
-	    cumCharge: 'Énergie chargée cumulée',
+	    cumCharge: 'Charge totale',
-	    cumDischarge: 'Énergie déchargée cumulée',
+	    cumDischarge: 'Décharge totale',
 	    avgTem: 'Température moyenne',
 	    avgVol: 'Tension moyenne',
 	    maxCellVol: 'Tension maximale par cellule',
@@ -350,10 +352,10 @@ export default {
 	    bvol: 'Tension de phase B',
 	    cvol: 'Tension de phase C',
 	    zxygzdl: 'Énergie active positive totale',
-	    dlj: 'Électricité (pointe extrême)',
+	    dlj: 'Pointe+',
-	    dlf: 'Électricité (pointe)',
+	    dlf: 'HP',
-	    dlp: 'Électricité (pleine)',
+	    dlp: 'Interm',
-	    dlg: 'Électricité (creuse)',
+	    dlg: 'HC',
 	    fxygzdl: 'Énergie active négative totale',
 	    hxyggl: "Puissance active d'enclenchement",
 	    hxwggl: "Puissance réactive d'enclenchement",
@@ -404,7 +406,7 @@ export default {
 	    stackTotalCurrent: 'Courant total du rack',
 	    stackSoc: 'État de charge du rack',
 	    CumulativeCharge: 'Énergie chargée cumulée',
-	    CumulativeDischarge: 'Énergie déchargée cumulée',
+	    CumulativeDischarge: 'Décharge totale',
 	    zdz: "Résistance d'isolation positive",
 	    fdz: "Résistance d'isolation négative",
 	    rechargeCapacity: 'Énergie chargée disponible',
@@ -418,22 +420,22 @@ export default {
 	    historyData: 'Données historiques'
 	},
 	earning: {
-	    changeDischargePro: 'Généralités de chargement/déchargement du projet',
+	    changeDischargePro: 'Aperçu charge/décharge',
-	    capacity: 'Puissance installée',
+	    capacity: 'Capacité',
-	    monthTotalCharge: 'Énergie chargée mensuelle totale',
+	    monthTotalCharge: 'Charge mois',
-	    monthTotalDischarge: 'Énergie déchargée mensuelle totale',
+	    monthTotalDischarge: 'Décharge mois',
-	    monthEff: 'Efficacité de conversion mensuelle du système',
+	    monthEff: 'Rendement mois',
-	    chargeVol: 'Énergie chargée cumulée',
+	    chargeVol: 'Charge totale',
-	    dischargeVol: 'Énergie déchargée cumulée',
+	    dischargeVol: 'Décharge totale',
-	    totalEff: 'Efficacité de conversion cumulée du système',
+	    totalEff: 'Rendement total',
 	    projectRevenue: 'Gains du projet',
-	    monthTotalChargePrice: 'Tarif mensuel total de chargement (RMB)',
+	    monthTotalChargePrice: 'Coût charge mois(EUR)',
-	    monthTotalDisChargePrice: 'Tarif mensuel total de déchargement (RMB)',
+	    monthTotalDisChargePrice: 'Revenu décharge mois(EUR)',
-	    earnings: 'Gain (RMB)',
+	    earnings: 'Gain (EUR)',
 	    earningsDetail: 'Détails des gains',
 	    charge: 'Chargement',
 	    ele: 'Énergie (kWh)',
-	    expend: 'Dépenses (RMB)',
+	    expend: 'Dépenses (EUR)',
 	    noChargeData: 'Aucune donnée de chargement disponible',
 	    disCharge: 'Déchargement',
 	    noDisChargeData: 'Aucune donnée de déchargement disponible',
@@ -478,14 +480,15 @@ export default {
 	    confirmTime: 'Heure de confirmation'
 	},
 	policy: {
+	    policyTitle: 'Stratégie de distribution',
 	    planCurve: 'Courbe programmée',
-	    planCurveTem: 'Modèle de courbe programmée',
+	    planCurveTem: 'Modèle de planning',
-	    IssueDevice: "Équipement cable d'envoi d'ordre",
+	    IssueDevice: "Équipement cible",
 	    operateOrNot: 'Mise en service ?',
-	    socUplimit: "Limite supérieure d'état de charge",
+	    socUplimit: "Limite SOC max",
-	    socDownlimit: "Limite inférieure d'état de charge",
+	    socDownlimit: "Limite SOC min",
-	    effectiveTime: 'Heure de validation',
+	    effectiveTime: "Heure d'effet",
-	    selectEffectiveTime: "Veuillez choisir l'heure de validation",
+	    selectEffectiveTime: "Sélectionner l'heure",
 	    distributeResult: "Résultat d'envoi",
 	    notDelivered: 'Non envoyé',
 	    commandDistribution: "Envoi d'ordre",
@@ -501,13 +504,13 @@ export default {
 	      name: 'Réglages généraux'
 	    }],
 	    radioList: [{
-	      name: "Mise en service",
+	      name: "Oui",
 	      disabled: false
 	    }, {
-	      name: "Non mise en service",
+	      name: "Non",
 	      disabled: false
 	    }],
-	    selectIssueDevice: "Veuillez choisir un équipement cable d'envoi d'ordre",
+	    selectIssueDevice: "Sélectionner un équipement",
 	    deliverErrorNewTip: 'Erreur de configuration ou configuration manquante du mapping ! Veuillez réessayer après confirmation !',
 	    passwordSuccess: 'Mot de passe correct',
 	    passwordError: 'Mot de passe incorrect',
@@ -519,7 +522,7 @@ export default {
 	    saveSuccess: 'Sauvegarde réussie',
 	    saveError: 'Sauvegarde échouée',
 	    delivered: 'Envoi fini',
-	    selectPlanCurveTem: 'Veuillez choisir un modèle de courbe programmée',
+	    selectPlanCurveTem: 'Sélectionner un modèle',
 	    deliverErrorTip: 'La puissance de chargement/déchargement dépasse la puissance nominale. Veuillez confirmer les réglages de courbe programmée !',
 	    deliverTip: "Voulez-vous envoyer l'ordre ?"
 	}

common/locales/homePage/pl.js

@@ -9,6 +9,7 @@ export default {
 	    loadAmmeter: 'Miernik obciążenia',
 	    dieselGeneratorMeter: 'Miernik energii z paliwa',
 	    energyStorageMeter: 'Miernik energii akumulatora',
+		emsControl: "Kontrola EMS",
 	    alarmTypeList: [
 	      {
 	        name: 'Alarmy w czasie rzeczywistym'
@@ -38,21 +39,21 @@ export default {
 	      }
 	    ],
 	    useElecPrice: 'Taryfa',
-	    workStatus: 'Status pracy: ',
+	    workStatus: 'Status: ',
 	    standing: 'statyczny',
 	    activePowerpcs: 'Moc czynna: ',
-	    operatingPower: 'Moc operacyjna',
+	    operatingPower: 'Moc',
-	    accumulatedElectricityConsumption: 'Łączny pobór mocy',
+	    accumulatedElectricityConsumption: 'Energia całkowita',
 	    pvKpi: 'Fotowoltaiczny wskaźnik KPI',
 	    saveStandardCoal: 'Oszczędność węgla standardowego (w tonach)',
 	    equivalentCo2Reduction: 'Redukcja emisji CO₂ (w tonach)',
 	    equivalentTreePlantings: 'Równoważność nasadzenia drzew (szt.)',
 	    dailyPowerGeneration: 'Dzienne wytwarzanie energii',
-	    cumulativePowerGeneration: 'Łączna produkcja energii',
+	    cumulativePowerGeneration: 'Całkowita produkcja',
 	    socialContribution: 'Wkład społeczny',
 	    energyStorageRevenueReport: 'Rachunek zysków magazynowania energii',
 	    pvStorageRevenueReport: 'Fotowoltaiczny rachunek zysków',
-	    projectMonthlyPower: 'Miesięczna produkcja energii w ramach projektu',
+	    projectMonthlyPower: 'Miesięczna produkcja',
 	    powerGeneration: 'Generowana energia elektryczna',
 	    mpptTopu: 'Schemat topologii MPPT',
 	    powerGenerationCapacity: 'Generowana moc',
@@ -62,10 +63,10 @@ export default {
 	    busCurrent: 'Prąd AKU',
 	    dc: 'Prąd stały',
 	    dcVoltage: 'Napięcie stałe',
-	    operatingPower: 'Moc operacyjna',
+	    operatingPower: 'Moc',
-	    pvPower: 'Moc',
+	    pvPower: 'pv Moc',
-	    enmonthTotalChargePrice: 'Całkowita cena ładowania w tym miesiącu (PLN)',
+	    enmonthTotalChargePrice: 'Koszt ładowania w miesiącu(PLN)',
-	    enmonthTotalDisChargePrice: 'Całkowita cena rozładowania w tym miesiącu (PLN)',
+	    enmonthTotalDisChargePrice: 'Przychód z rozładowania w miesiącu(PLN)',
 	    enearnings: 'Wpływy (PLN)',
 	    pvSwitch: 'Przełącznik PV',
 		stationDatacom: 'Dane elektrowni',
@@ -73,35 +74,35 @@ export default {
 		todayEarning: 'Dzisiejsze zyski (EUR)',
 		totalRevenue: 'Skumulowane zyski(EUR)',
 		ratedPower: 'Moc nominalna(kW)',
-		currentMonthlyPowerGeneration: 'Produkcja energii w tym miesiącu',
+		currentMonthlyPowerGeneration: 'Miesięczna produkcja',
 		ratedPowernokw: 'Moc nominalna',
-		powerGenerationStatus: 'Produkcja energii elektrycznej w projekcie',
+		powerGenerationStatus: 'Przegląd produkcji energii',
 		monthlyIncome: 'W tym miesiącu zyski(EUR)',
 		lowV:'Napięcie boczne niskiego napięcia',
 		lowI:'Prąd boczny niskiego napięcia',
 		highV:'Napięcie boczne wysokiego napięcia',
 		timesArr: [{
-				text: '1 minuta.',
+				text: '1 min',
 				value: 1
 			},
 			{
-				text: '5 minut.',
+				text: '5 min',
 				value: 5
 			},
 			{
-				text: '10 minut.',
+				text: '10 min',
 				value: 10
 			},
 			{
-				text: '15 minut.',
+				text: '15 min',
 				value: 15
 			},
 			{
-				text: '20 minut.',
+				text: '20 min',
 				value: 20
 			},
 			{
-				text: '30 minut.',
+				text: '30 min',
 				value: 30
 			}
 		],
@@ -129,7 +130,7 @@ export default {
 		standby: 'Tryb gotowości',
 		run: 'Praca',
 		allActivePower: 'Całkowita moc czynna (kW):',
-		cabinet: 'Szafa magazyn energii',
+		cabinet: 'Szafa',
 		gridMeter: 'Liczniki po stronie sieci',
 		photovoltaic: 'Fotowoltaika',
 		battery: 'Akumulator',
@@ -143,26 +144,26 @@ export default {
 		policy: 'Strategia',
 		stationTopo: 'Topologia stacji',
 		deviceMonitor: 'Monitorowanie sprzętu',
-		runCurve: 'Krzywa działania',
+		runCurve: 'Krzywa pracy',
 		chargeDisData: 'Dane ładowania i rozładowania',
 		stationData: 'Dane stacji',
 		environmentalData: 'Dane kontroli środ.',
-		sevenDay: 'Ostatnie siedem dni',
+		sevenDay: 'Tydzień',
-		monthDay: 'Ostatni miesiąc',
+		monthDay: 'Miesiąc',
 		monthThree: 'Ostatnie trzy miesiące',
-		yearDay: 'Ostatni rok',
+		yearDay: 'Rok',
 		tip: 'Informacja',
 		loading: 'Ładowanie zasobów...',
 		power: 'Moc (kW)',
-		photovoltaicCharge: 'Ładowanie fotowoltaiczne',
+		photovoltaicCharge: 'Ładowanie PV',
-		chargingandDischarging: 'Wolumen ładowania i rozładowania',
+		chargingandDischarging: 'Ładowanie i rozładowanie',
-		safeDaysUnit: 'Dni bezpiecznej pracy',
+		safeDaysUnit: 'Dni bez awarii',
-		totalCapacity: 'Całkowita zainstalowana moc',
+		totalCapacity: 'Całkowita pojemność',
 		systemConversionEfficiency: 'Wydajność konwersji systemu',
 		currentPower: 'Bieżąca moc',
 		totalCharge: 'Całkowite ładowanie',
 		totalDischarge: 'Całkowite rozładowanie',
-		dailyCharge: 'Dzienna ładowanie',
+		dailyCharge: 'Dzienne ładowanie',
 		dailyDischarge: 'Dzienne rozładowanie',
 		dayPhotovoltaic: 'Wytworzona energia fotowoltaiczna',
 		noData: 'Brak danych',
@@ -270,6 +271,7 @@ export default {
 	    cancel: 'Anuluj',
 	    messageDetail: 'Szczegóły wiadomości',
 	    operateSuccess: 'Operacja zakończona sukcesem',
+	    operateFail: 'Operacja nie powiodła się',
 	    messageReaded: 'Wiadomość została odczytana, nie ma potrzeby powtarzania akcji.'
 	},
 	device: {
@@ -294,10 +296,10 @@ export default {
 	    DCVol: 'Napięcie stałe',
 	    DCCurrent: 'Prąd stały',
 	    acbreaker: 'Wyłącznik obwodu prądu zmiennego',
-	    dcbreaker: 'Wyłącznik obwodu prądu stałego',
+	    dcbreakerCom: 'Wyłącznik obwodu prądu stałego',
 	    runState: 'Stan pracy',
 	    rsState: 'Stan zdalny/lokalny',
-	    gridMode: 'Stan sieci/Poza siecią',
+	    gridModeCom: 'Status sieci',
 	    deviceState: 'Stan urządzenia',
 	    totalActivePower: 'Calkowita moc czynna',
 	    totalReactivePower: 'Calkowita moc bierna',
@@ -316,27 +318,27 @@ export default {
 	    localManual: 'Lokalnie ręcznie',
 	    timesArr: [
 	      {
-	        label: '1 minuta',
+	        label: '1 min',
 	        value: 1
 	      },
 	      {
-	        label: '5 minut',
+	        label: '5 min',
 	        value: 5
 	      },
 	      {
-	        label: '10 minut',
+	        label: '10 min',
 	        value: 10
 	      },
 	      {
-	        label: '15 minut',
+	        label: '15 min',
 	        value: 15
 	      },
 	      {
-	        label: '20 minut',
+	        label: '20 min',
 	        value: 20
 	      },
 	      {
-	        label: '30 minut',
+	        label: '30 min',
 	        value: 30
 	      }
 	    ],
@@ -351,8 +353,8 @@ export default {
 	    },
 	    clusterTotalVol: 'Calkowite napięcie klastra/SOC',
 	    runData: 'Dane operacyjne',
-	    cumCharge: 'Łączne obciążenie',
+	    cumCharge: 'Całkowite ładowanie',
-	    cumDischarge: 'Łączne rozładowanie',
+	    cumDischarge: 'Całkowite rozładowanie',
 	    avgTem: 'Średnia temperatura',
 	    avgVol: 'Średnie napięcie',
 	    maxCellVol: 'Maksymalne napięcie na jednostkę',
@@ -371,10 +373,10 @@ export default {
 	    bvol: 'Napięcie fazy B',
 	    cvol: 'Napięcie fazy C',
 	    zxygzdl: 'Calkowita dodatnia moc czynna',
-	    dlj: 'Energia elektryczna (super szczyt)',
+	    dlj: 'Szczyt krytyczny',
-	    dlf: 'Energia elektryczna (szczyt)',
+	    dlf: 'Szczyt',
-	    dlp: 'Energia elektryczna (zwykły)',
+	    dlp: 'Poziom średni',
-	    dlg: 'Energia elektryczna (dolina)',
+	    dlg: 'Poza szczytem',
 	    fxygzdl: 'Calkowita odwrotna moc czynna',
 	    hxyggl: 'Moc czynna w fazie kombinowanej',
 	    hxwggl: 'Moc bierna w fazie kombinowanej',
@@ -427,7 +429,7 @@ export default {
 	    stackTotalCurrent: 'Prąd stosu',
 	    stackSoc: 'SOC stosu',
 	    CumulativeCharge: 'Łączne obciążenie',
-	    CumulativeDischarge: 'Łączne rozładowanie',
+	    CumulativeDischarge: 'Całkowite rozładowanie',
 	    zdz: 'Dodatnia rezystancja izolacji',
 	    fdz: 'Ujemna rezystancja izolacji',
 	    rechargeCapacity: 'Pojemność ładowania',
@@ -441,17 +443,17 @@ export default {
 	    historyData: 'Dane historyczne'
 	},
 	earning: {
-	    changeDischargePro: 'Ogólna charakterystyka ładowania i rozładowania projektu',
+	    changeDischargePro: 'Przegląd ładowania i rozładowania',
-	    capacity: 'Zainstalowana moc',
+	    capacity: 'Pojemność',
-	    monthTotalCharge: 'Łączna ilość ładowania w tym miesiącu',
+	    monthTotalCharge: 'Miesięczne ładowanie',
-	    monthTotalDischarge: 'Łączna ilość rozładowania w tym miesiącu',
+	    monthTotalDischarge: 'Miesięczne rozładowanie',
 	    monthEff: 'Miesięczna sprawność systemu',
-	    chargeVol: 'Łączne obciążenie',
+	    chargeVol: 'Całkowite ładowanie',
-	    dischargeVol: 'Łączne rozładowanie',
+	    dischargeVol: 'Całkowite rozładowanie',
-	    totalEff: 'Skumulowana sprawność systemu',
+	    totalEff: 'Całkowita sprawność systemu',
 	    projectRevenue: 'Skumulowana sprawność systemu',
-	    monthTotalChargePrice: 'Całkowita cena ładowania w tym miesiącu (PLN)',
+	    monthTotalChargePrice: 'Koszt ładowania w miesiącu(PLN)',
-	    monthTotalDisChargePrice: 'Całkowita cena rozładowania w tym miesiącu (PLN)',
+	    monthTotalDisChargePrice: 'Przychód z rozładowania w miesiącu(PLN)',
 	    earnings: 'Wpływy (PLN)',
 	    earningsDetail: 'Szczegóły przychodów',
 	    charge: 'Ładowanie',
@@ -504,15 +506,16 @@ export default {
 	    confirmTime: 'Czas potwierdzenia'
 	},
 	policy: {
+	    policyTitle: 'Strategia dystrybucji',
 	    planCurve: 'Krzywa planowania',
-	    planCurveTem: 'Szablon krzywej planowania',
+	    planCurveTem: 'Szablon harmonogramu',
-	    IssueDevice: 'Polecenie wydane urządzeniu',
+	    IssueDevice: 'Urządzenie docelowe',
-	    operateOrNot: 'Czy uruchomić',
+	    operateOrNot: 'W eksploatacji',
-	    socUplimit: 'Górny limit SOC',
+	    socUplimit: 'Górna granica SOC',
-	    socDownlimit: 'Dolny limit SOC',
+	    socDownlimit: 'Dolna granica SOC',
-	    effectiveTime: 'Data rozpoczęcia',
+	    effectiveTime: 'Czas rozpoczęcia',
-	    selectEffectiveTime: 'Wybierz efektywny czas',
+	    selectEffectiveTime: 'Wybierz czas',
-	    distributeResult: 'Wynik wysłania',
+	    distributeResult: 'Wynik polecenia',
 	    notDelivered: 'Nie wysłano',
 	    commandDistribution: 'Wysłanie polecenia',
 	    controlDistribution: 'Wysłanie sterowania',
@@ -531,15 +534,15 @@ export default {
 	    ],
 	    radioList: [
 	      {
-	        name: 'uruchomić',
+	        name: 'Tak',
 	        disabled: false
 	      },
 	      {
-	        name: 'nie uruchamiać',
+	        name: 'Nie',
 	        disabled: false
 	      }
 	    ],
-	    selectIssueDevice: 'Wybierz urządzenie wydające polecenie',
+	    selectIssueDevice: 'Wybierz urządzenie',
 	    deliverErrorNewTip: 'Relacja mapowania jest nieprawidłowo skonfigurowana lub nie została skonfigurowana, potwierdź i spróbuj ponownie!',
 	    passwordSuccess: 'Hasło jest prawidłowe',
 	    passwordError: 'Błędne hasło',
@@ -551,7 +554,7 @@ export default {
 	    saveSuccess: 'Zapisano pomyślnie',
 	    saveError: 'Zapis nie powiódł się',
 	    delivered: 'Wysłano',
-	    selectPlanCurveTem: 'Wybierz szablon krzywej planu',
+	    selectPlanCurveTem: 'Wybierz szablon harmonogramu',
 	    deliverErrorTip: 'Moc ładowania/rozładowania jest większa niż moc znamionowa, sprawdź ustawienie krzywej harmonogramu!',
 	    deliverTip: 'Czy na pewno wysłać polecenie?'
 	}

common/locales/homePage/zh.js

@@ -9,6 +9,7 @@ export default {
 		loadAmmeter: '负载电表',
 		dieselGeneratorMeter: '柴发电表',
 		energyStorageMeter: '储能电表',
+		emsControl: 'EMS控制',
 		alarmTypeList: [{
 			name: '实时告警'
 		}, {
@@ -263,8 +264,9 @@ export default {
 		sureRead: '确认已读',
 		cancel: '取消',
 		messageDetail: '消息详情',
-		operateSuccess: '操作成功',
+	    operateSuccess: '操作成功',
-		messageReaded: '该消息已读，无需重复操作'
+	    operateFail: '操作失败',
+	    messageReaded: '该消息已读，无需重复操作'
 	},
 	device: {
 		inputNameQuery: '输入名称搜索',
@@ -288,10 +290,10 @@ export default {
 		DCVol: '直流电压',
 		DCCurrent: '直流电流',
 		acbreaker: '交流断路器',
-		dcbreaker: '直流断路器',
+		dcbreakerCom: '直流断路器',
 		runState: '运行状态',
 		rsState: '远方/就地状态',
-		gridMode: '并离网状态',
+		gridModeCom: '并离网状态',
 		deviceState: '设备状态',
 		totalActivePower: '总有功功率',
 		totalReactivePower: '总无功功率',
@@ -548,5 +550,6 @@ export default {
 		selectPlanCurveTem: '请选择计划曲线模板',
 		deliverErrorTip: '充放电功率大于额定功率，请确认计划曲线设置！',
 		deliverTip: '是否确定下发命令?',
+		policyTitle: '策略下发',
 	}
 };

main.js

@@ -6,7 +6,7 @@ Vue.config.productionTip = false
 
 App.mpType = 'app'
 // 引入全局 uView 框架
-import uView from 'uview-ui'
+import uView from './uview-ui'
 Vue.use(uView)
 
 
@@ -18,7 +18,7 @@ let vuexStore = require('@/store/$u.mixin.js')
 Vue.mixin(vuexStore)
 
 // 引入 uView 对小程序分享的 mixin 封装
-let mpShare = require('uview-ui/libs/mixin/mpShare.js')
+let mpShare = require('./uview-ui/libs/mixin/mpShare.js')
 Vue.mixin(mpShare)
 
 // Vue i18n 国际化

manifest.json

@@ -2,8 +2,8 @@
     "name" : "Zeta Cloud",
     "appid" : "__UNI__86592F3",
     "description" : "Zetatech",
-    "versionName" : "2.0.16",
+    "versionName" : "2.0.18",
-    "versionCode" : 221,
+    "versionCode" : 223,
     "transformPx" : false,
     "sassImplementationName" : "node-sass",
     "app-plus" : {

package-lock.json

@@ -12,13 +12,24 @@
         "@dcloudio/uni-helper-json": "^1.0.13",
         "crypto-js": "^4.2.0",
         "image-tools": "^1.4.0",
-        "jsencrypt": "^3.3.2"
+        "jsencrypt": "^3.3.2",
+        "mqtt": "^5.15.0",
+        "paho-mqtt": "^1.1.0",
+        "pako": "^2.1.0"
       },
       "devDependencies": {
         "compression-webpack-plugin": "^6.1.1",
         "webpack": "^4.46.0"
       }
     },
+    "node_modules/@babel/runtime": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.28.6.tgz",
+      "integrity": "sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@dcloudio/uni-helper-json": {
       "version": "1.0.13",
       "resolved": "https://registry.npmmirror.com/@dcloudio/uni-helper-json/-/uni-helper-json-1.0.13.tgz",
@@ -121,6 +132,30 @@
       "integrity": "sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==",
       "dev": true
     },
+    "node_modules/@types/node": {
+      "version": "25.4.0",
+      "resolved": "https://registry.npmmirror.com/@types/node/-/node-25.4.0.tgz",
+      "integrity": "sha512-9wLpoeWuBlcbBpOY3XmzSTG3oscB6xjBEEtn+pYXTfhyXhIxC5FsBer2KTopBlvKEiW9l13po9fq+SJY/5lkhw==",
+      "dependencies": {
+        "undici-types": "~7.18.0"
+      }
+    },
+    "node_modules/@types/readable-stream": {
+      "version": "4.0.23",
+      "resolved": "https://registry.npmmirror.com/@types/readable-stream/-/readable-stream-4.0.23.tgz",
+      "integrity": "sha512-wwXrtQvbMHxCbBgjHaMGEmImFTQxxpfMOR/ZoQnXxB1woqkUbdLGFDgauo00Py9IudiaqSeiBiulSV9i6XIPig==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/ws": {
+      "version": "8.18.1",
+      "resolved": "https://registry.npmmirror.com/@types/ws/-/ws-8.18.1.tgz",
+      "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.9.0",
       "resolved": "https://registry.npmmirror.com/@webassemblyjs/ast/-/ast-1.9.0.tgz",
@@ -308,6 +343,17 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
       "dev": true
     },
+    "node_modules/abort-controller": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/abort-controller/-/abort-controller-3.0.0.tgz",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+      "dependencies": {
+        "event-target-shim": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6.5"
+      }
+    },
     "node_modules/acorn": {
       "version": "6.4.2",
       "resolved": "https://registry.npmmirror.com/acorn/-/acorn-6.4.2.tgz",
@@ -580,7 +626,6 @@
       "version": "1.5.1",
       "resolved": "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz",
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -615,6 +660,73 @@
         "node": ">=8"
       }
     },
+    "node_modules/bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmmirror.com/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
+    "node_modules/bl": {
+      "version": "6.1.6",
+      "resolved": "https://registry.npmmirror.com/bl/-/bl-6.1.6.tgz",
+      "integrity": "sha512-jLsPgN/YSvPUg9UX0Kd73CXpm2Psg9FxMeCSXnk3WBO3CMT10JMwijubhGfHCnFu6TPn1ei3b975dxv7K2pWVg==",
+      "dependencies": {
+        "@types/readable-stream": "^4.0.0",
+        "buffer": "^6.0.3",
+        "inherits": "^2.0.4",
+        "readable-stream": "^4.2.0"
+      }
+    },
+    "node_modules/bl/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmmirror.com/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
+    "node_modules/bl/node_modules/readable-stream": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-4.7.0.tgz",
+      "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==",
+      "dependencies": {
+        "abort-controller": "^3.0.0",
+        "buffer": "^6.0.3",
+        "events": "^3.3.0",
+        "process": "^0.11.10",
+        "string_decoder": "^1.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/bl/node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
     "node_modules/bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmmirror.com/bluebird/-/bluebird-3.7.2.tgz",
@@ -670,6 +782,17 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/broker-factory": {
+      "version": "3.1.13",
+      "resolved": "https://registry.npmmirror.com/broker-factory/-/broker-factory-3.1.13.tgz",
+      "integrity": "sha512-H2VALe31mEtO/SRcNp4cUU5BAm1biwhc/JaF77AigUuni/1YT0FLCJfbUxwIEs9y6Kssjk2fmXgf+Y9ALvmKlw==",
+      "dependencies": {
+        "@babel/runtime": "^7.28.6",
+        "fast-unique-numbers": "^9.0.26",
+        "tslib": "^2.8.1",
+        "worker-factory": "^7.0.48"
+      }
+    },
     "node_modules/brorand": {
       "version": "1.1.0",
       "resolved": "https://registry.npmmirror.com/brorand/-/brorand-1.1.0.tgz",
@@ -763,6 +886,12 @@
         "pako": "~1.0.5"
       }
     },
+    "node_modules/browserify-zlib/node_modules/pako": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmmirror.com/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+      "dev": true
+    },
     "node_modules/buffer": {
       "version": "4.9.2",
       "resolved": "https://registry.npmmirror.com/buffer/-/buffer-4.9.2.tgz",
@@ -777,8 +906,7 @@
     "node_modules/buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmmirror.com/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
-      "dev": true
     },
     "node_modules/buffer-xor": {
       "version": "1.0.3",
@@ -1006,6 +1134,11 @@
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true
     },
+    "node_modules/commist": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmmirror.com/commist/-/commist-3.2.0.tgz",
+      "integrity": "sha512-4PIMoPniho+LqXmpS5d3NuGYncG6XWlkBSVGiWycL22dd42OYdUGil2CWuzklaJoNxyxUSpO4MKIBU94viWNAw=="
+    },
     "node_modules/commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/commondir/-/commondir-1.0.1.tgz",
@@ -1647,11 +1780,18 @@
         "node": ">=4.0"
       }
     },
+    "node_modules/event-target-shim": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmmirror.com/event-target-shim/-/event-target-shim-5.0.1.tgz",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/events": {
       "version": "3.3.0",
       "resolved": "https://registry.npmmirror.com/events/-/events-3.3.0.tgz",
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "dev": true,
       "engines": {
         "node": ">=0.8.x"
       }
@@ -1828,6 +1968,18 @@
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
       "dev": true
     },
+    "node_modules/fast-unique-numbers": {
+      "version": "9.0.26",
+      "resolved": "https://registry.npmmirror.com/fast-unique-numbers/-/fast-unique-numbers-9.0.26.tgz",
+      "integrity": "sha512-3Mtq8p1zQinjGyWfKeuBunbuFoixG72AUkk4VvzbX4ykCW9Q4FzRaNyIlfQhUjnKw2ARVP+/CKnoyr6wfHftig==",
+      "dependencies": {
+        "@babel/runtime": "^7.28.6",
+        "tslib": "^2.8.1"
+      },
+      "engines": {
+        "node": ">=18.2.0"
+      }
+    },
     "node_modules/figgy-pudding": {
       "version": "3.5.2",
       "resolved": "https://registry.npmmirror.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
@@ -1835,6 +1987,13 @@
       "deprecated": "This module is no longer supported.",
       "dev": true
     },
+    "node_modules/file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-4.0.0.tgz",
@@ -2184,6 +2343,11 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/help-me": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmmirror.com/help-me/-/help-me-5.0.0.tgz",
+      "integrity": "sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg=="
+    },
     "node_modules/hmac-drbg": {
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -2205,7 +2369,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz",
       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -2270,8 +2433,15 @@
     "node_modules/inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-      "dev": true
+    },
+    "node_modules/ip-address": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmmirror.com/ip-address/-/ip-address-10.1.0.tgz",
+      "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==",
+      "engines": {
+        "node": ">= 12"
+      }
     },
     "node_modules/is-accessor-descriptor": {
       "version": "0.1.6",
@@ -2466,6 +2636,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/js-sdsl": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmmirror.com/js-sdsl/-/js-sdsl-4.3.0.tgz",
+      "integrity": "sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/js-sdsl"
+      }
+    },
     "node_modules/jsencrypt": {
       "version": "3.3.2",
       "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.2.tgz",
@@ -2675,7 +2854,6 @@
       "version": "1.2.8",
       "resolved": "https://registry.npmmirror.com/minimist/-/minimist-1.2.8.tgz",
       "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -2826,12 +3004,180 @@
         "run-queue": "^1.0.3"
       }
     },
+    "node_modules/mqtt": {
+      "version": "5.15.0",
+      "resolved": "https://registry.npmmirror.com/mqtt/-/mqtt-5.15.0.tgz",
+      "integrity": "sha512-KC+wAssYk83Qu5bT8YDzDYgUJxPhbLeVsDvpY2QvL28PnXYJzC2WkKruyMUgBAZaQ7h9lo9k2g4neRNUUxzgMw==",
+      "dependencies": {
+        "@types/readable-stream": "^4.0.21",
+        "@types/ws": "^8.18.1",
+        "commist": "^3.2.0",
+        "concat-stream": "^2.0.0",
+        "debug": "^4.4.1",
+        "help-me": "^5.0.0",
+        "lru-cache": "^10.4.3",
+        "minimist": "^1.2.8",
+        "mqtt-packet": "^9.0.2",
+        "number-allocator": "^1.0.14",
+        "readable-stream": "^4.7.0",
+        "rfdc": "^1.4.1",
+        "socks": "^2.8.6",
+        "split2": "^4.2.0",
+        "worker-timers": "^8.0.23",
+        "ws": "^8.18.3"
+      },
+      "bin": {
+        "mqtt": "build/bin/mqtt.js",
+        "mqtt_pub": "build/bin/pub.js",
+        "mqtt_sub": "build/bin/sub.js"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/mqtt-packet": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmmirror.com/mqtt-packet/-/mqtt-packet-9.0.2.tgz",
+      "integrity": "sha512-MvIY0B8/qjq7bKxdN1eD+nrljoeaai+qjLJgfRn3TiMuz0pamsIWY2bFODPZMSNmabsLANXsLl4EMoWvlaTZWA==",
+      "dependencies": {
+        "bl": "^6.0.8",
+        "debug": "^4.3.4",
+        "process-nextick-args": "^2.0.1"
+      }
+    },
+    "node_modules/mqtt-packet/node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmmirror.com/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/mqtt-packet/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "node_modules/mqtt/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmmirror.com/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
+    "node_modules/mqtt/node_modules/concat-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/concat-stream/-/concat-stream-2.0.0.tgz",
+      "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
+      "engines": [
+        "node >= 6.0"
+      ],
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.0.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "node_modules/mqtt/node_modules/concat-stream/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/mqtt/node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmmirror.com/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/mqtt/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="
+    },
+    "node_modules/mqtt/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "node_modules/mqtt/node_modules/readable-stream": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-4.7.0.tgz",
+      "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==",
+      "dependencies": {
+        "abort-controller": "^3.0.0",
+        "buffer": "^6.0.3",
+        "events": "^3.3.0",
+        "process": "^0.11.10",
+        "string_decoder": "^1.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/mqtt/node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
     "node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
+    "node_modules/nan": {
+      "version": "2.25.0",
+      "resolved": "https://registry.npmmirror.com/nan/-/nan-2.25.0.tgz",
+      "integrity": "sha512-0M90Ag7Xn5KMLLZ7zliPWP3rT90P6PN+IzVFS0VqmnPktBk3700xUVv8Ikm9EUaUE5SDWdp/BIxdENzVznpm1g==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmmirror.com/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -2907,6 +3253,36 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/number-allocator": {
+      "version": "1.0.14",
+      "resolved": "https://registry.npmmirror.com/number-allocator/-/number-allocator-1.0.14.tgz",
+      "integrity": "sha512-OrL44UTVAvkKdOdRQZIJpLkAdjXGTRda052sN4sO77bKEzYYqWKMBjQvrJFzqygI99gL6Z4u2xctPW1tB8ErvA==",
+      "dependencies": {
+        "debug": "^4.3.1",
+        "js-sdsl": "4.3.0"
+      }
+    },
+    "node_modules/number-allocator/node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmmirror.com/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/number-allocator/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
     "node_modules/object-copy": {
       "version": "0.1.0",
       "resolved": "https://registry.npmmirror.com/object-copy/-/object-copy-0.1.0.tgz",
@@ -3071,11 +3447,15 @@
         "node": ">=6"
       }
     },
+    "node_modules/paho-mqtt": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/paho-mqtt/-/paho-mqtt-1.1.0.tgz",
+      "integrity": "sha512-KPbL9KAB0ASvhSDbOrZBaccXS+/s7/LIofbPyERww8hM5Ko71GUJQ6Nmg0BWqj8phAIT8zdf/Sd/RftHU9i2HA=="
+    },
     "node_modules/pako": {
-      "version": "1.0.11",
+      "version": "2.1.0",
-      "resolved": "https://registry.npmmirror.com/pako/-/pako-1.0.11.tgz",
+      "resolved": "https://registry.npmmirror.com/pako/-/pako-2.1.0.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+      "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug=="
-      "dev": true
     },
     "node_modules/parallel-transform": {
       "version": "1.2.0",
@@ -3204,7 +3584,6 @@
       "version": "0.11.10",
       "resolved": "https://registry.npmmirror.com/process/-/process-0.11.10.tgz",
       "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
-      "dev": true,
       "engines": {
         "node": ">= 0.6.0"
       }
@@ -3212,8 +3591,7 @@
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-      "dev": true
     },
     "node_modules/promise-inflight": {
       "version": "1.0.1",
@@ -3418,6 +3796,11 @@
         "node": ">=0.12"
       }
     },
+    "node_modules/rfdc": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmmirror.com/rfdc/-/rfdc-1.4.1.tgz",
+      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA=="
+    },
     "node_modules/rimraf": {
       "version": "2.7.1",
       "resolved": "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz",
@@ -3454,7 +3837,6 @@
       "version": "5.2.1",
       "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz",
       "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -3596,6 +3978,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmmirror.com/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
     "node_modules/snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmmirror.com/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -3729,6 +4120,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/socks": {
+      "version": "2.8.7",
+      "resolved": "https://registry.npmmirror.com/socks/-/socks-2.8.7.tgz",
+      "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==",
+      "dependencies": {
+        "ip-address": "^10.0.1",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
     "node_modules/source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmmirror.com/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -3796,6 +4200,14 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/split2": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmmirror.com/split2/-/split2-4.2.0.tgz",
+      "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
+      "engines": {
+        "node": ">= 10.x"
+      }
+    },
     "node_modules/ssri": {
       "version": "6.0.2",
       "resolved": "https://registry.npmmirror.com/ssri/-/ssri-6.0.2.tgz",
@@ -4138,6 +4550,11 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
+    },
     "node_modules/tty-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmmirror.com/tty-browserify/-/tty-browserify-0.0.0.tgz",
@@ -4147,8 +4564,12 @@
     "node_modules/typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmmirror.com/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
+      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="
-      "dev": true
+    },
+    "node_modules/undici-types": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmmirror.com/undici-types/-/undici-types-7.18.2.tgz",
+      "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w=="
     },
     "node_modules/union-value": {
       "version": "1.0.1",
@@ -4295,8 +4716,7 @@
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
-      "dev": true
     },
     "node_modules/util/node_modules/inherits": {
       "version": "2.0.3",
@@ -4575,6 +4995,16 @@
         "node": ">= 4"
       }
     },
+    "node_modules/worker-factory": {
+      "version": "7.0.48",
+      "resolved": "https://registry.npmmirror.com/worker-factory/-/worker-factory-7.0.48.tgz",
+      "integrity": "sha512-CGmBy3tJvpBPjUvb0t4PrpKubUsfkI1Ohg0/GGFU2RvA9j/tiVYwKU8O7yu7gH06YtzbeJLzdUR29lmZKn5pag==",
+      "dependencies": {
+        "@babel/runtime": "^7.28.6",
+        "fast-unique-numbers": "^9.0.26",
+        "tslib": "^2.8.1"
+      }
+    },
     "node_modules/worker-farm": {
       "version": "1.7.0",
       "resolved": "https://registry.npmmirror.com/worker-farm/-/worker-farm-1.7.0.tgz",
@@ -4584,12 +5014,65 @@
         "errno": "~0.1.7"
       }
     },
+    "node_modules/worker-timers": {
+      "version": "8.0.30",
+      "resolved": "https://registry.npmmirror.com/worker-timers/-/worker-timers-8.0.30.tgz",
+      "integrity": "sha512-8P7YoMHWN0Tz7mg+9oEhuZdjBIn2z6gfjlJqFcHiDd9no/oLnMGCARCDkV1LR3ccQus62ZdtIp7t3aTKrMLHOg==",
+      "dependencies": {
+        "@babel/runtime": "^7.28.6",
+        "tslib": "^2.8.1",
+        "worker-timers-broker": "^8.0.15",
+        "worker-timers-worker": "^9.0.13"
+      }
+    },
+    "node_modules/worker-timers-broker": {
+      "version": "8.0.15",
+      "resolved": "https://registry.npmmirror.com/worker-timers-broker/-/worker-timers-broker-8.0.15.tgz",
+      "integrity": "sha512-Te+EiVUMzG5TtHdmaBZvBrZSFNauym6ImDaCAnzQUxvjnw+oGjMT2idmAOgDy30vOZMLejd0bcsc90Axu6XPWA==",
+      "dependencies": {
+        "@babel/runtime": "^7.28.6",
+        "broker-factory": "^3.1.13",
+        "fast-unique-numbers": "^9.0.26",
+        "tslib": "^2.8.1",
+        "worker-timers-worker": "^9.0.13"
+      }
+    },
+    "node_modules/worker-timers-worker": {
+      "version": "9.0.13",
+      "resolved": "https://registry.npmmirror.com/worker-timers-worker/-/worker-timers-worker-9.0.13.tgz",
+      "integrity": "sha512-qjn18szGb1kjcmh2traAdki1eiIS5ikFo+L90nfMOvSRpuDw1hAcR1nzkP2+Hkdqz5thIRnfuWx7QSpsEUsA6Q==",
+      "dependencies": {
+        "@babel/runtime": "^7.28.6",
+        "tslib": "^2.8.1",
+        "worker-factory": "^7.0.48"
+      }
+    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true
     },
+    "node_modules/ws": {
+      "version": "8.19.0",
+      "resolved": "https://registry.npmmirror.com/ws/-/ws-8.19.0.tgz",
+      "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmmirror.com/xtend/-/xtend-4.0.2.tgz",

package.json

@@ -18,7 +18,10 @@
     "@dcloudio/uni-helper-json": "^1.0.13",
     "crypto-js": "^4.2.0",
     "image-tools": "^1.4.0",
-    "jsencrypt": "^3.3.2"
+    "jsencrypt": "^3.3.2",
+    "mqtt": "^5.15.0",
+    "paho-mqtt": "^1.1.0",
+    "pako": "^2.1.0"
   },
   "devDependencies": {
     "compression-webpack-plugin": "^6.1.1",

pages.json

@@ -88,7 +88,16 @@
 					{
 						"navigationStyle": "custom"
 					}
+				},
+				{
+					"path" : "policy-Config/index",
+					"style" : 
+					{
+						"navigationBarTitleText" : "",
+						"navigationStyle": "custom"
+					}
 				}
+				
 			]
 		},
 

pages/home-page/device-detail/components/mppt.vue

@@ -136,7 +136,7 @@
 							[3, 120]
 						],
 						font: [{
-								text: this.$t('homePage.device.gridMode') + ':',
+								text: this.$t('homePage.device.gridModeCom') + ':',
 								size: 14,
 								color: "#999999",
 								width: 50,

pages/home-page/device-detail/components/pcs.vue

@@ -7,7 +7,7 @@
 			</view>
 		</view>
 		<view class="box">
-			<Section :title="$t('homePage.device.totalAcReaPower')">
+			<Section :title="$t('homePage.device.totalAcReaPower')" :style="language !== 'zh_CN'? 'flex-wrap: wrap;':''">
 				<view slot="right" style="flex: 1">
 					<view class="top-right-box">
 						<span class="time">{{$t('homePage.device.timeGranularity')}}:</span>
@@ -287,10 +287,10 @@
 					{
 						type: "text",
 						coord: [
-							[35, 80]
+							[3, 80]
 						],
 						font: [{
-								text: this.$t('homePage.device.dcbreaker') + ':',
+								text: this.$t('homePage.device.dcbreakerCom') + ':',
 								size: 14,
 								color: "#999999",
 								width: 50,
@@ -330,7 +330,7 @@
 							[3, 120]
 						],
 						font: [{
-								text: this.$t('homePage.device.gridMode') + ':',
+								text: this.$t('homePage.device.gridModeCom') + ':',
 								size: 14,
 								color: "#999999",
 								width: 50,
@@ -347,7 +347,7 @@
 					{
 						type: "text",
 						coord: [
-							[35, 140]
+							[3, 140]
 						],
 						font: [{
 								text: this.$t('homePage.device.deviceState') + ':',

pages/home-page/policy-Config/index.vue

@@ -0,0 +1,348 @@
+<template>
+  <view style="height: 100vh">
+    <view class="">
+      <u-navbar
+        :title="$t('homePage.policy.policyTitle')"
+        :is-back="true"
+        title-color="#FFF"
+        :background="background"
+        :border-bottom="false"
+        :custom-back="toback"
+      >
+      </u-navbar>
+    </view>
+    <view class="policeForm">
+      <u-form ref="form" labelPosition="top">
+        <view class="" v-for="(item, index) in smallArr" :key="index">
+          <view class="" v-if="item.type == 'Input'">
+            <u-form-item :label="item[`label_${lang}`]" :prop="item.prop">
+              <u-input
+                :key="'input_' + item.prop + '_' + item.inputKey"
+                :min="item.min"
+                :max="item.max"
+                :value="item.value"
+                type="number"
+                :placeholder="item[`place_${lang}`]"
+                @input="handleInput(item, $event)"
+              />
+            </u-form-item>
+          </view>
+          <view class="" v-if="item.type == 'Switch'">
+            <u-form-item :label="item[`label_${lang}`]" :prop="item.prop">
+              <u-switch :size="40" v-model="item.value"></u-switch>
+            </u-form-item>
+          </view>
+          <view class="" v-if="item.type == 'Select'">
+            <u-form-item :label="item[`label_${lang}`]" :prop="item.prop">
+              <view class="" v-show="false">
+                <u-input
+                  v-model="item.value"
+                  disabled
+                  @click="selectShow(item, index)"
+                />
+              </view>
+              <view class="select-value" @click.stop="selectShow(item, index)">
+                {{ item.selectLabel || $t("homePage.alarm.placeSelect") }}
+              </view>
+              <u-select
+                :key="item.prop"
+                @confirm="confirm($event, item)"
+                v-model="item.isShow"
+                :list="getSelectList(item)"
+              ></u-select>
+            </u-form-item>
+          </view>
+        </view>
+      </u-form>
+
+      <button
+        @click="submitDevice"
+        type="success"
+        size="mini"
+        style="
+          background-color: #009458;
+          padding: 10rpx 0;
+          color: #fff;
+          margin-top: 40rpx;
+          width: 100%;
+        "
+      >
+        {{ $t("homePage.mine.submit") }}
+      </button>
+    </view>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+import { formList } from "@/common/form.js";
+import { Langlist } from "@/common/lang";
+import mqtt from "@/uni_modules/leliven-mqtt/index.js";
+import pako from "pako";
+export default {
+  data() {
+    return {
+      formList: formList,
+      background: {
+        backgroundColor: "#0EA17E",
+      },
+
+      mqttClient: null,
+      backData: {},
+      smallArr: [],
+      user: {
+        username: "admin", // 设置用户名
+        password: "zzkj@688737", // 设置密码
+      },
+    };
+  },
+
+  computed: {
+    lang() {
+      return (
+        Langlist.find((v) => v.value == this.$store.state.vuex_language).prop ||
+        "en"
+      );
+    },
+    currentStation() {
+      return this.vuex_currentStation;
+    },
+  },
+  onLoad() {
+    this.getSn();
+  },
+
+  methods: {
+    getSn() {
+      this.$u.api.station
+        .getStationPostionSn({
+          stationId: this.currentStation.id,
+        })
+        .then((res) => {
+          this.sn = res.data[0]?.sn;
+          this.initmqttClient();
+        });
+    },
+    initmqttClient() {
+      console.log(this.lang);
+      console.log(this.currentStation);
+      // 初始化客户端连接地址
+      // #ifdef H5
+      let mqttClient = mqtt.connect("ws://1.95.170.86:8083/mqtt", {
+        ...this.user,
+      });
+      // #endif
+      // #ifdef MP-WEIXIN||APP-PLUS
+      let mqttClient = mqtt.connect("wx://1.95.170.86:8083/mqtt", {
+        ...this.user,
+      });
+      // #endif
+      this.mqttClient = mqttClient;
+      // 连接MQ服务
+      mqttClient
+        .on("connect", (res) => {
+          console.log("连接成功");
+          // 订阅主题
+          mqttClient.subscribe(`1/ems/${this.sn}/control/response`, (err) => {
+            console.log(`1/app/${this.sn}/control/request`);
+            if (!err) {
+              // 订阅成功
+              mqttClient.publish(
+                `1/app/${this.sn}/control/request`,
+                JSON.stringify({
+                  fun: "GET",
+                  type: "WJ_Get_NewControlSystem",
+                  content: 0,
+                }),
+              );
+            }
+          });
+        })
+        .on("reconnect", function () {
+          console.log("重新连接");
+        })
+        .on("error", function () {
+          console.log("连接失败");
+        })
+        .on("end", function () {
+          console.log("连接End");
+        })
+        .on("message", (topic, message) => {
+          console.log(this.decodeGzipBase64(message.toString()), "111");
+          let data = this.decodeGzipBase64(message.toString());
+          if (data.content && data.content.params) {
+            this.control(data.content);
+          } else if (data.content == 1) {
+            this.$refs.uToast.show({
+              title: this.$t("homePage.mine.operateSuccess"),
+              type: "success",
+            });
+          } else {
+            uni.showToast({
+              title: this.$t("homePage.mine.operateFail"),
+              icon: "none",
+            });
+          }
+        });
+    },
+
+    decodeGzipBase64(base64Str) {
+      // 1. base64 → Uint8Array
+      const binaryStr = atob(base64Str);
+      const len = binaryStr.length;
+      const bytes = new Uint8Array(len);
+
+      for (let i = 0; i < len; i++) {
+        bytes[i] = binaryStr.charCodeAt(i);
+      }
+
+      // 2. gunzip 解压
+      const decompressed = pako.ungzip(bytes, {
+        to: "string",
+      });
+      // 3. 转 JSON（如果是 JSON）
+      return JSON.parse(decompressed);
+    },
+    getSelectList(item) {
+      if (item.selectArr && item.selectArr.length > 0) {
+        return item.selectArr.map((option) => ({
+          value: option.value.toString(),
+          label: option[`label_${this.lang}`] || option.label,
+        }));
+      }
+      return [];
+    },
+    control(NewControlSystemShow_data) {
+      console.log(NewControlSystemShow_data, "123");
+      this.formList.forEach((item) => {
+        if (
+          item.type == "Switch" &&
+          NewControlSystemShow_data?.smallScreen?.includes(item.prop)
+        ) {
+          this.$set(
+            item,
+            "value",
+            NewControlSystemShow_data?.params[item.prop] ? true : false,
+          );
+        }
+        if (
+          item.type == "Input" &&
+          NewControlSystemShow_data?.smallScreen?.includes(item.prop)
+        ) {
+          this.$set(
+            item,
+            "value",
+            NewControlSystemShow_data?.params[item.prop] ?? item.default,
+          );
+        }
+        if (
+          item.type == "Select" &&
+          NewControlSystemShow_data?.smallScreen?.includes(item.prop)
+        ) {
+          const newValue =
+            NewControlSystemShow_data?.params[item.prop] ?? item.default;
+          this.$set(item, "value", newValue);
+          item.selectLabel = item.selectArr.find((v) => v.value == newValue)?.[
+            `label_${this.lang}`
+          ];
+        }
+        this.$set(item, "isShow", false);
+      });
+      this.backData = NewControlSystemShow_data;
+      this.smallArr = this.formList.filter((v) =>
+        NewControlSystemShow_data?.smallScreen.includes(v.prop),
+      );
+      console.log(this.smallArr, "234");
+    },
+    confirm(val, item) {
+      if (val && val.length > 0) {
+        this.$set(item, "value", val[0].value);
+        this.$set(item, "selectLabel", val[0].label);
+      }
+      this.$set(item, "isShow", false);
+    },
+    handleInput(item, value) {
+      try {
+        // u-input 组件 @input 事件直接传递 value 值，不是 event 对象
+        let iptval = String(value || "").replace(/[^0-9.]/g, "");
+        const parts = iptval.split(".");
+        if (parts.length > 2) {
+          iptval = parts[0] + "." + parts.slice(1).join("");
+        }
+        if (!iptval || iptval === ".") {
+          item.value = 0;
+          return;
+        }
+        let numVal = Number(iptval);
+        numVal = isNaN(numVal) ? 0 : numVal;
+
+        // 检查是否需要强制更新（值被限制）
+        let needForceUpdate = false;
+        if (item.min !== undefined && item.min !== null && numVal < item.min) {
+          numVal = item.min;
+          needForceUpdate = true;
+        }
+        if (item.max !== undefined && item.max !== null && numVal > item.max) {
+          numVal = item.max;
+          needForceUpdate = true;
+        }
+
+        item.value = numVal;
+
+        // 如果值被限制，强制重新渲染输入框
+        if (needForceUpdate) {
+          this.$set(item, "inputKey", (item.inputKey || 0) + 1);
+        }
+      } catch (error) {
+        console.log("handleInput方法错误:", error);
+      }
+    },
+
+    toback() {
+      uni.navigateBack();
+    },
+    selectShow(val, index) {
+      console.log(123);
+      this.$set(val, "isShow", true);
+    },
+    submitDevice() {
+      let smallParam = this.smallArr.reduce((pre, cur) => {
+        pre[cur.prop] = cur.type == "Switch" ? (cur.value ? 1 : 0) : cur.value;
+        pre[cur.prop] = Number(pre[cur.prop]);
+        return pre;
+      }, {});
+
+      this.mqttClient.publish(
+        `1/app/${this.sn}/control/request`,
+        JSON.stringify({
+          fun: "SET",
+          type: "WJ_Set_NewControlSystem",
+          content: {
+            ...this.backData,
+            params: {
+              ...this.backData.params,
+              ...smallParam,
+            },
+          },
+        }),
+      );
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.policeForm {
+  margin: 22rpx;
+  padding: 22rpx;
+  background-color: #fff;
+  box-shadow: 0px 4rpx 16rpx rgba(0, 0, 0, 0.1);
+  border-radius: 8rpx;
+}
+
+.select-value {
+  padding: 16rpx 0;
+  color: #333;
+  min-height: 60rpx;
+}
+</style>

pages/login/index.vue

@@ -94,41 +94,12 @@ import {
 } from "@/common/common.js"
 import messageModel from './components/dialog.vue'
 import config from '@/common/config.js'
+import { Langlist } from '@/common/lang.js'
 export default {
   components: { messageModel },
   data () {
     return {
-		Langlist: [{
+		Langlist:Langlist,
-			value: 'zh_CN',
-			label: '中文'
-		  },
-		  {
-			value: 'en_US',
-			label: 'English'
-		  },
-		  {
-			value: 'fr_FR',
-			label: 'French'
-		  }
-		  ,
-		  {
-			value: 'es_ES',
-			label: 'Spanish'
-		  },
-		  {
-			value: 'ar_EG',
-			label: 'Arabic'
-		  },
-		  {
-			value: 'de_DE',
-			label: 'German'
-		  }
-		  ,
-		  {
-			value: 'pl_PL',
-			label: 'Polish'
-		  }
-		],
       phoneNo: "",
       username: "",
       password: "",
@@ -301,6 +272,7 @@ export default {
     },
     changeLanguage (val) {
       this.$u.vuex("vuex_language", val[0].value);
+	  this.$u.vuex("vuex_configLang", val[0].prop);
       this.$i18n.locale = val[0].value
     },
     uploadFile () {
@@ -415,7 +387,7 @@ export default {
         }
         this.$u.api
           .login(params)
-          .then((res) => {
+          .then((res) => {    
             this.$u.vuex("vuex_token", res.data.accessToken)
             this.getMenuList()
             this.$u.vuex("vuex_iv", encryptData.iv)

pages/tabbar/components/topology/pv8FourthTopCenter.vue

@@ -981,7 +981,7 @@
 					}
 					
 				],
-				pointSpeed: 1, // 移动速度（像素/帧）
+				pointSpeed: 1.5, // 移动速度（像素/帧）
 				kWValues: {
 					pv1:null,
 					pv2:null,
@@ -994,7 +994,11 @@
 					pcs1:null,
 					pcs2:null,
 					pcs3:null,
-					pcs4:null
+					pcs4:null,
+					bms1:null,
+					bms2:null,
+					bms3:null,
+					bms4:null
 				}
 				
 			}
@@ -1247,42 +1251,34 @@
 				this.movingPoints.forEach(point => (point.isActive = false,point.isMove = false,point.currentStep = 0,point.x = point.path[0].x,point.y = point.path[0].y));
 				this.stationId = val
 				this.textCanvasData.splice(10)
-				const api = [ this.getpv1(), this.getpv2(), this.getPcs1(),
+				const api = [ this.getpv1(), this.getpv2(), this.getPcs1(), this.getBms1(),
-							  this.getpv3(), this.getpv4(), this.getPcs2(), 
+							  this.getpv3(), this.getpv4(), this.getPcs2(), this.getBms2(),
-							  this.getpv5(), this.getpv6(), this.getPcs3(), 
+							  this.getpv5(), this.getpv6(), this.getPcs3(), this.getBms3(),
-							  this.getpv7(), this.getpv8(), this.getPcs4(), 
+							  this.getpv7(), this.getpv8(), this.getPcs4(), this.getBms4(),
 							  this.getacdcCenter(), this.getAmmeter() 
 						]
 				Promise.all(api).finally((result) => {
 					// 获取三个 kW 值
-					const {pv1,pv2,pv3,pv4,pv5,pv6,pv7,pv8,pcs1,pcs2,pcs3,pcs4} = this.kWValues;
+					const {pv1,pv2,pv3,pv4,pv5,pv6,pv7,pv8,pcs1,pcs2,pcs3,pcs4,bms1,bms2,bms3,bms4} = this.kWValues;
 					const pvvalues = [pv1,pv2,pv3,pv4,pv5,pv6,pv7,pv8];
 					const pcsvalues = [pcs1,pcs2,pcs3,pcs4];
+					const bmsvalues = [bms1,bms2,bms3,bms4];
 					const pvallZero = pvvalues.every(v => v === 0);
 					const anyPositive = pvvalues.some(v => v > 1);
 					const anyNegative = pvvalues.some(v => v < 0);
-					const pcsanyNegative = pvvalues.some(v => v < 15);
+					const pcsValuesGreater = pcsvalues.some(v => v > 0);
+					const pcsValuesLess = pcsvalues.some(v => v < 0);
 					
 					// 重置所有点（确保干净）
 					this.movingPoints.forEach(p => (p.isActive = false));
-					// 条件3：全部为0 → 只显示点1
+					if(pcsValuesLess){
-					if (pvallZero) {
+						this.movingPoints.find(p => p.id === 'point-3').isActive = true;
-						this.movingPoints.find(p => p.id === 'point-1').isActive = true;
-						if(pcsanyNegative){
-							this.movingPoints.find(p => p.id === 'point-2').isActive = true;
-							this.movingPoints.find(p => p.id === 'point-4').isActive = true;
-							this.movingPoints.find(p => p.id === 'point-5').isActive = true;
-							this.movingPoints.find(p => p.id === 'point-6').isActive = true;
-							this.movingPoints.find(p => p.id === 'point-7').isActive = true;
-						}
-					} else {
-						// 条件1：任一大于0 → 点6运动
-						if (anyPositive) {
-							this.movingPoints.find(p => p.id === 'point-3').isActive = true;
-						}
-						// 再设置其他点显示逻辑
-						this.updatePvPcsPoints();
 					}
+					if(pcsValuesGreater && ((pv1 + pv2) < pcs1 || (pv3 + pv4) < pcs2 || (pv5 + pv6) < pcs3 || (pv7 + pv8) < pcs4)){
+						this.movingPoints.find(p => p.id === 'point-2').isActive = true;
+					}
+					// 设置其他点显示逻辑
+					this.updatePvPcsPoints();
 					this.canvasData = [...this.textCanvasData, ...this.imageCanvasData, ...this
 						.lineCanvasData, ...this.circleCanvasData
 					]
@@ -1360,30 +1356,101 @@
 			},
 			
 			updatePvPcsPoints() {
-			    const {pv1,pv2,pv3,pv4,pv5,pv6,pv7,pv8,pcs1,pcs2,pcs3,pcs4} = this.kWValues;
+			    const {pv1,pv2,pv3,pv4,pv5,pv6,pv7,pv8,pcs1,pcs2,pcs3,pcs4,bms1,bms2,bms3,bms4} = this.kWValues;
-				
+				// 处理点4、5、6、7
+			    const point4 = this.movingPoints.find(p => p.id === 'point-4');
+			    const point5 = this.movingPoints.find(p => p.id === 'point-5');
+			    const point6 = this.movingPoints.find(p => p.id === 'point-6');
+			    const point7 = this.movingPoints.find(p => p.id === 'point-7');
 			    // 处理左边：点8、9、10、11、12
 			    const point8 = this.movingPoints.find(p => p.id === 'point-8');
 			    const point9 = this.movingPoints.find(p => p.id === 'point-9');
 			    const point10 = this.movingPoints.find(p => p.id === 'point-10');
 			    const point11 = this.movingPoints.find(p => p.id === 'point-11');
 			    const point12 = this.movingPoints.find(p => p.id === 'point-12');
-				if(pv1 > 1){
+				if(pcs1 > 0){ //正充
-			        point8.isActive = true;
+					if((pv1 + pv2) < pcs1){ // 光伏小于pcs功率
-			        point9.isActive = true;
+						point4.isActive = true;
-				}else if (pv1 < 1){
+						point9.isActive = false;
-			        point8.isActive = false;
+						point11.isActive = false;
-			        point9.isActive = false;
+						if(pv1 > 0){
-				}
+							point8.isActive = true;
-				if(pv2 > 1){
+						}else{
-				    point10.isActive = true;
+							point8.isActive = false;
-				    point11.isActive = true;
+						}
-				}else if (pv2 < 1){
+						if(pv2 > 0){
-				    point10.isActive = false;
+							point10.isActive = true;
-				    point11.isActive = false;
+						}else{
-				}
+							point10.isActive = false;
-				if(pcs1 > 5){
+							}
-					point12.isActive = true;
+						point12.isActive = false;
+					}else if((pv1 + pv2) > pcs1){ // 光伏大于pcs功率
+						point4.isActive = false;
+						if(pv1 > 0){
+							point8.isActive = true;
+							point9.isActive = true;
+						}else{
+							point8.isActive = false;
+							point9.isActive = false;
+						}
+						if(pv2 > 0){
+							point10.isActive = true;
+							point11.isActive = true;
+						}else{
+							point10.isActive = false;
+							point11.isActive = false;
+						}
+						point12.isActive = false;
+					}else{
+						point4.isActive = false;
+						point8.isActive = true;
+						point9.isActive = false;
+						point10.isActive = true;
+						point11.isActive = false;
+						point12.isActive = false;
+					}
+				}else if(pcs1 < 0){ //负放 Math.abs(num)
+					if((pv1 + pv2) < Math.abs(pcs1)){  // 光伏小于pcs功率
+						if(pv1 > 0){ //光伏有功率
+							point8.isActive = false;
+							point9.isActive = true;
+						}else{
+							point8.isActive = false;
+							point9.isActive = false;
+						}
+						if(pv2 > 0){ //光伏有功率
+							point10.isActive = false;
+							point11.isActive = true;
+						}else{
+							point10.isActive = false;
+							point11.isActive = false;
+						}
+						point12.isActive = true;
+					}else if((pv1 + pv2) > Math.abs(pcs1)){ // 光伏大于pcs功率
+						if(pv1 > 0){ //光伏有功率
+							point8.isActive = true;
+							point9.isActive = true;
+						}else{
+							point8.isActive = false;
+							point9.isActive = false;
+						}
+						if(pv2 > 0){ //光伏有功率
+							point10.isActive = true;
+							point11.isActive = true;
+						}else{
+							point10.isActive = false;
+							point11.isActive = false;
+						}
+						point12.isActive = false;
+					}
+			        point4.isActive = false;
+				}else{
+			        point4.isActive = false;
+					point8.isActive = false;
+					point9.isActive = false;
+					point10.isActive = false;
+					point11.isActive = false;
+					point12.isActive = false;
 				}
 			    // 处理左边：点13、14、15、16、17
 			    const point13 = this.movingPoints.find(p => p.id === 'point-13');
@@ -1391,22 +1458,89 @@
 			    const point15 = this.movingPoints.find(p => p.id === 'point-15');
 			    const point16 = this.movingPoints.find(p => p.id === 'point-16');
 			    const point17 = this.movingPoints.find(p => p.id === 'point-17');
-				if(pv3 > 1){
+				if(pcs2 > 0){ //正充
-			        point13.isActive = true;
+					if((pv3 + pv4) < pcs2){ // 光伏小于pcs功率
-			        point14.isActive = true;
+						point5.isActive = true;
-				}else if (pv3 < 1){
+						point14.isActive = false;
-			        point13.isActive = false;
+						point16.isActive = false;
-			        point14.isActive = false;
+						if(pv3 > 0){
-				}
+							point13.isActive = true;
-				if(pv4 > 1){
+						}else{
-				    point15.isActive = true;
+							point13.isActive = false;
-				    point16.isActive = true;
+						}
-				}else if (pv4 < 1){
+						if(pv4 > 0){
-				    point15.isActive = false;
+							point15.isActive = true;
-				    point16.isActive = false;
+						}else{
-				}
+							point15.isActive = false;
-				if(pcs2 > 5){
+							}
-					point17.isActive = true;
+						point17.isActive = false;
+					}else if((pv3 + pv4) > pcs2){ // 光伏大于pcs功率
+						point5.isActive = false;
+						if(pv3 > 0){
+							point13.isActive = true;
+							point14.isActive = true;
+						}else{
+							point13.isActive = false;
+							point14.isActive = false;
+						}
+						if(pv4 > 0){
+							point15.isActive = true;
+							point16.isActive = true;
+						}else{
+							point15.isActive = false;
+							point16.isActive = false;
+						}
+						point17.isActive = false;
+					}else{
+						point5.isActive = false;
+						point13.isActive = true;
+						point14.isActive = false;
+						point15.isActive = true;
+						point16.isActive = false;
+						point17.isActive = false;
+					}
+				}else if(pcs2 < 0){ //负放 Math.abs(num)
+					if((pv3 + pv4) < Math.abs(pcs2)){  // 光伏小于pcs功率
+						if(pv3 > 0){ //光伏有功率
+							point13.isActive = false;
+							point14.isActive = true;
+						}else{
+							point13.isActive = false;
+							point14.isActive = false;
+						}
+						if(pv4 > 0){ //光伏有功率
+							point15.isActive = false;
+							point16.isActive = true;
+						}else{
+							point15.isActive = false;
+							point16.isActive = false;
+						}
+						point17.isActive = true;
+					}else if((pv3 + pv4) > Math.abs(pcs2)){ // 光伏大于pcs功率
+						if(pv3 > 0){ //光伏有功率
+							point13.isActive = true;
+							point14.isActive = true;
+						}else{
+							point13.isActive = false;
+							point14.isActive = false;
+						}
+						if(pv4 > 0){ //光伏有功率
+							point15.isActive = true;
+							point16.isActive = true;
+						}else{
+							point15.isActive = false;
+							point16.isActive = false;
+						}
+						point17.isActive = false;
+					}
+			        point5.isActive = false;
+				}else{
+			        point5.isActive = false;
+					point13.isActive = false;
+					point14.isActive = false;
+					point15.isActive = false;
+					point16.isActive = false;
+					point17.isActive = false;
 				}
 			    // 处理左边：点18、19、20、21、22
 			    const point18 = this.movingPoints.find(p => p.id === 'point-18');
@@ -1414,22 +1548,89 @@
 			    const point20 = this.movingPoints.find(p => p.id === 'point-20');
 			    const point21 = this.movingPoints.find(p => p.id === 'point-21');
 			    const point22 = this.movingPoints.find(p => p.id === 'point-22');
-				if(pv5 > 1){
+				if(pcs3 > 0){ //正充
-			        point18.isActive = true;
+					if((pv5 + pv6) < pcs3){ // 光伏小于pcs功率
-			        point19.isActive = true;
+						point6.isActive = true;
-				}else if (pv5 < 1){
+						point19.isActive = false;
-			        point18.isActive = false;
+						point21.isActive = false;
-			        point19.isActive = false;
+						if(pv5 > 0){
-				}
+							point18.isActive = true;
-				if(pv6 > 1){
+						}else{
-				    point20.isActive = true;
+							point18.isActive = false;
-				    point21.isActive = true;
+						}
-				}else if (pv6 < 1){
+						if(pv6 > 0){
-				    point20.isActive = false;
+							point20.isActive = true;
-				    point21.isActive = false;
+						}else{
-				}
+							point20.isActive = false;
-				if(pcs3 > 5){
+							}
-					point22.isActive = true;
+						point22.isActive = false;
+					}else if((pv5 + pv6) > pcs3){ // 光伏大于pcs功率
+						point6.isActive = false;
+						if(pv5 > 0){
+							point18.isActive = true;
+							point19.isActive = true;
+						}else{
+							point19.isActive = false;
+							point20.isActive = false;
+						}
+						if(pv6 > 0){
+							point20.isActive = true;
+							point21.isActive = true;
+						}else{
+							point20.isActive = false;
+							point21.isActive = false;
+						}
+						point22.isActive = false;
+					}else{
+						point6.isActive = false;
+						point18.isActive = true;
+						point19.isActive = false;
+						point20.isActive = true;
+						point21.isActive = false;
+						point22.isActive = false;
+					}
+				}else if(pcs3 < 0){ //负放 Math.abs(num)
+					if((pv5 + pv6) < Math.abs(pcs3)){  // 光伏小于pcs功率
+						if(pv5 > 0){ //光伏有功率
+							point18.isActive = true;
+							point19.isActive = false;
+						}else{
+							point18.isActive = false;
+							point19.isActive = false;
+						}
+						if(pv6 > 0){ //光伏有功率
+							point20.isActive = true;
+							point21.isActive = false;
+						}else{
+							point20.isActive = false;
+							point21.isActive = false;
+						}
+						point22.isActive = true;
+					}else if((pv5 + pv6) > Math.abs(pcs3)){ // 光伏大于pcs功率
+						if(pv5 > 0){ //光伏有功率
+							point18.isActive = true;
+							point19.isActive = true;
+						}else{
+							point18.isActive = false;
+							point19.isActive = false;
+						}
+						if(pv6 > 0){ //光伏有功率
+							point20.isActive = true;
+							point21.isActive = true;
+						}else{
+							point20.isActive = false;
+							point21.isActive = false;
+						}
+						point22.isActive = false;
+					}
+				    point6.isActive = false;
+				}else{
+				    point6.isActive = false;
+					point18.isActive = false;
+					point19.isActive = false;
+					point20.isActive = false;
+					point21.isActive = false;
+					point22.isActive = false;
 				}
 			    // 处理左边：点23、24、25、26、27
 			    const point23 = this.movingPoints.find(p => p.id === 'point-23');
@@ -1437,23 +1638,91 @@
 			    const point25 = this.movingPoints.find(p => p.id === 'point-25');
 			    const point26 = this.movingPoints.find(p => p.id === 'point-26');
 			    const point27 = this.movingPoints.find(p => p.id === 'point-27');
-				if(pv7 > 1){
+				if(pcs4 > 0){ //正充
-			        point23.isActive = true;
+					if((pv7 + pv8) < pcs4){ // 光伏小于pcs功率
-			        point24.isActive = true;
+						point7.isActive = true;
-				}else if (pv7 < 1){
+						point24.isActive = false;
-			        point23.isActive = false;
+						point26.isActive = false;
-			        point24.isActive = false;
+						if(pv7 > 0){
-				}
+							point23.isActive = true;
-				if(pv8 > 1){
+						}else{
-				    point25.isActive = true;
+							point23.isActive = false;
-				    point26.isActive = true;
+						}
-				}else if (pv8 < 1){
+						if(pv8 > 0){
-				    point25.isActive = false;
+							point25.isActive = true;
-				    point26.isActive = false;
+						}else{
-				}
+							point25.isActive = false;
-				if(pcs4 > 5){
+							}
-					point27.isActive = true;
+						point27.isActive = false;
+					}else if((pv7 + pv8) > pcs4){ // 光伏大于pcs功率
+						point7.isActive = false;
+						if(pv7 > 0){
+							point23.isActive = true;
+							point24.isActive = true;
+						}else{
+							point23.isActive = false;
+							point24.isActive = false;
+						}
+						if(pv8 > 0){
+							point25.isActive = true;
+							point26.isActive = true;
+						}else{
+							point25.isActive = false;
+							point26.isActive = false;
+						}
+						point27.isActive = false;
+					}else{
+						point7.isActive = false;
+						point23.isActive = true;
+						point24.isActive = false;
+						point25.isActive = true;
+						point26.isActive = false;
+						point27.isActive = false;
+					}
+				}else if(pcs4 < 0){ //负放 Math.abs(num)
+					if((pv7 + pv8) < Math.abs(pcs4)){  // 光伏小于pcs功率
+						if(pv7 > 0){ //光伏有功率
+							point23.isActive = false;
+							point24.isActive = true;
+						}else{
+							point23.isActive = false;
+							point24.isActive = false;
+						}
+						if(pv8 > 0){ //光伏有功率
+							point25.isActive = false;
+							point26.isActive = true;
+						}else{
+							point25.isActive = false;
+							point26.isActive = false;
+						}
+						point27.isActive = true;
+					}else if((pv7 + pv8) > Math.abs(pcs4)){ // 光伏大于pcs功率
+						if(pv7 > 0){ //光伏有功率
+							point23.isActive = true;
+							point24.isActive = true;
+						}else{
+							point23.isActive = false;
+							point24.isActive = false;
+						}
+						if(pv8 > 0){ //光伏有功率
+							point25.isActive = true;
+							point26.isActive = true;
+						}else{
+							point25.isActive = false;
+							point26.isActive = false;
+						}
+						point27.isActive = false;
+					}
+				    point7.isActive = false;
+				}else{
+				    point7.isActive = false;
+					point23.isActive = false;
+					point24.isActive = false;
+					point25.isActive = false;
+					point26.isActive = false;
+					point27.isActive = false;
 				}
+				
 			    
 			},
 
@@ -1612,6 +1881,33 @@
 							stationId: this.stationId,
 							pageLocation: 'triad-pcs-1'
 						})
+						.then((res) => {
+							if (res.data && res.data.length) {
+								res.data.forEach((item, index) => {
+									if (item.name.includes('kW')) {
+										const value = parseFloat(item.value);
+										self.kWValues.pcs1 = value;
+									}
+								})
+							} else {
+								this.kWValues.pcs1 = 0; // 没数据视为 0
+							}
+							resolve()
+						}).catch(() => {
+							this.kWValues.pcs1 = 0; // 出错也视为 0
+							resolve();
+						})
+				})
+			},
+			
+			getBms1() {
+				let self = this;
+				return new Promise((resolve, reject) => {
+					self.$u.api.homePageData
+						.GetDynamicConfig({
+							stationId: this.stationId,
+							pageLocation: 'triad-bms-1'
+						})
 						.then((res) => {
 							if (res.data && res.data.length) {
 								this.textCanvasData.push({
@@ -1641,7 +1937,7 @@
 								res.data.forEach((item, index) => {
 									if (item.name.includes('SOC')) {
 										const value = parseFloat(item.value);
-										this.kWValues.pcs1 = value;
+										this.kWValues.bms1 = value;
 									}
 									this.textCanvasData.push({
 										type: "text",
@@ -1657,11 +1953,11 @@
 									})
 								})
 							} else {
-								this.kWValues.pcs1 = 0; // 没数据视为 0
+								this.kWValues.bms1 = 0; // 没数据视为 0
 							}
 							resolve()
 						}).catch(() => {
-							this.kWValues.pcs1 = 0; // 出错也视为 0
+							this.kWValues.bms1 = 0; // 出错也视为 0
 							resolve();
 						})
 				})
@@ -1801,6 +2097,33 @@
 							stationId: this.stationId,
 							pageLocation: 'triad-pcs-2'
 						})
+						.then((res) => {
+							if (res.data && res.data.length) {
+								res.data.forEach((item, index) => {
+									if (item.name.includes('kW')) {
+										const value = parseFloat(item.value);
+										self.kWValues.pcs2 = value;
+									}
+								})
+							} else {
+								this.kWValues.pcs2 = 0; // 没数据视为 0
+							}
+							resolve()
+						}).catch(() => {
+							this.kWValues.pcs2 = 0; // 出错也视为 0
+							resolve();
+						})
+				})
+			},
+			
+			getBms2() {
+				let self = this;
+				return new Promise((resolve, reject) => {
+					self.$u.api.homePageData
+						.GetDynamicConfig({
+							stationId: this.stationId,
+							pageLocation: 'triad-bms-2'
+						})
 						.then((res) => {
 							if (res.data && res.data.length) {
 								this.textCanvasData.push({
@@ -1830,7 +2153,7 @@
 								res.data.forEach((item, index) => {
 									if (item.name.includes('SOC')) {
 										const value = parseFloat(item.value);
-										this.kWValues.pcs2 = value;
+										this.kWValues.bms2 = value;
 									}
 									this.textCanvasData.push({
 										type: "text",
@@ -1846,11 +2169,11 @@
 									})
 								})
 							} else {
-								this.kWValues.pcs2 = 0; // 没数据视为 0
+								this.kWValues.bms2 = 0; // 没数据视为 0
 							}
 							resolve()
 						}).catch(() => {
-							this.kWValues.pcs2 = 0; // 出错也视为 0
+							this.kWValues.bms2 = 0; // 出错也视为 0
 							resolve();
 						})
 				})
@@ -1990,6 +2313,33 @@
 							stationId: this.stationId,
 							pageLocation: 'triad-pcs-3'
 						})
+						.then((res) => {
+							if (res.data && res.data.length) {
+								res.data.forEach((item, index) => {
+									if (item.name.includes('kW')) {
+										const value = parseFloat(item.value);
+										self.kWValues.pcs3 = value;
+									}
+								})
+							} else {
+								this.kWValues.pcs3 = 0; // 没数据视为 0
+							}
+							resolve()
+						}).catch(() => {
+							this.kWValues.pcs3 = 0; // 出错也视为 0
+							resolve();
+						})
+				})
+			},
+			
+			getBms3() {
+				let self = this;
+				return new Promise((resolve, reject) => {
+					self.$u.api.homePageData
+						.GetDynamicConfig({
+							stationId: this.stationId,
+							pageLocation: 'triad-bms-3'
+						})
 						.then((res) => {
 							if (res.data && res.data.length) {
 								this.textCanvasData.push({
@@ -2019,7 +2369,7 @@
 								res.data.forEach((item, index) => {
 									if (item.name.includes('SOC')) {
 										const value = parseFloat(item.value);
-										this.kWValues.pcs3 = value;
+										this.kWValues.bms3 = value;
 									}
 									this.textCanvasData.push({
 										type: "text",
@@ -2035,11 +2385,11 @@
 									})
 								})
 							} else {
-								this.kWValues.pcs3 = 0; // 没数据视为 0
+								this.kWValues.bms3 = 0; // 没数据视为 0
 							}
 							resolve()
 						}).catch(() => {
-							this.kWValues.pcs3 = 0; // 出错也视为 0
+							this.kWValues.bms3 = 0; // 出错也视为 0
 							resolve();
 						})
 				})
@@ -2179,6 +2529,33 @@
 							stationId: this.stationId,
 							pageLocation: 'triad-pcs-4'
 						})
+						.then((res) => {
+							if (res.data && res.data.length) {
+								res.data.forEach((item, index) => {
+									if (item.name.includes('kW')) {
+										const value = parseFloat(item.value);
+										self.kWValues.pcs4 = value;
+									}
+								})
+							} else {
+								this.kWValues.pcs4 = 0; // 没数据视为 0
+							}
+							resolve()
+						}).catch(() => {
+							this.kWValues.pcs4 = 0; // 出错也视为 0
+							resolve();
+						})
+				})
+			},
+		
+			getBms4() {
+				let self = this;
+				return new Promise((resolve, reject) => {
+					self.$u.api.homePageData
+						.GetDynamicConfig({
+							stationId: this.stationId,
+							pageLocation: 'triad-bms-4'
+						})
 						.then((res) => {
 							if (res.data && res.data.length) {
 								this.textCanvasData.push({
@@ -2224,11 +2601,11 @@
 									})
 								})
 							} else {
-								this.kWValues.pcs4 = 0; // 没数据视为 0
+								this.kWValues.bms4 = 0; // 没数据视为 0
 							}
 							resolve()
 						}).catch(() => {
-							this.kWValues.pcs4 = 0; // 出错也视为 0
+							this.kWValues.bms4 = 0; // 出错也视为 0
 							resolve();
 						})
 				})

pages/tabbar/dashboard.vue

@@ -53,8 +53,9 @@
 					<runda215 v-else-if="topologyType === 12" ref="tuopu" />
 					<third v-else-if="topologyType === 13" ref="tuopu" />
 					<mdPviese v-else-if="topologyType === 14" ref="tuopu" />
-					<pv8FourthTopCenter v-else-if="topologyType === 1 && inverterFlag === 1 && pvTopologyType === 5" ref="tuopu" />
 					<pv2AndStorageSts v-else-if="topologyType === 1 && inverterFlag === 1 && pvTopologyType === 4" ref="tuopu" />
+					<pv8FourthTopCenter v-else-if="topologyType === 1 && inverterFlag === 1 && pvTopologyType === 5" ref="tuopu" />
+					<pv8FourthTopCenter v-else-if="topologyType === 1 && inverterFlag === 1 && pvTopologyType === 6" ref="tuopu" />
 					<!-- <third v-else-if="topologyType === 1 && inverterFlag === 1 && pvTopologyType === 4" ref="tuopu" /> -->
 					<!-- <cixi v-else-if="topologyType === 1 && inverterFlag === 1 && pvTopologyType === 3" ref="tuopu" /> -->
 					<!-- <ceshiL v-else-if="topologyType === 1 && inverterFlag === 1 && pvTopologyType === 2" ref="tuopu" /> -->
@@ -73,9 +74,9 @@
 			</view>
 
 			<view class="box">
-				<Section :title="$t('homePage.home.chargeDisData')">
+				<Section :title="$t('homePage.home.chargeDisData')" :style="language !== 'zh_CN'? 'flex-wrap: wrap;':''">
 					<view slot="right" style="flex: 1">
-						<view class="top-right-box">
+						<view class="top-right-box" :style="language !== 'zh_CN'? 'margin-top: 10rpx;':''">
 							<view class="top-right-item" :class="{ active: activeTime === 'day' }"
 								@click="changeTime('day')">{{this.$t('homePage.home.sevenDaycom')}}
 							</view>
@@ -216,7 +217,8 @@
 					{name:'pv1AndStorage_sts_261',value:2},
 					{name:'pv2AndStorage_261',value:3},
 					{name:'pv2AndStorage_sts_261',value:4},
-					{name:'pv8FourthTopCenter',value:5}
+					{name:'pv8FourthTopCenter',value:5},
+					{name:'pv8FourthDieselTopCenter',value:6}
 				],
 				pvTopologyType:0,
 				society: [{

pages/tabbar/mine.vue

@@ -146,6 +146,7 @@
 		},
 		methods: {
 			changeLanguage(val){
+				this.$u.vuex("vuex_configLang", val[0].prop);
 				this.$u.vuex("vuex_language", val[0].value);
 				this.$i18n.locale = val[0].value
 				this.getAllDict()

store/index.js

@@ -1,4 +1,3 @@
-
 import config from '@/common/config.js';
 import Vue from 'vue'
 import Vuex from 'vuex'
@@ -6,20 +5,22 @@ Vue.use(Vuex)
 
 let lifeData = {};
 
-try{
+try {
 	// 尝试获取本地是否存在lifeData变量，第一次启动APP时是不存在的
 	lifeData = uni.getStorageSync('lifeData');
-}catch(e){
+} catch (e) {
-	
+
 }
 
 // 需要永久存储，且下次APP启动需要取出的，在state中的变量名
-let saveStateKeys = ['vuex_user', 'vuex_token', 'vuex_remember', 'vuex_locale','vuex_isAgent','vuex_language','vuex_stationValue'];
+let saveStateKeys = ['vuex_user', 'vuex_token', 'vuex_remember', 'vuex_locale', 'vuex_isAgent', 'vuex_language',
+	'vuex_stationValue'
+];
 
 // 保存变量到本地存储中
-const saveLifeData = function(key, value){
+const saveLifeData = function(key, value) {
 	// 判断变量名是否在需要存储的数组中
-	if(saveStateKeys.indexOf(key) != -1) {
+	if (saveStateKeys.indexOf(key) != -1) {
 		// 获取本地存储的lifeData对象，将变量添加到对象中
 		let tmp = uni.getStorageSync('lifeData');
 		// 第一次打开APP，不存在lifeData变量，故放一个{}空对象
@@ -49,47 +50,46 @@ const store = new Vuex.Store({
 		vuex_isAgent: lifeData.vuex_isAgent ? lifeData.vuex_isAgent : '',
 		vuex_iv: lifeData.vuex_iv ? lifeData.vuex_iv : '',
 		vuex_psdkey: lifeData.vuex_psdkey ? lifeData.vuex_psdkey : '',
-		vuex_StationShow:lifeData.vuex_StationShow ? lifeData.vuex_StationShow : [0,0,0],
+		vuex_StationShow: lifeData.vuex_StationShow ? lifeData.vuex_StationShow : [0, 0, 0],
 		tabbar_current: 0,
-		vuex_stationValue:lifeData.vuex_stationValue ? lifeData.vuex_stationValue : '',
+		vuex_stationValue: lifeData.vuex_stationValue ? lifeData.vuex_stationValue : '',
-		vuex_inverterFlag:lifeData.vuex_inverterFlag ? lifeData.vuex_inverterFlag : 0,
+		vuex_inverterFlag: lifeData.vuex_inverterFlag ? lifeData.vuex_inverterFlag : 0,
-		tabbarList: [
+		tabbarList: [{
-	 			{
+				"icon": "warning",
-          "icon": "warning",
+				"text": "告警",
-          "text": "告警",
+				'name': 'Alarm'
-          'name': 'Alarm'
+			},
-        },
+			// {
-        // {
+			//   "icon": "order",
-        //   "icon": "order",
+			//   "text": "设备",
-        //   "text": "设备",
+			//   'name': 'Device'
-        //   'name': 'Device'
 
-        // },
+			// },
-        {
+			{
-          "icon": "moments",
+				"icon": "moments",
-          "text": "数据",
+				"text": "数据",
-          'name': 'Data'
+				'name': 'Data'
-        },
+			},
-        {
+			{
-          "icon": "attach",
+				"icon": "attach",
-          "text": "收益",
+				"text": "收益",
-          'name': 'Earnings'
+				'name': 'Earnings'
-        },
+			},
-        {
+			{
-          "icon": "attach",
+				"icon": "attach",
-          "text": "策略",
+				"text": "策略",
-          'name': 'Policy'
+				'name': 'Policy'
-        },
+			},
-        {
+			{
-          "icon": "account",
+				"icon": "account",
-          "text": "我的",
+				"text": "我的",
-          'name': 'My'
+				'name': 'My'
-        },
+			},
 		],
-		vuex_language:"en_US",
+		vuex_language: "en_US",
 		// 如果vuex_version无需保存到本地永久存储，无需lifeData.vuex_version方式
 		vuex_config: config,
-		vuex_currentComponent:'Data'
+		vuex_currentComponent: 'Data'
 	},
 	mutations: {
 		$uStore(state, payload) {
@@ -97,9 +97,9 @@ const store = new Vuex.Store({
 			let nameArr = payload.name.split('.');
 			let saveKey = '';
 			let len = nameArr.length;
-			if(len >= 2) {
+			if (len >= 2) {
 				let obj = state[nameArr[0]];
-				for(let i = 1; i < len - 1; i ++) {
+				for (let i = 1; i < len - 1; i++) {
 					obj = obj[nameArr[i]];
 				}
 				obj[nameArr[len - 1]] = payload.value;
@@ -115,4 +115,4 @@ const store = new Vuex.Store({
 	}
 })
 
-export default store
+export default store

uni_modules/leliven-mqtt/changelog.md

@@ -0,0 +1,4 @@
+## 1.0.1（2023-10-18）
+更新使用文档
+## 1.0.0（2023-10-18）
+初始化mqtt

uni_modules/leliven-mqtt/index.js

@@ -0,0 +1,3 @@
+import mqtt from './mqtt.min.js'
+
+export default mqtt

uni_modules/leliven-mqtt/package.json

@@ -0,0 +1,85 @@
+{
+  "id": "leliven-mqtt",
+  "displayName": "leliven-mqtt",
+  "version": "1.0.1",
+  "description": "leliven-mqtt",
+  "dependencies": {
+	  "mqtt": "^3.0.0"
+  },
+  "keywords": [
+    "leliven-mqtt"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "type": "sdk-js",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [
+	],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "u",
+          "vue3": "u"
+        },
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "u",
+          "Android Browser": "u",
+          "微信浏览器(Android)": "u",
+          "QQ浏览器(Android)": "u"
+        },
+        "H5-pc": {
+          "Chrome": "u",
+          "IE": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "u"
+        },
+        "小程序": {
+          "微信": "u",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u",
+          "钉钉": "u",
+          "快手": "u",
+          "飞书": "u",
+          "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}

uni_modules/leliven-mqtt/readme.md

@@ -0,0 +1,40 @@
+# leliven-mqtt
+
+## 使用
+1. 依赖 [leliven-mqtt](https://ext.dcloud.net.cn/plugin?name=leliven-mqtt)
+3. 页面引用 `	import mqtt from '@/uni_modules/leliven-mqtt/index.js'`
+4. 详细使用说明：[MQTT.js](https://github.com/mqttjs/MQTT.js)
+
+```js
+	
+	// 初始化客户端连接地址
+	// #ifdef H5
+	let client = mqtt.connect('ws://test.mosquitto.org:8080')
+	// #endif
+	// #ifdef MP-WEIXIN||APP-PLUS
+	let client = mqtt.connect('wx://test.mosquitto.org:8080')
+	// #endif
+	
+	// 连接MQ服务
+	client.on('connect', function() {
+		console.log('连接成功')
+		
+		// 订阅主题
+		client.subscribe('presence', function(err) {
+			if (!err) {
+				// 订阅成功
+				client.publish('presence', 'hello mqtt')
+			}
+		})
+	}).on('reconnect', function() {
+		console.log('重新连接')
+	}).on('error', function() {
+		console.log('连接失败')
+	}).on('end', function() {
+		console.log('连接End')
+	}).on('message', function(topic, message) {
+		// 收到MQ消息
+		console.log(message.toString())
+	})
+
+```

uni_modules/luyj-tree/components/luyj-tree-item/luyj-tree-item.scss

@@ -28,7 +28,7 @@
 
     // 默认箭头显示样式
     .right {
-      position: absolute;
+      // position: absolute;
       text-align: center;
       width: 80rpx;
       right: 30rpx;

uni_modules/luyj-tree/components/luyj-tree-item/luyj-tree-item.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container-list-item" >
-		<view class="content" @click="clickItem($event, item)">
+		<view class="content" @click="clickItem($event, item)" style="justify-content: space-between;">
 			<!-- 复选框 -->
 			<view class="checkbox" v-if="isCheckBox" @click.stop="clickBox($event , item)">
 				<i v-if="curChecked " :style="{'color' :checkActiveColor}"