From 2276c1f9dd33576c3805bb125991b7d8b5938947 Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Mon, 29 Jan 2024 17:03:21 +0800
Subject: [PATCH] 1

---
 src/components/TeamChartDayOptions.js       | 19 +++++--------------
 src/components/datapage/LatestWeekYield.vue |  4 ++--
 src/components/datapage/LineMonth.vue       |  2 +-
 src/components/datapage/LineToday.vue       |  2 +-
 src/pages/DataPage.vue                      | 12 ++++++------
 src/pages/ThreeDimension.vue                |  2 +-
 6 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/src/components/TeamChartDayOptions.js b/src/components/TeamChartDayOptions.js
index 45ac40f..379eb22 100644
--- a/src/components/TeamChartDayOptions.js
+++ b/src/components/TeamChartDayOptions.js
@@ -1,11 +1,13 @@
 export const options = {
-  color: ['#ffd601', '#72340b'],
+  color: ['#ffd601', '#72340b', '#a4c9d1'],
   grid: {
     top: 10,
     bottom: 0,
     left: 0,
     right: 28,
-    containLabel: true,
+  },  
+  legend: {
+    show: false,
   },
   xAxis: {
     max: 100,
@@ -23,8 +25,6 @@ export const options = {
     type: "category",
     data: ["A组", "B组", "C组"],
     inverse: true,
-    animationDuration: 300,
-    animationDurationUpdate: 300,
     max: 2, // only the largest 3 bars will be displayed
     axisLabel: {
       fontSize: 16,
@@ -38,27 +38,18 @@ export const options = {
   },
   series: [
     {
-      realtimeSort: true,
       type: "bar",
-      // data: [10, 20, 30],
       data: [],
       label: {
         show: true,
         position: "right",
-        valueAnimation: true,
         formatter: "{c}%",
         color: "#fff",
         fontSize: 16,
       },
     },
   ],
-  legend: {
-    show: false,
-  },
-  animationDuration: 0,
-  animationDurationUpdate: 3000,
-  animationEasing: "linear",
-  animationEasingUpdate: "linear",
+
 };
 
 export default function setup(echartInstance, dataArr) {
diff --git a/src/components/datapage/LatestWeekYield.vue b/src/components/datapage/LatestWeekYield.vue
index 6c16a53..fb5a8df 100644
--- a/src/components/datapage/LatestWeekYield.vue
+++ b/src/components/datapage/LatestWeekYield.vue
@@ -3,7 +3,7 @@ import { ref, watch, onMounted, nextTick } from "vue";
 import * as echarts from "echarts";
 import Container from "../Base/Container.vue";
 import { useWsStore } from "../../store";
-import chartSetup from "./LatestWeekYield";
+import chartSetup from "./LatestWeekYieldOptions";
 
 const store = useWsStore();
 const chartChart = ref(null);
@@ -77,7 +77,7 @@ onMounted(() => {
 </script>
 
 <template>
-  <Container class="chart" title="小时数据" icon="cube">
+  <Container class="chart" title="近7日产量" icon="cube">
     <div ref="chartChart" class="chart-chart" style="{opacity: (hourData && hourData.length > 0) ? 1 : 0}"></div>
     <p v-show="!hourData || hourData.length === 0" class="empty-data-hint">
       暂无数据
diff --git a/src/components/datapage/LineMonth.vue b/src/components/datapage/LineMonth.vue
index f2310b1..540a643 100644
--- a/src/components/datapage/LineMonth.vue
+++ b/src/components/datapage/LineMonth.vue
@@ -54,7 +54,7 @@ onMounted(() => {
 </script>
 
 <template>
-  <Container class="chart" title="本月班组情况" icon="cube">
+  <Container class="chart" title="本月生产线情况" icon="cube">
     <div ref="chartChart" class="chart-chart" style="{opacity: (monthData) ? 1 : 0}"></div>
     <p v-show="!monthData" class="empty-data-hint">暂无数据</p>
   </Container>
diff --git a/src/components/datapage/LineToday.vue b/src/components/datapage/LineToday.vue
index 9ec3393..8ca3c57 100644
--- a/src/components/datapage/LineToday.vue
+++ b/src/components/datapage/LineToday.vue
@@ -54,7 +54,7 @@ onMounted(() => {
 </script>
 
 <template>
-  <Container class="chart" title="本月班组情况" icon="cube">
+  <Container class="chart" title="本日生产线情况" icon="cube">
     <div ref="chartChart" class="chart-chart" style="{opacity: (monthData) ? 1 : 0}"></div>
     <p v-show="!monthData" class="empty-data-hint">暂无数据</p>
   </Container>
diff --git a/src/pages/DataPage.vue b/src/pages/DataPage.vue
index b43e950..04be6a7 100644
--- a/src/pages/DataPage.vue
+++ b/src/pages/DataPage.vue
@@ -12,17 +12,17 @@ import LineMonth from '../components/datapage/LineMonth.vue';
 <template>
   <div class="data-page">
     <!-- 小时数据 -->
-    <HourChart />
+    <!-- <HourChart /> -->
     <!-- 近7日产量 -->
-    <LatestWeekYield />
+    <!-- <LatestWeekYield /> -->
     <!-- 本日生产线情况 -->
-    <LineToday />
+    <!-- <LineToday /> -->
     <!-- 本月生产线情况 -->
-    <LineMonth />
+    <!-- <LineMonth /> -->
     <!-- 本日班组情况 -->
-    <TeamChartDay />
+    <!-- <TeamChartDay /> -->
     <!-- 本月班组情况 -->
-    <TeamChartMonth />
+    <!-- <TeamChartMonth /> -->
   </div>
 </template>
 
diff --git a/src/pages/ThreeDimension.vue b/src/pages/ThreeDimension.vue
index 0009a88..e5b6252 100644
--- a/src/pages/ThreeDimension.vue
+++ b/src/pages/ThreeDimension.vue
@@ -21,7 +21,7 @@ const props = defineProps({
     </div>
     <div class="data-list">
       <HourChart />
-      <TeamChartDay />
+      <!-- <TeamChartDay /> -->
       <TeamChartMonth />
     </div>
   </div>