From 3db8bf552742aaa707b381c1ae2b38f9d830a021 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 18 八月 2023 16:54:00 +0800
Subject: [PATCH] 调整测虫的图片获取方法
---
igds-web/src/main/resources/static/admin/pest/pest-check.js | 29 +++++++++-----
igds-web/src/main/resources/static/images/i-body1.png | 0
igds-basic/src/main/java/com/ld/igds/gas/controller/GasController.java | 9 ++--
igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java | 1
igds-web/src/main/resources/gas-conf.properties | 9 ++--
igds-core/src/main/java/com/ld/igds/data/ConfigGasImg.java | 3 +
igds-manager/src/main/java/com/ld/igds/models/OAArchives.java | 1
igds-basic/src/main/java/com/ld/igds/pest/controller/PestController.java | 40 +++++---------------
igds-web/src/main/resources/verb-conf.properties | 18 ++++----
9 files changed, 50 insertions(+), 60 deletions(-)
diff --git a/igds-basic/src/main/java/com/ld/igds/gas/controller/GasController.java b/igds-basic/src/main/java/com/ld/igds/gas/controller/GasController.java
index 1b76e0b..6588137 100644
--- a/igds-basic/src/main/java/com/ld/igds/gas/controller/GasController.java
+++ b/igds-basic/src/main/java/com/ld/igds/gas/controller/GasController.java
@@ -48,10 +48,6 @@
@RequestParam(value = "deptId", required = false) String deptId) {
ModelAndView view = new ModelAndView();
- // 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
- List<Depot> listDepot = commonManager.listDepot(null);
- view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
-
IUser user = ContextUtil.getLoginUser();
view.addObject(Constant.MODEL_KEY_LOGIN_USER, user);
@@ -59,6 +55,11 @@
deptId = ContextUtil.subDeptId(user);
}
+ // 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
+ List<Depot> listDepot = commonManager.listDepot(deptId);
+ view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
+
+
view.addObject("bizType", BizType.GAS.getCode());
//鑾峰彇褰撳墠鐢ㄦ埛鎵�鍦ㄧ殑鍒嗗簱鍚嶇О
DefaultDept dept = commonManager.getSubDept(user, deptId);
diff --git a/igds-basic/src/main/java/com/ld/igds/pest/controller/PestController.java b/igds-basic/src/main/java/com/ld/igds/pest/controller/PestController.java
index 404544a..ce5f0f7 100644
--- a/igds-basic/src/main/java/com/ld/igds/pest/controller/PestController.java
+++ b/igds-basic/src/main/java/com/ld/igds/pest/controller/PestController.java
@@ -46,32 +46,6 @@
private PestManager pestManager;
@Autowired
private ConfigGasImg gasImg;
- /**
- * 涓存椂椤甸潰
- *
- * @param depotId
- * @return
- */
- @RequestMapping("/pest-temp")
- public ModelAndView newGas(
- @RequestParam(value = "depotId", required = false) String depotId) {
- ModelAndView view = new ModelAndView();
-
- // 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
- List<Depot> listDepot = commonManager.listDepot(null);
- view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
-
- IUser user = ContextUtil.getLoginUser();
- view.addObject(Constant.MODEL_KEY_LOGIN_USER, user);
-
- view.addObject("bizType", BizType.PEST.getCode());
-
- String deptId = ContextUtil.subDeptId(user);
- view.addObject("deptId", deptId);
-
- view.setViewName("admin/pest/temp");
- return view;
- }
/**
* 瀹為檯浣跨敤椤甸潰
@@ -85,13 +59,19 @@
@RequestParam(value = "deptId", required = false) String deptId) {
ModelAndView view = new ModelAndView();
- // 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
- List<Depot> listDepot = commonManager.listDepot(null);
- view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
-
IUser user = ContextUtil.getLoginUser();
view.addObject(Constant.MODEL_KEY_LOGIN_USER, user);
+
+ if (StringUtils.isEmpty(deptId)) {
+ deptId = ContextUtil.subDeptId(user);
+ }
+
+ // 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
+ List<Depot> listDepot = commonManager.listDepot(deptId);
+ view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
+
+
view.addObject("bizType", BizType.PEST.getCode());
//鑾峰彇褰撳墠鐢ㄦ埛鎵�鍦ㄧ殑鍒嗗簱鍚嶇О
diff --git a/igds-core/src/main/java/com/ld/igds/data/ConfigGasImg.java b/igds-core/src/main/java/com/ld/igds/data/ConfigGasImg.java
index b084c41..e21e671 100644
--- a/igds-core/src/main/java/com/ld/igds/data/ConfigGasImg.java
+++ b/igds-core/src/main/java/com/ld/igds/data/ConfigGasImg.java
@@ -50,4 +50,7 @@
return result;
}
+
+
+
}
diff --git a/igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java b/igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java
index 671280d..ec90fa8 100644
--- a/igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java
+++ b/igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java
@@ -7,7 +7,6 @@
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
-import java.util.List;
/**
* 璁惧淇℃伅
diff --git a/igds-manager/src/main/java/com/ld/igds/models/OAArchives.java b/igds-manager/src/main/java/com/ld/igds/models/OAArchives.java
index f24f6ac..ca62629 100644
--- a/igds-manager/src/main/java/com/ld/igds/models/OAArchives.java
+++ b/igds-manager/src/main/java/com/ld/igds/models/OAArchives.java
@@ -6,7 +6,6 @@
import javax.persistence.*;
-import com.ld.igds.file.dto.FileData;
import lombok.Data;
import com.bstek.dorado.annotation.PropertyDef;
diff --git a/igds-web/src/main/resources/gas-conf.properties b/igds-web/src/main/resources/gas-conf.properties
index cbc7543..71d39ba 100644
--- a/igds-web/src/main/resources/gas-conf.properties
+++ b/igds-web/src/main/resources/gas-conf.properties
@@ -1,5 +1,8 @@
##----\u6C14\u4F53\u901A\u9053\u914D\u7F6E----gas.mapImg.deptId.img--##
+## 5000-\u6F6E\u9633
+gas.mapImg.5000_001.img=5000_001.png
+
## 5016-\u5927\u6E7E\u533A\u6C14\u4F53\uFF0C\u53EA\u670910\u4E2A\u5E73\u65B9\u4ED3\u6709\u6C14\u4F53
gas.mapImg.3P01.img=5016_001.png
gas.mapImg.3P02.img=5016_001.png
@@ -26,8 +29,4 @@
gas.mapImg.5013_001.img=5013_001.png
## 5318-\u6F6E\u9633
-gas.mapImg.5318_001.img=5318_001.png
-
-
-## 5000-\u6F6E\u9633
-gas.mapImg.5000_001.img=5000_001.png
\ No newline at end of file
+gas.mapImg.5318_001.img=5318_001.png
\ No newline at end of file
diff --git a/igds-web/src/main/resources/static/admin/pest/pest-check.js b/igds-web/src/main/resources/static/admin/pest/pest-check.js
index 9e294b0..f940596 100644
--- a/igds-web/src/main/resources/static/admin/pest/pest-check.js
+++ b/igds-web/src/main/resources/static/admin/pest/pest-check.js
@@ -71,15 +71,18 @@
function cutPoint(depotId) {
//棣栧厛闄ゅ幓宸叉湁鏁堟灉
$(".qt-pic-icon-active").removeClass("qt-pic-icon-active");
-
+
+ $("#list-point-right").css("display","none");
+ $("#list-point-left").css("display","block");
+
//鏍规嵁涔変箤杩欒竟鐩存帴鍒ゆ柇
- if("0135,0137,0139,0141,0143,0145,0147,0149,0151,0153".indexOf(depotId) >=0 ){
- $("#list-point-right").css("display","block");
- $("#list-point-left").css("display","none");
- }else{
- $("#list-point-right").css("display","none");
- $("#list-point-left").css("display","block");
- }
+ // if("0135,0137,0139,0141,0143,0145,0147,0149,0151,0153".indexOf(depotId) >=0 ){
+ // $("#list-point-right").css("display","block");
+ // $("#list-point-left").css("display","none");
+ // }else{
+ // $("#list-point-right").css("display","none");
+ // $("#list-point-left").css("display","block");
+ // }
}
@@ -332,11 +335,17 @@
//鍒囨崲浠撳簱鍥剧墖
function cutImg(depotId) {
- var gasImg = gasImgMap[depotId];
- //console.log(gasImg);
+ //榛樿鍥剧墖
var imgPath = "../../static/img/gas/default_img.png";
+ //鍙栦粨搴撻厤缃浘鐗�
+ var gasImg = gasImgMap[depotId];
if(gasImg){
imgPath = "../../static/img/gas/"+companyId+"/" + gasImg.img;
+ }else {
+ gasImg = gasImgMap[deptId];
+ if(gasImg){
+ imgPath = "../../static/img/gas/"+companyId+"/" + gasImg.img;
+ }
}
$("#depot_img").attr("src", imgPath);
}
diff --git a/igds-web/src/main/resources/static/images/i-body1.png b/igds-web/src/main/resources/static/images/i-body1.png
new file mode 100644
index 0000000..58abb13
--- /dev/null
+++ b/igds-web/src/main/resources/static/images/i-body1.png
Binary files differ
diff --git a/igds-web/src/main/resources/verb-conf.properties b/igds-web/src/main/resources/verb-conf.properties
index 87648fa..65147d3 100644
--- a/igds-web/src/main/resources/verb-conf.properties
+++ b/igds-web/src/main/resources/verb-conf.properties
@@ -1,4 +1,13 @@
##----\u901A\u98CE\u53C2\u6570\u914D\u7F6E----verb.mapImg.deptId.a--##
+## 5000_001
+verb.mapImg.5000_001.a=default_pfc2_a.png
+verb.mapImg.5000_001.b=default_pfc2_b.png
+
+verb.mapImg.5000_0137.a=default_qyc_a.png
+verb.mapImg.5000_0137.b=default_qyc_b.png
+verb.mapImg.5000_0138.a=default_qyc_a.png
+verb.mapImg.5000_0138.b=default_qyc_b.png
+
## 5013_001 \u5206\u5E93\u7F16\u7801
verb.mapImg.5013_001.a=default_pfc_a.png
verb.mapImg.5013_001.b=default_pfc_b.png
@@ -133,15 +142,6 @@
## 5307_001
verb.mapImg.5307_001.a=default_qyc_a.png
verb.mapImg.5307_001.b=default_qyc_b.png
-## 5000_001
-
-verb.mapImg.5000_001.a=default_pfc2_a.png
-verb.mapImg.5000_001.b=default_pfc2_b.png
-
-verb.mapImg.5000_0137.a=default_qyc_a.png
-verb.mapImg.5000_0137.b=default_qyc_b.png
-verb.mapImg.5000_0138.a=default_qyc_a.png
-verb.mapImg.5000_0138.b=default_qyc_b.png
## 5322_001 广东徐闻
--
Gitblit v1.9.3