From 26daa82addb12dfed4a1c4726f35c4574f64fd4b Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 22 Feb 2023 14:56:28 +0800
Subject: [PATCH] 洪水淹没-修改文字描述，修复水面渲染问题

---
 corelib/common/popup/evaluateAnalysis.html  |    2 +-
 widgets/FloodAnalysis/Widget.js             |    6 ++----
 corelib/common/popup/js/evaluateAnalysis.js |    2 +-
 widgets/YuShuiQing/CommonPointLayer3D.js    |    4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/corelib/common/popup/evaluateAnalysis.html b/corelib/common/popup/evaluateAnalysis.html
index e145e8c..d72cef3 100644
--- a/corelib/common/popup/evaluateAnalysis.html
+++ b/corelib/common/popup/evaluateAnalysis.html
@@ -13,7 +13,7 @@
             <div class="flood-image-box">
                 <div class="flood-image-top">
                     <div>
-                        <img id="show-img" class="show-img" src="image/floodAnalysisEvaluate-2.png" width="100%" height="100%">
+                        <img style="cursor: pointer" id="show-img" class="show-img" src="image/floodAnalysisEvaluate-2.png" width="100%" height="100%">
                     </div>
                 </div>
                 <div class="description">
diff --git a/corelib/common/popup/js/evaluateAnalysis.js b/corelib/common/popup/js/evaluateAnalysis.js
index 6b223c3..d2f818e 100644
--- a/corelib/common/popup/js/evaluateAnalysis.js
+++ b/corelib/common/popup/js/evaluateAnalysis.js
@@ -318,7 +318,7 @@
         // $(".area").html(area + 'km²')
         // $(".money").html(money + '万元')
 
-        $('.description').html("&nbsp&nbsp该站位于" + hd.riverway + "，靠近"+hd.stnm.trim()+"水文站，起始距为"+hd.gl_qdj+"m，河段长" + hd.river_length + "m,预计会造成受灾户数" + house + "户，受灾人口" + people + "人，受灾面积" + area + "km²，房屋价值" + money + "万元")
+        $('.description').html("&nbsp&nbsp该站位于" + hd.riverway + "，靠近"+hd.stnm.trim()+"水文站，起始距为"+hd.gl_qdj+"m，河段长" + hd.river_length + "m,淹没面积" + house + "km²，淹没耕地面积" + people + "km²，影响" + area + "万人，淹没区GDP" + money + "亿元")
     }
 
     //加载分页
diff --git a/widgets/FloodAnalysis/Widget.js b/widgets/FloodAnalysis/Widget.js
index 4d500e7..35d63d7 100644
--- a/widgets/FloodAnalysis/Widget.js
+++ b/widgets/FloodAnalysis/Widget.js
@@ -274,9 +274,7 @@
             //清空表格数据
             $('.analysis-box-list').empty();
             $('.history-box-list').empty();
-
             $('#analysis-pagination').hide()
-
             this.analysisTableList = []
 
             //关闭分析窗口
@@ -387,9 +385,7 @@
                     }
 
                     data.forEach(e => {
-
                         self.smxSelect.append("<option value=" + e.smxcode + ">" + e.waterline + "</option>");
-
                         if (e.smxcode == defaultId) {
                             $("#smx-select option[value=" + e.smxcode + "] ").attr("selected", true)
                             self.smxSelect.trigger("change")
@@ -430,6 +426,8 @@
             this.deleteEntities(pointEntities)
             // 水面线连线
             let cartesians = []
+            //防止切换面板后渲染水面出错
+            this.map.scene.globe.depthTestAgainstTerrain = true;
             for (let i = 0; i < data.length; i++) {
                 cartesians.push(new Cesium.Cartesian3.fromDegrees(data[i].lng, data[i].lat,data[i].sw))
                 let temp = this.map.entities.add({
diff --git a/widgets/YuShuiQing/CommonPointLayer3D.js b/widgets/YuShuiQing/CommonPointLayer3D.js
index f59827e..9873600 100644
--- a/widgets/YuShuiQing/CommonPointLayer3D.js
+++ b/widgets/YuShuiQing/CommonPointLayer3D.js
@@ -80,7 +80,7 @@
                     /**
                      * @billbo 对象，确定entities中billboard的值
                      * @labble 对象，确定entities中lable的值
-                     * 
+                     *
                      */
 
                     var billbo, labble, colorBill;
@@ -265,4 +265,4 @@
                 this.setVisible(vis);
             },
         });
-    });
\ No newline at end of file
+    });

--
Gitblit v1.9.3