Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang

chenhuan

2024-05-21 819c0b6478fb3385c8457cd03e04fdf0d3b90a70

Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang

 javaweb-plus/javaweb-admin/src/main/resources/application.yml

@@ -7,7 +7,7 @@
  # 版权年份
  copyrightYear: 2022
  # 实例演示开关
  demoEnabled: true
  demoEnabled: false
  # 文件路径 示例
  profile: D:\ChenjiangWeb\uploads
  # 获取ip地址开关

 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
}

 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;

 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]);

 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;

    /** 孔口高程 */

 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">

 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">

 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 : '孔口高程（m）'
@@ -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',

 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 {

 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;"/>