From 1a2905dce9e5d69df9619cfe513cc2e80b1424fb Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 04 Feb 2023 16:31:13 +0800
Subject: [PATCH] 水文水环境分析-洪水淹没：柱状图调整、地图直接定位到瑞金市
---
widgets/FloodAnalysis/Widget.js | 2 +-
corelib/common/popup/js/evaluateAnalysis.js | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/corelib/common/popup/js/evaluateAnalysis.js b/corelib/common/popup/js/evaluateAnalysis.js
index 12d0e58..2f5431e 100644
--- a/corelib/common/popup/js/evaluateAnalysis.js
+++ b/corelib/common/popup/js/evaluateAnalysis.js
@@ -1,7 +1,7 @@
$(function () {
//获取父窗口传来的数据
var data = JSON.parse(GetQueryString("data"))
- //配置饼图数据
+ //配置数据
var nameData=[]
var houseData = []
var peopleData = []
@@ -11,9 +11,9 @@
data.forEach(e=>{
nameData.push(e.name)
houseData.push(e.house)
- peopleData.push(e.house)
+ peopleData.push(e.people)
areaData.push(e.area)
- moneyData.push(e.area)
+ moneyData.push(e.money)
})
}
// change事件
@@ -37,7 +37,7 @@
imagePopup()
})
- //加载饼图
+ //加载柱状图
function loadEcharts(){
var chartDom = document.getElementById('evaluate-echarts');
var myChart = echarts.init(chartDom);
@@ -46,7 +46,7 @@
rotate: 0,
align: 'left',
verticalAlign: 'middle',
- position: 'insideLeft',
+ position: 'right',
distance: 15,
onChange: function () {
const labelOption = {
@@ -152,7 +152,7 @@
}
function recharts_z() {
- var width = $(window).width() * 0.8;
+ var width = $(window).width() * 0.9;
var height = ($(window).height() - 50) - 80;
$('#evaluate-echarts').empty();
$('#evaluate-echarts').removeAttr("_echarts_instance_").empty();
diff --git a/widgets/FloodAnalysis/Widget.js b/widgets/FloodAnalysis/Widget.js
index 4676031..91f7f5d 100644
--- a/widgets/FloodAnalysis/Widget.js
+++ b/widgets/FloodAnalysis/Widget.js
@@ -316,7 +316,7 @@
$($('div.cesium-viewer').find('.cesium-baseLayerPicker-choices')[0]).children('div:eq(0)').trigger('click');
$($('div.cesium-viewer').find('.cesium-baseLayerPicker-choices')[1]).children('div:eq(2)').trigger('click');
- this.map.camera.flyTo({
+ this.map.camera.setView({
destination: Cesium.Cartesian3.fromDegrees(116.021604,25.893668, 50000),
});
--
Gitblit v1.9.3