From 5b29289d508e4272c368cf39d9c95717e3a17df1 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 06 Feb 2023 14:52:11 +0800
Subject: [PATCH] 水文水环境分析-洪水淹没：表格添加分页，修正小数相加，结果数据有误差的问题
---
corelib/common/popup/evaluateAnalysis.html | 116 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 64 insertions(+), 52 deletions(-)
diff --git a/corelib/common/popup/evaluateAnalysis.html b/corelib/common/popup/evaluateAnalysis.html
index 7ee6673..bd50588 100644
--- a/corelib/common/popup/evaluateAnalysis.html
+++ b/corelib/common/popup/evaluateAnalysis.html
@@ -7,69 +7,81 @@
<link rel="stylesheet" href="">
</head>
<body>
- <div class="evaluate-analysis">
- <div class="evaluate-top"></div>
+<div class="evaluate-analysis">
+ <div class="evaluate-top"></div>
- <div class="evaluate-box">
- <div class="evaluate-box-top">
- <div class="evaluate-box-top-left">
- <div class="column-1">
- <div>
- <span >受灾户数：</span><span class="house">暂无数据</span>
- </div>
- <div>
- <span>受灾面积：</span><span class="area">暂无数据</span>
- </div>
+ <div class="evaluate-box">
+ <div class="evaluate-box-top">
+ <div class="evaluate-box-top-left">
+ <div class="column-1">
+ <div>
+ <span>受灾户数：</span><span class="house">暂无数据</span>
</div>
- <div class="column-2">
- <div>
- <span>受灾人口：</span><span class="people">暂无数据</span>
- </div>
- <div>
- <span>房屋价值：</span><span class="money">暂无数据</span>
- </div>
+ <div>
+ <span>受灾面积：</span><span class="area">暂无数据</span>
</div>
</div>
- <div class="evaluate-box-top-right">
- <label >
- <input id="list" type="radio" name="value" value="list" checked='checked'>列表
- </label>
-
- <label >
- <input id="echarts" type="radio" name="value" value="echarts">图表
- </label>
+ <div class="column-2">
+ <div>
+ <span>受灾人口：</span><span class="people">暂无数据</span>
+ </div>
+ <div>
+ <span>房屋价值：</span><span class="money">暂无数据</span>
+ </div>
</div>
</div>
- <div class="evaluate-box-middle">
- <div class="evaluate-table">
- <table>
- <caption class="evaluate-table-caption table-caption">人口财产淹没损失表</caption>
- <thead class="evaluate-table-thead table-thead">
- <tr>
- <th><div>编号</div></th>
- <th><div>受淹户数(户)</div></th>
- <th><div>受淹人口数量(人)</div></th>
- <th><div>受淹居民地面积(km²)</div></th>
- <th><div>受淹房屋价值(万元/人)</div></th>
- </tr>
- </thead>
- <tbody id="evaluate-tbody" class="table-tbody evaluate-tbody"></tbody>
- </table>
- </div>
- <div class="evaluate-echarts" id="evaluate-echarts"></div>
+ <div class="evaluate-box-top-right">
+ <label>
+ <input id="list" type="radio" name="value" value="list" checked='checked'>列表
+ </label>
+
+ <label>
+ <input id="echarts" type="radio" name="value" value="echarts">图表
+ </label>
</div>
</div>
-
- <div class="evaluate-bottom">
- <button id="create-flood-image" type="button">生成淹没图</button>
+ <div class="evaluate-box-middle">
+ <div class="evaluate-table">
+ <table>
+ <caption class="evaluate-table-caption table-caption">人口财产淹没损失表</caption>
+ <thead class="evaluate-table-thead table-thead">
+ <tr>
+ <th>
+ <div>编号</div>
+ </th>
+ <th>
+ <div>受淹户数(户)</div>
+ </th>
+ <th>
+ <div>受淹人口数量(人)</div>
+ </th>
+ <th>
+ <div>受淹居民地面积(km²)</div>
+ </th>
+ <th>
+ <div>受淹房屋价值(万元/人)</div>
+ </th>
+ </tr>
+ </thead>
+ <tbody id="evaluate-tbody" class="table-tbody evaluate-tbody"></tbody>
+ </table>
+ </div>
+ <div class="flood-analysis-pagination Pagination" id="pagination"></div>
+ <div class="evaluate-echarts" id="evaluate-echarts"></div>
</div>
-
</div>
+ <div class="evaluate-bottom">
+ <button id="create-flood-image" type="button">生成淹没图</button>
+ </div>
- <script src="../../../libs/jquery/jquery-3.3.1.min.js"></script>
- <script src="../../../libs/layer/layer.js"></script>
- <script src="../../../libs/echarts/v4/echarts.min.js"></script>
- <script src="js/evaluateAnalysis.js"></script>
+</div>
+
+
+<script src="../../../libs/jquery/jquery-3.3.1.min.js"></script>
+<script src="../../../libs/jquery.pagination.js"></script>
+<script src="../../../libs/layer/layer.js"></script>
+<script src="../../../libs/echarts/v4/echarts.min.js"></script>
+<script src="js/evaluateAnalysis.js"></script>
</body>
</html>
--
Gitblit v1.9.3