From decccd85b53746a6828c3c55856216a1219f9a0e Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 14 十二月 2022 17:39:44 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
vue.config.js | 4 ++--
src/api/operate/basecase.js | 2 +-
src/views/intelligentPatrol/trendAnalysis/index.vue | 15 ++++++++++++---
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/api/operate/basecase.js b/src/api/operate/basecase.js
index 9ab9043..c288e6b 100644
--- a/src/api/operate/basecase.js
+++ b/src/api/operate/basecase.js
@@ -55,7 +55,7 @@
},
getPointTrendAnalysisData: (params) => {
- return http.post('/sccg/trendAnalysis/pointInfo', params);
+ return http.get('/sccg/trendAnalysis/pointInfo', params);
}
}
\ No newline at end of file
diff --git a/src/views/intelligentPatrol/trendAnalysis/index.vue b/src/views/intelligentPatrol/trendAnalysis/index.vue
index 17bde54..53778b5 100644
--- a/src/views/intelligentPatrol/trendAnalysis/index.vue
+++ b/src/views/intelligentPatrol/trendAnalysis/index.vue
@@ -37,7 +37,7 @@
<div class="trend-main">
<div class="map">
- <MyMap></MyMap>
+ <MyMap :point="point" :zoom="zoom" :mark="mark"></MyMap>
</div>
<div class="trend-main-echarts" id="echarts">
@@ -78,7 +78,10 @@
trendAnalysisList: [],
highFlag: true,
echarts: null,
- pointName: null
+ pointName: null,
+ point: null,
+ mark: null,
+ zoom: null,
}
},
methods: {
@@ -121,7 +124,13 @@
pointClick(data) {
this.pointName = data.name;
- basecase.getPointTrendAnalysisData({ id: data.id })
+ this.point = {
+ x: data.latitude,
+ y: data.longitude,
+ };
+ this.zoom = 19;
+ this.mark = { title: data.address };
+ basecase.getPointTrendAnalysisData({ longitude: data.longitude,latitude: data.latitude })
.then(res => {
const countList = res.map(item => +item.count);
this.renderEchart(countList);
diff --git a/vue.config.js b/vue.config.js
index d97f668..f3a4d14 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -39,8 +39,8 @@
proxy: {
// 璺ㄥ煙閰嶇疆
"/sccg": {
- target: `http://42.193.1.25/`,
- // target: `http://127.0.0.1:8082/`,
+ // target: `http://42.193.1.25/`,
+ target: `http://127.0.0.1:8082/`,
changeOrigin: true
}
},
--
Gitblit v1.8.0