From b307682754a926f5bf626ca54147b6a314dab64d Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 21 Feb 2023 16:48:00 +0800
Subject: [PATCH] 洪水淹没-样式调整
---
widgets/FloodAnalysis/Widget.html | 4 -
corelib/common/popup/evaluateAnalysis.html | 8 +++-
widgets/FloodAnalysis/images/fold_down.png | 0
widgets/FloodAnalysis/css/style.css | 16 +++++++
widgets/FloodAnalysis/Widget.js | 39 ++++++++++++-------
corelib/common/popup/css/style.css | 4 +-
6 files changed, 49 insertions(+), 22 deletions(-)
diff --git a/corelib/common/popup/css/style.css b/corelib/common/popup/css/style.css
index c266595..76ab991 100644
--- a/corelib/common/popup/css/style.css
+++ b/corelib/common/popup/css/style.css
@@ -823,13 +823,13 @@
.evaluate-box-bottom{
display: flex;
- justify-content: flex-end;
+ justify-content: space-between;
}
.evaluate-box-bottom input{
width: 86px;
height: 25px;
- background-color: #bbbaba;
+ background-color: #124ebb;
border: none;
color: white;
border-radius: 5px;
diff --git a/corelib/common/popup/evaluateAnalysis.html b/corelib/common/popup/evaluateAnalysis.html
index 31a9671..819add6 100644
--- a/corelib/common/popup/evaluateAnalysis.html
+++ b/corelib/common/popup/evaluateAnalysis.html
@@ -84,8 +84,12 @@
</div>
</div>
<div class="evaluate-box-bottom">
- <input id="export-img" class="export-img" type="button" value="导出成果图"/>
- <input id="save-btn" class="save-btn" type="button" value="保存"/>
+ <div>
+ <input id="export-img" class="export-img" type="button" value="导出成果图"/>
+ <input id="save-btn" class="save-btn" type="button" value="保存"/>
+ </div>
+
+ <input id="close-btn" class="close-btn" type="button" value="关闭"/>
</div>
</div>
diff --git a/widgets/FloodAnalysis/Widget.html b/widgets/FloodAnalysis/Widget.html
index 78b7aa4..ef4ed76 100644
--- a/widgets/FloodAnalysis/Widget.html
+++ b/widgets/FloodAnalysis/Widget.html
@@ -37,11 +37,8 @@
<!-- <span class="tip">正数为水位上涨，负数为水位下降</span>-->
</div>
<input id="start-analysis-btn" class="start-analysis-btn" type="button" value="开始分析"/>
-
</div>
-
</div>
-
</div>
<div class="radio-box" style="text-align: center">
<input id="realtime" type="radio" name="middleRadio" value="realtime" checked='checked'>实时
@@ -73,4 +70,5 @@
<span id="progress_bar" class="h-100P bar"></span>
</span>
</div>
+ <div id="restore-icon" class="restore-icon"></div>
</div>
diff --git a/widgets/FloodAnalysis/Widget.js b/widgets/FloodAnalysis/Widget.js
index 0e51620..032a1e4 100644
--- a/widgets/FloodAnalysis/Widget.js
+++ b/widgets/FloodAnalysis/Widget.js
@@ -56,7 +56,7 @@
currentNearPoint:null,
evaluateLayerIndex:"",
//收起框打开状态
- isOpen: true,
+ popupLayer: null,
//api接口
url: {
riverwaySelectName: "http://localhost:82/blade-ycreal/riverway/selectName",
@@ -162,6 +162,7 @@
if (self.evaluateLayerIndex){
layer.close(self.evaluateLayerIndex)
self.evaluateLayerIndex = ""
+ $('#restore-icon').css('display','none')
}
setTimeout(function(){//有bug 需要延迟执行隐藏
$("#hd-select").hide()
@@ -233,9 +234,10 @@
self.loadPagination(filterArray, "history-pagination")
})
- $('#save-button').click(function () {
- self.confirmPopup()
- // self.floodAnalysisPopup()
+ $('#restore-icon').click(function () {
+ if (self.popupLayer){
+ self.popupLayer.css('display',"")
+ }
})
},
@@ -320,6 +322,7 @@
$('#search-name').val("")
$('#glzd').val("")
$('#qdj').val('')
+ $('.restore-icon').css('display','none')
this.isOpen = true
this.analysisBtn.addClass('choose-button')
@@ -675,7 +678,7 @@
let isAnalysis = flag == 'analysis'?true:false
let parentData = {}
-
+ let btnGroup = []
if (isAnalysis){
parentData.data = this.evaluateData
parentData.hd = this.currentHd
@@ -706,17 +709,20 @@
closeBtn: 0,
shade: 0,
move:false,
- maxmin: true,
+ maxmin: false,
//设置默认不在左下角
minStack:false,
min: function(layero,index){
setTimeout(function(){
- layero.css({
- 'width':'50px',
- 'top': '83px',
- 'left':'inherit',
- 'right':'0px',
- })
+ // layero.css({
+ // 'width':'50px',
+ // 'top': '83px',
+ // 'left':'inherit',
+ // 'right':'0px',
+ // })
+ self.popupLayer = $('.layui-layer')
+ layero.css('display','none')
+ $('#restore-icon').css('display','')
})
//显示最大化icon
$('.layui-layer-max').css("display","")
@@ -724,6 +730,7 @@
$('.layui-layer-title').css({
'background-color':'rgb(255,255,255)'
})
+ return false
},
restore: function(layero,index) {
//隐藏最大化icon
@@ -739,9 +746,7 @@
})
},
success:function (layero,index) {
-
$('.layui-layer-setwin .layui-layer-min cite').css("background-color",'white')
-
//绑定父子之间的关系，用于数据传递，缺少则无法传递
var body = layer.getChildFrame("body", index);
//得到iframe页的窗口对象
@@ -753,6 +758,11 @@
}else {
iframeWin.$('#save-btn').hide()
}
+ iframeWin.$('#close-btn').click(function () {
+ self.popupLayer = $('.layui-layer')
+ self.popupLayer.css('display','none')
+ $('#restore-icon').css('display','')
+ })
if ($('.layui-layer-max').hasClass('layui-layer-maxmin')){
$('.layui-layer-max').css("display","")
@@ -885,6 +895,7 @@
//关闭分析窗口
if (this.evaluateLayerIndex){
layer.close(this.evaluateLayerIndex)
+ $('#restore-icon').css('display','none')
this.evaluateLayerIndex = ""
}
diff --git a/widgets/FloodAnalysis/css/style.css b/widgets/FloodAnalysis/css/style.css
index 9f8e0fd..312a257 100644
--- a/widgets/FloodAnalysis/css/style.css
+++ b/widgets/FloodAnalysis/css/style.css
@@ -182,7 +182,7 @@
/**淹没分析表格**/
.analysis-box-list{
/*margin-left: 1%;*/
- height: calc(100% - 218px);
+ height: calc(100% - 194px);
top:3px;
overflow-y: auto;
background-color: #fff;
@@ -435,3 +435,17 @@
.evaluate-middle-first .column-2{
display: flex;
}
+
+/**放大按钮**/
+.restore-icon{
+ width: 32px;
+ height: 32px;
+ background: rgb(0, 73, 135);
+ position: fixed;
+ right: 16px;
+ top: 90.5px;
+ background-image: url(../images/fold_down.png);
+ background-position: center;
+ background-repeat: no-repeat;
+ cursor: pointer;
+}
diff --git a/widgets/FloodAnalysis/images/fold_down.png b/widgets/FloodAnalysis/images/fold_down.png
index 955b23b..fb51e19 100644
--- a/widgets/FloodAnalysis/images/fold_down.png
+++ b/widgets/FloodAnalysis/images/fold_down.png
Binary files differ
--
Gitblit v1.9.3