fix: 停泊点策略 只能选择起测水位比高程高的点

ruoyi-ui/src/views/site/plain-point/chart-list.vue

@@ -4,7 +4,6 @@
 
 <script>
 import * as echarts from "echarts";
-require('echarts/theme/macarons') // echarts theme
 import resize from '@/utils/resize'
 
 export default {
@@ -46,8 +45,8 @@ export default {
           name: '起点距',
           boundaryGap: false,
           type: 'value',
-          min: Math.min(...xAxisData),
-          max: Math.max(...xAxisData),
+          min: 'dataMin',
+          max: 'dataMax',
           axisLine: {
             lineStyle: {
               color: '#FF8500'
@@ -87,12 +86,8 @@ export default {
             nameTextStyle: {
               color: '#54606C'
             },
-            min: function (value) {
-              return Math.round(value.min - (value.max - value.min) * 0.1);
-            },
-            max: function (value) {
-              return Math.round(value.max + (value.max - value.min) * 0.1);
-            },
+            min: 'dataMin',
+            max: 'dataMax',
           },
           {
             axisLine: {
@@ -125,7 +120,6 @@ export default {
         },
         series: [{
           name: '高程',
-
           lineStyle: {
             width: 1,
             color: '#FF8500',

ruoyi-ui/src/views/site/plain-point/chart.vue

@@ -4,7 +4,6 @@
 
 <script>
 import * as echarts from "echarts";
-require('echarts/theme/macarons') // echarts theme
 import resize from '@/utils/resize'
 
 export default {
@@ -58,8 +57,8 @@ export default {
           name: '起点距',
           boundaryGap: false,
           type: 'value',
-          min: Math.min(...xAxisData),
-          max: Math.max(...xAxisData),
+          min: 'dataMin',
+          max: 'dataMax',
           axisLine: {
             lineStyle: {
               color: '#FF8500'
@@ -99,12 +98,8 @@ export default {
             nameTextStyle: {
               color: '#54606C'
             },
-            min: function (value) {
-              return Math.round(value.min - (value.max - value.min) * 0.1);
-            },
-            max: function (value) {
-              return Math.round(value.max + (value.max - value.min) * 0.1);
-            },
+            min: 'dataMin',
+            max: 'dataMax',
           },
           {
             axisLine: {
@@ -178,12 +173,18 @@ export default {
         }]
       };
       if (wlevel > wlevelmin && wlevel < wlevelmax) {
+        const points = seriesData.reduce((prev, [x, y]) => {
+          if (y < wlevel) {
+            prev.push([x, wlevel]);
+          }
+          return prev;
+        }, [])
         options.series.push({
           name: '起测水位',
           lineStyle: {
             width: 0,
           },
-          data: seriesData.map(([x]) => [x, wlevel]),
+          data: points,
           type: 'line',
           markLine: {
             symbol: 'none',

ruoyi-ui/src/views/site/section/chart.vue

@@ -34,6 +34,7 @@ export default {
     setOptions(sections) {
       const xAxisData = sections.map(({ x }) => x);
       const seriesData = sections.map(({ x, y }) => ([x, y]));
+      this.chart.clear();
       this.chart.setOption({
         xAxis: {
           name: '起点距',