From 0a39c24bbc9b91eb552d8201ba6907305233b8f5 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 04 Feb 2023 14:22:38 +0800
Subject: [PATCH] 水文水环境分析-洪水淹没：1、添加淹没图弹窗；2、模拟分析窗口改为屏幕显示，取消弹窗
---
corelib/common/popup/js/evaluateAnalysis.js | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/corelib/common/popup/js/evaluateAnalysis.js b/corelib/common/popup/js/evaluateAnalysis.js
index 0ce5ace..fcaf80c 100644
--- a/corelib/common/popup/js/evaluateAnalysis.js
+++ b/corelib/common/popup/js/evaluateAnalysis.js
@@ -1,4 +1,16 @@
$(function () {
+ //获取父窗口传来的数据
+ var data = JSON.parse(GetQueryString("data"))
+ //配置饼图数据
+ var pieData = []
+ if (data.length>0){
+ data.forEach(e=>{
+ pieData.push({
+ value : e.people,
+ name:e.name
+ })
+ })
+ }
// change事件
$('input[type=radio][name=value]').change(function () {
if (this.value == 'list'){
@@ -14,6 +26,11 @@
$('.evaluate-echarts').show()
}
});
+
+ //淹没图弹窗事件
+ $('#create-flood-image').click(function (){
+ imagePopup()
+ })
//加载饼图
function loadEcharts(){
@@ -50,11 +67,7 @@
labelLine: {
show: false
},
- data: [
- { value: 1048, name: '会昌县' },
- { value: 735, name: '石城县' },
- { value: 580, name: '宁都县' },
- ]
+ data: pieData
}
]
}
@@ -81,9 +94,26 @@
//获取参数
function GetQueryString(name) {
var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
- var r = window.location.search.substr(1).match(reg);
+ var r = decodeURI(window.location.search).substr(1).match(reg);
if (r != null) return unescape(r[2]);
return null;
}
+ //淹没图弹窗
+ function imagePopup(){
+ var url = './corelib/common/popup/floodImage.html';
+ var top = ($(window).height() - 526) / 2;
+ var left = ($(window).width() - 500 - 340) / 2 + 340;
+ parent.layer.open({
+ title:'影响分析',
+ type: 2,
+ maxmin: false, //开启最大化最小化按钮
+ area: ['1000px', '800px'],
+ skin: 'floodImage',
+ offset: [top, left],
+ content: url,
+ id: "floodImageLayer",
+ closeBtn: 1
+ });
+ }
});
--
Gitblit v1.9.3