UI、logo

.idea/.gitignore

@@ -0,0 +1,10 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 已忽略包含查询文件的默认文件夹
+/queries/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/

.idea/compiler.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <option name="BUILD_PROCESS_HEAP_SIZE" value="4096" />
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="SIPAIIS_WMS" />
+      </profile>
+    </annotationProcessing>
+  </component>
+</project>

.idea/encodings.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/src" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+  </component>
+</project>

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,7 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="JSHint" enabled="true" level="ERROR" enabled_by_default="true" />
+  </profile>
+</component>

.idea/jarRepositories.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+  </component>
+</project>

.idea/jsLinters/jshint.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JSHintConfiguration" version="2.13.6" use-config-file="true" use-custom-config-file="true" custom-config-file-path="$PROJECT_DIR$/src/main/webapp/plugins/jquery-ui/ui/.jshintrc">
+    <option bitwise="true" />
+    <option browser="true" />
+    <option curly="true" />
+    <option eqeqeq="true" />
+    <option forin="true" />
+    <option maxerr="50" />
+    <option noarg="true" />
+    <option noempty="true" />
+    <option nonew="true" />
+    <option strict="true" />
+    <option undef="true" />
+  </component>
+</project>

.idea/misc.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_25" project-jdk-name="temurin-1.8" project-jdk-type="JavaSDK" />
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

pom.xml

@@ -655,7 +655,7 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.68</version>
+            <version>1.70</version>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>

src/main/webapp/CSS/comm.css

@@ -1,80 +1,251 @@
-.table {
+
-	border-collapse: collapse;
+@charset "utf-8";
-	border-spacing: 0;
+/* 
-	font-size:12px;
+ * Comm.css - Global Custom Styles
-	table-layout:fixed;
+ * Optimized for "Intelligent" UI Look & Feel
-	width:100%;
+ * Brand Colors: Blue #009FE3, Green #7AC943
+ */
+
+/* =========================================
+   1. Global Element Enhancements (Intelligent Look)
+   ========================================= */
+
+/* Modern Scrollbar */
+::-webkit-scrollbar {
+    width: 8px;
+    height: 8px;
+}
+::-webkit-scrollbar-track {
+    background: #f1f1f1; 
+}
+::-webkit-scrollbar-thumb {
+    background: #c1c1c1; 
+    border-radius: 4px;
+}
+::-webkit-scrollbar-thumb:hover {
+    background: #a8a8a8; 
 }
 
-.table th,.table td {
+/* Typography Enhancements */
-	border: 1px solid #8CACBB;
+body {
-	padding: 0.3em 0.7em;
+    font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif; /* Clean, modern font stack */
-	text-align: left;
+    -webkit-font-smoothing: antialiased;
 }
 
-.table th {
+/* Buttons - Rounded, Shadow, Transition */
-	background: #F8F8F8;
+.btn {
-	text-align: center;
+    border-radius: 4px !important;
+    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+    transition: all 0.3s cubic-bezier(0.25, 0.8, 0.25, 1);
+    border: none;
+}
+.btn:hover {
+    box-shadow: 0 4px 8px rgba(0,0,0,0.15);
+    transform: translateY(-1px);
+}
+.btn:active {
+    box-shadow: 0 1px 2px rgba(0,0,0,0.1);
+    transform: translateY(0);
 }
 
+/* Inputs - Clean Focus State */
+.form-control {
+    border-radius: 4px !important;
+    border: 1px solid #d2d6de;
+    box-shadow: none;
+    transition: border-color 0.3s ease, box-shadow 0.3s ease;
+}
+.form-control:focus {
+    border-color: #009FE3 !important;
+    box-shadow: 0 0 0 2px rgba(0, 159, 227, 0.2) !important;
+}
+
+/* Cards / Boxes - Material Depth */
+.box, .panel {
+    border-radius: 6px !important;
+    box-shadow: 0 1px 3px rgba(0,0,0,0.05), 0 1px 2px rgba(0,0,0,0.1) !important;
+    transition: box-shadow 0.3s ease;
+    border-top-width: 3px;
+}
+.box:hover, .panel:hover {
+    box-shadow: 0 10px 20px rgba(0,0,0,0.05), 0 6px 6px rgba(0,0,0,0.05) !important;
+}
+
+/* Smart Dashboard Widgets (Small Box) */
+.small-box {
+    border-radius: 8px !important;
+    box-shadow: 0 4px 10px rgba(0,0,0,0.15) !important;
+    transition: transform 0.3s ease, box-shadow 0.3s ease;
+    overflow: hidden;
+}
+.small-box:hover {
+    transform: translateY(-5px);
+    box-shadow: 0 8px 15px rgba(0,0,0,0.2) !important;
+}
+.small-box .icon {
+    top: 10px;
+    right: 20px;
+    opacity: 0.3;
+    transition: all 0.3s linear;
+}
+.small-box:hover .icon {
+    font-size: 95px;
+    opacity: 0.5;
+}
+
+/* Modals - Modern & Clean */
+.modal-content {
+    border-radius: 8px !important;
+    box-shadow: 0 15px 35px rgba(0,0,0,0.2) !important;
+    border: none;
+}
+.modal-header {
+    background-color: #009FE3; /* Brand Blue */
+    color: #fff;
+    border-top-left-radius: 8px;
+    border-top-right-radius: 8px;
+    padding: 15px 20px;
+}
+.modal-title {
+    font-weight: 600;
+    letter-spacing: 0.5px;
+}
+.close {
+    color: #fff;
+    opacity: 0.7;
+    text-shadow: none;
+}
+.close:hover {
+    color: #fff;
+    opacity: 1;
+}
+
+/* Tables - Clean Header */
 .table thead th {
-	text-align: center;
+    background-color: #f8f9fa;
+    color: #444;
+    font-weight: 600;
+    border-bottom: 2px solid #e9ecef !important;
+}
+.table-striped > tbody > tr:nth-of-type(odd) {
+    background-color: rgba(0, 159, 227, 0.02); /* Very subtle brand tint */
 }
 
-.table tbody th {
+
-	width:120px;
+/* =========================================
-	height:22px;
+   2. Brand Color Overrides (Blue & Green)
-	text-align: right;
+   ========================================= */
+
+/* Primary Action Color (Blue #009FE3) */
+.btn-primary, 
+.pagination > .active > a, 
+.pagination > .active > a:focus, 
+.pagination > .active > a:hover, 
+.pagination > .active > span, 
+.pagination > .active > span:focus, 
+.pagination > .active > span:hover {
+    background-color: #009FE3 !important;
+    border-color: #009FE3 !important;
+    color: #fff !important;
+}
+.btn-primary:hover, .btn-primary:active, .btn-primary.hover {
+    background-color: #008AC6 !important;
 }
 
-.table tr:hover {
+/* Success/Accent Color (Green #7AC943) */
-	background-color: #f6fafd;
+.btn-success {
+    background-color: #7AC943 !important;
+    border-color: #7AC943 !important;
+}
+.btn-success:hover, .btn-success:active, .btn-success.hover {
+    background-color: #69B035 !important;
 }
 
-.table td:hover {
+/* Custom Blue Utility Class */
-	background-color: #f9feff;
+.blue {
+    background-color: #009FE3 !important;
+    border-color: #009FE3 !important;
+    color: #fff !important;
+}
+.blue:hover {
+    background-color: #008AC6 !important;
 }
 
-.tooltable input{
+/* Link Colors */
-	width:160px;
+a {
+    color: #009FE3;
+}
+a:hover {
+    color: #008AC6;
 }
 
-.form th {
+
-	text-align: right;
+/* =========================================
+   3. Skin-Blue Theme Overrides (Default Theme)
+   ========================================= */
+
+/* Header Navbar - Gradient Brand Blue */
+.skin-blue .main-header .navbar {
+    background: linear-gradient(135deg, #009FE3 0%, #0077aa 100%) !important;
+    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
 }
 
-.form th,.form td {
+/* Logo Area */
-	padding: 0.1em 0.3em;
+.skin-blue .main-header .logo {
-	border: 1px solid #D1D7DC;
+    background-color: #009FE3 !important;
+    color: #ffffff !important;
+    border-right: 1px solid rgba(255,255,255,0.1);
+}
+.skin-blue .main-header .logo:hover {
+    background-color: #008AC6 !important;
 }
 
-.form input,.form select,.form textarea {
+/* Sidebar - Active Item Highlight (Green) */
-	width: 200px;
+.skin-blue .sidebar-menu > li.active > a {
+    border-left-color: #7AC943 !important;
+    background: #1e282c !important;
+}
+.skin-blue .sidebar-menu > li.active > a > i {
+    color: #7AC943;
 }
 
-.form input[type='checkbox'],.form input[type='radio'] {
+/* Treeview Submenu Active */
-	width: 20px;
+.skin-blue .sidebar-menu .treeview-menu > li.active > a {
+    color: #7AC943 !important;
+}
+.skin-blue .sidebar-menu .treeview-menu > li > a:hover {
+    color: #fff !important;
 }
 
-fieldset {
+/* Sidebar Toggle Button */
-	border: 1px dotted #D1D7DC;
+.skin-blue .main-header .navbar .sidebar-toggle:hover {
+    background-color: rgba(0,0,0,0.1) !important;
 }
 
-legend {
+/* User Panel */
-	border: 1px dotted #D1D7DC;
+.skin-blue .user-panel > .info > a {
-	font-size: small;
+    color: #fff;
 }
 
-ul {
+/* Box Colors Matching Brand */
-	list-style-type: none;
+.box.box-primary {
-	margin: 0px;
+    border-top-color: #009FE3;
-	padding: 0px;
+}
+.box.box-success {
+    border-top-color: #7AC943;
 }
 
+/* Specific component tweaks from original file preserved below if needed */
 .linkbutton {
-	color :#005590;
+    color :#009FE3;
+    cursor: pointer;
 }
-
 .linkbutton:visited{
-	color :#005590;
+    color :#009FE3;
+    text-decoration: underline;
+}
+.table th,.table td {
+    text-align: center;
+    vertical-align: middle!important;
+    border: 1px solid #e0e0e0; /* Lighter border for modern look */
 }

src/main/webapp/CSS/module/login/login.css

@@ -4,7 +4,7 @@ Login page
 ***/
 /* logo page */
 .login {
-  background-color: #666 !important; }
+  background-color: #005072 !important; }
 .logo-img {
 	width: 115px;
 	height: 95px;
@@ -29,7 +29,7 @@ Login page
   /*北控登录框*/
   /*background-color: rgba(169,194,214,0.45);*/
   /*通用登录框*/
-  background-color: rgba(171,229,253,0.65);
+  background-color: rgba(0, 159, 227, 0.15);
   width: 31%;
   min-width: 390px;
   margin: 15px auto;
@@ -37,16 +37,18 @@ Login page
   padding: 20px;
 /*   padding-top: 15px;
   padding-bottom: 15px; */
-  -webkit-border-radius: 7px;
+  -webkit-border-radius: 8px;
-  -moz-border-radius: 7px;
+  -moz-border-radius: 8px;
-  -ms-border-radius: 7px;
+  -ms-border-radius: 8px;
-  -o-border-radius: 7px;
+  -o-border-radius: 8px;
-  border-radius: 7px; 
+  border-radius: 8px; 
+  box-shadow: 0 15px 35px rgba(0,0,0,0.3);
+  backdrop-filter: blur(5px);
   }
 
 .login .content h3 {
 	font-size: 21px;
-  color: #000; }
+  color: #009FE3; }
 
 .login .content h4 {
   color: #eee; }

src/main/webapp/JS/comm.js

@@ -507,6 +507,20 @@ function initMenu() {
         //return;
     } else {
         $.post(ext.contextPath + "/user/showMenuListByCu.do", {}, function (result) {
+            var bigScreenHtml = '<li class="treeview">' +
+                '<a href="#">' +
+                '<i class="fa fa-desktop"></i> <span>大屏展示</span>' +
+                '<span class="pull-right-container">' +
+                '<i class="fa fa-angle-left pull-right"></i>' +
+                '</span>' +
+                '</a>' +
+                '<ul class="treeview-menu">' +
+                '<li><a href="javascript:void(0);" onclick="window.open(\'' + ext.contextPath + '/jsp/bigScreen.jsp\', \'_blank\');"><i class="fa fa-circle-o"></i> 水厂大屏</a></li>' +
+                '<li><a href="javascript:void(0);" onclick="window.open(\'' + ext.contextPath + '/jsp/bigScreen2.jsp\', \'_blank\');"><i class="fa fa-circle-o"></i> 区域管线大屏</a></li>' +
+                '<li><a href="javascript:void(0);" onclick="window.open(\'' + ext.contextPath + '/jsp/bigScreen3.jsp\', \'_blank\');"><i class="fa fa-circle-o"></i> 排污户大屏</a></li>' +
+                '</ul>' +
+                '</li>';
+            result = result + bigScreenHtml;
             $('#menu').html(result);
             sessionStorage.setItem("menu", result);
             if (sessionStorage.m1 != undefined) {
@@ -841,7 +855,8 @@ var mySkins = [
     'skin-red-light',
     'skin-yellow-light',
     'skin-purple-light',
-    'skin-green-light'
+    'skin-green-light',
+    'skin-app-style'
 ];
 var myBgs = [
     'bg-light-blue',

src/main/webapp/WEB-INF/ServerConfig.xml

@@ -4,7 +4,7 @@
 	<Attribute name="DBEDIT">2008</Attribute>
 	<Attribute name="DEBUG">false</Attribute>
 	<Attribute name="RESOURCES">false</Attribute> 
-	<Attribute name="TOPTITLE">智慧水务云平台</Attribute>
+	<Attribute name="TOPTITLE">碳谷绿湾云平台</Attribute>
 	<Attribute name="DBNAME">EIP_PRD</Attribute>
 	<Attribute name="DBSERVER">127.0.0.1</Attribute>
 	<Attribute name="DBSERVER2">127.0.0.1</Attribute>

src/main/webapp/jsp/bigScreen.jsp

@@ -0,0 +1,30 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>水厂大屏展示</title>
+    <style>
+        body, html {
+            margin: 0;
+            padding: 0;
+            width: 100%;
+            height: 100%;
+            overflow: auto; /* Allow scrolling if window is smaller */
+        }
+        .screen-container {
+            width: 6500px;
+            height: 1800px;
+            background-image: url('<%=request.getContextPath()%>/IMG/screen1.png');
+            background-size: 100% 100%;
+            background-repeat: no-repeat;
+            position: relative;
+        }
+    </style>
+</head>
+<body>
+    <div class="screen-container">
+        <!-- Content placeholder -->
+    </div>
+</body>
+</html>

src/main/webapp/jsp/bigScreen2.jsp

@@ -0,0 +1,29 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>区域管线大屏展示</title>
+    <style>
+        body, html {
+            margin: 0;
+            padding: 0;
+            width: 100%;
+            height: 100%;
+            overflow: auto;
+        }
+        .screen-container {
+            width: 6500px;
+            height: 1800px;
+            background-image: url('<%=request.getContextPath()%>/IMG/screen2.png');
+            background-size: 100% 100%;
+            background-repeat: no-repeat;
+            position: relative;
+        }
+    </style>
+</head>
+<body>
+    <div class="screen-container">
+    </div>
+</body>
+</html>

src/main/webapp/jsp/bigScreen3.jsp

@@ -0,0 +1,29 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>排污户大屏展示</title>
+    <style>
+        body, html {
+            margin: 0;
+            padding: 0;
+            width: 100%;
+            height: 100%;
+            overflow: auto;
+        }
+        .screen-container {
+            width: 6500px;
+            height: 1800px;
+            background-image: url('<%=request.getContextPath()%>/IMG/screen3.png');
+            background-size: 100% 100%;
+            background-repeat: no-repeat;
+            position: relative;
+        }
+    </style>
+</head>
+<body>
+    <div class="screen-container">
+    </div>
+</body>
+</html>

src/main/webapp/jsp/changeTheme.jsp

@@ -197,6 +197,19 @@
                             </div>
                         </a>
                         <p class="text-center no-margin" style="font-size: 12px">黄白</p>
+                    </li>
+                    <li style="float:left; width: 25%; padding: 5px;">
+                        <a onclick="doSaveTheme('skin-app-style');" data-skin="skin-app-style" style="cursor: pointer;display: block; box-shadow: 0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
+                            <div>
+                                <span style="display:block; width: 20%; float: left; height: 11px; background: #78d363"></span>
+                                <span style="display:block; width: 80%; float: left; height: 11px; background: linear-gradient(90deg, #78d363 0%, #2ea7e0 100%);"></span>
+                            </div>
+                            <div>
+                                <span style="display:block; width: 20%; float: left; height: 24px; background: #f9fafc"></span>
+                                <span style="display:block; width: 80%; float: left; height: 24px; background: #f4f5f7"></span>
+                            </div>
+                        </a>
+                        <p class="text-center no-margin" style="font-size: 12px">App风格</p>
                     </li>
 			    </div>
            </form>

src/main/webapp/jsp/inc.jsp

@@ -60,7 +60,7 @@
 <link rel="stylesheet" href="<%=contextPath%>/node_modules/iconfont/iconfont.css"></link>
 <!-- AdminLTE样式 -->
 <link rel="stylesheet" href="<%=contextPath%>/plugins/AdminLTE/css/AdminLTE.min.css"></link>
-<link rel="stylesheet" href="<%=contextPath%>/plugins/AdminLTE/css/skins/_all-skins.min.css"></link>
+<link rel="stylesheet" href="<%=contextPath%>/plugins/AdminLTE/css/skins/_all-skins.css"></link>
 <!-- Google Font -->
 <!-- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic"/> -->
 <!-- select2 -->
@@ -84,6 +84,7 @@
 <!-- BEGIN 布局样式 -->
 <%-- 自定义Bootstrap主题样式 --%>
 <%-- <link rel="stylesheet" href="<%=contextPath%>/CSS/bootstrap-override.css" type="text/css"> --%>
+<link rel="stylesheet" href="<%=contextPath%>/CSS/comm.css" type="text/css">
 <%-- 引入js --%>
 <%-- 引入jQuery --%>
 <script type="text/javascript" src="<%=contextPath%>/node_modules/jquery/dist/jquery.min.js" charset="utf-8"></script>

src/main/webapp/jsp/left.jsp

@@ -4,6 +4,20 @@
 function searchMenu(){
     var search_name = $('#search_name_menu').val();
     $.post(ext.contextPath+"/user/showMenuListByCu.do" , {search_name:search_name}, function(result) {
+        var bigScreenHtml = '<li class="treeview">' +
+            '<a href="#">' +
+            '<i class="fa fa-desktop"></i> <span>大屏展示</span>' +
+            '<span class="pull-right-container">' +
+            '<i class="fa fa-angle-left pull-right"></i>' +
+            '</span>' +
+            '</a>' +
+            '<ul class="treeview-menu">' +
+            '<li><a href="javascript:void(0);" onclick="window.open(\'' + ext.contextPath + '/jsp/bigScreen.jsp\', \'_blank\');"><i class="fa fa-circle-o"></i> 水厂大屏</a></li>' +
+            '<li><a href="javascript:void(0);" onclick="window.open(\'' + ext.contextPath + '/jsp/bigScreen2.jsp\', \'_blank\');"><i class="fa fa-circle-o"></i> 区域管线大屏</a></li>' +
+            '<li><a href="javascript:void(0);" onclick="window.open(\'' + ext.contextPath + '/jsp/bigScreen3.jsp\', \'_blank\');"><i class="fa fa-circle-o"></i> 排污户大屏</a></li>' +
+            '</ul>' +
+            '</li>';
+        result = result + bigScreenHtml;
         $('#menu').html(result);
         sessionStorage.setItem("menu",result);
         var $li=$('#menu').find("li:first");

src/main/webapp/jsp/safety/SafetyJobInsideEdit.jsp

@@ -4,33 +4,203 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <style type="text/css">
-    .select2-container .select2-selection--single {
+    /* 覆盖Bootstrap Modal样式以匹配APP风格 */
-        height: 34px;
+    .modal-dialog {
-        line-height: 34px;
+        width: 46%;
+        margin: 30px auto;
+    }
+    @media (max-width: 768px) {
+        .modal-dialog {
+            width: 94%;
+            margin: 10px auto;
+        }
     }
 
-    .select2-selection__arrow {
+    .modal-content {
-        margin-top: 3px;
+        border-radius: 16px;
+        border: none;
+        box-shadow: 0 10px 30px rgba(0, 0, 0, 0.15);
+        overflow: hidden;
+        font-family: "PingFang SC", "Microsoft YaHei", sans-serif;
     }
 
-    /*.layout{*/
+    .modal-header {
-    /*    display: flex;*/
+        /* 截图中的蓝绿渐变背景 */
-    /*    padding-left: 15px;*/
+        background: linear-gradient(135deg, #4CD964 0%, #20E2D7 50%, #12B7F5 100%);
-    /*}*/
+        color: white;
+        padding: 20px 25px;
+        border-bottom: none;
+    }
+
+    .modal-title {
+        font-weight: 600;
+        font-size: 18px;
+        letter-spacing: 1px;
+    }
+
+    .close {
+        color: white;
+        opacity: 0.8;
+        text-shadow: none;
+        font-size: 28px;
+        margin-top: -5px;
+    }
+
+    .close:hover {
+        color: #fff;
+        opacity: 1;
+    }
+
+    .modal-body {
+        padding: 25px 30px;
+        background-color: #f9fbfd; /* 极淡的背景色 */
+    }
+
+    /* 表单样式优化 */
     .form-horizontal {
-        padding-top: 20px;
+        padding-top: 10px;
+    }
 
+    .form-group {
+        margin-bottom: 20px;
+    }
+
+    .form-group label {
+        font-weight: 500;
+        color: #555;
+        font-size: 14px;
+        padding-top: 10px !important; /* 垂直居中 */
+    }
+
+    .form-control {
+        border-radius: 8px;
+        border: 1px solid #e0e0e0;
+        box-shadow: none;
+        height: 40px;
+        background-color: #fff;
+        transition: all 0.3s;
+    }
+
+    .form-control:focus {
+        border-color: #20E2D7;
+        box-shadow: 0 0 0 3px rgba(32, 226, 215, 0.1);
+        background-color: #fff;
+    }
+
+    /* 只读输入框样式 */
+    .form-control[readonly] {
+        background-color: #f5f7fa;
+        color: #777;
+        cursor: pointer; /* 如果有点击事件 */
+    }
+
+    /* Select2 样式覆盖 */
+    .select2-container .select2-selection--single {
+        height: 40px !important;
+        border: 1px solid #e0e0e0 !important;
+        border-radius: 8px !important;
+        line-height: 40px !important;
+        outline: none;
+    }
+
+    .select2-container--default .select2-selection--single .select2-selection__rendered {
+        line-height: 40px !important;
+        color: #555;
+    }
+
+    .select2-container--default .select2-selection--single .select2-selection__arrow {
+        height: 38px !important;
+        right: 5px;
     }
 
     .select2-container--default .select2-selection--multiple .select2-selection__choice {
-        background-color: white;
+        background-color: #e3f2fd;
+        border: 1px solid #bbdefb;
+        color: #1e88e5;
+        border-radius: 4px;
+        margin-top: 7px;
     }
 
+    .select2-container .select2-selection--multiple {
+        min-height: 40px !important;
+        border: 1px solid #e0e0e0 !important;
+        border-radius: 8px !important;
+    }
+
+    /* 底部按钮区 */
+    .modal-footer {
+        border-top: none;
+        padding: 20px 30px 30px;
+        background-color: #f9fbfd;
+        text-align: right;
+    }
+
+    .btn {
+        border-radius: 25px; /* 圆角胶囊按钮 */
+        padding: 8px 30px;
+        font-size: 14px;
+        border: none;
+        font-weight: 500;
+        letter-spacing: 1px;
+        transition: transform 0.2s, box-shadow 0.2s;
+    }
+
+    .btn:active {
+        transform: scale(0.98);
+    }
+
+    .btn-default {
+        background-color: #edf2f7;
+        color: #666;
+    }
+
+    .btn-default:hover {
+        background-color: #e2e8f0;
+    }
+
+    .btn-primary {
+        /* 按钮也使用渐变 */
+        background: linear-gradient(90deg, #20E2D7 0%, #12B7F5 100%);
+        color: white;
+        box-shadow: 0 4px 12px rgba(18, 183, 245, 0.3);
+    }
+
+    .btn-primary:hover {
+        background: linear-gradient(90deg, #1CD1C7 0%, #10A6DF 100%);
+        box-shadow: 0 6px 15px rgba(18, 183, 245, 0.4);
+        color: white;
+    }
+
+    /* 日期选择器图标 */
+    .input-group-addon {
+        background-color: #fff;
+        border: 1px solid #e0e0e0;
+        border-left: none;
+        border-top-right-radius: 8px;
+        border-bottom-right-radius: 8px;
+        color: #12B7F5;
+    }
+
+    .input-group .form-control {
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+    }
+
+    /* 其他 */
     .right {
         margin-left: 50px;
     }
 
-
+    /* 必填项星号颜色 */
+    .control-label:before {
+        /*content: "*";*/
+        /*color: #f56c6c;*/
+        /*margin-right: 4px;*/
+    }
+    /* 针对现有HTML中写在label里的*号进行颜色处理，如果有的话 */
+    .control-label {
+        position: relative;
+    }
 </style>
 <script type="text/javascript">
 
@@ -71,7 +241,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
                 return repo.text;
             } // 函数用于呈现当前的选择
         });
-        $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'});
+        /* $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'}); */
         select_3.val('${bean.jobType}'.split(",")).trigger("change");
     }
 
@@ -305,7 +475,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
 
 </script>
 <div class="modal fade" id="subModal">
-    <div class="modal-dialog" style="width: 46%">
+    <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
@@ -314,7 +484,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
             </div>
             <div class="modal-body">
                 <div class="row">
-                    <div class="col-md-12 col-xs-13">
+                    <div class="col-md-12 col-xs-12">
                         <!-- 新增界面formid强制为editForm -->
                         <form class="form-horizontal" id="editForm" enctype="multipart/form-data">
                             <div id="alertDiv"></div>

src/main/webapp/jsp/top.jsp

@@ -1051,7 +1051,7 @@
         var topRightWidth=$('#topRight').outerWidth();
         var titleWidth=topWidth-topRightWidth-50;
         $("#topTitle").css('width',titleWidth);
-        $("#topTitle").text("智慧水务云平台");
+        $("#topTitle").text("碳谷绿湾云平台");
     });*/
 
 </script>
@@ -1061,9 +1061,14 @@
     <!-- Logo  -->
     <a onclick="goToMainTab();" style="cursor:pointer " class="logo">
         <!-- mini logo for sidebar mini 50x50 pixels -->
-        <span class="logo-mini"><b id="logo-mini">平台</b></span>
+        <span class="logo-mini">
+            <img src="<%=request.getContextPath()%>/IMG/logo.png" style="height: 30px; margin-top: 10px;" alt="Logo"/>
+        </span>
         <!-- logo for regular state and mobile devices -->
-        <span class="logo-lg"><b id="logo-lg"><%-- ${cu._pname} --%></b></span>
+        <span class="logo-lg">
+            <img src="<%=request.getContextPath()%>/IMG/logo.png" style="height: 30px; margin-right: 5px; vertical-align: middle;" alt="Logo"/>
+            <b id="logo-lg" style="vertical-align: middle; font-size: 18px;">上海金山卫污水厂</b>
+        </span>
     </a>
     <!-- Navbar Right Menu -->
     <div id="logo-top-title" class="pull-left hidden-xs hidden-sm"

src/main/webapp/plugins/AdminLTE/css/skins/_all-skins.css

@@ -1779,3 +1779,172 @@
     border-left: 1px solid #d2d6de;
   }
 }
+
+/*
+ * Skin: App Style
+ * -----------
+ */
+.skin-app-style .main-header .navbar {
+  background: linear-gradient(90deg, #78d363 0%, #2ea7e0 100%) !important;
+  background-color: #2ea7e0 !important; /* Fallback */
+}
+.skin-app-style .main-header .logo {
+  background-color: #78d363 !important;
+  color: #ffffff;
+  border-bottom: 0 solid transparent;
+}
+.skin-app-style .main-header .logo:hover {
+  background-color: #6ec35b !important;
+}
+.skin-app-style .main-header .navbar .nav > li > a {
+  color: #ffffff;
+}
+.skin-app-style .main-header .navbar .nav > li > a:hover,
+.skin-app-style .main-header .navbar .nav > li > a:active,
+.skin-app-style .main-header .navbar .nav > li > a:focus,
+.skin-app-style .main-header .navbar .nav .open > a,
+.skin-app-style .main-header .navbar .nav .open > a:hover,
+.skin-app-style .main-header .navbar .nav .open > a:focus,
+.skin-app-style .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-app-style .main-header .navbar .sidebar-toggle {
+  color: #ffffff;
+}
+.skin-app-style .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-app-style .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-app-style .main-header .navbar .sidebar-toggle:hover {
+  background-color: rgba(0, 0, 0, 0.1);
+}
+@media (max-width: 767px) {
+  .skin-app-style .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-app-style .main-header .navbar .dropdown-menu li a {
+    color: #fff;
+  }
+  .skin-app-style .main-header .navbar .dropdown-menu li a:hover {
+    background: rgba(0, 0, 0, 0.1);
+  }
+}
+.skin-app-style .main-header li.user-header {
+  background-color: #2ea7e0;
+}
+.skin-app-style .content-header {
+  background: transparent;
+}
+.skin-app-style .wrapper,
+.skin-app-style .main-sidebar,
+.skin-app-style .left-side {
+  background-color: #f9fafc;
+}
+.skin-app-style .main-sidebar {
+  border-right: 1px solid #d2d6de;
+}
+.skin-app-style .user-panel > .info,
+.skin-app-style .user-panel > .info > a {
+  color: #444444;
+}
+.skin-app-style .sidebar-menu > li {
+  -webkit-transition: border-left-color 0.3s ease;
+  -o-transition: border-left-color 0.3s ease;
+  transition: border-left-color 0.3s ease;
+}
+.skin-app-style .sidebar-menu > li.header {
+  color: #848484;
+  background: #f9fafc;
+}
+.skin-app-style .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+  font-weight: 600;
+}
+.skin-app-style .sidebar-menu > li:hover > a,
+.skin-app-style .sidebar-menu > li.active > a {
+  color: #000000;
+  background: #f4f4f5;
+}
+.skin-app-style .sidebar-menu > li.active {
+  border-left-color: #2ea7e0;
+}
+.skin-app-style .sidebar-menu > li.active > a {
+  font-weight: 600;
+}
+.skin-app-style .sidebar-menu > li > .treeview-menu {
+  background: #f4f4f5;
+}
+.skin-app-style .sidebar a {
+  color: #444444;
+}
+.skin-app-style .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-app-style .sidebar-menu .treeview-menu > li > a {
+  color: #777777;
+}
+.skin-app-style .sidebar-menu .treeview-menu > li.active > a,
+.skin-app-style .sidebar-menu .treeview-menu > li > a:hover {
+  color: #000000;
+}
+.skin-app-style .sidebar-menu .treeview-menu > li.active > a {
+  font-weight: 600;
+}
+.skin-app-style .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #d2d6de;
+  margin: 10px 10px;
+}
+.skin-app-style .sidebar-form input[type="text"],
+.skin-app-style .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #fff;
+  border: 1px solid transparent;
+  height: 35px;
+}
+.skin-app-style .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-app-style .sidebar-form input[type="text"]:focus,
+.skin-app-style .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-app-style .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-app-style .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+@media (min-width: 768px) {
+  .skin-app-style.sidebar-mini.sidebar-collapse .sidebar-menu > li > .treeview-menu {
+    border-left: 1px solid #d2d6de;
+  }
+}
+.skin-app-style .main-footer {
+  border-top-color: #d2d6de;
+}
+.skin-app-style.layout-top-nav .main-header > .logo {
+  background-color: #78d363;
+  color: #ffffff;
+  border-bottom: 0 solid transparent;
+}
+.skin-app-style.layout-top-nav .main-header > .logo:hover {
+  background-color: #6ec35b;
+}
+.skin-app-style .content-wrapper,
+.skin-app-style .right-side {
+  background-color: #f7f8fa;
+}

src/main/webapp/plugins/AdminLTE/js/demo.js

@@ -40,7 +40,8 @@ $(function () {
         'skin-red-light',
         'skin-yellow-light',
         'skin-purple-light',
-        'skin-green-light'
+        'skin-green-light',
+        'skin-app-style'
     ]
 
     /**