更新

dist/index.html

@@ -49,7 +49,7 @@
     
     <!-- <script type="module" src="/src/teacher/main.ts"></script> -->
     <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
-    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.a7008435.js"></script>
+    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.11b78793.js"></script>
     <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.fff06f3d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

dist/teacher.html

@@ -35,7 +35,7 @@
     <meta name="msapplication-tap-highlight" content="no" />
     <title>酷乐秀</title>
     <script src="./flexible.js" charset="UTF-8"></script>
-    <script type="module" crossorigin src="./assets/teacher.79c55f1c.js"></script>
+    <script type="module" crossorigin src="./assets/teacher.6cda61df.js"></script>
     <link rel="modulepreload" href="./assets/vendor.7fdfd452.js">
     <link rel="modulepreload" href="./assets/index.8d4409f0.js">
     <link rel="stylesheet" href="./assets/vendor.68261ebd.css">
@@ -48,7 +48,7 @@
     <div id="app"></div>
     
     <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
-    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.a7008435.js"></script>
-    <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.76b2bdb5.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.11b78793.js"></script>
+    <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.27f5a4da.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

src/teacher/income-consus/echarts.ts

@@ -1,3 +1,5 @@
+import { position } from 'html2canvas/dist/types/css/property-descriptors/position'
+
 export const lineChartOption = {
   legend: { show: false },
   emphasis: { lineStyle: { width: 2 } },
@@ -230,7 +232,50 @@ export const lineChartOption = {
     right: '5%',
     top: '7%'
   },
-  tooltip: { trigger: 'axis' },
+  tooltip: {
+    trigger: 'axis',
+    confine: true
+    // position: function (point, params, dom, rect, size) {
+    //   // 鼠标坐标和提示框位置的参考坐标系是：以外层div的左上角那一点为原点，x轴向右，y轴向下
+    //   // 提示框位置
+    //   var x = 0 // x坐标位置
+    //   var y = 0 // y坐标位置
+
+    //   // 当前鼠标位置
+    //   var pointX = point[0]
+    //   var pointY = point[1]
+
+    //   // 外层div大小
+    //   // var viewWidth = size.viewSize[0];
+    //   // var viewHeight = size.viewSize[1];
+
+    //   // 提示框大小
+    //   var boxWidth = size.contentSize[0]
+    //   var boxHeight = size.contentSize[1]
+
+    //   // boxWidth > pointX 说明鼠标左边放不下提示框 --- 情况
+    //   if (boxWidth > pointX) {
+    //     x = 5 // 自己定个x坐标值，以防出屏
+    //     y -= 15 // 防止点被覆盖住，可根据情况自行调节
+    //   } else {
+    //     // 左边放的下
+    //     x = pointX - boxWidth - 15
+    //   }
+
+    //   // boxHeight > pointY 说明鼠标上边放不下提示框 --- 情况
+    //   if (boxHeight + 20 > pointY) {
+    //     y = pointY + 15
+    //   } else if (boxHeight > pointY) {
+    //     y = 5
+    //   } else {
+    //     // 上边放得下
+    //     y += pointY - boxHeight
+    //   }
+    //   //return [x, y]
+    //   return [x, '20%'] //这里采用固定y轴 x轴随鼠标位置变化
+    //   // return [point[0], '10%']
+    // }
+  },
   yAxis: {
     type: 'value',
     splitLine: {