Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

zmk

2024-05-28 3f1889e77f861a8284770c85bdd83204f6863f39

Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

 javaweb-plus/javaweb-admin/src/main/resources/static/css/style.css

@@ -400,7 +400,6 @@
body.mini-navbar .navbar-static-side {
    width: 70px;
}

body.mini-navbar .profile-element, body.mini-navbar .nav-label, body.mini-navbar .navbar-default .nav li a span {
    display: none;
}

 javaweb-plus/javaweb-admin/src/main/resources/static/images/minilogo.png

 javaweb-plus/javaweb-admin/src/main/resources/static/ruoyi/index.js

@@ -62,6 +62,8 @@

function SmoothlyMenu() {
    if (!$('body').hasClass('mini-navbar')) {
        $("#minilogo").css({"display":"none"});
        $("#logo").css({"display":"block"});
        $('#side-menu').hide();
        $(".sidebar-collapse .logo").removeClass("hide");
        setTimeout(function() {
@@ -69,6 +71,8 @@
        },
        100);
    } else if ($('body').hasClass('fixed-sidebar')) {
        $("#minilogo").css({"display":"block"});
        $("#logo").css({"display":"none"});
        $('#side-menu').hide();
        $(".sidebar-collapse .logo").addClass("hide");
        setTimeout(function() {

 javaweb-plus/javaweb-admin/src/main/resources/templates/index.html

@@ -31,10 +31,16 @@
<!--                  <li class="logo">-->
<!--                    <span class="logo-lg" >钻探工程平台</span>-->
<!--                  </li>-->
                    <li style="margin: 36px auto;text-align: center">
                    <li id="logo" style="margin: 36px auto;text-align: center">
                        <img th:src="@{/images/logo.png}">
                    </li>
                </a>
				
                <li id="minilogo" style="display: none;height: 100px;align-content: center;">
                    <a style="text-align: center;padding: 0;" th:href="@{/index}">
                        <img th:src="@{/images/minilogo.png}">
                    </a>
                </li>

<!--                <li>-->
<!--                    <div class="user-panel">-->
@@ -175,7 +181,7 @@
        <div class="row border-bottom">
            <nav class="navbar navbar-static-top" role="navigation" style="margin-bottom: 0">
                <div class="navbar-header">
                    <a class="navbar-minimalize minimalize-styl-2" style="color:#FFF;" href="#" title="收起菜单">
                    <a class="navbar-minimalize minimalize-styl-2" style="color:#565656;" href="#" title="收起菜单">
                        <i class="fa fa-bars"></i>
                    </a>
                </div>

 javaweb-plus/javaweb-admin/src/main/resources/templates/main.html

@@ -407,7 +407,11 @@
                    emphasis: {
                        focus: 'series'
                    },
                    data: []
                    data: [],
                    itemStyle: {
                        // 修改柱子的颜色
                        color: '#e2b507'
                    }
                },
                {
                    name: '入库',
@@ -416,7 +420,11 @@
                    emphasis: {
                        focus: 'series'
                    },
                    data: []
                    data: [],
                    itemStyle: {
                        // 修改柱子的颜色
                        color: '#2992c6'
                    }
                },

            ]
@@ -598,6 +606,7 @@
        map.openInfoWindow(markerInfoWin, point); //开启信息窗口
    }


    //总进度仪表盘
    function totalProcess() {
        var Chart1 = echarts.init(document.getElementById('Chart1'));

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

@@ -273,7 +273,11 @@
                        emphasis: {
                            focus: 'series'
                        },
                        data: []
                        data: [],
                        itemStyle: {
                            // 修改柱子的颜色
                            color: '#e2b507'
                        }
                    },
                    {
                        name: '入库',
@@ -282,7 +286,11 @@
                        emphasis: {
                            focus: 'series'
                        },
                        data: []
                        data: [],
                        itemStyle: {
                            // 修改柱子的颜色
                            color: '#2992c6'
                        }
                    },

                ]