diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java index ba5a1fb..db221fd 100644 --- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java +++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java @@ -284,6 +284,7 @@ } marker.setIsValid(1); marker.setCompanyId(companyId); + marker.setColorType(markerDto.getColorType()); this.saveMarker(marker); //插入下拉列表的值 int type = markerDto.getRecordType(); diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java index ba5a1fb..db221fd 100644 --- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java +++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java @@ -284,6 +284,7 @@ } marker.setIsValid(1); marker.setCompanyId(companyId); + marker.setColorType(markerDto.getColorType()); this.saveMarker(marker); //插入下拉列表的值 int type = markerDto.getRecordType(); diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java index 3c213b7..940e40e 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -77,6 +77,16 @@ } } + @RequestMapping("get-images") + @ResponseBody + public Map getPathOfImages(@RequestParam(value = "id") Long id) { + Map result = new HashMap(); + String data = markerManager.get(id).getPhotos(); + result.put("data",data); + result.put("success","true"); + return result; + } + /** * 查询出要编辑的标签信息 * diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java index ba5a1fb..db221fd 100644 --- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java +++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java @@ -284,6 +284,7 @@ } marker.setIsValid(1); marker.setCompanyId(companyId); + marker.setColorType(markerDto.getColorType()); this.saveMarker(marker); //插入下拉列表的值 int type = markerDto.getRecordType(); diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java index 3c213b7..940e40e 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -77,6 +77,16 @@ } } + @RequestMapping("get-images") + @ResponseBody + public Map getPathOfImages(@RequestParam(value = "id") Long id) { + Map result = new HashMap(); + String data = markerManager.get(id).getPhotos(); + result.put("data",data); + result.put("success","true"); + return result; + } + /** * 查询出要编辑的标签信息 * diff --git a/src/main/webapp/content/marker/marker-info-edit-new.jsp b/src/main/webapp/content/marker/marker-info-edit-new.jsp index 8f5d29d..0aee35b 100644 --- a/src/main/webapp/content/marker/marker-info-edit-new.jsp +++ b/src/main/webapp/content/marker/marker-info-edit-new.jsp @@ -1 +1 @@ -<%@page contentType="text/html;charset=UTF-8" %> <%@include file="/taglibs.jsp" %> <%pageContext.setAttribute("currentMenu", "marker1");%> 地下管线电子标识系统 <%@include file="/common/layout/header.jsp" %>
<%@include file="/common/layout/menu_new.jsp" %>
<%--<%@include file="/common/layout/second-menu-user.jsp"%>--%>
标识器管理信息编辑
操作失败：
添加成功
毫米
<%@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", "marker1");%> 地下管线电子标识系统 <%@include file="/common/layout/header.jsp" %>
<%@include file="/common/layout/menu_new.jsp" %>
<%--<%@include file="/common/layout/second-menu-user.jsp"%>--%>
标识器管理信息编辑
操作失败：
添加成功
毫米
<%@include file="/common/layout/footer.jsp" %> <%----%> \ No newline at end of file diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java index ba5a1fb..db221fd 100644 --- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java +++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java @@ -284,6 +284,7 @@ } marker.setIsValid(1); marker.setCompanyId(companyId); + marker.setColorType(markerDto.getColorType()); this.saveMarker(marker); //插入下拉列表的值 int type = markerDto.getRecordType(); diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java index 3c213b7..940e40e 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -77,6 +77,16 @@ } } + @RequestMapping("get-images") + @ResponseBody + public Map getPathOfImages(@RequestParam(value = "id") Long id) { + Map result = new HashMap(); + String data = markerManager.get(id).getPhotos(); + result.put("data",data); + result.put("success","true"); + return result; + } + /** * 查询出要编辑的标签信息 * diff --git a/src/main/webapp/content/marker/marker-info-edit-new.jsp b/src/main/webapp/content/marker/marker-info-edit-new.jsp index 8f5d29d..0aee35b 100644 --- a/src/main/webapp/content/marker/marker-info-edit-new.jsp +++ b/src/main/webapp/content/marker/marker-info-edit-new.jsp @@ -1 +1 @@ -<%@page contentType="text/html;charset=UTF-8" %> <%@include file="/taglibs.jsp" %> <%pageContext.setAttribute("currentMenu", "marker1");%> 地下管线电子标识系统 <%@include file="/common/layout/header.jsp" %>
<%@include file="/common/layout/menu_new.jsp" %>
<%--<%@include file="/common/layout/second-menu-user.jsp"%>--%>
标识器管理信息编辑
操作失败：
添加成功
毫米
<%@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", "marker1");%> 地下管线电子标识系统 <%@include file="/common/layout/header.jsp" %>
<%@include file="/common/layout/menu_new.jsp" %>
<%--<%@include file="/common/layout/second-menu-user.jsp"%>--%>
标识器管理信息编辑
操作失败：
添加成功
毫米
<%@include file="/common/layout/footer.jsp" %> <%----%> \ No newline at end of file diff --git a/src/main/webapp/s/app/marker/marker-info-list.js b/src/main/webapp/s/app/marker/marker-info-list.js index 6fabbab..25549c6 100644 --- a/src/main/webapp/s/app/marker/marker-info-list.js +++ b/src/main/webapp/s/app/marker/marker-info-list.js @@ -656,7 +656,7 @@ Marker = {}; Marker.recordType = $("#markerObjectType").val(); Marker.area = $("#area").val(); - Marker.line = $("#line"); + Marker.line = $("#line").val(); Marker.road = $("#road").val(); Marker.ownerComp = $("#ownerComp").val(); Marker.creator = $("#creator").val();