Browse Source

保康修改全部网页ico图标 , 修改保康首页系统排列逻辑代码

1037015548@qq.com 1 month ago
parent
commit
c032c70082
24 changed files with 72 additions and 70 deletions
  1. 1 1
      ruoyi-admin/src/main/resources/templates/index-topnav.html
  2. 2 2
      ruoyi-admin/src/main/resources/templates/index.html
  3. 1 1
      ruoyi-admin/src/main/resources/templates/lock.html
  4. 1 1
      ruoyi-admin/src/main/resources/templates/login.html
  5. 1 1
      ruoyi-admin/src/main/resources/templates/loginBaokang.html
  6. 1 1
      ruoyi-admin/src/main/resources/templates/loginDangyang.html
  7. 1 1
      ruoyi-admin/src/main/resources/templates/loginJiangjin.html
  8. 1 1
      ruoyi-admin/src/main/resources/templates/loginYining.html
  9. 1 1
      ruoyi-admin/src/main/resources/templates/main.html
  10. 2 2
      ruoyi-admin/src/main/resources/templates/mainBaokang.html
  11. 41 39
      ruoyi-admin/src/main/resources/templates/mainBaokangView.html
  12. 2 2
      ruoyi-admin/src/main/resources/templates/mainDangyang.html
  13. 1 1
      ruoyi-admin/src/main/resources/templates/mainDangyangView.html
  14. 2 2
      ruoyi-admin/src/main/resources/templates/mainJiangjin.html
  15. 1 1
      ruoyi-admin/src/main/resources/templates/mainJiangjinView.html
  16. 2 2
      ruoyi-admin/src/main/resources/templates/mainLhk.html
  17. 2 2
      ruoyi-admin/src/main/resources/templates/mainYining.html
  18. 1 1
      ruoyi-admin/src/main/resources/templates/mainYiningMaskView.html
  19. 1 1
      ruoyi-admin/src/main/resources/templates/mainYiningView.html
  20. 1 1
      ruoyi-admin/src/main/resources/templates/main_v1.html
  21. 1 1
      ruoyi-admin/src/main/resources/templates/register.html
  22. 1 1
      ruoyi-admin/src/main/resources/templates/skin.html
  23. 3 3
      ruoyi-admin/src/main/resources/templates/view.html
  24. 1 1
      ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java

+ 1 - 1
ruoyi-admin/src/main/resources/templates/index-topnav.html

@@ -7,7 +7,7 @@
     <title>智慧水务系统-认证系统首页</title>
     <!-- 避免IE使用兼容模式 -->
  	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link th:href="@{favicon.ico}" rel="shortcut icon"/>
+    <link th:href="@{faviconOld.ico}" rel="shortcut icon"/>
     <link th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/jquery.contextMenu.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>

+ 2 - 2
ruoyi-admin/src/main/resources/templates/index.html

@@ -7,7 +7,7 @@
     <title>智慧水务系统-认证系统首页</title>
     <!-- 避免IE使用兼容模式 -->
  	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link th:href="@{favicon.ico}" rel="shortcut icon"/>
+    <link th:href="@{faviconOld.ico}" rel="shortcut icon"/>
     <link th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/jquery.contextMenu.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
@@ -52,7 +52,7 @@
         </div>
         <a th:href="@{/index}">
             <li class="logo hidden-xs" style="width: 100%!important;height: 60px!important;background-color: rgb(4,35,61)!important;padding-top: 3%">
-				<img th:src="@{favicon.ico}" style="height: 60%;display: inline-block"/>
+				<img th:src="@{faviconOld.ico}" style="height: 60%;display: inline-block"/>
                 <span class="" style="font-weight: bold">统一认证平台</span>
             </li>
          </a>

File diff suppressed because it is too large
+ 1 - 1
ruoyi-admin/src/main/resources/templates/lock.html


+ 1 - 1
ruoyi-admin/src/main/resources/templates/login.html

@@ -14,7 +14,7 @@
     <meta name="renderer" content="webkit">
     <!-- 避免IE使用兼容模式 -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
+    <link rel="shortcut icon" href="../static/faviconOld.ico" th:href="@{faviconOld.ico}"/>
     <style type="text/css">label.error { position:inherit;  }</style>
     <script>
         if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location};

+ 1 - 1
ruoyi-admin/src/main/resources/templates/loginBaokang.html

@@ -18,7 +18,7 @@
     <meta name="renderer" content="webkit">
     <!-- 避免IE使用兼容模式 -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
+    <link rel="shortcut icon" href="../static/faviconOld.ico" th:href="@{faviconOld.ico}"/>
     <style type="text/css">label.error { position:inherit;  }</style>
     <script>
         if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location};

+ 1 - 1
ruoyi-admin/src/main/resources/templates/loginDangyang.html

@@ -18,7 +18,7 @@
     <meta name="renderer" content="webkit">
     <!-- 避免IE使用兼容模式 -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
+    <link rel="shortcut icon" href="../static/faviconOld.ico" th:href="@{faviconOld.ico}"/>
     <style type="text/css">label.error { position:inherit;  }</style>
     <script>
         if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location};

+ 1 - 1
ruoyi-admin/src/main/resources/templates/loginJiangjin.html

@@ -18,7 +18,7 @@
     <meta name="renderer" content="webkit">
     <!-- 避免IE使用兼容模式 -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
+    <link rel="shortcut icon" href="../static/faviconOld.ico" th:href="@{faviconOld.ico}"/>
     <style type="text/css">label.error { position:inherit;  }</style>
     <script>
         if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location};

+ 1 - 1
ruoyi-admin/src/main/resources/templates/loginYining.html

@@ -18,7 +18,7 @@
     <meta name="renderer" content="webkit">
     <!-- 避免IE使用兼容模式 -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
+    <link rel="shortcut icon" href="../static/faviconOld.ico" th:href="@{faviconOld.ico}"/>
     <style type="text/css">label.error { position:inherit;  }</style>
     <script>
         if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location};

+ 1 - 1
ruoyi-admin/src/main/resources/templates/main.html

@@ -5,7 +5,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!--360浏览器优先以webkit内核解析-->
 	<title></title>
-	<link rel="shortcut icon" href="favicon.ico">
+	<link rel="shortcut icon" href="faviconOld.ico">
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 	<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
 	<link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>

+ 2 - 2
ruoyi-admin/src/main/resources/templates/mainBaokang.html

@@ -2,12 +2,12 @@
 <html  lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
 	<meta charset="utf-8">
-	<link rel="shortcut icon" href="../static/images/favicon.ico" type="image/icon">
+	<link rel="shortcut icon" href="../static/images/faviconOld.ico" type="image/icon">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!--360浏览器优先以webkit内核解析-->
 	<title></title>
-	<link rel="shortcut icon" href="favicon.ico">
+	<link rel="shortcut icon" href="faviconOld.ico">
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 	<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
 	<link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>

+ 41 - 39
ruoyi-admin/src/main/resources/templates/mainBaokangView.html

@@ -5,7 +5,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!--360浏览器优先以webkit内核解析-->
 	<title></title>
-	<link rel="shortcut icon" href="favicon.ico">
+	<link rel="shortcut icon" href="faviconOld.ico">
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 	<link href="../static/css/mainBaokang.css" th:href="@{/css/mainBaokang.css}" rel="stylesheet"/>
 	<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
@@ -157,85 +157,87 @@
 			for (let i = 1;i <= danganList.length;i++){
 			    let str = "";
 			    if(i===1){
+                    let targetObject;
+                    danganList.forEach(item =>{
+                        if(item.danganName ==="智慧水务综合大屏"){
+                            targetObject = item;
+						}
+					});
                     str += "<div style=\"\" class=\"leftOneDiv\">"+
 						"<div class=\"leftOneTopLine\"></div>" +
                     "<div>" +
-                    "<p style=\"word-wrap: break-word;width:400px;margin-top:1.5em;margin-left:-1em;display: inline-block;\">"+danganList[i-1].danganName+"</p>" +
-                    "<img class=\"leftOneIcon\" alt=\"[ "+danganList[i-1].danganName+" ]\" src=\"../img/baokang/左一.png\" " +
-                    " style=\"width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;margin-left: 0em\">" +
+                    "<p style=\"word-wrap: break-word;width:400px;margin-top:2em;margin-left:-1em;display: inline-block;\">智慧水务综合大屏</p>" +
+                    "<img class=\"leftOneIcon\" alt=\"[ 智慧水务综合大屏 ]\" src=\"../img/baokang/左一.png\" " +
+                    " style=\"width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;margin-left: 1.5em\">" +
                     "</div>" +
                     "<div class=\"leftOneBottomLine\"></div>"+
-                    "<input style='display: none' value='"+danganList[i-1].danganUrl+"' class='.divUrl'>";
+                    "<input style='display: none' value='"+targetObject.danganUrl+"' class='.divUrl'>";
 				}
                 if(i===2){
+                    let targetObject;
+                    danganList.forEach(item =>{
+                        if(item.danganName ==="DMA漏损管理系统"){
+                        	targetObject = item;
+                   	 	}
+                	});
                     str +="<div style=\"\" class=\"leftTwoDiv\">"+
 						"<div class=\"leftTwoTopLine\"></div>" +
                         "<div>" +
                         "<p class='pWidth' style=\"line-height: 60px;margin-left:-1em;display: inline-block;white-space: pre-wrap;" +
 						"margin-top:110px;text-align: right;";
                     //配合样式white-space: pre-wrap;使用该逻辑
-                    let left2DanganName = danganList[i-1].danganName;
+                    let left2DanganName = "DMA漏损管理系统";
                     if(left2DanganName.includes("供水运营")){
                         left2DanganName = insertChar(left2DanganName,4,"\n")
 					}
                     str+="\">"+left2DanganName+"</p>" +
-                        "<img class=\"leftTwoIcon\" alt=\"[ "+danganList[i-1].danganName+" ]\" src=\"../img/baokang/左二.png\" th:src=\"@{/img/yining/icon/智慧生产系统,未选中.png}\"" +
-                        " style=\"width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;margin-left: 1.5em\">" +
+                        "<img class=\"leftTwoIcon\" alt=\"[ DMA漏损管理系统 ]\" src=\"../img/baokang/左二.png\" th:src=\"@{/img/yining/icon/智慧生产系统,未选中.png}\"" +
+                        " style=\"width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;margin-left: 0.5em\">" +
                         "</div>" +
                         "<div class=\"leftTwoBottomLine\"></div>"+
-                        "<input style='display: none' value='"+danganList[i-1].danganUrl+"' class='.divUrl'>";
+                        "<input style='display: none' value='"+targetObject.danganUrl+"' class='.divUrl'>";
                 }
                 if(i===3){
-                    str +=	"<div style=\"\" class=\"leftThreeDiv\">"+
-						"<div class=\"leftThreeTopLine\"></div>" +
-                        "<div>" +
-                        "<p style=\"line-height: 6em;padding-left: 1em;display: inline-block;\">"+danganList[i-1].danganName+"</p>" +
-                        "<img class=\"leftThreeIcon\" alt=\"[ "+danganList[i-1].danganName+" ]\" src=\"../img/baokang/左三.png\" th:src=\"@{/img/yining/icon/智慧管网系统,未选中.png}\"" +
-                        " style=\"width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;margin-left: 1em\">" +
-                        "</div>" +
-                        "<div class=\"leftThreeBottomLine\"></div>"+
-                        "<input style='display: none' value='"+danganList[i-1].danganUrl+"' class='.divUrl'>";
-                }
-                if(i===4){
+                    let targetObject;
+                    danganList.forEach(item =>{
+                        if(item.danganName ==="管网地理信息系统"){
+                        	targetObject = item;
+                    	}
+                	});
                     str +=	"<div style=\"\" class=\"rightOneDiv\">"+
 						"<div class=\"rightOneTopLine\"></div>" +
                         "<div>" +
-                        "<img class=\"rightOneIcon\" alt=\"[ "+danganList[i-1].danganName+" ]\" src=\"../img/baokang/右一.png\" th:src=\"@{/img/yining/icon/智慧营业系统,未选中.png}\"" +
+                        "<img class=\"rightOneIcon\" alt=\"[ 管网地理信息系统 ]\" src=\"../img/baokang/右一.png\" th:src=\"@{/img/yining/icon/智慧营业系统,未选中.png}\"" +
                         " style=\"width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;left: 120px;margin-left: 1em\">" +
-                        "<p style=\"line-height: 60px;margin-left: 360px;display: inline-block;white-space: pre-wrap;" +
+                        "<p style=\"line-height: 120px;margin-left: 350px;display: inline-block;white-space: pre-wrap;" +
 						"margin-top:80px;text-align: right;" +
 						"\">";
 					//配合样式white-space: pre-wrap;使用该逻辑
-                    let right1DanganName = danganList[i-1].danganName;
+                    let right1DanganName = "管网地理信息系统";
                     if(right1DanganName .includes("DMA")){
                         right1DanganName  = insertChar(right1DanganName ,8,"\n")
                     }
 					str	+= right1DanganName+"</p>" +
                         "</div>" +
                         "<div class=\"rightOneBottomLine\"></div>"+
-                        "<input style='display: none' value='"+danganList[i-1].danganUrl+"' class='.divUrl'>";
+                        "<input style='display: none' value='"+targetObject.danganUrl+"' class='.divUrl'>";
                 }
-                if(i===5){
+                if(i===4){
+                    let targetObject;
+                    danganList.forEach(item =>{
+                        if(item.danganName ==="综合调度SCADA系统"){
+                        	targetObject = item;
+                    	}
+                	});
                     str +=	"<div style=\"\" class=\"rightTwoDiv\">"+
 						"<div class=\"rightTwoTopLine\"></div>" +
                         "<div>" +
-                        "<img class=\"rightTwoIcon\" alt=\"[ "+danganList[i-1].danganName+" ]\" src=\"../img/baokang/右二.png\" th:src=\"@{/img/yining/icon/智慧客服系统,未选中.png}\"" +
+                        "<img class=\"rightTwoIcon\" alt=\"[ 综合调度SCADA系统 ]\" src=\"../img/baokang/右二.png\" th:src=\"@{/img/yining/icon/智慧客服系统,未选中.png}\"" +
                         " style=\"width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;left: 60px;margin-left: 1em\">" +
-                        "<p style=\"line-height: 6em;margin-left: 300px;display: inline-block;\">"+danganList[i-1].danganName+"</p>" +
+                        "<p style=\"line-height: 1em;margin-left: 300px;margin-top:100px;display: inline-block;\">综合调度SCADA系统</p>" +
                         "</div>" +
                         "<div class=\"leftOneBottomLine\"></div>"+
-                        "<input style='display: none' value='"+danganList[i-1].danganUrl+"' class='.divUrl'>";
-                }
-                if(i===6){
-                    str += "<div style=\"\" class=\"rightThreeDiv\">"+
-						"<div class=\"rightThreeTopLine\"></div>" +
-                        "<div>" +
-                        "<img class=\"rightThreeIcon\" alt=\"[ "+danganList[i-1].danganName+" ]\" src=\"../img/baokang/右三.png\" th:src=\"@{/img/yining/icon/智慧办公系统,未选中.png}\"" +
-                        " style=\"width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;left: 120px;margin-left: 1em\">" +
-                        "<p style=\"line-height: 6em;margin-left: 360px;display: inline-block;\">"+danganList[i-1].danganName+"</p>" +
-                        "</div>" +
-                        "<div class=\"rightThreeBottomLine\"></div>"+
-                        "<input style='display: none' value='"+danganList[i-1].danganUrl+"' class='.divUrl'>";
+                        "<input style='display: none' value='"+targetObject.danganUrl+"' class='.divUrl'>";
                 }
 				str += "</div>";
                 $contentDiv.append(str);

+ 2 - 2
ruoyi-admin/src/main/resources/templates/mainDangyang.html

@@ -2,12 +2,12 @@
 <html  lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
 	<meta charset="utf-8">
-	<link rel="shortcut icon" href="../static/images/favicon.ico" type="image/icon">
+	<link rel="shortcut icon" href="../static/images/faviconOld.ico" type="image/icon">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!--360浏览器优先以webkit内核解析-->
 	<title></title>
-	<link rel="shortcut icon" href="favicon.ico">
+	<link rel="shortcut icon" href="faviconOld.ico">
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 	<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
 	<link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>

+ 1 - 1
ruoyi-admin/src/main/resources/templates/mainDangyangView.html

@@ -5,7 +5,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!--360浏览器优先以webkit内核解析-->
 	<title></title>
-	<link rel="shortcut icon" href="favicon.ico">
+	<link rel="shortcut icon" href="faviconOld.ico">
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 	<link href="../static/css/mainYining.css" th:href="@{/css/mainYining.css}" rel="stylesheet"/>
 	<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>

+ 2 - 2
ruoyi-admin/src/main/resources/templates/mainJiangjin.html

@@ -2,12 +2,12 @@
 <html  lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
 	<meta charset="utf-8">
-	<link rel="shortcut icon" href="../static/images/favicon.ico" type="image/icon">
+	<link rel="shortcut icon" href="../static/images/faviconOld.ico" type="image/icon">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!--360浏览器优先以webkit内核解析-->
 	<title></title>
-	<link rel="shortcut icon" href="favicon.ico">
+	<link rel="shortcut icon" href="faviconOld.ico">
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 	<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
 	<link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>

+ 1 - 1
ruoyi-admin/src/main/resources/templates/mainJiangjinView.html

@@ -5,7 +5,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!--360浏览器优先以webkit内核解析-->
 	<title></title>
-	<link rel="shortcut icon" href="favicon.ico">
+	<link rel="shortcut icon" href="faviconOld.ico">
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 	<link href="../static/css/mainJiangjin.css" th:href="@{/css/mainJiangjin.css}" rel="stylesheet"/>
 	<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>

+ 2 - 2
ruoyi-admin/src/main/resources/templates/mainLhk.html

@@ -2,12 +2,12 @@
 <html  lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
 	<meta charset="utf-8">
-	<link rel="shortcut icon" href="../static/images/favicon.ico" type="image/icon">
+	<link rel="shortcut icon" href="../static/images/faviconOld.ico" type="image/icon">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!--360浏览器优先以webkit内核解析-->
 	<title></title>
-	<link rel="shortcut icon" href="favicon.ico">
+	<link rel="shortcut icon" href="faviconOld.ico">
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 	<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
 	<link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>

+ 2 - 2
ruoyi-admin/src/main/resources/templates/mainYining.html

@@ -2,12 +2,12 @@
 <html  lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
 	<meta charset="utf-8">
-	<link rel="shortcut icon" href="../static/images/favicon.ico" type="image/icon">
+	<link rel="shortcut icon" href="../static/images/faviconOld.ico" type="image/icon">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!--360浏览器优先以webkit内核解析-->
 	<title></title>
-	<link rel="shortcut icon" href="favicon.ico">
+	<link rel="shortcut icon" href="faviconOld.ico">
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 	<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
 	<link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>

+ 1 - 1
ruoyi-admin/src/main/resources/templates/mainYiningMaskView.html

@@ -5,7 +5,7 @@
     <title></title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <!--360浏览器优先以webkit内核解析-->
-    <link rel="shortcut icon" href="favicon.ico">
+    <link rel="shortcut icon" href="faviconOld.ico">
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/mainYining.css" th:href="@{/css/mainYining.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>

+ 1 - 1
ruoyi-admin/src/main/resources/templates/mainYiningView.html

@@ -5,7 +5,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!--360浏览器优先以webkit内核解析-->
 	<title></title>
-	<link rel="shortcut icon" href="favicon.ico">
+	<link rel="shortcut icon" href="faviconOld.ico">
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 	<link href="../static/css/mainYining.css" th:href="@{/css/mainYining.css}" rel="stylesheet"/>
 	<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>

+ 1 - 1
ruoyi-admin/src/main/resources/templates/main_v1.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>统计</title>
-    <link rel="shortcut icon" href="favicon.ico">
+    <link rel="shortcut icon" href="faviconOld.ico">
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
     <link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>

+ 1 - 1
ruoyi-admin/src/main/resources/templates/register.html

@@ -14,7 +14,7 @@
     <meta name="renderer" content="webkit">
     <!-- 避免IE使用兼容模式 -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
+    <link rel="shortcut icon" href="../static/faviconOld.ico" th:href="@{faviconOld.ico}"/>
     <style type="text/css">label.error { position:inherit;  }</style>
 </head>
 <body class="signin">

+ 1 - 1
ruoyi-admin/src/main/resources/templates/skin.html

@@ -8,7 +8,7 @@
     <!--[if lt IE 9]>
     <meta http-equiv="refresh" content="0;ie.html"/>
     <![endif]-->
-    <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
+    <link rel="shortcut icon" href="../static/faviconOld.ico" th:href="@{faviconOld.ico}"/>
     <link th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/style.min.css}" rel="stylesheet"/>
     <style type="text/css">

+ 3 - 3
ruoyi-admin/src/main/resources/templates/view.html

@@ -3,13 +3,13 @@
 
 <head>
     <meta charset="utf-8">
-    <link rel="shortcut icon" href="./static/images/favicon.ico" type="image/icon">
+    <link rel="shortcut icon" href="./static/images/faviconOld.ico" type="image/icon">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no">
-    <link rel="icon" href="./static/favicon.ico">
+    <link rel="icon" href="./static/faviconOld.ico">
     <title>老河口清源供水有限公司</title>
 
-    <link rel="shortcut icon" href="favicon.ico">
+    <link rel="shortcut icon" href="faviconOld.ico">
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
     <link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>

+ 1 - 1
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java

@@ -287,7 +287,7 @@ public class ShiroConfig
         // Shiro连接约束配置,即过滤链的定义
         LinkedHashMap<String, String> filterChainDefinitionMap = new LinkedHashMap<>();
         // 对静态资源设置匿名访问
-        filterChainDefinitionMap.put("/favicon.ico**", "anon");
+        filterChainDefinitionMap.put("/faviconOld.ico**", "anon");
         filterChainDefinitionMap.put("/ruoyi.png**", "anon");
         filterChainDefinitionMap.put("/html/**", "anon");
         filterChainDefinitionMap.put("/css/**", "anon");