diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index c1fbf87..53c91ea 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -20,11 +20,12 @@ #db.default.username=scott #db.default.password=SZHTDB2 db.default.driverClassName=com.mysql.jdbc.Driver -#db.default.url=jdbc:mysql://192.168.0.225:3306/ems?useUnicode=true&characterEncoding=UTF-8 -db.default.url=jdbc:mysql://119.254.110.71:2019/ems?useUnicode=true&characterEncoding=UTF-8 -db.default.username=root -db.default.password=root - +db.default.url=jdbc:mysql://127.0.0.1:3306/ems?useUnicode=true&characterEncoding=UTF-8 +db.default.username=emsweb +db.default.password=emsweb +#db.default.url=jdbc:mysql://119.254.110.71:3307/ems?useUnicode=true&characterEncoding=UTF-8 +#db.default.username=root +#db.default.password=rootems # ============================================================================ # log4jdbc diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index c1fbf87..53c91ea 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -20,11 +20,12 @@ #db.default.username=scott #db.default.password=SZHTDB2 db.default.driverClassName=com.mysql.jdbc.Driver -#db.default.url=jdbc:mysql://192.168.0.225:3306/ems?useUnicode=true&characterEncoding=UTF-8 -db.default.url=jdbc:mysql://119.254.110.71:2019/ems?useUnicode=true&characterEncoding=UTF-8 -db.default.username=root -db.default.password=root - +db.default.url=jdbc:mysql://127.0.0.1:3306/ems?useUnicode=true&characterEncoding=UTF-8 +db.default.username=emsweb +db.default.password=emsweb +#db.default.url=jdbc:mysql://119.254.110.71:3307/ems?useUnicode=true&characterEncoding=UTF-8 +#db.default.username=root +#db.default.password=rootems # ============================================================================ # log4jdbc diff --git a/src/main/webapp/content/ems/ems.jsp b/src/main/webapp/content/ems/ems.jsp index dd0e96a..ac8ad94 100644 --- a/src/main/webapp/content/ems/ems.jsp +++ b/src/main/webapp/content/ems/ems.jsp @@ -553,10 +553,10 @@ App.init(); // initlayout and core plugins $('.hidden-phone').trigger("click"); OptionItemProcess.GetDataFromDb(); + EmsMarkerOpt.init(); Ems.initMap(); Ems.initForm(); Ems.initSelect(); - EmsMarkerOpt.init(); }) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index c1fbf87..53c91ea 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -20,11 +20,12 @@ #db.default.username=scott #db.default.password=SZHTDB2 db.default.driverClassName=com.mysql.jdbc.Driver -#db.default.url=jdbc:mysql://192.168.0.225:3306/ems?useUnicode=true&characterEncoding=UTF-8 -db.default.url=jdbc:mysql://119.254.110.71:2019/ems?useUnicode=true&characterEncoding=UTF-8 -db.default.username=root -db.default.password=root - +db.default.url=jdbc:mysql://127.0.0.1:3306/ems?useUnicode=true&characterEncoding=UTF-8 +db.default.username=emsweb +db.default.password=emsweb +#db.default.url=jdbc:mysql://119.254.110.71:3307/ems?useUnicode=true&characterEncoding=UTF-8 +#db.default.username=root +#db.default.password=rootems # ============================================================================ # log4jdbc diff --git a/src/main/webapp/content/ems/ems.jsp b/src/main/webapp/content/ems/ems.jsp index dd0e96a..ac8ad94 100644 --- a/src/main/webapp/content/ems/ems.jsp +++ b/src/main/webapp/content/ems/ems.jsp @@ -553,10 +553,10 @@ App.init(); // initlayout and core plugins $('.hidden-phone').trigger("click"); OptionItemProcess.GetDataFromDb(); + EmsMarkerOpt.init(); Ems.initMap(); Ems.initForm(); Ems.initSelect(); - EmsMarkerOpt.init(); }) diff --git a/src/main/webapp/content/marker/marker-info-list.jsp b/src/main/webapp/content/marker/marker-info-list.jsp index 601866c..aee7c62 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