From 3f1889e77f861a8284770c85bdd83204f6863f39 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期二, 28 五月 2024 18:07:43 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-admin/src/main/resources/static/css/style.css | 1 -
javaweb-plus/javaweb-admin/src/main/resources/templates/index.html | 10 ++++++++--
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html | 12 ++++++++++--
javaweb-plus/javaweb-admin/src/main/resources/static/images/minilogo.png | 0
javaweb-plus/javaweb-admin/src/main/resources/static/ruoyi/index.js | 4 ++++
javaweb-plus/javaweb-admin/src/main/resources/templates/main.html | 13 +++++++++++--
6 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/static/css/style.css b/javaweb-plus/javaweb-admin/src/main/resources/static/css/style.css
index 7150c80..c492ed5 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/static/css/style.css
+++ b/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;
}
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/static/images/minilogo.png b/javaweb-plus/javaweb-admin/src/main/resources/static/images/minilogo.png
new file mode 100644
index 0000000..a0dde6a
--- /dev/null
+++ b/javaweb-plus/javaweb-admin/src/main/resources/static/images/minilogo.png
Binary files differ
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/static/ruoyi/index.js b/javaweb-plus/javaweb-admin/src/main/resources/static/ruoyi/index.js
index f0a79f9..b69245b 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/static/ruoyi/index.js
+++ b/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() {
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/templates/index.html b/javaweb-plus/javaweb-admin/src/main/resources/templates/index.html
index 69714d7..a9b460d 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/index.html
+++ b/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>
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html b/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
index 6391db5..289da23 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
+++ b/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'));
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 b528a47..aa84e43 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
@@ -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'
+ }
},
]
--
Gitblit v1.9.1