diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..b6b1ecf1 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,10 @@ +# 默认忽略的文件 +/shelf/ +/workspace.xml +# 已忽略包含查询文件的默认文件夹 +/queries/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# 基于编辑器的 HTTP 客户端请求 +/httpRequests/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..89f96581 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 00000000..ae49250d --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 00000000..c73d2199 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 00000000..712ab9d9 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jsLinters/jshint.xml b/.idea/jsLinters/jshint.xml new file mode 100644 index 00000000..2dba70ef --- /dev/null +++ b/.idea/jsLinters/jshint.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..97706ed4 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index af9221f1..f0041725 100644 --- a/pom.xml +++ b/pom.xml @@ -655,7 +655,7 @@ org.bouncycastle bcprov-jdk15on - 1.68 + 1.70 commons-codec diff --git a/src/main/webapp/CSS/comm.css b/src/main/webapp/CSS/comm.css index b9c5c4c5..ff752e17 100644 --- a/src/main/webapp/CSS/comm.css +++ b/src/main/webapp/CSS/comm.css @@ -1,80 +1,251 @@ -.table { - border-collapse: collapse; - border-spacing: 0; - font-size:12px; - table-layout:fixed; - width:100%; + +@charset "utf-8"; +/* + * Comm.css - Global Custom Styles + * Optimized for "Intelligent" UI Look & Feel + * 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 { - border: 1px solid #8CACBB; - padding: 0.3em 0.7em; - text-align: left; +/* Typography Enhancements */ +body { + font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif; /* Clean, modern font stack */ + -webkit-font-smoothing: antialiased; } -.table th { - background: #F8F8F8; - text-align: center; +/* Buttons - Rounded, Shadow, Transition */ +.btn { + 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; - text-align: right; + +/* ========================================= + 2. Brand Color Overrides (Blue & Green) + ========================================= */ + +/* 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 { - background-color: #f6fafd; +/* Success/Accent Color (Green #7AC943) */ +.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 { - background-color: #f9feff; +/* Custom Blue Utility Class */ +.blue { + background-color: #009FE3 !important; + border-color: #009FE3 !important; + color: #fff !important; +} +.blue:hover { + background-color: #008AC6 !important; } -.tooltable input{ - width:160px; +/* Link Colors */ +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 { - padding: 0.1em 0.3em; - border: 1px solid #D1D7DC; +/* Logo Area */ +.skin-blue .main-header .logo { + 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 { - width: 200px; +/* Sidebar - Active Item Highlight (Green) */ +.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'] { - width: 20px; +/* Treeview Submenu Active */ +.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 { - border: 1px dotted #D1D7DC; +/* Sidebar Toggle Button */ +.skin-blue .main-header .navbar .sidebar-toggle:hover { + background-color: rgba(0,0,0,0.1) !important; } -legend { - border: 1px dotted #D1D7DC; - font-size: small; +/* User Panel */ +.skin-blue .user-panel > .info > a { + color: #fff; } -ul { - list-style-type: none; - margin: 0px; - padding: 0px; +/* Box Colors Matching Brand */ +.box.box-primary { + border-top-color: #009FE3; +} +.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; -} \ No newline at end of file + 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 */ +} diff --git a/src/main/webapp/CSS/module/login/login.css b/src/main/webapp/CSS/module/login/login.css index 37ed8cb0..284fe55a 100644 --- a/src/main/webapp/CSS/module/login/login.css +++ b/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; - -moz-border-radius: 7px; - -ms-border-radius: 7px; - -o-border-radius: 7px; - border-radius: 7px; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + -ms-border-radius: 8px; + -o-border-radius: 8px; + 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; } diff --git a/src/main/webapp/IMG/logo.png b/src/main/webapp/IMG/logo.png index dd086ca0..760c29cb 100644 Binary files a/src/main/webapp/IMG/logo.png and b/src/main/webapp/IMG/logo.png differ diff --git a/src/main/webapp/IMG/logo2.png b/src/main/webapp/IMG/logo2.png new file mode 100644 index 00000000..dd086ca0 Binary files /dev/null and b/src/main/webapp/IMG/logo2.png differ diff --git a/src/main/webapp/IMG/screen1.png b/src/main/webapp/IMG/screen1.png new file mode 100644 index 00000000..ca3c578c Binary files /dev/null and b/src/main/webapp/IMG/screen1.png differ diff --git a/src/main/webapp/IMG/screen2.png b/src/main/webapp/IMG/screen2.png new file mode 100644 index 00000000..eba78bd3 Binary files /dev/null and b/src/main/webapp/IMG/screen2.png differ diff --git a/src/main/webapp/IMG/screen3.png b/src/main/webapp/IMG/screen3.png new file mode 100644 index 00000000..11306140 Binary files /dev/null and b/src/main/webapp/IMG/screen3.png differ diff --git a/src/main/webapp/IMG/sipai copy.ico b/src/main/webapp/IMG/sipai copy.ico new file mode 100644 index 00000000..b372ffc2 Binary files /dev/null and b/src/main/webapp/IMG/sipai copy.ico differ diff --git a/src/main/webapp/IMG/sipai.ico b/src/main/webapp/IMG/sipai.ico index b372ffc2..760c29cb 100644 Binary files a/src/main/webapp/IMG/sipai.ico and b/src/main/webapp/IMG/sipai.ico differ diff --git a/src/main/webapp/JS/comm.js b/src/main/webapp/JS/comm.js index efa39e7b..7129ee17 100644 --- a/src/main/webapp/JS/comm.js +++ b/src/main/webapp/JS/comm.js @@ -507,6 +507,20 @@ function initMenu() { //return; } else { $.post(ext.contextPath + "/user/showMenuListByCu.do", {}, function (result) { + var bigScreenHtml = '
  • ' + + '' + + ' 大屏展示' + + '' + + '' + + '' + + '' + + '' + + '
    • '; + 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', diff --git a/src/main/webapp/WEB-INF/ServerConfig.xml b/src/main/webapp/WEB-INF/ServerConfig.xml index 5d50452c..6d8f9ce2 100644 --- a/src/main/webapp/WEB-INF/ServerConfig.xml +++ b/src/main/webapp/WEB-INF/ServerConfig.xml @@ -4,7 +4,7 @@ 2008 false false - 智慧水务云平台 + 碳谷绿湾云平台 EIP_PRD 127.0.0.1 127.0.0.1 diff --git a/src/main/webapp/jsp/bigScreen.jsp b/src/main/webapp/jsp/bigScreen.jsp new file mode 100644 index 00000000..9e286df2 --- /dev/null +++ b/src/main/webapp/jsp/bigScreen.jsp @@ -0,0 +1,30 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> + + + + + 水厂大屏展示 + + + +
    + +
    + + diff --git a/src/main/webapp/jsp/bigScreen2.jsp b/src/main/webapp/jsp/bigScreen2.jsp new file mode 100644 index 00000000..9ee5b962 --- /dev/null +++ b/src/main/webapp/jsp/bigScreen2.jsp @@ -0,0 +1,29 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> + + + + + 区域管线大屏展示 + + + +
    +
    + + diff --git a/src/main/webapp/jsp/bigScreen3.jsp b/src/main/webapp/jsp/bigScreen3.jsp new file mode 100644 index 00000000..3a51203b --- /dev/null +++ b/src/main/webapp/jsp/bigScreen3.jsp @@ -0,0 +1,29 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> + + + + + 排污户大屏展示 + + + +
    +
    + + diff --git a/src/main/webapp/jsp/changeTheme.jsp b/src/main/webapp/jsp/changeTheme.jsp index 45c8b647..bfe43850 100644 --- a/src/main/webapp/jsp/changeTheme.jsp +++ b/src/main/webapp/jsp/changeTheme.jsp @@ -197,6 +197,19 @@

    黄白

    + +
  • + +
    + + +
    +
    + + +
    +     +

    App风格

    • diff --git a/src/main/webapp/jsp/inc.jsp b/src/main/webapp/jsp/inc.jsp index 25e8b9b9..124865e5 100644 --- a/src/main/webapp/jsp/inc.jsp +++ b/src/main/webapp/jsp/inc.jsp @@ -60,7 +60,7 @@ - + @@ -84,6 +84,7 @@ <%-- 自定义Bootstrap主题样式 --%> <%-- --%> + <%-- 引入js --%> <%-- 引入jQuery --%> diff --git a/src/main/webapp/jsp/left.jsp b/src/main/webapp/jsp/left.jsp index 8d72d5ed..0133f526 100644 --- a/src/main/webapp/jsp/left.jsp +++ b/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 = '
  • ' + + '' + + ' 大屏展示' + + '' + + '' + + '' + + '' + + '' + + '
    • '; + result = result + bigScreenHtml; $('#menu').html(result); sessionStorage.setItem("menu",result); var $li=$('#menu').find("li:first"); diff --git a/src/main/webapp/jsp/safety/SafetyJobInsideEdit.jsp b/src/main/webapp/jsp/safety/SafetyJobInsideEdit.jsp index 2c195b93..585548bf 100644 --- a/src/main/webapp/jsp/safety/SafetyJobInsideEdit.jsp +++ b/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" %>