提交代码

zmk

2024-05-18 140c701242e3f003df44580f523118fe62a74c76

提交代码

 javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java

@@ -2,6 +2,9 @@

import java.util.List;

import cn.hutool.core.math.MathUtil;
import cn.hutool.core.util.ObjectUtil;
import com.javaweb.common.utils.Arith;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -104,9 +107,17 @@
    @PostMapping("/edit")
    @ResponseBody
    public AjaxResult editSave(Hole hole) {
        if(isNotNull(hole.getFootage()) &&  isNotNull(hole.getFootageCpl())){
            Double rate = Arith.div(hole.getFootageCpl(),hole.getFootage(),2) ;
            hole.setRate(rate);
        }
        return toAjax(holeService.updateHole(hole));
    }

    private boolean isNotNull(Double val){
        return val !=null && val !=0.0D;
    }

    /**
     * 删除钻孔
     */

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

@@ -14,13 +14,13 @@
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">孔口高程：</label>
                <label class="col-sm-3 control-label">孔口高程(m)：</label>
                <div class="col-sm-8">
                    <input name="elevation" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">设计孔深：</label>
                <label class="col-sm-3 control-label">设计孔深(m)：</label>
                <div class="col-sm-8">
                    <input name="depth" class="form-control" type="text">
                </div>
@@ -38,9 +38,9 @@
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">总进尺：</label>
                <label class="col-sm-3 control-label">总进尺(m)：</label>
                <div class="col-sm-8">
                    <input name="footage" class="form-control" type="text" placeholder="请输入总进尺">
                    <input name="footage" class="form-control" type="text" placeholder="请输入总进尺,单位（m）">
                </div>
            </div>


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

@@ -86,11 +86,11 @@
                },
                {
                    field : 'elevation', 
                    title : '孔口高程'
                    title : '孔口高程（m）'
                },
                {
                    field : 'depth', 
                    title : '设计孔深'
                    title : '设计孔深（m）'
                },
                {
                    field : 'longitude',
@@ -110,8 +110,23 @@
                    }
                },
                    {
                        field : 'footage',
                        title : '总进尺（m）',
                    },
                    {
                        field : 'footageCpl',
                        title : '已完成进尺（m）',
                    },
                    {
                        field : 'rate',
                        title : '进度',
                        title : '完成进度(%)',
                        formatter: function(value, row, index) {
                            if (row.rate !=null){
                                return (row.rate*100).toFixed(2) + "%";
                            }else{
                                return "0%";
                            }
                        }
                    },
                {
                    title: '操作',