From 69bbb6561e224ad43a108adf04e2fb3104107fe1 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 14 十二月 2022 17:14:48 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/intelligentPatrol/trendAnalysis/index.vue | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/views/intelligentPatrol/trendAnalysis/index.vue b/src/views/intelligentPatrol/trendAnalysis/index.vue
index 1cadf21..17bde54 100644
--- a/src/views/intelligentPatrol/trendAnalysis/index.vue
+++ b/src/views/intelligentPatrol/trendAnalysis/index.vue
@@ -7,12 +7,13 @@
<span class="trend-title">瓒嬪娍鍒嗘瀽</span>
<el-form ref="form" :model="search" label-width="6vw">
<el-form-item label="绫诲瀷鏌ヨ">
- <el-select v-model="search.type" placeholder="鍐呭淇℃伅">
+ <el-select v-model="search.type" @change="searchList" placeholder="鍐呭淇℃伅">
<el-option v-for="option in categoryOptions" :key="option.value" :value="option.value" :label="option.label" ></el-option>
</el-select>
</el-form-item>
<el-form-item class="time-area" label="鏃堕棿鑼冨洿">
- <el-date-picker v-model="search.timeRange" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss">
+ <el-date-picker @change="searchList" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿" v-model="search.timeRange"
+ type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</el-form>
@@ -34,6 +35,10 @@
</div>
</div>
<div class="trend-main">
+
+ <div class="map">
+ <MyMap></MyMap>
+ </div>
<div class="trend-main-echarts" id="echarts">
</div>
@@ -45,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()
},
@@ -106,6 +113,7 @@
this.trendAnalysisList = this.highFlag ? await basecase.getTrendAnalysisData(trendAnalysisParam)
: await basecase.getFirstTrendAnalysisData(trendAnalysisParam);
},
+
tabChange(params) {
this.highFlag = params === 1;
this.searchList();
@@ -127,7 +135,7 @@
<style lang="scss" scoped>
.trend-analysis {
height: 100%;
- padding: 10vh 10vw;
+ padding: 10vh 0vw;
color: #4b9bb7;
display: flex;
@@ -183,7 +191,7 @@
.trend-main {
flex: 1;
border: 1px solid #09152f;
-
+ display: flex;
.trend-main-echarts {
width: 500px;
height: 400px;
@@ -196,4 +204,8 @@
}
}
}
+.map {
+ height: 488px;
+ min-width: 460px;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0