From 5a685b76c6a54d72bbfe082d85454513e81dcf48 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 23 二月 2023 17:34:00 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/intelligentPatrol/trendAnalysis/index.vue | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/views/intelligentPatrol/trendAnalysis/index.vue b/src/views/intelligentPatrol/trendAnalysis/index.vue
index dc2095e..1e26fdc 100644
--- a/src/views/intelligentPatrol/trendAnalysis/index.vue
+++ b/src/views/intelligentPatrol/trendAnalysis/index.vue
@@ -72,7 +72,8 @@
import * as echarts from "echarts";
import basecase from "@/api/operate/basecase";
import { CATEGOTY } from "@/utils/helper";
-import MyMap from "@/components/map";
+// import MyMap from "@/components/map";
+import MyMap from "@/components/map/leafletMap.vue";
export default {
components: { MyMap },
@@ -164,7 +165,7 @@
x: data.longitude,
y: data.latitude,
};
- this.zoom = 19;
+ this.zoom = 18;
this.mark = { title: data.address };
basecase
.getPointTrendAnalysisData({
@@ -205,7 +206,7 @@
width: 30vw;
text-align: left;
height: 100%;
- border: 1px solid #09152f;
+ // border: 1px solid #09152f;
.trend-input-area {
display: flex;
@@ -232,7 +233,7 @@
.el-button {
flex: 1;
- border: 2px solid #09152f;
+ // border: 2px solid #09152f;
}
.el-button + .el-button {
@@ -256,7 +257,7 @@
.trend-main {
flex: 1;
- border: 1px solid #09152f;
+ // border: 1px solid #09152f;
display: flex;
margin-left: 20px;
.trend-main-echarts {
@@ -265,11 +266,11 @@
}
}
- .trend-footer {
- ::v-deep .el-range-input {
- background-color: #09152f;
- }
- }
+ // .trend-footer {
+ // ::v-deep .el-range-input {
+ // // background-color: #09152f;
+ // }
+ // }
}
.map {
height: 100%;
--
Gitblit v1.8.0