From 9af0ba7e5a51b187f762234755ed1559ab91f5f5 Mon Sep 17 00:00:00 2001
From: yupan <yupanx@163.com>
Date: Mon, 07 Nov 2022 16:23:37 +0800
Subject: [PATCH] 1、监测因子趋势时间控件修改 2、监测因子对比echarts显示修改
---
src/components/Echarts/LineChart2.vue | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/components/Echarts/LineChart2.vue b/src/components/Echarts/LineChart2.vue
index a74acd0..48931ad 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>
@@ -189,3 +190,4 @@
},
}
</script>
+
--
Gitblit v1.8.0