修改钻孔

suerwei

2024-05-17 a999c9084ba7b6f410a9743da11c8ce469cdf41b

修改钻孔

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

@@ -1,6 +1,7 @@
package com.javaweb.geo.controller;

import java.util.List;

import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -27,8 +28,8 @@
 */
@Controller
@RequestMapping("/geo/hole")
public class HoleController extends BaseController
{
public class HoleController extends BaseController {

    private String prefix = "geo/hole";

    @Autowired
@@ -36,11 +37,11 @@

    @RequiresPermissions("geo:hole:view")
    @GetMapping()
    public String hole(String id,ModelMap mmap)
    {
    public String hole(String id, ModelMap mmap) {
        mmap.put("projectId", id);
        return prefix + "/hole";
    }


    /**
     * 查询钻孔列表
@@ -48,12 +49,12 @@
    @RequiresPermissions("geo:hole:list")
    @PostMapping("/list")
    @ResponseBody
    public TableDataInfo list(Hole hole)
    {
    public TableDataInfo list(Hole hole) {
        startPage();
        List<Hole> list = holeService.selectHoleList(hole);
        return getDataTable(list);
    }


    /**
     * 导出钻孔列表
@@ -62,8 +63,7 @@
    @Log(title = "钻孔", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    @ResponseBody
    public AjaxResult export(Hole hole)
    {
    public AjaxResult export(Hole hole) {
        List<Hole> list = holeService.selectHoleList(hole);
        ExcelUtil<Hole> util = new ExcelUtil<Hole>(Hole.class);
        return util.exportExcel(list, "hole");
@@ -73,8 +73,8 @@
     * 新增钻孔
     */
    @GetMapping("/add")
    public String add()
    {
    public String add(String projectId, ModelMap mmap) {
        mmap.put("projectId", projectId);
        return prefix + "/add";
    }

@@ -85,8 +85,7 @@
    @Log(title = "钻孔", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @ResponseBody
    public AjaxResult addSave(Hole hole)
    {
    public AjaxResult addSave(Hole hole) {
        return toAjax(holeService.insertHole(hole));
    }

@@ -94,8 +93,7 @@
     * 修改钻孔
     */
    @GetMapping("/edit/{ids}")
    public String edit(@PathVariable("ids") String ids, ModelMap mmap)
    {
    public String edit(@PathVariable("ids") String ids, ModelMap mmap) {
        Hole hole = holeService.selectHoleById(ids);
        mmap.put("hole", hole);
        return prefix + "/edit";
@@ -108,8 +106,7 @@
    @Log(title = "钻孔", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @ResponseBody
    public AjaxResult editSave(Hole hole)
    {
    public AjaxResult editSave(Hole hole) {
        return toAjax(holeService.updateHole(hole));
    }

@@ -120,8 +117,7 @@
    @Log(title = "钻孔", businessType = BusinessType.DELETE)
    @PostMapping( "/remove")
    @ResponseBody
    public AjaxResult remove(String ids)
    {
    public AjaxResult remove(String ids) {
        return toAjax(holeService.deleteHoleByIds(ids));
    }


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

@@ -42,6 +42,8 @@
        return prefix + "/projectData";
    }



    /**
     * 查询项目资料列表
     */

 javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HoleServiceImpl.java

@@ -3,6 +3,7 @@
import java.util.List;

import com.javaweb.common.utils.DateUtils;
import com.javaweb.common.utils.IdGenerate;
import com.javaweb.geo.domain.*;
import com.javaweb.geo.mapper.*;
import com.javaweb.geo.service.*;
@@ -48,8 +49,7 @@
     * @return 钻孔
     */
    @Override
    public Hole selectHoleById(String ids)
    {
    public Hole selectHoleById(String ids) {
        return holeMapper.selectHoleById(ids);
    }

@@ -60,8 +60,7 @@
     * @return 钻孔
     */
    @Override
    public List<Hole> selectHoleList(Hole hole)
    {
    public List<Hole> selectHoleList(Hole hole) {
        return holeMapper.selectHoleList(hole);
    }

@@ -72,8 +71,10 @@
     * @return 结果
     */
    @Override
    public int insertHole(Hole hole)
    {
    public int insertHole(Hole hole) {
        if(ObjectUtils.isEmpty(hole.getIds())){
            hole.setIds(IdGenerate.nextId());
        }
        hole.setCreateTime(DateUtils.getNowDate());
        return holeMapper.insertHole(hole);
    }
@@ -85,8 +86,7 @@
     * @return 结果
     */
    @Override
    public int updateHole(Hole hole)
    {
    public int updateHole(Hole hole) {
        hole.setUpdateTime(DateUtils.getNowDate());
        return holeMapper.updateHole(hole);
    }
@@ -148,8 +148,7 @@
     * @return 结果
     */
    @Override
    public int deleteHoleById(String ids)
    {
    public int deleteHoleById(String ids) {
        return holeMapper.deleteHoleById(ids);
    }
}

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

@@ -8,30 +8,9 @@
    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
        <form class="form-horizontal m" id="form-hole-add">
            <div class="form-group">    
                <label class="col-sm-3 control-label">项目序列号：</label>
                <div class="col-sm-8">
                    <input name="projectId" 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">钻孔编号：</label>
                <div class="col-sm-8">
                    <input name="code" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">描述、技术要求：</label>
                <div class="col-sm-8">
                    <input name="description" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">勘探点类型：</label>
                <div class="col-sm-8">
                    <select name="type" class="form-control m-b">
                        <option value="">所有</option>
                    </select>
                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
                </div>
            </div>
            <div class="form-group">    
@@ -47,136 +26,41 @@
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">勘探点经度：</label>
                <label class="col-sm-3 control-label">钻孔经度：</label>
                <div class="col-sm-8">
                    <input name="longitude" 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">钻孔纬度：</label>
                <div class="col-sm-8">
                    <input name="latitude" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">相对坐标X：</label>
                <label class="col-sm-3 control-label">进度：</label>
                <div class="col-sm-8">
                    <input name="surveyX" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">相对坐标Y：</label>
                <div class="col-sm-8">
                    <input name="surveyY" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">相对坐标Z：</label>
                <div class="col-sm-8">
                    <input name="surveyZ" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">测量坐标纬度：</label>
                <div class="col-sm-8">
                    <input name="surveyLatitude" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">测量坐标经度：</label>
                <div class="col-sm-8">
                    <input name="surveyLongitude" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">钻孔定位纬度：</label>
                <div class="col-sm-8">
                    <input name="mapLatitude" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">钻孔定位经度：</label>
                <div class="col-sm-8">
                    <input name="mapLongitude" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">钻孔定位时间：</label>
                <div class="col-sm-8">
                    <div class="input-group date">
                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                        <input name="mapTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
                    </div>
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">无法定位的地点：</label>
                <div class="col-sm-8">
                    <input name="position" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">无法定位的时间：</label>
                <div class="col-sm-8">
                    <div class="input-group date">
                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                        <input name="locateTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
                    </div>
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">无法定位的原因：</label>
                <div class="col-sm-8">
                    <input name="reason" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">现场拍照1：</label>
                <div class="col-sm-8">
                    <input name="pic1" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">现场拍照2：</label>
                <div class="col-sm-8">
                    <input name="pic2" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">现场拍照3：</label>
                <div class="col-sm-8">
                    <input name="pic3" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">钻孔状态：</label>
                <div class="col-sm-8">
                    <div class="radio-box">
                        <input type="radio" name="status" value="">
                        <label th:for="status" th:text="未知"></label>
                    </div>
                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">是否删除：</label>
                <div class="col-sm-8">
                    <input name="isDeleted" class="form-control" type="text">
                    <input name="pic1" class="form-control" type="text" placeholder="请输入进度数字（例：10代表10%）">
                </div>
            </div>
        </form>
    </div>
    <th:block th:include="include :: footer" />
    <th:block th:include="include :: datetimepicker-js" />
    <script type="text/javascript">

    <script th:inline="javascript">
        var prefix = ctx + "geo/hole"
        var projectId = [[${projectId}]];

        $("#form-hole-add").validate({
            focusCleanup: true
        });

        function submitHandler() {
            if ($.validate.form()) {
                $.operate.save(prefix + "/add", $('#form-hole-add').serialize());
                let formData = $('#form-hole-add').serialize();
                let data = formData + "&projectId=" + projectId;
                $.operate.save(prefix + "/add", data);
            }
        }


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

@@ -9,146 +9,48 @@
        <form class="form-horizontal m" id="form-hole-edit" th:object="${hole}">
            <input name="ids" th:field="*{ids}" type="hidden">
            <div class="form-group">    
                <label class="col-sm-3 control-label">勘探点编号：</label>
                <label class="col-sm-3 control-label">钻孔编号：</label>
                <div class="col-sm-8">
                    <input name="code" th:field="*{code}" class="form-control" type="text"  disabled="disabled">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">描述、技术要求：</label>
                <div class="col-sm-8">
                    <input name="description" th:field="*{description}" class="form-control" type="text" disabled="disabled">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">勘探点类型：</label>
                <div class="col-sm-8">
                    <select name="type" class="form-control m-b" th:with="type=${@dict.getType('hole_type')}" disabled="disabled">
                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{type}"></option>
                    </select>
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">孔口高程：</label>
                <div class="col-sm-8">
                    <input name="elevation" th:field="*{elevation}" class="form-control" type="text"  disabled="disabled" >
                    <input name="elevation" th:field="*{elevation}" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">设计孔深：</label>
                <div class="col-sm-8">
                    <input name="depth" th:field="*{depth}" class="form-control" type="text"  disabled="disabled">
                    <input name="depth" th:field="*{depth}" 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">钻孔经度：</label>
                <div class="col-sm-8">
                    <input name="longitude" th:field="*{longitude}" class="form-control" type="text"  disabled="disabled">
                    <input name="longitude" th:field="*{longitude}" 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">钻孔纬度：</label>
                <div class="col-sm-8">
                    <input name="latitude" th:field="*{latitude}" class="form-control" type="text"  disabled="disabled">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">相对坐标X：</label>
                <div class="col-sm-8">
                    <input name="surveyX" th:field="*{surveyX}" class="form-control" type="text"  disabled="disabled">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">相对坐标Y：</label>
                <div class="col-sm-8">
                    <input name="surveyY" th:field="*{surveyY}" class="form-control" type="text"  disabled="disabled">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">相对坐标Z：</label>
                <div class="col-sm-8">
                    <input name="surveyZ" th:field="*{surveyZ}" class="form-control" type="text"  disabled="disabled">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">测量坐标纬度：</label>
                <div class="col-sm-8">
                    <input name="surveyLatitude" th:field="*{surveyLatitude}" class="form-control" type="text" disabled="disabled">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">测量坐标经度：</label>
                <div class="col-sm-8">
                    <input name="surveyLongitude" th:field="*{surveyLongitude}" class="form-control" type="text"  disabled="disabled" >
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">钻孔定位纬度：</label>
                <div class="col-sm-8">
                    <input name="mapLatitude" th:field="*{mapLatitude}" class="form-control" type="text"  disabled="disabled">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">钻孔定位经度：</label>
                <div class="col-sm-8">
                    <input name="mapLongitude" th:field="*{mapLongitude}" class="form-control" type="text"  disabled="disabled">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">钻孔定位时间：</label>
                <div class="col-sm-8">
                    <div class="input-group date">
<!--                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
                        <input name="mapTime" th:value="${#dates.format(hole.mapTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text"  disabled="disabled">
                    </div>
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">无法定位的地点：</label>
                <div class="col-sm-8">
                    <input name="position" th:field="*{position}" class="form-control" type="text"  disabled="disabled">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">无法定位的时间：</label>
                <div class="col-sm-8">
                    <div class="input-group date">
                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                        <input name="locateTime" th:value="${#dates.format(hole.locateTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text"  disabled="disabled">
                    </div>
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">无法定位的原因：</label>
                <div class="col-sm-8">
                    <input name="reason" th:field="*{reason}" class="form-control" type="text"  disabled="disabled">
                    <input name="latitude" th:field="*{latitude}" class="form-control" type="text" >
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">钻孔状态：</label>
                <div class="col-sm-8">
                    <div class="radio-box" th:each="dict : ${@dict.getType('hole_status')}">
                        <input type="radio" th:id="${'status_' + dict.dictCode}" name="status" th:value="${dict.dictValue}" th:field="*{status}" disabled="disabled">
                        <input type="radio" th:id="${'status_' + dict.dictCode}" name="status" th:value="${dict.dictValue}" th:field="*{status}" >
                        <label th:for="${'status_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
                    </div>
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">现场拍照1：</label>
                <label class="col-sm-3 control-label">进度：</label>
                <div class="col-sm-8">
                    <img border="0" th:src="*{pic1}" />
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">现场拍照2：</label>
                <div class="col-sm-8">
                    <img border="0" th:src="*{pic2}" />
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">现场拍照3：</label>
                <div class="col-sm-8">
                    <img border="0" th:src="*{pic3}" />
                    <input name="pic1" th:field="*{pic1}" class="form-control" type="text" placeholder="请输入进度数字（例：10代表10%）">
                </div>
            </div>
        </form>

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

@@ -16,14 +16,7 @@
                    <div class="select-list">
                        <ul>
                            <li>
                                <p>勘探点类型：</p>
                                <select name="type" th:with="type=${@dict.getType('hole_type')}">
                                    <option value="">所有</option>
                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                </select>
                            </li>
                            <li>
                                <p>勘探点编号：</p>
                                <p>钻孔编号：</p>
                                <input type="text" name="code"/>
                            </li>
                            <li>
@@ -43,6 +36,12 @@
            </div>

             <div class="btn-group-sm" id="toolbar" role="group">
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="geo:hole:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
                 <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="geo:hole:edit">
                     <i class="fa fa-edit"></i> 修改
                 </a>
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="geo:hole:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
@@ -60,10 +59,11 @@
        var statusDatas = [[${@dict.getType('hole_status')}]];
        var prefix = ctx + "geo/hole";
        var projectId=[[${projectId}]];

        $(function() {
            var options = {
                url: prefix + "/list?projectId="+projectId,
                createUrl: prefix + "/add",
                createUrl: prefix + "/add?projectId="+projectId,
                updateUrl: prefix + "/edit/{id}",
                removeUrl: prefix + "/remove",
                exportUrl: prefix + "/export",
@@ -78,19 +78,7 @@
                },
                {
                    field : 'code', 
                    title : '勘探点编号'
                },
                {
                    field : 'description', 
                    title : '描述、技术要求',
                    visible: false
                },
                {
                    field : 'type', 
                    title : '勘探点类型',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(typeDatas, value);
                    }
                    title : '钻孔编号'
                },
                {
                    field : 'elevation', 
@@ -102,65 +90,12 @@
                },
                {
                    field : 'longitude',
                    title : '勘探点经度',
                    title : '钻孔经度',
                    visible: false
                },
                {
                    field : 'latitude', 
                    title : '勘探点纬度',
                    visible: false
                },
                {
                    field : 'surveyX', 
                    title : '相对坐标X',
                    visible: false
                },
                {
                    field : 'surveyY', 
                    title : '相对坐标Y',
                    visible: false
                },
                {
                    field : 'surveyZ', 
                    title : '相对坐标Z',
                    visible: false
                },
                {
                    field : 'surveyLatitude', 
                    title : '测量坐标纬度',
                    visible: false
                },
                {
                    field : 'surveyLongitude', 
                    title : '测量坐标经度',
                    visible: false
                },
                {
                    field : 'mapLatitude', 
                    title : '钻孔定位纬度'
                },
                {
                    field : 'mapLongitude', 
                    title : '钻孔定位经度'
                },
                {
                    field : 'mapTime', 
                    title : '钻孔定位时间',
                    visible: false
                },
                {
                    field : 'position', 
                    title : '无法定位的地点',
                    visible: false
                },
                {
                    field : 'locateTime', 
                    title : '无法定位的时间',
                    visible: false
                },
                {
                    field : 'reason', 
                    title : '无法定位的原因',
                    title : '钻孔纬度',
                    visible: false
                },
                {
@@ -171,11 +106,15 @@
                    }
                },
                {
                        field : 'pic1',
                        title : '进度',
                    },
                {
                    title: '操作',
                    align: 'center',
                    formatter: function(value, row, index) {
                        var actions = [];
                        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-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('');
                    }

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

@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
    <th:block th:include="include :: header('新增项目')" />
    <th:block th:include="include :: header('新增场地')" />
    <th:block th:include="include :: select2-css" />
    <th:block th:include="include :: datetimepicker-css" />
</head>
@@ -9,14 +9,14 @@
    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
        <form class="form-horizontal m" id="form-project-add">
            <div class="form-group">
                <label class="col-sm-3 control-label">项目编号：</label>
                <label class="col-sm-3 control-label">场地编号：</label>
                <div class="col-sm-8">
                    <input name="code" class="form-control" required type="text">
                </div>
            </div>

            <div class="form-group">
                <label class="col-sm-3 control-label">项目名称：</label>
                <label class="col-sm-3 control-label">场地名称：</label>
                <div class="col-sm-8">
                    <input name="fullName" class="form-control" required type="text">
                </div>
@@ -46,7 +46,7 @@
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">项目负责人：</label>
                <label class="col-sm-3 control-label">场地负责人：</label>
                <div class="col-sm-8">
                    <input name="leader" class="form-control" type="text">
                </div>
@@ -67,14 +67,14 @@
            <div class="form-group">
                <label class="col-sm-3 control-label">开始时间：</label>
                <div class="col-sm-8">
                    <input name="startTime" type="text" class="form-control" id="start-time"  placeholder="选择项目起始时间">
                    <input name="startTime" type="text" class="form-control" id="start-time"  placeholder="选择场地起始时间">
                </div>
            </div>

            <div class="form-group">
                <label class="col-sm-3 control-label">结束时间：</label>
                <div class="col-sm-8">
                    <input name="endTime" type="text" class="form-control" id="end-time"  placeholder="选择项目结束时间">
                    <input name="endTime" type="text" class="form-control" id="end-time"  placeholder="选择场地结束时间">
                </div>
            </div>


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

@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
    <th:block th:include="include :: header('修改项目')" />
    <th:block th:include="include :: header('修改场地')" />
    <th:block th:include="include :: select2-css" />
    <th:block th:include="include :: datetimepicker-css" />
</head>
@@ -10,13 +10,13 @@
        <form class="form-horizontal m" id="form-project-edit" th:object="${project}">
            <input name="ids" th:field="*{ids}" type="hidden">
            <div class="form-group">
                <label class="col-sm-3 control-label">项目编号：</label>
                <label class="col-sm-3 control-label">场地编号：</label>
                <div class="col-sm-8">
                    <input name="code" th:field="*{code}" 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">场地名称：</label>
                <div class="col-sm-8">
                    <input name="fullName" th:field="*{fullName}" class="form-control" type="text">
                </div>
@@ -42,7 +42,7 @@
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">项目负责人：</label>
                <label class="col-sm-3 control-label">场地负责人：</label>
                <div class="col-sm-8">
                    <input name="leader" th:field="*{leader}" class="form-control" type="text">
                </div>
@@ -64,14 +64,14 @@
            <div class="form-group">
                <label class="col-sm-3 control-label">开始时间：</label>
                <div class="col-sm-8">
                    <input name="startTime"  th:field="*{startTime}" type="text" class="form-control" id="start-time" placeholder="选择项目起始时间">
                    <input name="startTime"  th:field="*{startTime}" type="text" class="form-control" id="start-time" placeholder="选择场地起始时间">
                </div>
            </div>

            <div class="form-group">
                <label class="col-sm-3 control-label">结束时间：</label>
                <div class="col-sm-8">
                    <input name="endTime"  th:field="*{endTime}" type="text" class="form-control" id="end-time" placeholder="选择项目结束时间">
                    <input name="endTime"  th:field="*{endTime}" type="text" class="form-control" id="end-time" placeholder="选择场地结束时间">
                </div>
            </div>


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

@@ -21,12 +21,12 @@
 
            <div class="box-header active">
                <div class="box-title">
                    <i class="fa fa-desktop"></i> <a class="afont" th:href="@{/geo/project/info(id=${project.ids})}" target="mainFrame" onclick="selected(this)">项目详情</a>                    
                    <i class="fa fa-desktop"></i> <a class="afont" th:href="@{/geo/project/info(id=${project.ids})}" target="mainFrame" onclick="selected(this)">场地详情</a>
                </div> 
            </div>
            <div class="box-header ">
                <div class="box-title">
                    <i class="glyphicon glyphicon-map-marker"></i> <a class="afont" th:href="@{/geo/hole(id=${project.ids})}" target="mainFrame" onclick="selected(this)">勘探点</a>                    
                    <i class="glyphicon glyphicon-map-marker"></i> <a class="afont" th:href="@{/geo/hole(id=${project.ids})}" target="mainFrame" onclick="selected(this)">钻孔</a>
                </div> 
            </div>
            <div class="box-header ">
@@ -51,32 +51,12 @@
            </div>
            <div class="box-header ">
                <div class="box-title">
                    <i class="glyphicon glyphicon-th-list"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='3')}" target="mainFrame" onclick="selected(this)">测井</a>
                    <i class="glyphicon glyphicon-th-list"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='3')}" target="mainFrame" onclick="selected(this)">施工现场管理</a>
                </div>
            </div>
            <div class="box-header ">
                <div class="box-title">
                    <i class="glyphicon glyphicon-align-justify"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='4')}" target="mainFrame" onclick="selected(this)">斜测</a>
                </div>
            </div>
            <div class="box-header ">
                <div class="box-title">
                    <i class="glyphicon glyphicon-home"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='5')}" target="mainFrame" onclick="selected(this)">室内试验</a>
                </div>
            </div>
            <div class="box-header ">
                <div class="box-title">
                    <i class="glyphicon glyphicon-object-align-left"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='6')}" target="mainFrame" onclick="selected(this)">工程测绘</a>
                </div>
            </div>
            <div class="box-header ">
                <div class="box-title">
                    <i class="glyphicon glyphicon-tint"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='7')}" target="mainFrame" onclick="selected(this)">水质分析</a>
                </div>
            </div>
            <div class="box-header ">
                <div class="box-title">
                    <i class="glyphicon glyphicon-facetime-video"></i> <a class="afont" th:href="@{/geo/projectCamera(id=${project.ids},type='7')}" target="mainFrame" onclick="selected(this)">现场监控设备</a>
                    <i class="glyphicon glyphicon-facetime-video"></i> <a class="afont" th:href="@{/geo/projectCamera(id=${project.ids})}" target="mainFrame" onclick="selected(this)">现场监控设备</a>
                </div>
            </div>
        </div>

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

@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
    <th:block th:include="include :: header('项目列表')" />
    <th:block th:include="include :: header('场地列表')" />
</head>
<body class="gray-bg">
     <div class="container-div">
@@ -12,11 +12,11 @@
                        <ul>
       
                            <li>
                                <p>项目名称：</p>
                                <p>场地名称：</p>
                                <input type="text" name="fullName"/>
                            </li>
                            <li>
                                <p>项目编号：</p>
                                <p>场地编号：</p>
                                <input type="text" name="code"/>
                            </li>
                            <li>
@@ -57,18 +57,18 @@
                updateUrl: prefix + "/edit/{id}",
                removeUrl: prefix + "/remove",
                exportUrl: prefix + "/export",
                modalName: "项目",
                modalName: "场地",
                columns: [{
                    checkbox: true
                },
                {
                        field : 'code',
                        title : '项目编号',
                        title : '场地编号',
                        sortable:true
                },
                {
                    field : 'fullName', 
                    title : '项目名称',
                    title : '场地名称',
                    formatter: function(value, row, index) {
                      return '<a onclick="navigate(\'' + row.ids + '\')">'+row.fullName+'</a>'                    
                   },           
@@ -84,7 +84,7 @@
                },
                {
                    field : 'leaderName',
                    title : '项目负责人'
                    title : '场地负责人'
                },
                {
                    field : 'createTime', 
@@ -92,7 +92,7 @@
                },
                {
                    field : 'status', 
                    title : '项目状态',
                    title : '场地状态',
                    formatter: function(value, row, index) {
                       if(row.status =='0'){
                           return "未验收";
@@ -118,7 +118,7 @@
        
       function navigate(id){   
            
            $.modal.openTab("项目导航",ctx+"/geo/project/navigate?ids="+id);
            $.modal.openTab("场地导航",ctx+"/geo/project/navigate?ids="+id);
        }
    </script>
</body>

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

@@ -8,21 +8,16 @@
        <div class="row">
            <div class="col-sm-12 search-collapse">
                <form id="formId">
                    <div class="select-list">

                    <!--        条件表达式            -->
                    <div th:if="${type}=='3'" class="select-list">
                        <ul>
                            <li>
                                <p>资料名称：</p>
                                <input type="text" name="name"/>
                            </li>
                            <li>
                                <p>资料类型：</p>
                                <select name="dataType" th:with="type=${@dict.getType('project_data_type')}">
                                    <option value="">所有</option>
                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                </select>
                            </li>
                            <li>
                                <p>文件类型：</p>
                                <p>业务类型：</p>
                                <select name="fileType" th:with="type=${@dict.getType('project_data_file_type')}">
                                    <option value="">所有</option>
                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -38,6 +33,24 @@
                            </li>
                        </ul>
                    </div>
                    <!--        条件表达式            -->
                    <div th:if="${type}!='3'" class="select-list">
                        <ul>
                            <li>
                                <p>资料名称：</p>
                                <input type="text" name="name"/>
                            </li>
                            <li>
                                <p>标签：</p>
                                <input type="text" name="labels"/>
                            </li>
                            <li>
                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                            </li>
                        </ul>
                    </div>

                </form>
            </div>

@@ -90,13 +103,6 @@
                {
                    field : 'name', 
                    title : '资料名称'
                },
                {
                    field : 'dataType', 
                    title : '资料类型',
                    formatter: function(value, row, index) {
                       return $.table.selectDictLabel(dataTypeDatas, value);
                    }
                },
                {
                    field : 'fileType',