From 819c0b6478fb3385c8457cd03e04fdf0d3b90a70 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期二, 21 五月 2024 10:11:44 +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 | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 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..76d285e 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
@@ -82,15 +82,20 @@
},
{
field : 'code',
- title : '閽诲瓟缂栧彿'
- },
+ title : '閽诲瓟缂栧彿',
+ sortable:true
+ }, {
+ field : 'type',
+ title : '閽诲瓟绫诲瀷',
+ sortable:true
+ },
{
field : 'elevation',
- title : '瀛斿彛楂樼▼'
+ title : '瀛斿彛楂樼▼锛坢锛�'
},
{
field : 'depth',
- title : '璁捐瀛旀繁'
+ title : '璁捐瀛旀繁锛坢锛�'
},
{
field : 'longitude',
@@ -104,15 +109,31 @@
},
{
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',
--
Gitblit v1.9.1