From efc8fd607931deb33b61474c25fa8b3255c71f01 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 21 Feb 2023 14:18:08 +0800
Subject: [PATCH] 洪水淹没-实时,预测水位方法合并

---
 widgets/FloodAnalysis/Widget.js |   54 ++++++++++++++++++++----------------------------------
 1 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/widgets/FloodAnalysis/Widget.js b/widgets/FloodAnalysis/Widget.js
index aa8eaad..b35e61e 100644
--- a/widgets/FloodAnalysis/Widget.js
+++ b/widgets/FloodAnalysis/Widget.js
@@ -176,7 +176,7 @@
 
             //水位输入事件
             $('#sw-input').on("input", function (e,v) {
-                self.getYcSw($('#sw-input').val())
+                self.getSw($('#sw-input').val())
             })
 
             //河段选择框改变事件
@@ -536,22 +536,6 @@
             return sw
         },
 
-        //预测水位计算
-        getYcSw(val) {
-            const self = this
-            let chazhi = self.accSub(val,self.currentNearPoint.water)
-            self.analysisTableList.forEach(e => {
-                e.lng = Number(e.lng).toFixed(4)
-                e.lat = Number(e.lat).toFixed(4)
-                e.sw = self.calculateSw(e.water, chazhi)
-
-                e.water = Number(e.water).toFixed(2)
-                e.sw = Number(e.sw).toFixed(2)
-            })
-
-            self.loadPagination(self.analysisTableList, "analysis-pagination")
-        },
-
         //减法函数
         accSub(arg1,arg2){
             var r1,r2,m,n;
@@ -582,28 +566,30 @@
                         if (res.code == 200) {
                             let sub = res.data
                             $('#sw-input').val(sub)
-                            //获取计算的差值    实时的水位-根据获取的最近水面点的信息计算
-                            let chazhi = 0
-                            if (sub > 0) {
-                                chazhi = self.accSub(sub,self.currentNearPoint.water)
-                            }
-                            self.analysisTableList.forEach(e => {
-                                e.lng = Number(e.lng).toFixed(4)
-                                e.lat = Number(e.lat).toFixed(4)
-                                e.sw = self.calculateSw(e.water, chazhi)
-
-                                e.water = Number(e.water).toFixed(2)
-                                e.sw = Number(e.sw).toFixed(2)
-                            })
-
-                            self.loadPagination(self.analysisTableList, "analysis-pagination")
+                            self.getSw(sub)
                         }
                     }
                 });
             } else {
-                self.getYcSw($('#sw-input').val())
+                self.getSw($('#sw-input').val())
             }
 
+        },
+        //计算水位
+        getSw(val){
+            const self = this
+            let chazhi = 0
+            if (val > 0) {
+                chazhi = self.accSub(val,self.currentNearPoint.water)
+            }
+            self.analysisTableList.forEach(e => {
+                e.lng = Number(e.lng).toFixed(4)
+                e.lat = Number(e.lat).toFixed(4)
+                e.sw = self.calculateSw(e.water, chazhi)
+                e.water = Number(e.water).toFixed(2)
+                e.sw = Number(e.sw).toFixed(2)
+            })
+            self.loadPagination(self.analysisTableList, "analysis-pagination")
         },
 
         //获取最接近水文站的值
@@ -708,7 +694,7 @@
                 offset: [top,left],
                 content: url + "?parentData=" + encodeURIComponent(JSON.stringify(parentData)),//使用encodeURIComponent转码,避免中文字符乱码,避免url截取错误
                 id: "floodAnalysisLayer",
-                closeBtn: 1,
+                closeBtn: 0,
                 shade: 0,
                 move:false,
                 maxmin: true,

--
Gitblit v1.9.3