From 5e697a70c7e49e18bc3bc2f75c2e9ad5bda17489 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期五, 17 五月 2024 15:40:23 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/edit.html | 6
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/add.html | 146 -------
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectDataController.java | 2
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/edit.html | 12
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HoleServiceImpl.java | 35 +-
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html | 34 -
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData.html | 44 +-
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java | 96 +++++
javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml | 12
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/add.html | 12
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/enums/RecordType.java | 106 ++++++
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java | 38 +-
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html | 95 +----
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectCamera/projectCamera.html | 18
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/enums/CityConst.java | 44 ++
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java | 14
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html | 59 ++
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/edit.html | 118 ------
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/projectPerson.html | 6
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/DeviceLogController.java | 23 +
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/add.html | 12
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IDeviceLogService.java | 7
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/device/device.html | 6
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html | 18
24 files changed, 493 insertions(+), 470 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/DeviceLogController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/DeviceLogController.java
index 10cc8a0..94af662 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/DeviceLogController.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/DeviceLogController.java
@@ -6,11 +6,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
import com.javaweb.common.annotation.Log;
import com.javaweb.common.enums.BusinessType;
import com.javaweb.geo.domain.DeviceLog;
@@ -19,6 +15,7 @@
import com.javaweb.common.core.domain.AjaxResult;
import com.javaweb.common.utils.poi.ExcelUtil;
import com.javaweb.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
/**
* 璁惧鍑哄叆搴撹褰旵ontroller
@@ -70,7 +67,8 @@
* 鏂板璁惧鍑哄叆搴撹褰�
*/
@GetMapping("/add")
- public String add() {
+ public String add(String projectId, ModelMap mmap) {
+ mmap.put("projectId", projectId);
return prefix + "/add";
}
@@ -116,4 +114,17 @@
public AjaxResult remove(String ids) {
return toAjax(deviceLogService.deleteDeviceLogByIds(ids));
}
+
+
+ /**
+ * 瀵煎叆璁惧鍑哄叆搴撹褰�
+ */
+ @RequiresPermissions("geo:deviceLog:import")
+ @Log(title = "瀵煎叆璁惧鍑哄叆搴撹褰�")
+ @PostMapping( "/importDeviceLog/{projectId}")
+ @ResponseBody
+ public AjaxResult importDeviceLog(@PathVariable("projectId") String projectId, @RequestParam("file") MultipartFile file, boolean updateSupport) throws Exception{
+ String message = deviceLogService.importDeviceLog(projectId,file,updateSupport);
+ return AjaxResult.success(message);
+ }
}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java
index f8fdd70..6ae2f30 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java
@@ -1,6 +1,7 @@
package com.javaweb.geo.controller;
import java.util.List;
+
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -21,14 +22,14 @@
/**
* 閽诲瓟Controller
- *
+ *
* @author zmk
* @date 2022-10-20
*/
@Controller
@RequestMapping("/geo/hole")
-public class HoleController extends BaseController
-{
+public class HoleController extends BaseController {
+
private String prefix = "geo/hole";
@Autowired
@@ -36,11 +37,11 @@
@RequiresPermissions("geo:hole:view")
@GetMapping()
- public String hole(String id,ModelMap mmap)
- {
- mmap.put("projectId", id);
+ public String hole(String id, ModelMap mmap) {
+ mmap.put("projectId", id);
return prefix + "/hole";
}
+
/**
* 鏌ヨ閽诲瓟鍒楄〃
@@ -48,12 +49,12 @@
@RequiresPermissions("geo:hole:list")
@PostMapping("/list")
@ResponseBody
- public TableDataInfo list(Hole hole)
- {
+ public TableDataInfo list(Hole hole) {
startPage();
List<Hole> list = holeService.selectHoleList(hole);
return getDataTable(list);
}
+
/**
* 瀵煎嚭閽诲瓟鍒楄〃
@@ -62,8 +63,7 @@
@Log(title = "閽诲瓟", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
- public AjaxResult export(Hole hole)
- {
+ public AjaxResult export(Hole hole) {
List<Hole> list = holeService.selectHoleList(hole);
ExcelUtil<Hole> util = new ExcelUtil<Hole>(Hole.class);
return util.exportExcel(list, "hole");
@@ -73,8 +73,8 @@
* 鏂板閽诲瓟
*/
@GetMapping("/add")
- public String add()
- {
+ public String add(String projectId, ModelMap mmap) {
+ mmap.put("projectId", projectId);
return prefix + "/add";
}
@@ -85,8 +85,7 @@
@Log(title = "閽诲瓟", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
- public AjaxResult addSave(Hole hole)
- {
+ public AjaxResult addSave(Hole hole) {
return toAjax(holeService.insertHole(hole));
}
@@ -94,8 +93,7 @@
* 淇敼閽诲瓟
*/
@GetMapping("/edit/{ids}")
- public String edit(@PathVariable("ids") String ids, ModelMap mmap)
- {
+ public String edit(@PathVariable("ids") String ids, ModelMap mmap) {
Hole hole = holeService.selectHoleById(ids);
mmap.put("hole", hole);
return prefix + "/edit";
@@ -108,8 +106,7 @@
@Log(title = "閽诲瓟", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
- public AjaxResult editSave(Hole hole)
- {
+ public AjaxResult editSave(Hole hole) {
return toAjax(holeService.updateHole(hole));
}
@@ -118,10 +115,9 @@
*/
@RequiresPermissions("geo:hole:remove")
@Log(title = "閽诲瓟", businessType = BusinessType.DELETE)
- @PostMapping( "/remove")
+ @PostMapping("/remove")
@ResponseBody
- public AjaxResult remove(String ids)
- {
+ public AjaxResult remove(String ids) {
return toAjax(holeService.deleteHoleByIds(ids));
}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectDataController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectDataController.java
index b1f2552..7380ad3 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectDataController.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectDataController.java
@@ -42,6 +42,8 @@
return prefix + "/projectData";
}
+
+
/**
* 鏌ヨ椤圭洰璧勬枡鍒楄〃
*/
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java
index fa47aca..5b674b3 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java
@@ -33,6 +33,9 @@
/** 璁惧id */
private String deviceId;
+ /** 璁惧缂栫爜 */
+ private String deviceCode;
+
/** 璁惧鍚嶇О */
@Excel(name = "璁惧鍚嶇О")
private String deviceName;
@@ -110,7 +113,15 @@
this.deviceName = deviceName;
}
- public String getDeviceName()
+ public String getDeviceCode() {
+ return deviceCode;
+ }
+
+ public void setDeviceCode(String deviceCode) {
+ this.deviceCode = deviceCode;
+ }
+
+ public String getDeviceName()
{
return deviceName;
}
@@ -177,6 +188,7 @@
.append("projectId", getProjectId())
.append("projectName", getProjectName())
.append("deviceId", getDeviceId())
+ .append("deviceCode", getDeviceCode())
.append("deviceName", getDeviceName())
.append("type", getType())
.append("transactionDate", getTransactionDate())
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/enums/CityConst.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/enums/CityConst.java
new file mode 100644
index 0000000..f7f774d
--- /dev/null
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/enums/CityConst.java
@@ -0,0 +1,44 @@
+package com.javaweb.geo.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class CityConst {
+
+ private static Map<Integer,String> cityMap = new HashMap<Integer, String>();
+
+ static{
+ cityMap.put(1, "涓滃煄鍖�");
+ cityMap.put(2, "瑗垮煄鍖�");
+ cityMap.put(5, "鏈濋槼鍖�");
+ cityMap.put(6, "涓板彴鍖�");
+ cityMap.put(7, "鐭虫櫙灞�");
+
+ cityMap.put(8, "娴锋穩鍖�");
+ cityMap.put(9, "闂ㄥご娌熷尯");
+
+ cityMap.put(10, "鎴垮北鍖�");
+
+ cityMap.put(11, "閫氬窞鍖�");
+
+ cityMap.put(12, "椤轰箟鍖�");
+
+ cityMap.put(13, "鏄屽钩鍖�");
+ cityMap.put(14, "澶у叴鍖�");
+ cityMap.put(15, "鎬�鏌斿尯");
+ cityMap.put(16, "骞宠胺鍖�");
+ cityMap.put(17, "瀵嗕簯鍘�");
+ cityMap.put(18, "寤跺簡鍘�");
+ cityMap.put(99, "澶栧煚");
+
+ }
+
+ public static String getCitName(Integer key){
+
+ if(key != null && cityMap.containsKey(key)){
+ return cityMap.get(key);
+ }
+ return null;
+
+ }
+}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/enums/RecordType.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/enums/RecordType.java
new file mode 100644
index 0000000..47780ca
--- /dev/null
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/enums/RecordType.java
@@ -0,0 +1,106 @@
+package com.javaweb.geo.enums;
+
+public enum RecordType {
+
+ /**
+ * 鍑哄叆搴撶姸鎬�
+ */
+ deviceLog_in("in","鍏ュ簱"),
+ deviceLog_out("out","鍑哄簱"),
+
+ /**
+ * 璁板綍鍒嗙被锛堝繀濉紝鐩存帴濉啓姹夊瓧锛屽洜鑰冭檻鍘嗗彶鏁版嵁鍘熷洜锛�
+ * 鈥滄満闀库�濊〃绀哄徃閽诲憳锛�
+ * 鍥炴銆佸博鍦熴�佸彇鍦熴�佹爣璐�佸姩鎺€�佹按浣嶃�佸彇姘淬�佽礋璐ｄ汉銆佸伐绋嬪笀銆佹満闀裤�侀捇鏈�
+ */
+ hc("鍥炴","鍥炴"),
+ yt("宀╁湡","宀╁湡"),
+ qt("鍙栧湡","鍙栧湡"),
+ bg("鏍囪疮","鏍囪疮"),
+ dt("鍔ㄦ帰","鍔ㄦ帰"),
+ sw("姘翠綅","姘翠綅"),
+ qs("鍙栨按","鍙栨按"),
+ fzr("璐熻矗浜�","璐熻矗浜�"),
+ gcs("宸ョ▼甯�","宸ョ▼甯�"),
+ jz("鏈洪暱","鏈洪暱"),
+ zj("閽绘満","閽绘満"),
+
+
+
+ /**
+ * 椤圭洰鐘舵��
+ */
+ projectStatus0("0","椤圭洰鏈畬鎴�"),
+ projectStatus1("1","椤圭洰楠屾敹瀹屾垚"),
+
+ /**
+ * 鏄惁鍒犻櫎
+ */
+ isDelete0("0","鏈垹闄�"),
+ isDelete1("1","宸插垹闄�"),
+
+ /**
+ * 鍕樻帰鐐圭姸鎬� 1-楠屾敹閫氳繃锛�2-楠屾敹涓嶉�氳繃锛�3-搴熷瓟
+ */
+ holeStatus1("1","楠屾敹閫氳繃"),
+ holeStatus2("2","楠屾敹涓嶉�氳繃"),
+ holeStatus3("3","搴熷瓟");
+
+
+ private String id ;
+ private String name ;
+
+ RecordType(String id, String name) {
+ this.id = id;
+ this.name = name;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * 鏍规嵁id鑾峰彇name
+ */
+ public static String getValueByKey(String id) {
+ RecordType[] recordTypes = values();
+ for (RecordType item: recordTypes) {
+ if (item.getId().equals(id)) {
+ return item.getName();
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 鏍规嵁name鑾峰彇id
+ */
+ public static String getKeyByName(String name) {
+ RecordType[] recordTypes = values();
+ for (RecordType item: recordTypes) {
+ if (item.getName().equals(name)) {
+ return item.getId();
+ }
+ }
+ return null;
+ }
+
+ public static void main(String[] args) {
+ String valueByKey = RecordType.getKeyByName("姘存枃-姘存枃娴嬩簳");
+ System.out.println(valueByKey);
+
+ }
+
+}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IDeviceLogService.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IDeviceLogService.java
index 1d28b72..1f32791 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IDeviceLogService.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IDeviceLogService.java
@@ -1,6 +1,8 @@
package com.javaweb.geo.service;
import com.javaweb.geo.domain.DeviceLog;
+import org.springframework.web.multipart.MultipartFile;
+
import java.util.List;
/**
@@ -58,4 +60,9 @@
* @return 缁撴灉
*/
public int deleteDeviceLogById(String id);
+
+ /**
+ * 瀵煎叆璁惧鍑哄叆搴撹褰�
+ */
+ String importDeviceLog(String projectId, MultipartFile file, boolean updateSupport);
}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java
index ee49ede..f958545 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java
@@ -1,9 +1,18 @@
package com.javaweb.geo.service.impl;
+import java.io.File;
import java.util.List;
+import cn.hutool.poi.excel.ExcelReader;
+import cn.hutool.poi.excel.ExcelUtil;
+import com.javaweb.common.config.Global;
import com.javaweb.common.utils.DateUtils;
import com.javaweb.common.utils.IdGenerate;
+import com.javaweb.geo.domain.Device;
+import com.javaweb.geo.domain.Project;
+import com.javaweb.geo.enums.RecordType;
+import com.javaweb.geo.service.IDeviceService;
+import com.javaweb.geo.service.IProjectService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.javaweb.geo.mapper.DeviceLogMapper;
@@ -11,6 +20,7 @@
import com.javaweb.geo.service.IDeviceLogService;
import com.javaweb.common.core.text.Convert;
import org.springframework.util.ObjectUtils;
+import org.springframework.web.multipart.MultipartFile;
import tk.mybatis.mapper.genid.GenIdUtil;
/**
@@ -21,8 +31,17 @@
*/
@Service
public class DeviceLogServiceImpl implements IDeviceLogService {
+
@Autowired
private DeviceLogMapper deviceLogMapper;
+
+ @Autowired
+ private IProjectService projectService;
+
+ @Autowired
+ private IDeviceService deviceService;
+
+ private String fileSaveDir = Global.getProfile() + "\\template\\" ;
/**
* 鏌ヨ璁惧鍑哄叆搴撹褰�
@@ -57,7 +76,7 @@
if(ObjectUtils.isEmpty(deviceLog.getId())){
deviceLog.setId(IdGenerate.nextId());
}
- deviceLog.setCreateTime(DateUtils.getNowDate());
+ deviceLog.setCreateDate(DateUtils.getNowDate());
return deviceLogMapper.insertDeviceLog(deviceLog);
}
@@ -93,4 +112,79 @@
public int deleteDeviceLogById(String id) {
return deviceLogMapper.deleteDeviceLogById(id);
}
+
+
+ /**
+ * 瀵煎叆璁惧鍑哄叆搴撹褰�
+ */
+ @Override
+ public String importDeviceLog(String projectId,MultipartFile file, boolean updateSupport) {
+ // 鍏宠仈椤圭洰淇℃伅
+ Project project = projectService.selectProjectById(projectId);
+
+ try {
+ String dest = saveExcel(file);
+ List<DeviceLog> list = readData(dest);
+ for (DeviceLog item : list) {
+ // 杞崲椤圭洰淇℃伅
+ item.setProjectId(projectId);
+ item.setProjectName(project.getFullName());
+
+ // 杞崲鍑哄叆搴撶被鍨�
+ String proTypeCode = RecordType.getKeyByName(item.getType());
+ item.setType(proTypeCode);
+
+ // 杞崲璁惧缂栫爜
+ String deviceCode = item.getDeviceCode();
+ if (!ObjectUtils.isEmpty(deviceCode)){
+ Device param = new Device();
+ param.setCode(deviceCode);
+ List<Device> devices = deviceService.selectDeviceList(param);
+ if (!ObjectUtils.isEmpty(devices)){
+ Device device = devices.get(0);
+ item.setDeviceId(device.getId());
+ item.setDeviceCode(device.getCode());
+ item.setDeviceName(device.getName());
+ }
+ }
+
+ item.setCreateDate(DateUtils.getNowDate());
+ insertDeviceLog(item);
+ }
+ } catch (Exception e) {
+ return e.toString();
+ }
+ return "瀵煎叆瀹屾瘯" ;
+ }
+
+ private String saveExcel(MultipartFile file) {
+ String filename = file.getOriginalFilename();
+ File dir = new File(fileSaveDir);
+ if (!dir.exists()) {
+ dir.mkdir();
+ }
+ String addr = fileSaveDir + filename;
+ try {
+ File dest = new File(addr);
+ file.transferTo(dest);
+ } catch (Exception e) {
+ return null;
+ }
+ return addr;
+ }
+
+ private List<DeviceLog> readData(String filepath) {
+ ExcelReader reader = ExcelUtil.getReader(filepath, 0);
+ reader.addHeaderAlias("鍑哄叆搴撳崟瀛愬彿", "code");
+ reader.addHeaderAlias("璁惧缂栫爜", "deviceCode");
+ reader.addHeaderAlias("鍑哄叆搴撶被鍨�", "type");
+ reader.addHeaderAlias("鍑哄叆搴撴椂闂�", "transactionDate");
+ reader.addHeaderAlias("缁忓姙浜�", "optUser");
+ reader.addHeaderAlias("浣跨敤浜�", "applyUser");
+ reader.addHeaderAlias("鍑哄叆搴撴暟閲�", "number");
+ reader.addHeaderAlias("澶囨敞", "remark");
+
+ List<DeviceLog> list = reader.readAll(DeviceLog.class);
+ return list;
+ }
}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HoleServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HoleServiceImpl.java
index 1faa0fa..ba7f4c6 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HoleServiceImpl.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HoleServiceImpl.java
@@ -3,6 +3,7 @@
import java.util.List;
import com.javaweb.common.utils.DateUtils;
+import com.javaweb.common.utils.IdGenerate;
import com.javaweb.geo.domain.*;
import com.javaweb.geo.mapper.*;
import com.javaweb.geo.service.*;
@@ -13,7 +14,7 @@
/**
* 閽诲瓟Service涓氬姟灞傚鐞�
- *
+ *
* @author zmk
* @date 2022-10-20
*/
@@ -43,57 +44,56 @@
/**
* 鏌ヨ閽诲瓟
- *
+ *
* @param ids 閽诲瓟ID
* @return 閽诲瓟
*/
@Override
- public Hole selectHoleById(String ids)
- {
+ public Hole selectHoleById(String ids) {
return holeMapper.selectHoleById(ids);
}
/**
* 鏌ヨ閽诲瓟鍒楄〃
- *
+ *
* @param hole 閽诲瓟
* @return 閽诲瓟
*/
@Override
- public List<Hole> selectHoleList(Hole hole)
- {
+ public List<Hole> selectHoleList(Hole hole) {
return holeMapper.selectHoleList(hole);
}
/**
* 鏂板閽诲瓟
- *
+ *
* @param hole 閽诲瓟
* @return 缁撴灉
*/
@Override
- public int insertHole(Hole hole)
- {
+ public int insertHole(Hole hole) {
+ if(ObjectUtils.isEmpty(hole.getIds())){
+ hole.setIds(IdGenerate.nextId());
+ }
hole.setCreateTime(DateUtils.getNowDate());
return holeMapper.insertHole(hole);
}
/**
* 淇敼閽诲瓟
- *
+ *
* @param hole 閽诲瓟
* @return 缁撴灉
*/
@Override
- public int updateHole(Hole hole)
- {
+ public int updateHole(Hole hole) {
hole.setUpdateTime(DateUtils.getNowDate());
return holeMapper.updateHole(hole);
}
/**
* 鍒犻櫎閽诲瓟瀵硅薄
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
* @return 缁撴灉
*/
@@ -102,7 +102,7 @@
// 鎵归噺鍒犻櫎閽诲瓟涓嬮潰鐨勫叧鑱旀暟鎹�
String[] strings = Convert.toStrArray(ids);
- if (!ObjectUtils.isEmpty(strings)){
+ if (!ObjectUtils.isEmpty(strings)) {
for (String holeId : strings) {
// =======鏍囪疮==========
@@ -143,13 +143,12 @@
/**
* 鍒犻櫎閽诲瓟淇℃伅
- *
+ *
* @param ids 閽诲瓟ID
* @return 缁撴灉
*/
@Override
- public int deleteHoleById(String ids)
- {
+ public int deleteHoleById(String ids) {
return holeMapper.deleteHoleById(ids);
}
}
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml
index 4313582..fc033af 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml
+++ b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml
@@ -10,6 +10,7 @@
<result property="projectId" column="project_id" />
<result property="projectName" column="project_name" />
<result property="deviceId" column="device_id" />
+ <result property="deviceCode" column="device_code" />
<result property="deviceName" column="device_name" />
<result property="type" column="type" />
<result property="transactionDate" column="transaction_date" />
@@ -21,21 +22,23 @@
</resultMap>
<sql id="selectDeviceLogVo">
- select id, code, project_id, project_name, device_id, device_name, type, transaction_date, opt_user, apply_user, number, create_date, remark from js_device_log
+ select id, code, project_id, project_name, device_id, device_code, device_name, type, transaction_date, opt_user, apply_user, number, create_date, remark from js_device_log
</sql>
<select id="selectDeviceLogList" parameterType="DeviceLog" resultMap="DeviceLogResult">
<include refid="selectDeviceLogVo"/>
<where>
- <if test="projectId != null and projectId != ''"> and project_id = #{projectId}</if>
- <if test="deviceId != null and deviceId != ''"> and device_id = #{deviceId}</if>
<if test="code != null and code != ''"> and code = #{code}</if>
+ <if test="projectId != null and projectId != ''"> and project_id = #{projectId}</if>
<if test="projectName != null and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
+ <if test="deviceId != null and deviceId != ''"> and device_id = #{deviceId}</if>
+ <if test="deviceCode != null and deviceCode != ''"> and device_code = #{deviceCode}</if>
<if test="deviceName != null and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="optUser != null and optUser != ''"> and opt_user = #{optUser}</if>
<if test="applyUser != null and applyUser != ''"> and apply_user = #{applyUser}</if>
</where>
+ ORDER BY create_date
</select>
<select id="selectDeviceLogById" parameterType="String" resultMap="DeviceLogResult">
@@ -51,6 +54,7 @@
<if test="projectId != null and projectId != ''">project_id,</if>
<if test="projectName != null and projectName != ''">project_name,</if>
<if test="deviceId != null and deviceId != ''">device_id,</if>
+ <if test="deviceCode != null and deviceCode != ''">device_code,</if>
<if test="deviceName != null and deviceName != ''">device_name,</if>
<if test="type != null and type != ''">type,</if>
<if test="transactionDate != null and transactionDate != ''">transaction_date,</if>
@@ -66,6 +70,7 @@
<if test="projectId != null and projectId != ''">#{projectId},</if>
<if test="projectName != null and projectName != ''">#{projectName},</if>
<if test="deviceId != null and deviceId != ''">#{deviceId},</if>
+ <if test="deviceCode != null and deviceCode != ''">#{deviceCode},</if>
<if test="deviceName != null and deviceName != ''">#{deviceName},</if>
<if test="type != null and type != ''">#{type},</if>
<if test="transactionDate != null and transactionDate != ''">#{transactionDate},</if>
@@ -84,6 +89,7 @@
<if test="projectId != null and projectId != ''">project_id = #{projectId},</if>
<if test="projectName != null and projectName != ''">project_name = #{projectName},</if>
<if test="deviceId != null and deviceId != ''">device_id = #{deviceId},</if>
+ <if test="deviceCode != null and deviceCode != ''">device_code = #{deviceCode},</if>
<if test="deviceName != null and deviceName != ''">device_name = #{deviceName},</if>
<if test="type != null and type != ''">type = #{type},</if>
<if test="transactionDate != null and transactionDate != ''">transaction_date = #{transactionDate},</if>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/device/device.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/device/device.html
index 2dd10eb..ce939cd 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/device/device.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/device/device.html
@@ -54,9 +54,9 @@
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="geo:device:remove">
<i class="fa fa-remove"></i> 鍒犻櫎
</a>
- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:device:export">
- <i class="fa fa-download"></i> 瀵煎嚭
- </a>
+<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:device:export">-->
+<!-- <i class="fa fa-download"></i> 瀵煎嚭-->
+<!-- </a>-->
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/add.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/add.html
index 3e47423..6a96c70 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/add.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/add.html
@@ -18,6 +18,12 @@
<input name="projectName" class="form-control" type="text">
</div>
</div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">璁惧缂栧彿锛�</label>
+ <div class="col-sm-8">
+ <input name="deviceCode" class="form-control" type="text">
+ </div>
+ </div>
<div class="form-group">
<label class="col-sm-3 control-label">璁惧鍚嶇О锛�</label>
<div class="col-sm-8">
@@ -61,13 +67,17 @@
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "geo/deviceLog"
+ var projectId = [[${projectId}]];
+
$("#form-deviceLog-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
- $.operate.save(prefix + "/add", $('#form-deviceLog-add').serialize());
+ let formData = $('#form-deviceLog-add').serialize();
+ let data = formData + "&projectId=" + projectId;
+ $.operate.save(prefix + "/add", data);
}
}
</script>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html
index 12b106c..8f51043 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html
@@ -56,9 +56,12 @@
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="geo:deviceLog:remove">
<i class="fa fa-remove"></i> 鍒犻櫎
</a>
- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:deviceLog:export">
- <i class="fa fa-download"></i> 瀵煎嚭
- </a>
+<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:deviceLog:export">-->
+<!-- <i class="fa fa-download"></i> 瀵煎嚭-->
+<!-- </a>-->
+ <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="geo:deviceLog:import">
+ <i class="fa fa-upload"></i> 瀵煎叆
+ </a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
@@ -76,56 +79,61 @@
$(function() {
var options = {
url: prefix + "/list?projectId="+projectId,
- createUrl: prefix + "/add",
+ createUrl: prefix + "/add?projectId="+projectId,
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
+ importUrl: prefix + "/importDeviceLog/"+projectId,
modalName: "璁惧鍑哄叆搴撹褰�",
columns: [{
checkbox: true
},
{
- field : 'id',
+ field : 'id',
title : '涓婚敭',
visible: false
},
{
- field : 'code',
+ field : 'code',
title : '鍑哄叆搴撳崟瀛愬彿'
},
{
- field : 'projectName',
+ field : 'projectName',
title : '椤圭洰鍚嶇О'
},
+ {
+ field : 'deviceCode',
+ title : '璁惧缂栫爜'
+ },
{
- field : 'deviceName',
+ field : 'deviceName',
title : '璁惧鍚嶇О'
},
{
- field : 'type',
+ field : 'type',
title : '鍑哄叆搴撶被鍨�',
formatter: function(value, row, index) {
return $.table.selectDictLabel(typeDatas, value);
}
},
{
- field : 'transactionDate',
+ field : 'transactionDate',
title : '鍑哄叆搴撴椂闂�'
},
{
- field : 'optUser',
+ field : 'optUser',
title : '缁忓姙浜�'
},
{
- field : 'applyUser',
+ field : 'applyUser',
title : '浣跨敤浜�'
},
{
- field : 'number',
+ field : 'number',
title : '鍑哄叆搴撴暟閲�'
},
{
- field : 'remark',
+ field : 'remark',
title : '澶囨敞'
},
{
@@ -141,6 +149,29 @@
};
$.table.init(options);
});
+
+ //涓嬭浇
+ function importTemplate() {
+ var filename="璁惧鍑哄叆搴撹褰曟ā鏉�.xls";
+ window.location.href = ctx + "common/download?fileName=" + encodeURI(filename) + "&delete=" + false;
+ }
</script>
</body>
+
+<!-- 瀵煎叆鍖哄煙 -->
+<script id="importTpl" type="text/template">
+ <form enctype="multipart/form-data" class="mt20 mb10">
+ <div class="col-xs-offset-1">
+ <input type="file" id="file" name="file"/>
+ <div class="mt10 pt5">
+ <input type="checkbox" id="updateSupport" name="updateSupport" title="瀵煎叆璁惧鍑哄叆搴撲俊鎭俊鎭�"> 鏄惁鏇存柊宸茬粡瀛樺湪鐨勬暟鎹�
+ <a onclick="importTemplate()" class="btn btn-default btn-xs"><i class="fa fa-file-excel-o"></i> 涓嬭浇妯℃澘</a>
+ </div>
+ <font color="red" class="pull-left mt10">
+ 鎻愮ず锛氫粎鍏佽瀵煎叆鈥渪ls鈥濇垨鈥渪lsx鈥濇牸寮忔枃浠讹紒
+ </font>
+ </div>
+ </form>
+</script>
+
</html>
\ No newline at end of file
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/edit.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/edit.html
index 0dc7b9c..f789000 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/edit.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/edit.html
@@ -19,6 +19,12 @@
<input name="projectName" th:field="*{projectName}" class="form-control" type="text">
</div>
</div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">璁惧缂栧彿锛�</label>
+ <div class="col-sm-8">
+ <input name="deviceCode" th:field="*{deviceCode}" class="form-control" type="text">
+ </div>
+ </div>
<div class="form-group">
<label class="col-sm-3 control-label">璁惧鍚嶇О锛�</label>
<div class="col-sm-8">
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/add.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/add.html
index 3a99683..1bbcaeb 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/add.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/add.html
@@ -7,34 +7,13 @@
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-hole-add">
- <div class="form-group">
- <label class="col-sm-3 control-label">椤圭洰搴忓垪鍙凤細</label>
- <div class="col-sm-8">
- <input name="projectId" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鍕樻帰鐐圭紪鍙凤細</label>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">閽诲瓟缂栧彿锛�</label>
<div class="col-sm-8">
<input name="code" class="form-control" type="text">
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鎻忚堪銆佹妧鏈姹傦細</label>
- <div class="col-sm-8">
- <input name="description" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鍕樻帰鐐圭被鍨嬶細</label>
- <div class="col-sm-8">
- <select name="type" class="form-control m-b">
- <option value="">鎵�鏈�</option>
- </select>
- <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 浠ｇ爜鐢熸垚璇烽�夋嫨瀛楀吀灞炴��</span>
- </div>
- </div>
- <div class="form-group">
+ <div class="form-group">
<label class="col-sm-3 control-label">瀛斿彛楂樼▼锛�</label>
<div class="col-sm-8">
<input name="elevation" class="form-control" type="text">
@@ -47,136 +26,41 @@
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">鍕樻帰鐐圭粡搴︼細</label>
+ <label class="col-sm-3 control-label">閽诲瓟缁忓害锛�</label>
<div class="col-sm-8">
<input name="longitude" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">鍕樻帰鐐圭含搴︼細</label>
+ <label class="col-sm-3 control-label">閽诲瓟绾害锛�</label>
<div class="col-sm-8">
<input name="latitude" class="form-control" type="text">
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鐩稿鍧愭爣X锛�</label>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">杩涘害锛�</label>
<div class="col-sm-8">
- <input name="surveyX" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鐩稿鍧愭爣Y锛�</label>
- <div class="col-sm-8">
- <input name="surveyY" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鐩稿鍧愭爣Z锛�</label>
- <div class="col-sm-8">
- <input name="surveyZ" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">娴嬮噺鍧愭爣绾害锛�</label>
- <div class="col-sm-8">
- <input name="surveyLatitude" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">娴嬮噺鍧愭爣缁忓害锛�</label>
- <div class="col-sm-8">
- <input name="surveyLongitude" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">閽诲瓟瀹氫綅绾害锛�</label>
- <div class="col-sm-8">
- <input name="mapLatitude" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">閽诲瓟瀹氫綅缁忓害锛�</label>
- <div class="col-sm-8">
- <input name="mapLongitude" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">閽诲瓟瀹氫綅鏃堕棿锛�</label>
- <div class="col-sm-8">
- <div class="input-group date">
- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
- <input name="mapTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
- </div>
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鏃犳硶瀹氫綅鐨勫湴鐐癸細</label>
- <div class="col-sm-8">
- <input name="position" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鏃犳硶瀹氫綅鐨勬椂闂达細</label>
- <div class="col-sm-8">
- <div class="input-group date">
- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
- <input name="locateTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
- </div>
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鏃犳硶瀹氫綅鐨勫師鍥狅細</label>
- <div class="col-sm-8">
- <input name="reason" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鐜板満鎷嶇収1锛�</label>
- <div class="col-sm-8">
- <input name="pic1" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鐜板満鎷嶇収2锛�</label>
- <div class="col-sm-8">
- <input name="pic2" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鐜板満鎷嶇収3锛�</label>
- <div class="col-sm-8">
- <input name="pic3" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">閽诲瓟鐘舵�侊細</label>
- <div class="col-sm-8">
- <div class="radio-box">
- <input type="radio" name="status" value="">
- <label th:for="status" th:text="鏈煡"></label>
- </div>
- <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 浠ｇ爜鐢熸垚璇烽�夋嫨瀛楀吀灞炴��</span>
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鏄惁鍒犻櫎锛�</label>
- <div class="col-sm-8">
- <input name="isDeleted" class="form-control" type="text">
+ <input name="pic1" class="form-control" type="text" placeholder="璇疯緭鍏ヨ繘搴︽暟瀛楋紙渚嬶細10浠ｈ〃10%锛�">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
- <script type="text/javascript">
+
+ <script th:inline="javascript">
var prefix = ctx + "geo/hole"
+ var projectId = [[${projectId}]];
+
$("#form-hole-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
- $.operate.save(prefix + "/add", $('#form-hole-add').serialize());
+ let formData = $('#form-hole-add').serialize();
+ let data = formData + "&projectId=" + projectId;
+ $.operate.save(prefix + "/add", data);
}
}
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/edit.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/edit.html
index efa69dd..ecdff4f 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/edit.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/edit.html
@@ -9,146 +9,48 @@
<form class="form-horizontal m" id="form-hole-edit" th:object="${hole}">
<input name="ids" th:field="*{ids}" type="hidden">
<div class="form-group">
- <label class="col-sm-3 control-label">鍕樻帰鐐圭紪鍙凤細</label>
+ <label class="col-sm-3 control-label">閽诲瓟缂栧彿锛�</label>
<div class="col-sm-8">
<input name="code" th:field="*{code}" class="form-control" type="text" disabled="disabled">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">鎻忚堪銆佹妧鏈姹傦細</label>
- <div class="col-sm-8">
- <input name="description" th:field="*{description}" class="form-control" type="text" disabled="disabled">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鍕樻帰鐐圭被鍨嬶細</label>
- <div class="col-sm-8">
- <select name="type" class="form-control m-b" th:with="type=${@dict.getType('hole_type')}" disabled="disabled">
- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{type}"></option>
- </select>
- </div>
- </div>
- <div class="form-group">
<label class="col-sm-3 control-label">瀛斿彛楂樼▼锛�</label>
<div class="col-sm-8">
- <input name="elevation" th:field="*{elevation}" class="form-control" type="text" disabled="disabled" >
+ <input name="elevation" th:field="*{elevation}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">璁捐瀛旀繁锛�</label>
<div class="col-sm-8">
- <input name="depth" th:field="*{depth}" class="form-control" type="text" disabled="disabled">
+ <input name="depth" th:field="*{depth}" class="form-control" type="text" >
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">鍕樻帰鐐圭粡搴︼細</label>
+ <label class="col-sm-3 control-label">閽诲瓟缁忓害锛�</label>
<div class="col-sm-8">
- <input name="longitude" th:field="*{longitude}" class="form-control" type="text" disabled="disabled">
+ <input name="longitude" th:field="*{longitude}" class="form-control" type="text" >
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">鍕樻帰鐐圭含搴︼細</label>
+ <label class="col-sm-3 control-label">閽诲瓟绾害锛�</label>
<div class="col-sm-8">
- <input name="latitude" th:field="*{latitude}" class="form-control" type="text" disabled="disabled">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鐩稿鍧愭爣X锛�</label>
- <div class="col-sm-8">
- <input name="surveyX" th:field="*{surveyX}" class="form-control" type="text" disabled="disabled">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鐩稿鍧愭爣Y锛�</label>
- <div class="col-sm-8">
- <input name="surveyY" th:field="*{surveyY}" class="form-control" type="text" disabled="disabled">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鐩稿鍧愭爣Z锛�</label>
- <div class="col-sm-8">
- <input name="surveyZ" th:field="*{surveyZ}" class="form-control" type="text" disabled="disabled">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">娴嬮噺鍧愭爣绾害锛�</label>
- <div class="col-sm-8">
- <input name="surveyLatitude" th:field="*{surveyLatitude}" class="form-control" type="text" disabled="disabled">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">娴嬮噺鍧愭爣缁忓害锛�</label>
- <div class="col-sm-8">
- <input name="surveyLongitude" th:field="*{surveyLongitude}" class="form-control" type="text" disabled="disabled" >
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">閽诲瓟瀹氫綅绾害锛�</label>
- <div class="col-sm-8">
- <input name="mapLatitude" th:field="*{mapLatitude}" class="form-control" type="text" disabled="disabled">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">閽诲瓟瀹氫綅缁忓害锛�</label>
- <div class="col-sm-8">
- <input name="mapLongitude" th:field="*{mapLongitude}" class="form-control" type="text" disabled="disabled">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">閽诲瓟瀹氫綅鏃堕棿锛�</label>
- <div class="col-sm-8">
- <div class="input-group date">
-<!-- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
- <input name="mapTime" th:value="${#dates.format(hole.mapTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" disabled="disabled">
- </div>
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鏃犳硶瀹氫綅鐨勫湴鐐癸細</label>
- <div class="col-sm-8">
- <input name="position" th:field="*{position}" class="form-control" type="text" disabled="disabled">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鏃犳硶瀹氫綅鐨勬椂闂达細</label>
- <div class="col-sm-8">
- <div class="input-group date">
- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
- <input name="locateTime" th:value="${#dates.format(hole.locateTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" disabled="disabled">
- </div>
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鏃犳硶瀹氫綅鐨勫師鍥狅細</label>
- <div class="col-sm-8">
- <input name="reason" th:field="*{reason}" class="form-control" type="text" disabled="disabled">
+ <input name="latitude" th:field="*{latitude}" class="form-control" type="text" >
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">閽诲瓟鐘舵�侊細</label>
<div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('hole_status')}">
- <input type="radio" th:id="${'status_' + dict.dictCode}" name="status" th:value="${dict.dictValue}" th:field="*{status}" disabled="disabled">
+ <input type="radio" th:id="${'status_' + dict.dictCode}" name="status" th:value="${dict.dictValue}" th:field="*{status}" >
<label th:for="${'status_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">鐜板満鎷嶇収1锛�</label>
+ <label class="col-sm-3 control-label">杩涘害锛�</label>
<div class="col-sm-8">
- <img border="0" th:src="*{pic1}" />
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鐜板満鎷嶇収2锛�</label>
- <div class="col-sm-8">
- <img border="0" th:src="*{pic2}" />
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鐜板満鎷嶇収3锛�</label>
- <div class="col-sm-8">
- <img border="0" th:src="*{pic3}" />
+ <input name="pic1" th:field="*{pic1}" class="form-control" type="text" placeholder="璇疯緭鍏ヨ繘搴︽暟瀛楋紙渚嬶細10浠ｈ〃10%锛�">
</div>
</div>
</form>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html
index c1b5faa..d8f0e22 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html
@@ -16,14 +16,7 @@
<div class="select-list">
<ul>
<li>
- <p>鍕樻帰鐐圭被鍨嬶細</p>
- <select name="type" th:with="type=${@dict.getType('hole_type')}">
- <option value="">鎵�鏈�</option>
- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
- </select>
- </li>
- <li>
- <p>鍕樻帰鐐圭紪鍙凤細</p>
+ <p>閽诲瓟缂栧彿锛�</p>
<input type="text" name="code"/>
</li>
<li>
@@ -43,6 +36,12 @@
</div>
<div class="btn-group-sm" id="toolbar" role="group">
+ <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="geo:hole:add">
+ <i class="fa fa-plus"></i> 娣诲姞
+ </a>
+ <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="geo:hole:edit">
+ <i class="fa fa-edit"></i> 淇敼
+ </a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="geo:hole:remove">
<i class="fa fa-remove"></i> 鍒犻櫎
</a>
@@ -60,10 +59,11 @@
var statusDatas = [[${@dict.getType('hole_status')}]];
var prefix = ctx + "geo/hole";
var projectId=[[${projectId}]];
+
$(function() {
var options = {
url: prefix + "/list?projectId="+projectId,
- createUrl: prefix + "/add",
+ createUrl: prefix + "/add?projectId="+projectId,
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
@@ -78,19 +78,7 @@
},
{
field : 'code',
- title : '鍕樻帰鐐圭紪鍙�'
- },
- {
- field : 'description',
- title : '鎻忚堪銆佹妧鏈姹�',
- visible: false
- },
- {
- field : 'type',
- title : '鍕樻帰鐐圭被鍨�',
- formatter: function(value, row, index) {
- return $.table.selectDictLabel(typeDatas, value);
- }
+ title : '閽诲瓟缂栧彿'
},
{
field : 'elevation',
@@ -102,65 +90,12 @@
},
{
field : 'longitude',
- title : '鍕樻帰鐐圭粡搴�',
+ title : '閽诲瓟缁忓害',
visible: false
},
{
field : 'latitude',
- title : '鍕樻帰鐐圭含搴�',
- visible: false
- },
- {
- field : 'surveyX',
- title : '鐩稿鍧愭爣X',
- visible: false
- },
- {
- field : 'surveyY',
- title : '鐩稿鍧愭爣Y',
- visible: false
- },
- {
- field : 'surveyZ',
- title : '鐩稿鍧愭爣Z',
- visible: false
- },
- {
- field : 'surveyLatitude',
- title : '娴嬮噺鍧愭爣绾害',
- visible: false
- },
- {
- field : 'surveyLongitude',
- title : '娴嬮噺鍧愭爣缁忓害',
- visible: false
- },
- {
- field : 'mapLatitude',
- title : '閽诲瓟瀹氫綅绾害'
- },
- {
- field : 'mapLongitude',
- title : '閽诲瓟瀹氫綅缁忓害'
- },
- {
- field : 'mapTime',
- title : '閽诲瓟瀹氫綅鏃堕棿',
- visible: false
- },
- {
- field : 'position',
- title : '鏃犳硶瀹氫綅鐨勫湴鐐�',
- visible: false
- },
- {
- field : 'locateTime',
- title : '鏃犳硶瀹氫綅鐨勬椂闂�',
- visible: false
- },
- {
- field : 'reason',
- title : '鏃犳硶瀹氫綅鐨勫師鍥�',
+ title : '閽诲瓟绾害',
visible: false
},
{
@@ -170,12 +105,16 @@
return $.table.selectDictLabel(statusDatas, value);
}
},
+ {
+ field : 'pic1',
+ title : '杩涘害',
+ },
{
title: '鎿嶄綔',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
- actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.ids + '\')"><i class="fa fa-edit"></i>璇︽儏</a> ');
+ actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.ids + '\')"><i class="fa fa-edit"></i>淇敼</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.ids + '\')"><i class="fa fa-remove"></i>鍒犻櫎</a>');
return actions.join('');
}
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/add.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/add.html
index 40d1431..df294da 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/add.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/add.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
- <th:block th:include="include :: header('鏂板椤圭洰')" />
+ <th:block th:include="include :: header('鏂板鍦哄湴')" />
<th:block th:include="include :: select2-css" />
<th:block th:include="include :: datetimepicker-css" />
</head>
@@ -9,14 +9,14 @@
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-project-add">
<div class="form-group">
- <label class="col-sm-3 control-label">椤圭洰缂栧彿锛�</label>
+ <label class="col-sm-3 control-label">鍦哄湴缂栧彿锛�</label>
<div class="col-sm-8">
<input name="code" class="form-control" required type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">椤圭洰鍚嶇О锛�</label>
+ <label class="col-sm-3 control-label">鍦哄湴鍚嶇О锛�</label>
<div class="col-sm-8">
<input name="fullName" class="form-control" required type="text">
</div>
@@ -46,7 +46,7 @@
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">椤圭洰璐熻矗浜猴細</label>
+ <label class="col-sm-3 control-label">鍦哄湴璐熻矗浜猴細</label>
<div class="col-sm-8">
<input name="leader" class="form-control" type="text">
</div>
@@ -67,14 +67,14 @@
<div class="form-group">
<label class="col-sm-3 control-label">寮�濮嬫椂闂达細</label>
<div class="col-sm-8">
- <input name="startTime" type="text" class="form-control" id="start-time" placeholder="閫夋嫨椤圭洰璧峰鏃堕棿">
+ <input name="startTime" type="text" class="form-control" id="start-time" placeholder="閫夋嫨鍦哄湴璧峰鏃堕棿">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">缁撴潫鏃堕棿锛�</label>
<div class="col-sm-8">
- <input name="endTime" type="text" class="form-control" id="end-time" placeholder="閫夋嫨椤圭洰缁撴潫鏃堕棿">
+ <input name="endTime" type="text" class="form-control" id="end-time" placeholder="閫夋嫨鍦哄湴缁撴潫鏃堕棿">
</div>
</div>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/edit.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/edit.html
index ba3a6f5..ef256ce 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/edit.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/edit.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
- <th:block th:include="include :: header('淇敼椤圭洰')" />
+ <th:block th:include="include :: header('淇敼鍦哄湴')" />
<th:block th:include="include :: select2-css" />
<th:block th:include="include :: datetimepicker-css" />
</head>
@@ -10,13 +10,13 @@
<form class="form-horizontal m" id="form-project-edit" th:object="${project}">
<input name="ids" th:field="*{ids}" type="hidden">
<div class="form-group">
- <label class="col-sm-3 control-label">椤圭洰缂栧彿锛�</label>
+ <label class="col-sm-3 control-label">鍦哄湴缂栧彿锛�</label>
<div class="col-sm-8">
<input name="code" th:field="*{code}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">椤圭洰鍚嶇О锛�</label>
+ <label class="col-sm-3 control-label">鍦哄湴鍚嶇О锛�</label>
<div class="col-sm-8">
<input name="fullName" th:field="*{fullName}" class="form-control" type="text">
</div>
@@ -42,7 +42,7 @@
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">椤圭洰璐熻矗浜猴細</label>
+ <label class="col-sm-3 control-label">鍦哄湴璐熻矗浜猴細</label>
<div class="col-sm-8">
<input name="leader" th:field="*{leader}" class="form-control" type="text">
</div>
@@ -64,14 +64,14 @@
<div class="form-group">
<label class="col-sm-3 control-label">寮�濮嬫椂闂达細</label>
<div class="col-sm-8">
- <input name="startTime" th:field="*{startTime}" type="text" class="form-control" id="start-time" placeholder="閫夋嫨椤圭洰璧峰鏃堕棿">
+ <input name="startTime" th:field="*{startTime}" type="text" class="form-control" id="start-time" placeholder="閫夋嫨鍦哄湴璧峰鏃堕棿">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">缁撴潫鏃堕棿锛�</label>
<div class="col-sm-8">
- <input name="endTime" th:field="*{endTime}" type="text" class="form-control" id="end-time" placeholder="閫夋嫨椤圭洰缁撴潫鏃堕棿">
+ <input name="endTime" th:field="*{endTime}" type="text" class="form-control" id="end-time" placeholder="閫夋嫨鍦哄湴缁撴潫鏃堕棿">
</div>
</div>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html
index b07c8c4..23dd7ae 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html
@@ -21,13 +21,13 @@
<div class="box-header active">
<div class="box-title">
- <i class="fa fa-desktop"></i> <a class="afont" th:href="@{/geo/project/info(id=${project.ids})}" target="mainFrame" onclick="selected(this)">椤圭洰璇︽儏</a>
+ <i class="fa fa-desktop"></i> <a class="afont" th:href="@{/geo/project/info(id=${project.ids})}" target="mainFrame" onclick="selected(this)">鍦哄湴璇︽儏</a>
</div>
</div>
<div class="box-header ">
<div class="box-title">
- <i class="glyphicon glyphicon-map-marker"></i> <a class="afont" th:href="@{/geo/hole(id=${project.ids})}" target="mainFrame" onclick="selected(this)">鍕樻帰鐐�</a>
- </div>
+ <i class="glyphicon glyphicon-map-marker"></i> <a class="afont" th:href="@{/geo/hole(id=${project.ids})}" target="mainFrame" onclick="selected(this)">閽诲瓟</a>
+ </div>
</div>
<div class="box-header ">
<div class="box-title">
@@ -51,32 +51,12 @@
</div>
<div class="box-header ">
<div class="box-title">
- <i class="glyphicon glyphicon-th-list"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='3')}" target="mainFrame" onclick="selected(this)">娴嬩簳</a>
+ <i class="glyphicon glyphicon-th-list"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='3')}" target="mainFrame" onclick="selected(this)">鏂藉伐鐜板満绠＄悊</a>
</div>
</div>
<div class="box-header ">
<div class="box-title">
- <i class="glyphicon glyphicon-align-justify"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='4')}" target="mainFrame" onclick="selected(this)">鏂滄祴</a>
- </div>
- </div>
- <div class="box-header ">
- <div class="box-title">
- <i class="glyphicon glyphicon-home"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='5')}" target="mainFrame" onclick="selected(this)">瀹ゅ唴璇曢獙</a>
- </div>
- </div>
- <div class="box-header ">
- <div class="box-title">
- <i class="glyphicon glyphicon-object-align-left"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='6')}" target="mainFrame" onclick="selected(this)">宸ョ▼娴嬬粯</a>
- </div>
- </div>
- <div class="box-header ">
- <div class="box-title">
- <i class="glyphicon glyphicon-tint"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='7')}" target="mainFrame" onclick="selected(this)">姘磋川鍒嗘瀽</a>
- </div>
- </div>
- <div class="box-header ">
- <div class="box-title">
- <i class="glyphicon glyphicon-facetime-video"></i> <a class="afont" th:href="@{/geo/projectCamera(id=${project.ids},type='7')}" target="mainFrame" onclick="selected(this)">鐜板満鐩戞帶璁惧</a>
+ <i class="glyphicon glyphicon-facetime-video"></i> <a class="afont" th:href="@{/geo/projectCamera(id=${project.ids})}" target="mainFrame" onclick="selected(this)">鐜板満鐩戞帶璁惧</a>
</div>
</div>
</div>
@@ -86,8 +66,8 @@
<iframe id="mainFrame" name="mainFrame" class="ui-layout-content p0"
th:src="@{/geo/project/info(id=${project.ids})}"></iframe>
</div>
-
-
+
+
<th:block th:include="include :: footer" />
<th:block th:include="include :: layout-latest-js" />
<th:block th:include="include :: ztree-js" />
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html
index 27e3e93..81b12f8 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
- <th:block th:include="include :: header('椤圭洰鍒楄〃')" />
+ <th:block th:include="include :: header('鍦哄湴鍒楄〃')" />
</head>
<body class="gray-bg">
<div class="container-div">
@@ -12,11 +12,11 @@
<ul>
<li>
- <p>椤圭洰鍚嶇О锛�</p>
+ <p>鍦哄湴鍚嶇О锛�</p>
<input type="text" name="fullName"/>
</li>
<li>
- <p>椤圭洰缂栧彿锛�</p>
+ <p>鍦哄湴缂栧彿锛�</p>
<input type="text" name="code"/>
</li>
<li>
@@ -57,18 +57,18 @@
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
- modalName: "椤圭洰",
+ modalName: "鍦哄湴",
columns: [{
checkbox: true
},
{
field : 'code',
- title : '椤圭洰缂栧彿',
+ title : '鍦哄湴缂栧彿',
sortable:true
},
{
field : 'fullName',
- title : '椤圭洰鍚嶇О',
+ title : '鍦哄湴鍚嶇О',
formatter: function(value, row, index) {
return '<a onclick="navigate(\'' + row.ids + '\')">'+row.fullName+'</a>'
},
@@ -84,7 +84,7 @@
},
{
field : 'leaderName',
- title : '椤圭洰璐熻矗浜�'
+ title : '鍦哄湴璐熻矗浜�'
},
{
field : 'createTime',
@@ -92,7 +92,7 @@
},
{
field : 'status',
- title : '椤圭洰鐘舵��',
+ title : '鍦哄湴鐘舵��',
formatter: function(value, row, index) {
if(row.status =='0'){
return "鏈獙鏀�";
@@ -118,7 +118,7 @@
function navigate(id){
- $.modal.openTab("椤圭洰瀵艰埅",ctx+"/geo/project/navigate?ids="+id);
+ $.modal.openTab("鍦哄湴瀵艰埅",ctx+"/geo/project/navigate?ids="+id);
}
</script>
</body>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectCamera/projectCamera.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectCamera/projectCamera.html
index 51aa254..f899d22 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectCamera/projectCamera.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectCamera/projectCamera.html
@@ -11,24 +11,12 @@
<div class="select-list">
<ul>
<li>
- <p>椤圭洰id锛�</p>
- <input type="text" name="projectId"/>
- </li>
- <li>
<p>鍚嶇О锛�</p>
<input type="text" name="name"/>
</li>
<li>
<p>瑙嗛缂栧彿锛�</p>
<input type="text" name="code"/>
- </li>
- <li>
- <p>缁忓害锛�</p>
- <input type="text" name="lng"/>
- </li>
- <li>
- <p>绾害锛�</p>
- <input type="text" name="lat"/>
</li>
<li>
<p>Ip鍦板潃锛�</p>
@@ -53,9 +41,9 @@
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="geo:projectCamera:remove">
<i class="fa fa-remove"></i> 鍒犻櫎
</a>
- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:projectCamera:export">
- <i class="fa fa-download"></i> 瀵煎嚭
- </a>
+<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:projectCamera:export">-->
+<!-- <i class="fa fa-download"></i> 瀵煎嚭-->
+<!-- </a>-->
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData.html
index 176921d..ef289a1 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData.html
@@ -8,21 +8,16 @@
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
- <div class="select-list">
+
+ <!-- 鏉′欢琛ㄨ揪寮� -->
+ <div th:if="${type}=='3'" class="select-list">
<ul>
<li>
<p>璧勬枡鍚嶇О锛�</p>
<input type="text" name="name"/>
</li>
<li>
- <p>璧勬枡绫诲瀷锛�</p>
- <select name="dataType" th:with="type=${@dict.getType('project_data_type')}">
- <option value="">鎵�鏈�</option>
- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
- </select>
- </li>
- <li>
- <p>鏂囦欢绫诲瀷锛�</p>
+ <p>涓氬姟绫诲瀷锛�</p>
<select name="fileType" th:with="type=${@dict.getType('project_data_file_type')}">
<option value="">鎵�鏈�</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -38,6 +33,24 @@
</li>
</ul>
</div>
+ <!-- 鏉′欢琛ㄨ揪寮� -->
+ <div th:if="${type}!='3'" class="select-list">
+ <ul>
+ <li>
+ <p>璧勬枡鍚嶇О锛�</p>
+ <input type="text" name="name"/>
+ </li>
+ <li>
+ <p>鏍囩锛�</p>
+ <input type="text" name="labels"/>
+ </li>
+ <li>
+ <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 鎼滅储</a>
+ <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 閲嶇疆</a>
+ </li>
+ </ul>
+ </div>
+
</form>
</div>
@@ -51,9 +64,9 @@
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="geo:projectData:remove">
<i class="fa fa-remove"></i> 鍒犻櫎
</a>
- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:projectData:export">
- <i class="fa fa-download"></i> 瀵煎嚭
- </a>
+<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:projectData:export">-->
+<!-- <i class="fa fa-download"></i> 瀵煎嚭-->
+<!-- </a>-->
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
@@ -90,13 +103,6 @@
{
field : 'name',
title : '璧勬枡鍚嶇О'
- },
- {
- field : 'dataType',
- title : '璧勬枡绫诲瀷',
- formatter: function(value, row, index) {
- return $.table.selectDictLabel(dataTypeDatas, value);
- }
},
{
field : 'fileType',
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/projectPerson.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/projectPerson.html
index 8a22aee..f2c1bc0 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/projectPerson.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/projectPerson.html
@@ -44,9 +44,9 @@
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="geo:projectPerson:remove">
<i class="fa fa-remove"></i> 鍒犻櫎
</a>
- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:projectPerson:export">
- <i class="fa fa-download"></i> 瀵煎嚭
- </a>
+<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:projectPerson:export">-->
+<!-- <i class="fa fa-download"></i> 瀵煎嚭-->
+<!-- </a>-->
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
--
Gitblit v1.9.1