Add .DS_Store to .gitignore

.idea/.gitignore

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

.idea/compiler.xml

@@ -1,14 +0,0 @@
-<?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

@@ -1,8 +0,0 @@
-<?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

@@ -1,7 +0,0 @@
-<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

@@ -1,20 +0,0 @@
-<?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

@@ -1,16 +0,0 @@
-<?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

@@ -1,12 +0,0 @@
-<?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

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

pom.xml

@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>SIPAIIS_WMS</groupId>
+    <groupId>TGLW</groupId>
-    <artifactId>SIPAIIS_WMS</artifactId>
+    <artifactId>TGLW</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>war</packaging>
     <properties>
@@ -655,7 +655,7 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.70</version>
+            <version>1.68</version>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
@@ -781,7 +781,7 @@
         </dependency>
     </dependencies>
     <build>
-        <finalName>SIPAIIS_WMS</finalName>
+        <finalName>TGLW</finalName>
         <resources>
             <resource>
                 <directory>src/main/java</directory>

src/main/java/com/sipai/controller/activiti/OEProcessController.java

@@ -138,10 +138,10 @@ public class OEProcessController {
     	String password=request.getParameter("password");
     	
     	if(null==username || "".equals(username)){
-    		return "redirect:http://192.168.2.10:5001/SIPAIIS_WMS/";
+    		return "redirect:http://192.168.2.10:5001/TGLW/";
     	}
     	if(null==password || "".equals(password)){
-    		return "redirect:http://192.168.2.10:5001/SIPAIIS_WMS/";
+    		return "redirect:http://192.168.2.10:5001/TGLW/";
     	}
 
     	List<User> userList=userService.selectListByWhere(" where name='"+username+"' and password='"+password+"'");
@@ -160,7 +160,7 @@ public class OEProcessController {
     		//return "/activiti/taskList";
     		return "/activiti/oeProcessTaskList";
     	}else{
-    		return "redirect:http://192.168.2.10:5001/SIPAIIS_WMS/";
+    		return "redirect:http://192.168.2.10:5001/TGLW/";
     		
     	}
 		

src/main/java/com/sipai/controller/equipment/EquipmentCardController.java

@@ -4666,10 +4666,10 @@ public class EquipmentCardController {
         String password = request.getParameter("password");
 
         if (null == username || "".equals(username)) {
-            return "redirect:http://192.168.2.10:5001/SIPAIIS_WMS/";
+            return "redirect:http://192.168.2.10:5001/TGLW/";
         }
         if (null == password || "".equals(password)) {
-            return "redirect:http://192.168.2.10:5001/SIPAIIS_WMS/";
+            return "redirect:http://192.168.2.10:5001/TGLW/";
         }
 
         List<User> userList = userService.selectListByWhere(" where name='" + username + "' and password='" + password + "'");
@@ -4689,7 +4689,7 @@ public class EquipmentCardController {
             //return "/activiti/taskList";
             return "/equipment/pumpAnalysis";
         } else {
-            return "redirect:http://192.168.2.10:5001/SIPAIIS_WMS/";
+            return "redirect:http://192.168.2.10:5001/TGLW/";
 
         }
 

src/main/java/com/sipai/controller/maintenance/EquipmentPlanController.java

@@ -103,12 +103,12 @@ public class EquipmentPlanController {
     @ApiOperation(value = "获取设备计划list数据", notes = "获取设备计划list数据", httpMethod = "GET")
     @ApiResponses({@ApiResponse(code = 400, message = "请求参数没填好")})
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "page", value = "页数", dataType = "Integer", paramType = "query", required = true),
+            @ApiImplicitParam(name = "page", value = "页数", dataType = "Integer", paramType = "query", required = false),
-            @ApiImplicitParam(name = "rows", value = "每页显示数", dataType = "Integer", paramType = "query", required = true),
+            @ApiImplicitParam(name = "rows", value = "每页显示数", dataType = "Integer", paramType = "query", required = false),
             @ApiImplicitParam(name = "sort", value = "排序字段", dataType = "String", paramType = "query", required = false),
             @ApiImplicitParam(name = "order", value = "排序类型", dataType = "String", paramType = "query", required = false),
-            @ApiImplicitParam(name = "companyId", value = "厂id", dataType = "String", paramType = "query", required = true),
+            @ApiImplicitParam(name = "companyId", value = "厂id", dataType = "String", paramType = "query", required = false),
-            @ApiImplicitParam(name = "status_val", value = "状态筛选 （全部：空、未开始：noStart、开始流程：start、完成：finish、已下发：issued）", dataType = "String", paramType = "query", required = true),
+            @ApiImplicitParam(name = "status_val", value = "状态筛选 （全部：空、未开始：noStart、开始流程：start、完成：finish、已下发：issued）", dataType = "String", paramType = "query", required = false),
             @ApiImplicitParam(name = "type", value = "维修：wx   保养：by   大修：dx", dataType = "String", paramType = "query", required = true),
             @ApiImplicitParam(name = "search_name", value = "计划内容", dataType = "String", paramType = "query", required = false),
             @ApiImplicitParam(name = "date", value = "筛选日期 2023-02-17+17%3A00+~+2023-02-20+17%3A00", dataType = "String", paramType = "query", required = false)
@@ -116,8 +116,8 @@ public class EquipmentPlanController {
     })
     @RequestMapping("/getList.do")
     public ModelAndView getList(HttpServletRequest request, Model model,
-                                @RequestParam(value = "page") Integer page,
+                                @RequestParam(value = "page",required = false) Integer page,
-                                @RequestParam(value = "rows") Integer rows,
+                                @RequestParam(value = "rows",required = false) Integer rows,
                                 @RequestParam(value = "sort", required = false) String sort,
                                 @RequestParam(value = "order", required = false) String order) {
         User cu = (User) request.getSession().getAttribute("cu");
@@ -173,6 +173,8 @@ public class EquipmentPlanController {
         if (StringUtils.isNotBlank(status_equ)) {
             wherestr += " and (tee.equipmentCardID like '%" + status_equ + "%' or tee.equipmentName like '%" + status_equ + "%') ";
         }
+        page = page == null ? 1 : page;
+        rows = rows == null ? 10 : rows;
         PageHelper.startPage(page, rows);
 //        System.out.println(wherestr);
         List<EquipmentPlan> list = this.equipmentPlanService.selectListByWhereWithEquEqu(wherestr);
@@ -337,7 +339,7 @@ public class EquipmentPlanController {
 
 
             JSONArray json = new JSONArray();
-            if(equipmentPlan.getGroupDetailId()!=null){
+            if (equipmentPlan.getGroupDetailId() != null) {
                 String[] did = equipmentPlan.getGroupDetailId().split(",");
                 for (String sid : did) {
                     JSONObject jsonObject = new JSONObject();
@@ -350,7 +352,6 @@ public class EquipmentPlanController {
         }
 
 
-
         return "maintenance/equipmentPlanEdit";
     }
 
@@ -589,11 +590,11 @@ public class EquipmentPlanController {
     })
     @RequestMapping("/doHandPlan.do")
     public String doHandPlan(HttpServletRequest request, Model model) {
-        try{
+        try {
             NewMonthWork newMonthWork = new NewMonthWork();
             newMonthWork.addNewMonthWork(null);
             model.addAttribute("result", "suc");
-        }catch (Exception e){
+        } catch (Exception e) {
             model.addAttribute("result", "fail");
         }
         return "result";

src/main/java/com/sipai/controller/robot/RobotController.java

@@ -222,9 +222,9 @@ public class RobotController {
             pageNum = 0;
         }
         String token = "";
-//        String url = "http://127.0.0.1:8099/SIPAIIS_WMS/robot/test.do";
+//        String url = "http://127.0.0.1:8099/TGLW/robot/test.do";
         String url = "http://10.194.10.169:9206/nsapi/cxlsbg";
-//        String tokenURL = "http://127.0.0.1:8099/SIPAIIS_WMS/third/test";
+//        String tokenURL = "http://127.0.0.1:8099/TGLW/third/test";
         String tokenURL = "http://10.194.10.169:9206/nsapi/getoken?objkey=sipai";
         Map<String, String> headerMap = new HashMap<>();
         headerMap.put("Authorization", "sipai");

src/main/java/com/sipai/entity/scada/MPointHistory.java

@@ -30,7 +30,7 @@ public class MPointHistory extends SQLAdapter implements Serializable {
 
     private String tbName;
 
-    //为报表展示使用 SIPAIIS_WMS
+    //为报表展示使用 TGLW
     private String year;
     private String month;
     private String day;

src/main/resources/log4j.properties

@@ -15,7 +15,7 @@ log4j.appender.Console.layout.ConversionPattern=[%c] - %m%n
 #\u6587\u4EF6\u5927\u5C0F\u5230\u8FBE\u6307\u5B9A\u5C3A\u5BF8\u7684\u65F6\u5019\u4EA7\u751F\u4E00\u4E2A\u65B0\u7684\u6587\u4EF6
 log4j.appender.File = org.apache.log4j.RollingFileAppender
 #\u6307\u5B9A\u8F93\u51FA\u76EE\u5F55
-log4j.appender.File.File = logs/SIPAIIS_WMS.log
+log4j.appender.File.File = logs/TGLW.log
 #\u5B9A\u4E49\u6587\u4EF6\u6700\u5927\u5927\u5C0F
 log4j.appender.File.MaxFileSize = 10MB
 # \u8F93\u51FA\u6240\u4EE5\u65E5\u5FD7\uFF0C\u5982\u679C\u6362\u6210DEBUG\u8868\u793A\u8F93\u51FADEBUG\u4EE5\u4E0A\u7EA7\u522B\u65E5\u5FD7

src/main/resources/redis.properties

@@ -1,10 +1,10 @@
 #redis<69><73><EFBFBD><EFBFBD>
-redis.host=122.51.194.184
+#redis.host=122.51.194.184
-#redis.host=127.0.0.1
+redis.host=127.0.0.1
 #<23><><EFBFBD><EFBFBD>single  <20><>Ⱥcluster
 redis.mode=single
-redis.port=26739
+#redis.port=26739
-#redis.port=6379
+redis.port=6379
 redis.password=Aa112211
 redis.maxIdle=100
 redis.maxActive=300

src/main/resources/url.properties

@@ -1 +1 @@
-url=http\://127.0.0.1\:8080/SIPAIIS_WMS/oeProcess/taskList.do?ng\=''
+url=http\://127.0.0.1\:8080/TGLW/oeProcess/taskList.do?ng\=''

src/main/webapp/CSS/comm.css

@@ -1,251 +1,80 @@
-
+.table {
-@charset "utf-8";
+	border-collapse: collapse;
-/* 
+	border-spacing: 0;
- * Comm.css - Global Custom Styles
+	font-size:12px;
- * Optimized for "Intelligent" UI Look & Feel
+	table-layout:fixed;
- * Brand Colors: Blue #009FE3, Green #7AC943
+	width:100%;
- */
-
-/* =========================================
-   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; 
 }
 
-/* Typography Enhancements */
-body {
-    font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif; /* Clean, modern font stack */
-    -webkit-font-smoothing: antialiased;
-}
-
-/* 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 {
-    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 */
-}
-
-
-/* =========================================
-   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;
-}
-
-/* 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;
-}
-
-/* Custom Blue Utility Class */
-.blue {
-    background-color: #009FE3 !important;
-    border-color: #009FE3 !important;
-    color: #fff !important;
-}
-.blue:hover {
-    background-color: #008AC6 !important;
-}
-
-/* Link Colors */
-a {
-    color: #009FE3;
-}
-a:hover {
-    color: #008AC6;
-}
-
-
-/* =========================================
-   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);
-}
-
-/* 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;
-}
-
-/* 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;
-}
-
-/* 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;
-}
-
-/* Sidebar Toggle Button */
-.skin-blue .main-header .navbar .sidebar-toggle:hover {
-    background-color: rgba(0,0,0,0.1) !important;
-}
-
-/* User Panel */
-.skin-blue .user-panel > .info > a {
-    color: #fff;
-}
-
-/* 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 :#009FE3;
-    cursor: pointer;
-}
-.linkbutton:visited{
-    color :#009FE3;
-    text-decoration: underline;
-}
 .table th,.table td {
-    text-align: center;
+	border: 1px solid #8CACBB;
-    vertical-align: middle!important;
+	padding: 0.3em 0.7em;
-    border: 1px solid #e0e0e0; /* Lighter border for modern look */
+	text-align: left;
 }
+
+.table th {
+	background: #F8F8F8;
+	text-align: center;
+}
+
+.table thead th {
+	text-align: center;
+}
+
+.table tbody th {
+	width:120px;
+	height:22px;
+	text-align: right;
+}
+
+.table tr:hover {
+	background-color: #f6fafd;
+}
+
+.table td:hover {
+	background-color: #f9feff;
+}
+
+.tooltable input{
+	width:160px;
+}
+
+.form th {
+	text-align: right;
+}
+
+.form th,.form td {
+	padding: 0.1em 0.3em;
+	border: 1px solid #D1D7DC;
+}
+
+.form input,.form select,.form textarea {
+	width: 200px;
+}
+
+.form input[type='checkbox'],.form input[type='radio'] {
+	width: 20px;
+}
+
+fieldset {
+	border: 1px dotted #D1D7DC;
+}
+
+legend {
+	border: 1px dotted #D1D7DC;
+	font-size: small;
+}
+
+ul {
+	list-style-type: none;
+	margin: 0px;
+	padding: 0px;
+}
+
+.linkbutton {
+	color :#005590;
+}
+
+.linkbutton:visited{
+	color :#005590;
+}

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

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

src/main/webapp/JS/comm.js

@@ -507,20 +507,6 @@ 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) {
@@ -855,8 +841,7 @@ 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

@@ -1,30 +0,0 @@
-<%@ 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

@@ -1,29 +0,0 @@
-<%@ 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

@@ -1,29 +0,0 @@
-<%@ 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,19 +197,6 @@
                             </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.css"></link>
+<link rel="stylesheet" href="<%=contextPath%>/plugins/AdminLTE/css/skins/_all-skins.min.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,7 +84,6 @@
 <!-- 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,20 +4,6 @@
 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/maintenance/libraryFaultBiz4Tree.jsp

@@ -101,7 +101,7 @@
                 $.post(ext.contextPath + '/maintenance/libraryFaultBloc/doInit.do', {unitId: unitId}, function (data) {
                     if (data.code == '1') {
                         showAlert('s', data.msg, 'mainAlertdiv');
-                        // refreshPage('/SIPAIIS_WMS/maintenance/libraryFaultBloc/showList4TreeBiz.do')
+                        // refreshPage('/TGLW/maintenance/libraryFaultBloc/showList4TreeBiz.do')
                         location.reload();
                     } else {
                         showAlert('d', data.msg, 'mainAlertdiv');

src/main/webapp/jsp/register.jsp

@@ -39,7 +39,7 @@
         //微信授权注册
     	var companyid=$('#pid').val();
         //console.info(companyid);
-    	$("#btn_wechat").attr('href','http://wx.sipaiis.com/wxAuth/wxLogin?systemFlag=SIPAIIS_WMS'+'&companyid='+companyid);
+    	$("#btn_wechat").attr('href','http://wx.sipaiis.com/wxAuth/wxLogin?systemFlag=TGLW'+'&companyid='+companyid);
     	
     	//输入框验证
     	$("#subForm").bootstrapValidator({  

src/main/webapp/jsp/robot.jsp

@@ -106,8 +106,8 @@
         // function getJobList(){
         //     $.ajax({
         //       type: 'get',
-        //       url:  "http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do",
+        //       url:  "http://10.194.10.125:8088/TGLW/robot/getJobList.do",
-        //       // url:  "http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do",
+        //       // url:  "http://10.194.10.125:8088/TGLW/robot/getJobList.do",
         //       dataType: JSON,
         //             async: true,
         //             success: function(data) {
@@ -191,8 +191,8 @@
 
             $.ajax({
                 type: 'get',
-                // url: "http://10.197.50.126:8081/SIPAIIS_WMS/robot/taskStart.do?type=1&taskId=" + taskId,
+                // url: "http://10.197.50.126:8081/TGLW/robot/taskStart.do?type=1&taskId=" + taskId,
-                url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/taskStart.do?type=1&taskId=" + taskId,
+                url: "http://10.194.10.125:8088/TGLW/robot/taskStart.do?type=1&taskId=" + taskId,
                 dataType: JSON,
                 async: true,
                 success: function (data) {
@@ -253,14 +253,14 @@
 
 
         function getJobList2() {
-            // $.post("http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do", {id: hiddenUnitId}, function (data) {
+            // $.post("http://10.194.10.125:8088/TGLW/robot/getJobList.do", {id: hiddenUnitId}, function (data) {
             // $('#mptableTop').css('display', 'block');
             // $('#singleBizDivTop').css('display', 'none');
 
             $('#table9').bootstrapTable('destroy');
             $("#table9").bootstrapTable({ // 对应table标签的id
-                // url: "http://10.197.50.126:8081/SIPAIIS_WMS/robot/getJobList.do", // 获取表格数据的url
+                // url: "http://10.197.50.126:8081/TGLW/robot/getJobList.do", // 获取表格数据的url
-                url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do", // 获取表格数据的url
+                url: "http://10.194.10.125:8088/TGLW/robot/getJobList.do", // 获取表格数据的url
                 cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
                 striped: true,  //表格显示条纹，默认为false
                 pagination: true, // 在表格底部显示分页组件，默认false
@@ -389,14 +389,14 @@
 
 
         function getJobListTYPE_2() {
-            // $.post("http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do", {id: hiddenUnitId}, function (data) {
+            // $.post("http://10.194.10.125:8088/TGLW/robot/getJobList.do", {id: hiddenUnitId}, function (data) {
             // $('#mptableTop').css('display', 'block');
             // $('#singleBizDivTop').css('display', 'none');
 
             $('#table11').bootstrapTable('destroy');
             $("#table11").bootstrapTable({ // 对应table标签的id
-                // url: "http://10.197.50.126:8081/SIPAIIS_WMS/robot/getJobListTYPE_2.do", // 获取表格数据的url
+                // url: "http://10.197.50.126:8081/TGLW/robot/getJobListTYPE_2.do", // 获取表格数据的url
-                url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobListTYPE_2.do", // 获取表格数据的url
+                url: "http://10.194.10.125:8088/TGLW/robot/getJobListTYPE_2.do", // 获取表格数据的url
                 cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
                 striped: true,  //表格显示条纹，默认为false
                 pagination: true, // 在表格底部显示分页组件，默认false
@@ -484,7 +484,7 @@
 
         // function getJobList() {
         //     $("#table").bootstrapTable({ // 对应table标签的id
-        //         url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do", // 获取表格数据的url
+        //         url: "http://10.194.10.125:8088/TGLW/robot/getJobList.do", // 获取表格数据的url
         //         contentType: null,
         //         cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
         //         striped: true,  //表格显示条纹，默认为false
@@ -648,8 +648,8 @@
             openModal("robotsubModal")
             $('#table10').bootstrapTable('destroy');
             $("#table10").bootstrapTable({ // 对应table标签的id
-                // url: "http://10.197.50.126:8081/SIPAIIS_WMS/robot/taskResult.do", // 获取表格数据的url
+                // url: "http://10.197.50.126:8081/TGLW/robot/taskResult.do", // 获取表格数据的url
-                url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/taskResult.do", // 获取表格数据的url
+                url: "http://10.194.10.125:8088/TGLW/robot/taskResult.do", // 获取表格数据的url
                 cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
                 striped: true,  //表格显示条纹，默认为false
                 pagination: true, // 在表格底部显示分页组件，默认false

src/main/webapp/jsp/robot2.jsp

@@ -105,8 +105,8 @@
         // function getJobList(){
         //     $.ajax({
         //       type: 'get',
-        //       url:  "http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do",
+        //       url:  "http://10.194.10.125:8088/TGLW/robot/getJobList.do",
-        //       // url:  "http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do",
+        //       // url:  "http://10.194.10.125:8088/TGLW/robot/getJobList.do",
         //       dataType: JSON,
         //             async: true,
         //             success: function(data) {
@@ -251,13 +251,13 @@
 
 
         function getJobList2() {
-            // $.post("http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do", {id: hiddenUnitId}, function (data) {
+            // $.post("http://10.194.10.125:8088/TGLW/robot/getJobList.do", {id: hiddenUnitId}, function (data) {
             // $('#mptableTop').css('display', 'block');
             // $('#singleBizDivTop').css('display', 'none');
 
             $('#table9').bootstrapTable('destroy');
             $("#table9").bootstrapTable({ // 对应table标签的id
-                url: "http://10.194.10.125:8088/SIPAIIS_WMS/ro2/getList", // 获取表格数据的url
+                url: "http://10.194.10.125:8088/TGLW/ro2/getList", // 获取表格数据的url
                 cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
                 striped: true,  //表格显示条纹，默认为false
                 pagination: true, // 在表格底部显示分页组件，默认false
@@ -368,7 +368,7 @@
 
         // function getJobList() {
         //     $("#table").bootstrapTable({ // 对应table标签的id
-        //         url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do", // 获取表格数据的url
+        //         url: "http://10.194.10.125:8088/TGLW/robot/getJobList.do", // 获取表格数据的url
         //         contentType: null,
         //         cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
         //         striped: true,  //表格显示条纹，默认为false
@@ -533,7 +533,7 @@
 
            /* $.ajax({
                 type: 'get',
-                url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/taskResult.do?jobId=" + jobId,
+                url: "http://10.194.10.125:8088/TGLW/robot/taskResult.do?jobId=" + jobId,
                 dataType: JSON,
                 async: true,
                 success: function (data) {
@@ -651,7 +651,7 @@
 
             $('#table10').bootstrapTable('destroy');
             $("#table10").bootstrapTable({ // 对应table标签的id
-                url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/taskResult.do", // 获取表格数据的url
+                url: "http://10.194.10.125:8088/TGLW/robot/taskResult.do", // 获取表格数据的url
                 cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
                 striped: true,  //表格显示条纹，默认为false
                 pagination: true, // 在表格底部显示分页组件，默认false

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

@@ -4,203 +4,33 @@ 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">
-    /* 覆盖Bootstrap Modal样式以匹配APP风格 */
-    .modal-dialog {
-        width: 46%;
-        margin: 30px auto;
-    }
-    @media (max-width: 768px) {
-        .modal-dialog {
-            width: 94%;
-            margin: 10px auto;
-        }
-    }
-
-    .modal-content {
-        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;
-    }
-
-    .modal-header {
-        /* 截图中的蓝绿渐变背景 */
-        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: 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;
+        height: 34px;
-        border: 1px solid #e0e0e0 !important;
+        line-height: 34px;
-        border-radius: 8px !important;
-        line-height: 40px !important;
-        outline: none;
     }
 
-    .select2-container--default .select2-selection--single .select2-selection__rendered {
+    .select2-selection__arrow {
-        line-height: 40px !important;
+        margin-top: 3px;
-        color: #555;
     }
 
-    .select2-container--default .select2-selection--single .select2-selection__arrow {
+    /*.layout{*/
-        height: 38px !important;
+    /*    display: flex;*/
-        right: 5px;
+    /*    padding-left: 15px;*/
+    /*}*/
+    .form-horizontal {
+        padding-top: 20px;
+
     }
 
     .select2-container--default .select2-selection--multiple .select2-selection__choice {
-        background-color: #e3f2fd;
+        background-color: white;
-        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">
 
@@ -241,7 +71,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");
     }
 
@@ -475,7 +305,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">
+    <div class="modal-dialog" style="width: 46%">
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
@@ -484,7 +314,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-12">
+                    <div class="col-md-12 col-xs-13">
                         <!-- 新增界面formid强制为editForm -->
                         <form class="form-horizontal" id="editForm" enctype="multipart/form-data">
                             <div id="alertDiv"></div>

src/main/webapp/jsp/top.jsp

@@ -779,7 +779,7 @@
             width: 150,
             height: 150,
             //text: "http://www.baidu.com"
-            text: "http://127.0.0.1:8080/SIPAIIS_WMS/app/downLoadAPP.do?&path=D:\\Tomcat 7.0\\webapps\\SIPAIIS_WMS_APK&ng=''"
+            text: "http://127.0.0.1:8080/TGLW/app/downLoadAPP.do?&path=D:\\Tomcat 7.0\\webapps\\SIPAIIS_WMS_APK&ng=''"
 
         }); */
     }
@@ -1051,7 +1051,7 @@
         var topRightWidth=$('#topRight').outerWidth();
         var titleWidth=topWidth-topRightWidth-50;
         $("#topTitle").css('width',titleWidth);
-        $("#topTitle").text("碳谷绿湾云平台");
+        $("#topTitle").text("智慧水务云平台");
     });*/
 
 </script>
@@ -1061,14 +1061,9 @@
     <!-- Logo  -->
     <a onclick="goToMainTab();" style="cursor:pointer " class="logo">
         <!-- mini logo for sidebar mini 50x50 pixels -->
-        <span class="logo-mini">
+        <span class="logo-mini"><b id="logo-mini">平台</b></span>
-            <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">
+        <span class="logo-lg"><b id="logo-lg"><%-- ${cu._pname} --%></b></span>
-            <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/jsp/visual/material.jsp

@@ -1522,7 +1522,7 @@
                 <div style="margin-left: 36%;">
                     <%--<div class="div8_out">
                         <div id="chart_div_16" style="width:100%; height: 100%;"></div>
-                    </div>D:\workspace\SIPAIIS_WMS\WebRoot\IMG\model\battery.png
+                    </div>D:\workspace\TGLW\WebRoot\IMG\model\battery.png
                     <div class="div8_out">
                         <div id="chart_div_17" style="width:100%; height: 100%;"></div>
                     </div>--%>

src/main/webapp/jsp/work/materialDeployOverview.jsp

@@ -265,7 +265,7 @@
     window.onresize = function(){
 		  var  biz_id = '?biz_id='+unitId;
 			console.log("+biz_id"+biz_id);
-    	refreshPage('/SIPAIIS_WMS/work/mpoint/showlistOverview.do'+biz_id);
+    	refreshPage('/TGLW/work/mpoint/showlistOverview.do'+biz_id);
 	}
 
 	//物资

src/main/webapp/jsp/work/materverview.jsp

@@ -23,7 +23,7 @@
 	 $(function(){
     var  biz_id = '?biz_id='+unitId;
 			console.log("+biz_id"+biz_id);
-    	refreshPage('/SIPAIIS_WMS/work/mpoint/showlistOverview.do'+biz_id);
+    	refreshPage('/TGLW/work/mpoint/showlistOverview.do'+biz_id);
     });
 
 	</script>

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

@@ -1779,172 +1779,3 @@
     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,8 +40,7 @@ $(function () {
         'skin-red-light',
         'skin-yellow-light',
         'skin-purple-light',
-        'skin-green-light',
+        'skin-green-light'
-        'skin-app-style'
     ]
 
     /**