diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java index 3d2d5fa..bb7836d 100644 --- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java +++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java @@ -77,7 +77,7 @@ Event event = new Event(); //TODO LIST:保存图片 FileOutputStream fos = null; - String toDir = strDirPath + "/eventImage"; //存储路径 + String toDir = strDirPath + "/images/events"; //存储路径 String fileName = ""; for (int i = 0; i < fileBuffers.length; i++) { if (fileBuffers[i] != null && fileNames[i] != null) { diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java index 3d2d5fa..bb7836d 100644 --- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java +++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java @@ -77,7 +77,7 @@ Event event = new Event(); //TODO LIST:保存图片 FileOutputStream fos = null; - String toDir = strDirPath + "/eventImage"; //存储路径 + String toDir = strDirPath + "/images/events"; //存储路径 String fileName = ""; for (int i = 0; i < fileBuffers.length; i++) { if (fileBuffers[i] != null && fileNames[i] != null) { diff --git a/src/main/webapp/images/events/avatar1.jpg b/src/main/webapp/images/events/avatar1.jpg new file mode 100644 index 0000000..d2ea54e --- /dev/null +++ b/src/main/webapp/images/events/avatar1.jpg Binary files differ diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java index 3d2d5fa..bb7836d 100644 --- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java +++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java @@ -77,7 +77,7 @@ Event event = new Event(); //TODO LIST:保存图片 FileOutputStream fos = null; - String toDir = strDirPath + "/eventImage"; //存储路径 + String toDir = strDirPath + "/images/events"; //存储路径 String fileName = ""; for (int i = 0; i < fileBuffers.length; i++) { if (fileBuffers[i] != null && fileNames[i] != null) { diff --git a/src/main/webapp/images/events/avatar1.jpg b/src/main/webapp/images/events/avatar1.jpg new file mode 100644 index 0000000..d2ea54e --- /dev/null +++ b/src/main/webapp/images/events/avatar1.jpg Binary files differ diff --git a/src/main/webapp/images/events/image1.jpg b/src/main/webapp/images/events/image1.jpg new file mode 100644 index 0000000..bd3a2a9 --- /dev/null +++ b/src/main/webapp/images/events/image1.jpg Binary files differ diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java index 3d2d5fa..bb7836d 100644 --- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java +++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java @@ -77,7 +77,7 @@ Event event = new Event(); //TODO LIST:保存图片 FileOutputStream fos = null; - String toDir = strDirPath + "/eventImage"; //存储路径 + String toDir = strDirPath + "/images/events"; //存储路径 String fileName = ""; for (int i = 0; i < fileBuffers.length; i++) { if (fileBuffers[i] != null && fileNames[i] != null) { diff --git a/src/main/webapp/images/events/avatar1.jpg b/src/main/webapp/images/events/avatar1.jpg new file mode 100644 index 0000000..d2ea54e --- /dev/null +++ b/src/main/webapp/images/events/avatar1.jpg Binary files differ diff --git a/src/main/webapp/images/events/image1.jpg b/src/main/webapp/images/events/image1.jpg new file mode 100644 index 0000000..bd3a2a9 --- /dev/null +++ b/src/main/webapp/images/events/image1.jpg Binary files differ diff --git a/src/main/webapp/images/events/image2.jpg b/src/main/webapp/images/events/image2.jpg new file mode 100644 index 0000000..761acba --- /dev/null +++ b/src/main/webapp/images/events/image2.jpg Binary files differ diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java index 3d2d5fa..bb7836d 100644 --- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java +++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java @@ -77,7 +77,7 @@ Event event = new Event(); //TODO LIST:保存图片 FileOutputStream fos = null; - String toDir = strDirPath + "/eventImage"; //存储路径 + String toDir = strDirPath + "/images/events"; //存储路径 String fileName = ""; for (int i = 0; i < fileBuffers.length; i++) { if (fileBuffers[i] != null && fileNames[i] != null) { diff --git a/src/main/webapp/images/events/avatar1.jpg b/src/main/webapp/images/events/avatar1.jpg new file mode 100644 index 0000000..d2ea54e --- /dev/null +++ b/src/main/webapp/images/events/avatar1.jpg Binary files differ diff --git a/src/main/webapp/images/events/image1.jpg b/src/main/webapp/images/events/image1.jpg new file mode 100644 index 0000000..bd3a2a9 --- /dev/null +++ b/src/main/webapp/images/events/image1.jpg Binary files differ diff --git a/src/main/webapp/images/events/image2.jpg b/src/main/webapp/images/events/image2.jpg new file mode 100644 index 0000000..761acba --- /dev/null +++ b/src/main/webapp/images/events/image2.jpg Binary files differ diff --git a/src/main/webapp/images/events/image3.jpg b/src/main/webapp/images/events/image3.jpg new file mode 100644 index 0000000..5f28bbf --- /dev/null +++ b/src/main/webapp/images/events/image3.jpg Binary files differ diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java index 3d2d5fa..bb7836d 100644 --- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java +++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java @@ -77,7 +77,7 @@ Event event = new Event(); //TODO LIST:保存图片 FileOutputStream fos = null; - String toDir = strDirPath + "/eventImage"; //存储路径 + String toDir = strDirPath + "/images/events"; //存储路径 String fileName = ""; for (int i = 0; i < fileBuffers.length; i++) { if (fileBuffers[i] != null && fileNames[i] != null) { diff --git a/src/main/webapp/images/events/avatar1.jpg b/src/main/webapp/images/events/avatar1.jpg new file mode 100644 index 0000000..d2ea54e --- /dev/null +++ b/src/main/webapp/images/events/avatar1.jpg Binary files differ diff --git a/src/main/webapp/images/events/image1.jpg b/src/main/webapp/images/events/image1.jpg new file mode 100644 index 0000000..bd3a2a9 --- /dev/null +++ b/src/main/webapp/images/events/image1.jpg Binary files differ diff --git a/src/main/webapp/images/events/image2.jpg b/src/main/webapp/images/events/image2.jpg new file mode 100644 index 0000000..761acba --- /dev/null +++ b/src/main/webapp/images/events/image2.jpg Binary files differ diff --git a/src/main/webapp/images/events/image3.jpg b/src/main/webapp/images/events/image3.jpg new file mode 100644 index 0000000..5f28bbf --- /dev/null +++ b/src/main/webapp/images/events/image3.jpg Binary files differ diff --git a/src/main/webapp/images/events/image4.jpg b/src/main/webapp/images/events/image4.jpg new file mode 100644 index 0000000..190fe28 --- /dev/null +++ b/src/main/webapp/images/events/image4.jpg Binary files differ diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java index 3d2d5fa..bb7836d 100644 --- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java +++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java @@ -77,7 +77,7 @@ Event event = new Event(); //TODO LIST:保存图片 FileOutputStream fos = null; - String toDir = strDirPath + "/eventImage"; //存储路径 + String toDir = strDirPath + "/images/events"; //存储路径 String fileName = ""; for (int i = 0; i < fileBuffers.length; i++) { if (fileBuffers[i] != null && fileNames[i] != null) { diff --git a/src/main/webapp/images/events/avatar1.jpg b/src/main/webapp/images/events/avatar1.jpg new file mode 100644 index 0000000..d2ea54e --- /dev/null +++ b/src/main/webapp/images/events/avatar1.jpg Binary files differ diff --git a/src/main/webapp/images/events/image1.jpg b/src/main/webapp/images/events/image1.jpg new file mode 100644 index 0000000..bd3a2a9 --- /dev/null +++ b/src/main/webapp/images/events/image1.jpg Binary files differ diff --git a/src/main/webapp/images/events/image2.jpg b/src/main/webapp/images/events/image2.jpg new file mode 100644 index 0000000..761acba --- /dev/null +++ b/src/main/webapp/images/events/image2.jpg Binary files differ diff --git a/src/main/webapp/images/events/image3.jpg b/src/main/webapp/images/events/image3.jpg new file mode 100644 index 0000000..5f28bbf --- /dev/null +++ b/src/main/webapp/images/events/image3.jpg Binary files differ diff --git a/src/main/webapp/images/events/image4.jpg b/src/main/webapp/images/events/image4.jpg new file mode 100644 index 0000000..190fe28 --- /dev/null +++ b/src/main/webapp/images/events/image4.jpg Binary files differ diff --git a/src/main/webapp/images/events/image5.jpg b/src/main/webapp/images/events/image5.jpg new file mode 100644 index 0000000..9051221 --- /dev/null +++ b/src/main/webapp/images/events/image5.jpg Binary files differ diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java index 3d2d5fa..bb7836d 100644 --- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java +++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java @@ -77,7 +77,7 @@ Event event = new Event(); //TODO LIST:保存图片 FileOutputStream fos = null; - String toDir = strDirPath + "/eventImage"; //存储路径 + String toDir = strDirPath + "/images/events"; //存储路径 String fileName = ""; for (int i = 0; i < fileBuffers.length; i++) { if (fileBuffers[i] != null && fileNames[i] != null) { diff --git a/src/main/webapp/images/events/avatar1.jpg b/src/main/webapp/images/events/avatar1.jpg new file mode 100644 index 0000000..d2ea54e --- /dev/null +++ b/src/main/webapp/images/events/avatar1.jpg Binary files differ diff --git a/src/main/webapp/images/events/image1.jpg b/src/main/webapp/images/events/image1.jpg new file mode 100644 index 0000000..bd3a2a9 --- /dev/null +++ b/src/main/webapp/images/events/image1.jpg Binary files differ diff --git a/src/main/webapp/images/events/image2.jpg b/src/main/webapp/images/events/image2.jpg new file mode 100644 index 0000000..761acba --- /dev/null +++ b/src/main/webapp/images/events/image2.jpg Binary files differ diff --git a/src/main/webapp/images/events/image3.jpg b/src/main/webapp/images/events/image3.jpg new file mode 100644 index 0000000..5f28bbf --- /dev/null +++ b/src/main/webapp/images/events/image3.jpg Binary files differ diff --git a/src/main/webapp/images/events/image4.jpg b/src/main/webapp/images/events/image4.jpg new file mode 100644 index 0000000..190fe28 --- /dev/null +++ b/src/main/webapp/images/events/image4.jpg Binary files differ diff --git a/src/main/webapp/images/events/image5.jpg b/src/main/webapp/images/events/image5.jpg new file mode 100644 index 0000000..9051221 --- /dev/null +++ b/src/main/webapp/images/events/image5.jpg Binary files differ diff --git a/src/main/webapp/images/events/worker.png b/src/main/webapp/images/events/worker.png new file mode 100644 index 0000000..2e9a912 --- /dev/null +++ b/src/main/webapp/images/events/worker.png Binary files differ diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java index 3d2d5fa..bb7836d 100644 --- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java +++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java @@ -77,7 +77,7 @@ Event event = new Event(); //TODO LIST:保存图片 FileOutputStream fos = null; - String toDir = strDirPath + "/eventImage"; //存储路径 + String toDir = strDirPath + "/images/events"; //存储路径 String fileName = ""; for (int i = 0; i < fileBuffers.length; i++) { if (fileBuffers[i] != null && fileNames[i] != null) { diff --git a/src/main/webapp/images/events/avatar1.jpg b/src/main/webapp/images/events/avatar1.jpg new file mode 100644 index 0000000..d2ea54e --- /dev/null +++ b/src/main/webapp/images/events/avatar1.jpg Binary files differ diff --git a/src/main/webapp/images/events/image1.jpg b/src/main/webapp/images/events/image1.jpg new file mode 100644 index 0000000..bd3a2a9 --- /dev/null +++ b/src/main/webapp/images/events/image1.jpg Binary files differ diff --git a/src/main/webapp/images/events/image2.jpg b/src/main/webapp/images/events/image2.jpg new file mode 100644 index 0000000..761acba --- /dev/null +++ b/src/main/webapp/images/events/image2.jpg Binary files differ diff --git a/src/main/webapp/images/events/image3.jpg b/src/main/webapp/images/events/image3.jpg new file mode 100644 index 0000000..5f28bbf --- /dev/null +++ b/src/main/webapp/images/events/image3.jpg Binary files differ diff --git a/src/main/webapp/images/events/image4.jpg b/src/main/webapp/images/events/image4.jpg new file mode 100644 index 0000000..190fe28 --- /dev/null +++ b/src/main/webapp/images/events/image4.jpg Binary files differ diff --git a/src/main/webapp/images/events/image5.jpg b/src/main/webapp/images/events/image5.jpg new file mode 100644 index 0000000..9051221 --- /dev/null +++ b/src/main/webapp/images/events/image5.jpg Binary files differ diff --git a/src/main/webapp/images/events/worker.png b/src/main/webapp/images/events/worker.png new file mode 100644 index 0000000..2e9a912 --- /dev/null +++ b/src/main/webapp/images/events/worker.png Binary files differ diff --git a/src/main/webapp/s/app/task/task.js b/src/main/webapp/s/app/task/task.js index 018e10f..ec6d7d1 100644 --- a/src/main/webapp/s/app/task/task.js +++ b/src/main/webapp/s/app/task/task.js @@ -631,7 +631,7 @@ for (var i = 0; i < eventBeanList.length; i++) { var bdPoint = gpsBdUtils.gcj2bd(eventBeanList[i].latitude, eventBeanList[i].longitude); var point = new BMap.Point(bdPoint.longitude, bdPoint.latitude); - var iconImage = $('#context').val() + "/images/tasks/multi-tasks.png"; + var iconImage = $('#context').val() + "/images/tasks/singleTask.png"; var myIcon = new BMap.Icon(iconImage, new BMap.Size(20, 50));//图片marker的ICON var msg = "事件描述:" + eventBeanList[i].description + "\r\n" + "上传时间:" + eventBeanList[i].createTime + "\r\n";