done 本月生产线情况

src/components/datapage/LineMonth.vue

@@ -5,68 +5,100 @@ import Container from "../Base/Container.vue";
 import { useWsStore } from "../../store";
 import setupFn from "./LineMonthOptions";
 
+const show = ref(false);
+const chartContainer = ref(null);
+const chartInstance = ref(null);
 const store = useWsStore();
-const chartChart = ref(null);
-const chart = ref(null);
-
-const monthData = ref(null);
-store.$subscribe((mutation, state) => {
-  console.log("[ChartMonth]  ===>  state: ", state.data2.monthlyTarget);
-  if (
-    state.data2.monthlyTarget == undefined ||
-    state.data2.monthlyTarget?.length == 0
-  ) {
-    console.log("[ChartMonth]  ===>  清除状态");
-    monthData.value = null;
-    if (chart.value) chart.value.dispose();
-    return;
-  }
-
-  if (!state.data2.monthlyTarget[0]) return;
-  const { targetProduction, nowProduction, targetYield, nowYield } =
-    state.data2.monthlyTarget[0];
-  monthData.value = { targetProduction, nowProduction, targetYield, nowYield };
-  setupChart();
-});
-
-
 
 // 绿色：24FF5E
 // 黄色：FFB524
 // 红色：FF3737
-
+onMounted(() => {
-
+  chartContainer.value.classList.add("h-full");
-function setupChart() {
+  const d = loadData(store.data2.monthlyTarget);
-  if (chart.value) chart.value.dispose();
+  // const d = loadData([
-  nextTick(() => {
+  //   {
-    console.log("[ChartMonth]  ===>  初始化表格: ", monthData.value);
+  //     targetProduction: 100,
-    chart.value = echarts.init(chartChart.value);
+  //     nowProduction: 66,
-    setupFn(chart.value, monthData.value);
+  //     targetYield: 13,
+  //     nowYield: 3,
+  //   },
+  // ]);
+  if (!d) {
+    show.value = false;
+    if (chartInstance.value) {
+      chartInstance.value.dispose();
+      chartInstance.value = null;
+    }
+  } else {
+    if (!chartInstance.value)
+      chartInstance.value = echarts.init(chartContainer.value);
+    setupFn(chartInstance.value, d);
+    show.value = true;
+  }
 });
+
+// 订阅
+store.$subscribe((mutation, state) => {
+  const d = loadData(state.data2.monthlyTarget);
+  // const d = loadData([
+  //   {
+  //     targetProduction: 100,
+  //     nowProduction: 66,
+  //     targetYield: 13,
+  //     nowYield: 3,
+  //   },
+  // ]);
+  if (!d) {
+    show.value = false;
+    if (chartInstance.value) {
+      chartInstance.value.dispose();
+      chartInstance.value = null;
+    }
+  } else {
+    if (!chartInstance.value)
+      chartInstance.value = echarts.init(chartContainer.value);
+    setupFn(chartInstance.value, d);
+    show.value = true;
+  }
+});
+
+// utils
+function loadData(monthlyTarget) {
+  if (
+    monthlyTarget == undefined ||
+    // monthlyTarget?.length == 0 ||
+    !monthlyTarget[0]
+  ) {
+    return null;
   }
 
-onMounted(() => {
+  return {
-  chartChart.value.classList.add("h-full");
+    targetProduction: monthlyTarget[0].targetProduction,
-  // nextTick(() => {
+    nowProduction: monthlyTarget[0].nowProduction,
-  //   setupChart();
+    targetYield: monthlyTarget[0].targetYield,
-  // })
+    nowYield: monthlyTarget[0].nowYield,
-});
+  };
+}
 </script>
 
 <template>
   <Container class="chart" title="本月生产线情况" icon="cube">
-    <div ref="chartChart" class="chart-chart" style="{opacity: (monthData) ? 1 : 0}"></div>
+    <div
-    <p v-show="!monthData" class="empty-data-hint">暂无数据</p>
+      ref="chartContainer"
+      class="chart-chart"
+      :style="{ opacity: show ? 1 : 0 }"
+    ></div>
+    <p v-show="!show" class="empty-data-hint">暂无数据</p>
   </Container>
 </template>
 
 <style scoped>
 .chart {
   /* height: 300px; */
+  height: auto;
 }
 
-.chart-inner {}
-
 .chart-chart {
   height: 100%;
 }

src/components/datapage/LineMonthOptions.js

@@ -56,11 +56,11 @@ export const options = {
       radius: "55%",
       progress: {
         show: true,
-        width: 12,
+        width: 24,
       },
       axisLine: {
         lineStyle: {
-          width: 12,
+          width: 24,
         },
       },
       pointer: {
@@ -97,11 +97,11 @@ export const options = {
       radius: "55%",
       progress: {
         show: true,
-        width: 12,
+        width: 24,
       },
       axisLine: {
         lineStyle: {
-          width: 12,
+          width: 24,
         },
       },
       pointer: {

src/pages/DataPage.vue

@@ -18,7 +18,7 @@ import LineMonth from '../components/datapage/LineMonth.vue';
     <!-- 本日生产线情况 -->
     <LineToday />
     <!-- 本月生产线情况 -->
-    <!-- <LineMonth /> -->
+    <LineMonth />
     <!-- 本日班组情况 -->
     <!-- <TeamChartDay /> -->
     <!-- 本月班组情况 -->