diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java index c5f8cf5..8e1971c 100644 --- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java +++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java @@ -45,8 +45,8 @@ private String line; private String colorType; private String photos; - private String btnEdit = "编辑"; - private String btnDelete = "删除"; + private String btnEdit = "编辑"; + private String btnDelete = "删除"; public Long getId() { return id; diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java index c5f8cf5..8e1971c 100644 --- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java +++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java @@ -45,8 +45,8 @@ private String line; private String colorType; private String photos; - private String btnEdit = "编辑"; - private String btnDelete = "删除"; + private String btnEdit = "编辑"; + private String btnDelete = "删除"; public Long getId() { return id; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index cea976f..fa407f3 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -16,7 +16,7 @@ # db # ============================================================================ db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://127.0.0.1:3306/ems_tong?useUnicode=true&characterEncoding=UTF-8 +db.default.url=jdbc:mysql://localhost:3306/ems_web?useUnicode=true&characterEncoding=UTF-8 db.default.username=root db.default.password=root #db.default.username=emsweb diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java index c5f8cf5..8e1971c 100644 --- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java +++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java @@ -45,8 +45,8 @@ private String line; private String colorType; private String photos; - private String btnEdit = "编辑"; - private String btnDelete = "删除"; + private String btnEdit = "编辑"; + private String btnDelete = "删除"; public Long getId() { return id; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index cea976f..fa407f3 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -16,7 +16,7 @@ # db # ============================================================================ db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://127.0.0.1:3306/ems_tong?useUnicode=true&characterEncoding=UTF-8 +db.default.url=jdbc:mysql://localhost:3306/ems_web?useUnicode=true&characterEncoding=UTF-8 db.default.username=root db.default.password=root #db.default.username=emsweb diff --git a/src/main/webapp/common/layout/menu_new.jsp b/src/main/webapp/common/layout/menu_new.jsp index f1df83e..bdab2f9 100644 --- a/src/main/webapp/common/layout/menu_new.jsp +++ b/src/main/webapp/common/layout/menu_new.jsp @@ -38,7 +38,7 @@ - + 位置点管理 @@ -56,7 +56,7 @@ - + 工单管理 @@ -73,7 +73,7 @@ - + 用户管理 diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java index c5f8cf5..8e1971c 100644 --- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java +++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java @@ -45,8 +45,8 @@ private String line; private String colorType; private String photos; - private String btnEdit = "编辑"; - private String btnDelete = "删除"; + private String btnEdit = "编辑"; + private String btnDelete = "删除"; public Long getId() { return id; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index cea976f..fa407f3 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -16,7 +16,7 @@ # db # ============================================================================ db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://127.0.0.1:3306/ems_tong?useUnicode=true&characterEncoding=UTF-8 +db.default.url=jdbc:mysql://localhost:3306/ems_web?useUnicode=true&characterEncoding=UTF-8 db.default.username=root db.default.password=root #db.default.username=emsweb diff --git a/src/main/webapp/common/layout/menu_new.jsp b/src/main/webapp/common/layout/menu_new.jsp index f1df83e..bdab2f9 100644 --- a/src/main/webapp/common/layout/menu_new.jsp +++ b/src/main/webapp/common/layout/menu_new.jsp @@ -38,7 +38,7 @@ - + 位置点管理 @@ -56,7 +56,7 @@ - + 工单管理 @@ -73,7 +73,7 @@ - + 用户管理 diff --git a/src/main/webapp/content/marker/marker-info-list.jsp b/src/main/webapp/content/marker/marker-info-list.jsp index dc0f1dc..0ec5a71 100644 --- a/src/main/webapp/content/marker/marker-info-list.jsp +++ b/src/main/webapp/content/marker/marker-info-list.jsp @@ -1 +1 @@ -<%@page contentType="text/html;charset=UTF-8" %> <%@include file="/taglibs.jsp" %> <%pageContext.setAttribute("currentMenu", "markerManagerMenu");%> 地下管线电子标识系统 <%----%> <%----%> <%@include file="/common/layout/header.jsp" %>
<%@include file="/common/layout/menu_new.jsp" %>
<%--<%@include file="/common/layout/second-menu-auth.jsp" %>--%>
标识器管理
<%--
--%> <%----%> <%--
--%> <%--
--%> <%----%> <%--
--%>
<%--
--%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%--
--%>
<%--
--%> <%----%> <%----%> <%----%> <%--
--%>
<%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%>
id标识器编号标识器名称区域线路类型埋深里程1里程2安装时间安装人员备注编辑删除
<%@include file="/common/layout/footer.jsp" %> <%----%> <%----%> \ No newline at end of file +<%@page contentType="text/html;charset=UTF-8" %> <%@include file="/taglibs.jsp" %> <%pageContext.setAttribute("currentMenu", "markerManagerMenu");%> 地下管线电子标识系统 <%----%> <%----%> <%@include file="/common/layout/header.jsp" %>
<%@include file="/common/layout/menu_new.jsp" %>
<%--<%@include file="/common/layout/second-menu-auth.jsp" %>--%>
标识器管理
<%--
--%> <%----%> <%--
--%> <%--
--%> <%----%> <%--
--%>
<%--
--%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%--
--%>
<%--
--%> <%----%> <%----%> <%----%> <%--
--%>
<%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%>
id标识器编号标识器名称区域线路类型埋深里程1里程2安装时间安装人员备注编辑删除
<%@include file="/common/layout/footer.jsp" %> <%----%> <%----%> \ No newline at end of file diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java index c5f8cf5..8e1971c 100644 --- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java +++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java @@ -45,8 +45,8 @@ private String line; private String colorType; private String photos; - private String btnEdit = "编辑"; - private String btnDelete = "删除"; + private String btnEdit = "编辑"; + private String btnDelete = "删除"; public Long getId() { return id; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index cea976f..fa407f3 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -16,7 +16,7 @@ # db # ============================================================================ db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://127.0.0.1:3306/ems_tong?useUnicode=true&characterEncoding=UTF-8 +db.default.url=jdbc:mysql://localhost:3306/ems_web?useUnicode=true&characterEncoding=UTF-8 db.default.username=root db.default.password=root #db.default.username=emsweb diff --git a/src/main/webapp/common/layout/menu_new.jsp b/src/main/webapp/common/layout/menu_new.jsp index f1df83e..bdab2f9 100644 --- a/src/main/webapp/common/layout/menu_new.jsp +++ b/src/main/webapp/common/layout/menu_new.jsp @@ -38,7 +38,7 @@ - + 位置点管理 @@ -56,7 +56,7 @@ - + 工单管理 @@ -73,7 +73,7 @@ - + 用户管理 diff --git a/src/main/webapp/content/marker/marker-info-list.jsp b/src/main/webapp/content/marker/marker-info-list.jsp index dc0f1dc..0ec5a71 100644 --- a/src/main/webapp/content/marker/marker-info-list.jsp +++ b/src/main/webapp/content/marker/marker-info-list.jsp @@ -1 +1 @@ -<%@page contentType="text/html;charset=UTF-8" %> <%@include file="/taglibs.jsp" %> <%pageContext.setAttribute("currentMenu", "markerManagerMenu");%> 地下管线电子标识系统 <%----%> <%----%> <%@include file="/common/layout/header.jsp" %>
<%@include file="/common/layout/menu_new.jsp" %>
<%--<%@include file="/common/layout/second-menu-auth.jsp" %>--%>
标识器管理
<%--
--%> <%----%> <%--
--%> <%--
--%> <%----%> <%--
--%>
<%--
--%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%--
--%>
<%--
--%> <%----%> <%----%> <%----%> <%--
--%>
<%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%>
id标识器编号标识器名称区域线路类型埋深里程1里程2安装时间安装人员备注编辑删除
<%@include file="/common/layout/footer.jsp" %> <%----%> <%----%> \ No newline at end of file +<%@page contentType="text/html;charset=UTF-8" %> <%@include file="/taglibs.jsp" %> <%pageContext.setAttribute("currentMenu", "markerManagerMenu");%> 地下管线电子标识系统 <%----%> <%----%> <%@include file="/common/layout/header.jsp" %>
<%@include file="/common/layout/menu_new.jsp" %>
<%--<%@include file="/common/layout/second-menu-auth.jsp" %>--%>
标识器管理
<%--
--%> <%----%> <%--
--%> <%--
--%> <%----%> <%--
--%>
<%--
--%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%--
--%>
<%--
--%> <%----%> <%----%> <%----%> <%--
--%>
<%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%>
id标识器编号标识器名称区域线路类型埋深里程1里程2安装时间安装人员备注编辑删除
<%@include file="/common/layout/footer.jsp" %> <%----%> <%----%> \ No newline at end of file diff --git a/src/main/webapp/s/media/css/blue.css b/src/main/webapp/s/media/css/blue.css index 8631e31..699253d 100644 --- a/src/main/webapp/s/media/css/blue.css +++ b/src/main/webapp/s/media/css/blue.css @@ -5,7 +5,7 @@ Reset and overrides ***/ body { - background-color: #1570A6 !important; + background-color: #F4F4F4 !important; } .log-info { @@ -50,10 +50,10 @@ .header .navbar-inner { filter: none !important; background-image: none !important; - background-color: #4596DA !important; + background-color: #409EFF !important; } .header .btn-navbar { - background-color: #0f4e74 !important; + background-color: #f4f4f4 !important; } .header .nav .dropdown-toggle:hover, .header .nav .dropdown.open .dropdown-toggle { @@ -66,30 +66,35 @@ Page sidebar ***/ .page-sidebar { - background-color: #1570a6; + font-size: 16px; + background-color: #f4f4f4; +} +ul.page-sidebar-menu > li{ + line-height: 30px !important; } ul.page-sidebar-menu > li > a { - border-top: 1px solid #1c95dc !important; - color: #ffffff !important; + /*border-top: 1px solid #1c95dc !important;*/ + color: #303133 !important; } ul.page-sidebar-menu > li:last-child > a { - border-bottom: 1px solid transparent !important; + /*border-bottom: 1px solid transparent !important;*/ } ul.page-sidebar-menu > li a i { - color: #7fc5ef; + color: #303133; } ul.page-sidebar-menu > li.open > a, ul.page-sidebar-menu > li > a:hover, ul.page-sidebar-menu > li:hover > a { - background: #12618f; + color: #409EFF; + /*background: #12618f;*/ } ul.page-sidebar-menu > li.active > a { - background: #cc1d1d !important; - border-top-color: transparent !important; - color: #ffffff; + /*background: #cc1d1d !important;*/ + /*border-top-color: transparent !important;*/ + color: #409EFF !important; } ul.page-sidebar-menu > li.active > a i { - color: #ffffff; + color: #409EFF; } ul.page-sidebar-menu > li > ul.sub-menu > li:first-child > a { border-top: 0px !important; diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java index c5f8cf5..8e1971c 100644 --- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java +++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java @@ -45,8 +45,8 @@ private String line; private String colorType; private String photos; - private String btnEdit = "编辑"; - private String btnDelete = "删除"; + private String btnEdit = "编辑"; + private String btnDelete = "删除"; public Long getId() { return id; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index cea976f..fa407f3 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -16,7 +16,7 @@ # db # ============================================================================ db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://127.0.0.1:3306/ems_tong?useUnicode=true&characterEncoding=UTF-8 +db.default.url=jdbc:mysql://localhost:3306/ems_web?useUnicode=true&characterEncoding=UTF-8 db.default.username=root db.default.password=root #db.default.username=emsweb diff --git a/src/main/webapp/common/layout/menu_new.jsp b/src/main/webapp/common/layout/menu_new.jsp index f1df83e..bdab2f9 100644 --- a/src/main/webapp/common/layout/menu_new.jsp +++ b/src/main/webapp/common/layout/menu_new.jsp @@ -38,7 +38,7 @@ - + 位置点管理 @@ -56,7 +56,7 @@ - + 工单管理 @@ -73,7 +73,7 @@ - + 用户管理 diff --git a/src/main/webapp/content/marker/marker-info-list.jsp b/src/main/webapp/content/marker/marker-info-list.jsp index dc0f1dc..0ec5a71 100644 --- a/src/main/webapp/content/marker/marker-info-list.jsp +++ b/src/main/webapp/content/marker/marker-info-list.jsp @@ -1 +1 @@ -<%@page contentType="text/html;charset=UTF-8" %> <%@include file="/taglibs.jsp" %> <%pageContext.setAttribute("currentMenu", "markerManagerMenu");%> 地下管线电子标识系统 <%----%> <%----%> <%@include file="/common/layout/header.jsp" %>
<%@include file="/common/layout/menu_new.jsp" %>
<%--<%@include file="/common/layout/second-menu-auth.jsp" %>--%>
标识器管理
<%--
--%> <%----%> <%--
--%> <%--
--%> <%----%> <%--
--%>
<%--
--%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%--
--%>
<%--
--%> <%----%> <%----%> <%----%> <%--
--%>
<%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%>
id标识器编号标识器名称区域线路类型埋深里程1里程2安装时间安装人员备注编辑删除
<%@include file="/common/layout/footer.jsp" %> <%----%> <%----%> \ No newline at end of file +<%@page contentType="text/html;charset=UTF-8" %> <%@include file="/taglibs.jsp" %> <%pageContext.setAttribute("currentMenu", "markerManagerMenu");%> 地下管线电子标识系统 <%----%> <%----%> <%@include file="/common/layout/header.jsp" %>
<%@include file="/common/layout/menu_new.jsp" %>
<%--<%@include file="/common/layout/second-menu-auth.jsp" %>--%>
标识器管理
<%--
--%> <%----%> <%--
--%> <%--
--%> <%----%> <%--
--%>
<%--
--%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%--
--%>
<%--
--%> <%----%> <%----%> <%----%> <%--
--%>
<%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%>
id标识器编号标识器名称区域线路类型埋深里程1里程2安装时间安装人员备注编辑删除
<%@include file="/common/layout/footer.jsp" %> <%----%> <%----%> \ No newline at end of file diff --git a/src/main/webapp/s/media/css/blue.css b/src/main/webapp/s/media/css/blue.css index 8631e31..699253d 100644 --- a/src/main/webapp/s/media/css/blue.css +++ b/src/main/webapp/s/media/css/blue.css @@ -5,7 +5,7 @@ Reset and overrides ***/ body { - background-color: #1570A6 !important; + background-color: #F4F4F4 !important; } .log-info { @@ -50,10 +50,10 @@ .header .navbar-inner { filter: none !important; background-image: none !important; - background-color: #4596DA !important; + background-color: #409EFF !important; } .header .btn-navbar { - background-color: #0f4e74 !important; + background-color: #f4f4f4 !important; } .header .nav .dropdown-toggle:hover, .header .nav .dropdown.open .dropdown-toggle { @@ -66,30 +66,35 @@ Page sidebar ***/ .page-sidebar { - background-color: #1570a6; + font-size: 16px; + background-color: #f4f4f4; +} +ul.page-sidebar-menu > li{ + line-height: 30px !important; } ul.page-sidebar-menu > li > a { - border-top: 1px solid #1c95dc !important; - color: #ffffff !important; + /*border-top: 1px solid #1c95dc !important;*/ + color: #303133 !important; } ul.page-sidebar-menu > li:last-child > a { - border-bottom: 1px solid transparent !important; + /*border-bottom: 1px solid transparent !important;*/ } ul.page-sidebar-menu > li a i { - color: #7fc5ef; + color: #303133; } ul.page-sidebar-menu > li.open > a, ul.page-sidebar-menu > li > a:hover, ul.page-sidebar-menu > li:hover > a { - background: #12618f; + color: #409EFF; + /*background: #12618f;*/ } ul.page-sidebar-menu > li.active > a { - background: #cc1d1d !important; - border-top-color: transparent !important; - color: #ffffff; + /*background: #cc1d1d !important;*/ + /*border-top-color: transparent !important;*/ + color: #409EFF !important; } ul.page-sidebar-menu > li.active > a i { - color: #ffffff; + color: #409EFF; } ul.page-sidebar-menu > li > ul.sub-menu > li:first-child > a { border-top: 0px !important; diff --git a/src/main/webapp/s/media/css/style-metro.css b/src/main/webapp/s/media/css/style-metro.css index 31380df..ab70582 100644 --- a/src/main/webapp/s/media/css/style-metro.css +++ b/src/main/webapp/s/media/css/style-metro.css @@ -52,12 +52,12 @@ .btn.red-stripe { - border-left: 3px solid #d84a38; + border-left: 3px solid #F56C6C; } .btn.blue-stripe { - border-left: 3px solid #4d90fe; + border-left: 3px solid #409EFF; } .btn.purple-stripe @@ -67,18 +67,18 @@ .btn.green-stripe { - border-left: 3px solid #35aa47; + border-left: 3px solid #67C23A; } .btn.yellow-stripe { - border-left: 3px solid #ffb848; + border-left: 3px solid #E6A23C; } /* Red */ .btn.red { color: white; text-shadow: none; - background-color: #d84a38; + background-color: #F56C6C; } .btn.red:hover, .btn.red:focus, @@ -102,7 +102,7 @@ { color: white; text-shadow: none; - background-color: #4d90fe; + background-color: #409EFF; } .btn.blue:hover, .btn.blue:focus, diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java index c5f8cf5..8e1971c 100644 --- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java +++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java @@ -45,8 +45,8 @@ private String line; private String colorType; private String photos; - private String btnEdit = "编辑"; - private String btnDelete = "删除"; + private String btnEdit = "编辑"; + private String btnDelete = "删除"; public Long getId() { return id; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index cea976f..fa407f3 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -16,7 +16,7 @@ # db # ============================================================================ db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://127.0.0.1:3306/ems_tong?useUnicode=true&characterEncoding=UTF-8 +db.default.url=jdbc:mysql://localhost:3306/ems_web?useUnicode=true&characterEncoding=UTF-8 db.default.username=root db.default.password=root #db.default.username=emsweb diff --git a/src/main/webapp/common/layout/menu_new.jsp b/src/main/webapp/common/layout/menu_new.jsp index f1df83e..bdab2f9 100644 --- a/src/main/webapp/common/layout/menu_new.jsp +++ b/src/main/webapp/common/layout/menu_new.jsp @@ -38,7 +38,7 @@ - + 位置点管理 @@ -56,7 +56,7 @@ - + 工单管理 @@ -73,7 +73,7 @@ - + 用户管理 diff --git a/src/main/webapp/content/marker/marker-info-list.jsp b/src/main/webapp/content/marker/marker-info-list.jsp index dc0f1dc..0ec5a71 100644 --- a/src/main/webapp/content/marker/marker-info-list.jsp +++ b/src/main/webapp/content/marker/marker-info-list.jsp @@ -1 +1 @@ -<%@page contentType="text/html;charset=UTF-8" %> <%@include file="/taglibs.jsp" %> <%pageContext.setAttribute("currentMenu", "markerManagerMenu");%> 地下管线电子标识系统 <%----%> <%----%> <%@include file="/common/layout/header.jsp" %>
<%@include file="/common/layout/menu_new.jsp" %>
<%--<%@include file="/common/layout/second-menu-auth.jsp" %>--%>
标识器管理
<%--
--%> <%----%> <%--
--%> <%--
--%> <%----%> <%--
--%>
<%--
--%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%--
--%>
<%--
--%> <%----%> <%----%> <%----%> <%--
--%>
<%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%>
id标识器编号标识器名称区域线路类型埋深里程1里程2安装时间安装人员备注编辑删除
<%@include file="/common/layout/footer.jsp" %> <%----%> <%----%> \ No newline at end of file +<%@page contentType="text/html;charset=UTF-8" %> <%@include file="/taglibs.jsp" %> <%pageContext.setAttribute("currentMenu", "markerManagerMenu");%> 地下管线电子标识系统 <%----%> <%----%> <%@include file="/common/layout/header.jsp" %>
<%@include file="/common/layout/menu_new.jsp" %>
<%--<%@include file="/common/layout/second-menu-auth.jsp" %>--%>
标识器管理
<%--
--%> <%----%> <%--
--%> <%--
--%> <%----%> <%--
--%>
<%--
--%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%--
--%>
<%--
--%> <%----%> <%----%> <%----%> <%--
--%>
<%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%> <%----%>
id标识器编号标识器名称区域线路类型埋深里程1里程2安装时间安装人员备注编辑删除
<%@include file="/common/layout/footer.jsp" %> <%----%> <%----%> \ No newline at end of file diff --git a/src/main/webapp/s/media/css/blue.css b/src/main/webapp/s/media/css/blue.css index 8631e31..699253d 100644 --- a/src/main/webapp/s/media/css/blue.css +++ b/src/main/webapp/s/media/css/blue.css @@ -5,7 +5,7 @@ Reset and overrides ***/ body { - background-color: #1570A6 !important; + background-color: #F4F4F4 !important; } .log-info { @@ -50,10 +50,10 @@ .header .navbar-inner { filter: none !important; background-image: none !important; - background-color: #4596DA !important; + background-color: #409EFF !important; } .header .btn-navbar { - background-color: #0f4e74 !important; + background-color: #f4f4f4 !important; } .header .nav .dropdown-toggle:hover, .header .nav .dropdown.open .dropdown-toggle { @@ -66,30 +66,35 @@ Page sidebar ***/ .page-sidebar { - background-color: #1570a6; + font-size: 16px; + background-color: #f4f4f4; +} +ul.page-sidebar-menu > li{ + line-height: 30px !important; } ul.page-sidebar-menu > li > a { - border-top: 1px solid #1c95dc !important; - color: #ffffff !important; + /*border-top: 1px solid #1c95dc !important;*/ + color: #303133 !important; } ul.page-sidebar-menu > li:last-child > a { - border-bottom: 1px solid transparent !important; + /*border-bottom: 1px solid transparent !important;*/ } ul.page-sidebar-menu > li a i { - color: #7fc5ef; + color: #303133; } ul.page-sidebar-menu > li.open > a, ul.page-sidebar-menu > li > a:hover, ul.page-sidebar-menu > li:hover > a { - background: #12618f; + color: #409EFF; + /*background: #12618f;*/ } ul.page-sidebar-menu > li.active > a { - background: #cc1d1d !important; - border-top-color: transparent !important; - color: #ffffff; + /*background: #cc1d1d !important;*/ + /*border-top-color: transparent !important;*/ + color: #409EFF !important; } ul.page-sidebar-menu > li.active > a i { - color: #ffffff; + color: #409EFF; } ul.page-sidebar-menu > li > ul.sub-menu > li:first-child > a { border-top: 0px !important; diff --git a/src/main/webapp/s/media/css/style-metro.css b/src/main/webapp/s/media/css/style-metro.css index 31380df..ab70582 100644 --- a/src/main/webapp/s/media/css/style-metro.css +++ b/src/main/webapp/s/media/css/style-metro.css @@ -52,12 +52,12 @@ .btn.red-stripe { - border-left: 3px solid #d84a38; + border-left: 3px solid #F56C6C; } .btn.blue-stripe { - border-left: 3px solid #4d90fe; + border-left: 3px solid #409EFF; } .btn.purple-stripe @@ -67,18 +67,18 @@ .btn.green-stripe { - border-left: 3px solid #35aa47; + border-left: 3px solid #67C23A; } .btn.yellow-stripe { - border-left: 3px solid #ffb848; + border-left: 3px solid #E6A23C; } /* Red */ .btn.red { color: white; text-shadow: none; - background-color: #d84a38; + background-color: #F56C6C; } .btn.red:hover, .btn.red:focus, @@ -102,7 +102,7 @@ { color: white; text-shadow: none; - background-color: #4d90fe; + background-color: #409EFF; } .btn.blue:hover, .btn.blue:focus, diff --git a/src/main/webapp/s/media/css/style.css b/src/main/webapp/s/media/css/style.css index 4fc7b93..a7263ca 100644 --- a/src/main/webapp/s/media/css/style.css +++ b/src/main/webapp/s/media/css/style.css @@ -36,11 +36,11 @@ ***/ /* general body settings */ body { - color: #000; - font-family: 'Open Sans'; + color: #000; + font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; padding: 0px !important; margin: 0px !important; - font-size:13px; + font-size:14px; direction: ltr; } @@ -69,22 +69,22 @@ ***/ .bg-blue { background-image: none !important; - background-color: #4b8df8 !important; + background-color: #409EFF !important; } .bg-red { background-image: none !important; - background-color: #e02222 !important; + background-color: #F56C6C !important; } .bg-yellow { background-image: none !important; - background-color: #ffb848 !important; + background-color: #E6A23C !important; } .bg-green { background-image: none !important; - background-color: #35aa47 !important; + background-color: #67C23A !important; } .bg-purple { @@ -371,7 +371,7 @@ border: 0px; padding: 0px; box-shadow: none; - height: 42px; + height: 56px; } .header .nav { @@ -466,7 +466,7 @@ } .page-header-fixed .page-container { - margin-top: 42px; + margin-top: 56px; } /*** @@ -1230,7 +1230,8 @@ .portlet-title .caption { float: left; display: inline-block; - font-size: 18px; + /*font-size: 18px;*/ + font-size: 15px; font-weight: 400; margin: 0; padding: 0; @@ -1252,7 +1253,7 @@ .portlet.red > .portlet-title .caption, .portlet-title.red .caption, .portlet.purple > .portlet-title .caption, .portlet-title.purple .caption, .portlet.grey > .portlet-title .caption, .portlet-title.dark-grey .caption, { - color: #fff; + color: #606266; } .portlet.box.blue > .portlet-title .caption > i, @@ -1262,7 +1263,7 @@ .portlet.box.red > .portlet-title .caption > i, .portlet.box.purple > .portlet-title .caption > i, .portlet.box.light-grey > .portlet-title .caption > i{ - color: #fff; + color: #606266; } .sortable .portlet .portlet-title { @@ -1488,13 +1489,13 @@ } .portlet.box .portlet-title { - padding:8px 10px 2px 10px; + padding:13px 10px 8px 10px; border-bottom: 1px solid #eee; - color: #fff !important; + color: #606266 !important; } .portlet.box .portlet-title > .actions > .btn > i { - color: #fff !important; + color: #606266 !important; } .portlet.box .portlet-title .tools { @@ -1537,11 +1538,12 @@ } .portlet.box.blue .portlet-title { - background-color: #4b8df8; + background-color: #f4f4f4; + color: #606266 !important; } .portlet.box.blue { - border: 1px solid #b4cef8; + /*border: 1px solid #b4cef8;*/ border-top: 0; } @@ -2496,7 +2498,7 @@ } .chat-form .btn-cont { - margin-top: -42px; + margin-top: -56px; position: relative; float: right; width:44px;