From c6ea4a8c5228196fb22e7c01b3fed7bc3c296d87 Mon Sep 17 00:00:00 2001 From: huangjp Date: Fri, 7 Nov 2025 15:23:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=89=E4=BC=8F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/config.js | 4 +- common/locales/homePage/en.js | 32 +- common/locales/homePage/zh.js | 33 +- locales/homePage/en.js | 6 +- manifest.json | 22 +- .../device-detail/components/mppt.vue | 875 ++++++++++++++++++ pages/home-page/device-detail/index.vue | 10 + pages/home-page/device-list/index.vue | 4 +- pages/home-page/earningSelect/index.vue | 10 +- pages/home-page/earnings/index.vue | 6 +- .../lights/components/runChart/index.vue | 9 +- pages/home-page/lights/index.vue | 8 +- pages/home-page/policy-management/index.vue | 11 +- pages/login/index.vue | 8 +- pages/tabbar/components/grid/index.vue | 2 + pages/tabbar/components/topology/ceshiL.vue | 164 +++- pages/tabbar/components/topology/ceshiT.vue | 140 ++- pages/tabbar/dashboard.vue | 44 +- 18 files changed, 1256 insertions(+), 132 deletions(-) create mode 100644 pages/home-page/device-detail/components/mppt.vue diff --git a/common/config.js b/common/config.js index a0e0ce9..711c3d1 100644 --- a/common/config.js +++ b/common/config.js @@ -22,6 +22,6 @@ const config = { } // 设置后台接口服务的基础地址 -// config.baseUrl = "https://zzkj-cloud.com/api" - config.baseUrl = 'http://1.95.170.86:8002/api' +config.baseUrl = "https://zzkj-cloud.com/api" + // config.baseUrl = 'http://1.95.170.86:8002/api' export default config \ No newline at end of file diff --git a/common/locales/homePage/en.js b/common/locales/homePage/en.js index 2ac3044..7cc319e 100644 --- a/common/locales/homePage/en.js +++ b/common/locales/homePage/en.js @@ -31,6 +31,36 @@ export default { }, { name: 'Overseas Station' }], - useElecPrice: 'Electricity prices' + useElecPrice: 'Electricity prices', + workStatus: 'Working Status：', + standing:'standing', + activePower:'Active Power(kW):', + operatingPower:'Operating Power', + accumulatedElectricityConsumption:'Total power', + pvKpi: 'PV KPI', + saveStandardCoal: 'Save standard coal (ton)', + equivalentCo2Reduction: "CO2 emission reduction (kg)", + equivalentTreePlantings: "Equivalent tree plantings (Trees)", + dailyPowerGeneration: 'Daily Power Generation', + cumulativePowerGeneration: 'Cumulative Power Generation', + socialContribution: 'Social Contribution', + energyStorageRevenueReport:'Energy Storage Revenue Report', + pvStorageRevenueReport:'PV Revenue Report', + projectMonthlyPower:'Monthly power generation of the project', + powerGeneration:'power generation', + mpptTopu:'MPPT topology diagram', + powerGenerationCapacity: 'Output power', + batVoltage: 'BAT voltage', + batCurrent: 'BAT current', + busVoltage: 'BUS voltage', + busCurrent: 'BUS current', + dc: 'DC', + dcVoltage: 'DC voltage', + operatingPower: 'operating power', + pvPower:'power', + enmonthTotalChargePrice: 'Total Charging Price Monthly(EUR)', + enmonthTotalDisChargePrice: 'Total Discharging Price Monthly(EUR)', + enearnings: 'Revenue(EUR)', + pvSwitch:'PV switch' } } \ No newline at end of file diff --git a/common/locales/homePage/zh.js b/common/locales/homePage/zh.js index 0ceb735..9a9febd 100644 --- a/common/locales/homePage/zh.js +++ b/common/locales/homePage/zh.js @@ -31,6 +31,37 @@ export default { }, { name: '海外站' }], - useElecPrice: '用电价格' + useElecPrice: '用电价格', + workStatus: '工作状态：', + standing:'静置', + activePower:'有功功率(kW):', + operatingPower:'运行功率', + accumulatedElectricityConsumption:'累计电量', + pvKpi: '光伏KPI', + saveStandardCoal: '节约标准煤(吨)', + equivalentCo2Reduction: 'CO2减排(吨)', + equivalentTreePlantings: '等效植树(棵)', + dailyPowerGeneration: '日发电量', + cumulativePowerGeneration: '累计发电量', + socialContribution: '社会贡献', + energyStorageRevenueReport:'储能收益报表', + pvStorageRevenueReport:'光伏收益报表', + projectMonthlyPower:'项目月发电量', + powerGeneration:'发电量', + mpptTopu:'MPPT拓扑图', + powerGenerationCapacity: '发电功率', + batVoltage: 'BAT电压', + batCurrent: 'BAT电流', + busVoltage: 'BAT电压', + busCurrent: 'BAT电流', + dc: '直流电流', + dcVoltage: '直流电压', + operatingPower: '运行功率', + pvPower:'功率', + enmonthTotalChargePrice: '本月总充电量总价(元)', + enmonthTotalDisChargePrice: '本月总放电量总价(元)', + enearnings: '收益(元)', + pvSwitch:'PV开关' + } }; \ No newline at end of file diff --git a/locales/homePage/en.js b/locales/homePage/en.js index d35a81b..e65b172 100644 --- a/locales/homePage/en.js +++ b/locales/homePage/en.js @@ -353,9 +353,9 @@ export default { dischargeVol: 'Cumulative Discharging Volume', totalEff: 'Cumulative Conversion Efficiency', projectRevenue: 'Project Revenue', - monthTotalChargePrice: 'Total Charging Price Monthly(RMB)', - monthTotalDisChargePrice: 'Total Discharging Price Monthly(RMB)', - earnings: 'Revenue(RMB)', + monthTotalChargePrice: 'Total Charging Price Monthly(EUR)', + monthTotalDisChargePrice: 'Total Discharging Price Monthly(EUR)', + earnings: 'Revenue(EUR)', earningsDetail: 'Revenue Detail', charge: 'Charge', ele: 'Electricity(kWh)', diff --git a/manifest.json b/manifest.json index c1d749c..9d03192 100644 --- a/manifest.json +++ b/manifest.json @@ -1,11 +1,11 @@ { - "name": "StoraSmart", - "appid": "__UNI__86592F3", + "name" : "StoraSmart", + "appid" : "__UNI__86592F3", "description" : "Zetatech", - "versionName" : "2.0.2", - "versionCode" : 207, + "versionName" : "2.0.8", + "versionCode" : 213, "transformPx" : false, - "sassImplementationName": "node-sass", + "sassImplementationName" : "node-sass", "app-plus" : { "compatible" : { "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 @@ -32,10 +32,15 @@ "modules" : {}, "distribute" : { "android" : { + "permissions" : [], + "useAutoPermissions" : false, "minSdkVersion" : 32, "targetSdkVersion" : 36, - "permissions" : [], - "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ] + "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ], + "excludePermissions" : [ + "", + "" + ] }, "ios" : { "dSYMs" : false @@ -155,5 +160,6 @@ "disableHostCheck" : true } }, - "locale" : "en" + "locale" : "en", + "fallbackLocale" : "en" } diff --git a/pages/home-page/device-detail/components/mppt.vue b/pages/home-page/device-detail/components/mppt.vue new file mode 100644 index 0000000..5eb6e58 --- /dev/null +++ b/pages/home-page/device-detail/components/mppt.vue @@ -0,0 +1,875 @@ + + + \ No newline at end of file diff --git a/pages/home-page/device-detail/index.vue b/pages/home-page/device-detail/index.vue index 906aefb..27fd6c9 100644 --- a/pages/home-page/device-detail/index.vue +++ b/pages/home-page/device-detail/index.vue @@ -23,6 +23,7 @@ + @@ -44,6 +45,7 @@ import JKPCS from './components/jingke-pcs.vue' import JKStack from './components/jingke-stack.vue' import PCS from './components/pcs.vue' + import MPPT from './components/mppt.vue' import Cluster from './components/cluster.vue' import Stack from './components/stack.vue' import Pack from './components/pack.vue' @@ -108,6 +110,10 @@ if (this.$refs.PCS) { this.$refs.PCS.getData(this.srcId) } + // 新增mppt + if (this.$refs.MPPT) { + this.$refs.MPPT.getData(this.srcId) + } if (this.$refs.Stack) { this.$refs.Stack.getData(this.srcId) } @@ -137,6 +143,7 @@ components: { JKPCS, PCS, + MPPT, DeviceYC, DeviceYX, Cluster, @@ -202,6 +209,9 @@ if (this.$refs.PCS) { this.$refs.PCS.getData(this.srcId) } + if (this.$refs.MPPT) { + this.$refs.MPPT.getData(this.srcId) + } if (this.$refs.Stack) { this.$refs.Stack.getData(this.srcId) } diff --git a/pages/home-page/device-list/index.vue b/pages/home-page/device-list/index.vue index 005e95c..ef0bb15 100644 --- a/pages/home-page/device-list/index.vue +++ b/pages/home-page/device-list/index.vue @@ -84,8 +84,8 @@ type = "storage"; } else if (item.deviceType?.includes("basic") ) { type = "anything" - } else { - type = "pcs"; + } else if (item.deviceType?.includes("mttp") ) { + type = "mttp" } if (type) { diff --git a/pages/home-page/earningSelect/index.vue b/pages/home-page/earningSelect/index.vue index a663ae8..071bccb 100644 --- a/pages/home-page/earningSelect/index.vue +++ b/pages/home-page/earningSelect/index.vue @@ -8,10 +8,10 @@ - - + @@ -43,12 +43,12 @@ }, labeArr: [ { - label: '储能收益报表', + label: this.$t("homePage.home.energyStorageRevenueReport"), icon: require('@/static/aidex/images/earningSelect.png'), url: '/pages/home-page/earnings/index' }, { - label: '光伏收益报表', + label: this.$t("homePage.home.pvStorageRevenueReport"), icon: require('@/static/aidex/images/earningSelect.png'), url: '/pages/home-page/lights/index' }, diff --git a/pages/home-page/earnings/index.vue b/pages/home-page/earnings/index.vue index 13edc90..e2cab2a 100644 --- a/pages/home-page/earnings/index.vue +++ b/pages/home-page/earnings/index.vue @@ -149,7 +149,7 @@ {{ totalData.totalChargePrice | isNull }} - {{ $t('homePage.earning.monthTotalChargePrice') }} + {{ $t('homePage.home.enmonthTotalChargePrice') }} @@ -164,7 +164,7 @@ {{ totalData.totalDisChargePrice | isNull }} - {{ $t('homePage.earning.monthTotalDisChargePrice') }} + {{ $t('homePage.home.enmonthTotalDisChargePrice') }} @@ -179,7 +179,7 @@ {{ totalData.income | isNull }} - {{ $t('homePage.earning.earnings') }} + {{ $t('homePage.home.enearnings') }} diff --git a/pages/home-page/lights/components/runChart/index.vue b/pages/home-page/lights/components/runChart/index.vue index 0cf2080..bb6936a 100644 --- a/pages/home-page/lights/components/runChart/index.vue +++ b/pages/home-page/lights/components/runChart/index.vue @@ -39,7 +39,7 @@ column: { width: '10', } - } + }, } }; }, @@ -49,17 +49,18 @@ }, methods: { getServerData() { + let _this = this; //模拟从服务器获取数据时的延时 setTimeout(() => { //模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接 let res = { - categories: ["2018-10-17", "2018-10-17", "2018-10-17", "2018-10-17", "2018-10-17", - "2018-10-17" + categories: ["2025-10-17", "2025-10-18", "2025-10-19", "2025-10-20", "2025-10-21", + "2025-10-22" ], series: [ { - + name:this.$t('homePage.home.powerGeneration'), textColor: "#FFFFFF", data: [18, 27, 21, 24, 6, 28] } diff --git a/pages/home-page/lights/index.vue b/pages/home-page/lights/index.vue index 3b2efaf..b9e77f9 100644 --- a/pages/home-page/lights/index.vue +++ b/pages/home-page/lights/index.vue @@ -105,7 +105,7 @@ -
+
@@ -123,7 +123,7 @@ {{ totalData.totalChargePrice | isNull }} - {{ $t("homePage.earning.monthTotalChargePrice") }} + {{ $t("homePage.home.enmonthTotalChargePrice") }} @@ -138,7 +138,7 @@ {{ totalData.totalDisChargePrice | isNull }} - {{ $t("homePage.earning.monthTotalDisChargePrice") }} + {{ $t("homePage.home.enmonthTotalDisChargePrice") }} @@ -150,7 +150,7 @@ {{ totalData.income | isNull }} - {{ $t("homePage.earning.earnings") }} + {{ $t("homePage.home.enearnings") }} diff --git a/pages/home-page/policy-management/index.vue b/pages/home-page/policy-management/index.vue index e6a1a77..495934a 100644 --- a/pages/home-page/policy-management/index.vue +++ b/pages/home-page/policy-management/index.vue @@ -54,17 +54,22 @@ - - + diff --git a/pages/login/index.vue b/pages/login/index.vue index 377c1e9..d00790a 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -189,13 +189,13 @@ export default { // this.$u.vuex("vuex_stationValue", val); if (val === '海外站' || val === 'Overseas Station') { this.$u.http.setConfig({ - baseUrl: 'http://1.95.170.86:8002/api', - // baseUrl: 'https://zetatech.zzkj-cloud.com/api' + // baseUrl: 'http://1.95.170.86:8002/api', + baseUrl: 'https://zetatech.zzkj-cloud.com/api' }); } else if (val === '中国站' || val === 'China Station') { this.$u.http.setConfig({ - baseUrl: 'http://1.95.170.86:8002/api' - // baseUrl: 'https://zzkj-cloud.com/api' + // baseUrl: 'http://1.95.170.86:8002/api' + baseUrl: 'https://zzkj-cloud.com/api' }); } const res = await this.$u.api.GetLanguageConfig('zh') diff --git a/pages/tabbar/components/grid/index.vue b/pages/tabbar/components/grid/index.vue index 5df4924..2136c4d 100644 --- a/pages/tabbar/components/grid/index.vue +++ b/pages/tabbar/components/grid/index.vue @@ -61,6 +61,8 @@ .label { font-size: 24rpx; color: #5A5A5A; + text-align: center; + white-space: pre-wrap; } .rightMark { position: absolute; diff --git a/pages/tabbar/components/topology/ceshiL.vue b/pages/tabbar/components/topology/ceshiL.vue index 3432a62..0e56d45 100644 --- a/pages/tabbar/components/topology/ceshiL.vue +++ b/pages/tabbar/components/topology/ceshiL.vue @@ -1652,9 +1652,32 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1675,17 +1698,17 @@ y: 194 }, { - text: '计量电表功率(kW):100', + text: this.$t('homePage.home.workStatus') + this.$t('homePage.home.standing'), x: 535, y: 370 }, { - text: '计量电表功率(kW):120', + text: this.$t('homePage.home.activePower') + '120', x: 535, y: 420 }, { - text: '运行功率', + text: this.$t('homePage.home.operatingPower'), x: 58, y: 860 }, @@ -1695,7 +1718,7 @@ y: 920 }, { - text: '累计电量', + text: this.$t('homePage.home.accumulatedElectricityConsumption'), x: 58, y: 990 }, @@ -1705,7 +1728,7 @@ y: 1050 }, { - text: '运行功率', + text: this.$t('homePage.home.operatingPower'), x: 460, y: 860 }, @@ -1715,7 +1738,7 @@ y: 920 }, { - text: '累计电量', + text: this.$t('homePage.home.accumulatedElectricityConsumption'), x: 460, y: 990 }, @@ -1727,28 +1750,15 @@ { text: 'SOC(%):100', x: 810, - y: 860 + y: 910 }, { text: 'SOH(%):100', x: 810, - y: 920 + y: 960 }, { - text: '有机功率', - x: 840, - y: 990 - }, - { - text: '(kWh):100', - x: 810, - y: 1050 - }, - - - - { - text: '运行功率', + text: this.$t('homePage.home.operatingPower'), x: 58, y: 1420 }, @@ -1758,7 +1768,7 @@ y: 1480 }, { - text: '累计电量', + text: this.$t('homePage.home.accumulatedElectricityConsumption'), x: 58, y: 1550 }, @@ -1768,7 +1778,7 @@ y: 1610 }, { - text: '运行功率', + text: this.$t('homePage.home.operatingPower'), x: 460, y: 1420 }, @@ -1778,7 +1788,7 @@ y: 1480 }, { - text: '累计电量', + text: this.$t('homePage.home.accumulatedElectricityConsumption'), x: 460, y: 1550 }, @@ -1790,23 +1800,13 @@ { text: 'SOC(%):100', x: 810, - y: 1420 + y: 1470 }, { text: 'SOH(%):100', x: 810, - y: 1480 - }, - { - text: '有机功率', - x: 840, - y: 1550 - }, - { - text: '(kWh):100', - x: 810, - y: 1610 - }, + y: 1530 + } ] } }, @@ -1837,4 +1837,86 @@ font-size: 40px; fill: #7F7F7F; } + .anim-pv1{ + animation: moveToplfetpv1 3s linear 0s infinite both; + } + @keyframes moveToplfetpv1 { + 0% { cx: 160; cy: 680; } + 10% { cx: 160; cy: 600; } + 37.5% { cx: 10; cy: 600; } + 67.5% { cx: 10; cy: 405; } + 99.9999% { cx: 180; cy: 405; } + 100% { cx: 160; cy: 680; } + } + .anim-pv2{ + animation: moveToplfetpv2 3.8s linear 0s infinite both; + } + @keyframes moveToplfetpv2 { + 0% { cx: 560; cy: 680; } + 10% { cx: 560; cy: 600; } + 57.5% { cx: 10; cy: 600; } + 77.5% { cx: 10; cy: 405; } + 99.9999% { cx: 180; cy: 405; } + 100% { cx: 560; cy: 680; } + } + .anim-pv3{ + animation: moveToplfetpv3 5s linear 0s infinite both; + } + @keyframes moveToplfetpv3 { + 0% { cx: 160; cy: 1230; } + 7% { cx: 160; cy: 1160; } + 21% { cx: 10; cy: 1160; } + 70% { cx: 10; cy: 405; } + 99.9999% { cx: 180; cy: 405; } + 100% { cx: 160; cy: 1230; } + } + .anim-pv4{ + animation: moveToplfetpv4 6.5s linear 0s infinite both; + } + @keyframes moveToplfetpv4 { + 0% { cx: 560; cy: 1230; } + 5% { cx: 560; cy: 1160; } + 45% { cx: 10; cy: 1160; } + 85% { cx: 10; cy: 405; } + 99.9999% { cx: 180; cy: 405; } + 100% { cx: 560; cy: 1230; } + } + .anim-elebox1{ + animation: moveToplfetbox1 5s linear 0s infinite both; + } + @keyframes moveToplfetbox1 { + 0% { cx: 925; cy: 680; } + 10% { cx: 925; cy: 600; } + 67.5% { cx: 10; cy: 600; } + 82.5% { cx: 10; cy: 405; } + 99.9999% { cx: 180; cy: 405; } + 100% { cx: 925; cy: 680; } + } + .anim-elebox2{ + animation: moveToplfetbox2 8s linear 0s infinite both; + } + @keyframes moveToplfetbox2 { + 0% { cx: 925; cy: 1230; } + 5% { cx: 925; cy: 1160; } + 55% { cx: 10; cy: 1160; } + 90% { cx: 10; cy: 405; } + 99.9999% { cx: 180; cy: 405; } + 100% { cx: 925; cy: 1230; } + } + .animation{ + animation: moveRightTopRight 5s linear 0s infinite both; + } + .anim-pvele{ + animation-delay: 0s; + } + @keyframes moveRightTopRight { + 0% { cx: 300; cy: 400; } + 15% { cx: 435; cy: 400; } + 50% { cx: 435; cy: 64; } + 99.9999% { cx: 940; cy: 64; } + 100% { cx: 300; cy: 400; } + } + .anim-boxele{ + animation-delay: 1s; + } \ No newline at end of file diff --git a/pages/tabbar/components/topology/ceshiT.vue b/pages/tabbar/components/topology/ceshiT.vue index 8b46daa..6b41e07 100644 --- a/pages/tabbar/components/topology/ceshiT.vue +++ b/pages/tabbar/components/topology/ceshiT.vue @@ -550,11 +550,21 @@ + + + + + + + + + + - - - + + + @@ -566,57 +576,57 @@ return { tags: [ { - text: '100kW', + text: '', x: 68, y: 194 }, { - text: '100kW', + text: '', x: 1060, y: 194 }, { - text: '计量电表功率(kW):100', + text: this.$t('homePage.home.workStatus') + this.$t('homePage.home.standing'), x: 655, y: 400 }, { - text: '计量电表功率(kW):120', + text: this.$t('homePage.home.activePower') + '120', x: 655, y: 460 }, { - text: '运行功率', + text: this.$t('homePage.home.operatingPower'), x: 48, y: 1110 }, { - text: '(kW):100', + text: '(kW):50', x: 48, y: 1170 }, { - text: '累计电量', + text: this.$t('homePage.home.accumulatedElectricityConsumption'), x: 48, y: 1240 }, { - text: '(kWh):100', + text: '(kWh):220', x: 48, y: 1300 }, { - text: '运行功率', + text: this.$t('homePage.home.operatingPower'), x: 470, y: 1110 }, { - text: '(kW):100', + text: '(kW):50', x: 470, y: 1170 }, { - text: '累计电量', + text: this.$t('homePage.home.accumulatedElectricityConsumption'), x: 470, y: 1240 }, @@ -626,25 +636,15 @@ y: 1300 }, { - text: 'SOC(%):100', + text: 'SOC(%):73', x: 880, - y: 1110 + y: 1160 }, { - text: 'SOH(%):100', + text: 'SOH(%):99', x: 880, - y: 1170 - }, - { - text: '有机功率', - x: 920, - y: 1230 - }, - { - text: '(kWh):100', - x: 900, - y: 1300 - }, + y: 1220 + } ] } }, @@ -675,4 +675,86 @@ font-size: 40px; fill: #7F7F7F; } + /* 通用动画点样式 */ + .anim-pv1 { + r: 15; /* 半径 */ + fill: #338EFE; /* 颜色 */ + /* CSS 动画核心配置：动画名称 时长 时间函数 延迟 循环次数 填充模式 */ + animation: moveTopRightTop 3s linear 0s infinite both; + } + .anim-pv2 { + r: 15; + fill: #338EFE; + animation: moveTop 2s linear 0s infinite both; + } + .anim-elebox1 { + r: 15; + fill: #58D86B; + animation: moveTopleftTop 3s linear 0s infinite both; + } + /* 关键帧：定义运动轨迹（向右→向下→复位） */ + @keyframes moveTopRightTop { + /* 0%：初始位置（cx=280, cy=67） */ + 0% { + cx: 155; + cy: 920; + } + + 10% { + cx: 155; + cy: 845; + } + /* 65%：向右移动（2s 完成，对应总时长 3.1s 的 65%） */ + 65% { + cx: 570; /* 横向终点 */ + cy: 845; /* 纵向保持初始 */ + } + /* 97%：向下移动（1s 完成，对应总时长 3.1s 的 97%） */ + 99.99% { + cx: 570; /* 横向保持终点 */ + cy: 680; /* 纵向终点 */ + } + /* 100%：瞬间复位（避免卡顿） */ + 100% { + cx: 155; + cy: 920; + } + } + @keyframes moveTop { + 0% { + cx: 570; + cy: 920; + } + 99.99% { + cx: 570; + cy: 680; + } + 100% { + cx: 570; + cy: 920; + } + } + @keyframes moveTopleftTop { + 0% { cx: 1000; cy: 920; } + 10% { cx: 1000; cy: 845; } + 65% { cx: 570; cy: 845; } + 99.99% { cx: 570; cy: 680; } + 100% { cx: 1000; cy: 920; } + } + + .anim-topright{ + animation: moveTopRight 4s linear 0s infinite both; + } + .anim-pvele{ + animation-delay: 0s; + } + .anim-boxele{ + animation-delay: 1s; + } + @keyframes moveTopRight { + 0% { cx: 573; cy: 500; } + 50% { cx: 573; cy: 67; } + 99.99% { cx: 1000; cy: 67; } + 100% { cx: 573; cy: 500; } + } \ No newline at end of file diff --git a/pages/tabbar/dashboard.vue b/pages/tabbar/dashboard.vue index 42ae2b9..ba1f447 100644 --- a/pages/tabbar/dashboard.vue +++ b/pages/tabbar/dashboard.vue @@ -48,10 +48,10 @@ + - - + + 当前组件有数据处理示例 - + -->
@@ -105,19 +105,19 @@ - -
+ +
- +
-
+
@@ -207,40 +207,40 @@ tuopuTimer: null, rightCenter: null, society: [{ - label: '充放电数据', - value: '85.00', + label: this.$t('homePage.home.saveStandardCoal'), + value: '15.00', image: require('@/static/aidex/images/ll01.png'), }, { - label: 'CO2减排(吨)', - value: '85.00', + label: this.$t('homePage.home.equivalentCo2Reduction'), + value: '20.50', image: require('@/static/aidex/images/ll02.png'), }, { - label: '等效植树(万棵)', - value: '85.00', + label: this.$t('homePage.home.equivalentTreePlantings'), + value: '1.50', image: require('@/static/aidex/images/ll03.png'), }, ], lightArr: [{ - label: '装机总容量(kWh)', - value: '85.00', + label: this.$t('homePage.home.totalCapacity') + '(kW)', + value: '100.00', image: require('@/static/aidex/images/ll05.png'), }, { - label: '当前功率(kW)', - value: '85.00', + label: this.$t('homePage.home.currentPower') + '(kW)', + value: '47.00', image: require('@/static/aidex/images/ll06.png'), }, { - label: '日发电量(kWh)', + label: this.$t('homePage.home.dailyPowerGeneration') + '(kWh)', value: '85.00', image: require('@/static/aidex/images/ll07.png'), showMark: true }, { - label: '总发电量(MWh)', - value: '85.00', + label: this.$t('homePage.home.cumulativePowerGeneration') + '(kWh)', + value: '496.00', image: require('@/static/aidex/images/ll07.png'), showMark: true }, @@ -273,7 +273,7 @@ this.stationId = val.id this.userId = this.userData.userId - console.log(val.topologyType) + console.log('拓扑图',val) this.topologyType = val.topologyType this.getComponents() this.$nextTick(() => {