From 880c8f54cddc8533f00f674da3f14c2cf0d34340 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期二, 25 六月 2024 17:58:17 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang

---
 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html |   66 +++++++++++++++++++++++++++------
 1 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html
index 0079353..2f3f474 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html
@@ -58,9 +58,11 @@
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('geo:hole:edit')}]];
         var removeFlag = [[${@permission.hasPermi('geo:hole:remove')}]];
+        var holeLogAddFlag = [[${@permission.hasPermi('geo:holeLog:add')}]];
         var typeDatas = [[${@dict.getType('hole_type')}]];
         var statusDatas = [[${@dict.getType('hole_status')}]];
         var prefix = ctx + "geo/hole";
+        var prefix2 = ctx + "geo/holeLog";
         var projectId=[[${projectId}]];
 
         $(function() {
@@ -72,6 +74,7 @@
                 exportUrl: prefix + "/export",
                 importUrl: prefix + "/importHole/"+projectId,
                 modalName: "閽诲瓟",
+                pageSize:50,
                 columns: [{
                     checkbox: true
                 },
@@ -82,15 +85,25 @@
                 },
                 {
                     field : 'code', 
-                    title : '閽诲瓟缂栧彿'
-                },
+                    title : '閽诲瓟缂栧彿',
+                    sortable:true
+                }, {
+                        field : 'type',
+                        title : '閽诲瓟绫诲瀷',
+                        sortable:true,
+                        formatter: function (value, row, index) {
+                            var actions=[];
+                            actions.push('<a href="javascript:void(0)" style="color:#1E9FFF;" onclick="preview(\'' + row.code + '\')">'+value+'</a>');
+                            return actions.join('');
+                        }
+                    },
                 {
                     field : 'elevation', 
-                    title : '瀛斿彛楂樼▼'
+                    title : '瀛斿彛楂樼▼锛坢锛�'
                 },
                 {
                     field : 'depth', 
-                    title : '璁捐瀛旀繁'
+                    title : '璁捐瀛旀繁锛坢锛�'
                 },
                 {
                     field : 'longitude',
@@ -104,20 +117,37 @@
                 },
                 {
                     field : 'status', 
-                    title : '閽诲瓟鐘舵��',
-                    formatter: function(value, row, index) {
-                        return $.table.selectDictLabel(statusDatas, value);
-                    }
+                    title : '閽诲瓟鐘舵��'
                 },
-                    {
-                        field : 'rate',
-                        title : '杩涘害',
-                    },
+                {
+                    field : 'footage',
+                    title : '鎬昏繘灏猴紙m锛�',
+                },
+                {
+                     field : 'footageCpl',
+                     title : '宸插畬鎴愯繘灏猴紙m锛�',
+
+                },
+                {
+                     field : 'rate',
+                     title : '瀹屾垚杩涘害(%)',
+                     sortable:true,
+                     formatter: function(value, row, index) {
+                         var proc =0;
+                         if (row.rate !=null){
+                             proc= (row.rate*100).toFixed(0) ;
+                         }
+                         return  `<div class="progress" style="margin-bottom: 0px;">
+                                  <div class="progress-bar bg-danger" role="progressbar" style="width: ${proc}%;" aria-valuenow="${proc}" aria-valuemin="0" aria-valuemax="100">${proc}%</div>
+                                  </div>`
+                     }
+                },
                 {
                     title: '鎿嶄綔',
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
+                        actions.push('<a class="btn btn-info btn-xs ' + holeLogAddFlag + '" href="javascript:void(0)" onclick="holeLogSave(\'' + row.code + '\')"><i class="glyphicon glyphicon-th-list"></i>閽诲瓟杩涘害</a> ');
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.ids + '\')"><i class="fa fa-edit"></i>淇敼</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.ids + '\')"><i class="fa fa-remove"></i>鍒犻櫎</a>');
                         return actions.join('');
@@ -133,6 +163,18 @@
             var filename="閽诲瓟妯℃澘.xls";
             window.location.href = ctx + "common/download?fileName=" + encodeURI(filename) + "&delete=" + false;
         }
+
+        //淇濆瓨璁板綍
+        function holeLogSave(holeCode) {
+            const url = prefix2 + "/add?projectId=" + projectId + "&holeCode=" + holeCode;
+            $.modal.open("閽诲瓟杩涘害璁板綍",url);
+        }
+
+        //鏌ョ湅閽诲瓟鍒楄〃
+        function preview(code) {
+            const url = prefix2 + "/viewHoleLog?projectId=" + projectId + "&holeCode=" + code;
+            $.modal.open("閽诲瓟杩涘害璁板綍鍒楄〃", url , 1100, 700);
+        }
     </script>
 </body>
 

--
Gitblit v1.9.1