From 8d00f769c1e5113e714cbb5e39752d1cf705f5aa Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期一, 20 五月 2024 18:56:12 +0800
Subject: [PATCH] 提交代码
---
javaweb-plus/javaweb-admin/src/main/resources/static/css/skins.css | 18 ++++----
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html | 56 +++++++++++++++------------
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/add.html | 8 ++++
javaweb-plus/javaweb-admin/src/main/resources/application.yml | 2
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Hole.java | 3 -
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html | 2
javaweb-plus/javaweb-cms/src/main/resources/templates/loginPage/process/login.html | 2
javaweb-plus/javaweb-admin/src/main/resources/static/ruoyi/css/ry-ui.css | 2
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/edit.html | 15 +++++--
javaweb-plus/javaweb-admin/src/main/resources/templates/skin.html | 7 +--
10 files changed, 67 insertions(+), 48 deletions(-)
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/application.yml b/javaweb-plus/javaweb-admin/src/main/resources/application.yml
index aea707c..85c624c 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/application.yml
+++ b/javaweb-plus/javaweb-admin/src/main/resources/application.yml
@@ -7,7 +7,7 @@
# 鐗堟潈骞翠唤
copyrightYear: 2022
# 瀹炰緥婕旂ず寮�鍏�
- demoEnabled: true
+ demoEnabled: false
# 鏂囦欢璺緞 绀轰緥
profile: D:\ChenjiangWeb\uploads
# 鑾峰彇ip鍦板潃寮�鍏�
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/static/css/skins.css b/javaweb-plus/javaweb-admin/src/main/resources/static/css/skins.css
index 43c4f27..beb0ad8 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/static/css/skins.css
+++ b/javaweb-plus/javaweb-admin/src/main/resources/static/css/skins.css
@@ -6,7 +6,7 @@
*/
/** 钃濊壊涓婚 skin-blue **/
.navbar, .skin-blue .navbar {
- background-color: #3c8dbc
+ background-color: #2da4e9
}
.skin-blue .navbar-default .nav>li.selected>a,
@@ -44,7 +44,7 @@
}
.skin-blue .navbar .sidebar-toggle:hover {
- background-color: #367fa9
+ background-color: #2e9ddd
}
@media ( max-width :767px) {
@@ -55,22 +55,22 @@
color: #fff
}
.skin-blue .navbar .dropdown-menu li a:hover {
- background: #367fa9
+ background: #2e9ddd
}
}
.skin-blue .logo {
- background-color: #367fa9;
+ background-color: #2e9ddd;
color: #fff;
border-bottom: 0 solid transparent
}
.skin-blue .logo:hover {
- background-color: #357ca5
+ background-color: #198fd3
}
.skin-blue li.user-header {
- background-color: #3c8dbc
+ background-color: #2da4e9
}
.skin-blue .content-header {
@@ -96,7 +96,7 @@
.skin-blue .nav>li.active {
color: #fff;
background: #293846;
- border-left: 3px solid #3c8dbc;
+ border-left: 3px solid #2da4e9;
}
.skin-blue .nav>li.active>ul li.active {
@@ -152,7 +152,7 @@
}
.skin-blue.layout-top-nav>.logo {
- background-color: #3c8dbc;
+ background-color: #2da4e9;
color: #fff;
border-bottom: 0 solid transparent
}
@@ -166,7 +166,7 @@
}
.skin-blue.layout-top-nav>.logo {
- background-color: #3c8dbc;
+ background-color: #2da4e9;
color: #fff;
border-bottom: 0 solid transparent
}
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/static/ruoyi/css/ry-ui.css b/javaweb-plus/javaweb-admin/src/main/resources/static/ruoyi/css/ry-ui.css
index f899673..d7d4d60 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/static/ruoyi/css/ry-ui.css
+++ b/javaweb-plus/javaweb-admin/src/main/resources/static/ruoyi/css/ry-ui.css
@@ -605,7 +605,7 @@
.search-collapse,.select-table {
width: 100%;
- background: #fff;
+ background: white;
border-radius: 6px;
margin-top: 10px;
padding-top: 5px;
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/templates/skin.html b/javaweb-plus/javaweb-admin/src/main/resources/templates/skin.html
index deb19f0..6f69a72 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/skin.html
+++ b/javaweb-plus/javaweb-admin/src/main/resources/templates/skin.html
@@ -21,8 +21,8 @@
<ul class="list-unstyled clearfix">
<li style="float:left; width: 33.33333%; padding: 5px;">
<a href="javascript:" data-skin="skin-blue|theme-dark" style="display: block; box-shadow: 0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
- <span style="width: 20%; float: left; height: 13px; background: #367fa9"></span>
- <span style="width: 80%; float: left; height: 13px; background: #3c8dbc"></span>
+ <span style="width: 20%; float: left; height: 13px; background: #2da4e9"></span>
+ <span style="width: 80%; float: left; height: 13px; background: #198fd3"></span>
<span style="width: 20%; float: left; height: 30px; background: #2f4050"></span>
<span style="width: 80%; float: left; height: 30px; background: #f4f5f7"></span>
</a>
@@ -148,8 +148,7 @@
// 涓婚鏍峰紡鍒楄〃
var themes = ["theme-dark", "theme-light", "theme-blue"];
-$("[data-skin]").on('click',
-function(e) {
+$("[data-skin]").on('click', function(e) {
var skin = $(this).data('skin');
$.each(skins, function(i) {
parent.$("body").removeClass(skins[i]);
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Hole.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Hole.java
index 8c8426e..506b333 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Hole.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Hole.java
@@ -32,8 +32,7 @@
@Excel(name = "鎻忚堪銆佹妧鏈姹�")
private String description;
- /** 鍕樻帰鐐圭被鍨嬶紙1-鎺簳銆�2-閽诲瓟锛� */
- @Excel(name = "鍕樻帰鐐圭被鍨�", readConverterExp = "1=-鎺簳銆�2-閽诲瓟")
+ /** 鍕樻帰鐐圭被鍨� */
private String type;
/** 瀛斿彛楂樼▼ */
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 d178bb9..ede720d 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
@@ -14,6 +14,14 @@
</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')}">
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
<label class="col-sm-3 control-label">瀛斿彛楂樼▼(m)锛�</label>
<div class="col-sm-8">
<input name="elevation" class="form-control" type="text">
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 4706995..f22fbcb 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
@@ -14,6 +14,16 @@
<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">
+ <select name="type" class="form-control m-b" th:with="type=${@dict.getType('hole_type')}">
+ <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">瀛斿彛楂樼▼(m)锛�</label>
<div class="col-sm-8">
@@ -41,10 +51,7 @@
<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}" >
- <label th:for="${'status_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
- </div>
+ <input name="status" th:field="*{status}" class="form-control" type="text" >
</div>
</div>
<div class="form-group">
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html
index 7665a41..76d285e 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html
+++ b/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 : '瀛斿彛楂樼▼锛坢锛�'
@@ -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',
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html
index d17a8c2..0694e9e 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html
@@ -6,7 +6,7 @@
<th:block th:include="include :: ztree-css" />
<style>
.active {
- background: #3c8dbc;
+ background: #41aae7;
}
.active a {
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/loginPage/process/login.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/loginPage/process/login.html
index fb70365..bd86f6b 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/loginPage/process/login.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/loginPage/process/login.html
@@ -99,7 +99,7 @@
<span class="bar-line"></span>
<form name="loginform" id="loginform">
<input type="hidden" id="redirectUrl" name="redirectUrl" value="${redirectUrl}" >
- <div><span id="logo-text">閽绘帰宸ョ▼淇℃伅鍖栫郴缁�</span></div>
+ <div><span id="logo-text">鍖椾含甯傚湴闈㈡矇闄嶇洃娴嬬綉寤鸿宸ョ▼</span></div>
<div class="input-container" style="margin-top:25px;position:relative;">
<img src="images/loginPage/user3.png" style="margin-right:5px;"/>
--
Gitblit v1.9.1