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

src/components/Chart/RateChart.vue

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

src/components/datapage/LineMonth.vue

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

src/components/datapage/LineToday.vue

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

src/pages/ThreeDimension.vue

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