PM20230220027_Service.git

13693261870

2023-08-21 f7989bdd8129afa5d94b4a27dea2354d2e50db72

修改后台服务的登录页面及系统标题

已添加3个文件

已修改10个文件

已删除3个文件

	src/main/java/com/moon/server/controller/sys/MenuController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/mapper/show/OneMapMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/static/html/login.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/static/images/earth/css_globe_bg.jpg	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/static/images/earth/css_globe_diffuse.jpg	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/static/images/earth/css_globe_halo.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/static/images/moon/css_globe_bg.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/static/images/moon/css_globe_diffuse.jpg	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/static/images/moon/css_globe_halo.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/static/js/earth/script.js	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/static/sg/login.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/templates/druid.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/templates/index.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/templates/login.html	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/templates/login_old.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/templates/monitor.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 src/main/java/com/moon/server/controller/sys/MenuController.java

@@ -219,7 +219,7 @@
    public ResponseMsg<Object> selectMenuRecursive(String name) {
        try {
            if (StringHelper.isEmpty(name)) {
                name = "管道基础大数据平台";
                name = "SmartEarth三维地理信息系统平台V7.0";
            }
            List<MenuEntity> list = menuService.selectMenuRecursive(name);


 src/main/resources/mapper/show/OneMapMapper.xml

@@ -203,7 +203,7 @@
        group by medium;
    </select>

    <!--  统计全国站场座数、阀室、管道数量  -->
    <!--  统计全国站场座数、阀室、数量  -->
    <select id="countZhPipeStations" resultType="java.util.Map">
        select
            case medium when 'CO' then '原油' when 'RP' then '成品油' when 'GS' then '天然气' else '其它' end "输送介质",

 src/main/resources/static/html/login.html

@@ -1,7 +1,7 @@
<!DOCTYPE>
<html>
<head>
  <title>管道基础大数据平台服务-登录</title>
  <title>SmartEarth三维地理信息系统平台V7.0-登录</title>
  <meta http-equiv="Expires" content="0" />
  <meta http-equiv="Cache" content="no-cache" />
  <meta http-equiv="Pragma" content="no-cache" />

 src/main/resources/static/images/earth/css_globe_bg.jpg

Binary files differ

 src/main/resources/static/images/earth/css_globe_diffuse.jpg

Binary files differ

 src/main/resources/static/images/earth/css_globe_halo.png

Binary files differ

 src/main/resources/static/images/moon/css_globe_bg.png


 src/main/resources/static/images/moon/css_globe_diffuse.jpg


 src/main/resources/static/images/moon/css_globe_halo.png


 src/main/resources/static/js/earth/script.js

@@ -50,9 +50,9 @@
var tick = 1;

var URLS = {
    bg: '',
    diffuse: '../images/earth/css_globe_diffuse.jpg',
    halo: '../images/earth/css_globe_halo.png',
    bg: '../images/moon/css_globe_bg.png',
    diffuse: '../images/moon/css_globe_diffuse.jpg',
    halo: '../images/moon/css_globe_halo.png',
};

var transformStyleName = PerspectiveTransform.transformStyleName;

 src/main/resources/static/sg/login.html

@@ -1,7 +1,7 @@
<!DOCTYPE>
<html>
<head>
  <title>管道基础大数据平台服务-登录</title>
  <title>SmartEarth三维地理信息系统平台V7.0-登录</title>
  <meta charset="utf-8" />
  <meta http-equiv="pragma" content="no-cache" />
  <meta http-equiv="cache-control" content="no-cache" />

 src/main/resources/templates/druid.html

@@ -2,7 +2,7 @@
<html>
<head>
  <meta charset="UTF-8">
  <title>管道基础大数据平台服务-数据库监控</title>
  <title>SmartEarth三维地理信息系统平台V7.0-数据库监控</title>
  <script>
    location.href = "../druid/index.html";
  </script>

 src/main/resources/templates/index.html

@@ -2,7 +2,7 @@
<html lang="en" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
  <meta charset="UTF-8">
  <title>管道基础大数据平台服务-首页</title>
  <title>SmartEarth三维地理信息系统平台V7.0-首页</title>
  <script src="../js/jquery.min.js"></script>
  <script>
    window.onload = function () {

 src/main/resources/templates/login.html

@@ -1,7 +1,7 @@
<!DOCTYPE>
<html>
<head>
  <title>管道基础大数据平台服务-登录</title>
  <title>SmartEarth三维地理信息系统平台V7.0-登录</title>
  <meta http-equiv="Expires" content="0" />
  <meta http-equiv="Cache" content="no-cache" />
  <meta http-equiv="Pragma" content="no-cache" />
@@ -63,7 +63,8 @@
  </div>

  <div class="title">
    <img src="../images/login/lg_03.png" alt=""/>
    <!--<img src="../images/login/lg_03.png" alt=""/>-->
    <span style="font-family: 微软雅黑; font-size: 32px;">SmartEarth三维地理信息系统平台V7.0</span>
  </div>

  <script src='../js/earth/dat.gui.min.js'></script>

 src/main/resources/templates/login_old.html

@@ -1,7 +1,7 @@
<!DOCTYPE>
<html>
<head>
  <title>管道基础大数据平台服务-登录</title>
  <title>SmartEarth三维地理信息系统平台V7.0-登录</title>
  <meta charset="utf-8" />
  <meta http-equiv="pragma" content="no-cache" />
  <meta http-equiv="cache-control" content="no-cache" />

 src/main/resources/templates/monitor.html

@@ -4,7 +4,7 @@
<head>
  <meta charset="UTF-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  <title>运维监控</title>
  <title>SmartEarth三维地理信息系统平台V7.0-运维监控</title>

  <link rel="stylesheet" href="./css/main/main1.css">
  <link rel="stylesheet" href="./css/main/jquery-ui.min.css">

			@@ -219,7 +219,7 @@
			public ResponseMsg<Object> selectMenuRecursive(String name) {
			try {
			if (StringHelper.isEmpty(name)) {
			name = "管道基础大数据平台";
			name = "SmartEarth三维地理信息系统平台V7.0";
			}
			List<MenuEntity> list = menuService.selectMenuRecursive(name);

			@@ -203,7 +203,7 @@
			group by medium;
			</select>

			<!-- 统计全国站场座数、阀室、管道数量 -->
			<!-- 统计全国站场座数、阀室、数量 -->
			<select id="countZhPipeStations" resultType="java.util.Map">
			select
			case medium when 'CO' then '原油' when 'RP' then '成品油' when 'GS' then '天然气' else '其它' end "输送介质",

			@@ -1,7 +1,7 @@
			<!DOCTYPE>
			<html>
			<head>
			<title>管道基础大数据平台服务-登录</title>
			<title>SmartEarth三维地理信息系统平台V7.0-登录</title>
			<meta http-equiv="Expires" content="0" />
			<meta http-equiv="Cache" content="no-cache" />
			<meta http-equiv="Pragma" content="no-cache" />

			@@ -50,9 +50,9 @@
			var tick = 1;

			var URLS = {
			bg: '',
			diffuse: '../images/earth/css_globe_diffuse.jpg',
			halo: '../images/earth/css_globe_halo.png',
			bg: '../images/moon/css_globe_bg.png',
			diffuse: '../images/moon/css_globe_diffuse.jpg',
			halo: '../images/moon/css_globe_halo.png',
			};

			var transformStyleName = PerspectiveTransform.transformStyleName;

			@@ -2,7 +2,7 @@
			<html>
			<head>
			<meta charset="UTF-8">
			<title>管道基础大数据平台服务-数据库监控</title>
			<title>SmartEarth三维地理信息系统平台V7.0-数据库监控</title>
			<script>
			location.href = "../druid/index.html";
			</script>

			@@ -2,7 +2,7 @@
			<html lang="en" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
			<head>
			<meta charset="UTF-8">
			<title>管道基础大数据平台服务-首页</title>
			<title>SmartEarth三维地理信息系统平台V7.0-首页</title>
			<script src="../js/jquery.min.js"></script>
			<script>
			window.onload = function () {

			@@ -4,7 +4,7 @@
			<head>
			<meta charset="UTF-8">
			<meta name="viewport" content="width=device-width, initial-scale=1.0">
			<title>运维监控</title>
			<title>SmartEarth三维地理信息系统平台V7.0-运维监控</title>

			<link rel="stylesheet" href="./css/main/main1.css">
			<link rel="stylesheet" href="./css/main/jquery-ui.min.css">