Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang

chenhuan

2024-05-21 819c0b6478fb3385c8457cd03e04fdf0d3b90a70

 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html

@@ -82,8 +82,13 @@
                },
                {
                    field : 'code', 
                    title : '钻孔编号'
                },
                    title : '钻孔编号',
                    sortable:true
                }, {
                        field : 'type',
                        title : '钻孔类型',
                        sortable:true
                    },
                {
                    field : 'elevation', 
                    title : '孔口高程（m）'
@@ -104,30 +109,31 @@
                },
                {
                    field : 'status', 
                    title : '钻孔状态',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(statusDatas, value);
                    }
                    title : '钻孔状态'
                },
                    {
                        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%";
                            }
                        }
                    },
                {
                    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',