javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java
@@ -55,6 +55,12 @@ return getDataTable(list); } @GetMapping("/holelist") @ResponseBody public AjaxResult holelist(Hole hole) { List<Hole> list = holeService.selectHoleList(hole); return AjaxResult.success(list); } /** * 导出钻孔列表 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/edit.html
@@ -96,11 +96,6 @@ $.modal.alertWarning("出入库时间，请选择一条记录"); return; } if (!$.common.isEmpty(inboundDateValue) && !$.common.isEmpty(outboundDateValue)) { $.modal.alertWarning("出入库时间，请选择一条记录"); return; } if ($.validate.form()) { $.operate.save(prefix + "/edit", $('#form-TubLog-edit').serialize()); } javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/add.html
@@ -10,7 +10,7 @@ <div class="form-group"> <label class="col-sm-3 control-label">钻孔编号：</label> <div class="col-sm-8"> <input name="code" class="form-control" type="text"> <input name="code" class="form-control" type="text" placeholder="请输入钻孔编号" required> </div> </div> <div class="form-group"> @@ -48,7 +48,7 @@ <div class="form-group"> <label class="col-sm-3 control-label">总进尺(m)：</label> <div class="col-sm-8"> <input name="footage" class="form-control" type="text" placeholder="请输入总进尺,单位（m）"> <input name="footage" class="form-control" type="text" required placeholder="请输入总进尺,单位（m）"> </div> </div>
@@ -11,7 +11,7 @@ <div class="form-group"> <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"> <input name="code" th:field="*{code}" class="form-control" type="text" disabled="disabled" required> </div> </div> <div class="form-group"> @@ -57,7 +57,7 @@ <div class="form-group"> <label class="col-sm-3 control-label">总进尺（m）：</label> <div class="col-sm-8"> <input name="footage" th:field="*{footage}" class="form-control" type="text" placeholder="请输入总进尺,单位（m）"> <input name="footage" th:field="*{footage}" class="form-control" type="text" placeholder="请输入总进尺,单位（m）" required> </div> </div> <div class="form-group"> javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/add.html
@@ -10,7 +10,7 @@ <div class="form-group"> <label class="col-sm-3 control-label">钻孔编号：</label> <div class="col-sm-8"> <input name="code" th:value="${holeCode}" class="form-control" type="text"> <input name="code" th:value="${holeCode}" required class="form-control" type="text" placeholder="请填写钻孔编号"> </div> </div> <div class="form-group"> @@ -30,14 +30,14 @@ <div class="col-sm-8"> <div class="input-group date"> <span class="input-group-addon"><i class="fa fa-calendar"></i></span> <input name="createTime" class="form-control" placeholder="yyyy-MM-dd" type="text"> <input name="createTime" required 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="recordPerson" class="form-control" type="text"> <input name="recordPerson" required class="form-control" type="text" placeholder="填写记录人"> </div> </div> <div class="form-group"> javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/edit.html
@@ -11,7 +11,7 @@ <div class="form-group"> <label class="col-sm-3 control-label">钻孔编号：</label> <div class="col-sm-8"> <input name="code" th:field="*{code}" class="form-control" type="text"> <input name="code" th:field="*{code}" required class="form-control" type="text" placeholder="请填写钻孔编号"> </div> </div> <div class="form-group"> @@ -31,14 +31,14 @@ <div class="col-sm-8"> <div class="input-group date"> <span class="input-group-addon"><i class="fa fa-calendar"></i></span> <input name="createTime" th:value="${#dates.format(holeLog.createTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text"> <input name="createTime" th:value="${#dates.format(holeLog.createTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required> </div> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">记录人：</label> <div class="col-sm-8"> <input name="recordPerson" th:field="*{recordPerson}" class="form-control" type="text"> <input name="recordPerson" th:field="*{recordPerson}" class="form-control" type="text" required placeholder="填写记录人"> </div> </div> <div class="form-group"> javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/holeLog2.html
@@ -15,7 +15,7 @@ <!-- <input type="text" name="code"/>--> <!-- </li>--> <li class="select-time"> <p>记录保存时间：</p> <p>时间：</p> <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/> <span>-</span> <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/> javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html
@@ -2,109 +2,134 @@ <html lang="zh" xmlns:th="http://www.thymeleaf.org" > <head> <th:block th:include="include :: header('基本信息')" /> <th:block th:include="include :: datetimepicker-css" /> <!-- <link th:href="@{/js/elementUI/index.css}" rel="stylesheet" />--> <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"> <script th:src="@{/js/jquery.min.js}"></script> <script th:src="@{/js/vue.min.js}"></script> <!-- <script th:src="@{/js/elementUI/index.js}"></script>--> <script src="https://unpkg.com/element-ui/lib/index.js"></script> <style type="text/css"> * { padding: 0px; margin: 0px; box-sizing: border-box; user-select: none; } html, body { height: 100%; } #container { .el-card__header{ height: 40px; padding: 8px 20px; } #app { height: 100%; padding: 20px; } .basic-info { border-collapse: collapse; width: 100%; } .basic-info td { border: 1px solid #8080807a; padding: 8px 0px 8px 5px; } .project-name{ font-size: 16px; } .map-model{ margin-top: 10px; text-align: right; } .map-model button{ background-color: rgb(66,139,202); height: 30px; line-height: 30px; color: white; padding: 0px 10px; border-width: 0px; border-radius: 3px; .el-progress-circle{ width: 180px !important; height: 180px !important; } </style> </head> <body class="white-bg"> <div id="container"> <body> <div id="app" v-cloak> <el-row style="height: 200px;"> <el-col :span="8"> <el-card class="box-card" style="height: 320px;"> <div slot="header" class="clearfix"> <span>场地简介</span> </div> <el-descriptions class="margin-top" title="" :column="1" size="small" border> <el-descriptions-item> <template slot="label"> <i class="el-icon-s-tools"></i> 项目名称 </template> {{project.fullName}} </el-descriptions-item> <div class="row"> <p class="project-name"> <h3>场地信息</h3> <!-- <span class="name-label">场地名称：</span>--> <!-- <span class="name-val" th:text="${project.fullName}"></span>--> </p> <table class="basic-info"> <tr> <td>建设单位：</td> <td colspan="3" th:text="${project.companyName}"></td> <td>劳务单位：</td> <td colspan="3" th:text="${project.laborUnit}"></td> </tr> <tr> <td>建设地点：</td> <td colspan="7" th:text="${project.address}"></td> </tr> <tr> <td>场地名称：</td> <td colspan="5" th:text="${project.fullName}"></td> <td>场地编号：</td> <td th:text="${project.code}"></td> </tr> <tr> <td>钻孔个数：</td> <td th:text="${project.holeNum}"></td> <td>开始时间：</td> <td th:text="${#dates.format(project.createTime,'yyyy-MM-dd')}"></td> <td>终止时间：</td> <td th:text="${#dates.format(project.endTime,'yyyy-MM-dd')}"></td> <td>负责人：</td> <td th:text="${project.leaderName}"></td> </tr> </table> <!-- <div class="map-model">--> <!-- <button onclick="map()" type="button">地图模式</button>--> <!-- </div>--> </div> <el-descriptions-item> <template slot="label"> <i class="el-icon-menu"></i> 场地编号 </template> {{project.code}} </el-descriptions-item> <el-descriptions-item> <template slot="label"> <i class="el-icon-map-location"></i> 所在区域 </template> {{project.district}} </el-descriptions-item> <div class="row" style="margin-top: 30px;"> <h3>场地钻孔列表</h3> </div> <div class="row"> <div class="col-sm-12 select-table table-striped"> <table id="bootstrap-table"></table> </div> </div> <el-descriptions-item> <template slot="label"> <i class="el-icon-location"></i> 场地位置 </template> {{project.address}} </el-descriptions-item> <el-descriptions-item> <template slot="label"> <i class="el-icon-user"></i> 负责人： </template> {{project.leaderName}} </el-descriptions-item> <el-descriptions-item> <template slot="label"> <i class="el-icon-s-operation"></i> 当前进度 </template> {{project.rate}} </el-descriptions-item> <el-descriptions-item> <template slot="label"> <i class="el-icon-price-tag"></i> 劳务单位 </template> {{project.laborUnit}} </el-descriptions-item> </el-descriptions> </el-card> </el-col> <el-col :span="10" > <el-card class="box-card" style="height: 320px;"> <div slot="header" class="clearfix"> <span>场地进度</span> </div> <template> <el-table :data="holeData" size="small" style="width: 100%"> <el-table-column prop="code" label="编号"></el-table-column> <el-table-column prop="type" label="类型"></el-table-column> <el-table-column prop="footage" label="总进尺(m)"></el-table-column> <el-table-column prop="footageCpl" label="已完成(m)"></el-table-column> <el-table-column label="进度(%)"> <template slot-scope="scope"> <el-progress :percentage=(scope.row.rate*100).toFixed(0) ></el-progress> </template> </el-table-column> </el-table> </template> </el-card> </el-col> <el-col :span="6" > <el-card class="box-card" style="height: 320px;"> <div slot="header" class="clearfix"> <span>场地进度</span> </div> <div style=""> <el-progress type="dashboard" :percentage="50"> </el-progress> </div> </el-card> </el-col> </el-row> </div> <th:block th:include="include :: footer" /> <th:block th:include="include :: datetimepicker-js" /> <script th:inline="javascript"> var project =[[${project}]]; @@ -113,62 +138,29 @@ var prefix = ctx + "geo/hole"; $(function() { var options = { url: prefix + "/list?projectId=" + projectId, modalName: "钻孔", columns: [ { field : 'code', title : '钻孔编号' }, { field : 'elevation', title : '孔口高程（m）' }, { field : 'depth', title : '设计孔深（m）' }, { field : 'longitude', title : '钻孔经度', visible: false }, { field : 'latitude', title : '钻孔纬度', visible: false }, { field : 'status', title : '钻孔状态', formatter: function(value, row, index) { return $.table.selectDictLabel(statusDatas, value); } }, { 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%"; } } } ] }; $.table.init(options); var url = prefix + "/holelist?projectId=" + projectId; $.ajaxSettings.async = false; $.get(url,{},function(res){ vm.holeData = res.data; }); vm.project = project; console.log(vm.project); console.log(vm.holeData); }); var vm = new Vue({ el: "#app", data() { return { project: "", holeData: [], }; }, methods: { } }); // // function map(){ // parent.$.modal.openTab("项目地图",ctx+"/geo/projectwork/map?id=" + project.ids); javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/infocopy.html
New file @@ -0,0 +1,178 @@ <!DOCTYPE html> <html lang="zh" xmlns:th="http://www.thymeleaf.org" > <head> <th:block th:include="include :: header('基本信息')" /> <th:block th:include="include :: datetimepicker-css" /> <style type="text/css"> * { padding: 0px; margin: 0px; box-sizing: border-box; user-select: none; } html, body { height: 100%; } #container { height: 100%; padding: 20px; } .basic-info { border-collapse: collapse; width: 100%; } .basic-info td { border: 1px solid #8080807a; padding: 8px 0px 8px 5px; } .project-name{ font-size: 16px; } .map-model{ margin-top: 10px; text-align: right; } .map-model button{ background-color: rgb(66,139,202); height: 30px; line-height: 30px; color: white; padding: 0px 10px; border-width: 0px; border-radius: 3px; } </style> </head> <body class="white-bg"> <div id="container"> <div class="row"> <p class="project-name"> <h3>场地信息</h3> <!-- <span class="name-label">场地名称：</span>--> <!-- <span class="name-val" th:text="${project.fullName}"></span>--> </p> <table class="basic-info"> <tr> <td>建设单位：</td> <td colspan="3" th:text="${project.companyName}"></td> <td>劳务单位：</td> <td colspan="3" th:text="${project.laborUnit}"></td> </tr> <tr> <td>建设地点：</td> <td colspan="7" th:text="${project.address}"></td> </tr> <tr> <td>场地名称：</td> <td colspan="5" th:text="${project.fullName}"></td> <td>场地编号：</td> <td th:text="${project.code}"></td> </tr> <tr> <td>钻孔个数：</td> <td th:text="${project.holeNum}"></td> <td>开始时间：</td> <td th:text="${#dates.format(project.createTime,'yyyy-MM-dd')}"></td> <td>终止时间：</td> <td th:text="${#dates.format(project.endTime,'yyyy-MM-dd')}"></td> <td>负责人：</td> <td th:text="${project.leaderName}"></td> </tr> </table> <!-- <div class="map-model">--> <!-- <button onclick="map()" type="button">地图模式</button>--> <!-- </div>--> </div> <div class="row" style="margin-top: 30px;"> <h3>场地钻孔列表</h3> </div> <div class="row"> <div class="col-sm-12 select-table table-striped"> <table id="bootstrap-table"></table> </div> </div> </div> <th:block th:include="include :: footer" /> <th:block th:include="include :: datetimepicker-js" /> <script th:inline="javascript"> var project =[[${project}]]; var projectId=[[${projectId}]]; var statusDatas = [[${@dict.getType('hole_status')}]]; var prefix = ctx + "geo/hole"; $(function() { var options = { url: prefix + "/list?projectId=" + projectId, modalName: "钻孔", columns: [ { field : 'code', title : '钻孔编号' }, { field : 'elevation', title : '孔口高程（m）' }, { field : 'depth', title : '设计孔深（m）' }, { field : 'longitude', title : '钻孔经度', visible: false }, { field : 'latitude', title : '钻孔纬度', visible: false }, { field : 'status', title : '钻孔状态', formatter: function(value, row, index) { return $.table.selectDictLabel(statusDatas, value); } }, { 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%"; } } } ] }; $.table.init(options); }); // // function map(){ // parent.$.modal.openTab("项目地图",ctx+"/geo/projectwork/map?id=" + project.ids); // } </script> </body> </html> javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectCamera/add.html
@@ -9,7 +9,7 @@ <div class="form-group"> <label class="col-sm-3 control-label">名称：</label> <div class="col-sm-8"> <input name="name" class="form-control" type="text"> <input name="name" class="form-control" type="text" required placeholder="请输入名称"> </div> </div> <div class="form-group"> @@ -33,7 +33,7 @@ <div class="form-group"> <label class="col-sm-3 control-label">Ip地址：</label> <div class="col-sm-8"> <input name="ip" class="form-control" type="text"> <input name="ip" class="form-control" type="text" required placeholder="请输入播放地址"> </div> </div> </form> javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectCamera/edit.html
@@ -10,7 +10,7 @@ <div class="form-group"> <label class="col-sm-3 control-label">名称：</label> <div class="col-sm-8"> <input name="name" th:field="*{name}" class="form-control" type="text"> <input name="name" th:field="*{name}" class="form-control" type="text" required placeholder="请输入名称"> </div> </div> <div class="form-group"> @@ -34,7 +34,7 @@ <div class="form-group"> <label class="col-sm-3 control-label">Ip地址：</label> <div class="col-sm-8"> <input name="ip" th:field="*{ip}" class="form-control" type="text"> <input name="ip" th:field="*{ip}" class="form-control" type="text" required placeholder="请输入播放地址"> </div> </div> </form> javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/add.html
@@ -9,13 +9,13 @@ <div class="form-group"> <label class="col-sm-3 control-label">资料名称：</label> <div class="col-sm-8"> <input name="name" class="form-control" type="text"> <input name="name" class="form-control" type="text" required placeholder="请输入资料名称"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">钻孔编号：</label> <div class="col-sm-8"> <input name="holeCode" class="form-control" type="text"> <input name="holeCode" class="form-control" type="text" required placeholder="请输入钻孔编号"> </div> </div> <!-- <div class="form-group">--> javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/edit.html
@@ -10,13 +10,13 @@ <div class="form-group"> <label class="col-sm-3 control-label">资料名称：</label> <div class="col-sm-8"> <input name="name" th:field="*{name}" class="form-control" type="text"> <input name="name" th:field="*{name}" class="form-control" type="text" required placeholder="请输入资料名称"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">钻孔编号：</label> <div class="col-sm-8"> <input name="holeCode" th:field="*{holeCode}" class="form-control" type="text"> <input name="holeCode" th:field="*{holeCode}" class="form-control" type="text" required placeholder="请输入钻孔编号"> </div> </div> <!-- <div class="form-group"> --> javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/add.html
@@ -10,7 +10,7 @@ <div class="form-group"> <label class="col-sm-3 control-label">人员名称：</label> <div class="col-sm-8"> <input name="name" class="form-control" type="text"> <input name="name" class="form-control" type="text" placeholder="请输入人员名称" required> </div> </div> <div class="form-group"> @@ -24,13 +24,13 @@ <div class="form-group"> <label class="col-sm-3 control-label">手机号：</label> <div class="col-sm-8"> <input name="phone" class="form-control" type="text"> <input name="phone" class="form-control" type="text" placeholder="请输入手机号" required> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">身份证号：</label> <div class="col-sm-8"> <input name="idCard" class="form-control" type="text"> <input name="idCard" class="form-control" type="text" placeholder="请输入身份证号" required> </div> </div> <div class="form-group"> javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/edit.html
@@ -11,7 +11,7 @@ <div class="form-group"> <label class="col-sm-3 control-label">人员名称：</label> <div class="col-sm-8"> <input name="name" th:field="*{name}" class="form-control" type="text"> <input name="name" th:field="*{name}" class="form-control" type="text" placeholder="请输入人员名称" required> </div> </div> <div class="form-group"> @@ -25,13 +25,13 @@ <div class="form-group"> <label class="col-sm-3 control-label">手机号：</label> <div class="col-sm-8"> <input name="phone" th:field="*{phone}" class="form-control" type="text"> <input name="phone" th:field="*{phone}" class="form-control" type="text" placeholder="请输入手机号" required> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">身份证号：</label> <div class="col-sm-8"> <input name="idCard" th:field="*{idCard}" class="form-control" type="text"> <input name="idCard" th:field="*{idCard}" class="form-control" type="text" placeholder="请输入身份证号" required> </div> </div> <div class="form-group">
