Merge branch 'main' of git.zdool.com:xs/ggfwjsc

src/view/analyze.vue

@@ -217,10 +217,10 @@
 </template>
 
 <script setup>
-import eBubble from "./echarts/bubble.vue";
-import ePie from "./echarts/pie.vue";
-import ePie2 from "./echarts/pie2.vue";
-import eGraph from "./echarts/graph.vue";
+// import eBubble from "./echarts/bubble.vue";
+// import ePie from "./echarts/pie.vue";
+// import ePie2 from "./echarts/pie2.vue";
+// import eGraph from "./echarts/graph.vue";
 </script>
 
 <style lang="scss" scoped>

src/view/education.vue

@@ -217,10 +217,10 @@
 </template>
 
 <script setup>
-import eBubble from "./echarts/bubble.vue";
-import ePie from "./echarts/pie.vue";
-import ePie2 from "./echarts/pie2.vue";
-import eGraph from "./echarts/graph.vue";
+// import eBubble from "./echarts/bubble.vue";
+// import ePie from "./echarts/pie.vue";
+// import ePie2 from "./echarts/pie2.vue";
+// import eGraph from "./echarts/graph.vue";
 </script>
 
 <style lang="scss" scoped>

src/view/home.vue

@@ -14,10 +14,7 @@
 
 <script setup>
 import Header from "../components/header.vue";
-import eBubble from "./echarts/bubble.vue";
-import ePie from "./echarts/pie.vue";
-import ePie2 from "./echarts/pie2.vue";
-import eGraph from "./echarts/graph.vue";
+
 import { ref, onMounted, onBeforeMount } from "vue";
 
 // 监听缩放

src/view/hygiene.vue

@@ -217,10 +217,10 @@
 </template>
 
 <script setup>
-import eBubble from "./echarts/bubble.vue";
-import ePie from "./echarts/pie.vue";
-import ePie2 from "./echarts/pie2.vue";
-import eGraph from "./echarts/graph.vue";
+// import eBubble from "./echarts/bubble.vue";
+// import ePie from "./echarts/pie.vue";
+// import ePie2 from "./echarts/pie2.vue";
+// import eGraph from "./echarts/graph.vue";
 </script>
 
 <style lang="scss" scoped>

src/view/sy.vue

@@ -217,10 +217,10 @@
 </template>
 
 <script setup>
-import eBubble from "./echarts/bubble.vue";
-import ePie from "./echarts/pie.vue";
-import ePie2 from "./echarts/pie2.vue";
-import eGraph from "./echarts/graph.vue";
+// import eBubble from "./echarts/bubble.vue";
+// import ePie from "./echarts/pie.vue";
+// import ePie2 from "./echarts/pie2.vue";
+// import eGraph from "./echarts/graph.vue";
 </script>
 
 <style lang="scss" scoped>

src/view/work.vue

@@ -217,10 +217,10 @@
 </template>
 
 <script setup>
-import eBubble from "./echarts/bubble.vue";
-import ePie from "./echarts/pie.vue";
-import ePie2 from "./echarts/pie2.vue";
-import eGraph from "./echarts/graph.vue";
+// import eBubble from "./echarts/bubble.vue";
+// import ePie from "./echarts/pie.vue";
+// import ePie2 from "./echarts/pie2.vue";
+// import eGraph from "./echarts/graph.vue";
 </script>
 
 <style lang="scss" scoped>

src/view/yl.vue

@@ -169,19 +169,18 @@
 </template>
 
 <script setup>
-import eBubble from "./echarts/bubble.vue";
-import ePie from "./echarts/pie.vue";
-import eP2 from "./echarts/eP2.vue";
-import eP2_2 from "./echarts/eP2_2.vue";
-import eP3 from "./echarts/eP3.vue";
-import eP3_2 from "./echarts/eP3_2.vue";
-import ePie2 from "./echarts/pie2.vue";
-import eGraph from "./echarts/graph.vue";
-import ePie3d from "./echarts/pie3d.vue";
-// import waterBall from "./echarts/waterBall.vue";
-import ylJHSY from "./echarts/ylJHSY.vue";
-import ylSMFW from "./echarts/ylSMFW.vue";
-import ylXZZC from "./echarts/ylXZZC.vue";
+import ePie from "./echarts_yl/pie.vue";
+import eP2 from "./echarts_yl/eP2.vue";
+import eP2_2 from "./echarts_yl/eP2_2.vue";
+import eP3 from "./echarts_yl/eP3.vue";
+import eP3_2 from "./echarts_yl/eP3_2.vue";
+import ePie2 from "./echarts_yl/pie2.vue";
+import eGraph from "./echarts_yl/graph.vue";
+import ePie3d from "./echarts_yl/pie3d.vue";
+// import waterBall from "./echarts_yl/waterBall.vue";
+import ylJHSY from "./echarts_yl/ylJHSY.vue";
+import ylSMFW from "./echarts_yl/ylSMFW.vue";
+import ylXZZC from "./echarts_yl/ylXZZC.vue";
 import { ref, onMounted, onBeforeMount } from "vue";
 const leftchoose = ref({
   first: "1",
@@ -671,7 +670,7 @@ const change = (name, index) => {
     background-repeat: no-repeat;
     background-size: 100% 100%;
     position: absolute;
-    top: 316px;
+    top: 378px;
     left: 84px;
   }