From 227411e38ee425bf7899b64c9aec835ca7430308 Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Sun, 28 Apr 2024 14:54:54 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BA=A7=E9=87=8F=E9=A9=BE=E9=A9=B6?=
 =?UTF-8?q?=E8=88=B1=E7=9A=84=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |   4 +-
 .../copilot/components/ChartContainer.vue     |  69 ++++++++++++++++++
 .../charts/base/fetcherDoubleRing.js          |  10 ---
 src/views/copilot/components/name.vue         |   0
 .../charts/base => yield/assets}/icon.png     | Bin
 .../components}/BipvOutput.vue                |   2 +-
 .../components}/ChipInvest.vue                |   4 +-
 .../components}/ChipOutput.vue                |   2 +-
 .../charts => yield/components}/FtoInvest.vue |   4 +-
 .../charts => yield/components}/StdOutput.vue |   2 +-
 .../components/sub/bar}/BarChartBase.vue      |   4 +-
 .../components/sub/city}/CityData.vue         |   0
 .../components/sub/city}/CityItem.vue         |   5 +-
 .../components/sub/city}/CityName.vue         |   2 +-
 .../components/sub/city}/CityValue.vue        |   2 +-
 .../components/sub/gradient}/GradientText.vue |   0
 .../components/sub/ring}/DoubleRingChart.vue  |   2 +-
 .../sub/ring}/DoubleRingWrapper.vue           |   4 +-
 src/views/copilot/yield/index.vue             |  22 +++---
 .../options}/double-ring-chart-options.js     |   0
 20 files changed, 99 insertions(+), 39 deletions(-)
 create mode 100644 src/views/copilot/components/ChartContainer.vue
 delete mode 100644 src/views/copilot/components/charts/base/fetcherDoubleRing.js
 delete mode 100644 src/views/copilot/components/name.vue
 rename src/views/copilot/{components/charts/base => yield/assets}/icon.png (100%)
 rename src/views/copilot/{components/charts => yield/components}/BipvOutput.vue (88%)
 rename src/views/copilot/{components/charts => yield/components}/ChipInvest.vue (97%)
 rename src/views/copilot/{components/charts => yield/components}/ChipOutput.vue (88%)
 rename src/views/copilot/{components/charts => yield/components}/FtoInvest.vue (97%)
 rename src/views/copilot/{components/charts => yield/components}/StdOutput.vue (88%)
 rename src/views/copilot/{components/charts/base => yield/components/sub/bar}/BarChartBase.vue (98%)
 rename src/views/copilot/{components/charts/base => yield/components/sub/city}/CityData.vue (100%)
 rename src/views/copilot/{components/charts/base => yield/components/sub/city}/CityItem.vue (88%)
 rename src/views/copilot/{components/charts/base => yield/components/sub/city}/CityName.vue (94%)
 rename src/views/copilot/{components/charts/base => yield/components/sub/city}/CityValue.vue (97%)
 rename src/views/copilot/{components/charts/base => yield/components/sub/gradient}/GradientText.vue (100%)
 rename src/views/copilot/{components/charts/base => yield/components/sub/ring}/DoubleRingChart.vue (98%)
 rename src/views/copilot/{components/charts/base => yield/components/sub/ring}/DoubleRingWrapper.vue (93%)
 rename src/views/copilot/{components/charts/base => yield/options}/double-ring-chart-options.js (100%)

diff --git a/.env.dev b/.env.dev
index f62007f..e8ccd63 100644
--- a/.env.dev
+++ b/.env.dev
@@ -5,8 +5,8 @@ ENV = 'development'
 VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/开发环境
-# VUE_APP_BASE_API = 'http://192.168.1.61:48080'
-VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
+VUE_APP_BASE_API = 'http://192.168.1.61:48080'
+# VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/views/copilot/components/ChartContainer.vue b/src/views/copilot/components/ChartContainer.vue
new file mode 100644
index 0000000..2dec009
--- /dev/null
+++ b/src/views/copilot/components/ChartContainer.vue
@@ -0,0 +1,69 @@
+<!-- 
+    filename: ChartContainer.vue
+    author: liubin
+    date: 2024-04-10 08:54:33
+    description: 
+    todo: 驾驶舱和首页的 ChartContainer, 实现滑动条 和动态宽高
+-->
+
+<template>
+  <div class="chart-container" :class="{ 'no-scroll': noScroll }">
+    <slot />
+  </div>
+</template>
+
+<script>
+export default {
+  name: "ChartContainer",
+  components: {},
+  props: {
+    noScroll: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.chart-container {
+  height: 0;
+  flex: 1;
+  overflow-x: scroll;
+}
+
+.no-scroll::-webkit-scrollbar {
+  width: 0;
+  height: 0;
+}
+
+::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+}
+
+::-webkit-scrollbar-button {
+  width: 0;
+  height: 0;
+  //   width: 10px;
+  //   height: 10px;
+  //   background: #14305f;
+}
+
+::-webkit-scrollbar-track {
+  background: #14305f;
+  border: 0 none;
+  border-radius: 0;
+}
+
+::-webkit-scrollbar-thumb {
+  background: #004798;
+  border: 0 none;
+  border-radius: 6px;
+}
+</style>
diff --git a/src/views/copilot/components/charts/base/fetcherDoubleRing.js b/src/views/copilot/components/charts/base/fetcherDoubleRing.js
deleted file mode 100644
index 6f452a6..0000000
--- a/src/views/copilot/components/charts/base/fetcherDoubleRing.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export default {
-  getData: async function (url) {
-    //
-    return await new Promise((resolve, reject) => {
-      setTimeout(() => {
-        resolve([90119, 40801, 44028]);
-      }, 1200);
-    });
-  },
-};
diff --git a/src/views/copilot/components/name.vue b/src/views/copilot/components/name.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/views/copilot/components/charts/base/icon.png b/src/views/copilot/yield/assets/icon.png
similarity index 100%
rename from src/views/copilot/components/charts/base/icon.png
rename to src/views/copilot/yield/assets/icon.png
diff --git a/src/views/copilot/components/charts/BipvOutput.vue b/src/views/copilot/yield/components/BipvOutput.vue
similarity index 88%
rename from src/views/copilot/components/charts/BipvOutput.vue
rename to src/views/copilot/yield/components/BipvOutput.vue
index dba836b..1f77c21 100644
--- a/src/views/copilot/components/charts/BipvOutput.vue
+++ b/src/views/copilot/yield/components/BipvOutput.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import DoubleRingWrapperVue from "./base/DoubleRingWrapper.vue";
+import DoubleRingWrapperVue from "./sub/ring/DoubleRingWrapper.vue";
 
 export default {
   name: "BipvOutput",
diff --git a/src/views/copilot/components/charts/ChipInvest.vue b/src/views/copilot/yield/components/ChipInvest.vue
similarity index 97%
rename from src/views/copilot/components/charts/ChipInvest.vue
rename to src/views/copilot/yield/components/ChipInvest.vue
index 18af8e5..9fea832 100644
--- a/src/views/copilot/components/charts/ChipInvest.vue
+++ b/src/views/copilot/yield/components/ChipInvest.vue
@@ -6,7 +6,7 @@
 -->
 
 <template>
-  <bar-chart-base
+  <BarChartBase
     :legend="legend"
     :series="series"
     :xAxis="xAxis"
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import BarChartBase from "./base/BarChartBase.vue";
+import BarChartBase from "./sub/bar/BarChartBase.vue";
 
 export default {
   name: "ChipInvest",
diff --git a/src/views/copilot/components/charts/ChipOutput.vue b/src/views/copilot/yield/components/ChipOutput.vue
similarity index 88%
rename from src/views/copilot/components/charts/ChipOutput.vue
rename to src/views/copilot/yield/components/ChipOutput.vue
index 099dd42..9286c61 100644
--- a/src/views/copilot/components/charts/ChipOutput.vue
+++ b/src/views/copilot/yield/components/ChipOutput.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import DoubleRingWrapperVue from "./base/DoubleRingWrapper.vue";
+import DoubleRingWrapperVue from "./sub/ring/DoubleRingWrapper.vue";
 
 export default {
   name: "ChipOutput",
diff --git a/src/views/copilot/components/charts/FtoInvest.vue b/src/views/copilot/yield/components/FtoInvest.vue
similarity index 97%
rename from src/views/copilot/components/charts/FtoInvest.vue
rename to src/views/copilot/yield/components/FtoInvest.vue
index a825691..b41bd1b 100644
--- a/src/views/copilot/components/charts/FtoInvest.vue
+++ b/src/views/copilot/yield/components/FtoInvest.vue
@@ -6,7 +6,7 @@
 -->
 
 <template>
-  <bar-chart-base
+  <BarChartBase
     :legend="legend"
     :series="series"
     :xAxis="xAxis"
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import BarChartBase from "./base/BarChartBase.vue";
+import BarChartBase from "./sub/bar/BarChartBase.vue";
 
 export default {
   name: "FtoInvest",
diff --git a/src/views/copilot/components/charts/StdOutput.vue b/src/views/copilot/yield/components/StdOutput.vue
similarity index 88%
rename from src/views/copilot/components/charts/StdOutput.vue
rename to src/views/copilot/yield/components/StdOutput.vue
index 064b8b6..ca0a8f2 100644
--- a/src/views/copilot/components/charts/StdOutput.vue
+++ b/src/views/copilot/yield/components/StdOutput.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import DoubleRingWrapperVue from "./base/DoubleRingWrapper.vue";
+import DoubleRingWrapperVue from "./sub/ring/DoubleRingWrapper.vue";
 
 export default {
   name: "StdOutput",
diff --git a/src/views/copilot/components/charts/base/BarChartBase.vue b/src/views/copilot/yield/components/sub/bar/BarChartBase.vue
similarity index 98%
rename from src/views/copilot/components/charts/base/BarChartBase.vue
rename to src/views/copilot/yield/components/sub/bar/BarChartBase.vue
index 54768a9..5369183 100644
--- a/src/views/copilot/components/charts/base/BarChartBase.vue
+++ b/src/views/copilot/yield/components/sub/bar/BarChartBase.vue
@@ -26,13 +26,13 @@
 
 <script>
 import screenfull from "screenfull";
-import ChartContainerVue from "../../../../components/ChartContainer.vue";
+import ChartContainer from "../../../../components/ChartContainer.vue";
 import chartMixin from "@/mixins/chart.js";
 
 export default {
   name: "BarChartBase",
   components: {
-    ChartContainer: ChartContainerVue,
+    ChartContainer,
   },
   mixins: [chartMixin],
   props: {
diff --git a/src/views/copilot/components/charts/base/CityData.vue b/src/views/copilot/yield/components/sub/city/CityData.vue
similarity index 100%
rename from src/views/copilot/components/charts/base/CityData.vue
rename to src/views/copilot/yield/components/sub/city/CityData.vue
diff --git a/src/views/copilot/components/charts/base/CityItem.vue b/src/views/copilot/yield/components/sub/city/CityItem.vue
similarity index 88%
rename from src/views/copilot/components/charts/base/CityItem.vue
rename to src/views/copilot/yield/components/sub/city/CityItem.vue
index 2dbaf02..9145f26 100644
--- a/src/views/copilot/components/charts/base/CityItem.vue
+++ b/src/views/copilot/yield/components/sub/city/CityItem.vue
@@ -8,14 +8,15 @@
 <template>
   <div class="city-item inner-shadow">
     <CityName :value="location" />
-    <CityValue :value="value+''" :period="period" />
+    <CityValue :value="value + ''" :period="period" />
   </div>
 </template>
 
 <script>
 import CityNameVue from "./CityName.vue";
 import CityValueVue from "./CityValue.vue";
-import GradientTextVue from "./GradientText.vue";
+import GradientTextVue from "../gradient/GradientText.vue";
+
 export default {
   name: "CityItem",
   components: {
diff --git a/src/views/copilot/components/charts/base/CityName.vue b/src/views/copilot/yield/components/sub/city/CityName.vue
similarity index 94%
rename from src/views/copilot/components/charts/base/CityName.vue
rename to src/views/copilot/yield/components/sub/city/CityName.vue
index d6fda61..bf3ffd1 100644
--- a/src/views/copilot/components/charts/base/CityName.vue
+++ b/src/views/copilot/yield/components/sub/city/CityName.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import Icon from "./icon.png";
+import Icon from "../../../assets/icon.png";
 
 export default {
   name: "CityName",
diff --git a/src/views/copilot/components/charts/base/CityValue.vue b/src/views/copilot/yield/components/sub/city/CityValue.vue
similarity index 97%
rename from src/views/copilot/components/charts/base/CityValue.vue
rename to src/views/copilot/yield/components/sub/city/CityValue.vue
index 9c42ab7..2521efc 100644
--- a/src/views/copilot/components/charts/base/CityValue.vue
+++ b/src/views/copilot/yield/components/sub/city/CityValue.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import GradientTextVue from "./GradientText.vue";
+import GradientTextVue from "../gradient/GradientText.vue";
 
 export default {
   name: "CityValue",
diff --git a/src/views/copilot/components/charts/base/GradientText.vue b/src/views/copilot/yield/components/sub/gradient/GradientText.vue
similarity index 100%
rename from src/views/copilot/components/charts/base/GradientText.vue
rename to src/views/copilot/yield/components/sub/gradient/GradientText.vue
diff --git a/src/views/copilot/components/charts/base/DoubleRingChart.vue b/src/views/copilot/yield/components/sub/ring/DoubleRingChart.vue
similarity index 98%
rename from src/views/copilot/components/charts/base/DoubleRingChart.vue
rename to src/views/copilot/yield/components/sub/ring/DoubleRingChart.vue
index 76be992..e9182ea 100644
--- a/src/views/copilot/components/charts/base/DoubleRingChart.vue
+++ b/src/views/copilot/yield/components/sub/ring/DoubleRingChart.vue
@@ -21,7 +21,7 @@
 <script>
 import chartMixin from "@/mixins/chart.js";
 import fullscreenMixin from "@/mixins/fullscreen.js";
-import getOptions from "./double-ring-chart-options";
+import getOptions from "../../../options/double-ring-chart-options";
 
 export default {
   name: "DoubleRingChart",
diff --git a/src/views/copilot/components/charts/base/DoubleRingWrapper.vue b/src/views/copilot/yield/components/sub/ring/DoubleRingWrapper.vue
similarity index 93%
rename from src/views/copilot/components/charts/base/DoubleRingWrapper.vue
rename to src/views/copilot/yield/components/sub/ring/DoubleRingWrapper.vue
index 621d5e7..d7348c1 100644
--- a/src/views/copilot/components/charts/base/DoubleRingWrapper.vue
+++ b/src/views/copilot/yield/components/sub/ring/DoubleRingWrapper.vue
@@ -27,9 +27,9 @@
 </template>
 
 <script>
-import CopilotSelect from "../../select.vue";
+import CopilotSelect from "@/views/copilot/components/select.vue";
 import DoubleRingChartVue from "./DoubleRingChart.vue";
-import CityData from "./CityData.vue";
+import CityData from "../city/CityData.vue";
 
 export default {
   name: "DoubleRingWrapper",
diff --git a/src/views/copilot/yield/index.vue b/src/views/copilot/yield/index.vue
index b35ed84..7816343 100644
--- a/src/views/copilot/yield/index.vue
+++ b/src/views/copilot/yield/index.vue
@@ -30,22 +30,22 @@
 </template>
 
 <script>
-import Container from "../components/Container.vue";
-import StdOutputVue from "../components/charts/StdOutput.vue";
-import ChipOutputVue from "../components/charts/ChipOutput.vue";
-import FtoInvestVue from "../components/charts/FtoInvest.vue";
-import BipvOutputVue from "../components/charts/BipvOutput.vue";
-import ChipInvestVue from "../components/charts/ChipInvest.vue";
+import Container from "@/views/copilot/components/Container.vue";
+import StdOutput from "./components/StdOutput.vue";
+import ChipOutput from "./components/ChipOutput.vue";
+import FtoInvest from "./components/FtoInvest.vue";
+import BipvOutput from "./components/BipvOutput.vue";
+import ChipInvest from "./components/ChipInvest.vue";
 
 export default {
   name: "YieldCopilot",
   components: {
     DbContainer: Container,
-    StdOutput: StdOutputVue,
-    ChipOutput: ChipOutputVue,
-    BipvOutput: BipvOutputVue,
-    FtoInvest: FtoInvestVue,
-    ChipInvest: ChipInvestVue,
+    StdOutput,
+    ChipOutput,
+    BipvOutput,
+    FtoInvest,
+    ChipInvest,
   },
   props: {
     period: {
diff --git a/src/views/copilot/components/charts/base/double-ring-chart-options.js b/src/views/copilot/yield/options/double-ring-chart-options.js
similarity index 100%
rename from src/views/copilot/components/charts/base/double-ring-chart-options.js
rename to src/views/copilot/yield/options/double-ring-chart-options.js