From 6a70f946aca610f81245a5e314e9ac2bdf466c91 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 25 十二月 2025 16:27:12 +0800
Subject: [PATCH] 首页大屏数据交互1
---
fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java | 181 ++++++++++++++--
fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupIndexData.java | 6
fzzy-igdss-web/src/main/resources/static/group/gis-chart.js | 2
fzzy-igdss-web/src/main/resources/static/group/index.js | 306 +++++++++------------------
fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupDeptData.java | 32 ++
fzzy-igdss-web/src/main/resources/templates/group/index.html | 64 +++--
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java | 16 +
fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupGisData.java | 2
fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java | 37 +++
fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/FoodVariety.java | 2
10 files changed, 383 insertions(+), 265 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/FoodVariety.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/FoodVariety.java
index 7d92d4f..77cc06c 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/FoodVariety.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/FoodVariety.java
@@ -40,7 +40,7 @@
* @return
*/
public static String getMsg(String code) {
- if (null == code) return "鏈厤缃�";
+ if (null == code) return "鍏朵粬";
return mapFoodVariety.get(code);
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupDeptData.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupDeptData.java
new file mode 100644
index 0000000..f60c2d9
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupDeptData.java
@@ -0,0 +1,32 @@
+package com.fzzy.igds.data;
+
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * @Description 鐩戠淇℃伅鎬昏-搴撳尯淇℃伅灏佽
+ * @Author CZT
+ * @Date 2025/12/25 15:36
+ */
+@Data
+public class GroupDeptData implements Serializable {
+
+ /**
+ * 鐩戠搴撳尯淇℃伅
+ */
+ private String code; //琛屾斂鍖哄垝缂栫爜
+ private String county; //琛屾斂鍖哄悕绉�
+ private String deptName; //搴撳尯鍚嶇О
+ private Integer inNum = 0; //鏃ュ叆搴撹溅鏁�
+ private Integer outNum = 0; //鏃ュ嚭搴撹溅鏁�
+ private Integer depotNumber = 0; //浠撳簱鏁�
+ private Integer depotBankNumber = 0; //璐ㄦ娂浠撴暟
+ private Double storageNum = 0.0; //搴撳瓨鏁�
+
+ /**
+ * 鐩戠鏁伴噺
+ */
+ private Double jd; //缁忓害
+ private Double wd; //缁村害
+
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GisData.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupGisData.java
similarity index 95%
rename from fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GisData.java
rename to fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupGisData.java
index 3dbca71..341cdc0 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GisData.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupGisData.java
@@ -10,7 +10,7 @@
* @Date 2025/12/25 9:35
*/
@Data
-public class GisData {
+public class GroupGisData {
private List<ChartPie> deptList = new ArrayList<>();//鍖哄幙搴撳尯鏁�
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupData.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupIndexData.java
similarity index 84%
rename from fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupData.java
rename to fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupIndexData.java
index e36dd28..f03c34b 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupData.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupIndexData.java
@@ -8,10 +8,10 @@
/**
* @Description 鐩戠淇℃伅鎬昏--鏁伴噺淇℃伅灏佽
* @Author CZT
- * @Date 2025/11/29 10:56
+ * @Date 2025/12/25 10:56
*/
@Data
-public class GroupData implements Serializable {
+public class GroupIndexData implements Serializable {
/**
* 鐩戠搴撳尯淇℃伅
@@ -19,7 +19,7 @@
private Integer companyNum = 0; //浼佷笟涓暟
private Integer deptNum = 0; //搴撶偣涓暟
private Integer depotNum = 0; //浠撳簱涓暟
- private Integer depotCirNum = 0; //绛掍粨涓暟
+ private Integer depotBankNum = 0;//璐ㄦ娂浠撳簱鏁�
/**
* 鐩戠鏁伴噺
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java
index 5923d64..db7e6f0 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java
@@ -47,6 +47,22 @@
}
/**
+ * 鏌ヨ鍏徃鏁伴噺
+ * @param companyId
+ * @return
+ */
+ public Integer getCompanyNum(String companyId) {
+
+ QueryWrapper<Company> queryWrapper = new QueryWrapper<>();
+
+ if(StringUtils.isNotBlank(companyId)){
+ queryWrapper.eq("company_id", companyId);
+ }
+
+ return coreCompanyMapper.selectCount(queryWrapper);
+ }
+
+ /**
* 鏇存柊鎴栦繚瀛樺叕鍙镐俊鎭�
* @param sysDept
* @param isAdd
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java b/fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java
index be8b58c..95d9c43 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java
@@ -2,7 +2,7 @@
import com.fzzy.group.manager.GroupManager;
import com.fzzy.igds.constant.Constant;
-import com.fzzy.igds.data.GisData;
+import com.fzzy.igds.data.*;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.domain.DicArea;
import com.fzzy.igds.domain.Slogan;
@@ -12,7 +12,10 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
import javax.annotation.Resource;
import java.util.List;
@@ -121,10 +124,38 @@
view.put("deptList", deptList);
//缁熻淇℃伅
- GisData gisData = groupManager.getGisData();
- view.put("gisData", gisData);
+ GroupGisData groupGisData = groupManager.getGisData();
+ view.put("gisData", groupGisData);
return prefix + "/gis";
}
+
+ /**
+ * 棣栭〉--鑾峰彇鏁伴噺淇℃伅(鍌ㄩ噺缁熻銆佸垎鍝佺搴撳瓨銆佺洃绠℃暟閲忕瓑)
+ *
+ * @param param
+ * @return
+ */
+ @RequestMapping("/index-num")
+ @ResponseBody
+ public PageResponse<GroupIndexData> indexNum(@RequestBody IgdsBaseParam param) {
+
+ return groupManager.getGroupIndexData(param);
+ }
+
+
+ /**
+ * 棣栭〉--搴撳尯淇℃伅缁熻
+ *
+ * @param param
+ * @return
+ */
+ @RequestMapping("/index-dept-list")
+ @ResponseBody
+ public PageResponse<List<GroupDeptData>> indexDeptList(@RequestBody IgdsBaseParam param) {
+
+ return groupManager.indexDeptList(param);
+ }
+
}
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java
index adfc479..5247da8 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java
@@ -1,15 +1,17 @@
package com.fzzy.group.manager;
import com.fzzy.igds.constant.Constant;
-import com.fzzy.igds.data.ChartPie;
-import com.fzzy.igds.data.GisData;
+import com.fzzy.igds.constant.FoodVariety;
+import com.fzzy.igds.constant.RespCodeEnum;
+import com.fzzy.igds.data.*;
import com.fzzy.igds.domain.Depot;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.domain.DicArea;
-import com.fzzy.igds.service.CoreDeptService;
-import com.fzzy.igds.service.DepotService;
-import com.fzzy.igds.service.DicAreaService;
+import com.fzzy.igds.domain.InoutRecord;
+import com.fzzy.igds.service.*;
import com.fzzy.igds.utils.ContextUtil;
+import com.fzzy.igds.utils.DateUtil;
+import com.fzzy.igds.utils.NumberUtil;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -33,6 +35,10 @@
private CoreDeptService deptService;
@Resource
private DepotService depotService;
+ @Resource
+ private CoreCompanyService coreCompanyService;
+ @Resource
+ private InoutRecordService inoutRecordService;
/**
* 鑾峰彇鐪佸強涓嬪睘甯傚窞闆嗗悎
@@ -114,13 +120,144 @@
return deptService.listDept(null, companyId, null);
}
+
/**
- * 缁熻gis鏁版嵁锛屽彧缁熻鐧诲綍浜轰笅灞炵殑鏁版嵁缁熻
+ * 澶у睆棣栭〉缁熻淇℃伅锛氫紒涓氭暟銆佸簱鍖烘暟銆佷粨搴撴暟銆佽川鎶间粨鏁般�佹暎绮強鎴愬搧绮暟銆佸垎鍝佺搴撳瓨鏁�
+ *
+ * @param param
* @return
*/
- public GisData getGisData() {
+ public PageResponse<GroupIndexData> getGroupIndexData(IgdsBaseParam param) {
- GisData gisData = new GisData();
+ GroupIndexData indexData = new GroupIndexData();
+
+ //浼佷笟鏁�
+ Integer companyNum = coreCompanyService.getCompanyNum(param.getCompanyId());
+ indexData.setCompanyNum(companyNum);
+
+ //搴撳尯鏁�
+ List<Dept> deptList = deptService.listDept(null, param.getCompanyId(), null);
+ if (null != deptList) {
+ indexData.setDeptNum(deptList.size());
+ }
+
+ ///浠撳簱鏁板強璐ㄦ娂浠撳簱鏁�
+ List<Depot> depotList = depotService.getCacheDepotList(param.getCompanyId());
+ if (null != depotList) {
+ Double foodSum = 0.0;
+ Double packFoodSum = 0.0;
+ indexData.setDepotNum(depotList.size());
+
+ //鐢ㄤ簬缁熻鍒嗗搧绉嶅簱瀛�
+ LinkedHashMap<String, Double> varietyMap = new LinkedHashMap<>();
+ for (Depot depot : depotList) {
+ if(StringUtils.isNotBlank(depot.getPledgeBank())){
+ indexData.setDepotBankNum(indexData.getDepotBankNum() + 1);
+ }
+ if(null == depot.getStorageReal()){
+ depot.setStorageReal(0.0);
+ }
+ if(StringUtils.isNotBlank(depot.getStoreType()) && "2".equals(depot.getStoreType())){
+ packFoodSum += depot.getStorageReal()/1000;
+ }else {
+ foodSum += depot.getStorageReal()/1000;
+ }
+
+ if(depot.getStorageReal() > 0){
+ if(StringUtils.isBlank(depot.getFoodVariety())){
+ //璁剧疆涓哄叾浠栧搧绫�
+ depot.setFoodVariety("9999000");
+ }
+
+ varietyMap.putIfAbsent(depot.getFoodVariety(), 0.000);
+ varietyMap.put(depot.getFoodVariety(), varietyMap.get(depot.getFoodVariety()) + NumberUtil.keepPrecision(depot.getStorageReal()/1000, 3));
+ }
+ }
+
+ for (String mapKey : varietyMap.keySet()) {
+ if (varietyMap.get(mapKey) <= 0) {
+ continue;
+ }
+ indexData.getXaxis().add(FoodVariety.getMsg(mapKey));
+ indexData.getSeriesData().add(new DecimalFormat("0.000").format(varietyMap.get(mapKey)));
+ }
+ indexData.setFoodSum(new DecimalFormat("0.000").format(foodSum));
+ indexData.setPackFoodSum(new DecimalFormat("0.000").format(packFoodSum));
+ }
+
+ return new PageResponse<>(RespCodeEnum.CODE_0000, indexData);
+ }
+
+ /**
+ * 澶у睆棣栭〉-搴撳尯淇℃伅缁熻
+ * @param param
+ * @return
+ */
+ public PageResponse<List<GroupDeptData>> indexDeptList(IgdsBaseParam param) {
+
+ List<GroupDeptData> list = new ArrayList<>();
+ GroupDeptData deptData;
+ List<Dept> deptList = deptService.getDeptData();
+ if (null != deptList && !deptList.isEmpty()) {
+ List<Depot> depotList;
+ for (Dept dept : deptList) {
+ deptData = new GroupDeptData();
+ deptData.setDeptName(dept.getKqmc());
+ deptData.setCode(dept.getXzqhdm());
+ deptData.setCounty(dept.getXzqhmc());
+ deptData.setJd(dept.getJd());
+ deptData.setWd(dept.getWd());
+
+ //缁熻浠撳簱鏁�
+ depotList = depotService.getCacheDepotList(dept.getCompanyId(), dept.getId());
+ if (null != depotList && !depotList.isEmpty()) {
+ for (Depot depot : depotList) {
+ deptData.setDepotNumber(deptData.getDepotNumber() + 1);
+
+ if(StringUtils.isNotBlank(depot.getPledgeBank())){
+ deptData.setDepotBankNumber(deptData.getDepotBankNumber() + 1);
+ }
+
+ if(null == depot.getStorageReal()){
+ depot.setStorageReal(0.0);
+ }
+ deptData.setStorageNum(deptData.getStorageNum() + depot.getStorageReal()/1000);
+ }
+ }
+
+ //缁熻鍑哄叆搴撴暟閲�
+ InoutParam inoutParam = new InoutParam();
+ inoutParam.setDeptId(dept.getId());
+ inoutParam.setCompanyId(param.getCompanyId());
+ inoutParam.setStart(DateUtil.getCurZero(new Date()));
+ inoutParam.setEnd(DateUtil.getNextZero(new Date()));
+ List<InoutRecord> inoutRecords = inoutRecordService.listInout(inoutParam);
+ if (null != inoutRecords && !inoutRecords.isEmpty()) {
+ for (InoutRecord inoutRecord : inoutRecords) {
+ if (Constant.TYPE_IN.equals(inoutRecord.getType())) {
+ deptData.setInNum(deptData.getInNum() + 1);
+ }
+ if (Constant.TYPE_OUT.equals(inoutRecord.getType())){
+ deptData.setOutNum(deptData.getOutNum() + 1);
+
+ }
+ }
+ }
+ list.add(deptData);
+ }
+ }
+
+ return new PageResponse<>(RespCodeEnum.CODE_0000, list);
+ }
+
+ /**
+ * 缁熻gis鏁版嵁锛屽彧缁熻鐧诲綍浜轰笅灞炵殑鏁版嵁缁熻
+ *
+ * @return
+ */
+ public GroupGisData getGisData() {
+
+ GroupGisData groupGisData = new GroupGisData();
//鏌ヨ浼婄妬涓嬪睘鍖哄幙
//鍖哄幙
@@ -138,7 +275,7 @@
List<Dept> deptList = deptService.getDeptData();
if (null != deptList && !deptList.isEmpty()) {
//搴撳尯鎬绘暟
- gisData.setDeptNum(deptList.size());
+ groupGisData.setDeptNum(deptList.size());
for (Dept dept : deptList) {
if (StringUtils.isBlank(dept.getXzqhdm()) || null == valuePieChart.get(dept.getXzqhdm())) {
if(null == valuePieChart.get("999999")){
@@ -151,33 +288,33 @@
}
}
- if(gisData.getDeptNum() > 0){
+ if(groupGisData.getDeptNum() > 0){
for (String mapKey : valuePieChart.keySet()) {
- gisData.getDeptList().add(new ChartPie(valuePieChart.get(mapKey) + "", namePieChart.get(mapKey), new DecimalFormat("0.0").format((double)valuePieChart.get(mapKey) / gisData.getDeptNum() * 100)));
+ groupGisData.getDeptList().add(new ChartPie(valuePieChart.get(mapKey) + "", namePieChart.get(mapKey), new DecimalFormat("0.0").format((double)valuePieChart.get(mapKey) / groupGisData.getDeptNum() * 100)));
}
}
//缁熻閲嶉噺
- List<Depot> depotLisst = depotService.getData(ContextUtil.getCompanyId(), ContextUtil.subDeptId(null), false);
- if (null != depotLisst && !depotLisst.isEmpty()) {
- for (Depot depot : depotLisst) {
+ List<Depot> depotList = depotService.getData(ContextUtil.getCompanyId(), ContextUtil.subDeptId(null), false);
+ if (null != depotList && !depotList.isEmpty()) {
+ for (Depot depot : depotList) {
if(null == depot.getStorageReal()){
depot.setStorageReal(0.0);
}
- gisData.setSum(gisData.getSum() + depot.getStorageReal());
+ groupGisData.setSum(groupGisData.getSum() + depot.getStorageReal());
if(StringUtils.isNotBlank(depot.getPledgeBank())){
- gisData.setBankSum(gisData.getBankSum() + depot.getStorageReal());
+ groupGisData.setBankSum(groupGisData.getBankSum() + depot.getStorageReal());
}else{
- gisData.setNormalSum(gisData.getNormalSum() + depot.getStorageReal());
+ groupGisData.setNormalSum(groupGisData.getNormalSum() + depot.getStorageReal());
}
}
}
- if(gisData.getSum() > 0){
- gisData.setSumPer(new DecimalFormat("0.00").format(gisData.getSum() / gisData.getSum() * 100L));
- gisData.setBankSumPer(new DecimalFormat("0.00").format(gisData.getBankSum() / gisData.getSum() * 100L));
- gisData.setNormalSumPer(new DecimalFormat("0.00").format(gisData.getNormalSum() / gisData.getSum() * 100L));
+ if(groupGisData.getSum() > 0){
+ groupGisData.setSumPer(new DecimalFormat("0.00").format(groupGisData.getSum() / groupGisData.getSum() * 100L));
+ groupGisData.setBankSumPer(new DecimalFormat("0.00").format(groupGisData.getBankSum() / groupGisData.getSum() * 100L));
+ groupGisData.setNormalSumPer(new DecimalFormat("0.00").format(groupGisData.getNormalSum() / groupGisData.getSum() * 100L));
}
- return gisData;
+ return groupGisData;
}
}
diff --git a/fzzy-igdss-web/src/main/resources/static/group/gis-chart.js b/fzzy-igdss-web/src/main/resources/static/group/gis-chart.js
index 7a908ab..841aa77 100644
--- a/fzzy-igdss-web/src/main/resources/static/group/gis-chart.js
+++ b/fzzy-igdss-web/src/main/resources/static/group/gis-chart.js
@@ -17,7 +17,7 @@
return params.name + ': ' + params.value;
}
},
- color: ['#FF6B6B','#4ECDC4','#45B7D1','#96CEB4','#FECA57','#FF9FF3','#54A0FF','#5F27CD','#00D2D3','#FF7675','#208620'],
+ color: ['#96CEB4','#4ECDC4','#45B7D1','#FF6B6B','#FECA57','#FF9FF3','#54A0FF','#5F27CD','#00D2D3','#FF7675','#208620'],
series: [
{
name: '',
diff --git a/fzzy-igdss-web/src/main/resources/static/group/index.js b/fzzy-igdss-web/src/main/resources/static/group/index.js
index 30cf5e1..1e661dc 100644
--- a/fzzy-igdss-web/src/main/resources/static/group/index.js
+++ b/fzzy-igdss-web/src/main/resources/static/group/index.js
@@ -1,55 +1,57 @@
var nowClientWidth = document.documentElement.clientWidth; // 褰撳墠瑙嗗彛瀹藉害
var hisVarietyChart = null; // 鍝佺鏌辩姸鍥�
-var deptAreaAllList = null; // 鎵�鏈夊簱鍖哄垪琛ㄤ俊鎭�
-var deptAreaList = null; // 瀛樻斁鍒囨崲搴撳尯鍒楄〃淇℃伅
-var companyList = null; // 鍏徃淇℃伅
+var deptList = null; // 鎵�鏈夊簱鍖哄垪琛ㄤ俊鎭�
var deptCode = null; // 褰撳墠闂儊鍦板尯鐨勭紪鐮�
-var timer1; // 搴撳尯瀹氭椂
-var index1 = 0; // 搴撳尯鍒囨崲涓嬫爣
-var timer2; // 绮鏁伴噺瀹氭椂
-var index2 = 0; // 绮鏁伴噺鍒囨崲涓嬫爣
-var number2 = 2;// 绮鏁伴噺鍒囨崲鎬绘暟閲�
-var timer3; // 鍌ㄩ噺楗煎浘瀹氭椂
-var index3 = 0; // 鍌ㄩ噺楗煎浘鍒囨崲涓嬫爣
-var number3 = 2;// 鍌ㄩ噺楗煎浘鍒囨崲鎬绘暟閲�
-
+var timer; // 搴撳尯瀹氭椂
+var deptNum = 0; //搴撳尯鍒囨崲涓嬫爣
var mapChart = null;
var geoMap = [{name: '浼婄妬鍝堣惃鍏嬭嚜娌诲窞', value: [81.317946, 43.92186]}]; //榛樿鐐逛綅
var map = chinaMapOutline; //榛樿鍔犺浇鍏ㄥ浗鍦板浘
+
$(function () {
// 鍒濆鍖栭〉闈�
init();
// 鍒濆鍖朩ebSocket
- initWS(companyId,bizType, bizTag, userId);
+ // initWS(companyId,bizType, bizTag, userId);
});
// 鍒濆鍖栭〉闈�
function init() {
// 閫傚簲灞忓箷澶у皬
initScrollbar();
- // 鏃堕棿
- initTime();
+
// 鍒濆鍖栧浘琛�
initChart();
- //鍒濆鍖栨爣璇�
- initDicSlogan();
+
//鍒濆鍖栧湴鍥�
initMap();
+
+ // 鏃堕棿
+ initTime();
+
+ //鍒濆鍖栨爣璇�
+ initDicSlogan();
+
//鍔犺浇鎸囧畾鍦板尯鍦板浘
renderMapPoints("涔岄瞾鏈ㄩ綈甯�,鍏嬫媺鐜涗緷甯�,鍚愰瞾鐣競,鍝堝瘑甯�,鏄屽悏鍥炴棌鑷不宸�,鍗氬皵濉旀媺钂欏彜鑷不宸�,宸撮煶閮钂欏彜鑷不宸�,闃垮厠鑻忓湴鍖�,鍏嬪瓬鍕掕嫃鏌皵鍏嬪瓬鑷不宸�,鍠�浠�鍦板尯,鍜岀敯鍦板尯,浼婄妬鍝堣惃鍏嬭嚜娌诲窞,濉斿煄鍦板尯,闃垮嫆娉板湴鍖�");
- //TODO 缁熻鐩稿叧鏁伴噺淇℃伅锛屽寘鍚簱鐐瑰強绮鏁伴噺
- // ajaxFoodNum();
+ //缁熻鐩稿叧鏁伴噺淇℃伅锛屽寘鍚簱鐐瑰強绮鏁伴噺
+ ajaxFoodNum();
- //TODO 璇锋眰鐩戠搴撳尯淇℃伅
- // ajaxDeptArea();
+ //璇锋眰鐩戠搴撳尯淇℃伅
+ ajaxDeptList();
+
+ clearInterval(timer);
+ timing();
//TODO 璇锋眰AI浜嬩欢淇℃伅
// ajaxMsg();
//TODO 璇锋眰鎶撴媿璺熻釜淇℃伅
// ajaxFoodNum();
+
+
//鎶撴媿璺熻釜婊氬姩
jQuery(".block2").slide({ mainCell: ".bd ul", autoPage: true, effect: "topLoop", autoPlay: true, vis: 4 });
@@ -63,6 +65,20 @@
dicSlogan = data;
initDicSlogan();
}
+}
+
+/**
+ * 搴撳尯瀹氭椂鍒囨崲
+ */
+function timing() {
+ timer = setInterval(function() {
+ if(deptNum === deptList.length){
+ deptNum = 0;
+ }
+
+ renderDeptInfo();
+ deptNum += 1;
+ }, 5000);
}
//鍔犺浇搴撳尯鍦板浘浣嶇疆
@@ -96,15 +112,15 @@
geoMap = [];
for (var j = 0; j < names.length; j++) {
for (var i = 0; i < all.length; i++) {
- if(all[i].properties.name == names[j]){
+ if(all[i].properties.name === names[j]){
map.features.push(all[i]);
- if(all[i].properties.name == "浼婄妬鍝堣惃鍏嬭嚜娌诲窞"){
+ // if(all[i].properties.name === "浼婄妬鍝堣惃鍏嬭嚜娌诲窞"){
geoMap.push({
name: all[i].properties.centerName,
value: [all[i].properties.center[0], all[i].properties.center[1], 12]
});
- }
- renderMap();
+ // }
+ // renderMap();
break;
}
}
@@ -273,26 +289,6 @@
}
/**
- * 鑾峰彇鍏徃淇℃伅
- */
-function ajaxCompany() {
- $.ajax({
- type: "POST",
- url: "../../visual/index-company",
- dataType: "json",
- contentType: "application/json;charset=UTF-8",
- data: JSON.stringify({
- "companyId": companyId
- }),
- success: function (result) {
- if (result.code == "0000") {
- companyList = result.data;
- }
- }
- });
-}
-
-/**
* 璇锋眰鑾峰彇鍔ㄦ�佷俊鎭�
*/
function ajaxMsg() {
@@ -393,25 +389,43 @@
/**
* 璇锋眰鑾峰彇搴撳尯鐩稿叧淇℃伅
*/
-function ajaxDeptArea() {
- // $.ajax({
- // type: "POST",
- // url: "../../visual/index-dept-area",
- // dataType: "json",
- // contentType: "application/json;charset=UTF-8",
- // data: JSON.stringify({
- // "companyId": companyId
- // }),
- // success: function (result) {
- // if (result.code == "0000") {
- // deptAreaAllList = result.data;
- // getChangeDeptArea(null);
- // }
- // },
- // error: function (error) {
- //
- // }
- // });
+function ajaxDeptList() {
+ deptList = null;
+ $.ajax({
+ type: "POST",
+ url: "/group/index-dept-list",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify({
+ "companyId": companyId
+ }),
+ success: function (result) {
+ if (result.code == "0000") {
+ deptList = result.data;
+ renderDeptInfo();
+ }
+ },
+ error: function (error) {
+
+ }
+ });
+}
+
+/**
+ * 娓叉煋搴撳尯淇℃伅
+ */
+function renderDeptInfo() {
+ if (deptList == null || deptList.length <= 0) {
+ return;
+ }
+
+ $("#county").html(deptList[deptNum].county);
+ $("#deptName").html(deptList[deptNum].deptName);
+ $("#inNum").html(deptList[deptNum].inNum);
+ $("#outNum").html(deptList[deptNum].outNum);
+ $("#depotNumber").html(deptList[deptNum].depotNumber);
+ $("#depotBankNumber").html(deptList[deptNum].depotBankNumber);
+ $("#storageNum").html(deptList[deptNum].storageNum);
//鍔犺浇搴撳尯鍦板浘
geoMap = updateDeptMap();
@@ -423,12 +437,12 @@
$.each(deptList, function(index, item) {
var val = [];
var name = '';
- // if(index == deptNum){
- // name = item.name;
- // val = [item.lon, item.lat, 17];
- // }else {
+ if(index === deptNum){
+ name = item.deptName;
+ val = [item.jd, item.wd, 17];
+ }else {
val = [item.jd, item.wd, 8];
- // }
+ }
points.push({
name: name,
value: val
@@ -520,19 +534,19 @@
}
/**
- * 璇锋眰鑾峰彇鐩稿叧鏁伴噺淇℃伅
+ * 璇锋眰鑾峰彇缁熻鏁伴噺淇℃伅
*/
function ajaxFoodNum() {
$.ajax({
type: "POST",
- url: "../../visual/index-food-number",
+ url: "/group/index-num",
dataType: "json",
contentType: "application/json;charset=UTF-8",
data: JSON.stringify({
"companyId": companyId
}),
success: function (result) {
- if (result.code == "0000") {
+ if (result.code === "0000") {
var data = result.data;
renderFoodNum(data);
}
@@ -543,7 +557,10 @@
});
}
-// 鏇存柊搴撳尯淇℃伅
+/**
+ * 娓叉煋缁熻鏁伴噺淇℃伅
+ * @param data
+ */
function renderFoodNum(data) {
if (!data) {
@@ -552,24 +569,17 @@
/*----- 鐩戠搴撶偣淇℃伅 -----*/
$("#companyNum").html(data.companyNum);
- $("#deptAreaNum").html(data.deptAreaNum);
- $("#depotSum").html(data.depotNum);
+ $("#deptNum").html(data.deptNum);
+ $("#depotNum").html(data.depotNum);
+ $("#depotBankNum").html(data.depotBankNum);
/*----- 鐩戠鏁伴噺淇℃伅 -----*/
- if (data.foodSum.length > 8 || data.oilSum.length > 8) {
+ if (data.foodSum.length > 8 || data.packFoodSum.length > 8) {
$("#foodSum").css("font-size", "32px");
- $("#oilSum").css("font-size", "32px");
+ $("#packFoodSum").css("font-size", "32px");
}
$("#foodSum").html(data.foodSum);
- $("#oilSum").html(data.oilSum);
-
- if (data.goodsFoodSum.length > 8 || data.goodsOilSum.length > 8) {
- $("#goodsFoodSum").css("font-size", "32px");
- $("#goodsOilSum").css("font-size", "32px");
- }
- $("#goodsFoodSum").html(data.goodsFoodSum);
- $("#goodsOilSum").html(data.goodsOilSum);
-
+ $("#packFoodSum").html(data.packFoodSum);
/*----- 鍒嗗搧绉嶆煴鐘跺浘 -----*/
if (data.xaxis.length > 0 && data.seriesData.length > 0) {
@@ -579,125 +589,6 @@
hisFoodVariety.chart.setOption(hisFoodVariety.option, true);
hisVarietyChart = hisFoodVariety;
}
-
- // 绮鐩戠鏁伴噺鍒囨崲
- foodNumSwitch();
- // 绮楗煎浘鍒囨崲
- pieChartSwitch();
-}
-
-/* ---------- 绮鏁伴噺鐩戠鍒囨崲 ---------- */
-function foodNumSwitch() {
- $(".lb-body .right-topInfo-jg").eq(0).show().siblings().hide();
- StartLunbo();
-
- $(".lb-tab").hover(function () {
- clearInterval(timer2);
- index2 = $(this).index();
- ShowPicTab();
- }, function () {
- StartLunbo();
- });
-
- $(".lb-btn1").click(function () {
- clearInterval(timer2);
- index2--;
- if (index2 == -1) {
- index2 = number2 - 1;
- }
-
- ShowPicTab();
- StartLunbo();
- });
-
- $(".lb-btn2").click(function () {
- clearInterval(timer2);
- index2++;
- if (index2 == number2) {
- index2 = 0;
- }
- ShowPicTab();
- StartLunbo();
- });
-}
-
-function ShowPicTab() {
- if (index2 === 0) {
- $("#foodNumTitle").html("鍌ㄥ绮补");
- } else if (index2 === 1) {
- $("#foodNumTitle").html("鍟嗗搧绮补");
- }
- // else if (index2 === 2) {
- // $("#foodNumTitle").html("灏忓寘瑁呯伯娌�");
- // }
- $(".lb-body .right-topInfo-jg").eq(index2).fadeIn(300).siblings().fadeOut(300);
- $(".lb-tab").eq(index2).addClass("bg").siblings().removeClass("bg");
-}
-
-function StartLunbo() {
- timer2 = setInterval(function () {
- index2++;
- if (index2 >= number2) {
- index2 = 0;
- }
- ShowPicTab();
- }, 3000);
-}
-
-/* ---------- 绮楗煎浘鍒囨崲 ---------- */
-function pieChartSwitch() {
- $(".tubiao-Carousel .stats-chart-box").eq(0).show().siblings().hide();
- StartCarousel();
-
- $(".carousel-tab").hover(function () {
- clearInterval(timer3);
- index3 = $(this).index();
- ShowTubiao();
-
- }, function () {
- StartCarousel();
- });
-
- $(".carousel-btn1").click(function () {
- clearInterval(timer3);
- index3--;
- if (index3 == -1) {
- index3 = number3 - 1;
- }
-
- ShowTubiao();
- StartCarousel();
- });
-
- $(".carousel-btn2").click(function () {
- clearInterval(timer3);
- index3++;
- if (index3 == number3) {
- index3 = 0;
- }
- ShowTubiao();
- StartCarousel();
- });
-}
-
-function ShowTubiao() {
- if (index3 === 0) {
- $("#pieCharTitle").html("绮鏁伴噺缁熻(鍚�)");
- } else if (index3 === 1) {
- $("#pieCharTitle").html("娌硅剛鏁伴噺缁熻(鍚�)");
- }
- $(".tubiao-Carousel .stats-chart-box").eq(index3).fadeIn(300).siblings().fadeOut(300);
- $(".carousel-tab").eq(index3).addClass("bg").siblings().removeClass("bg");
-}
-
-function StartCarousel() {
- timer3 = setInterval(function () {
- index3++;
- if (index3 >= number3) {
- index3 = 0;
- }
- ShowTubiao();
- }, 3000);
}
// 鍒锋柊鏃堕棿
@@ -740,9 +631,10 @@
return document.getElementById('inventoryInfo').clientHeight > document.getElementById('inventoryInfoBox').clientHeight;
}
-// 鍒濆鍖栧浘琛�
+/**
+ * 鍒濆鍖栧浘琛�
+ */
function initChart() {
-
/* 搴撳瓨鍥捐〃鍔犺浇 */
allInventoryChartLoad(
['灏忛害', '鐜夌背', '绋昏胺', '鎴愬搧绮�', '鎴愬搧娌�', '鍏朵粬'],
diff --git a/fzzy-igdss-web/src/main/resources/templates/group/index.html b/fzzy-igdss-web/src/main/resources/templates/group/index.html
index bc3b361..3ad26fd 100644
--- a/fzzy-igdss-web/src/main/resources/templates/group/index.html
+++ b/fzzy-igdss-web/src/main/resources/templates/group/index.html
@@ -140,15 +140,15 @@
</li>
<li>
<h3>搴撶偣锛堜釜锛�</h3>
- <p id="deptAreaNum">0</p>
+ <p id="deptNum">0</p>
</li>
<li>
<h3>浠撳簱锛堜釜锛�</h3>
- <p id="depotSum">0</p>
+ <p id="depotNum">0</p>
</li>
<li>
- <h3>绛掍粨锛堜釜锛�</h3>
- <p id="depotOilSum">0</p>
+ <h3>璐ㄦ娂浠擄紙涓級</h3>
+ <p id="depotBankNum">0</p>
</li>
</ul>
@@ -156,7 +156,7 @@
</div><!-- i-m1 end -->
<div class="left-m2">
- <div class="panel-title" id="panel-title">鐩戠鍔ㄦ�佷俊鎭�</div>
+ <div class="panel-title" id="panel-title">AI浜嬩欢鍔ㄦ��</div>
<div class="panel-content">
<div class="panel-content-head">
@@ -168,52 +168,62 @@
<div class="panel-content-body" id="inventoryInfoBox">
<div id="inventoryInfo">
<div class="panel-content-body-tr">
- <span class="body-item">搴撳尯1</span>
+ <span class="body-item sp">浼婂畞鍘垮悍杈惧啘涓氬彂灞曟湁闄愬叕鍙�</span>
<span class="body-item">褰撴棩鍒嗘瀽涓�鍒囨甯�</span>
<span class="body-item" style="flex: 0.3;">04/22</span>
</div>
<div class="panel-content-body-tr">
- <span class="body-item">搴撳尯2</span>
+ <span class="body-item sp">浼婂畞鍘挎亽杈惧啘涓氬彂灞曟湁闄愬叕鍙�</span>
<span class="body-item">褰撴棩鍒嗘瀽涓�鍒囨甯�</span>
<span class="body-item" style="flex: 0.3;">04/22</span>
</div>
<div class="panel-content-body-tr">
- <span class="body-item">搴撳尯3</span>
+ <span class="body-item sp">浼婂畞鍘胯壘瑗跨儹鏅儤骞插巶</span>
<span class="body-item">褰撴棩鍒嗘瀽涓�鍒囨甯�</span>
<span class="body-item" style="flex: 0.3;">04/22</span>
</div>
<div class="panel-content-body-tr">
- <span class="body-item">搴撳尯4</span>
+ <span class="body-item sp">灏煎嫆鍏嬪幙鏈ㄦ柉涔℃綐鍒氱儤骞插巶</span>
<span class="body-item">褰撴棩鍒嗘瀽涓�鍒囨甯�</span>
<span class="body-item" style="flex: 0.3;">04/22</span>
</div>
<div class="panel-content-body-tr">
- <span class="body-item">搴撳尯5</span>
+ <span class="body-item sp">鏂扮枂浼婂畞淇濆仴楗叉枡鏈夐檺鍏徃搴撳尯</span>
<span class="body-item">褰撴棩鍒嗘瀽涓�鍒囨甯�</span>
<span class="body-item" style="flex: 0.3;">04/22</span>
</div>
<div class="panel-content-body-tr">
- <span class="body-item">搴撳尯6</span>
+ <span class="body-item sp">浼婂畞鍘垮嚡婧愮帀绫崇妞嶅啘姘戜笓涓氬悎浣滅ぞ</span>
<span class="body-item">褰撴棩鍒嗘瀽涓�鍒囨甯�</span>
<span class="body-item" style="flex: 0.3;">04/22</span>
</div>
<div class="panel-content-body-tr">
- <span class="body-item">搴撳尯7</span>
+ <span class="body-item sp">浼婂畞鍘跨帀婧愬啘鍓骇鍝佽喘閿�涓撲笟鍚堜綔绀�</span>
<span class="body-item">褰撴棩鍒嗘瀽涓�鍒囨甯�</span>
<span class="body-item" style="flex: 0.3;">04/22</span>
</div>
<div class="panel-content-body-tr">
- <span class="body-item">搴撳尯8</span>
+ <span class="body-item sp">鏂扮枂鐗熸皬璋烽噾鍐滀笟绉戞妧鏈夐檺璐ｄ换鍏徃搴撳尯</span>
<span class="body-item">褰撴棩鍒嗘瀽涓�鍒囨甯�</span>
<span class="body-item" style="flex: 0.3;">04/22</span>
</div>
<div class="panel-content-body-tr">
- <span class="body-item">搴撳尯9</span>
+ <span class="body-item sp">鏂扮枂骞挎嘲闅嗗啘涓氬彂灞曟湁闄愬叕鍙�</span>
<span class="body-item">褰撴棩鍒嗘瀽涓�鍒囨甯�</span>
<span class="body-item" style="flex: 0.3;">04/22</span>
</div>
<div class="panel-content-body-tr">
- <span class="body-item">搴撳尯10</span>
+ <span class="body-item sp">浼婂畞鍘垮箍绮晢璐告湁闄愬叕鍙稿簱鍖�</span>
+ <span class="body-item">褰撴棩鍒嗘瀽涓�鍒囨甯�</span>
+ <span class="body-item" style="flex: 0.3;">04/22</span>
+ </div>
+ <div class="panel-content-body-tr">
+ <span class="body-item sp">鏄嫃75鍥�</span>
+ <span class="body-item">褰撴棩鍒嗘瀽涓�鍒囨甯�</span>
+ <span class="body-item" style="flex: 0.3;">04/22</span>
+ </div>
+ <div class="panel-content-body-tr">
+ <span class="body-item sp">鏄嫃77鍥�</span>
<span class="body-item">褰撴棩鍒嗘瀽涓�鍒囨甯�</span>
<span class="body-item" style="flex: 0.3;">04/22</span>
</div>
@@ -254,7 +264,7 @@
<h3>鏁ｇ伯 (鍚�)</h3>
</li>
<li>
- <p id="oilSum">0</p>
+ <p id="packFoodSum">0</p>
<h3>鎴愬搧 (鍚�)</h3>
</li>
</ul>
@@ -267,33 +277,33 @@
<div class="panel-title">搴撶偣淇℃伅</div>
<div class="right-topInfo-address">
<i class="i-icon32"><img th:src="@{/img/web/group/icon-address.png}" alt=""></i>
- <span id="cityAndCounty">涔岄瞾鏈ㄩ綈甯�</span>
+ <span id="county">涔岄瞾鏈ㄩ綈甯�</span>
</div>
<div class="panel-content">
- <h2 class="right-topInfo-kd-h" id="deptAreaName">搴撳尯1</h2>
+ <h2 class="right-topInfo-kd-h" id="deptName">搴撳尯1</h2>
<div class="right-topInfo-kd">
<div class="right-topInfo-kd-item">
- <h3>褰撴棩鍏ュ簱鏁帮紙涓級</h3>
- <p id="depotNum">0</p>
+ <h3>褰撴棩鍏ュ簱鍗曟暟锛堜釜锛�</h3>
+ <p id="inNum">0</p>
</div>
<div class="right-topInfo-kd-item">
- <h3>褰撴棩鍑哄簱鏁帮紙涓級</h3>
- <p id="depotOilNum">0</p>
+ <h3>褰撴棩鍑哄簱鍗曟暟锛堜釜锛�</h3>
+ <p id="outNum">0</p>
</div>
</div>
<ul class="right-topInfo-kd-list right-topInfo-jg">
<li>
- <p id="foodNum">0</p>
+ <p id="depotNumber">0</p>
<h3>浠撳簱鏁帮紙涓級</h3>
</li>
<li>
- <p id="oilNum">0</p>
- <h3>鍌ㄧ伯鏁帮紙鍚級</h3>
+ <p id="depotBankNumber">0</p>
+ <h3>璐ㄦ娂浠撴暟锛堜釜锛�</h3>
</li>
<li>
- <p id="area">0</p>
- <h3>鍗犲湴闈㈢Н锛坢虏锛�</h3>
+ <p id="storageNum">0</p>
+ <h3>搴撳瓨鏁帮紙鍚級</h3>
</li>
</ul>
</div>
--
Gitblit v1.9.3