From b82c1f5e2c6daeede03f6fcf7c91ae66348d97e3 Mon Sep 17 00:00:00 2001
From: guoshipeng <3194674006@qq.com>
Date: Thu, 11 May 2023 16:03:21 +0800
Subject: [PATCH] 1、道路尘负荷分析尘负荷值修改 2、6参设定修改

---
 src/components/Echarts/LineChart2.vue |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/Echarts/LineChart2.vue b/src/components/Echarts/LineChart2.vue
index a74acd0..f260441 100644
--- a/src/components/Echarts/LineChart2.vue
+++ b/src/components/Echarts/LineChart2.vue
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <template>
   <div :class="className" :style="{ height: height, width: width }" />
 </template>
@@ -79,6 +80,7 @@
       this.setOptions(this.chartData)
     },
     setOptions(val) {
+      // console.log(val,'123');
       function fontSize(res) {
         let clientWidth =
           window.innerWidth ||
@@ -90,8 +92,6 @@
       }
 
       // console.log('���������������������')
-
-      console.log(val, 'eee')
       this.chart.setOption(
         {
           title: {
@@ -104,7 +104,7 @@
             data: val.xAxis,
             boundaryGap: false,
             axisTick: {
-              show: false,
+              show: true,
             },
             // axisTick: { // ������������������������������
             //   alignWithLabel: true,
@@ -138,13 +138,13 @@
           tooltip: {
             trigger: 'axis',
             position: function (pt) {
-              return [pt[1], '-14%']
+              return [pt[1], '-13%']
             },
             textStyle: {
               fontSize: fontSize(0.117), // ������������
             },
           },
-         
+
           yAxis: {
             axisTick: {
               show: false, // ������������
@@ -176,7 +176,7 @@
             {
               start: 0,
               end: 20,
-              bottom: fontSize(3.3),
+              top: fontSize(4.8),
               height: fontSize(0.5),
             },
           ],
@@ -189,3 +189,4 @@
   },
 }
 </script>
+

--
Gitblit v1.8.0