Merge branch 'master' of git.picaiba.com:g7hoo/chenzhou

This commit is contained in:
gtz 2024-03-20 10:23:40 +08:00
commit 43f7ccac4c
4 changed files with 15 additions and 11 deletions

View File

@ -33,10 +33,12 @@ watch(
); );
const rate = computed(() => { const rate = computed(() => {
const _rate = ((props.rawData.nowYield / props.rawData.targetYield) * 100) if (!props.rawData.nowYield || props.rawData.nowYield == 0) return [0, 0];
.toFixed(2) // const _rate = ((props.rawData.nowYield / props.rawData.targetYield) * 100)
.toString(); // .toFixed(2)
return [parseInt(_rate), _rate.split(".")[1]]; // .toString();
// return [parseInt(_rate), _rate.split(".")[1]];
return [parseInt(props.rawData.nowYield), props.rawData.nowYield.split(".")[1]];
}); });
const chart = ref(null); const chart = ref(null);

View File

@ -98,17 +98,17 @@ function loadData(monthlyTarget) {
<p v-show="!show" class="empty-data-hint">暂无数据</p> --> <p v-show="!show" class="empty-data-hint">暂无数据</p> -->
<div class="container-body__h-full"> <div class="container-body__h-full">
<yield-chart <yield-chart
v-if="displayProductionChart" :display-placeholder="!displayProductionChart"
:key="refreshToken + '_yield_chart'" :key="refreshToken + '_yield_chart_linemonth'"
:raw-data="websocketData" :raw-data="websocketData"
/> />
<rate-chart <rate-chart
v-if="displayRateChart" :display-placeholder="!displayRateChart"
:key="refreshToken + '_rate_chart'" :key="refreshToken + '_rate_chart_linemonth'"
:raw-data="websocketData" :raw-data="websocketData"
:isOnlyChild="!displayProductionChart" :isOnlyChild="!displayProductionChart"
/> />
<p <!-- <p
v-if="!displayProductionChart && !displayRateChart" v-if="!displayProductionChart && !displayRateChart"
style=" style="
height: 100%; height: 100%;
@ -121,7 +121,7 @@ function loadData(monthlyTarget) {
" "
> >
暂无数据 暂无数据
</p> </p> -->
</div> </div>
</Container> </Container>
</template> </template>

View File

@ -104,10 +104,12 @@ function loadData(dailyTarget) {
<div class="container-body__h-full"> <div class="container-body__h-full">
<yield-chart <yield-chart
:display-placeholder="!displayProductionChart" :display-placeholder="!displayProductionChart"
:key="refreshToken + '_yield_chart_linetoday'"
:raw-data="websocketData" :raw-data="websocketData"
/> />
<rate-chart <rate-chart
:display-placeholder="!displayRateChart" :display-placeholder="!displayRateChart"
:key="refreshToken + '_rate_chart_linetoday'"
:raw-data="websocketData" :raw-data="websocketData"
:isOnlyChild="!displayProductionChart" :isOnlyChild="!displayProductionChart"
/> />

View File

@ -36,7 +36,7 @@ const props = defineProps({
} }
.data-list { .data-list {
height: 100%; /* height: 100%; */
width: 480px; width: 480px;
position: absolute; position: absolute;