From f979c8991929e0e8372f86b34537172d77c3739e Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 14 十二月 2022 14:36:11 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/intelligentPatrol/trendAnalysis/index.vue | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/views/intelligentPatrol/trendAnalysis/index.vue b/src/views/intelligentPatrol/trendAnalysis/index.vue
index 50de7ed..17bde54 100644
--- a/src/views/intelligentPatrol/trendAnalysis/index.vue
+++ b/src/views/intelligentPatrol/trendAnalysis/index.vue
@@ -35,6 +35,10 @@
</div>
</div>
<div class="trend-main">
+
+ <div class="map">
+ <MyMap></MyMap>
+ </div>
<div class="trend-main-echarts" id="echarts">
</div>
@@ -46,8 +50,10 @@
import * as echarts from 'echarts'
import basecase from "@/api/operate/basecase";
import { CATEGOTY } from "@/utils/helper";
+import MyMap from "@/components/map";
export default {
+ components :{MyMap},
created() {
this.searchList()
},
@@ -129,7 +135,7 @@
<style lang="scss" scoped>
.trend-analysis {
height: 100%;
- padding: 10vh 10vw;
+ padding: 10vh 0vw;
color: #4b9bb7;
display: flex;
@@ -185,7 +191,7 @@
.trend-main {
flex: 1;
border: 1px solid #09152f;
-
+ display: flex;
.trend-main-echarts {
width: 500px;
height: 400px;
@@ -198,4 +204,8 @@
}
}
}
+.map {
+ height: 488px;
+ min-width: 460px;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0