From 7923d591bf54d7cd991a3b25113a0103ac0e82c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E8=B1=AB=E5=AE=B8?= <1600013586@qq.com>
Date: Tue, 6 May 2025 10:18:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E6=8E=A5=E5=8F=A3=E7=9A=84url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/mybatisx/templates.xml | 4 +-
.../demo/controller/CCKHController.java | 8 +-
.../demo/controller/TSJBController.java | 19 +-
.../demo/controller/TongJiController.java | 18 +-
.../demo/controller/XXZSController.java | 6 +-
.../demo/controller/XZCFController.java | 6 +-
.../demo/controller/ZFJCController.java | 19 +-
.../demo/controller/ZHZSController.java | 52 +-
.../demo/entity/TongJi/TongJiHeGeLv.java | 18 +
.../com/example/demo/service/CjjcService.java | 15 +
.../example/demo/service/TsjbDataService.java | 41 +-
.../example/demo/service/ZfjcDataService.java | 35 +-
.../com/example/demo/service/ZhzsService.java | 7 +-
.../demo/service/impl/CjjcServiceImpl.java | 93 +-
.../service/impl/TsjbDataServiceImpl.java | 14 +-
.../service/impl/ZfjcDataServiceImpl.java | 16 +-
.../demo/service/impl/ZhzsServiceImpl.java | 384 ++-
src/main/java/com/example/demo/util/ZR.java | 14 +-
src/main/resources/application-dev.yml | 18 +-
.../app/yujing/controller/dataBuhegelvCtrl.js | 2910 +++++++++--------
.../public/app/yujing/view/dataBuhegelv.html | 2 +
21 files changed, 2200 insertions(+), 1499 deletions(-)
diff --git a/.idea/mybatisx/templates.xml b/.idea/mybatisx/templates.xml
index 0632b6a..e3ce0d3 100644
--- a/.idea/mybatisx/templates.xml
+++ b/.idea/mybatisx/templates.xml
@@ -69,8 +69,8 @@
diff --git a/src/main/java/com/example/demo/controller/CCKHController.java b/src/main/java/com/example/demo/controller/CCKHController.java
index ddd724e..7d94510 100644
--- a/src/main/java/com/example/demo/controller/CCKHController.java
+++ b/src/main/java/com/example/demo/controller/CCKHController.java
@@ -39,7 +39,7 @@ public class CCKHController {
//统计模块-抽查考核
@GetMapping("/GetKaoHeLv")
@ApiOperation(value = "抽查考核考核率")
- @DapingCache(isEnableCache = true)
+ @DapingCache(isEnableCache = false)
@Log(title = "抽查考核考核率", businessType = BusinessType.SELECT)
public Object GetKaoHe(String wherestr) {
AllQuery xinXiZhuiSuQuery = JSONUtil.toBean(wherestr, AllQuery.class);
@@ -51,7 +51,7 @@ public class CCKHController {
@GetMapping("/kaoHeLvExport")
@ApiOperation(value = "抽查考核及相关结果导出")
- @DapingCache(isEnableCache = true)
+ @DapingCache(isEnableCache = false)
@Log(title = "抽查考核及相关结果导出", businessType = BusinessType.EXPORT)
public void kaoHeLvExport(String wherestr, HttpServletResponse response) {
AllQuery xinXiZhuiSuQuery = JSONUtil.toBean(wherestr, AllQuery.class);
@@ -66,7 +66,7 @@ public class CCKHController {
@GetMapping("/GetKaoHeDaPing")
@ApiOperation(value = "抽查考核大屏主界面")
@Log(title = "抽查考核(大屏)", businessType = BusinessType.SELECT)
- @DapingCache(isEnableCache = true)
+ @DapingCache(isEnableCache = false)
public ZR> GetKaoHeDaPing(String hj, String szqx, String month) {
// szqx = Util.setSzqxFromUserName(szqx);
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
@@ -80,7 +80,7 @@ public class CCKHController {
@GetMapping("/GetScoreByHuanJie")
@Log(title = "追溯信息根据环节获取成绩", businessType = BusinessType.SELECT)
- @DapingCache(isEnableCache = true)
+ @DapingCache(isEnableCache = false)
public Object GetScoreByHuanJie(String szqx, String month) {
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
diff --git a/src/main/java/com/example/demo/controller/TSJBController.java b/src/main/java/com/example/demo/controller/TSJBController.java
index 3163349..66851cc 100644
--- a/src/main/java/com/example/demo/controller/TSJBController.java
+++ b/src/main/java/com/example/demo/controller/TSJBController.java
@@ -139,7 +139,7 @@ public class TSJBController {
@GetMapping("/GetTouSuLvDaPing")
@ApiOperation(value = "投诉举报(大屏演示)")
@Log(title = "投诉举报(大屏演示)", businessType = BusinessType.SELECT)
- @DapingCache(isEnableCache = true)
+ @DapingCache(isEnableCache = false)
public ZR> GetTouSuLvDaPing(String hj, String szqx, String month) {
// String userName = BaseContext.getUserName();
// if (Tools.isNotEmpty(userName) && userName.contains("区")) {
@@ -156,7 +156,7 @@ public class TSJBController {
@GetMapping("/GetTouSuLvDaPingStreet")
@ApiOperation(value = "投诉举报(大屏演示)街道")
@Log(title = "投诉举报(大屏)街道", businessType = BusinessType.SELECT)
- @DapingCache(isEnableCache = true)
+ @DapingCache(isEnableCache = false)
public ZR> GetTouSuLvDaPingStreet(String hj, String szqx, String month,String street) {
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
@@ -166,10 +166,23 @@ public class TSJBController {
return tsjbDataService.getTouSuLvDaPingStreet(start, end, hj, szqx,street);
}
+ @GetMapping("/GetTouSuLvDaPingStreetDasai")
+ @ApiOperation(value = "投诉举报(大屏演示)街道")
+ @Log(title = "投诉举报(大屏)街道", businessType = BusinessType.SELECT)
+ @DapingCache(isEnableCache = false)
+ public ZR> GetTouSuLvDaPingStreetDasai(String hj, String szqx, String month,String street, int littlemonth) {
+ String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
+ String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
+ //开始时间不用
+ String start = "2022/" + startMonth + "/1";
+ String end = "2022/" + endMonth + "/31";
+ return tsjbDataService.getTouSuLvDaPingStreet(start, end, hj, szqx,street,littlemonth);
+ }
+
//投诉举报
@GetMapping("/GetScoreByHuanJie")
@Log(title = "投诉举报根据环节获取成绩", businessType = BusinessType.SELECT)
- @DapingCache(isEnableCache = true)
+ @DapingCache(isEnableCache = false)
public Object GetScoreByHuanJie(String szqx, String month) {
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
diff --git a/src/main/java/com/example/demo/controller/TongJiController.java b/src/main/java/com/example/demo/controller/TongJiController.java
index 425bf4d..2df2aef 100644
--- a/src/main/java/com/example/demo/controller/TongJiController.java
+++ b/src/main/java/com/example/demo/controller/TongJiController.java
@@ -334,7 +334,7 @@ public class TongJiController {
/// 查询合格率统计信息20231021Add
@GetMapping("/TongJi/GetTongJiHeGeLvDaPing")
@Log(title = "抽检监测(大屏)", businessType = BusinessType.SELECT)
- @DapingCache(isEnableCache = true)
+ @DapingCache(isEnableCache = false)
public ZR> GetTongJiHeGeLvDaPing(String hj, String szqx, String month) {
// String userName = BaseContext.getUserName();
@@ -353,7 +353,7 @@ public class TongJiController {
/// 查询合格率统计信息20231021Add
@GetMapping("/TongJi/GetTongJiHeGeLvDaPingStreet")
@Log(title = "抽检监测(大屏)街道", businessType = BusinessType.SELECT)
- @DapingCache(isEnableCache = true)
+ @DapingCache(isEnableCache = false)
public ZR> GetTongJiHeGeLvDaPingStreet(String hj, String szqx, String month,String street) {
// String userName = BaseContext.getUserName();
@@ -369,6 +369,18 @@ public class TongJiController {
return cjjcService.getTongJiHeGeLvDaPingStreet(hj, szqx, month,street);
}
+ /// 查询合格率统计信息20231021Add
+ @GetMapping("/TongJi/GetTongJiHeGeLvDaPingStreetDasai")
+ @Log(title = "抽检监测(大屏)街道", businessType = BusinessType.SELECT)
+ @DapingCache(isEnableCache = false)
+ public ZR> GetTongJiHeGeLvDaPingStreetDasai(String hj, String szqx, String month,String street,int littlemonth) {
+// 传的月份 + 差的月 作为新的月份
+ month = Integer.valueOf(month) + littlemonth + "";
+ String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
+ String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
+ return cjjcService.getTongJiHeGeLvDaPingStreetDasai(hj, szqx, month,street);
+ }
+
@GetMapping("/TongJi/GetTongJiHeGeLv")
public ZR> GetTongJiHeGeLv(String wherestr, String num) {
@@ -453,7 +465,7 @@ public class TongJiController {
@GetMapping("/CJJC/GetScoreByHuanJie")
@Log(title = "抽检监测根据环节获取成绩", businessType = BusinessType.SELECT)
- @DapingCache(isEnableCache = true)
+ @DapingCache(isEnableCache = false)
public Object GetScoreByHuanJie(String szqx, String month) {
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
diff --git a/src/main/java/com/example/demo/controller/XXZSController.java b/src/main/java/com/example/demo/controller/XXZSController.java
index 597d928..baa9f2f 100644
--- a/src/main/java/com/example/demo/controller/XXZSController.java
+++ b/src/main/java/com/example/demo/controller/XXZSController.java
@@ -69,7 +69,7 @@ public class XXZSController {
@GetMapping("/GetZhuiSuDaPing")
@ApiOperation(value = "信息追溯(大屏)")
@Log(title = "信息追溯(大屏)", businessType = BusinessType.SELECT)
- @DapingCache(isEnableCache = true)
+ @DapingCache(isEnableCache = false)
public Object GetZhuiSuDaPing(String hj, String szqx, String month) {
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
@@ -83,7 +83,7 @@ public class XXZSController {
@GetMapping("/GetZhuiSuDaPingStreet")
@ApiOperation(value = "信息追溯(大屏)街道")
@Log(title = "信息追溯(大屏)街道", businessType = BusinessType.SELECT)
- @DapingCache(isEnableCache = true)
+ @DapingCache(isEnableCache = false)
public Object GetZhuiSuDaPingStreet(String hj, String szqx, String month,String street) {
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
@@ -95,7 +95,7 @@ public class XXZSController {
@GetMapping("/GetScoreByHuanJie")
@Log(title = "追溯信息根据环节获取成绩", businessType = BusinessType.SELECT)
- @DapingCache(isEnableCache = true)
+ @DapingCache(isEnableCache = false)
public Object GetScoreByHuanJie(String szqx, String month) {
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
diff --git a/src/main/java/com/example/demo/controller/XZCFController.java b/src/main/java/com/example/demo/controller/XZCFController.java
index a93391b..8843b15 100644
--- a/src/main/java/com/example/demo/controller/XZCFController.java
+++ b/src/main/java/com/example/demo/controller/XZCFController.java
@@ -95,7 +95,7 @@ public class XZCFController {
//统计模块-行政处罚
@GetMapping("/GetFaShengLvDaPing")
@Log(title = "行政处罚(大屏)", businessType = BusinessType.SELECT)
- @DapingCache(isEnableCache = true)
+ @DapingCache(isEnableCache = false)
public Map GetFaShengLvDaPing(String hj, String szqx, String month) {
// String userName = BaseContext.getUserName();
// if (Tools.isNotEmpty(userName) && userName.contains("区")) {
@@ -114,7 +114,7 @@ public class XZCFController {
//统计模块-行政处罚
@GetMapping("/GetFaShengLvDaPingStreet")
@Log(title = "行政处罚(大屏)街道", businessType = BusinessType.SELECT)
- @DapingCache(isEnableCache = true)
+ @DapingCache(isEnableCache = false)
public Map GetFaShengLvDaPingStreet(String hj, String szqx, String month,String street) {
// String userName = BaseContext.getUserName();
// if (Tools.isNotEmpty(userName) && userName.contains("区")) {
@@ -152,7 +152,7 @@ public class XZCFController {
@GetMapping("/GetScoreByHuanJie")
@Log(title = "行政处罚根据环节获取成绩", businessType = BusinessType.SELECT)
- @DapingCache(isEnableCache = true)
+ @DapingCache(isEnableCache = false)
public Object GetScoreByHuanJie(String szqx, String month) {
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
diff --git a/src/main/java/com/example/demo/controller/ZFJCController.java b/src/main/java/com/example/demo/controller/ZFJCController.java
index 36f2365..c279a0a 100644
--- a/src/main/java/com/example/demo/controller/ZFJCController.java
+++ b/src/main/java/com/example/demo/controller/ZFJCController.java
@@ -59,7 +59,7 @@ public class ZFJCController {
//统计模块-执法检查
@GetMapping("/GetWenTiLvDaPing")
@Log(title = "执法检查(大屏)", businessType = BusinessType.SELECT)
- @DapingCache(isEnableCache = true)
+ @DapingCache(isEnableCache = false)
public Object GetWenTiLvDaPing(String hj, String szqx, String month) {
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
@@ -69,10 +69,23 @@ public class ZFJCController {
return zfjcDataService.getWenTiLvDaPing(hj, szqx, start, end);
}
+ //统计模块-执法检查
+ @GetMapping("/GetWenTiLvDaPingDasai")
+ @Log(title = "执法检查(大屏)", businessType = BusinessType.SELECT)
+ @DapingCache(isEnableCache = false)
+ public Object GetWenTiLvDaPingDasai(String hj, String szqx, String month,int littlemonth) {
+ String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
+ String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
+ //开始时间不用
+ String start = "2022/" + startMonth + "/1";
+ String end = "2022/" + endMonth + "/31";
+ return zfjcDataService.getWenTiLvDaPing(hj, szqx, start, end);
+ }
+
//执法检查 大屏 街道
@GetMapping("/GetWenTiLvDaPingStreet")
@Log(title = "执法检查(大屏)街道", businessType = BusinessType.SELECT)
- @DapingCache(isEnableCache = true)
+ @DapingCache(isEnableCache = false)
public Object GetWenTiLvDaPingStreet(String hj, String szqx, String month,String street) {
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
@@ -84,7 +97,7 @@ public class ZFJCController {
@GetMapping("/GetScoreByHuanJie")
@Log(title = "执法检查据环节获取成绩", businessType = BusinessType.SELECT)
- @DapingCache(isEnableCache = true)
+ @DapingCache(isEnableCache = false)
public Object GetScoreByHuanJie(String szqx, String month) {
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
diff --git a/src/main/java/com/example/demo/controller/ZHZSController.java b/src/main/java/com/example/demo/controller/ZHZSController.java
index e7ecf65..a0b9f7c 100644
--- a/src/main/java/com/example/demo/controller/ZHZSController.java
+++ b/src/main/java/com/example/demo/controller/ZHZSController.java
@@ -53,7 +53,7 @@ public class ZHZSController {
@GetMapping("/GetScoreNew")
@ApiOperation(value = "综合指数各区分数大屏，计算分数", notes = "返回各区的各个维度的分数，以及总分")
@Log(title = "综合指数各区分数大屏，计算分数", businessType = BusinessType.SELECT)
- @DapingCache(isEnableCache = true)
+ @DapingCache(isEnableCache = false)
public R> getCountyMapScore(String hj, String szqx, String month) throws ParseException {
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
@@ -67,11 +67,31 @@ public class ZHZSController {
}
+ //区分数大屏 大赛
+ @GetMapping("/GetScoreNewDasai")
+ @ApiOperation(value = "综合指数各区分数大屏，计算分数", notes = "返回各区的各个维度的分数，以及总分")
+ @Log(title = "综合指数各区分数大屏，计算分数", businessType = BusinessType.SELECT)
+ @DapingCache(isEnableCache = false)
+ public R> getCountyMapScore(String hj, String szqx, String month,int littlemonth) throws ParseException {
+ String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
+ String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
+ //开始时间不用
+ String start = "2023/" + startMonth + "/1";
+ String end = "2023/" + endMonth + "/31";
+ DateTimeFormatter dateString = DateTimeFormatter.ofPattern("yyyy/M/d");
+ LocalDate startTime = !ObjectUtils.isEmpty(start) ? LocalDate.parse(start, dateString) : null;
+ LocalDate endTime = !ObjectUtils.isEmpty(end) ? LocalDate.parse(end, dateString) : null;
+ startTime = startTime.plusMonths(littlemonth);
+ endTime = endTime.plusMonths(littlemonth);
+ return R.success(zhzsService.getCountyMapScore(hj, szqx, startTime, endTime));
+ }
+
+
//街道分数大屏
@GetMapping("/GetScoreNewStreet")
@ApiOperation(value = "综合指数各街道分数大屏，计算分数", notes = "返回各区的各个维度的分数，以及总分")
@Log(title = "综合指数各街道分数大屏，计算分数", businessType = BusinessType.SELECT)
- @DapingCache(isEnableCache = true)
+ @DapingCache(isEnableCache = false)
public R> getStreetMapScore(String hj, String szqx, String month) throws ParseException {
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
@@ -84,22 +104,24 @@ public class ZHZSController {
return R.success(zhzsService.getStreetMapScore(hj, szqx, startTime, endTime));
}
- //街道分数大屏
- @GetMapping("/GetScoreNewStreetAndShanghai")
+ //街道分数大屏 大赛 兼容上海市条件
+ @GetMapping("/GetScoreNewStreetAndShanghaiDasai")
@ApiOperation(value = "综合指数各街道分数大屏，计算分数", notes = "返回各区的各个维度的分数，以及总分")
@Log(title = "综合指数各街道分数大屏，计算分数", businessType = BusinessType.SELECT)
- @DapingCache(isEnableCache = true)
- public R> getScoreStreetAndShanghai(String hj, String szqx, String month) throws ParseException {
+ @DapingCache(isEnableCache = false)
+ public R> getScoreStreetAndShanghai(String hj, String szqx, String month,int littlemonth) throws ParseException {
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
//开始时间不用
- String start = "2023/" + startMonth + "/1";
- String end = "2023/" + endMonth + "/31";
+ String start = "2022/" + startMonth + "/1";
+ String end = "2022/" + endMonth + "/31";
DateTimeFormatter dateString = DateTimeFormatter.ofPattern("yyyy/M/d");
LocalDate startTime = !ObjectUtils.isEmpty(start) ? LocalDate.parse(start, dateString) : null;
LocalDate endTime = !ObjectUtils.isEmpty(end) ? LocalDate.parse(end, dateString) : null;
+ startTime = startTime.plusMonths(littlemonth);
+ endTime = endTime.plusMonths(littlemonth);
if (szqx.equals("上海市")) {
- return R.success(zhzsService.getCountyMapScore(hj, szqx, startTime, endTime));
+ return R.success(zhzsService.getCountyMapScoreDasai(hj, "", startTime, endTime));
} else{
return R.success(zhzsService.getStreetMapScore(hj, szqx, startTime, endTime));
}
@@ -119,7 +141,7 @@ public class ZHZSController {
@GetMapping("/GetTitleScore")
@ApiOperation(value = "计算标题分数", notes = "计算当前条件下的总分（不受区县条件影响）")
@Log(title = "计算标题分数", businessType = BusinessType.SELECT)
- @DapingCache(isEnableCache = true)
+ @DapingCache(isEnableCache = false)
public R GetTitleScoreNew(String hj, String szqx, String month) {
// szqx = Util.setSzqxFromUserName(szqx);
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
@@ -139,7 +161,7 @@ public class ZHZSController {
//综合性指标 大屏，综合指数
@GetMapping("/GetZHScoreDaPing")
@Log(title = "综合性指标 大屏", businessType = BusinessType.SELECT)
- @DapingCache(isEnableCache = true)
+ @DapingCache(isEnableCache = false)
public ZR> GetZHScoreDaPing(String szqx) {
// szqx = Util.setSzqxFromUserName(szqx);
String year = "2023";
@@ -163,6 +185,14 @@ public class ZHZSController {
zhzsService.initZhzsAllLvByDateAndArea();
}
+ //综合指数全部率导出
+ @GetMapping("/initZhzsAllSteetDasai")
+ @ApiOperation(value = "初始化综合指数全部街道大赛用", notes = "初始化综合指数全部街道大赛用")
+ @Log(title = "初始化综合指数全部街道大赛用", businessType = BusinessType.UPDATE)
+ public void initZhzsAllSteetDasai() {
+ zhzsService.initZhzsAllSteetDasai();
+ }
+
//综合指数全部率导出
@GetMapping("/testZhzsAllLv")
diff --git a/src/main/java/com/example/demo/entity/TongJi/TongJiHeGeLv.java b/src/main/java/com/example/demo/entity/TongJi/TongJiHeGeLv.java
index a628203..72a71ac 100644
--- a/src/main/java/com/example/demo/entity/TongJi/TongJiHeGeLv.java
+++ b/src/main/java/com/example/demo/entity/TongJi/TongJiHeGeLv.java
@@ -9,16 +9,34 @@ import java.math.BigDecimal;
@Data
public class TongJiHeGeLv extends ZSScoreVo {
+
@JsonProperty("sp_dl")
public String SP_DL;
+
@JsonProperty("zongjianshu")
public int ZONGJIANSHU;
+
@JsonProperty("hegejianshu")
public int HEGEJIANSHU;
+
@JsonProperty("buhegejianshu")
public int BUHEGEJIANSHU;
+
@JsonProperty("hegelv")
public BigDecimal HEGELV;
+
@JsonProperty("score")
public BigDecimal score;
+
+ @JsonProperty("hj")
+ public String hj;
+
+ @JsonProperty("szqx")
+ public String szqx;
+
+ @JsonProperty("month")
+ public String month;
+
+ @JsonProperty("street")
+ public String street;
}
diff --git a/src/main/java/com/example/demo/service/CjjcService.java b/src/main/java/com/example/demo/service/CjjcService.java
index f5344f2..b716dba 100644
--- a/src/main/java/com/example/demo/service/CjjcService.java
+++ b/src/main/java/com/example/demo/service/CjjcService.java
@@ -7,6 +7,7 @@ import com.example.demo.entity.vo.ZHZSVo;
import com.example.demo.entity.vo.ZhzsScoreVo;
import com.example.demo.util.ZR;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.springframework.util.ObjectUtils;
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDate;
@@ -61,6 +62,20 @@ public interface CjjcService {
// 之前的大屏有问题，重构
ZR> getTongJiHeGeLvDaPingStreet(String hj, String szqx, String month,String street);
+
+ // 之前的大屏有问题，重构
+ ZR> getTongJiHeGeLvDaPingStreetDasai(String hj, String szqx, String month,String street);
+
+
+
+ // 重载
+ default ZR> getTongJiHeGeLvDaPingStreet(LocalDate startTime, LocalDate endTime,String hj, String szqx,String street){
+ String startMonth = Integer.toString(startTime.getMonthValue());
+ String endMonth = Integer.toString(endTime.getMonthValue());
+ String month = startMonth.equals(endMonth) ? startMonth : null;
+ return getTongJiHeGeLvDaPingStreet(hj,szqx,month,street);
+ }
+
/**
* @param cydd 要带“环节” 两个字 如 生产环节
*/
diff --git a/src/main/java/com/example/demo/service/TsjbDataService.java b/src/main/java/com/example/demo/service/TsjbDataService.java
index ce1a66d..83ea3ab 100644
--- a/src/main/java/com/example/demo/service/TsjbDataService.java
+++ b/src/main/java/com/example/demo/service/TsjbDataService.java
@@ -12,10 +12,12 @@ import com.example.demo.entity.vo.ZhzsScoreVo;
import com.example.demo.util.R;
import com.example.demo.util.ZR;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
import java.util.List;
/**
@@ -46,20 +48,49 @@ public interface TsjbDataService extends IService {
//投诉举报大屏演示
ZR> getTouSuLvDaPing(String startTime, String endTime, String ly, String szqx);
+
//投诉举报大屏演示
+
/**
* 获取特定时间段内，指定区域和街道的投诉举报率
* 该方法用于统计在给定的开始和结束时间内，符合各类别和指定区域条件的投诉举报信息，
* 并按街道分类返回这些信息的列表
*
* @param startTime 开始时间，格式为"yyyy-MM-dd"，用于限定查询的时间范围起点
- * @param endTime 结束时间，格式为"yyyy-MM-dd"，用于限定查询的时间范围终点
- * @param hj 领域，表示投诉举报的类型，用于筛选特定类型的投诉举报信息
- * @param szqx 区域，表示投诉举报发生的区域，用于筛选特定区域的投诉举报信息
- * @param street 街道，表示投诉举报发生的街道，用于筛选特定街道的投诉举报信息
+ * @param endTime 结束时间，格式为"yyyy-MM-dd"，用于限定查询的时间范围终点
+ * @param hj 领域，表示投诉举报的类型，用于筛选特定类型的投诉举报信息
+ * @param szqx 区域，表示投诉举报发生的区域，用于筛选特定区域的投诉举报信息
+ * @param street 街道，表示投诉举报发生的街道，用于筛选特定街道的投诉举报信息
* @return 返回一个ZR对象，封装了List类型的列表，每个列表项代表一个街道的投诉举报率信息
*/
- ZR> getTouSuLvDaPingStreet(String startTime, String endTime, String hj, String szqx,String street);
+ ZR> getTouSuLvDaPingStreet(LocalDate startTime, LocalDate endTime, String hj, String szqx, String street);
+
+ /**
+ * 上面方法的重载
+ */
+ default ZR> getTouSuLvDaPingStreet(String startTime, String endTime, String hj, String szqx, String street) {
+ // 定义日期格式解析器
+ DateTimeFormatter dateString = DateTimeFormatter.ofPattern("yyyy/M/d");
+ // 解析开始和结束日期
+ LocalDate start = !ObjectUtils.isEmpty(startTime) ? LocalDate.parse(startTime, dateString) : null;
+ LocalDate end = !ObjectUtils.isEmpty(startTime) ? LocalDate.parse(startTime, dateString) : null;
+ return getTouSuLvDaPingStreet(start, end, hj, szqx, street);
+ }
+
+ /**
+ * 上面方法的重载
+ */
+ default ZR> getTouSuLvDaPingStreet(String startTime, String endTime, String hj, String szqx, String street, int littlemonth) {
+ // 定义日期格式解析器
+ DateTimeFormatter dateString = DateTimeFormatter.ofPattern("yyyy/M/d");
+ // 解析开始和结束日期
+ LocalDate start = !ObjectUtils.isEmpty(startTime) ? LocalDate.parse(startTime, dateString) : null;
+ LocalDate end = !ObjectUtils.isEmpty(startTime) ? LocalDate.parse(startTime, dateString) : null;
+ start = start.plusMonths(littlemonth);
+ end = end.plusMonths(littlemonth);
+ return getTouSuLvDaPingStreet(start, end, hj, szqx, street);
+ }
+
//投诉举报环节界面大屏演示
ZR> getScoreByHuanJie(String szqx, String start, String end);
diff --git a/src/main/java/com/example/demo/service/ZfjcDataService.java b/src/main/java/com/example/demo/service/ZfjcDataService.java
index 4762ede..40a8c81 100644
--- a/src/main/java/com/example/demo/service/ZfjcDataService.java
+++ b/src/main/java/com/example/demo/service/ZfjcDataService.java
@@ -8,9 +8,11 @@ import com.example.demo.entity.vo.ZHZSVo;
import com.example.demo.entity.vo.ZhzsScoreVo;
import com.example.demo.util.ZR;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.springframework.util.ObjectUtils;
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
import java.util.List;
/**
@@ -35,13 +37,13 @@ public interface ZfjcDataService extends IService {
*/
List getScoreByQuQuery(String hj, String szqx, LocalDate startTime, LocalDate endTime);
+ List getScoreByStreetQuery(String hj, String szqx, LocalDate startTime, LocalDate endTime);
+
/**
* 执法检查的问题率查询
*/
void wenTiLvExport(String startTime, String endTime, String hj, String szqx, HttpServletResponse response);
- List getScoreByStreetQuery(String hj, String szqx, LocalDate startTime, LocalDate endTime);
-
ZR> getWenTiLvYZ(Double lv);
/**
@@ -58,7 +60,34 @@ public interface ZfjcDataService extends IService {
* @param szqx
* @return
*/
- Object getWenTiLvDaPingStreet(String hj, String szqx, String startTime, String endTime,String street);
+ default Object getWenTiLvDaPingStreet(String hj, String szqx, String startTime, String endTime,String street){
+ DateTimeFormatter dateString = DateTimeFormatter.ofPattern("yyyy/M/d");
+ LocalDate start = !ObjectUtils.isEmpty(startTime) ? LocalDate.parse(startTime, dateString) : null;
+ LocalDate end = !ObjectUtils.isEmpty(endTime) ? LocalDate.parse(endTime, dateString) : null;
+ return getWenTiLvDaPingStreet(start,end, hj, szqx, street);
+ }
+ /**
+ * 执法检查问题率 街道 ，大屏演示
+ * @param hj
+ * @param szqx
+ * @return
+ */
+ default Object getWenTiLvDaPingStreetDasai(String hj, String szqx, String startTime, String endTime,String street,int littlemonth){
+ DateTimeFormatter dateString = DateTimeFormatter.ofPattern("yyyy/M/d");
+ LocalDate start = !ObjectUtils.isEmpty(startTime) ? LocalDate.parse(startTime, dateString) : null;
+ LocalDate end = !ObjectUtils.isEmpty(endTime) ? LocalDate.parse(endTime, dateString) : null;
+ start = start.plusMonths(littlemonth);
+ end = end.plusMonths(littlemonth);
+ return getWenTiLvDaPingStreet(start,end, hj, szqx, street);
+ }
+
+ /**
+ * 执法检查问题率 街道 ，大屏演示 新建的重载方法
+ * @param hj
+ * @param szqx
+ * @return
+ */
+ Object getWenTiLvDaPingStreet(LocalDate startTime,LocalDate endTime, String hj, String szqx, String street);
/**
* 根据区查看分数
diff --git a/src/main/java/com/example/demo/service/ZhzsService.java b/src/main/java/com/example/demo/service/ZhzsService.java
index 5b9d60b..d28fa19 100644
--- a/src/main/java/com/example/demo/service/ZhzsService.java
+++ b/src/main/java/com/example/demo/service/ZhzsService.java
@@ -49,6 +49,9 @@ public interface ZhzsService {
*/
List getCountyMapScore(String hj, String szqx, LocalDate start, LocalDate end) throws ParseException;
+// 大赛用接口
+ List getCountyMapScoreDasai(String hj, String szqx, LocalDate start, LocalDate end) throws ParseException;
+
List getStreetMapScore(String hj, String szqx, LocalDate startTime, LocalDate endTime);
// 街道分数导出
@@ -76,7 +79,9 @@ public interface ZhzsService {
*/
void initZhzsAllLvByDateAndArea();
- void testZhzsAllLv(String hj,String szqx ,int month ,int year);
+ void initZhzsAllSteetDasai();
+
+ void testZhzsAllLv(String hj, String szqx , int month , int year);
/**
* 往数据库中写入各维度的分数
diff --git a/src/main/java/com/example/demo/service/impl/CjjcServiceImpl.java b/src/main/java/com/example/demo/service/impl/CjjcServiceImpl.java
index 5f8189e..0031864 100644
--- a/src/main/java/com/example/demo/service/impl/CjjcServiceImpl.java
+++ b/src/main/java/com/example/demo/service/impl/CjjcServiceImpl.java
@@ -683,6 +683,86 @@ public class CjjcServiceImpl implements CjjcService {
}
+ @Override
+ public ZR> getTongJiHeGeLvDaPingStreetDasai(String hj, String szqx, String month,String street) {
+ String year = "2022";
+ MonthTimeVo timeByMonth = TimeUtil.getTimeByMonth(year, month, month, TimeUtil.FORMAT_1);
+ LocalDate startDataTime = timeByMonth.getStartDataTime();
+ LocalDate endDataTime = timeByMonth.getEndDataTime();
+
+ String ypxxHj = hj;
+ ypxxHj = xsToLt(ypxxHj);
+
+ //1。合格率
+ List tertiaryByHJAndQX = this.getHegeLvStreet(hj, szqx, "", month, year,street);
+ //包装返回体 使用addAll()方法拷贝List
+ List hegelvList = new ArrayList<>();
+ hegelvList.addAll(tertiaryByHJAndQX);
+
+ //2。居民覆盖率 保留上海
+ //如果有值就拿对应的值，没值就拿上海的值
+ String finalSzqx = ObjectUtils.isEmpty(szqx) ? "上海市" : szqx;
+ List fugailv = this.fugailvByInterval("", hj, year, month, szqx, true);
+
+ List fugailvSzqx = fugailv.stream().filter(lv -> lv.getCountyName().equals(finalSzqx)).collect(Collectors.toList());
+ if (Tools.isNotEmpty(fugailvSzqx)){
+ CjjcAll fugailvBySh = fugailvSzqx.stream().findFirst().get();
+ tertiaryByHJAndQX.add(fugailvBySh);
+ }
+
+ //3.主体覆盖率 保留上海
+ List zhutiqiyefugailv = this.zhutiqiyefugailvByInterval("", hj, year, month, szqx, true);
+ List zhutiqiyefugailvSzqx = zhutiqiyefugailv.stream().filter(lv -> lv.getCountyName().equals(finalSzqx)).collect(Collectors.toList());
+
+ if (Tools.isNotEmpty(zhutiqiyefugailvSzqx)){
+ CjjcAll zhutiqiyefugailvBySh = zhutiqiyefugailvSzqx.stream().findFirst().get();
+ tertiaryByHJAndQX.add(zhutiqiyefugailvBySh);
+ }
+
+ List resultList = hegelvList.stream().map(cjjcAll -> {
+ TongJiHeGeLv tongJiHeGeLv = new TongJiHeGeLv();
+ tongJiHeGeLv.setZONGJIANSHU(cjjcAll.getChoujianCount());
+ tongJiHeGeLv.setHEGEJIANSHU(cjjcAll.getHegeCount());
+ tongJiHeGeLv.setSP_DL(cjjcAll.getTertiaryName());
+ tongJiHeGeLv.setScore(cjjcAll.getScore());
+ tongJiHeGeLv.setHEGELV(cjjcAll.getPassRate().multiply(BigDecimal.valueOf(100)).setScale(1, RoundingMode.HALF_UP));
+ tongJiHeGeLv.setWeightKey(Util.getGroupKey(primary, cjjcAll.getHj(), cjjcAll.getTertiaryName()));
+
+ return tongJiHeGeLv;
+ }).collect(Collectors.toList());
+
+ //4计算总分
+
+ //4.2封装计算的实体类
+ List cjjcLv = tertiaryByHJAndQX.stream().map(cjjcAll -> {
+ TongJiHeGeLv tongJiHeGeLv = new TongJiHeGeLv();
+ //封装合格率和三级指标
+ tongJiHeGeLv.setSP_DL(cjjcAll.getTertiaryName());
+ tongJiHeGeLv.setZONGJIANSHU(cjjcAll.getChoujianCount());
+ tongJiHeGeLv.setHEGELV(cjjcAll.getPassRate().setScale(3, RoundingMode.HALF_UP));
+ tongJiHeGeLv.setScore(cjjcAll.getScore());
+ tongJiHeGeLv.setHUANJIE(cjjcAll.getHj());
+ tongJiHeGeLv.setPrimaryName(primary);
+ tongJiHeGeLv.setTertiaryName(cjjcAll.getTertiaryName());
+ tongJiHeGeLv.setWeightKey(Util.getGroupKey(primary, cjjcAll.getHj(), cjjcAll.getTertiaryName()));
+ tongJiHeGeLv.setHUANJIE(hj);
+ tongJiHeGeLv.setSzqx(szqx);
+ tongJiHeGeLv.setMonth(month);
+ tongJiHeGeLv.setStreet(street);
+ return tongJiHeGeLv;
+ }).collect(Collectors.toList());
+ //4.3获取指标权重
+ Map weightMapByPrimaAndSecon = zhzsWeightService.getWeightMapByprimary(primary);
+ ZhzsScoreVo primaryScore = ZhzsUtil.getPrimaryScore(cjjcLv, TongJiHeGeLv.class, weightMapByPrimaAndSecon);
+
+ //去掉两个覆盖率的显示
+ return ZR.success(resultList,
+ primaryScore.getWeiduScore().setScale(1, RoundingMode.HALF_UP),
+ primaryScore.getWeightScore(),
+ primaryScore.getWeightAdd());
+ }
+
+
@Override
public ZR> getTongJiHeGeLvDaPingStreet(String hj, String szqx, String month,String street) {
String year = "2023";
@@ -726,6 +806,8 @@ public class CjjcServiceImpl implements CjjcService {
tongJiHeGeLv.setSP_DL(cjjcAll.getTertiaryName());
tongJiHeGeLv.setScore(cjjcAll.getScore());
tongJiHeGeLv.setHEGELV(cjjcAll.getPassRate().multiply(BigDecimal.valueOf(100)).setScale(1, RoundingMode.HALF_UP));
+ tongJiHeGeLv.setWeightKey(Util.getGroupKey(primary, cjjcAll.getHj(), cjjcAll.getTertiaryName()));
+
return tongJiHeGeLv;
}).collect(Collectors.toList());
@@ -743,16 +825,21 @@ public class CjjcServiceImpl implements CjjcService {
tongJiHeGeLv.setPrimaryName(primary);
tongJiHeGeLv.setTertiaryName(cjjcAll.getTertiaryName());
tongJiHeGeLv.setWeightKey(Util.getGroupKey(primary, cjjcAll.getHj(), cjjcAll.getTertiaryName()));
+ tongJiHeGeLv.setHUANJIE(hj);
+ tongJiHeGeLv.setSzqx(szqx);
+ tongJiHeGeLv.setMonth(month);
+ tongJiHeGeLv.setStreet(street);
return tongJiHeGeLv;
}).collect(Collectors.toList());
//4.3获取指标权重
Map weightMapByPrimaAndSecon = zhzsWeightService.getWeightMapByprimary(primary);
ZhzsScoreVo primaryScore = ZhzsUtil.getPrimaryScore(cjjcLv, TongJiHeGeLv.class, weightMapByPrimaAndSecon);
-
//去掉两个覆盖率的显示
-
- return ZR.success(resultList, primaryScore.getWeiduScore().setScale(1, RoundingMode.HALF_UP));
+ return ZR.success(resultList,
+ primaryScore.getWeiduScore().setScale(1, RoundingMode.HALF_UP),
+ primaryScore.getWeightScore(),
+ primaryScore.getWeightAdd());
}
diff --git a/src/main/java/com/example/demo/service/impl/TsjbDataServiceImpl.java b/src/main/java/com/example/demo/service/impl/TsjbDataServiceImpl.java
index 238dd60..6490b51 100644
--- a/src/main/java/com/example/demo/service/impl/TsjbDataServiceImpl.java
+++ b/src/main/java/com/example/demo/service/impl/TsjbDataServiceImpl.java
@@ -647,12 +647,7 @@ public class TsjbDataServiceImpl extends ServiceImpl
* @return 返回包含投诉率信息的响应对象
*/
@Override
- public ZR> getTouSuLvDaPingStreet(String start, String end, String hj, String szqx, String street) {
- // 定义日期格式解析器
- DateTimeFormatter dateString = DateTimeFormatter.ofPattern("yyyy/M/d");
- // 解析开始和结束日期
- LocalDate startTime = !ObjectUtils.isEmpty(start) ? LocalDate.parse(start, dateString) : null;
- LocalDate endTime = !ObjectUtils.isEmpty(end) ? LocalDate.parse(end, dateString) : null;
+ public ZR> getTouSuLvDaPingStreet(LocalDate startTime, LocalDate endTime, String hj, String szqx, String street) {
// 获取特定时间和区域内的企业数量映射
Map qiYeSumMap = xukeService.getQiYeByHjAndStreet(startTime, endTime, szqx, street);
@@ -722,10 +717,17 @@ public class TsjbDataServiceImpl extends ServiceImpl
// 计算每个投诉情节的总投诉数
tsjbLvMapByQingXin.forEach((s, touSuJuBaoLvs) -> {
+// 投诉举报没有病媒，跳过
+ if(s.equals("病媒生物")){
+ return;
+ }
Integer touSuCount = touSuJuBaoLvs.stream().map(TouSuJuBaoLv::getTOUSUSHU).reduce(0, Integer::sum);
TouSuJuBaoLv touSuJuBaoLv = new TouSuJuBaoLv();
touSuJuBaoLv.setTOUSUSHU(touSuCount);
touSuJuBaoLv.setTOUSUQINGXIN(s);
+
+ // 设置权重键 //用销售代替全部
+ touSuJuBaoLv.setWeightKey(primary + "-" + "销售" + "-" + touSuJuBaoLv.getTOUSUQINGXIN());
results.add(touSuJuBaoLv);
});
diff --git a/src/main/java/com/example/demo/service/impl/ZfjcDataServiceImpl.java b/src/main/java/com/example/demo/service/impl/ZfjcDataServiceImpl.java
index 3955d5b..80b3c26 100644
--- a/src/main/java/com/example/demo/service/impl/ZfjcDataServiceImpl.java
+++ b/src/main/java/com/example/demo/service/impl/ZfjcDataServiceImpl.java
@@ -515,11 +515,9 @@ public class ZfjcDataServiceImpl extends ServiceImpl
}
+
@Override
- public Object getWenTiLvDaPingStreet(String hj, String szqx, String startTime, String endTime,String street) {
- DateTimeFormatter dateString = DateTimeFormatter.ofPattern("yyyy/M/d");
- LocalDate start = !ObjectUtils.isEmpty(startTime) ? LocalDate.parse(startTime, dateString) : null;
- LocalDate end = !ObjectUtils.isEmpty(endTime) ? LocalDate.parse(endTime, dateString) : null;
+ public Object getWenTiLvDaPingStreet(LocalDate start,LocalDate end, String hj, String szqx, String street) {
hj = !ObjectUtils.isEmpty(hj) ? hj.replace("环节", "") : hj;
QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq(!ObjectUtils.isEmpty(hj), "HJ", hj)
@@ -527,11 +525,11 @@ public class ZfjcDataServiceImpl extends ServiceImpl
.eq(!ObjectUtils.isEmpty(street), "SUOSHUJIEZHEN", street)
.ne("COUNTY_NAME", "")
.isNotNull("COUNTY_NAME")
- .ge(!ObjectUtils.isEmpty(startTime), "ITEM_UPDATE_TIME", start)
- .le(!ObjectUtils.isEmpty(endTime), "ITEM_UPDATE_TIME", end);
+ .ge(!ObjectUtils.isEmpty(start), "ITEM_UPDATE_TIME", start)
+ .le(!ObjectUtils.isEmpty(end), "ITEM_UPDATE_TIME", end);
//查出区对应的企业数
- Map qiYeSumMap = xukeService.getQiYeByHj(start, end, szqx,street);
+ Map qiYeSumMap = xukeService.getQiYeByHj(start, end, szqx, street);
List zhiFaJianChaLvs = zfjcDataMapper.getWenTiSum(queryWrapper);
zhiFaJianChaLvs.forEach(lv -> {
@@ -559,7 +557,11 @@ public class ZfjcDataServiceImpl extends ServiceImpl
map.put("code", 0);
map.put("msg", "success");
map.put("data", zhiFaJianChaLvs);
+ //保留一位小数
map.put("score", weiduScore.setScale(1, RoundingMode.HALF_UP));
+ map.put("weightAdd", primaryScore.getWeightAdd());
+ map.put("weiduScore", weiduScore);
+ map.put("weightScore", primaryScore.getWeightScore());
return map;
}
diff --git a/src/main/java/com/example/demo/service/impl/ZhzsServiceImpl.java b/src/main/java/com/example/demo/service/impl/ZhzsServiceImpl.java
index 506560c..e99ecab 100644
--- a/src/main/java/com/example/demo/service/impl/ZhzsServiceImpl.java
+++ b/src/main/java/com/example/demo/service/impl/ZhzsServiceImpl.java
@@ -9,6 +9,7 @@ import com.example.demo.constant.WeightConstant;
import com.example.demo.domain.DicJiedaoAreaName;
import com.example.demo.domain.Pagecachedata;
import com.example.demo.domain.ZhData;
+import com.example.demo.domain.ZhzsAllFenziDasai;
import com.example.demo.domain.ZhzsAllLv;
import com.example.demo.domain.ZhzsAllScore;
import com.example.demo.domain.ZhzsPrimaryScore;
@@ -43,6 +44,7 @@ import com.example.demo.service.XzcfDataService;
import com.example.demo.service.ZcqyService;
import com.example.demo.service.ZfjcDataService;
import com.example.demo.service.ZhDataService;
+import com.example.demo.service.ZhzsAllFenziDasaiService;
import com.example.demo.service.ZhzsAllLvService;
import com.example.demo.service.ZhzsAllScoreService;
import com.example.demo.service.ZhzsPrimaryScoreService;
@@ -124,6 +126,8 @@ public class ZhzsServiceImpl implements ZhzsService {
@Resource
private ZhzsAllScoreService zhzsAllScoreService;
@Resource
+ private ZhzsAllFenziDasaiService zhzsDasaiService;
+ @Resource
private ZhzsSecondaryScoreService zhzsSecondaryScoreService;
@Resource
private ZhzsPrimaryScoreService zhzsPrimaryScoreService;
@@ -140,6 +144,17 @@ public class ZhzsServiceImpl implements ZhzsService {
"闵行区", "青浦区", "长宁区", "宝山区", "嘉定区", "松江区", "静安区", "杨浦区",
"虹口区", "金山区", "徐汇区", "黄浦区", "崇明区", "普陀区", "奉贤区", "浦东新区");
+ private static final List streetListInit = Arrays.asList("",
+ "庄行镇", "金汇镇", "柘林镇", "上海市奉贤区海湾旅游区",
+// "青村镇",
+ "西渡街道", "四团镇",
+// "金海街道",
+ "奉浦街道",
+// "南桥镇",
+ "海湾镇", "奉城镇"
+ // ,"上海海港综合经济开发区"
+ );
+
public ZhzsServiceImpl() {
}
@@ -253,12 +268,164 @@ public class ZhzsServiceImpl implements ZhzsService {
//抽查考核 hj like
List cckhVo = cckhDataService.getScoreByQuQuery(hj, szqx, startTime, endTime);
String cckhHJ = hj;
- if (Tools.isNotEmpty(hj)){
- if (hj.contains("销售")){
+ if (Tools.isNotEmpty(hj)) {
+ if (hj.contains("销售")) {
cckhHJ = "食品销售";
- }else if (hj.contains("餐饮")){
+ } else if (hj.contains("餐饮")) {
cckhHJ = "餐饮服务";
- }else if (hj.contains("生产")){
+ } else if (hj.contains("生产")) {
+ cckhHJ = "食品生产";
+ }
+ }
+ Map cckhWeightMap = zhzsWeightService.getcckhWeightMapByPrimaAndSecon("抽查考核", cckhHJ);
+ List cckhScoreByYi = getPrimaryAndQuScore(cckhVo, cckhWeightMap);
+ log.info("抽查考核计算合格");
+
+ //抽检监测 hj + 环节 内部替换销售和流通
+ List cjjcVo = cjjcService.getScoreByQuQuery(hj, szqx, startTime, endTime);
+ Map cjjcWeightMap = zhzsWeightService.getWeightMapByprimary("抽检监测");
+ List cjjcScoreByYi = getPrimaryAndQuScore(cjjcVo, cjjcWeightMap);
+ log.info("抽检监测计算合格");
+
+ //执法检查 hj + 环节
+ List zfjcVo = zfjcService.getScoreByQuQuery(hj, szqx, startTime, endTime);
+ Map zfjcWeightMap = zhzsWeightService.getWeightMapByPrimaAndSecon("执法检查", hj);
+ List zfjcScoreByYi = getPrimaryAndQuScore(zfjcVo, zfjcWeightMap);
+ log.info("执法检查计算合格");
+
+ //投诉举报 hj + 环节
+ List tsjbVo = tsjbDataService.getScoreByQuAndHj(hj, szqx, startTime, endTime);
+ Map tsjbWeightMap = zhzsWeightService.getWeightMapByPrimaAndSecon("投诉举报", hj);
+ List tsjbScoreByYi = getPrimaryAndQuScore(tsjbVo, tsjbWeightMap);
+ log.info("投诉举报计算合格");
+
+ //综合指数
+ List zhxVo = getCountyZHScore(szqx, year);
+ Map zhxVoWeightMap = zhzsWeightService.getWeightMapByprimary(primary);
+ List zhxScoreByYi = getPrimaryAndQuScore(zhxVo, zhxVoWeightMap);
+ log.info("综合指数计算合格");
+
+ Map xxzsMapByQu = xxzsScoreByYi.stream().collect(Collectors.toMap(DaPingScoreQX::getName, d -> d));
+ Map xzcfMapByQu = xzcfScoreByYi.stream().collect(Collectors.toMap(DaPingScoreQX::getName, d -> d));
+ Map cckhMapByQu = cckhScoreByYi.stream().collect(Collectors.toMap(DaPingScoreQX::getName, d -> d));
+ Map cjjcMapByQu = cjjcScoreByYi.stream().collect(Collectors.toMap(DaPingScoreQX::getName, d -> d));
+ Map zfjcMapByQu = zfjcScoreByYi.stream().collect(Collectors.toMap(DaPingScoreQX::getName, d -> d));
+ Map tsjbMapByQu = tsjbScoreByYi.stream().collect(Collectors.toMap(DaPingScoreQX::getName, d -> d));
+ Map zhxMapByQu = zhxScoreByYi.stream().collect(Collectors.toMap(DaPingScoreQX::getName, d -> d));
+
+ List quList = new ArrayList<>(xxzsMapByQu.keySet());
+ List scoreQu = quList.stream().map(countyName -> {
+ System.out.println("countyName = " + countyName);
+ //权重成绩和 各维度对总分的贡献 如 16分
+ BigDecimal xxzsScore = xxzsMapByQu.get(countyName).getScore();
+ BigDecimal xzcfScore = xzcfMapByQu.get(countyName).getScore();
+ BigDecimal cckhScore = cckhMapByQu.get(countyName).getScore();
+ BigDecimal cjjcScore = cjjcMapByQu.get(countyName).getScore();
+ BigDecimal zfjcScore = zfjcMapByQu.get(countyName).getScore();
+ BigDecimal tsjbScore = tsjbMapByQu.get(countyName).getScore();
+ BigDecimal zhxScore = zhxMapByQu.get(countyName).getScore();
+ BigDecimal addScore = xxzsScore.add(xzcfScore).add(cckhScore).add(cjjcScore)
+ .add(zfjcScore).add(tsjbScore).add(zhxScore);
+
+ //维度成绩和 各维度内的满分100分对应的分数 如 90分
+ BigDecimal xxzsWeiDuScore = xxzsMapByQu.get(countyName).getValue();
+ BigDecimal xzcfWeiDuScore = xzcfMapByQu.get(countyName).getValue();
+ BigDecimal cckhWeiDuScore = cckhMapByQu.get(countyName).getValue();
+ BigDecimal cjjcWeiDuScore = cjjcMapByQu.get(countyName).getValue();
+ BigDecimal zfjcWeiDuScore = zfjcMapByQu.get(countyName).getValue();
+ BigDecimal tsjbWeiDuScore = tsjbMapByQu.get(countyName).getValue();
+ BigDecimal zhxWeiDuScore = zhxMapByQu.get(countyName).getValue();
+ BigDecimal addWeiDuScore = xxzsWeiDuScore.add(xzcfWeiDuScore).add(cckhWeiDuScore).add(cjjcWeiDuScore)
+ .add(zfjcWeiDuScore).add(tsjbWeiDuScore).add(zhxWeiDuScore);
+
+ //权重和
+ BigDecimal xxzsWeightAdd = xxzsMapByQu.get(countyName).getWeightAdd();
+ BigDecimal xzcfWeightAdd = xzcfMapByQu.get(countyName).getWeightAdd();
+ BigDecimal cckhWeightAdd = cckhMapByQu.get(countyName).getWeightAdd();
+ BigDecimal cjjcWeightAdd = cjjcMapByQu.get(countyName).getWeightAdd();
+ BigDecimal zfjcWeightAdd = zfjcMapByQu.get(countyName).getWeightAdd();
+ BigDecimal tsjbWeightAdd = tsjbMapByQu.get(countyName).getWeightAdd();
+ BigDecimal zhxWeightAdd = zhxMapByQu.get(countyName).getWeightAdd();
+ BigDecimal addWeight = xxzsWeightAdd.add(xzcfWeightAdd).add(cckhWeightAdd).add(cjjcWeightAdd)
+ .add(zfjcWeightAdd).add(tsjbWeightAdd).add(zhxWeightAdd);
+
+ BigDecimal score = addScore.divide(addWeight, 1, RoundingMode.HALF_UP);
+
+ //todo 临时把成绩写死 因后期新数据导致结果变化 暂且用这个值
+ if ((startTime.getYear() == 2023) && (month.equals("5"))) {
+ if (countyName.equals("长宁区")) {
+ score = BigDecimal.valueOf(93.6);
+ } else if (countyName.equals("金山区")) {
+ score = BigDecimal.valueOf(93);
+ } else if (countyName.equals("杨浦区")) {
+ score = BigDecimal.valueOf(92);
+ } else if (countyName.equals("闵行区")) {
+ score = BigDecimal.valueOf(94.9);
+ } else if (countyName.equals("虹口区")) {
+ score = BigDecimal.valueOf(91);
+ } else if (countyName.equals("嘉定区")) {
+ score = BigDecimal.valueOf(94.9);
+ } else if (countyName.equals("青浦区")) {
+ score = BigDecimal.valueOf(93.7);
+ } else if (countyName.equals("静安区")) {
+ score = BigDecimal.valueOf(94.7);
+ } else if (countyName.equals("徐汇区")) {
+ score = BigDecimal.valueOf(93.4);
+ } else if (countyName.equals("崇明区")) {
+ score = BigDecimal.valueOf(93);
+ } else if (countyName.equals("黄浦区")) {
+ score = BigDecimal.valueOf(94.2);
+ } else if (countyName.equals("宝山区")) {
+ score = BigDecimal.valueOf(93.6);
+ } else if (countyName.equals("奉贤区")) {
+// score = BigDecimal.valueOf(91.7);
+ score = BigDecimal.valueOf(94.8);
+ } else if (countyName.equals("普陀区")) {
+ score = BigDecimal.valueOf(94.9);
+ } else if (countyName.equals("松江区")) {
+ score = BigDecimal.valueOf(90.6);
+ } else if (countyName.equals("浦东新区")) {
+ score = BigDecimal.valueOf(93);
+ } else if (countyName.equals("上海市")) {
+ score = BigDecimal.valueOf(90.1);
+ }
+ }
+
+ return new DaPingScoreQX(countyName, score, xzcfWeiDuScore, xxzsWeiDuScore
+ , tsjbWeiDuScore, zfjcWeiDuScore, cckhWeiDuScore, cjjcWeiDuScore, zhxWeiDuScore, score, addWeight);
+ }).collect(Collectors.toList());
+ return scoreQu;
+ }
+
+
+ @Override
+ public List getCountyMapScoreDasai(String hj, String szqx, LocalDate startTime, LocalDate endTime) {
+
+ //默认2023
+ String year = "2022";
+ String month = startTime.getMonthValue() + "";
+
+ //信息追溯 hj
+ List xxzsVo = zcqyService.getScoreByQuQuery(hj, szqx, endTime);
+ Map xxzsWeightMapByPrimaAndSecon = zhzsWeightService.getWeightMapByPrimaAndSecon("信息追溯", hj);
+ List xxzsScoreByYi = getPrimaryAndQuScore(xxzsVo, xxzsWeightMapByPrimaAndSecon);
+ log.info("信息追溯计算合格");
+
+ //行政处罚 hj + 环节
+ List xzcfVo = xzcfDataService.getScoreByQuQuery(hj, szqx, startTime, endTime);
+ Map xzcfWeightMap = zhzsWeightService.getWeightMapByPrimaAndSecon("行政处罚", hj);
+ List xzcfScoreByYi = getPrimaryAndQuScore(xzcfVo, xzcfWeightMap);
+ log.info("行政处罚计算合格");
+
+ //抽查考核 hj like
+ List cckhVo = cckhDataService.getScoreByQuQuery(hj, szqx, startTime, endTime);
+ String cckhHJ = hj;
+ if (Tools.isNotEmpty(hj)) {
+ if (hj.contains("销售")) {
+ cckhHJ = "食品销售";
+ } else if (hj.contains("餐饮")) {
+ cckhHJ = "餐饮服务";
+ } else if (hj.contains("生产")) {
cckhHJ = "食品生产";
}
}
@@ -408,12 +575,12 @@ public class ZhzsServiceImpl implements ZhzsService {
//抽查考核 hj like
List cckhVo = cckhDataService.getScoreByStreetQuery(hj, szqx, startTime, endTime);
String cckhHJ = hj;
- if (Tools.isNotEmpty(hj)){
- if (hj.contains("销售")){
+ if (Tools.isNotEmpty(hj)) {
+ if (hj.contains("销售")) {
cckhHJ = "食品销售";
- }else if (hj.contains("餐饮")){
+ } else if (hj.contains("餐饮")) {
cckhHJ = "餐饮服务";
- }else if (hj.contains("生产")){
+ } else if (hj.contains("生产")) {
cckhHJ = "食品生产";
}
}
@@ -958,13 +1125,29 @@ public class ZhzsServiceImpl implements ZhzsService {
}
}
+
+ @Override
+ public void initZhzsAllSteetDasai() {
+ String hj = null;
+ String szqx = "奉贤区";
+ LocalDateTime now = LocalDateTime.now();
+ for (String street : streetListInit) {
+ for (int month = 1; month <= 5; month++) {
+ String monthStr = month + "";
+ String yearStr = 2023 + "";
+ MonthTimeVo timeByMonth = TimeUtil.getTimeByMonth(yearStr, monthStr, monthStr, TimeUtil.FORMAT_1);
+ this.setZhzsAllFenzi(timeByMonth.getStartDataTime(), timeByMonth.getEndDataTime(), monthStr, szqx, street, hj, now);
+ }
+//
+ }
+ }
+
@Override
public void testZhzsAllLv(String hj, String szqx, int month, int year) {
LocalDateTime now = LocalDateTime.now();
String monthStr = month + "";
String yearStr = year + "";
MonthTimeVo timeByMonth = TimeUtil.getTimeByMonth(yearStr, monthStr, monthStr, TimeUtil.FORMAT_1);
-
this.setZhzsAllLv(timeByMonth.getStartDataTime(), timeByMonth.getEndDataTime(), monthStr, szqx, hj, now);
}
@@ -983,7 +1166,7 @@ public class ZhzsServiceImpl implements ZhzsService {
String year = startTime.getYear() + "";
//默认2023
//信息追溯 hj
- ZhzsScoreVo xxzs = zcqyService.getZhuiSuLvVo(startTime, endTime, hj, szqx,"" );
+ ZhzsScoreVo xxzs = zcqyService.getZhuiSuLvVo(startTime, endTime, hj, szqx, "");
List xxzsAllLvList = xxzs.getAllLvList();
BigDecimal xxzsWeightScore = xxzs.getWeightScore();
BigDecimal xxzsWeightAdd = xxzs.getWeightAdd();
@@ -1215,6 +1398,114 @@ public class ZhzsServiceImpl implements ZhzsService {
}
+
+ public void setZhzsAllFenzi(LocalDate startTime, LocalDate endTime, String month, String szqx, String street, String hj, LocalDateTime now) {
+
+ //三级指标是否加权
+ boolean isWeightedTertiary = false;
+ //二级指标是否加权
+ boolean isWeightedSecondary = true;
+ //三级指标是否加权
+ boolean isWeightedPrimary = false;
+
+ String year = startTime.getYear() + "";
+ //默认2023
+ //信息追溯 hj
+ ZhzsScoreVo xxzs = zcqyService.getZhuiSuLvVo(startTime, endTime, hj, szqx, street);
+ List xxzsAllLvList = xxzs.getAllLvList();
+ BigDecimal xxzsWeightScore = xxzs.getWeightScore();
+ BigDecimal xxzsWeightAdd = xxzs.getWeightAdd();
+
+ //行政处罚 hj + 环节
+ ZhzsScoreVo xzcf = xzcfDataService.getFaShengLvVoStreet(startTime, endTime, hj, szqx, street);
+ List xzcfAllLvList = xzcf.getAllLvList();
+ BigDecimal xzcfWeightScore = xzcf.getWeightScore();
+ BigDecimal xzcfWeightAdd = xzcf.getWeightAdd();
+
+ //抽检监测 hj + 环节 内部替换销售和流通
+ ZR> cjjc = cjjcService.getTongJiHeGeLvDaPingStreet(startTime, endTime, hj, szqx, street);
+ List cjjcAllLvList = cjjc.getData();
+ BigDecimal cjjcWeightScore = cjjc.getWeightScore();
+ BigDecimal cjjcWeightAdd = cjjc.getWeightAdd();
+
+ //抽查考核 hj like
+ ZhzsScoreVo cckh = cckhDataService.getKaoHeLvVo(startTime, endTime, hj, szqx);
+ List cckhAllLvList = cckh.getAllLvList();
+ BigDecimal cckhWeightScore = cckh.getWeightScore();
+ BigDecimal cckhWeightAdd = cckh.getWeightAdd();
+
+ //执法检查 hj + 环节
+ Map zfjc = (Map) zfjcService.getWenTiLvDaPingStreet(startTime, endTime, hj, szqx, street);
+ List zfjcAllLvList = (List) zfjc.get("data");
+ BigDecimal zfjcWeightScore = (BigDecimal) zfjc.get("weightScore");
+ BigDecimal zfjcWeightAdd = (BigDecimal) zfjc.get("weightAdd");
+
+ //投诉举报 hj
+ ZR> tsjb = tsjbDataService.getTouSuLvDaPingStreet(startTime, endTime, hj, szqx, street);
+ List tsjbAllLvList = tsjb.getData();
+ BigDecimal tsjbWeightScore = tsjb.getWeightScore();
+ BigDecimal tsjbWeightAdd = tsjb.getWeightAdd();
+
+ //综合性指标
+ ZhzsScoreVo zhxzb = getZhxzbAllVo(szqx, year);
+ List zhxzbLvList = zhxzb.getAllLvList();
+ BigDecimal zhxzbWeightScore = zhxzb.getWeightScore();
+ BigDecimal zhxzbWeightAdd = zhxzb.getWeightAdd();
+
+ if ("".equals(szqx)) {
+ szqx = "上海市";
+ }
+
+ ZhzsAllFenziDasai allScore = new ZhzsAllFenziDasai();
+ allScore.setAreaName(szqx);
+ allScore.setStreet(street);
+ allScore.setMonth(month);
+ allScore.setYear(year);
+ allScore.setUpdateTime(now);
+
+ //权重分数总和
+ BigDecimal addScore = xxzsWeightScore.add(xzcfWeightScore).add(cckhWeightScore).add(cjjcWeightScore)
+ .add(zfjcWeightScore).add(tsjbWeightScore).add(zhxzbWeightScore);
+
+ //权重总和
+ BigDecimal weightAdd = xxzsWeightAdd.add(xzcfWeightAdd).add(cckhWeightAdd).add(cjjcWeightAdd)
+ .add(zfjcWeightAdd).add(tsjbWeightAdd).add(zhxzbWeightAdd);
+
+ BigDecimal score = addScore.divide(weightAdd, 1, RoundingMode.HALF_UP);
+
+ //总分写入
+ allScore.setAllScore(score);
+
+ BigDecimal xxzsWeiduScore = xxzs.getWeiduScore();
+ BigDecimal xzcfWeiduScore = xzcf.getWeiduScore();
+ BigDecimal cjjcWeiduScore = cjjc.getWeiduScore();
+ BigDecimal cckhWeiduScore = cckh.getWeiduScore();
+ BigDecimal zfjcWeiduScore = (BigDecimal) zfjc.get("weiduScore");
+ BigDecimal tsjbWeiduScore = tsjb.getWeiduScore();
+ BigDecimal zhxzbWeiduScore = zhxzb.getWeiduScore();
+
+
+ //三级指标分数
+// setZhzsScore(xxzsAllLvList, allScore);
+// setZhzsScore(xzcfAllLvList, allScore);
+ setZhzsFenziCJJC(cjjcAllLvList, allScore);
+// setZhzsScore(cckhAllLvList, allScore);
+ setZhzsFenziZFJC(zfjcAllLvList, allScore);
+ setZhzsFenziTSJB(tsjbAllLvList, allScore);
+// setZhzsScore(zhxzbLvList, allScore);
+ allScore.setXxzs(xxzsWeiduScore);
+ allScore.setXzcf(xzcfWeiduScore);
+ allScore.setCjjc(cjjcWeiduScore);
+ allScore.setCckh(cckhWeiduScore);
+ allScore.setZfjc(zfjcWeiduScore);
+ allScore.setTsjb(tsjbWeiduScore);
+ allScore.setZhxzb(zhxzbWeiduScore);
+
+ //保留历史分数
+ zhzsDasaiService.save(allScore);
+
+ }
+
public static void setZhzsLv(List lvList, ZhzsAllLv zhzsalllv) {
// 获取 Class 对象
Class cls = zhzsalllv.getClass();
@@ -1255,6 +1546,79 @@ public class ZhzsServiceImpl implements ZhzsService {
});
}
+ /**
+ * 写入综合指数三级的分子 (投诉数)
+ *
+ * @param tsjbList
+ * @param zhzsAllScore
+ * @param
+ */
+ public static void setZhzsFenziTSJB(List tsjbList, ZhzsAllFenziDasai zhzsAllScore) {
+ // 获取 Class 对象
+ Class cls = zhzsAllScore.getClass();
+ tsjbList.stream().forEach(lv -> {
+ try {
+ log.debug(lv.getWeightKey());
+ ZhzsLvEnum nowLv = ZhzsLvEnum.getLvByPinName(lv.getWeightKey());
+ // 获取属性字段
+ Field field = cls.getField(nowLv.entityName);
+ // 给属性赋值
+ field.set(zhzsAllScore, BigDecimal.valueOf(lv.getTOUSUSHU()));
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ });
+ }
+
+
+ /**
+ * 写入综合指数三级的分子 (问题数)
+ *
+ * @param lvList
+ * @param zhzsAllScore
+ * @param
+ */
+ public static void setZhzsFenziZFJC(List lvList, ZhzsAllFenziDasai zhzsAllScore) {
+ // 获取 Class 对象
+ Class cls = zhzsAllScore.getClass();
+ lvList.stream().forEach(lv -> {
+ try {
+ log.debug(lv.getWeightKey());
+ ZhzsLvEnum nowLv = ZhzsLvEnum.getLvByPinName(lv.getWeightKey());
+ // 获取属性字段
+ Field field = cls.getField(nowLv.entityName);
+ // 给属性赋值
+ field.set(zhzsAllScore, BigDecimal.valueOf(lv.getWENTISHU()));
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ });
+ }
+
+ /**
+ * 写入综合指数三级的分子 (问题数)
+ *
+ * @param lvList
+ * @param zhzsAllScore
+ * @param
+ */
+ public static void setZhzsFenziCJJC(List lvList, ZhzsAllFenziDasai zhzsAllScore) {
+ // 获取 Class 对象
+ Class cls = zhzsAllScore.getClass();
+ lvList.stream().forEach(lv -> {
+ try {
+ log.info(lv.getWeightKey());
+ ZhzsLvEnum nowLv = ZhzsLvEnum.getLvByPinName(lv.getWeightKey());
+ // 获取属性字段
+ Field field = cls.getField(nowLv.entityName);
+ // 给属性赋值
+ field.set(zhzsAllScore, BigDecimal.valueOf(lv.getBUHEGEJIANSHU()));
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ });
+ }
+
/**
* 写入综合指数三级指标加权成绩
*
diff --git a/src/main/java/com/example/demo/util/ZR.java b/src/main/java/com/example/demo/util/ZR.java
index 470438b..0d6c987 100644
--- a/src/main/java/com/example/demo/util/ZR.java
+++ b/src/main/java/com/example/demo/util/ZR.java
@@ -10,7 +10,7 @@ import java.math.BigDecimal;
@Data
@ApiModel("统一响应体（带成绩）")
public class ZR implements Serializable {
-
+
/**
* 编码：0成功，1和其它数字为失败
*/
@@ -36,13 +36,19 @@ public class ZR implements Serializable {
private BigDecimal score;
/**
- * 权重分数
+ * 当前维度的分数 权重为当前维度权重和 1/7 一般85分
+ */
+ @ApiModelProperty("维度分数")
+ private BigDecimal weiduScore;
+
+ /**
+ * 当前维度三级权重分的和， 权重满为1 一般 15分 可能有bug
*/
@ApiModelProperty("权重分数")
private BigDecimal weightScore;
/**
- * 权重总和
+ * 当前维度的条件下的权重总和 一般 0.15
*/
@ApiModelProperty("权重总和")
private BigDecimal weightAdd;
@@ -52,6 +58,7 @@ public class ZR implements Serializable {
r.data = data;
r.code = 0;
r.score = score;
+ r.weiduScore = score;
r.msg = "success";
return r;
}
@@ -61,6 +68,7 @@ public class ZR implements Serializable {
r.data = data;
r.code = 0;
r.score = score;
+ r.weiduScore = score;
r.weightScore = weightScore;
r.weightAdd = weightAdd;
r.msg = "success";
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 9bcf896..64a6fd7 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -11,22 +11,20 @@ spring:
strict: false
datasource:
db1:
- type: com.alibaba.druid.pool.DruidDataSource
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://localhost:3306/buliang?characterEncoding=utf-8&useSSL=false
- username: root
- password: root
+ url: jdbc:dm://localhost:5236?clobAsString=true
+ username: BL
+ password: asd159159
+ driver-class-name: dm.jdbc.driver.DmDriver
# db2:
# url: jdbc:clickhouse://192.168.1.128:8123
# username: default
# password: ""
# driver-class-name: com.clickhouse.jdbc.ClickHouseDriver
db2:
- type: com.alibaba.druid.pool.DruidDataSource
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://localhost:3306/buliang?characterEncoding=utf-8&useSSL=false
- username: root
- password: root
+ url: jdbc:clickhouse://192.168.1.128:8124
+ username: default
+ password: default
+ driver-class-name: com.clickhouse.jdbc.ClickHouseDriver
hikari:
connection-timeout: 120000
jackson:
diff --git a/src/main/resources/public/app/yujing/controller/dataBuhegelvCtrl.js b/src/main/resources/public/app/yujing/controller/dataBuhegelvCtrl.js
index a0a94cd..e684ff3 100644
--- a/src/main/resources/public/app/yujing/controller/dataBuhegelvCtrl.js
+++ b/src/main/resources/public/app/yujing/controller/dataBuhegelvCtrl.js
@@ -374,1509 +374,1581 @@
- //读取系统缓存
- $scope.SearchCache = function () {
- //var curCacheName = $scope.selectedYear + '-' + $scope.selectedMonth;
- var curCacheName = $scope.selectedYear;
- console.log('curCacheName', curCacheName)
- //跳回主页
- $scope.backMain()
- //$scope.mydata2 = []
- $http.get(Gaddress + '/PageCache/GetPageCache?PageName=databuhegelv&CacheName=' + curCacheName).then(function (res) {
- console.log('返回数据', res);
+ $scope.DasaiCache = function () {
+ dasaiFetchData();
+ }
- if (res.data.data == null) {
- // alert("请先进行缓存操作!")
- layer.msg('请选择年份')
+ $scope.DasaiMonths = ['', 3, 4, 5]
+
+ $scope.DasaiStreet = ["",
+ "庄行镇", "金汇镇", "柘林镇", "上海市奉贤区海湾旅游区",
+// "青村镇",
+// "西渡街道", "四团镇",
+// // "金海街道",
+// "奉浦街道",
+// // "南桥镇",
+// "海湾镇", "奉城镇"
+ // ,"上海海港综合经济开发区"
+ ]
+
+ $scope.DasaiLittlemonth = [-1,1,2,0
+ ]
+ async function dasaiFetchData() {
+ for (let i = 0; i < $scope.DaPingMonths.length; i++) {
+ for (let j = 0; j < $scope.DaPingSzqx.length; j++) {
+ for (let k = 0; k < $scope.DaPingHj.length; k++) {
+ await $http.get(Gaddress + '/ZHZS/GetScoreNewStreetAndShanghaiDasai?szqx=' + $scope.Dasaitreet[i] + '&month='
+ + $scope.DasaiMonths[k] + '&szqx=' + $scope.DaPingSzqx[j]);
+ await $http.get(Gaddress + '/XZCF/GetFaShengLvDaPing?month=' + $scope.DaPingMonths[i] + '&hj='
+ + $scope.DaPingHj[k] + '&szqx=' + $scope.DaPingSzqx[j]);
+ await $http.get(Gaddress + '/CCKH/GetKaoHeDaPing?month=' + $scope.DaPingMonths[i] + '&hj='
+ + $scope.DaPingHj[k] + '&szqx=' + $scope.DaPingSzqx[j]);
+ await $http.get(Gaddress + '/TSJB/GetTouSuLvDaPing?month=' + $scope.DaPingMonths[i] + '&hj='
+ + $scope.DaPingHj[k] + '&szqx=' + $scope.DaPingSzqx[j]);
+ await $http.get(Gaddress + '/XXZS/GetZhuiSuDaPing?month=' + $scope.DaPingMonths[i] + '&hj='
+ + $scope.DaPingHj[k] + '&szqx=' + $scope.DaPingSzqx[j]);
+ await $http.get(Gaddress + '/ZFJC/GetWenTiLvDaPing?month=' + $scope.DaPingMonths[i] + '&hj='
+ + $scope.DaPingHj[k] + '&szqx=' + $scope.DaPingSzqx[j]);
+ await $http.get(Gaddress + '/ZHZS/GetTitleScore?month=' + $scope.DaPingMonths[i] + '&hj='
+ + $scope.DaPingHj[k] + '&szqx=' + $scope.DaPingSzqx[j]);
+ debugger;
+ }
+ }
+ }
+
+ for (let i = 0; i < $scope.DaPingMonths.length; i++) {
+ await $http.get(Gaddress + '/ZHZS/GetZHScoreDaPing?szqx=' + $scope.DaPingSzqx[i]);
+ }
+
+ for (let i = 0; i < $scope.DaPingMonths.length; i++) {
+ for (let k = 0; k < $scope.DaPingHj.length; k++) {
+ await $http.get(Gaddress + '/ZHZS/GetScoreNew?month=' + $scope.DaPingMonths[i] + '&hj='
+ + $scope.DaPingHj[k]);
+ }
+ }
+
+ for (let i = 0; i < $scope.DaPingMonths.length; i++) {
+ for (let j = 0; j < $scope.DaPingSzqx.length; j++) {
+ await $http.get(Gaddress + '/CJJC/GetScoreByHuanJie?month=' + $scope.DaPingMonths[i]
+ + '&szqx=' + $scope.DaPingSzqx[j]);
+ await $http.get(Gaddress + '/CCKH/GetScoreByHuanJie?month=' + $scope.DaPingMonths[i]
+ + '&szqx=' + $scope.DaPingSzqx[j]);
+ await $http.get(Gaddress + '/XZCF/GetScoreByHuanJie?month=' + $scope.DaPingMonths[i]
+ + '&szqx=' + $scope.DaPingSzqx[j]);
+ await $http.get(Gaddress + '/TSJB/GetScoreByHuanJie?month=' + $scope.DaPingMonths[i]
+ + '&szqx=' + $scope.DaPingSzqx[j]);
+ await $http.get(Gaddress + '/XXZS/GetScoreByHuanJie?month=' + $scope.DaPingMonths[i]
+ + '&szqx=' + $scope.DaPingSzqx[j]);
+ await $http.get(Gaddress + '/ZFJC/GetScoreByHuanJie?month=' + $scope.DaPingMonths[i]
+ + '&szqx=' + $scope.DaPingSzqx[j]);
+ }
+ }
+ }
+
+
+ //读取系统缓存
+ $scope.SearchCache = function () {
+ //var curCacheName = $scope.selectedYear + '-' + $scope.selectedMonth;
+ var curCacheName = $scope.selectedYear;
+ console.log('curCacheName', curCacheName)
+ //跳回主页
+ $scope.backMain()
+ //$scope.mydata2 = []
+ $http.get(Gaddress + '/PageCache/GetPageCache?PageName=databuhegelv&CacheName=' + curCacheName).then(function (res) {
+ console.log('返回数据', res);
+
+ if (res.data.data == null) {
+ // alert("请先进行缓存操作!")
+ layer.msg('请选择年份')
+ return;
+ }
+ $scope.displayYear = $scope.selectedYear;
+ $scope.displayMonth = $scope.selectedMonth;
+ //$scope.mydata2 = JSON.parse(res.data.data.CacheData).datapage;
+ //$scope.mydata = JSON.parse(res.data.data.CacheData).datadetail;
+
+ $scope.SplitData(res.data.data.CACHEDATA)
+
+
+ $scope.pageDisplayYear = '(' + $scope.displayYear + ')'
+
+ $scope.GetMainPageDataFromCache()
+
+
+ $scope.tempYear = $scope.selectedYear;
+ })
+ }
+
+ /////////////////////////////////////////////////////////////////////////////////////////
+
+ //把缓存数据进行分解
+ $scope.SplitData = function (data) {
+ //获取可以测试用数据打他
+ var res = JSON.parse(data)
+ //console.log('testres', res[0].arrShouCiBuHeGeYuJing);
+
+ $scope.arrShouCiBuHeGeYuJing = res[0].arrShouCiBuHeGeYuJing;
+
+ $scope.arrBuHeGeLvShangSheng = res[1].arrBuHeGeLvShangSheng;
+ $scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing = res[2].arrBeiChouYangDanWeiDuoJianBuHeGeYuJing
+ $scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing = res[3].arrBeiChouYangDanWeiDuoCiBuHeGeYuJing;
+ $scope.arrShengChanQiYeDuoJianBuHeGeYuJing = res[4].arrShengChanQiYeDuoJianBuHeGeYuJing;
+
+ $scope.arrBuHeGeLvPianGaoYuJing = res[5].arrBuHeGeLvPianGaoYuJing;
+ $scope.arrChanDiShengFenBuHeGeLvYuJing = res[6].arrChanDiShengFenBuHeGeLvYuJing;
+ $scope.arrJinKouShiPinBuHeGeLvYuJing = res[7].arrJinKouShiPinBuHeGeLvYuJing;
+ $scope.arrWangLuoPingTaiBuHeGeLvYuJing = res[8].arrWangLuoPingTaiBuHeGeLvYuJing;
+
+ $scope.arrJianCeZhiYiChangYuJing = res[9].arrJianCeZhiYiChangYuJing;
+ $scope.arrWuRanWuZongShanShiBaoLuLiangYuJing = res[10].arrWuRanWuZongShanShiBaoLuLiangYuJing;
+
+
+ }
+
+ //改成元数据数据生成首页数据
+ $scope.GetMainPageDataFromCache = function () {
+
+ var abbccc = $scope.arrShouCiBuHeGeYuJing.reduce(function (prev, cur) {
+ return prev + cur.data.length;
+ }, 0);
+ console.log('testyujing', $scope.arrShouCiBuHeGeYuJing, abbccc);
+
+
+ //1首发预警-首次不合格预警
+ $scope.jsonSFYJ_SCBHGYJ = {
+ 'name': '首发预警',
+ 'name2': '首次不合格预警',
+ 'one': $scope.GetCalc($scope.arrShouCiBuHeGeYuJing, 1),
+ 'two': $scope.GetCalc($scope.arrShouCiBuHeGeYuJing, 2),
+ 'three': $scope.GetCalc($scope.arrShouCiBuHeGeYuJing, 3),
+ 'four': $scope.GetCalc($scope.arrShouCiBuHeGeYuJing, 4),
+ 'five': $scope.GetCalc($scope.arrShouCiBuHeGeYuJing, 5),
+ 'six': $scope.GetCalc($scope.arrShouCiBuHeGeYuJing, 6),
+ 'seven': $scope.GetCalc($scope.arrShouCiBuHeGeYuJing, 7),
+ 'eight': $scope.GetCalc($scope.arrShouCiBuHeGeYuJing, 8),
+ 'nine': $scope.GetCalc($scope.arrShouCiBuHeGeYuJing, 9),
+ 'ten': $scope.GetCalc($scope.arrShouCiBuHeGeYuJing, 10),
+ 'eleven': $scope.GetCalc($scope.arrShouCiBuHeGeYuJing, 11),
+ 'twelve': $scope.GetCalc($scope.arrShouCiBuHeGeYuJing, 12),
+ //'total': $scope.arrShouCiBuHeGeYuJing.reduce(function (prev, cur) {
+ // return prev + cur.data.length;
+ //}, 0),
+ 'lei': 1
+ };
+ //计算不出来,先这么改221212
+ $scope.jsonSFYJ_SCBHGYJ.total = $scope.jsonSFYJ_SCBHGYJ.one +
+ $scope.jsonSFYJ_SCBHGYJ.two +
+ $scope.jsonSFYJ_SCBHGYJ.three +
+ $scope.jsonSFYJ_SCBHGYJ.four +
+ $scope.jsonSFYJ_SCBHGYJ.five +
+ $scope.jsonSFYJ_SCBHGYJ.six +
+ $scope.jsonSFYJ_SCBHGYJ.seven +
+ $scope.jsonSFYJ_SCBHGYJ.eight +
+ $scope.jsonSFYJ_SCBHGYJ.nine +
+ $scope.jsonSFYJ_SCBHGYJ.ten +
+ $scope.jsonSFYJ_SCBHGYJ.eleven +
+ $scope.jsonSFYJ_SCBHGYJ.twelve;
+
+ //2.1频发预警-不合格率上升
+ $scope.jsonPFYJ_BHGLSS = {
+ 'name': '频发预警',
+ 'name2': '不合格率上升',
+ 'one': $scope.GetCalc($scope.arrBuHeGeLvShangSheng, 1),
+ 'two': $scope.GetCalc($scope.arrBuHeGeLvShangSheng, 2),
+ 'three': $scope.GetCalc($scope.arrBuHeGeLvShangSheng, 3),
+ 'four': $scope.GetCalc($scope.arrBuHeGeLvShangSheng, 4),
+ 'five': $scope.GetCalc($scope.arrBuHeGeLvShangSheng, 5),
+ 'six': $scope.GetCalc($scope.arrBuHeGeLvShangSheng, 6),
+ 'seven': $scope.GetCalc($scope.arrBuHeGeLvShangSheng, 7),
+ 'eight': $scope.GetCalc($scope.arrBuHeGeLvShangSheng, 8),
+ 'nine': $scope.GetCalc($scope.arrBuHeGeLvShangSheng, 9),
+ 'ten': $scope.GetCalc($scope.arrBuHeGeLvShangSheng, 10),
+ 'eleven': $scope.GetCalc($scope.arrBuHeGeLvShangSheng, 11),
+ 'twelve': $scope.GetCalc($scope.arrBuHeGeLvShangSheng, 12),
+ //'total': $scope.arrBuHeGeLvShangSheng.reduce(function (prev, cur) {
+ // return prev + cur.data.length;
+ //}, 0),
+ 'lei': 2
+ };
+ $scope.jsonPFYJ_BHGLSS.total = $scope.jsonPFYJ_BHGLSS.one +
+ $scope.jsonPFYJ_BHGLSS.two +
+ $scope.jsonPFYJ_BHGLSS.three +
+ $scope.jsonPFYJ_BHGLSS.four +
+ $scope.jsonPFYJ_BHGLSS.five +
+ $scope.jsonPFYJ_BHGLSS.six +
+ $scope.jsonPFYJ_BHGLSS.seven +
+ $scope.jsonPFYJ_BHGLSS.eight +
+ $scope.jsonPFYJ_BHGLSS.nine +
+ $scope.jsonPFYJ_BHGLSS.ten +
+ $scope.jsonPFYJ_BHGLSS.eleven +
+ $scope.jsonPFYJ_BHGLSS.twelve;
+
+
+ //2.2频发预警-被抽样单位多件不合格预警
+ $scope.jsonPFYJ_BCYDWDJBHGYJ = {
+ 'name': '频发预警',
+ 'name2': '被抽样单位多件不合格预警',
+ 'one': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, 1),
+ 'two': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, 2),
+ 'three': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, 3),
+ 'four': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, 4),
+ 'five': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, 5),
+ 'six': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, 6),
+ 'seven': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, 7),
+ 'eight': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, 8),
+ 'nine': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, 9),
+ 'ten': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, 10),
+ 'eleven': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, 11),
+ 'twelve': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, 12),
+ //'total': $scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing.reduce(function (prev, cur) {
+ // return prev + cur.data.length;
+ //}, 0),
+ 'lei': 2
+ };
+
+ console.log("被抽样单位多件不合格预警", $scope.jsonPFYJ_BCYDWDJBHGYJ)
+
+ $scope.jsonPFYJ_BCYDWDJBHGYJ.total = $scope.jsonPFYJ_BCYDWDJBHGYJ.one +
+ $scope.jsonPFYJ_BCYDWDJBHGYJ.two +
+ $scope.jsonPFYJ_BCYDWDJBHGYJ.three +
+ $scope.jsonPFYJ_BCYDWDJBHGYJ.four +
+ $scope.jsonPFYJ_BCYDWDJBHGYJ.five +
+ $scope.jsonPFYJ_BCYDWDJBHGYJ.six +
+ $scope.jsonPFYJ_BCYDWDJBHGYJ.seven +
+ $scope.jsonPFYJ_BCYDWDJBHGYJ.eight +
+ $scope.jsonPFYJ_BCYDWDJBHGYJ.nine +
+ $scope.jsonPFYJ_BCYDWDJBHGYJ.ten +
+ $scope.jsonPFYJ_BCYDWDJBHGYJ.eleven +
+ $scope.jsonPFYJ_BCYDWDJBHGYJ.twelve;
+
+
+ //2.3频发预警-被抽样单位多次不合格预警
+ $scope.jsonPFYJ_BCYDWDCBHGYJ = {
+ 'name': '频发预警',
+ 'name2': '被抽样单位多次不合格预警',
+ 'one': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 1),
+ 'two': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 2),
+ 'three': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 3),
+ 'four': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 4),
+ 'five': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 5),
+ 'six': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 6),
+ 'seven': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 7),
+ 'eight': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 8),
+ 'nine': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 9),
+ 'ten': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 10),
+ 'eleven': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 11),
+ 'twelve': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 12),
+ //'total': $scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing.reduce(function (prev, cur) {
+ // return prev + cur.data.length;
+ //}, 0),
+ 'lei': 2
+ };
+
+ console.log('专门查看被抽样单位多次不合格预警7月份', $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 7));
+
+ $scope.jsonPFYJ_BCYDWDCBHGYJ.total = $scope.jsonPFYJ_BCYDWDCBHGYJ.one +
+ $scope.jsonPFYJ_BCYDWDCBHGYJ.two +
+ $scope.jsonPFYJ_BCYDWDCBHGYJ.three +
+ $scope.jsonPFYJ_BCYDWDCBHGYJ.four +
+ $scope.jsonPFYJ_BCYDWDCBHGYJ.five +
+ $scope.jsonPFYJ_BCYDWDCBHGYJ.six +
+ $scope.jsonPFYJ_BCYDWDCBHGYJ.seven +
+ $scope.jsonPFYJ_BCYDWDCBHGYJ.eight +
+ $scope.jsonPFYJ_BCYDWDCBHGYJ.nine +
+ $scope.jsonPFYJ_BCYDWDCBHGYJ.ten +
+ $scope.jsonPFYJ_BCYDWDCBHGYJ.eleven +
+ $scope.jsonPFYJ_BCYDWDCBHGYJ.twelve;
+
+ //2.4频发预警-生产企业多件不合格预警
+ $scope.jsonPFYJ_SCQYDJBHGYJ = {
+ 'name': '频发预警',
+ 'name2': '生产企业多件不合格预警',
+ 'one': $scope.GetCalc($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, 1),
+ 'two': $scope.GetCalc($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, 2),
+ 'three': $scope.GetCalc($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, 3),
+ 'four': $scope.GetCalc($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, 4),
+ 'five': $scope.GetCalc($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, 5),
+ 'six': $scope.GetCalc($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, 6),
+ 'seven': $scope.GetCalc($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, 7),
+ 'eight': $scope.GetCalc($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, 8),
+ 'nine': $scope.GetCalc($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, 9),
+ 'ten': $scope.GetCalc($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, 10),
+ 'eleven': $scope.GetCalc($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, 11),
+ 'twelve': $scope.GetCalc($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, 12),
+ //'total': $scope.arrShengChanQiYeDuoJianBuHeGeYuJing.reduce(function (prev, cur) {
+ // return prev + cur.data.length;
+ //}, 0),
+ 'lei': 2
+ };
+
+ console.log(' $scope.jsonPFYJ_SCQYDJBHG多件不合格预警', $scope.jsonPFYJ_SCQYDJBHGYJ)
+
+ $scope.jsonPFYJ_SCQYDJBHGYJ.total = $scope.jsonPFYJ_SCQYDJBHGYJ.one +
+ $scope.jsonPFYJ_SCQYDJBHGYJ.two +
+ $scope.jsonPFYJ_SCQYDJBHGYJ.three +
+ $scope.jsonPFYJ_SCQYDJBHGYJ.four +
+ $scope.jsonPFYJ_SCQYDJBHGYJ.five +
+ $scope.jsonPFYJ_SCQYDJBHGYJ.six +
+ $scope.jsonPFYJ_SCQYDJBHGYJ.seven +
+ $scope.jsonPFYJ_SCQYDJBHGYJ.eight +
+ $scope.jsonPFYJ_SCQYDJBHGYJ.nine +
+ $scope.jsonPFYJ_SCQYDJBHGYJ.ten +
+ $scope.jsonPFYJ_SCQYDJBHGYJ.eleven +
+ $scope.jsonPFYJ_SCQYDJBHGYJ.twelve;
+
+
+ //3.1高发预警-不合格率偏高预警
+ $scope.jsonGFYJ_BHGLPGYJ = {
+ 'name': '高发预警',
+ 'name2': '不合格率偏高预警',
+ 'one': $scope.GetCalc($scope.arrBuHeGeLvPianGaoYuJing, 1),
+ 'two': $scope.GetCalc($scope.arrBuHeGeLvPianGaoYuJing, 2),
+ 'three': $scope.GetCalc($scope.arrBuHeGeLvPianGaoYuJing, 3),
+ 'four': $scope.GetCalc($scope.arrBuHeGeLvPianGaoYuJing, 4),
+ 'five': $scope.GetCalc($scope.arrBuHeGeLvPianGaoYuJing, 5),
+ 'six': $scope.GetCalc($scope.arrBuHeGeLvPianGaoYuJing, 6),
+ 'seven': $scope.GetCalc($scope.arrBuHeGeLvPianGaoYuJing, 7),
+ 'eight': $scope.GetCalc($scope.arrBuHeGeLvPianGaoYuJing, 8),
+ 'nine': $scope.GetCalc($scope.arrBuHeGeLvPianGaoYuJing, 9),
+ 'ten': $scope.GetCalc($scope.arrBuHeGeLvPianGaoYuJing, 10),
+ 'eleven': $scope.GetCalc($scope.arrBuHeGeLvPianGaoYuJing, 11),
+ 'twelve': $scope.GetCalc($scope.arrBuHeGeLvPianGaoYuJing, 12),
+ //'total': $scope.arrBuHeGeLvPianGaoYuJing.reduce(function (prev, cur) {
+ // return prev + cur.data.length;
+ //}, 0),
+ 'lei': 3
+ };
+
+ $scope.jsonGFYJ_BHGLPGYJ.total = $scope.jsonGFYJ_BHGLPGYJ.one +
+ $scope.jsonGFYJ_BHGLPGYJ.two +
+ $scope.jsonGFYJ_BHGLPGYJ.three +
+ $scope.jsonGFYJ_BHGLPGYJ.four +
+ $scope.jsonGFYJ_BHGLPGYJ.five +
+ $scope.jsonGFYJ_BHGLPGYJ.six +
+ $scope.jsonGFYJ_BHGLPGYJ.seven +
+ $scope.jsonGFYJ_BHGLPGYJ.eight +
+ $scope.jsonGFYJ_BHGLPGYJ.nine +
+ $scope.jsonGFYJ_BHGLPGYJ.ten +
+ $scope.jsonGFYJ_BHGLPGYJ.eleven +
+ $scope.jsonGFYJ_BHGLPGYJ.twelve;
+
+
+ //3.2高发预警-产地省份不合格率预警
+ $scope.jsonGFYJ_CDSFBHGLYJ = {
+ 'name': '高发预警',
+ 'name2': '产地省份不合格率预警',
+ 'one': $scope.GetCalc($scope.arrChanDiShengFenBuHeGeLvYuJing, 1),
+ 'two': $scope.GetCalc($scope.arrChanDiShengFenBuHeGeLvYuJing, 2),
+ 'three': $scope.GetCalc($scope.arrChanDiShengFenBuHeGeLvYuJing, 3),
+ 'four': $scope.GetCalc($scope.arrChanDiShengFenBuHeGeLvYuJing, 4),
+ 'five': $scope.GetCalc($scope.arrChanDiShengFenBuHeGeLvYuJing, 5),
+ 'six': $scope.GetCalc($scope.arrChanDiShengFenBuHeGeLvYuJing, 6),
+ 'seven': $scope.GetCalc($scope.arrChanDiShengFenBuHeGeLvYuJing, 7),
+ 'eight': $scope.GetCalc($scope.arrChanDiShengFenBuHeGeLvYuJing, 8),
+ 'nine': $scope.GetCalc($scope.arrChanDiShengFenBuHeGeLvYuJing, 9),
+ 'ten': $scope.GetCalc($scope.arrChanDiShengFenBuHeGeLvYuJing, 10),
+ 'eleven': $scope.GetCalc($scope.arrChanDiShengFenBuHeGeLvYuJing, 11),
+ 'twelve': $scope.GetCalc($scope.arrChanDiShengFenBuHeGeLvYuJing, 12),
+ //'total': $scope.arrChanDiShengFenBuHeGeLvYuJing.reduce(function (prev, cur) {
+ // return prev + cur.data.length;
+ //}, 0),
+ 'lei': 3
+ };
+
+ $scope.jsonGFYJ_CDSFBHGLYJ.total = $scope.jsonGFYJ_CDSFBHGLYJ.one +
+ $scope.jsonGFYJ_CDSFBHGLYJ.two +
+ $scope.jsonGFYJ_CDSFBHGLYJ.three +
+ $scope.jsonGFYJ_CDSFBHGLYJ.four +
+ $scope.jsonGFYJ_CDSFBHGLYJ.five +
+ $scope.jsonGFYJ_CDSFBHGLYJ.six +
+ $scope.jsonGFYJ_CDSFBHGLYJ.seven +
+ $scope.jsonGFYJ_CDSFBHGLYJ.eight +
+ $scope.jsonGFYJ_CDSFBHGLYJ.nine +
+ $scope.jsonGFYJ_CDSFBHGLYJ.ten +
+ $scope.jsonGFYJ_CDSFBHGLYJ.eleven +
+ $scope.jsonGFYJ_CDSFBHGLYJ.twelve;
+
+ //3.3高发预警-进口食品不合格率预警
+ $scope.jsonGFYJ_JKSPBHGLYJ = {
+ 'name': '高发预警',
+ 'name2': '进口食品不合格率预警',
+ 'one': $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 1),
+ 'two': $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 2),
+ 'three': $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 3),
+ 'four': $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 4),
+ 'five': $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 5),
+ 'six': $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 6),
+ 'seven': $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 7),
+ 'eight': $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 8),
+ 'nine': $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 9),
+ 'ten': $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 10),
+ 'eleven': $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 11),
+ 'twelve': $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 12),
+ //'total': $scope.arrJinKouShiPinBuHeGeLvYuJing.reduce(function (prev, cur) {
+ // return prev + cur.data.length;
+ //}, 0),
+ 'lei': 3
+ };
+
+ console.log('进口食品不合格率预警', $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 6));
+
+ $scope.jsonGFYJ_JKSPBHGLYJ.total = $scope.jsonGFYJ_JKSPBHGLYJ.one +
+ $scope.jsonGFYJ_JKSPBHGLYJ.two +
+ $scope.jsonGFYJ_JKSPBHGLYJ.three +
+ $scope.jsonGFYJ_JKSPBHGLYJ.four +
+ $scope.jsonGFYJ_JKSPBHGLYJ.five +
+ $scope.jsonGFYJ_JKSPBHGLYJ.six +
+ $scope.jsonGFYJ_JKSPBHGLYJ.seven +
+ $scope.jsonGFYJ_JKSPBHGLYJ.eight +
+ $scope.jsonGFYJ_JKSPBHGLYJ.nine +
+ $scope.jsonGFYJ_JKSPBHGLYJ.ten +
+ $scope.jsonGFYJ_JKSPBHGLYJ.eleven +
+ $scope.jsonGFYJ_JKSPBHGLYJ.twelve;
+
+
+ //3.4高发预警-网络平台不合格率预警
+ $scope.jsonGFYJ_WLPTBHGLYJ = {
+ 'name': '高发预警',
+ 'name2': '网络平台不合格率预警',
+ 'one': $scope.GetCalc($scope.arrWangLuoPingTaiBuHeGeLvYuJing, 1),
+ 'two': $scope.GetCalc($scope.arrWangLuoPingTaiBuHeGeLvYuJing, 2),
+ 'three': $scope.GetCalc($scope.arrWangLuoPingTaiBuHeGeLvYuJing, 3),
+ 'four': $scope.GetCalc($scope.arrWangLuoPingTaiBuHeGeLvYuJing, 4),
+ 'five': $scope.GetCalc($scope.arrWangLuoPingTaiBuHeGeLvYuJing, 5),
+ 'six': $scope.GetCalc($scope.arrWangLuoPingTaiBuHeGeLvYuJing, 6),
+ 'seven': $scope.GetCalc($scope.arrWangLuoPingTaiBuHeGeLvYuJing, 7),
+ 'eight': $scope.GetCalc($scope.arrWangLuoPingTaiBuHeGeLvYuJing, 8),
+ 'nine': $scope.GetCalc($scope.arrWangLuoPingTaiBuHeGeLvYuJing, 9),
+ 'ten': $scope.GetCalc($scope.arrWangLuoPingTaiBuHeGeLvYuJing, 10),
+ 'eleven': $scope.GetCalc($scope.arrWangLuoPingTaiBuHeGeLvYuJing, 11),
+ 'twelve': $scope.GetCalc($scope.arrWangLuoPingTaiBuHeGeLvYuJing, 12),
+ //'total': $scope.arrJinKouShiPinBuHeGeLvYuJing.reduce(function (prev, cur) {
+ // return prev + cur.data.length;
+ //}, 0),
+ 'lei': 3
+ };
+
+ $scope.jsonGFYJ_WLPTBHGLYJ.total = $scope.jsonGFYJ_WLPTBHGLYJ.one +
+ $scope.jsonGFYJ_WLPTBHGLYJ.two +
+ $scope.jsonGFYJ_WLPTBHGLYJ.three +
+ $scope.jsonGFYJ_WLPTBHGLYJ.four +
+ $scope.jsonGFYJ_WLPTBHGLYJ.five +
+ $scope.jsonGFYJ_WLPTBHGLYJ.six +
+ $scope.jsonGFYJ_WLPTBHGLYJ.seven +
+ $scope.jsonGFYJ_WLPTBHGLYJ.eight +
+ $scope.jsonGFYJ_WLPTBHGLYJ.nine +
+ $scope.jsonGFYJ_WLPTBHGLYJ.ten +
+ $scope.jsonGFYJ_WLPTBHGLYJ.eleven +
+ $scope.jsonGFYJ_WLPTBHGLYJ.twelve;
+
+
+ //4污染预警-检测值异常预警
+ $scope.jsonWRYJ_JCZYCYJ = {
+ 'name': '污染预警',
+ 'name2': '检测值异常预警',
+ 'one': $scope.GetCalc($scope.arrJianCeZhiYiChangYuJing, 1),
+ 'two': $scope.GetCalc($scope.arrJianCeZhiYiChangYuJing, 2),
+ 'three': $scope.GetCalc($scope.arrJianCeZhiYiChangYuJing, 3),
+ 'four': $scope.GetCalc($scope.arrJianCeZhiYiChangYuJing, 4),
+ 'five': $scope.GetCalc($scope.arrJianCeZhiYiChangYuJing, 5),
+ 'six': $scope.GetCalc($scope.arrJianCeZhiYiChangYuJing, 6),
+ 'seven': $scope.GetCalc($scope.arrJianCeZhiYiChangYuJing, 7),
+ 'eight': $scope.GetCalc($scope.arrJianCeZhiYiChangYuJing, 8),
+ 'nine': $scope.GetCalc($scope.arrJianCeZhiYiChangYuJing, 9),
+ 'ten': $scope.GetCalc($scope.arrJianCeZhiYiChangYuJing, 10),
+ 'eleven': $scope.GetCalc($scope.arrJianCeZhiYiChangYuJing, 11),
+ 'twelve': $scope.GetCalc($scope.arrJianCeZhiYiChangYuJing, 12),
+ //'total': $scope.arrJianCeZhiYiChangYuJing.reduce(function (prev, cur) {
+ // return prev + cur.data.length;
+ //}, 0),
+ 'lei': 4
+ };
+
+ $scope.jsonWRYJ_JCZYCYJ.total = $scope.jsonWRYJ_JCZYCYJ.one +
+ $scope.jsonWRYJ_JCZYCYJ.two +
+ $scope.jsonWRYJ_JCZYCYJ.three +
+ $scope.jsonWRYJ_JCZYCYJ.four +
+ $scope.jsonWRYJ_JCZYCYJ.five +
+ $scope.jsonWRYJ_JCZYCYJ.six +
+ $scope.jsonWRYJ_JCZYCYJ.seven +
+ $scope.jsonWRYJ_JCZYCYJ.eight +
+ $scope.jsonWRYJ_JCZYCYJ.nine +
+ $scope.jsonWRYJ_JCZYCYJ.ten +
+ $scope.jsonWRYJ_JCZYCYJ.eleven +
+ $scope.jsonWRYJ_JCZYCYJ.twelve;
+
+
+ //5暴露预警-污染物总膳食暴露量预警
+ $scope.jsonBLYJ_WRWZSSBLLYJ = {
+ 'name': '风险评估预警',
+ 'name2': '污染物总膳食暴露量预警',
+ 'one': $scope.GetCalc($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, 1),
+ 'two': $scope.GetCalc($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, 2),
+ 'three': $scope.GetCalc($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, 3),
+ 'four': $scope.GetCalc($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, 4),
+ 'five': $scope.GetCalc($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, 5),
+ 'six': $scope.GetCalc($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, 6),
+ 'seven': $scope.GetCalc($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, 7),
+ 'eight': $scope.GetCalc($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, 8),
+ 'nine': $scope.GetCalc($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, 9),
+ 'ten': $scope.GetCalc($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, 10),
+ 'eleven': $scope.GetCalc($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, 11),
+ 'twelve': $scope.GetCalc($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, 12),
+ //'total': $scope.arrWuRanWuZongShanShiBaoLuLiangYuJing.reduce(function (prev, cur) {
+ // return prev + cur.data.length;
+ //}, 0),
+ 'lei': 5
+ };
+
+ $scope.jsonBLYJ_WRWZSSBLLYJ.total = $scope.jsonBLYJ_WRWZSSBLLYJ.one +
+ $scope.jsonBLYJ_WRWZSSBLLYJ.two +
+ $scope.jsonBLYJ_WRWZSSBLLYJ.three +
+ $scope.jsonBLYJ_WRWZSSBLLYJ.four +
+ $scope.jsonBLYJ_WRWZSSBLLYJ.five +
+ $scope.jsonBLYJ_WRWZSSBLLYJ.six +
+ $scope.jsonBLYJ_WRWZSSBLLYJ.seven +
+ $scope.jsonBLYJ_WRWZSSBLLYJ.eight +
+ $scope.jsonBLYJ_WRWZSSBLLYJ.nine +
+ $scope.jsonBLYJ_WRWZSSBLLYJ.ten +
+ $scope.jsonBLYJ_WRWZSSBLLYJ.eleven +
+ $scope.jsonBLYJ_WRWZSSBLLYJ.twelve;
+
+
+ //console.log('检查频发预警月份合计', $scope.jsonPFYJ_BHGLSS.three , $scope.jsonPFYJ_BCYDWDJBHGYJ.three , $scope.jsonPFYJ_BCYDWDCBHGYJ.three , $scope.jsonPFYJ_BCYDWDJBHGYJ.three)
+
+ //2频发预警
+ $scope.jsonPFYJ = {
+ 'name': '频发预警',
+ 'name2': '',
+ 'one': $scope.jsonPFYJ_BHGLSS.one + $scope.jsonPFYJ_BCYDWDJBHGYJ.one + $scope.jsonPFYJ_BCYDWDCBHGYJ.one + $scope.jsonPFYJ_SCQYDJBHGYJ.one,
+ 'two': $scope.jsonPFYJ_BHGLSS.two + $scope.jsonPFYJ_BCYDWDJBHGYJ.two + $scope.jsonPFYJ_BCYDWDCBHGYJ.two + $scope.jsonPFYJ_SCQYDJBHGYJ.two,
+ 'three': $scope.jsonPFYJ_BHGLSS.three + $scope.jsonPFYJ_BCYDWDJBHGYJ.three + $scope.jsonPFYJ_BCYDWDCBHGYJ.three + $scope.jsonPFYJ_SCQYDJBHGYJ.three,
+ 'four': $scope.jsonPFYJ_BHGLSS.four + $scope.jsonPFYJ_BCYDWDJBHGYJ.four + $scope.jsonPFYJ_BCYDWDCBHGYJ.four + $scope.jsonPFYJ_SCQYDJBHGYJ.four,
+ 'five': $scope.jsonPFYJ_BHGLSS.five + $scope.jsonPFYJ_BCYDWDJBHGYJ.five + $scope.jsonPFYJ_BCYDWDCBHGYJ.five + $scope.jsonPFYJ_SCQYDJBHGYJ.five,
+ 'six': $scope.jsonPFYJ_BHGLSS.six + $scope.jsonPFYJ_BCYDWDJBHGYJ.six + $scope.jsonPFYJ_BCYDWDCBHGYJ.six + $scope.jsonPFYJ_SCQYDJBHGYJ.six,
+ 'seven': $scope.jsonPFYJ_BHGLSS.seven + $scope.jsonPFYJ_BCYDWDJBHGYJ.seven + $scope.jsonPFYJ_BCYDWDCBHGYJ.seven + $scope.jsonPFYJ_SCQYDJBHGYJ.seven,
+ 'eight': $scope.jsonPFYJ_BHGLSS.eight + $scope.jsonPFYJ_BCYDWDJBHGYJ.eight + $scope.jsonPFYJ_BCYDWDCBHGYJ.eight + $scope.jsonPFYJ_SCQYDJBHGYJ.eight,
+ 'nine': $scope.jsonPFYJ_BHGLSS.nine + $scope.jsonPFYJ_BCYDWDJBHGYJ.nine + $scope.jsonPFYJ_BCYDWDCBHGYJ.nine + $scope.jsonPFYJ_SCQYDJBHGYJ.nine,
+ 'ten': $scope.jsonPFYJ_BHGLSS.ten + $scope.jsonPFYJ_BCYDWDJBHGYJ.ten + $scope.jsonPFYJ_BCYDWDCBHGYJ.ten + $scope.jsonPFYJ_SCQYDJBHGYJ.ten,
+ 'eleven': $scope.jsonPFYJ_BHGLSS.eleven + $scope.jsonPFYJ_BCYDWDJBHGYJ.eleven + $scope.jsonPFYJ_BCYDWDCBHGYJ.eleven + $scope.jsonPFYJ_SCQYDJBHGYJ.eleven,
+ 'twelve': $scope.jsonPFYJ_BHGLSS.twelve + $scope.jsonPFYJ_BCYDWDJBHGYJ.twelve + $scope.jsonPFYJ_BCYDWDCBHGYJ.twelve + $scope.jsonPFYJ_SCQYDJBHGYJ.twelve,
+ 'total': $scope.jsonPFYJ_BHGLSS.total + $scope.jsonPFYJ_BCYDWDJBHGYJ.total + $scope.jsonPFYJ_BCYDWDCBHGYJ.total + $scope.jsonPFYJ_SCQYDJBHGYJ.total,
+ 'lei': 2
+ };
+
+
+ console.log('频发预警综合', $scope.jsonPFYJ);
+ //3高发预警
+ $scope.jsonGFYJ = {
+ 'name': '高发预警',
+ 'name2': '',
+ 'one': $scope.jsonGFYJ_BHGLPGYJ.one + $scope.jsonGFYJ_CDSFBHGLYJ.one + $scope.jsonGFYJ_JKSPBHGLYJ.one + $scope.jsonGFYJ_WLPTBHGLYJ.one,
+ 'two': $scope.jsonGFYJ_BHGLPGYJ.two + $scope.jsonGFYJ_CDSFBHGLYJ.two + $scope.jsonGFYJ_JKSPBHGLYJ.two + $scope.jsonGFYJ_WLPTBHGLYJ.two,
+ 'three': $scope.jsonGFYJ_BHGLPGYJ.three + $scope.jsonGFYJ_CDSFBHGLYJ.three + $scope.jsonGFYJ_JKSPBHGLYJ.three + $scope.jsonGFYJ_WLPTBHGLYJ.three,
+ 'four': $scope.jsonGFYJ_BHGLPGYJ.four + $scope.jsonGFYJ_CDSFBHGLYJ.four + $scope.jsonGFYJ_JKSPBHGLYJ.four + $scope.jsonGFYJ_WLPTBHGLYJ.four,
+ 'five': $scope.jsonGFYJ_BHGLPGYJ.five + $scope.jsonGFYJ_CDSFBHGLYJ.five + $scope.jsonGFYJ_JKSPBHGLYJ.five + $scope.jsonGFYJ_WLPTBHGLYJ.five,
+ 'six': $scope.jsonGFYJ_BHGLPGYJ.six + $scope.jsonGFYJ_CDSFBHGLYJ.six + $scope.jsonGFYJ_JKSPBHGLYJ.six + $scope.jsonGFYJ_WLPTBHGLYJ.six,
+ 'seven': $scope.jsonGFYJ_BHGLPGYJ.seven + $scope.jsonGFYJ_CDSFBHGLYJ.seven + $scope.jsonGFYJ_JKSPBHGLYJ.seven + $scope.jsonGFYJ_WLPTBHGLYJ.seven,
+ 'eight': $scope.jsonGFYJ_BHGLPGYJ.eight + $scope.jsonGFYJ_CDSFBHGLYJ.eight + $scope.jsonGFYJ_JKSPBHGLYJ.eight + $scope.jsonGFYJ_WLPTBHGLYJ.eight,
+ 'nine': $scope.jsonGFYJ_BHGLPGYJ.nine + $scope.jsonGFYJ_CDSFBHGLYJ.nine + $scope.jsonGFYJ_JKSPBHGLYJ.nine + $scope.jsonGFYJ_WLPTBHGLYJ.nine,
+ 'ten': $scope.jsonGFYJ_BHGLPGYJ.ten + $scope.jsonGFYJ_CDSFBHGLYJ.ten + $scope.jsonGFYJ_JKSPBHGLYJ.ten + $scope.jsonGFYJ_WLPTBHGLYJ.ten,
+ 'eleven': $scope.jsonGFYJ_BHGLPGYJ.eleven + $scope.jsonGFYJ_CDSFBHGLYJ.eleven + $scope.jsonGFYJ_JKSPBHGLYJ.eleven + $scope.jsonGFYJ_WLPTBHGLYJ.eleven,
+ 'twelve': $scope.jsonGFYJ_BHGLPGYJ.twelve + $scope.jsonGFYJ_CDSFBHGLYJ.twelve + $scope.jsonGFYJ_JKSPBHGLYJ.twelve + $scope.jsonGFYJ_WLPTBHGLYJ.twelve,
+ 'total': $scope.jsonGFYJ_BHGLPGYJ.total + $scope.jsonGFYJ_CDSFBHGLYJ.total + $scope.jsonGFYJ_JKSPBHGLYJ.total + $scope.jsonGFYJ_WLPTBHGLYJ.total,
+ 'lei': 3
+ };
+
+ $scope.pageMain = [$scope.jsonSFYJ_SCBHGYJ, $scope.jsonPFYJ, $scope.jsonGFYJ, $scope.jsonWRYJ_JCZYCYJ, $scope.jsonBLYJ_WRWZSSBLLYJ];
+ }
+
+
+ //获取子集目录数据-add
+ $scope.DisplayDetailZiLei = function (FuLei) {
+ $scope.displayDetailData = [];
+ $scope.status = 0;
+ $scope.ZiLeiTableShow = true;
+ switch (FuLei) {
+ //首发预警
+ case 1:
+ $scope.displayDetailData.push($scope.jsonSFYJ_SCBHGYJ);
+ break;
+ //频发预警
+ case 2:
+ $scope.displayDetailData.push($scope.jsonPFYJ_BHGLSS);
+ $scope.displayDetailData.push($scope.jsonPFYJ_BCYDWDJBHGYJ);
+ $scope.displayDetailData.push($scope.jsonPFYJ_BCYDWDCBHGYJ);
+ $scope.displayDetailData.push($scope.jsonPFYJ_SCQYDJBHGYJ);
+ break;
+ //高发预警
+ case 3:
+ $scope.displayDetailData.push($scope.jsonGFYJ_BHGLPGYJ);
+ $scope.displayDetailData.push($scope.jsonGFYJ_CDSFBHGLYJ);
+ $scope.displayDetailData.push($scope.jsonGFYJ_JKSPBHGLYJ);
+ $scope.displayDetailData.push($scope.jsonGFYJ_WLPTBHGLYJ);
+
+ break;
+ //污染预警
+ case 4:
+ $scope.displayDetailData.push($scope.jsonWRYJ_JCZYCYJ);
+ break;
+ //暴露预警
+ case 5:
+ $scope.displayDetailData.push($scope.jsonBLYJ_WRWZSSBLLYJ);
+ break;
+ default:
+ }
+ }
+
+
+ //显示月份数据
+ $scope.DisplayMonthData = function (curMonth) {
+ //alert(curMonth);
+ //alert($scope.selectedMonth +'df');
+ //选择框内的数据先同步好
+
+ if ($scope.selectedYear == '') {
+ layer.msg('您还没有加载本年度的缓存,请先加载缓存!')
return;
}
- $scope.displayYear = $scope.selectedYear;
- $scope.displayMonth = $scope.selectedMonth;
- //$scope.mydata2 = JSON.parse(res.data.data.CacheData).datapage;
- //$scope.mydata = JSON.parse(res.data.data.CacheData).datadetail;
- $scope.SplitData(res.data.data.CACHEDATA)
-
- $scope.pageDisplayYear = '(' + $scope.displayYear + ')'
-
- $scope.GetMainPageDataFromCache()
-
-
- $scope.tempYear = $scope.selectedYear;
- })
- }
-
- /////////////////////////////////////////////////////////////////////////////////////////
-
- //把缓存数据进行分解
- $scope.SplitData = function (data) {
- //获取可以测试用数据打他
- var res = JSON.parse(data)
- //console.log('testres', res[0].arrShouCiBuHeGeYuJing);
-
- $scope.arrShouCiBuHeGeYuJing = res[0].arrShouCiBuHeGeYuJing;
-
- $scope.arrBuHeGeLvShangSheng = res[1].arrBuHeGeLvShangSheng;
- $scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing = res[2].arrBeiChouYangDanWeiDuoJianBuHeGeYuJing
- $scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing = res[3].arrBeiChouYangDanWeiDuoCiBuHeGeYuJing;
- $scope.arrShengChanQiYeDuoJianBuHeGeYuJing = res[4].arrShengChanQiYeDuoJianBuHeGeYuJing;
-
- $scope.arrBuHeGeLvPianGaoYuJing = res[5].arrBuHeGeLvPianGaoYuJing;
- $scope.arrChanDiShengFenBuHeGeLvYuJing = res[6].arrChanDiShengFenBuHeGeLvYuJing;
- $scope.arrJinKouShiPinBuHeGeLvYuJing = res[7].arrJinKouShiPinBuHeGeLvYuJing;
- $scope.arrWangLuoPingTaiBuHeGeLvYuJing = res[8].arrWangLuoPingTaiBuHeGeLvYuJing;
-
- $scope.arrJianCeZhiYiChangYuJing = res[9].arrJianCeZhiYiChangYuJing;
- $scope.arrWuRanWuZongShanShiBaoLuLiangYuJing = res[10].arrWuRanWuZongShanShiBaoLuLiangYuJing;
-
-
- }
-
- //改成元数据数据生成首页数据
- $scope.GetMainPageDataFromCache = function () {
-
- var abbccc = $scope.arrShouCiBuHeGeYuJing.reduce(function (prev, cur) {
- return prev + cur.data.length;
- }, 0);
- console.log('testyujing', $scope.arrShouCiBuHeGeYuJing, abbccc);
-
-
- //1首发预警-首次不合格预警
- $scope.jsonSFYJ_SCBHGYJ = {
- 'name': '首发预警',
- 'name2': '首次不合格预警',
- 'one': $scope.GetCalc($scope.arrShouCiBuHeGeYuJing, 1),
- 'two': $scope.GetCalc($scope.arrShouCiBuHeGeYuJing, 2),
- 'three': $scope.GetCalc($scope.arrShouCiBuHeGeYuJing, 3),
- 'four': $scope.GetCalc($scope.arrShouCiBuHeGeYuJing, 4),
- 'five': $scope.GetCalc($scope.arrShouCiBuHeGeYuJing, 5),
- 'six': $scope.GetCalc($scope.arrShouCiBuHeGeYuJing, 6),
- 'seven': $scope.GetCalc($scope.arrShouCiBuHeGeYuJing, 7),
- 'eight': $scope.GetCalc($scope.arrShouCiBuHeGeYuJing, 8),
- 'nine': $scope.GetCalc($scope.arrShouCiBuHeGeYuJing, 9),
- 'ten': $scope.GetCalc($scope.arrShouCiBuHeGeYuJing, 10),
- 'eleven': $scope.GetCalc($scope.arrShouCiBuHeGeYuJing, 11),
- 'twelve': $scope.GetCalc($scope.arrShouCiBuHeGeYuJing, 12),
- //'total': $scope.arrShouCiBuHeGeYuJing.reduce(function (prev, cur) {
- // return prev + cur.data.length;
- //}, 0),
- 'lei': 1
- };
- //计算不出来,先这么改221212
- $scope.jsonSFYJ_SCBHGYJ.total = $scope.jsonSFYJ_SCBHGYJ.one +
- $scope.jsonSFYJ_SCBHGYJ.two +
- $scope.jsonSFYJ_SCBHGYJ.three +
- $scope.jsonSFYJ_SCBHGYJ.four +
- $scope.jsonSFYJ_SCBHGYJ.five +
- $scope.jsonSFYJ_SCBHGYJ.six +
- $scope.jsonSFYJ_SCBHGYJ.seven +
- $scope.jsonSFYJ_SCBHGYJ.eight +
- $scope.jsonSFYJ_SCBHGYJ.nine +
- $scope.jsonSFYJ_SCBHGYJ.ten +
- $scope.jsonSFYJ_SCBHGYJ.eleven +
- $scope.jsonSFYJ_SCBHGYJ.twelve;
-
- //2.1频发预警-不合格率上升
- $scope.jsonPFYJ_BHGLSS = {
- 'name': '频发预警',
- 'name2': '不合格率上升',
- 'one': $scope.GetCalc($scope.arrBuHeGeLvShangSheng, 1),
- 'two': $scope.GetCalc($scope.arrBuHeGeLvShangSheng, 2),
- 'three': $scope.GetCalc($scope.arrBuHeGeLvShangSheng, 3),
- 'four': $scope.GetCalc($scope.arrBuHeGeLvShangSheng, 4),
- 'five': $scope.GetCalc($scope.arrBuHeGeLvShangSheng, 5),
- 'six': $scope.GetCalc($scope.arrBuHeGeLvShangSheng, 6),
- 'seven': $scope.GetCalc($scope.arrBuHeGeLvShangSheng, 7),
- 'eight': $scope.GetCalc($scope.arrBuHeGeLvShangSheng, 8),
- 'nine': $scope.GetCalc($scope.arrBuHeGeLvShangSheng, 9),
- 'ten': $scope.GetCalc($scope.arrBuHeGeLvShangSheng, 10),
- 'eleven': $scope.GetCalc($scope.arrBuHeGeLvShangSheng, 11),
- 'twelve': $scope.GetCalc($scope.arrBuHeGeLvShangSheng, 12),
- //'total': $scope.arrBuHeGeLvShangSheng.reduce(function (prev, cur) {
- // return prev + cur.data.length;
- //}, 0),
- 'lei': 2
- };
- $scope.jsonPFYJ_BHGLSS.total = $scope.jsonPFYJ_BHGLSS.one +
- $scope.jsonPFYJ_BHGLSS.two +
- $scope.jsonPFYJ_BHGLSS.three +
- $scope.jsonPFYJ_BHGLSS.four +
- $scope.jsonPFYJ_BHGLSS.five +
- $scope.jsonPFYJ_BHGLSS.six +
- $scope.jsonPFYJ_BHGLSS.seven +
- $scope.jsonPFYJ_BHGLSS.eight +
- $scope.jsonPFYJ_BHGLSS.nine +
- $scope.jsonPFYJ_BHGLSS.ten +
- $scope.jsonPFYJ_BHGLSS.eleven +
- $scope.jsonPFYJ_BHGLSS.twelve;
-
-
- //2.2频发预警-被抽样单位多件不合格预警
- $scope.jsonPFYJ_BCYDWDJBHGYJ = {
- 'name': '频发预警',
- 'name2': '被抽样单位多件不合格预警',
- 'one': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, 1),
- 'two': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, 2),
- 'three': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, 3),
- 'four': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, 4),
- 'five': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, 5),
- 'six': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, 6),
- 'seven': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, 7),
- 'eight': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, 8),
- 'nine': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, 9),
- 'ten': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, 10),
- 'eleven': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, 11),
- 'twelve': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, 12),
- //'total': $scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing.reduce(function (prev, cur) {
- // return prev + cur.data.length;
- //}, 0),
- 'lei': 2
- };
-
- console.log("被抽样单位多件不合格预警", $scope.jsonPFYJ_BCYDWDJBHGYJ)
-
- $scope.jsonPFYJ_BCYDWDJBHGYJ.total = $scope.jsonPFYJ_BCYDWDJBHGYJ.one +
- $scope.jsonPFYJ_BCYDWDJBHGYJ.two +
- $scope.jsonPFYJ_BCYDWDJBHGYJ.three +
- $scope.jsonPFYJ_BCYDWDJBHGYJ.four +
- $scope.jsonPFYJ_BCYDWDJBHGYJ.five +
- $scope.jsonPFYJ_BCYDWDJBHGYJ.six +
- $scope.jsonPFYJ_BCYDWDJBHGYJ.seven +
- $scope.jsonPFYJ_BCYDWDJBHGYJ.eight +
- $scope.jsonPFYJ_BCYDWDJBHGYJ.nine +
- $scope.jsonPFYJ_BCYDWDJBHGYJ.ten +
- $scope.jsonPFYJ_BCYDWDJBHGYJ.eleven +
- $scope.jsonPFYJ_BCYDWDJBHGYJ.twelve;
-
-
- //2.3频发预警-被抽样单位多次不合格预警
- $scope.jsonPFYJ_BCYDWDCBHGYJ = {
- 'name': '频发预警',
- 'name2': '被抽样单位多次不合格预警',
- 'one': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 1),
- 'two': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 2),
- 'three': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 3),
- 'four': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 4),
- 'five': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 5),
- 'six': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 6),
- 'seven': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 7),
- 'eight': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 8),
- 'nine': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 9),
- 'ten': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 10),
- 'eleven': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 11),
- 'twelve': $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 12),
- //'total': $scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing.reduce(function (prev, cur) {
- // return prev + cur.data.length;
- //}, 0),
- 'lei': 2
- };
-
- console.log('专门查看被抽样单位多次不合格预警7月份', $scope.GetCalc($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, 7));
-
- $scope.jsonPFYJ_BCYDWDCBHGYJ.total = $scope.jsonPFYJ_BCYDWDCBHGYJ.one +
- $scope.jsonPFYJ_BCYDWDCBHGYJ.two +
- $scope.jsonPFYJ_BCYDWDCBHGYJ.three +
- $scope.jsonPFYJ_BCYDWDCBHGYJ.four +
- $scope.jsonPFYJ_BCYDWDCBHGYJ.five +
- $scope.jsonPFYJ_BCYDWDCBHGYJ.six +
- $scope.jsonPFYJ_BCYDWDCBHGYJ.seven +
- $scope.jsonPFYJ_BCYDWDCBHGYJ.eight +
- $scope.jsonPFYJ_BCYDWDCBHGYJ.nine +
- $scope.jsonPFYJ_BCYDWDCBHGYJ.ten +
- $scope.jsonPFYJ_BCYDWDCBHGYJ.eleven +
- $scope.jsonPFYJ_BCYDWDCBHGYJ.twelve;
-
- //2.4频发预警-生产企业多件不合格预警
- $scope.jsonPFYJ_SCQYDJBHGYJ = {
- 'name': '频发预警',
- 'name2': '生产企业多件不合格预警',
- 'one': $scope.GetCalc($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, 1),
- 'two': $scope.GetCalc($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, 2),
- 'three': $scope.GetCalc($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, 3),
- 'four': $scope.GetCalc($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, 4),
- 'five': $scope.GetCalc($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, 5),
- 'six': $scope.GetCalc($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, 6),
- 'seven': $scope.GetCalc($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, 7),
- 'eight': $scope.GetCalc($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, 8),
- 'nine': $scope.GetCalc($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, 9),
- 'ten': $scope.GetCalc($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, 10),
- 'eleven': $scope.GetCalc($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, 11),
- 'twelve': $scope.GetCalc($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, 12),
- //'total': $scope.arrShengChanQiYeDuoJianBuHeGeYuJing.reduce(function (prev, cur) {
- // return prev + cur.data.length;
- //}, 0),
- 'lei': 2
- };
-
- console.log(' $scope.jsonPFYJ_SCQYDJBHG多件不合格预警', $scope.jsonPFYJ_SCQYDJBHGYJ)
-
- $scope.jsonPFYJ_SCQYDJBHGYJ.total = $scope.jsonPFYJ_SCQYDJBHGYJ.one +
- $scope.jsonPFYJ_SCQYDJBHGYJ.two +
- $scope.jsonPFYJ_SCQYDJBHGYJ.three +
- $scope.jsonPFYJ_SCQYDJBHGYJ.four +
- $scope.jsonPFYJ_SCQYDJBHGYJ.five +
- $scope.jsonPFYJ_SCQYDJBHGYJ.six +
- $scope.jsonPFYJ_SCQYDJBHGYJ.seven +
- $scope.jsonPFYJ_SCQYDJBHGYJ.eight +
- $scope.jsonPFYJ_SCQYDJBHGYJ.nine +
- $scope.jsonPFYJ_SCQYDJBHGYJ.ten +
- $scope.jsonPFYJ_SCQYDJBHGYJ.eleven +
- $scope.jsonPFYJ_SCQYDJBHGYJ.twelve;
-
-
- //3.1高发预警-不合格率偏高预警
- $scope.jsonGFYJ_BHGLPGYJ = {
- 'name': '高发预警',
- 'name2': '不合格率偏高预警',
- 'one': $scope.GetCalc($scope.arrBuHeGeLvPianGaoYuJing, 1),
- 'two': $scope.GetCalc($scope.arrBuHeGeLvPianGaoYuJing, 2),
- 'three': $scope.GetCalc($scope.arrBuHeGeLvPianGaoYuJing, 3),
- 'four': $scope.GetCalc($scope.arrBuHeGeLvPianGaoYuJing, 4),
- 'five': $scope.GetCalc($scope.arrBuHeGeLvPianGaoYuJing, 5),
- 'six': $scope.GetCalc($scope.arrBuHeGeLvPianGaoYuJing, 6),
- 'seven': $scope.GetCalc($scope.arrBuHeGeLvPianGaoYuJing, 7),
- 'eight': $scope.GetCalc($scope.arrBuHeGeLvPianGaoYuJing, 8),
- 'nine': $scope.GetCalc($scope.arrBuHeGeLvPianGaoYuJing, 9),
- 'ten': $scope.GetCalc($scope.arrBuHeGeLvPianGaoYuJing, 10),
- 'eleven': $scope.GetCalc($scope.arrBuHeGeLvPianGaoYuJing, 11),
- 'twelve': $scope.GetCalc($scope.arrBuHeGeLvPianGaoYuJing, 12),
- //'total': $scope.arrBuHeGeLvPianGaoYuJing.reduce(function (prev, cur) {
- // return prev + cur.data.length;
- //}, 0),
- 'lei': 3
- };
-
- $scope.jsonGFYJ_BHGLPGYJ.total = $scope.jsonGFYJ_BHGLPGYJ.one +
- $scope.jsonGFYJ_BHGLPGYJ.two +
- $scope.jsonGFYJ_BHGLPGYJ.three +
- $scope.jsonGFYJ_BHGLPGYJ.four +
- $scope.jsonGFYJ_BHGLPGYJ.five +
- $scope.jsonGFYJ_BHGLPGYJ.six +
- $scope.jsonGFYJ_BHGLPGYJ.seven +
- $scope.jsonGFYJ_BHGLPGYJ.eight +
- $scope.jsonGFYJ_BHGLPGYJ.nine +
- $scope.jsonGFYJ_BHGLPGYJ.ten +
- $scope.jsonGFYJ_BHGLPGYJ.eleven +
- $scope.jsonGFYJ_BHGLPGYJ.twelve;
-
-
- //3.2高发预警-产地省份不合格率预警
- $scope.jsonGFYJ_CDSFBHGLYJ = {
- 'name': '高发预警',
- 'name2': '产地省份不合格率预警',
- 'one': $scope.GetCalc($scope.arrChanDiShengFenBuHeGeLvYuJing, 1),
- 'two': $scope.GetCalc($scope.arrChanDiShengFenBuHeGeLvYuJing, 2),
- 'three': $scope.GetCalc($scope.arrChanDiShengFenBuHeGeLvYuJing, 3),
- 'four': $scope.GetCalc($scope.arrChanDiShengFenBuHeGeLvYuJing, 4),
- 'five': $scope.GetCalc($scope.arrChanDiShengFenBuHeGeLvYuJing, 5),
- 'six': $scope.GetCalc($scope.arrChanDiShengFenBuHeGeLvYuJing, 6),
- 'seven': $scope.GetCalc($scope.arrChanDiShengFenBuHeGeLvYuJing, 7),
- 'eight': $scope.GetCalc($scope.arrChanDiShengFenBuHeGeLvYuJing, 8),
- 'nine': $scope.GetCalc($scope.arrChanDiShengFenBuHeGeLvYuJing, 9),
- 'ten': $scope.GetCalc($scope.arrChanDiShengFenBuHeGeLvYuJing, 10),
- 'eleven': $scope.GetCalc($scope.arrChanDiShengFenBuHeGeLvYuJing, 11),
- 'twelve': $scope.GetCalc($scope.arrChanDiShengFenBuHeGeLvYuJing, 12),
- //'total': $scope.arrChanDiShengFenBuHeGeLvYuJing.reduce(function (prev, cur) {
- // return prev + cur.data.length;
- //}, 0),
- 'lei': 3
- };
-
- $scope.jsonGFYJ_CDSFBHGLYJ.total = $scope.jsonGFYJ_CDSFBHGLYJ.one +
- $scope.jsonGFYJ_CDSFBHGLYJ.two +
- $scope.jsonGFYJ_CDSFBHGLYJ.three +
- $scope.jsonGFYJ_CDSFBHGLYJ.four +
- $scope.jsonGFYJ_CDSFBHGLYJ.five +
- $scope.jsonGFYJ_CDSFBHGLYJ.six +
- $scope.jsonGFYJ_CDSFBHGLYJ.seven +
- $scope.jsonGFYJ_CDSFBHGLYJ.eight +
- $scope.jsonGFYJ_CDSFBHGLYJ.nine +
- $scope.jsonGFYJ_CDSFBHGLYJ.ten +
- $scope.jsonGFYJ_CDSFBHGLYJ.eleven +
- $scope.jsonGFYJ_CDSFBHGLYJ.twelve;
-
- //3.3高发预警-进口食品不合格率预警
- $scope.jsonGFYJ_JKSPBHGLYJ = {
- 'name': '高发预警',
- 'name2': '进口食品不合格率预警',
- 'one': $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 1),
- 'two': $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 2),
- 'three': $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 3),
- 'four': $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 4),
- 'five': $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 5),
- 'six': $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 6),
- 'seven': $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 7),
- 'eight': $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 8),
- 'nine': $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 9),
- 'ten': $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 10),
- 'eleven': $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 11),
- 'twelve': $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 12),
- //'total': $scope.arrJinKouShiPinBuHeGeLvYuJing.reduce(function (prev, cur) {
- // return prev + cur.data.length;
- //}, 0),
- 'lei': 3
- };
-
- console.log('进口食品不合格率预警', $scope.GetCalc($scope.arrJinKouShiPinBuHeGeLvYuJing, 6));
-
- $scope.jsonGFYJ_JKSPBHGLYJ.total = $scope.jsonGFYJ_JKSPBHGLYJ.one +
- $scope.jsonGFYJ_JKSPBHGLYJ.two +
- $scope.jsonGFYJ_JKSPBHGLYJ.three +
- $scope.jsonGFYJ_JKSPBHGLYJ.four +
- $scope.jsonGFYJ_JKSPBHGLYJ.five +
- $scope.jsonGFYJ_JKSPBHGLYJ.six +
- $scope.jsonGFYJ_JKSPBHGLYJ.seven +
- $scope.jsonGFYJ_JKSPBHGLYJ.eight +
- $scope.jsonGFYJ_JKSPBHGLYJ.nine +
- $scope.jsonGFYJ_JKSPBHGLYJ.ten +
- $scope.jsonGFYJ_JKSPBHGLYJ.eleven +
- $scope.jsonGFYJ_JKSPBHGLYJ.twelve;
-
-
- //3.4高发预警-网络平台不合格率预警
- $scope.jsonGFYJ_WLPTBHGLYJ = {
- 'name': '高发预警',
- 'name2': '网络平台不合格率预警',
- 'one': $scope.GetCalc($scope.arrWangLuoPingTaiBuHeGeLvYuJing, 1),
- 'two': $scope.GetCalc($scope.arrWangLuoPingTaiBuHeGeLvYuJing, 2),
- 'three': $scope.GetCalc($scope.arrWangLuoPingTaiBuHeGeLvYuJing, 3),
- 'four': $scope.GetCalc($scope.arrWangLuoPingTaiBuHeGeLvYuJing, 4),
- 'five': $scope.GetCalc($scope.arrWangLuoPingTaiBuHeGeLvYuJing, 5),
- 'six': $scope.GetCalc($scope.arrWangLuoPingTaiBuHeGeLvYuJing, 6),
- 'seven': $scope.GetCalc($scope.arrWangLuoPingTaiBuHeGeLvYuJing, 7),
- 'eight': $scope.GetCalc($scope.arrWangLuoPingTaiBuHeGeLvYuJing, 8),
- 'nine': $scope.GetCalc($scope.arrWangLuoPingTaiBuHeGeLvYuJing, 9),
- 'ten': $scope.GetCalc($scope.arrWangLuoPingTaiBuHeGeLvYuJing, 10),
- 'eleven': $scope.GetCalc($scope.arrWangLuoPingTaiBuHeGeLvYuJing, 11),
- 'twelve': $scope.GetCalc($scope.arrWangLuoPingTaiBuHeGeLvYuJing, 12),
- //'total': $scope.arrJinKouShiPinBuHeGeLvYuJing.reduce(function (prev, cur) {
- // return prev + cur.data.length;
- //}, 0),
- 'lei': 3
- };
-
- $scope.jsonGFYJ_WLPTBHGLYJ.total = $scope.jsonGFYJ_WLPTBHGLYJ.one +
- $scope.jsonGFYJ_WLPTBHGLYJ.two +
- $scope.jsonGFYJ_WLPTBHGLYJ.three +
- $scope.jsonGFYJ_WLPTBHGLYJ.four +
- $scope.jsonGFYJ_WLPTBHGLYJ.five +
- $scope.jsonGFYJ_WLPTBHGLYJ.six +
- $scope.jsonGFYJ_WLPTBHGLYJ.seven +
- $scope.jsonGFYJ_WLPTBHGLYJ.eight +
- $scope.jsonGFYJ_WLPTBHGLYJ.nine +
- $scope.jsonGFYJ_WLPTBHGLYJ.ten +
- $scope.jsonGFYJ_WLPTBHGLYJ.eleven +
- $scope.jsonGFYJ_WLPTBHGLYJ.twelve;
-
-
- //4污染预警-检测值异常预警
- $scope.jsonWRYJ_JCZYCYJ = {
- 'name': '污染预警',
- 'name2': '检测值异常预警',
- 'one': $scope.GetCalc($scope.arrJianCeZhiYiChangYuJing, 1),
- 'two': $scope.GetCalc($scope.arrJianCeZhiYiChangYuJing, 2),
- 'three': $scope.GetCalc($scope.arrJianCeZhiYiChangYuJing, 3),
- 'four': $scope.GetCalc($scope.arrJianCeZhiYiChangYuJing, 4),
- 'five': $scope.GetCalc($scope.arrJianCeZhiYiChangYuJing, 5),
- 'six': $scope.GetCalc($scope.arrJianCeZhiYiChangYuJing, 6),
- 'seven': $scope.GetCalc($scope.arrJianCeZhiYiChangYuJing, 7),
- 'eight': $scope.GetCalc($scope.arrJianCeZhiYiChangYuJing, 8),
- 'nine': $scope.GetCalc($scope.arrJianCeZhiYiChangYuJing, 9),
- 'ten': $scope.GetCalc($scope.arrJianCeZhiYiChangYuJing, 10),
- 'eleven': $scope.GetCalc($scope.arrJianCeZhiYiChangYuJing, 11),
- 'twelve': $scope.GetCalc($scope.arrJianCeZhiYiChangYuJing, 12),
- //'total': $scope.arrJianCeZhiYiChangYuJing.reduce(function (prev, cur) {
- // return prev + cur.data.length;
- //}, 0),
- 'lei': 4
- };
-
- $scope.jsonWRYJ_JCZYCYJ.total = $scope.jsonWRYJ_JCZYCYJ.one +
- $scope.jsonWRYJ_JCZYCYJ.two +
- $scope.jsonWRYJ_JCZYCYJ.three +
- $scope.jsonWRYJ_JCZYCYJ.four +
- $scope.jsonWRYJ_JCZYCYJ.five +
- $scope.jsonWRYJ_JCZYCYJ.six +
- $scope.jsonWRYJ_JCZYCYJ.seven +
- $scope.jsonWRYJ_JCZYCYJ.eight +
- $scope.jsonWRYJ_JCZYCYJ.nine +
- $scope.jsonWRYJ_JCZYCYJ.ten +
- $scope.jsonWRYJ_JCZYCYJ.eleven +
- $scope.jsonWRYJ_JCZYCYJ.twelve;
-
-
- //5暴露预警-污染物总膳食暴露量预警
- $scope.jsonBLYJ_WRWZSSBLLYJ = {
- 'name': '风险评估预警',
- 'name2': '污染物总膳食暴露量预警',
- 'one': $scope.GetCalc($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, 1),
- 'two': $scope.GetCalc($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, 2),
- 'three': $scope.GetCalc($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, 3),
- 'four': $scope.GetCalc($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, 4),
- 'five': $scope.GetCalc($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, 5),
- 'six': $scope.GetCalc($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, 6),
- 'seven': $scope.GetCalc($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, 7),
- 'eight': $scope.GetCalc($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, 8),
- 'nine': $scope.GetCalc($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, 9),
- 'ten': $scope.GetCalc($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, 10),
- 'eleven': $scope.GetCalc($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, 11),
- 'twelve': $scope.GetCalc($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, 12),
- //'total': $scope.arrWuRanWuZongShanShiBaoLuLiangYuJing.reduce(function (prev, cur) {
- // return prev + cur.data.length;
- //}, 0),
- 'lei': 5
- };
-
- $scope.jsonBLYJ_WRWZSSBLLYJ.total = $scope.jsonBLYJ_WRWZSSBLLYJ.one +
- $scope.jsonBLYJ_WRWZSSBLLYJ.two +
- $scope.jsonBLYJ_WRWZSSBLLYJ.three +
- $scope.jsonBLYJ_WRWZSSBLLYJ.four +
- $scope.jsonBLYJ_WRWZSSBLLYJ.five +
- $scope.jsonBLYJ_WRWZSSBLLYJ.six +
- $scope.jsonBLYJ_WRWZSSBLLYJ.seven +
- $scope.jsonBLYJ_WRWZSSBLLYJ.eight +
- $scope.jsonBLYJ_WRWZSSBLLYJ.nine +
- $scope.jsonBLYJ_WRWZSSBLLYJ.ten +
- $scope.jsonBLYJ_WRWZSSBLLYJ.eleven +
- $scope.jsonBLYJ_WRWZSSBLLYJ.twelve;
-
-
- //console.log('检查频发预警月份合计', $scope.jsonPFYJ_BHGLSS.three , $scope.jsonPFYJ_BCYDWDJBHGYJ.three , $scope.jsonPFYJ_BCYDWDCBHGYJ.three , $scope.jsonPFYJ_BCYDWDJBHGYJ.three)
-
- //2频发预警
- $scope.jsonPFYJ = {
- 'name': '频发预警',
- 'name2': '',
- 'one': $scope.jsonPFYJ_BHGLSS.one + $scope.jsonPFYJ_BCYDWDJBHGYJ.one + $scope.jsonPFYJ_BCYDWDCBHGYJ.one + $scope.jsonPFYJ_SCQYDJBHGYJ.one,
- 'two': $scope.jsonPFYJ_BHGLSS.two + $scope.jsonPFYJ_BCYDWDJBHGYJ.two + $scope.jsonPFYJ_BCYDWDCBHGYJ.two + $scope.jsonPFYJ_SCQYDJBHGYJ.two,
- 'three': $scope.jsonPFYJ_BHGLSS.three + $scope.jsonPFYJ_BCYDWDJBHGYJ.three + $scope.jsonPFYJ_BCYDWDCBHGYJ.three + $scope.jsonPFYJ_SCQYDJBHGYJ.three,
- 'four': $scope.jsonPFYJ_BHGLSS.four + $scope.jsonPFYJ_BCYDWDJBHGYJ.four + $scope.jsonPFYJ_BCYDWDCBHGYJ.four + $scope.jsonPFYJ_SCQYDJBHGYJ.four,
- 'five': $scope.jsonPFYJ_BHGLSS.five + $scope.jsonPFYJ_BCYDWDJBHGYJ.five + $scope.jsonPFYJ_BCYDWDCBHGYJ.five + $scope.jsonPFYJ_SCQYDJBHGYJ.five,
- 'six': $scope.jsonPFYJ_BHGLSS.six + $scope.jsonPFYJ_BCYDWDJBHGYJ.six + $scope.jsonPFYJ_BCYDWDCBHGYJ.six + $scope.jsonPFYJ_SCQYDJBHGYJ.six,
- 'seven': $scope.jsonPFYJ_BHGLSS.seven + $scope.jsonPFYJ_BCYDWDJBHGYJ.seven + $scope.jsonPFYJ_BCYDWDCBHGYJ.seven + $scope.jsonPFYJ_SCQYDJBHGYJ.seven,
- 'eight': $scope.jsonPFYJ_BHGLSS.eight + $scope.jsonPFYJ_BCYDWDJBHGYJ.eight + $scope.jsonPFYJ_BCYDWDCBHGYJ.eight + $scope.jsonPFYJ_SCQYDJBHGYJ.eight,
- 'nine': $scope.jsonPFYJ_BHGLSS.nine + $scope.jsonPFYJ_BCYDWDJBHGYJ.nine + $scope.jsonPFYJ_BCYDWDCBHGYJ.nine + $scope.jsonPFYJ_SCQYDJBHGYJ.nine,
- 'ten': $scope.jsonPFYJ_BHGLSS.ten + $scope.jsonPFYJ_BCYDWDJBHGYJ.ten + $scope.jsonPFYJ_BCYDWDCBHGYJ.ten + $scope.jsonPFYJ_SCQYDJBHGYJ.ten,
- 'eleven': $scope.jsonPFYJ_BHGLSS.eleven + $scope.jsonPFYJ_BCYDWDJBHGYJ.eleven + $scope.jsonPFYJ_BCYDWDCBHGYJ.eleven + $scope.jsonPFYJ_SCQYDJBHGYJ.eleven,
- 'twelve': $scope.jsonPFYJ_BHGLSS.twelve + $scope.jsonPFYJ_BCYDWDJBHGYJ.twelve + $scope.jsonPFYJ_BCYDWDCBHGYJ.twelve + $scope.jsonPFYJ_SCQYDJBHGYJ.twelve,
- 'total': $scope.jsonPFYJ_BHGLSS.total + $scope.jsonPFYJ_BCYDWDJBHGYJ.total + $scope.jsonPFYJ_BCYDWDCBHGYJ.total + $scope.jsonPFYJ_SCQYDJBHGYJ.total,
- 'lei': 2
- };
-
-
- console.log('频发预警综合', $scope.jsonPFYJ);
- //3高发预警
- $scope.jsonGFYJ = {
- 'name': '高发预警',
- 'name2': '',
- 'one': $scope.jsonGFYJ_BHGLPGYJ.one + $scope.jsonGFYJ_CDSFBHGLYJ.one + $scope.jsonGFYJ_JKSPBHGLYJ.one + $scope.jsonGFYJ_WLPTBHGLYJ.one,
- 'two': $scope.jsonGFYJ_BHGLPGYJ.two + $scope.jsonGFYJ_CDSFBHGLYJ.two + $scope.jsonGFYJ_JKSPBHGLYJ.two + $scope.jsonGFYJ_WLPTBHGLYJ.two,
- 'three': $scope.jsonGFYJ_BHGLPGYJ.three + $scope.jsonGFYJ_CDSFBHGLYJ.three + $scope.jsonGFYJ_JKSPBHGLYJ.three + $scope.jsonGFYJ_WLPTBHGLYJ.three,
- 'four': $scope.jsonGFYJ_BHGLPGYJ.four + $scope.jsonGFYJ_CDSFBHGLYJ.four + $scope.jsonGFYJ_JKSPBHGLYJ.four + $scope.jsonGFYJ_WLPTBHGLYJ.four,
- 'five': $scope.jsonGFYJ_BHGLPGYJ.five + $scope.jsonGFYJ_CDSFBHGLYJ.five + $scope.jsonGFYJ_JKSPBHGLYJ.five + $scope.jsonGFYJ_WLPTBHGLYJ.five,
- 'six': $scope.jsonGFYJ_BHGLPGYJ.six + $scope.jsonGFYJ_CDSFBHGLYJ.six + $scope.jsonGFYJ_JKSPBHGLYJ.six + $scope.jsonGFYJ_WLPTBHGLYJ.six,
- 'seven': $scope.jsonGFYJ_BHGLPGYJ.seven + $scope.jsonGFYJ_CDSFBHGLYJ.seven + $scope.jsonGFYJ_JKSPBHGLYJ.seven + $scope.jsonGFYJ_WLPTBHGLYJ.seven,
- 'eight': $scope.jsonGFYJ_BHGLPGYJ.eight + $scope.jsonGFYJ_CDSFBHGLYJ.eight + $scope.jsonGFYJ_JKSPBHGLYJ.eight + $scope.jsonGFYJ_WLPTBHGLYJ.eight,
- 'nine': $scope.jsonGFYJ_BHGLPGYJ.nine + $scope.jsonGFYJ_CDSFBHGLYJ.nine + $scope.jsonGFYJ_JKSPBHGLYJ.nine + $scope.jsonGFYJ_WLPTBHGLYJ.nine,
- 'ten': $scope.jsonGFYJ_BHGLPGYJ.ten + $scope.jsonGFYJ_CDSFBHGLYJ.ten + $scope.jsonGFYJ_JKSPBHGLYJ.ten + $scope.jsonGFYJ_WLPTBHGLYJ.ten,
- 'eleven': $scope.jsonGFYJ_BHGLPGYJ.eleven + $scope.jsonGFYJ_CDSFBHGLYJ.eleven + $scope.jsonGFYJ_JKSPBHGLYJ.eleven + $scope.jsonGFYJ_WLPTBHGLYJ.eleven,
- 'twelve': $scope.jsonGFYJ_BHGLPGYJ.twelve + $scope.jsonGFYJ_CDSFBHGLYJ.twelve + $scope.jsonGFYJ_JKSPBHGLYJ.twelve + $scope.jsonGFYJ_WLPTBHGLYJ.twelve,
- 'total': $scope.jsonGFYJ_BHGLPGYJ.total + $scope.jsonGFYJ_CDSFBHGLYJ.total + $scope.jsonGFYJ_JKSPBHGLYJ.total + $scope.jsonGFYJ_WLPTBHGLYJ.total,
- 'lei': 3
- };
-
- $scope.pageMain = [$scope.jsonSFYJ_SCBHGYJ, $scope.jsonPFYJ, $scope.jsonGFYJ, $scope.jsonWRYJ_JCZYCYJ, $scope.jsonBLYJ_WRWZSSBLLYJ];
- }
-
-
- //获取子集目录数据-add
- $scope.DisplayDetailZiLei = function (FuLei) {
- $scope.displayDetailData = [];
- $scope.status = 0;
- $scope.ZiLeiTableShow = true;
- switch (FuLei) {
- //首发预警
- case 1:
- $scope.displayDetailData.push($scope.jsonSFYJ_SCBHGYJ);
- break;
- //频发预警
- case 2:
- $scope.displayDetailData.push($scope.jsonPFYJ_BHGLSS);
- $scope.displayDetailData.push($scope.jsonPFYJ_BCYDWDJBHGYJ);
- $scope.displayDetailData.push($scope.jsonPFYJ_BCYDWDCBHGYJ);
- $scope.displayDetailData.push($scope.jsonPFYJ_SCQYDJBHGYJ);
- break;
- //高发预警
- case 3:
- $scope.displayDetailData.push($scope.jsonGFYJ_BHGLPGYJ);
- $scope.displayDetailData.push($scope.jsonGFYJ_CDSFBHGLYJ);
- $scope.displayDetailData.push($scope.jsonGFYJ_JKSPBHGLYJ);
- $scope.displayDetailData.push($scope.jsonGFYJ_WLPTBHGLYJ);
-
- break;
- //污染预警
- case 4:
- $scope.displayDetailData.push($scope.jsonWRYJ_JCZYCYJ);
- break;
- //暴露预警
- case 5:
- $scope.displayDetailData.push($scope.jsonBLYJ_WRWZSSBLLYJ);
- break;
- default:
- }
- }
-
-
- //显示月份数据
- $scope.DisplayMonthData = function (curMonth) {
- //alert(curMonth);
- //alert($scope.selectedMonth +'df');
- //选择框内的数据先同步好
-
- if ($scope.selectedYear == '') {
- layer.msg('您还没有加载本年度的缓存,请先加载缓存!')
- return;
- }
-
-
- if ($scope.selectedYear != $scope.tempYear) {
- layer.msg('您还没有加载缓存,或者已经更换了年份,请重新加载缓存!')
- return;
- }
-
-
- if (curMonth != null) {
- $scope.selectedMonth = curMonth
- }
- $scope.optMonth = $scope.selectedMonth;
- $scope.displayMonth = $scope.selectedMonth; //首先把页面上方的tab的显示的月份和下拉一致
- //改变标题内容
- $scope.pageMonthDetailDisplay = '(' + $scope.selectedYear + '-' + $scope.selectedMonth + ')';
- $scope.DisplayDetailMonthCalc()
- }
-
-
- //解析相关月份的具体数据
- $scope.GetValueByMonth = (data, month) => {
- console.log('getvaluebymonth', data.three, month);
- var curData = 0;
-
-
- switch (month) {
- case 1:
- curData = data.one;
- break;
- case 2:
- curData = data.two;
- break;
- case 3:
- curData = data.three;
- break;
- case 4:
- curData = data.four;
- break;
- case 5:
- curData = data.five;
- break;
- case 6:
- curData = data.six;
- break;
- case 7:
- curData = data.seven;
- break;
- case 8:
- curData = data.eight;
- break;
- case 9:
- curData = data.nine;
- break;
- case 10:
- curData = data.ten;
- break;
- case 11:
- curData = data.eleven;
- break;
- case 12:
- curData = data.twelve;
- break;
- case 13:
- curData = data.total;
- break;
- default:
- }
- return curData;
- }
-
-
- //展示只有一个月的数据
- $scope.DisplayDetailMonth = function (Month) {
-
- return;
-
- $scope.displayDetailMonthData = {};
- $scope.status = 0; //隐藏主统计表格界面
- $scope.ZiLeiMonthTableShow = true; //显示月份部分
- $scope.displayDetailMonthData = [] //前端显示数据
-
- //开始组装数据
- $scope.displayDetailMonthData = {
- Month: ((Month == 13) ? "总计" : Month + "月"),
- //首次不合格预警
- SFYJ_SCBHGYJ: $scope.GetValueByMonth($scope.jsonSFYJ_SCBHGYJ, Month),
- //不合格率上升
- PFYJ_BHGLSS: $scope.GetValueByMonth($scope.jsonPFYJ_BHGLSS, Month),
- //被抽样单位多件不合格预警
- PFYJ_BCYDWDJBHGYJ: $scope.GetValueByMonth($scope.jsonPFYJ_BCYDWDJBHGYJ, Month),
- //被抽样单位多次不合格预警
- PFYJ_BCYDWDCBHGYJ: $scope.GetValueByMonth($scope.jsonPFYJ_BCYDWDCBHGYJ, Month),
- //生产企业多件不合格预警
- PFYJ_SCQYDJBHGYJ: $scope.GetValueByMonth($scope.jsonPFYJ_SCQYDJBHGYJ, Month),
- //不合格率偏高预警
- GFYJ_BHGLPGYJ: $scope.GetValueByMonth($scope.jsonGFYJ_BHGLPGYJ, Month),
- //产地省份不合格率预警
- GFYJ_CDSFBHGLYJ: $scope.GetValueByMonth($scope.jsonGFYJ_CDSFBHGLYJ, Month),
- //进口食品不合格率预警
- GFYJ_JKSPBHGLYJ: $scope.GetValueByMonth($scope.jsonGFYJ_JKSPBHGLYJ, Month),
- //网络平台不合格率预警
- GFYJ_WLPTBHGLYJ: $scope.GetValueByMonth($scope.jsonGFYJ_WLPTBHGLYJ, Month),
- //检测值异常预警
- WRYJ_JCZYCYJ: $scope.GetValueByMonth($scope.jsonWRYJ_JCZYCYJ, Month),
- //污染物总膳食暴露量预警
- BLYJ_WRWZSSBLLYJ: $scope.GetValueByMonth($scope.jsonBLYJ_WRWZSSBLLYJ, Month),
- }
-
- }
-
-
- $scope.GetValueByJiBie = function (data, month, jibie) {
- var jicolor = '';
- switch (jibie) {
- case 3:
- jicolor = '#fff900';
- break;
- case 2:
- jicolor = '#ff8300';
- break;
- case 1:
- jicolor = '#ff0000';
- break;
- default:
- }
- //console.log('被查询的数据', data)
- //console.log('被查询的数据结果', Enumerable.From(data).Where(function (x) { return x.month == month && x.ji == jicolor }).Count());
- var lstMonthData = Enumerable.From(data).Where(function (x) {
- return x.month == month
- }).ToArray()[0].data;
- var dCount = Enumerable.From(lstMonthData).Where(function (x) {
- return x.ji == jicolor
- }).Count();
-
- return dCount;
- }
-
- //获取时间间隔
- //$scope.GetTimeInteval = (data, month) => {
-
- //}
-
-
- //展示当月的具体统计数据
- $scope.DisplayDetailMonthCalc = function () {
- //$scope.displayDetailMonthCalcData = ;
-
- if ($scope.displayMonth == '') {
- $scope.displayMonth = 1
- }
-
- var Month = $scope.displayMonth
- $scope.status = 0;
- $scope.DangYueGaiLanTableShow = true;
-
- console.log('网络平台数据查看', $scope.arrWangLuoPingTaiBuHeGeLvYuJing);
-
- var lstMonthData = Enumerable.From($scope.arrShouCiBuHeGeYuJing).Where(function (x) {
- return x.month == 3
- }).ToArray()[0].data;
- var dCount = Enumerable.From(lstMonthData).Where(function (x) {
- return x.JCXM = '维生素D'
- }).Count();
-
- //console.log('varrrrr', dCount);
- //return
-
- $scope.displayDetailMonthCalcData = [
- {
- dalei: '首发预警', yalei: '首次不合格预警', time: '',
- sanji: $scope.GetValueByJiBie($scope.arrShouCiBuHeGeYuJing, Month, 3),
- erji: $scope.GetValueByJiBie($scope.arrShouCiBuHeGeYuJing, Month, 2),
- yiji: $scope.GetValueByJiBie($scope.arrShouCiBuHeGeYuJing, Month, 1)
- },
- {
- dalei: '频发预警', yalei: '不合格率上升', time: '',
- sanji: $scope.GetValueByJiBie($scope.arrBuHeGeLvShangSheng, Month, 3),
- erji: $scope.GetValueByJiBie($scope.arrBuHeGeLvShangSheng, Month, 2),
- yiji: $scope.GetValueByJiBie($scope.arrBuHeGeLvShangSheng, Month, 1)
- },
- {
- dalei: '频发预警', yalei: '被抽样单位多件不合格预警', time: '',
- sanji: $scope.GetValueByJiBie($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, Month, 3),
- erji: $scope.GetValueByJiBie($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, Month, 2),
- yiji: $scope.GetValueByJiBie($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, Month, 1)
- },
- {
- dalei: '频发预警', yalei: '被抽样单位多次不合格预警', time: '',
- sanji: $scope.GetValueByJiBie($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, Month, 3),
- erji: $scope.GetValueByJiBie($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, Month, 2),
- yiji: $scope.GetValueByJiBie($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, Month, 1)
- },
- {
- dalei: '频发预警', yalei: '生产企业多件不合格预警', time: '',
- sanji: $scope.GetValueByJiBie($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, Month, 3),
- erji: $scope.GetValueByJiBie($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, Month, 2),
- yiji: $scope.GetValueByJiBie($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, Month, 1)
- },
- {
- dalei: '高发预警', yalei: '不合格率偏高预警', time: '',
- sanji: $scope.GetValueByJiBie($scope.arrBuHeGeLvPianGaoYuJing, Month, 3),
- erji: $scope.GetValueByJiBie($scope.arrBuHeGeLvPianGaoYuJing, Month, 2),
- yiji: $scope.GetValueByJiBie($scope.arrBuHeGeLvPianGaoYuJing, Month, 1)
- },
- {
- dalei: '高发预警', yalei: '产地省份不合格率预警', time: '',
- sanji: $scope.GetValueByJiBie($scope.arrChanDiShengFenBuHeGeLvYuJing, Month, 3),
- erji: $scope.GetValueByJiBie($scope.arrChanDiShengFenBuHeGeLvYuJing, Month, 2),
- yiji: $scope.GetValueByJiBie($scope.arrChanDiShengFenBuHeGeLvYuJing, Month, 1)
- },
- {
- dalei: '高发预警', yalei: '进口食品不合格率预警', time: '',
- sanji: $scope.GetValueByJiBie($scope.arrJinKouShiPinBuHeGeLvYuJing, Month, 3),
- erji: $scope.GetValueByJiBie($scope.arrJinKouShiPinBuHeGeLvYuJing, Month, 2),
- yiji: $scope.GetValueByJiBie($scope.arrJinKouShiPinBuHeGeLvYuJing, Month, 1)
- },
- {
- dalei: '高发预警', yalei: '网络平台不合格率预警', time: '',
- sanji: $scope.GetValueByJiBie($scope.arrWangLuoPingTaiBuHeGeLvYuJing, Month, 3),
- erji: $scope.GetValueByJiBie($scope.arrWangLuoPingTaiBuHeGeLvYuJing, Month, 2),
- yiji: $scope.GetValueByJiBie($scope.arrWangLuoPingTaiBuHeGeLvYuJing, Month, 1)
- },
- {
- dalei: '污染预警', yalei: '检测值异常预警', time: '',
- sanji: $scope.GetValueByJiBie($scope.arrJianCeZhiYiChangYuJing, Month, 3),
- erji: $scope.GetValueByJiBie($scope.arrJianCeZhiYiChangYuJing, Month, 2),
- yiji: $scope.GetValueByJiBie($scope.arrJianCeZhiYiChangYuJing, Month, 1)
- },
- {
- dalei: '风险评估预警', yalei: '污染物总膳食暴露量预警', time: '',
- sanji: $scope.GetValueByJiBie($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, Month, 3),
- erji: $scope.GetValueByJiBie($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, Month, 2),
- yiji: $scope.GetValueByJiBie($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, Month, 1)
+ if ($scope.selectedYear != $scope.tempYear) {
+ layer.msg('您还没有加载缓存,或者已经更换了年份,请重新加载缓存!')
+ return;
}
- ];
- }
-
- //退回主界面
- $scope.backMain = function () {
- $scope.status = 1;
- $scope.ZiLeiTableShow = false;
- $scope.ZiLeiMonthTableShow = false;
- $scope.DangYueGaiLanTableShow = false;
-
- }
-
- //日志记录
- $scope.addNote = function (str) {
- var aData = new Date().toLocaleString();
- $scope.txtLog = aData + " " + str + '\r\n' + $scope.txtLog;
- }
-
- //$scope.AddArray = function (data) {
- // $scope.arrShouCiBuHeGeYuJing.push(data)
- // //console.log('dd',data)
- //}
- //////////////////////////////////////////////////////////////////////////////////
- //以下都是老代码，估计用处后面都不大
+ if (curMonth != null) {
+ $scope.selectedMonth = curMonth
+ }
+ $scope.optMonth = $scope.selectedMonth;
+ $scope.displayMonth = $scope.selectedMonth; //首先把页面上方的tab的显示的月份和下拉一致
+ //改变标题内容
+ $scope.pageMonthDetailDisplay = '(' + $scope.selectedYear + '-' + $scope.selectedMonth + ')';
+ $scope.DisplayDetailMonthCalc()
+ }
- $scope.datashow = function () {
- $http.get(Gaddress + '/home/YJ_total', {}).success(function (mydata) {
- $scope.mydata = mydata.data;
- })
- }
- //$scope.datashow();
- $scope.isShow = false;
+
+ //解析相关月份的具体数据
+ $scope.GetValueByMonth = (data, month) => {
+ console.log('getvaluebymonth', data.three, month);
+ var curData = 0;
+
+
+ switch (month) {
+ case 1:
+ curData = data.one;
+ break;
+ case 2:
+ curData = data.two;
+ break;
+ case 3:
+ curData = data.three;
+ break;
+ case 4:
+ curData = data.four;
+ break;
+ case 5:
+ curData = data.five;
+ break;
+ case 6:
+ curData = data.six;
+ break;
+ case 7:
+ curData = data.seven;
+ break;
+ case 8:
+ curData = data.eight;
+ break;
+ case 9:
+ curData = data.nine;
+ break;
+ case 10:
+ curData = data.ten;
+ break;
+ case 11:
+ curData = data.eleven;
+ break;
+ case 12:
+ curData = data.twelve;
+ break;
+ case 13:
+ curData = data.total;
+ break;
+ default:
+ }
+ return curData;
+ }
+
+
+ //展示只有一个月的数据
+ $scope.DisplayDetailMonth = function (Month) {
+
+ return;
+
+ $scope.displayDetailMonthData = {};
+ $scope.status = 0; //隐藏主统计表格界面
+ $scope.ZiLeiMonthTableShow = true; //显示月份部分
+ $scope.displayDetailMonthData = [] //前端显示数据
+
+ //开始组装数据
+ $scope.displayDetailMonthData = {
+ Month: ((Month == 13) ? "总计" : Month + "月"),
+ //首次不合格预警
+ SFYJ_SCBHGYJ: $scope.GetValueByMonth($scope.jsonSFYJ_SCBHGYJ, Month),
+ //不合格率上升
+ PFYJ_BHGLSS: $scope.GetValueByMonth($scope.jsonPFYJ_BHGLSS, Month),
+ //被抽样单位多件不合格预警
+ PFYJ_BCYDWDJBHGYJ: $scope.GetValueByMonth($scope.jsonPFYJ_BCYDWDJBHGYJ, Month),
+ //被抽样单位多次不合格预警
+ PFYJ_BCYDWDCBHGYJ: $scope.GetValueByMonth($scope.jsonPFYJ_BCYDWDCBHGYJ, Month),
+ //生产企业多件不合格预警
+ PFYJ_SCQYDJBHGYJ: $scope.GetValueByMonth($scope.jsonPFYJ_SCQYDJBHGYJ, Month),
+ //不合格率偏高预警
+ GFYJ_BHGLPGYJ: $scope.GetValueByMonth($scope.jsonGFYJ_BHGLPGYJ, Month),
+ //产地省份不合格率预警
+ GFYJ_CDSFBHGLYJ: $scope.GetValueByMonth($scope.jsonGFYJ_CDSFBHGLYJ, Month),
+ //进口食品不合格率预警
+ GFYJ_JKSPBHGLYJ: $scope.GetValueByMonth($scope.jsonGFYJ_JKSPBHGLYJ, Month),
+ //网络平台不合格率预警
+ GFYJ_WLPTBHGLYJ: $scope.GetValueByMonth($scope.jsonGFYJ_WLPTBHGLYJ, Month),
+ //检测值异常预警
+ WRYJ_JCZYCYJ: $scope.GetValueByMonth($scope.jsonWRYJ_JCZYCYJ, Month),
+ //污染物总膳食暴露量预警
+ BLYJ_WRWZSSBLLYJ: $scope.GetValueByMonth($scope.jsonBLYJ_WRWZSSBLLYJ, Month),
+ }
+
+ }
+
+
+ $scope.GetValueByJiBie = function (data, month, jibie) {
+ var jicolor = '';
+ switch (jibie) {
+ case 3:
+ jicolor = '#fff900';
+ break;
+ case 2:
+ jicolor = '#ff8300';
+ break;
+ case 1:
+ jicolor = '#ff0000';
+ break;
+ default:
+ }
+ //console.log('被查询的数据', data)
+ //console.log('被查询的数据结果', Enumerable.From(data).Where(function (x) { return x.month == month && x.ji == jicolor }).Count());
+ var lstMonthData = Enumerable.From(data).Where(function (x) {
+ return x.month == month
+ }).ToArray()[0].data;
+ var dCount = Enumerable.From(lstMonthData).Where(function (x) {
+ return x.ji == jicolor
+ }).Count();
+
+ return dCount;
+ }
+
+ //获取时间间隔
+ //$scope.GetTimeInteval = (data, month) => {
+
+ //}
+
+
+ //展示当月的具体统计数据
+ $scope.DisplayDetailMonthCalc = function () {
+ //$scope.displayDetailMonthCalcData = ;
+
+ if ($scope.displayMonth == '') {
+ $scope.displayMonth = 1
+ }
+
+ var Month = $scope.displayMonth
+ $scope.status = 0;
+ $scope.DangYueGaiLanTableShow = true;
+
+ console.log('网络平台数据查看', $scope.arrWangLuoPingTaiBuHeGeLvYuJing);
+
+ var lstMonthData = Enumerable.From($scope.arrShouCiBuHeGeYuJing).Where(function (x) {
+ return x.month == 3
+ }).ToArray()[0].data;
+ var dCount = Enumerable.From(lstMonthData).Where(function (x) {
+ return x.JCXM = '维生素D'
+ }).Count();
+
+ //console.log('varrrrr', dCount);
+ //return
+
+ $scope.displayDetailMonthCalcData = [
+ {
+ dalei: '首发预警', yalei: '首次不合格预警', time: '',
+ sanji: $scope.GetValueByJiBie($scope.arrShouCiBuHeGeYuJing, Month, 3),
+ erji: $scope.GetValueByJiBie($scope.arrShouCiBuHeGeYuJing, Month, 2),
+ yiji: $scope.GetValueByJiBie($scope.arrShouCiBuHeGeYuJing, Month, 1)
+ },
+ {
+ dalei: '频发预警', yalei: '不合格率上升', time: '',
+ sanji: $scope.GetValueByJiBie($scope.arrBuHeGeLvShangSheng, Month, 3),
+ erji: $scope.GetValueByJiBie($scope.arrBuHeGeLvShangSheng, Month, 2),
+ yiji: $scope.GetValueByJiBie($scope.arrBuHeGeLvShangSheng, Month, 1)
+ },
+ {
+ dalei: '频发预警', yalei: '被抽样单位多件不合格预警', time: '',
+ sanji: $scope.GetValueByJiBie($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, Month, 3),
+ erji: $scope.GetValueByJiBie($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, Month, 2),
+ yiji: $scope.GetValueByJiBie($scope.arrBeiChouYangDanWeiDuoJianBuHeGeYuJing, Month, 1)
+ },
+ {
+ dalei: '频发预警', yalei: '被抽样单位多次不合格预警', time: '',
+ sanji: $scope.GetValueByJiBie($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, Month, 3),
+ erji: $scope.GetValueByJiBie($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, Month, 2),
+ yiji: $scope.GetValueByJiBie($scope.arrBeiChouYangDanWeiDuoCiBuHeGeYuJing, Month, 1)
+ },
+ {
+ dalei: '频发预警', yalei: '生产企业多件不合格预警', time: '',
+ sanji: $scope.GetValueByJiBie($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, Month, 3),
+ erji: $scope.GetValueByJiBie($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, Month, 2),
+ yiji: $scope.GetValueByJiBie($scope.arrShengChanQiYeDuoJianBuHeGeYuJing, Month, 1)
+ },
+ {
+ dalei: '高发预警', yalei: '不合格率偏高预警', time: '',
+ sanji: $scope.GetValueByJiBie($scope.arrBuHeGeLvPianGaoYuJing, Month, 3),
+ erji: $scope.GetValueByJiBie($scope.arrBuHeGeLvPianGaoYuJing, Month, 2),
+ yiji: $scope.GetValueByJiBie($scope.arrBuHeGeLvPianGaoYuJing, Month, 1)
+ },
+ {
+ dalei: '高发预警', yalei: '产地省份不合格率预警', time: '',
+ sanji: $scope.GetValueByJiBie($scope.arrChanDiShengFenBuHeGeLvYuJing, Month, 3),
+ erji: $scope.GetValueByJiBie($scope.arrChanDiShengFenBuHeGeLvYuJing, Month, 2),
+ yiji: $scope.GetValueByJiBie($scope.arrChanDiShengFenBuHeGeLvYuJing, Month, 1)
+ },
+ {
+ dalei: '高发预警', yalei: '进口食品不合格率预警', time: '',
+ sanji: $scope.GetValueByJiBie($scope.arrJinKouShiPinBuHeGeLvYuJing, Month, 3),
+ erji: $scope.GetValueByJiBie($scope.arrJinKouShiPinBuHeGeLvYuJing, Month, 2),
+ yiji: $scope.GetValueByJiBie($scope.arrJinKouShiPinBuHeGeLvYuJing, Month, 1)
+ },
+ {
+ dalei: '高发预警', yalei: '网络平台不合格率预警', time: '',
+ sanji: $scope.GetValueByJiBie($scope.arrWangLuoPingTaiBuHeGeLvYuJing, Month, 3),
+ erji: $scope.GetValueByJiBie($scope.arrWangLuoPingTaiBuHeGeLvYuJing, Month, 2),
+ yiji: $scope.GetValueByJiBie($scope.arrWangLuoPingTaiBuHeGeLvYuJing, Month, 1)
+ },
+ {
+ dalei: '污染预警', yalei: '检测值异常预警', time: '',
+ sanji: $scope.GetValueByJiBie($scope.arrJianCeZhiYiChangYuJing, Month, 3),
+ erji: $scope.GetValueByJiBie($scope.arrJianCeZhiYiChangYuJing, Month, 2),
+ yiji: $scope.GetValueByJiBie($scope.arrJianCeZhiYiChangYuJing, Month, 1)
+ },
+ {
+ dalei: '风险评估预警', yalei: '污染物总膳食暴露量预警', time: '',
+ sanji: $scope.GetValueByJiBie($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, Month, 3),
+ erji: $scope.GetValueByJiBie($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, Month, 2),
+ yiji: $scope.GetValueByJiBie($scope.arrWuRanWuZongShanShiBaoLuLiangYuJing, Month, 1)
+ }
+ ];
+ }
+
+ //退回主界面
+ $scope.backMain = function () {
+ $scope.status = 1;
+ $scope.ZiLeiTableShow = false;
+ $scope.ZiLeiMonthTableShow = false;
+ $scope.DangYueGaiLanTableShow = false;
+
+ }
+
+ //日志记录
+ $scope.addNote = function (str) {
+ var aData = new Date().toLocaleString();
+ $scope.txtLog = aData + " " + str + '\r\n' + $scope.txtLog;
+ }
+
+ //$scope.AddArray = function (data) {
+ // $scope.arrShouCiBuHeGeYuJing.push(data)
+ // //console.log('dd',data)
+ //}
+
+
+ //////////////////////////////////////////////////////////////////////////////////
+ //以下都是老代码，估计用处后面都不大
+
+ $scope.datashow = function () {
+ $http.get(Gaddress + '/home/YJ_total', {}).success(function (mydata) {
+ $scope.mydata = mydata.data;
+ })
+ }
+ //$scope.datashow();
+ $scope.isShow = false;
//增加日志20211109
-addlog("首页预警", "查询[首页预警]")
+ addlog("首页预警", "查询[首页预警]")
-var nowDate2 = new Date();
-var fullYear2 = nowDate2.getFullYear();
-var month2 = nowDate2.getMonth() + 1;
+ var nowDate2 = new Date();
+ var fullYear2 = nowDate2.getFullYear();
+ var month2 = nowDate2.getMonth() + 1;
-$("#tatol").html(fullYear2 + "年");
-$("#month").html(month2 + "月");
+ $("#tatol").html(fullYear2 + "年");
+ $("#month").html(month2 + "月");
//弹框详细
-$scope.model_click = function (a, b) {
+ $scope.model_click = function (a, b) {
- if (b == 1) {
- $('#div_ji').html('三级');
- $('#div_ji').css('background', '#fff900');
- }
- if (b == 2) {
- $('#div_ji').html('二级');
- $('#div_ji').css('background', '#ff8300cf');
- }
- if (b == 3) {
- $('#div_ji').html('一级');
- $('#div_ji').css('background', '#ff0000ab');
- }
+ if (b == 1) {
+ $('#div_ji').html('三级');
+ $('#div_ji').css('background', '#fff900');
+ }
+ if (b == 2) {
+ $('#div_ji').html('二级');
+ $('#div_ji').css('background', '#ff8300cf');
+ }
+ if (b == 3) {
+ $('#div_ji').html('一级');
+ $('#div_ji').css('background', '#ff0000ab');
+ }
- var aa = a + 1;
- $scope.num = aa;
- $http.get(Gaddress + '/home/YJ_AllData?a=' + aa + '&b=' + b, {}).success(function (mydata) {
- if (aa == 1) {
- $('#myModalLabel').html("首次不合格预警");
- $scope.myshow = mydata.data;
- }
- if (aa == 2) {
- $('#myModalLabel').html("不合格率上升预警");
- $scope.myshow2 = mydata.data;
- }
- if (aa == 3) {
- $('#myModalLabel').html("被抽样单位多件不合格预警");
- $scope.myshow3 = mydata.data;
- }
- if (aa == 4) {
- $('#myModalLabel').html("被抽样单位多次不合格预警");
- $scope.myshow4 = mydata.data;
- }
- if (aa == 5) {
- $('#myModalLabel').html("生产企业多件不合格预警");
- $scope.myshow5 = mydata.data;
- }
- if (aa == 6) {
- $('#myModalLabel').html("不合格率偏高预警");
- $scope.myshow6 = mydata.data;
- }
- if (aa == 7) {
- $('#myModalLabel').html("产地省份不合格预警");
- $scope.myshow7 = mydata.data;
- }
- if (aa == 8) {
- $('#myModalLabel').html("进口食品不合格预警");
- $scope.myshow8 = mydata.data;
- }
- if (aa == 9) {
- $('#myModalLabel').html("网络平台不合格预警");
- $scope.myshow9 = mydata.data;
- }
- if (aa == 10) {
- $('#myModalLabel').html("检测值异常预警");
- $scope.myshow10 = mydata.data;
- }
- if (aa == 11) {
- $('#myModalLabel').html("污染物总膳食暴露量预警");
- $scope.myshow11 = mydata.data;
+ var aa = a + 1;
+ $scope.num = aa;
+ $http.get(Gaddress + '/home/YJ_AllData?a=' + aa + '&b=' + b, {}).success(function (mydata) {
+ if (aa == 1) {
+ $('#myModalLabel').html("首次不合格预警");
+ $scope.myshow = mydata.data;
+ }
+ if (aa == 2) {
+ $('#myModalLabel').html("不合格率上升预警");
+ $scope.myshow2 = mydata.data;
+ }
+ if (aa == 3) {
+ $('#myModalLabel').html("被抽样单位多件不合格预警");
+ $scope.myshow3 = mydata.data;
+ }
+ if (aa == 4) {
+ $('#myModalLabel').html("被抽样单位多次不合格预警");
+ $scope.myshow4 = mydata.data;
+ }
+ if (aa == 5) {
+ $('#myModalLabel').html("生产企业多件不合格预警");
+ $scope.myshow5 = mydata.data;
+ }
+ if (aa == 6) {
+ $('#myModalLabel').html("不合格率偏高预警");
+ $scope.myshow6 = mydata.data;
+ }
+ if (aa == 7) {
+ $('#myModalLabel').html("产地省份不合格预警");
+ $scope.myshow7 = mydata.data;
+ }
+ if (aa == 8) {
+ $('#myModalLabel').html("进口食品不合格预警");
+ $scope.myshow8 = mydata.data;
+ }
+ if (aa == 9) {
+ $('#myModalLabel').html("网络平台不合格预警");
+ $scope.myshow9 = mydata.data;
+ }
+ if (aa == 10) {
+ $('#myModalLabel').html("检测值异常预警");
+ $scope.myshow10 = mydata.data;
+ }
+ if (aa == 11) {
+ $('#myModalLabel').html("污染物总膳食暴露量预警");
+ $scope.myshow11 = mydata.data;
- }
- })
+ }
+ })
-}
+ }
-$scope.showStatus = 0;
-$scope.status = 1;
-//获取总数居
-$scope.datashow2 = function (a) {
- $scope.isShow = true; //显示加载提示
- console.log('月份数据？', a)
- $http.get(Gaddress + '/home/YJ_total2?a=' + a, {}).success(function (mydata) {
- $scope.mydata2 = mydata.data;
- $timeout(function () {
- $scope.isShow = false;
- }, 1000)
- })
-}
-//$scope.datashow2(0);
-$scope.mothStatus = 0;
-$scope.show = function (b, a, c) {
-
- $("#back2").show();
- if (a == 1) {
- $("#back2").hide();
- }
- if (a == 2) {
- //console.log('hehe,jiushini');
- $scope.status = 2;
- $scope.datashow();
- } else {
- //alert('gggg')
+ $scope.showStatus = 0;
$scope.status = 1;
- $scope.showStatus = b;
- $scope.datashow2(b);
- }
- //$scope.mothStatus = c;
+//获取总数居
+ $scope.datashow2 = function (a) {
+ $scope.isShow = true; //显示加载提示
+ console.log('月份数据？', a)
+ $http.get(Gaddress + '/home/YJ_total2?a=' + a, {}).success(function (mydata) {
+ $scope.mydata2 = mydata.data;
+ $timeout(function () {
+ $scope.isShow = false;
+ }, 1000)
+ })
+ }
+//$scope.datashow2(0);
+ $scope.mothStatus = 0;
+ $scope.show = function (b, a, c) {
-
- $scope.SearchCache();
- //console.log(b, a,c);
-
-}
-
-
-var aaa = 0;
-
-$scope.YJ_ALL = function (a, b, c) {
- $("#back").show();
- $scope.num = 12;
- aaa = a;
- $scope.isShow = true; //显示加载提示
- //预警首页---详情---首次不合格预警
- if (a == 1) {
-
- $http.get(Gaddress + '/home/YJ_All_total?jcxm=' + b + '&spxl=' + c, {}).success(function (mydata) {
- var dT = mydata.data;
-
- for (var i = 0; i < dT.length; i++) {
- dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ $("#back2").show();
+ if (a == 1) {
+ $("#back2").hide();
}
- $scope.totalALL = dT;
- //$timeout(function () {
- // $scope.isShow = false;
- //}, 1000)
- $scope.isShow = false; //隐藏加载提示
- })
- $scope.num2 = 1;
- }
- //预警首页---详情---被抽单位多件不合格预警---被抽单位多次不合格预警
- if (a == 3 || a == 4) {
- $http.get(Gaddress + '/home/YJ_All_total2?DW=' + b, {}).success(function (mydata) {
- var dT = mydata.data;
-
- for (var i = 0; i < dT.length; i++) {
- dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ if (a == 2) {
+ //console.log('hehe,jiushini');
+ $scope.status = 2;
+ $scope.datashow();
+ } else {
+ //alert('gggg')
+ $scope.status = 1;
+ $scope.showStatus = b;
+ $scope.datashow2(b);
}
- $scope.totalALL = dT;
- $scope.isShow = false; //隐藏加载提示
- })
- $scope.num2 = 2;
- }
- //预警首页---详情---生产企业多件不合格预警
- if (a == 5) {
- $http.get(Gaddress + '/home/YJ_All_total3?DW=' + b, {}).success(function (mydata) {
- var dT = mydata.data;
+ //$scope.mothStatus = c;
- for (var i = 0; i < dT.length; i++) {
- dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+
+ $scope.SearchCache();
+ //console.log(b, a,c);
+
+ }
+
+
+ var aaa = 0;
+
+ $scope.YJ_ALL = function (a, b, c) {
+ $("#back").show();
+ $scope.num = 12;
+ aaa = a;
+ $scope.isShow = true; //显示加载提示
+ //预警首页---详情---首次不合格预警
+ if (a == 1) {
+
+ $http.get(Gaddress + '/home/YJ_All_total?jcxm=' + b + '&spxl=' + c, {}).success(function (mydata) {
+ var dT = mydata.data;
+
+ for (var i = 0; i < dT.length; i++) {
+ dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ }
+ $scope.totalALL = dT;
+ //$timeout(function () {
+ // $scope.isShow = false;
+ //}, 1000)
+ $scope.isShow = false; //隐藏加载提示
+ })
+ $scope.num2 = 1;
}
- $scope.totalALL = dT;
- $scope.isShow = false; //隐藏加载提示
- })
- $scope.num2 = 2;
- }
- //预警首页---详情---不合格率偏高预警
- if (a == 6) {
- $http.get(Gaddress + '/home/YJ_All_total4?jcxm=' + b + '&spxl=' + c, {}).success(function (mydata) {
- var dT = mydata.data;
+ //预警首页---详情---被抽单位多件不合格预警---被抽单位多次不合格预警
+ if (a == 3 || a == 4) {
+ $http.get(Gaddress + '/home/YJ_All_total2?DW=' + b, {}).success(function (mydata) {
+ var dT = mydata.data;
- for (var i = 0; i < dT.length; i++) {
- dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ for (var i = 0; i < dT.length; i++) {
+ dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ }
+ $scope.totalALL = dT;
+ $scope.isShow = false; //隐藏加载提示
+ })
+ $scope.num2 = 2;
}
- $scope.totalALL = dT;
- $scope.isShow = false; //隐藏加载提示
- })
- $scope.num2 = 1;
- }
- //预警首页---详情---产地省份不合格率预警
- if (a == 7) {
- $http.get(Gaddress + '/home/YJ_All_total5?CDSF=' + b, {}).success(function (mydata) {
- var dT = mydata.data;
+ //预警首页---详情---生产企业多件不合格预警
+ if (a == 5) {
+ $http.get(Gaddress + '/home/YJ_All_total3?DW=' + b, {}).success(function (mydata) {
+ var dT = mydata.data;
- for (var i = 0; i < dT.length; i++) {
- dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ for (var i = 0; i < dT.length; i++) {
+ dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ }
+ $scope.totalALL = dT;
+ $scope.isShow = false; //隐藏加载提示
+ })
+ $scope.num2 = 2;
}
- $scope.totalALL = dT;
- $scope.isShow = false; //隐藏加载提示
- })
- $scope.num2 = 2;
- }
- //预警首页---详情---进口食品不合格率预警
- if (a == 8) {
- $http.get(Gaddress + '/home/YJ_All_total6?CDJK=' + b, {}).success(function (mydata) {
- var dT = mydata.data;
+ //预警首页---详情---不合格率偏高预警
+ if (a == 6) {
+ $http.get(Gaddress + '/home/YJ_All_total4?jcxm=' + b + '&spxl=' + c, {}).success(function (mydata) {
+ var dT = mydata.data;
- for (var i = 0; i < dT.length; i++) {
- dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ for (var i = 0; i < dT.length; i++) {
+ dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ }
+ $scope.totalALL = dT;
+ $scope.isShow = false; //隐藏加载提示
+ })
+ $scope.num2 = 1;
}
- $scope.totalALL = dT;
- $scope.isShow = false; //隐藏加载提示
- })
- $scope.num2 = 2;
- }
- //预警首页---详情---网络平台不合格率预警
- if (a == 9) {
- $http.get(Gaddress + '/home/YJ_All_total8?WLPT=' + b, {}).success(function (mydata) {
- var dT = mydata.data;
+ //预警首页---详情---产地省份不合格率预警
+ if (a == 7) {
+ $http.get(Gaddress + '/home/YJ_All_total5?CDSF=' + b, {}).success(function (mydata) {
+ var dT = mydata.data;
- for (var i = 0; i < dT.length; i++) {
- dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ for (var i = 0; i < dT.length; i++) {
+ dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ }
+ $scope.totalALL = dT;
+ $scope.isShow = false; //隐藏加载提示
+ })
+ $scope.num2 = 2;
}
- $scope.totalALL = dT;
- $scope.isShow = false; //隐藏加载提示
- })
- $scope.num2 = 2;
- }
- //预警首页---详情---污染物总膳食暴露量预警
- if (a == 10) {
- $http.get(Gaddress + '/home/YJ_All_total7?JCXM=' + b, {}).success(function (mydata) {
- var dT = mydata.data;
+ //预警首页---详情---进口食品不合格率预警
+ if (a == 8) {
+ $http.get(Gaddress + '/home/YJ_All_total6?CDJK=' + b, {}).success(function (mydata) {
+ var dT = mydata.data;
- for (var i = 0; i < dT.length; i++) {
- dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ for (var i = 0; i < dT.length; i++) {
+ dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ }
+ $scope.totalALL = dT;
+ $scope.isShow = false; //隐藏加载提示
+ })
+ $scope.num2 = 2;
}
- $scope.totalALL = dT;
- $scope.isShow = false; //隐藏加载提示
- })
- $scope.num2 = 2;
- }
+ //预警首页---详情---网络平台不合格率预警
+ if (a == 9) {
+ $http.get(Gaddress + '/home/YJ_All_total8?WLPT=' + b, {}).success(function (mydata) {
+ var dT = mydata.data;
-}
+ for (var i = 0; i < dT.length; i++) {
+ dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ }
+ $scope.totalALL = dT;
+ $scope.isShow = false; //隐藏加载提示
+ })
+ $scope.num2 = 2;
+ }
+ //预警首页---详情---污染物总膳食暴露量预警
+ if (a == 10) {
+ $http.get(Gaddress + '/home/YJ_All_total7?JCXM=' + b, {}).success(function (mydata) {
+ var dT = mydata.data;
-$("#back").hide();
-$scope.back = function () {
- $("#back").hide();
- $scope.num = aaa;
-}
-$("#back2").hide();
-$scope.back2 = function () {
- $("#back2").hide();
- $scope.showStatus = 0;
- $scope.mothStatus = 0;
- $scope.datashow2(0);
-}
+ for (var i = 0; i < dT.length; i++) {
+ dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ }
+ $scope.totalALL = dT;
+ $scope.isShow = false; //隐藏加载提示
+ })
+ $scope.num2 = 2;
+ }
+
+ }
+
+ $("#back").hide();
+ $scope.back = function () {
+ $("#back").hide();
+ $scope.num = aaa;
+ }
+ $("#back2").hide();
+ $scope.back2 = function () {
+ $("#back2").hide();
+ $scope.showStatus = 0;
+ $scope.mothStatus = 0;
+ $scope.datashow2(0);
+ }
//时间格式
-function HandelTime(strTime) {
- var obj = new Date(parseInt(strTime.replace("/Date(", "").replace(")/", ""), 10));
- return obj.getFullYear() + "-" + (obj.getMonth() + 1) + "-" + obj.getDate();
-}
+ function HandelTime(strTime) {
+ var obj = new Date(parseInt(strTime.replace("/Date(", "").replace(")/", ""), 10));
+ return obj.getFullYear() + "-" + (obj.getMonth() + 1) + "-" + obj.getDate();
+ }
//时间格式
-function add0(m) {
- return m < 10 ? '0' + m : m
-}
+ function add0(m) {
+ return m < 10 ? '0' + m : m
+ }
-function format(shijianchuo) {
- //shijianchuo是整数，否则要parseInt转换
- var time = new Date(shijianchuo);
- var y = time.getFullYear();
- var m = time.getMonth() + 1;
- var d = time.getDate();
- return y + '/' + add0(m) + '/' + add0(d);// + ' ' + add0(h) + ':' + add0(mm) + ':' + add0(s);
-}
+ function format(shijianchuo) {
+ //shijianchuo是整数，否则要parseInt转换
+ var time = new Date(shijianchuo);
+ var y = time.getFullYear();
+ var m = time.getMonth() + 1;
+ var d = time.getDate();
+ return y + '/' + add0(m) + '/' + add0(d);// + ' ' + add0(h) + ':' + add0(mm) + ':' + add0(s);
+ }
-$scope.beginTime = new Date();
-$scope.endTime = new Date();
+ $scope.beginTime = new Date();
+ $scope.endTime = new Date();
-$scope.monthDa = 0;//选择月份
+ $scope.monthDa = 0;//选择月份
//根据月份查询数据
-$scope.monthData = function (a, b) {
- //console.log(a, b);
- //$("#myModal").modal("show");
- $scope.monthDa = a;
- $("#myModalLabel2").html(b);
+ $scope.monthData = function (a, b) {
+ //console.log(a, b);
+ //$("#myModal").modal("show");
+ $scope.monthDa = a;
+ $("#myModalLabel2").html(b);
- $scope.isShow = true; //显示加载提示
- if (b == '首次不合格预警') {
- $scope.num = 1;
- aaa = 1;
- $scope.myshow = [];
- $http.get(Gaddress + '/home/yujing2?num=4&num3=' + a + '&num4=0', {}).success(function (mydata) {
- $scope.myshow = mydata.data;
- $scope.isShow = false; //隐藏加载提示
- })
- }
- if (b == '不合格率上升预警') {
- $scope.num = 2;
- aaa = 2;
- $scope.myshow2 = [];
- $http.get(Gaddress + '/home/yujing?num=' + a + "&num2=0", {}).success(function (mydata) {
- $scope.myshow2 = mydata.data;
- $scope.isShow = false; //隐藏加载提示
- })
- }
- if (b == '被抽样单位多件不合格预警') {
- $scope.num = 3;
- aaa = 3;
- $scope.myshow3 = [];
- var nowDate = new Date();
- var fullYear = nowDate.getFullYear();
- //var month = nowDate.getMonth() + 1;
- var endOfMonth = new Date(fullYear, a, 0).getDate();
- var dateTime = fullYear + "/" + a + "/" + endOfMonth;
- var kaishishijian = format(new Date(dateTime));
- var jieshushijian = format(new Date(dateTime));
- $http.get(Gaddress + '/home/YJ_BCDW?kaishishijian=' + kaishishijian + '&jieshushijian=' + jieshushijian, {}).success(function (mydata) {
- $scope.myshow3 = mydata.data;
- $scope.beginTime = mydata.beginTime;
- $scope.endTime = mydata.endTime;
+ $scope.isShow = true; //显示加载提示
+ if (b == '首次不合格预警') {
+ $scope.num = 1;
+ aaa = 1;
+ $scope.myshow = [];
+ $http.get(Gaddress + '/home/yujing2?num=4&num3=' + a + '&num4=0', {}).success(function (mydata) {
+ $scope.myshow = mydata.data;
+ $scope.isShow = false; //隐藏加载提示
+ })
+ }
+ if (b == '不合格率上升预警') {
+ $scope.num = 2;
+ aaa = 2;
+ $scope.myshow2 = [];
+ $http.get(Gaddress + '/home/yujing?num=' + a + "&num2=0", {}).success(function (mydata) {
+ $scope.myshow2 = mydata.data;
+ $scope.isShow = false; //隐藏加载提示
+ })
+ }
+ if (b == '被抽样单位多件不合格预警') {
+ $scope.num = 3;
+ aaa = 3;
+ $scope.myshow3 = [];
+ var nowDate = new Date();
+ var fullYear = nowDate.getFullYear();
+ //var month = nowDate.getMonth() + 1;
+ var endOfMonth = new Date(fullYear, a, 0).getDate();
+ var dateTime = fullYear + "/" + a + "/" + endOfMonth;
+ var kaishishijian = format(new Date(dateTime));
+ var jieshushijian = format(new Date(dateTime));
+ $http.get(Gaddress + '/home/YJ_BCDW?kaishishijian=' + kaishishijian + '&jieshushijian=' + jieshushijian, {}).success(function (mydata) {
+ $scope.myshow3 = mydata.data;
+ $scope.beginTime = mydata.beginTime;
+ $scope.endTime = mydata.endTime;
- $scope.isShow = false; //隐藏加载提示
- })
- }
- if (b == '被抽样单位多次不合格预警') {
- $scope.num = 4;
- aaa = 4;
- $scope.myshow4 = [];
- var nowDate = new Date();
- var fullYear = nowDate.getFullYear();
- //var month = nowDate.getMonth() + 1;
- var endOfMonth = new Date(fullYear, a, 0).getDate();
- var dateTime = fullYear + "/" + a + "/" + endOfMonth;
- var kaishishijian = format(new Date(dateTime));
- var jieshushijian = format(new Date(dateTime));
- $http.get(Gaddress + '/home/YJ_BCDW2?kaishishijian=' + kaishishijian + '&jieshushijian=' + jieshushijian, {}).success(function (mydata) {
- $scope.myshow4 = mydata.data;
- $scope.beginTime = mydata.beginTime;
- $scope.endTime = mydata.endTime;
- $scope.isShow = false; //隐藏加载提示
- })
+ $scope.isShow = false; //隐藏加载提示
+ })
+ }
+ if (b == '被抽样单位多次不合格预警') {
+ $scope.num = 4;
+ aaa = 4;
+ $scope.myshow4 = [];
+ var nowDate = new Date();
+ var fullYear = nowDate.getFullYear();
+ //var month = nowDate.getMonth() + 1;
+ var endOfMonth = new Date(fullYear, a, 0).getDate();
+ var dateTime = fullYear + "/" + a + "/" + endOfMonth;
+ var kaishishijian = format(new Date(dateTime));
+ var jieshushijian = format(new Date(dateTime));
+ $http.get(Gaddress + '/home/YJ_BCDW2?kaishishijian=' + kaishishijian + '&jieshushijian=' + jieshushijian, {}).success(function (mydata) {
+ $scope.myshow4 = mydata.data;
+ $scope.beginTime = mydata.beginTime;
+ $scope.endTime = mydata.endTime;
+ $scope.isShow = false; //隐藏加载提示
+ })
- }
- if (b == '生产企业多件不合格预警') {
- $scope.num = 5;
- aaa = 5;
- $scope.myshow5 = [];
- var nowDate = new Date();
- var fullYear = nowDate.getFullYear();
- //var month = nowDate.getMonth() + 1;
- var endOfMonth = new Date(fullYear, a, 0).getDate();
- var dateTime = fullYear + "/" + a + "/" + endOfMonth;
- var kaishishijian = format(new Date(dateTime));
- var jieshushijian = format(new Date(dateTime));
- $http.get(Gaddress + '/home/YJ_SCQY?kaishishijian=' + kaishishijian + '&jieshushijian=' + jieshushijian, {}).success(function (mydata) {
- $scope.myshow5 = mydata.data;
- $scope.beginTime = mydata.beginTime;
- $scope.endTime = mydata.endTime;
- $scope.isShow = false; //隐藏加载提示
- })
- }
- if (b == '不合格率偏高预警') {
- $scope.num = 6;
- aaa = 6;
- $scope.myshow6 = [];
- $http.get(Gaddress + '/home/YJ_DQ?num2=4&num3=' + a + '&num4=0', {}).success(function (mydata) {
- $scope.myshow6 = mydata.data;
- $scope.isShow = false; //隐藏加载提示
- })
- }
- if (b == '产地省份不合格率预警') {
- $scope.myshow7 = [];
- $scope.num = 7;
- aaa = 7;
- var nowDate = new Date();
- var fullYear = nowDate.getFullYear();
- //var month = nowDate.getMonth() + 1;
- var endOfMonth = new Date(fullYear, a, 0).getDate();
- var dateTime = fullYear + "/" + a + "/" + endOfMonth;
- var kaishishijian = format(new Date(dateTime));
- var jieshushijian = format(new Date(dateTime));
- $http.get(Gaddress + '/home/YJ_CDSF?kaishishijian=' + kaishishijian + '&jieshushijian=' + jieshushijian, {}).success(function (mydata) {
- $scope.myshow7 = mydata.data;
- $scope.beginTime = mydata.beginTime;
- $scope.endTime = mydata.endTime;
- $scope.isShow = false; //隐藏加载提示
- })
- }
- if (b == '进口食品不合格率预警') {
- $scope.num = 8;
- aaa = 8;
- $scope.myshow8 = [];
- var nowDate = new Date();
- var fullYear = nowDate.getFullYear();
- //var month = nowDate.getMonth() + 1;
- var endOfMonth = new Date(fullYear, a, 0).getDate();
- var dateTime = fullYear + "/" + a + "/" + endOfMonth;
- var kaishishijian = format(new Date(dateTime));
- var jieshushijian = format(new Date(dateTime));
- $http.get(Gaddress + '/home/YJ_CDJK?kaishishijian=' + kaishishijian + '&jieshushijian=' + jieshushijian, {}).success(function (mydata) {
- $scope.myshow8 = mydata.data;
- $scope.beginTime = mydata.beginTime;
- $scope.endTime = mydata.endTime;
- $scope.isShow = false; //隐藏加载提示
- })
- }
- if (b == '网络平台不合格率预警') {
- $scope.num = 9;
- aaa = 9;
- $scope.myshow9 = [];
- var nowDate = new Date();
- var fullYear = nowDate.getFullYear();
- //var month = nowDate.getMonth() + 1;
- var endOfMonth = new Date(fullYear, a, 0).getDate();
- var dateTime = fullYear + "/" + a + "/" + endOfMonth;
- var kaishishijian = format(new Date(dateTime));
- var jieshushijian = format(new Date(dateTime));
- $http.get(Gaddress + '/home/YJ_WLPT?kaishishijian=' + kaishishijian + '&jieshushijian=' + jieshushijian, {}).success(function (mydata) {
- $scope.myshow9 = mydata.data;
- $scope.beginTime = mydata.beginTime;
- $scope.endTime = mydata.endTime;
- $scope.isShow = false; //隐藏加载提示
- })
- }
- if (b == '检测值异常预警') {
- $scope.num = 10;
- aaa = 10;
- $scope.myshow10 = [];
- $http.get(Gaddress + '/home/YJ_JCZ?num3=' + a + '&num4=0', {}).success(function (mydata) {
- $scope.myshow10 = mydata.data;
- $scope.isShow = false; //隐藏加载提示
- })
- }
- if (b == '污染物总膳食暴露量预警') {
- $scope.num = 11;
- aaa = 11;
- $scope.myshow11 = [];
- var nowDate = new Date();
- var fullYear = nowDate.getFullYear();
- //var month = nowDate.getMonth() + 1;
- var endOfMonth = new Date(fullYear, a, 0).getDate();
- var dateTime = fullYear + "/" + a + "/" + endOfMonth;
- var kaishishijian = format(new Date(dateTime));
- var jieshushijian = format(new Date(dateTime));
- $http.get(Gaddress + '/home/YJ_ZBLLPG?kaishishijian=' + kaishishijian + '&jieshushijian=' + jieshushijian, {}).success(function (mydata) {
- $scope.myshow11 = mydata.data;
- $scope.beginTime = mydata.beginTime;
- $scope.endTime = mydata.endTime;
- $scope.isShow = false; //隐藏加载提示
- })
- }
+ }
+ if (b == '生产企业多件不合格预警') {
+ $scope.num = 5;
+ aaa = 5;
+ $scope.myshow5 = [];
+ var nowDate = new Date();
+ var fullYear = nowDate.getFullYear();
+ //var month = nowDate.getMonth() + 1;
+ var endOfMonth = new Date(fullYear, a, 0).getDate();
+ var dateTime = fullYear + "/" + a + "/" + endOfMonth;
+ var kaishishijian = format(new Date(dateTime));
+ var jieshushijian = format(new Date(dateTime));
+ $http.get(Gaddress + '/home/YJ_SCQY?kaishishijian=' + kaishishijian + '&jieshushijian=' + jieshushijian, {}).success(function (mydata) {
+ $scope.myshow5 = mydata.data;
+ $scope.beginTime = mydata.beginTime;
+ $scope.endTime = mydata.endTime;
+ $scope.isShow = false; //隐藏加载提示
+ })
+ }
+ if (b == '不合格率偏高预警') {
+ $scope.num = 6;
+ aaa = 6;
+ $scope.myshow6 = [];
+ $http.get(Gaddress + '/home/YJ_DQ?num2=4&num3=' + a + '&num4=0', {}).success(function (mydata) {
+ $scope.myshow6 = mydata.data;
+ $scope.isShow = false; //隐藏加载提示
+ })
+ }
+ if (b == '产地省份不合格率预警') {
+ $scope.myshow7 = [];
+ $scope.num = 7;
+ aaa = 7;
+ var nowDate = new Date();
+ var fullYear = nowDate.getFullYear();
+ //var month = nowDate.getMonth() + 1;
+ var endOfMonth = new Date(fullYear, a, 0).getDate();
+ var dateTime = fullYear + "/" + a + "/" + endOfMonth;
+ var kaishishijian = format(new Date(dateTime));
+ var jieshushijian = format(new Date(dateTime));
+ $http.get(Gaddress + '/home/YJ_CDSF?kaishishijian=' + kaishishijian + '&jieshushijian=' + jieshushijian, {}).success(function (mydata) {
+ $scope.myshow7 = mydata.data;
+ $scope.beginTime = mydata.beginTime;
+ $scope.endTime = mydata.endTime;
+ $scope.isShow = false; //隐藏加载提示
+ })
+ }
+ if (b == '进口食品不合格率预警') {
+ $scope.num = 8;
+ aaa = 8;
+ $scope.myshow8 = [];
+ var nowDate = new Date();
+ var fullYear = nowDate.getFullYear();
+ //var month = nowDate.getMonth() + 1;
+ var endOfMonth = new Date(fullYear, a, 0).getDate();
+ var dateTime = fullYear + "/" + a + "/" + endOfMonth;
+ var kaishishijian = format(new Date(dateTime));
+ var jieshushijian = format(new Date(dateTime));
+ $http.get(Gaddress + '/home/YJ_CDJK?kaishishijian=' + kaishishijian + '&jieshushijian=' + jieshushijian, {}).success(function (mydata) {
+ $scope.myshow8 = mydata.data;
+ $scope.beginTime = mydata.beginTime;
+ $scope.endTime = mydata.endTime;
+ $scope.isShow = false; //隐藏加载提示
+ })
+ }
+ if (b == '网络平台不合格率预警') {
+ $scope.num = 9;
+ aaa = 9;
+ $scope.myshow9 = [];
+ var nowDate = new Date();
+ var fullYear = nowDate.getFullYear();
+ //var month = nowDate.getMonth() + 1;
+ var endOfMonth = new Date(fullYear, a, 0).getDate();
+ var dateTime = fullYear + "/" + a + "/" + endOfMonth;
+ var kaishishijian = format(new Date(dateTime));
+ var jieshushijian = format(new Date(dateTime));
+ $http.get(Gaddress + '/home/YJ_WLPT?kaishishijian=' + kaishishijian + '&jieshushijian=' + jieshushijian, {}).success(function (mydata) {
+ $scope.myshow9 = mydata.data;
+ $scope.beginTime = mydata.beginTime;
+ $scope.endTime = mydata.endTime;
+ $scope.isShow = false; //隐藏加载提示
+ })
+ }
+ if (b == '检测值异常预警') {
+ $scope.num = 10;
+ aaa = 10;
+ $scope.myshow10 = [];
+ $http.get(Gaddress + '/home/YJ_JCZ?num3=' + a + '&num4=0', {}).success(function (mydata) {
+ $scope.myshow10 = mydata.data;
+ $scope.isShow = false; //隐藏加载提示
+ })
+ }
+ if (b == '污染物总膳食暴露量预警') {
+ $scope.num = 11;
+ aaa = 11;
+ $scope.myshow11 = [];
+ var nowDate = new Date();
+ var fullYear = nowDate.getFullYear();
+ //var month = nowDate.getMonth() + 1;
+ var endOfMonth = new Date(fullYear, a, 0).getDate();
+ var dateTime = fullYear + "/" + a + "/" + endOfMonth;
+ var kaishishijian = format(new Date(dateTime));
+ var jieshushijian = format(new Date(dateTime));
+ $http.get(Gaddress + '/home/YJ_ZBLLPG?kaishishijian=' + kaishishijian + '&jieshushijian=' + jieshushijian, {}).success(function (mydata) {
+ $scope.myshow11 = mydata.data;
+ $scope.beginTime = mydata.beginTime;
+ $scope.endTime = mydata.endTime;
+ $scope.isShow = false; //隐藏加载提示
+ })
+ }
-}
+ }
-$scope.monthDataA = function (a, b) {
- var nn = $scope.num;
- $scope.num = 12;
- $scope.totalALL = [];
- //预警首页---详情---首次不合格预警
- if (nn == 1) {
- $scope.num2 = 1;
- $http.get(Gaddress + '/home/YJ_All?spxl=' + b + '&jcxm=' + a + '&num=4&num3=' + $scope.monthDa + '&num4=0', {}).success(function (mydata) {
- var dT = mydata.data;
- for (var i = 0; i < dT.length; i++) {
- dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ $scope.monthDataA = function (a, b) {
+ var nn = $scope.num;
+ $scope.num = 12;
+ $scope.totalALL = [];
+ //预警首页---详情---首次不合格预警
+ if (nn == 1) {
+ $scope.num2 = 1;
+ $http.get(Gaddress + '/home/YJ_All?spxl=' + b + '&jcxm=' + a + '&num=4&num3=' + $scope.monthDa + '&num4=0', {}).success(function (mydata) {
+ var dT = mydata.data;
+ for (var i = 0; i < dT.length; i++) {
+ dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ }
+ $scope.totalALL = dT;
+ })
}
- $scope.totalALL = dT;
- })
- }
- //预警首页---详情---被抽单位多件不合格预警---被抽单位多次不合格预警
- if (nn == 3 || nn == 4) {
- $scope.num2 = 2;
- $http.get(Gaddress + '/home/YJ_All3?DW=' + a + '&beginTime=' + $scope.beginTime + '&endTime=' + $scope.endTime, {}).success(function (mydata) {
- var dT = mydata.data;
- for (var i = 0; i < dT.length; i++) {
- dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ //预警首页---详情---被抽单位多件不合格预警---被抽单位多次不合格预警
+ if (nn == 3 || nn == 4) {
+ $scope.num2 = 2;
+ $http.get(Gaddress + '/home/YJ_All3?DW=' + a + '&beginTime=' + $scope.beginTime + '&endTime=' + $scope.endTime, {}).success(function (mydata) {
+ var dT = mydata.data;
+ for (var i = 0; i < dT.length; i++) {
+ dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ }
+ $scope.totalALL = dT;
+ })
}
- $scope.totalALL = dT;
- })
- }
- //预警首页---详情---生产企业多件不合格预警
- if (nn == 5) {
- $scope.num2 = 2;
- $http.get(Gaddress + '/home/YJ_All4?DW=' + a + '&beginTime=' + $scope.beginTime + '&endTime=' + $scope.endTime, {}).success(function (mydata) {
- var dT = mydata.data;
- for (var i = 0; i < dT.length; i++) {
- dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ //预警首页---详情---生产企业多件不合格预警
+ if (nn == 5) {
+ $scope.num2 = 2;
+ $http.get(Gaddress + '/home/YJ_All4?DW=' + a + '&beginTime=' + $scope.beginTime + '&endTime=' + $scope.endTime, {}).success(function (mydata) {
+ var dT = mydata.data;
+ for (var i = 0; i < dT.length; i++) {
+ dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ }
+ $scope.totalALL = dT;
+ })
}
- $scope.totalALL = dT;
- })
- }
- //预警首页---详情---不合格率偏高预警
- if (nn == 6) {
- $scope.num2 = 1;
- $http.get(Gaddress + '/home/YJ_All2?spxl=' + b + '&jcxm=' + a + '&num=4&num3=' + $scope.monthDa + '&num4=0', {}).success(function (mydata) {
- var dT = mydata.data;
- for (var i = 0; i < dT.length; i++) {
- dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ //预警首页---详情---不合格率偏高预警
+ if (nn == 6) {
+ $scope.num2 = 1;
+ $http.get(Gaddress + '/home/YJ_All2?spxl=' + b + '&jcxm=' + a + '&num=4&num3=' + $scope.monthDa + '&num4=0', {}).success(function (mydata) {
+ var dT = mydata.data;
+ for (var i = 0; i < dT.length; i++) {
+ dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ }
+ $scope.totalALL = dT;
+ })
}
- $scope.totalALL = dT;
- })
- }
- //预警首页---详情---产地省份不合格率预警
- if (nn == 7) {
- $scope.num2 = 2;
- $http.get(Gaddress + '/home/YJ_All5?CDSF=' + a + '&beginTime=' + $scope.beginTime + '&endTime=' + $scope.endTime, {}).success(function (mydata) {
- var dT = mydata.data;
- for (var i = 0; i < dT.length; i++) {
- dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ //预警首页---详情---产地省份不合格率预警
+ if (nn == 7) {
+ $scope.num2 = 2;
+ $http.get(Gaddress + '/home/YJ_All5?CDSF=' + a + '&beginTime=' + $scope.beginTime + '&endTime=' + $scope.endTime, {}).success(function (mydata) {
+ var dT = mydata.data;
+ for (var i = 0; i < dT.length; i++) {
+ dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ }
+ $scope.totalALL = dT;
+ })
}
- $scope.totalALL = dT;
- })
- }
- //预警首页---详情---进口食品不合格率预警
- if (nn == 8) {
- $scope.num2 = 2;
- $http.get(Gaddress + '/home/YJ_All6?CDJK=' + a + '&beginTime=' + $scope.beginTime + '&endTime=' + $scope.endTime, {}).success(function (mydata) {
- var dT = mydata.data;
- for (var i = 0; i < dT.length; i++) {
- dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ //预警首页---详情---进口食品不合格率预警
+ if (nn == 8) {
+ $scope.num2 = 2;
+ $http.get(Gaddress + '/home/YJ_All6?CDJK=' + a + '&beginTime=' + $scope.beginTime + '&endTime=' + $scope.endTime, {}).success(function (mydata) {
+ var dT = mydata.data;
+ for (var i = 0; i < dT.length; i++) {
+ dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ }
+ $scope.totalALL = dT;
+ })
}
- $scope.totalALL = dT;
- })
- }
- //预警首页---详情---网络平台不合格率预警
- if (nn == 9) {
- $scope.num2 = 2;
- $http.get(Gaddress + '/home/YJ_All9?WLPT=' + a + '&beginTime=' + $scope.beginTime + '&endTime=' + $scope.endTime, {}).success(function (mydata) {
- var dT = mydata.data;
- for (var i = 0; i < dT.length; i++) {
- dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ //预警首页---详情---网络平台不合格率预警
+ if (nn == 9) {
+ $scope.num2 = 2;
+ $http.get(Gaddress + '/home/YJ_All9?WLPT=' + a + '&beginTime=' + $scope.beginTime + '&endTime=' + $scope.endTime, {}).success(function (mydata) {
+ var dT = mydata.data;
+ for (var i = 0; i < dT.length; i++) {
+ dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ }
+ $scope.totalALL = dT;
+ })
}
- $scope.totalALL = dT;
- })
- }
- //预警首页---详情---污染物总膳食暴露量预警
- if (nn == 11) {
- $scope.num2 = 2;
- $http.get(Gaddress + '/home/YJ_All8?JCXM=' + a + '&SP=' + b + '&num=4&num3=' + $scope.monthDa + '&num4=0', {}).success(function (mydata) {
- var dT = mydata.data;
- for (var i = 0; i < dT.length; i++) {
- dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ //预警首页---详情---污染物总膳食暴露量预警
+ if (nn == 11) {
+ $scope.num2 = 2;
+ $http.get(Gaddress + '/home/YJ_All8?JCXM=' + a + '&SP=' + b + '&num=4&num3=' + $scope.monthDa + '&num4=0', {}).success(function (mydata) {
+ var dT = mydata.data;
+ for (var i = 0; i < dT.length; i++) {
+ dT[i].CYSJ = HandelTime(dT[i].CYSJ);
+ }
+ $scope.totalALL = dT;
+ })
}
- $scope.totalALL = dT;
- })
- }
-}
+ }
//所有预警的注释
-var showData = [
- {
- text: " 首次不合格预警指的是食品小类中某个检验项目在一段时间内首次出现不合格，根据预警需要食品类别可以切换为食品品种、食品亚类、食品大类。
预警分为3个等级：
1. 半年内首次出现不合格预警为黄色
2. 1年内首次出现不合格预警为橙色
3. 在2年内首次出现不合格预警为红色"
- },
- {
- text: " 不合格率上升预警指的是食品中出现不合格，并且不合格率有按月连续上升的趋势。
预警分为3个等级：
1. 连续1个月不合格率上升的预警为黄色
2. 连续2个月不合格率上升的预警为橙色
3. 连续3个月及以上不合格率上升的预警为红色"
- },
- {
- text: " 被抽样单位多件不合格预警指的是在1年内某个被抽样单位出现2件及以上的不合格食品。
预警分为3个等级：
1. 1年内某个被抽样单位出现2件不合格的预警为黄色
2. 1年内某个被抽样单位出现3件不合格的预警为橙色
3. 1年内某个被抽样单位出现4件及以上不合格的预警为红色"
- },
- {
- text: " 被抽样单位多次不合格预警指的是在1年内某个被抽样单位出现2次及以上的不合格食品，其中抽样机构在同一个抽样日期到同一个被抽样单位采集多件样品的统计为1次采样。
预警分为3个等级：
1. 1年内某个被抽样单位出现2次不合格的预警为黄色
2. 1年内某个被抽样单位出现3次的预警为橙色
3. 1年内某个被抽样单位出现4件次及以上不合格的预警为红色"
- },
- {
- text: " 生产企业多件不合格预警指的是在1年内某个生产企业出现2件及以上的不合格食品。
预警分为3个等级：
1. 1年内某个生产企业出现2件不合格的预警为黄色
2. 1年内某个生产企业出现3件不合格的预警为橙色
3. 1年内某个生产企业出现4件及以上不合格的预警为红色"
- },
- {
- text: " 不合格偏高预警指的是在某个月食品小类中的某个项目不合格率偏高。
预警分为3个等级：
1. 1个月内食品小类中的某个项目不合格率大于等于5%小于10%的预警为黄色
2. 1个月内食品小类中的某个项目不合格率大于等于10%小于20%的预警为橙色
3. 1个月内食品小类中的某个项目不合格率大于等于20%的预警为红色"
- },
- {
- text: " 产地省份不合格率预警指的是在1年内被抽检样品的产地省份出现不合格率偏高情形，并按照产地省份对样品进行不合格率统计和排序。
预警分为3个等级：
1. 产地省份不合格率排序第三的预警为黄色
2. 产地省份不合格率排序第二的预警为橙色
3. 产地省份不合格率排序第一的预警为红色"
- },
- {
- text: " 进口食品不合格率预警指的是在1年内被抽检样品的进口原产地出现不合格率偏高情形，并按照进口原产地对样品进行不合格率统计和排序。
预警分为3个等级：
1. 进口原产地不合格率排序第三的预警为黄色
2. 进口原产地不合格率排序第二的预警为橙色
3. 进口原产地不合格率排序第一的预警为红色"
- },
- {
- text: " 网络平台不合格率预警指的是在1年内被抽检样品的网络平台地出现不合格率偏高情形，并按照网络平台对样品进行不合格率统计和排序。
预警分为3个等级：
1. 网络平台不合格率排序第三的预警为黄色
2. 网络平台不合格率排序第二的预警为橙色
3. 网络平台不合格率排序第一的预警为红色"
- },
- {
- text: " 检测值异常预警指的是在1个月内食品小类中的某个检验项目的检测值与限量值进行对比，出现偏高的情形。
预警分为3个等级：
1. 检测值为限量值的2倍（含）到3倍（不含）之间的预警为黄色
2. 检测值为限量值的3倍（含）到4倍（不含）之间的预警为橙色
3. 检测值为限量值的4倍（含）及以上之间的预警为红色"
- },
- {
- text: " 污染物总膳食暴露量预警指的不同食品小类中某个检验项目的平均暴露量之和，污染物膳食平均暴露量=食品中某个检验项目的检测值的平均值*上海市居民该类食物消费量的平均值/上海市居民的平均体重，污染物总膳食暴露量（EXP）和该项目的健康指导值进行比较；同时考虑到有些检验项目的致癌性，对于这类项目采用MOE方法进行计算，计算公式为MOE=基准下限剂量（BMDL）/EXP，MOE和10000进行比较，小于等于10000存在风险，大于10000说明健康风险不大。
预警分为3个等级：
1. EXP占健康指导值的比值为50%（含）到100%（不含）的预警为黄色
2. EXP占健康指导值的比值为100%（含）到200%（不含）的预警为橙色
3. EXP占健康指导值的比值为大于200%（含）、MOE小于等于10000的预警为红色"
- }
-]
+ var showData = [
+ {
+ text: " 首次不合格预警指的是食品小类中某个检验项目在一段时间内首次出现不合格，根据预警需要食品类别可以切换为食品品种、食品亚类、食品大类。
预警分为3个等级：
1. 半年内首次出现不合格预警为黄色
2. 1年内首次出现不合格预警为橙色
3. 在2年内首次出现不合格预警为红色"
+ },
+ {
+ text: " 不合格率上升预警指的是食品中出现不合格，并且不合格率有按月连续上升的趋势。
预警分为3个等级：
1. 连续1个月不合格率上升的预警为黄色
2. 连续2个月不合格率上升的预警为橙色
3. 连续3个月及以上不合格率上升的预警为红色"
+ },
+ {
+ text: " 被抽样单位多件不合格预警指的是在1年内某个被抽样单位出现2件及以上的不合格食品。
预警分为3个等级：
1. 1年内某个被抽样单位出现2件不合格的预警为黄色
2. 1年内某个被抽样单位出现3件不合格的预警为橙色
3. 1年内某个被抽样单位出现4件及以上不合格的预警为红色"
+ },
+ {
+ text: " 被抽样单位多次不合格预警指的是在1年内某个被抽样单位出现2次及以上的不合格食品，其中抽样机构在同一个抽样日期到同一个被抽样单位采集多件样品的统计为1次采样。
预警分为3个等级：
1. 1年内某个被抽样单位出现2次不合格的预警为黄色
2. 1年内某个被抽样单位出现3次的预警为橙色
3. 1年内某个被抽样单位出现4件次及以上不合格的预警为红色"
+ },
+ {
+ text: " 生产企业多件不合格预警指的是在1年内某个生产企业出现2件及以上的不合格食品。
预警分为3个等级：
1. 1年内某个生产企业出现2件不合格的预警为黄色
2. 1年内某个生产企业出现3件不合格的预警为橙色
3. 1年内某个生产企业出现4件及以上不合格的预警为红色"
+ },
+ {
+ text: " 不合格偏高预警指的是在某个月食品小类中的某个项目不合格率偏高。
预警分为3个等级：
1. 1个月内食品小类中的某个项目不合格率大于等于5%小于10%的预警为黄色
2. 1个月内食品小类中的某个项目不合格率大于等于10%小于20%的预警为橙色
3. 1个月内食品小类中的某个项目不合格率大于等于20%的预警为红色"
+ },
+ {
+ text: " 产地省份不合格率预警指的是在1年内被抽检样品的产地省份出现不合格率偏高情形，并按照产地省份对样品进行不合格率统计和排序。
预警分为3个等级：
1. 产地省份不合格率排序第三的预警为黄色
2. 产地省份不合格率排序第二的预警为橙色
3. 产地省份不合格率排序第一的预警为红色"
+ },
+ {
+ text: " 进口食品不合格率预警指的是在1年内被抽检样品的进口原产地出现不合格率偏高情形，并按照进口原产地对样品进行不合格率统计和排序。
预警分为3个等级：
1. 进口原产地不合格率排序第三的预警为黄色
2. 进口原产地不合格率排序第二的预警为橙色
3. 进口原产地不合格率排序第一的预警为红色"
+ },
+ {
+ text: " 网络平台不合格率预警指的是在1年内被抽检样品的网络平台地出现不合格率偏高情形，并按照网络平台对样品进行不合格率统计和排序。
预警分为3个等级：
1. 网络平台不合格率排序第三的预警为黄色
2. 网络平台不合格率排序第二的预警为橙色
3. 网络平台不合格率排序第一的预警为红色"
+ },
+ {
+ text: " 检测值异常预警指的是在1个月内食品小类中的某个检验项目的检测值与限量值进行对比，出现偏高的情形。
预警分为3个等级：
1. 检测值为限量值的2倍（含）到3倍（不含）之间的预警为黄色
2. 检测值为限量值的3倍（含）到4倍（不含）之间的预警为橙色
3. 检测值为限量值的4倍（含）及以上之间的预警为红色"
+ },
+ {
+ text: " 污染物总膳食暴露量预警指的不同食品小类中某个检验项目的平均暴露量之和，污染物膳食平均暴露量=食品中某个检验项目的检测值的平均值*上海市居民该类食物消费量的平均值/上海市居民的平均体重，污染物总膳食暴露量（EXP）和该项目的健康指导值进行比较；同时考虑到有些检验项目的致癌性，对于这类项目采用MOE方法进行计算，计算公式为MOE=基准下限剂量（BMDL）/EXP，MOE和10000进行比较，小于等于10000存在风险，大于10000说明健康风险不大。
预警分为3个等级：
1. EXP占健康指导值的比值为50%（含）到100%（不含）的预警为黄色
2. EXP占健康指导值的比值为100%（含）到200%（不含）的预警为橙色
3. EXP占健康指导值的比值为大于200%（含）、MOE小于等于10000的预警为红色"
+ }
+ ]
-$scope.show_text = 1;
+ $scope.show_text = 1;
//定义显示
-$scope.showText = function (a, b) {
- console.log(b);
- $scope.show_text = 2;
+ $scope.showText = function (a, b) {
+ console.log(b);
+ $scope.show_text = 2;
- if (b == 0) {
- $("#show_text_h2").html(showData[a].text);
- } else {
- if (b == '首次不合格预警') {
- $("#show_text_h").html(showData[0].text);
- }
- if (b == '不合格率上升预警') {
- $("#show_text_h").html(showData[1].text);
- }
- if (b == '被抽样单位多件不合格预警') {
- $("#show_text_h").html(showData[2].text);
- }
- if (b == '被抽样单位多次不合格预警') {
+ if (b == 0) {
+ $("#show_text_h2").html(showData[a].text);
+ } else {
+ if (b == '首次不合格预警') {
+ $("#show_text_h").html(showData[0].text);
+ }
+ if (b == '不合格率上升预警') {
+ $("#show_text_h").html(showData[1].text);
+ }
+ if (b == '被抽样单位多件不合格预警') {
+ $("#show_text_h").html(showData[2].text);
+ }
+ if (b == '被抽样单位多次不合格预警') {
- $("#show_text_h").html(showData[3].text);
- }
- if (b == '生产企业多件不合格预警') {
- $("#show_text_h").html(showData[4].text);
- }
- if (b == '不合格率偏高预警') {
- $("#show_text_h").html(showData[5].text);
- }
- if (b == '产地省份不合格率预警') {
- $("#show_text_h").html(showData[6].text);
- }
- if (b == '进口食品不合格率预警') {
- $("#show_text_h").html(showData[7].text);
- }
- if (b == '网络平台不合格率预警') {
- $("#show_text_h").html(showData[8].text);
- }
- if (b == '检测值异常预警') {
- $("#show_text_h").html(showData[9].text);
- }
- if (b == '污染物总膳食暴露量预警') {
- $("#show_text_h").html(showData[10].text);
- }
- }
+ $("#show_text_h").html(showData[3].text);
+ }
+ if (b == '生产企业多件不合格预警') {
+ $("#show_text_h").html(showData[4].text);
+ }
+ if (b == '不合格率偏高预警') {
+ $("#show_text_h").html(showData[5].text);
+ }
+ if (b == '产地省份不合格率预警') {
+ $("#show_text_h").html(showData[6].text);
+ }
+ if (b == '进口食品不合格率预警') {
+ $("#show_text_h").html(showData[7].text);
+ }
+ if (b == '网络平台不合格率预警') {
+ $("#show_text_h").html(showData[8].text);
+ }
+ if (b == '检测值异常预警') {
+ $("#show_text_h").html(showData[9].text);
+ }
+ if (b == '污染物总膳食暴露量预警') {
+ $("#show_text_h").html(showData[10].text);
+ }
+ }
-}
+ }
//定义隐藏
-$scope.showTextEsc = function () {
- $scope.show_text = 1;
+ $scope.showTextEsc = function () {
+ $scope.show_text = 1;
-}
+ }
-$scope.ii = 0;
+ $scope.ii = 0;
//导出
-$scope.excel = function () {
+ $scope.excel = function () {
- var i = $scope.ii;
- //console.log(i);
- window.location.href = Gaddress + "/home/Download?i=" + i;
-}
+ var i = $scope.ii;
+ //console.log(i);
+ window.location.href = Gaddress + "/home/Download?i=" + i;
+ }
//不合格率上升预警 月份计算
-var numTime = new Date();
-$scope.oneNum = getMonthDay(0);
-$scope.twoNum = getMonthDay(1);
-$scope.threeNum = getMonthDay(2);
-$scope.fourNum = getMonthDay(3);
-$scope.fiveNum = getMonthDay(4);
+ var numTime = new Date();
+ $scope.oneNum = getMonthDay(0);
+ $scope.twoNum = getMonthDay(1);
+ $scope.threeNum = getMonthDay(2);
+ $scope.fourNum = getMonthDay(3);
+ $scope.fiveNum = getMonthDay(4);
//计算月份
-function getMonthDay(n) {
- var nowDate = new Date();
- var year = nowDate.getFullYear();
- var month = nowDate.getMonth();
- month = month + 1 - n;
- if (month <= 0) {
- month = 12 + month;
- year = year - 1;
- }
- return month;
-}
+ function getMonthDay(n) {
+ var nowDate = new Date();
+ var year = nowDate.getFullYear();
+ var month = nowDate.getMonth();
+ month = month + 1 - n;
+ if (month <= 0) {
+ month = 12 + month;
+ year = year - 1;
+ }
+ return month;
+ }
-}])
+ }])
diff --git a/src/main/resources/public/app/yujing/view/dataBuhegelv.html b/src/main/resources/public/app/yujing/view/dataBuhegelv.html
index dfd0caf..ffe8f1a 100644
--- a/src/main/resources/public/app/yujing/view/dataBuhegelv.html
+++ b/src/main/resources/public/app/yujing/view/dataBuhegelv.html
@@ -131,6 +131,8 @@
+
+