From 306749fa2e6ea7609468889cb56473770d0a26cc Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期六, 18 五月 2024 14:44:51 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html | 155 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 116 insertions(+), 39 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html
index cf01935..1f4867a 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html
@@ -54,51 +54,128 @@
</head>
<body class="white-bg">
<div id="container">
- <p class="project-name">
- <span class="name-label">鍦哄湴鍚嶇О锛�</span>
- <span class="name-val" th:text="${project.fullName}"></span>
- </p>
- <table class="basic-info">
- <tr>
- <td>寤鸿鍗曚綅锛�</td>
- <td colspan="3" th:text="${project.companyName}"></td>
- <td>鍔冲姟鍗曚綅锛�</td>
- <td colspan="3" th:text="${project.laborUnit}"></td>
- </tr>
- <tr>
- <td>寤鸿鍦扮偣锛�</td>
- <td colspan="7" th:text="${project.address}"></td>
- </tr>
- <tr>
- <td>鍦哄湴鍚嶇О锛�</td>
- <td colspan="5" th:text="${project.fullName}"></td>
- <td>鍦哄湴缂栧彿锛�</td>
- <td th:text="${project.code}"></td>
- </tr>
- <tr>
- <td>閽诲瓟涓暟锛�</td>
- <td th:text="${project.holeNum}"></td>
- <td>寮�濮嬫椂闂达細</td>
- <td th:text="${#dates.format(project.createTime,'yyyy-MM-dd')}"></td>
- <td>缁堟鏃堕棿锛�</td>
- <td th:text="${#dates.format(project.endTime,'yyyy-MM-dd')}"></td>
- <td>璐熻矗浜猴細</td>
- <td th:text="${project.leaderName}"></td>
- </tr>
- </table>
-<!-- <div class="map-model">-->
-<!-- <button onclick="map()" type="button">鍦板浘妯″紡</button>-->
-<!-- </div>-->
+
+ <div class="row">
+ <p class="project-name">
+ <span class="name-label">鍦哄湴鍚嶇О锛�</span>
+ <span class="name-val" th:text="${project.fullName}"></span>
+ </p>
+ <table class="basic-info">
+ <tr>
+ <td>寤鸿鍗曚綅锛�</td>
+ <td colspan="3" th:text="${project.companyName}"></td>
+ <td>鍔冲姟鍗曚綅锛�</td>
+ <td colspan="3" th:text="${project.laborUnit}"></td>
+ </tr>
+ <tr>
+ <td>寤鸿鍦扮偣锛�</td>
+ <td colspan="7" th:text="${project.address}"></td>
+ </tr>
+ <tr>
+ <td>鍦哄湴鍚嶇О锛�</td>
+ <td colspan="5" th:text="${project.fullName}"></td>
+ <td>鍦哄湴缂栧彿锛�</td>
+ <td th:text="${project.code}"></td>
+ </tr>
+ <tr>
+ <td>閽诲瓟涓暟锛�</td>
+ <td th:text="${project.holeNum}"></td>
+ <td>寮�濮嬫椂闂达細</td>
+ <td th:text="${#dates.format(project.createTime,'yyyy-MM-dd')}"></td>
+ <td>缁堟鏃堕棿锛�</td>
+ <td th:text="${#dates.format(project.endTime,'yyyy-MM-dd')}"></td>
+ <td>璐熻矗浜猴細</td>
+ <td th:text="${project.leaderName}"></td>
+ </tr>
+ </table>
+ <!-- <div class="map-model">-->
+ <!-- <button onclick="map()" type="button">鍦板浘妯″紡</button>-->
+ <!-- </div>-->
+ </div>
+
+ <div class="row">
+ <div class="col-sm-12 select-table table-striped">
+ <table id="bootstrap-table"></table>
+ </div>
+ </div>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
-
+
<script th:inline="javascript">
var project =[[${project}]];
+ var projectId=[[${projectId}]];
+ var statusDatas = [[${@dict.getType('hole_status')}]];
+ var prefix = ctx + "geo/hole";
- function map(){
- parent.$.modal.openTab("椤圭洰鍦板浘",ctx+"/geo/projectwork/map?id=" + project.ids);
- }
+ $(function() {
+ var options = {
+ url: prefix + "/list?projectId=" + projectId,
+ modalName: "閽诲瓟",
+ columns: [{
+ checkbox: true
+ },
+ {
+ field : 'ids',
+ title : '涓婚敭',
+ visible: false
+ },
+ {
+ field : 'code',
+ title : '閽诲瓟缂栧彿'
+ },
+ {
+ field : 'elevation',
+ title : '瀛斿彛楂樼▼锛坢锛�'
+ },
+ {
+ field : 'depth',
+ title : '璁捐瀛旀繁锛坢锛�'
+ },
+ {
+ field : 'longitude',
+ title : '閽诲瓟缁忓害',
+ visible: false
+ },
+ {
+ field : 'latitude',
+ title : '閽诲瓟绾害',
+ visible: false
+ },
+ {
+ field : 'status',
+ title : '閽诲瓟鐘舵��',
+ formatter: function(value, row, index) {
+ return $.table.selectDictLabel(statusDatas, value);
+ }
+ },
+ {
+ field : 'footage',
+ title : '鎬昏繘灏猴紙m锛�',
+ },
+ {
+ field : 'footageCpl',
+ title : '宸插畬鎴愯繘灏猴紙m锛�',
+ },
+ {
+ field : 'rate',
+ title : '瀹屾垚杩涘害(%)',
+ formatter: function(value, row, index) {
+ if (row.rate !=null){
+ return (row.rate*100).toFixed(2) + "%";
+ }else{
+ return "0%";
+ }
+ }
+ }
+ ]
+ };
+ $.table.init(options);
+ });
+ //
+ // function map(){
+ // parent.$.modal.openTab("椤圭洰鍦板浘",ctx+"/geo/projectwork/map?id=" + project.ids);
+ // }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1