From e27f9d475c8732b64dbc863640e25d5253d707f1 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期五, 24 五月 2024 10:45:07 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/add.html | 6
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/add.html | 4
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/edit.html | 6
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java | 6
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/edit.html | 4
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html | 280 +++++++++++++++----------------
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/add.html | 4
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/edit.html | 6
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/edit.html | 4
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/holeLog2.html | 2
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectCamera/edit.html | 4
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/edit.html | 5
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectCamera/add.html | 4
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/infocopy.html | 178 +++++++++++++++++++
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/add.html | 6
15 files changed, 345 insertions(+), 174 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java
index 342a31c..0cbe91d 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java
+++ b/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);
+ }
/**
* 瀵煎嚭閽诲瓟鍒楄〃
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/edit.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/edit.html
index 6100e45..d94ea29 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/edit.html
+++ b/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());
}
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/add.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/add.html
index ede720d..e958edb 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/add.html
+++ b/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="璇疯緭鍏ユ�昏繘灏�,鍗曚綅锛坢锛�">
+ <input name="footage" class="form-control" type="text" required placeholder="璇疯緭鍏ユ�昏繘灏�,鍗曚綅锛坢锛�">
</div>
</div>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/edit.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/edit.html
index f22fbcb..3814b6a 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/edit.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/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" 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="璇疯緭鍏ユ�昏繘灏�,鍗曚綅锛坢锛�">
+ <input name="footage" th:field="*{footage}" class="form-control" type="text" placeholder="璇疯緭鍏ユ�昏繘灏�,鍗曚綅锛坢锛�" required>
</div>
</div>
<div class="form-group">
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/add.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/add.html
index 5e635de..9647309 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/add.html
+++ b/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">
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/edit.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/edit.html
index 2dc7278..d8f4ded 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/edit.html
+++ b/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">
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/holeLog2.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/holeLog2.html
index fd399df..6b2f1c5 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/holeLog2.html
+++ b/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]"/>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html
index 32e3404..b8aa1a6 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html
+++ b/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 : '瀛斿彛楂樼▼锛坢锛�'
- },
- {
- field : 'depth',
- title : '璁捐瀛旀繁锛坢锛�'
- },
- {
- 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);
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/infocopy.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/infocopy.html
new file mode 100644
index 0000000..32e3404
--- /dev/null
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/infocopy.html
@@ -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 : '瀛斿彛楂樼▼锛坢锛�'
+ },
+ {
+ field : 'depth',
+ title : '璁捐瀛旀繁锛坢锛�'
+ },
+ {
+ 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>
\ No newline at end of file
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectCamera/add.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectCamera/add.html
index 53d203a..7ac1df0 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectCamera/add.html
+++ b/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>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectCamera/edit.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectCamera/edit.html
index abcf3af..7133734 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectCamera/edit.html
+++ b/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>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/add.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/add.html
index f923279..7ffe653 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/add.html
+++ b/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">-->
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/edit.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/edit.html
index a358fe0..a415d8c 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/edit.html
+++ b/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"> -->
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/add.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/add.html
index bb22c2e..bc73927 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/add.html
+++ b/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">
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/edit.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/edit.html
index a14508e..eb62008 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/edit.html
+++ b/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">
--
Gitblit v1.9.1