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

This commit is contained in:
pengqiao1993
2026-03-09 15:04:58 +08:00
32 changed files with 5836 additions and 3257 deletions

View File

@ -903,7 +903,19 @@
}
},
color: ['#009458', '#f0c252', '#0f94da'],
legend: {},
legend: {
type: 'scroll',
orient: 'horizontal',
icon: "rect",
bottom: 0,
left: 0,
right: 0,
itemWidth: 10,
itemHeight: 10,
textStyle: {
fontSize: 10,
}
},
xAxis: {
type: 'category',
boundaryGap: false,
@ -1085,7 +1097,19 @@
}
},
color: ['#009458', '#f0c252', '#0f94da'],
legend: {},
legend: {
type: 'scroll',
orient: 'horizontal',
icon: "rect",
bottom: 0,
left: 0,
right: 0,
itemWidth: 10,
itemHeight: 10,
textStyle: {
fontSize: 10,
}
},
xAxis: {
type: 'category',
boundaryGap: false,

View File

@ -20,71 +20,6 @@
<charts v-else id="pcsChart" :options="curve_option"></charts>
</view>
</view>
<!-- <view class="box" style="margin-bottom: 0;">
<Section :title="$t('homePage.device.deviceData')" />
<zero-loading v-if="stationLoading" position="absolute"></zero-loading>
<view v-else class="group-box">
<view class="group-item" @click="showHistory($t('homePage.home.batVoltage'), 'outputPower', 'pcs', 'kW', '')">
<view class="history-icon">
<image src="/static/aidex/images/history-icon.png"></image>
</view>
<view class="item-icon">
<image src="/static/aidex/images/zjrl.png"></image>
</view>
<view class="item-con">
<view class="item-num">{{ panelData.pvActivePower | kWFormat }}
</view>
<view class="item-title">{{$t('homePage.home.batVoltage')}}(V)</view>
</view>
</view>
<view class="group-item border-right"
@click="showHistory($t('homePage.home.batCurrent'), 'reactivePowerPCS', 'pcs', 'V', '')">
<view class="history-icon">
<image src="/static/aidex/images/history-icon.png"></image>
</view>
<view class="item-icon">
<image src="/static/aidex/images/zjrl.png"></image>
</view>
<view class="item-con">
<view class="item-num">{{ panelData.lowV }}
</view>
<view class="item-title">{{$t('homePage.home.batCurrent')}}(A)</view>
</view>
</view>
<view class="group-item" @click="showHistory($t('homePage.home.busVoltage'), 'grid', 'pcs', 'Hz', '')">
<view class="history-icon">
<image src="/static/aidex/images/history-icon.png"></image>
</view>
<view class="item-icon">
<image src="/static/aidex/images/dqgl.png"></image>
</view>
<view class="item-con">
<view class="item-num">{{ panelData.lowI | isNull }}
</view>
<view class="item-title">{{$t('homePage.home.busVoltage')}}(V)</view>
</view>
</view>
<view class="group-item border-right" @click="showHistory($t('homePage.home.busCurrent'), 'volA', 'pcs', 'V', '')">
<view class="history-icon">
<image src="/static/aidex/images/history-icon.png"></image>
</view>
<view class="item-icon">
<image src="/static/aidex/images/zfdl.png"></image>
</view>
<view class="item-con">
<view class="item-num">{{ panelData.highV | isNull }}
</view>
<view class="item-title">{{$t('homePage.home.busCurrent')}}(A)</view>
</view>
</view>
</view>
</view> -->
<historyModal :is-show.sync="histroyShow" :title="chartTitle" :params="hisParams" />
<u-action-sheet :list="actionSheetList" v-model="timeShow" @click="actionSheetCallback" @close="closeTimeAction"
:mask-close-able="false"></u-action-sheet>
@ -234,8 +169,6 @@
},
],
}
],
imageCanvasData: [
{
@ -331,7 +264,7 @@
const xAxis = [];
val.forEach((v) => {
xAxis.push(v.data);
gonglv.push(v.planCurve);
gonglv.push(v.inCoreDataCurve);
// soc.push(v.inCoreDataCurve);
});
this.curve_option = {
@ -512,13 +445,11 @@
this.textCanvasData[1].font[1].text = res.data.highV?.value ? res.data.highV.value + " V" : 0 + " V";
this.textCanvasData[2].font[1].text = res.data.lowV?.value ? res.data.lowV.value + " V" : 0 + " V";
this.textCanvasData[3].font[1].text = res.data.lowI?.value ? res.data.lowI.value + " A" : 0 + " A";
this.textCanvasData[5].font[1].text = res.data.onGrid?.value ?
this.$t('homePage.device.grid') :
this.$t('homePage.device.offGrid');
if(res.data.outputPower?.value){
this.textCanvasData[6].font[1].text = this.getFlowDirection(res.data.outputPower?.value, res
.data.flowDirection)
}
this.textCanvasData[4].font[1].text = res.data.onGrid?.value ? this.$t('homePage.device.grid') : this.$t('homePage.device.offGrid');
if(res.data.pvActivePower?.value){
this.textCanvasData[5].font[1].text = this.getFlowDirection(res.data.pvActivePower?.value, res
.data.runState?.value)
}
this.canvasData = [...this.textCanvasData, ...this.imageCanvasData, ...this.lineCanvasData]
})
.finally((res) => {