cl 1 год назад
Родитель
Сommit
dab42b8747

+ 1 - 0
src/assets/icons/direction-icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="20" height="40" viewBox="0 0 20 40"><g><path d="M0,0L20,0L20,3L3,3L3,8L20,8L20,11L3,11L3,16L20,16L20,19L3,19L3,40L0,40L0,0Z" fill-rule="evenodd" fill="#006EDC" fill-opacity="1"/></g></svg>

+ 8 - 2
src/components/Dialog/mapDialog.vue

@@ -657,8 +657,14 @@ function echarts1() {
           color: '#fff',
         },
         formatter: function (value) {
-          return value + "";
-        }
+          if (tableTitle.value.indexOf('水位') != -1) {
+            return value.toFixed(2);
+          } else if (tableTitle.value.indexOf('流量') != -1) {
+            return value.toFixed(3);
+          } else {
+            return value.toFixed(1);
+          }
+        },
       },
       splitLine: {
         //网格线

+ 3 - 3
src/views/hydrology/components/regimen.vue

@@ -471,9 +471,9 @@ function echarts2() {
         padding: [0, 0, 0, 30],
       },
       scale: true,
-      interval: liuliang2.interval, // 步长
-      min: liuliang2.minValue,
-      max: liuliang2.maxValue,
+      //interval: liuliang2.interval, // 步长
+      //min: liuliang2.minValue,
+      //max: liuliang2.maxValue,
     },
 
     series: [

+ 2 - 2
src/views/meteorological/components/monitorEcharts.vue

@@ -330,8 +330,8 @@ function echarts2() {
         data: props.windSpeeCharts.data,
         type: 'line',
         smooth: true,
-        symbol: 'image://' + imgangle,
-        symbolSize: 30,
+        symbol: 'path://M0,0L20,0L20,3L3,3L3,8L20,8L20,11L3,11L3,16L20,16L20,19L3,19L3,40L0,40L0,0Z',
+        symbolSize: 18,
         symbolRotate: (value, params) => {
           return props.windDirection.data[params.dataIndex] * -1;
         },

+ 24 - 20
src/views/meteorological/components/weatherForecast.vue

@@ -65,22 +65,22 @@ let erd = elementResizeDetectorMaker(); //创建实例
 let activeKey = ref<Number>(0);
 let zooms = ref('')
 eventBus.on('weatherReset', (e) => {
-    // setEcharts();
-    if (e == 'calc(100% - 500px)') {
-      setBox(1)
-    }
-    if(e == '900') {
-      setBox(2)
-    }
-    if(e != 'calc(100% - 500px)' && e != '900') {
-      setBox(3)
-    }
-    if(e == 'calc(100% - 500px)' || e == '900') {
-      zooms.value = document.getElementsByClassName("ant-modal")[0].style.zoom
-      setTimeout(() => {
-        chart.resize();
-      }, 400);
-    }
+  // setEcharts();
+  if (e == 'calc(100% - 500px)') {
+    setBox(1)
+  }
+  if (e == '900') {
+    setBox(2)
+  }
+  if (e != 'calc(100% - 500px)' && e != '900') {
+    setBox(3)
+  }
+  if (e == 'calc(100% - 500px)' || e == '900') {
+    zooms.value = document.getElementsByClassName("ant-modal")[0].style.zoom
+    setTimeout(() => {
+      chart.resize();
+    }, 400);
+  }
 });
 let boxHeight = ref(900);
 // eventBus.on('progressHeight', (height) => {
@@ -223,7 +223,9 @@ function echarts1() {
             color: '#fff',
             margin: 15,
           },
-          // formatter: '{value} %'//y轴的每一个刻度值后面加上‘%’号
+          formatter: function (value) {
+            return value.toFixed(1);
+          },
         },
         splitLine: {
           //网格线
@@ -247,7 +249,9 @@ function echarts1() {
             color: '#fff',
             margin: 15,
           },
-          // formatter: '{value} %'//y轴的每一个刻度值后面加上‘%’号
+          formatter: function (value) {
+            return value.toFixed(1);
+          },
         },
         splitLine: {
           //网格线
@@ -402,10 +406,10 @@ const setBox = (type) => {
   setTimeout(() => {
     setEcharts();
     echarts1();
-    if(type == 3){
+    if (type == 3) {
       zooms.value = document.getElementsByClassName("ant-modal")[0].style.zoom
     }
-    
+
   }, 0);
 }
 // 图表方法结束