From a1cc1dca3ad00d2ac1b81c54b0f98b3684c31da1 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 25 十二月 2025 11:48:20 +0800
Subject: [PATCH] Gis大屏调整及数据交互
---
fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java | 79 ++++++
fzzy-igdss-web/src/main/resources/static/group/gis.js | 45 +++
fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupData.java | 36 +++
fzzy-igdss-web/src/main/resources/static/group/gis-chart.js | 172 +-------------
fzzy-igdss-web/src/main/resources/static/group/index.js | 230 +------------------
fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GisData.java | 28 ++
fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java | 5
fzzy-igdss-web/src/main/resources/templates/group/gis.html | 81 ++----
fzzy-igdss-core/src/main/java/com/fzzy/igds/data/ChartPie.java | 28 ++
9 files changed, 271 insertions(+), 433 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/ChartPie.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/ChartPie.java
new file mode 100644
index 0000000..35f0886
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/ChartPie.java
@@ -0,0 +1,28 @@
+package com.fzzy.igds.data;
+
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author CZT
+ * @Date 2025/12/25 9:35
+ */
+@Data
+public class ChartPie {
+
+ private String value;
+
+ private String name;
+
+ private String percent;
+
+ public ChartPie() {
+ super();
+ }
+
+ public ChartPie(String value, String name, String percent) {
+ this.value = value;
+ this.name = name;
+ this.percent = percent;
+ }
+}
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/GisData.java
new file mode 100644
index 0000000..3dbca71
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GisData.java
@@ -0,0 +1,28 @@
+package com.fzzy.igds.data;
+
+import lombok.Data;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description gis澶у睆鏁版嵁灏佽
+ * @Author CZT
+ * @Date 2025/12/25 9:35
+ */
+@Data
+public class GisData {
+
+ private List<ChartPie> deptList = new ArrayList<>();//鍖哄幙搴撳尯鏁�
+
+ private Integer deptNum = 0; //搴撳尯鏁�
+
+ private Double sum = 0.0; //鎬婚噸閲�
+ private String sumPer = "0.0"; //鍗犳瘮
+
+ private Double bankSum = 0.0; //閾惰璐ㄦ娂閲嶉噺;
+ private String bankSumPer = "0.0"; //鍗犳瘮;
+
+ private Double normalSum = 0.0; //闈炶川鎶奸噸閲�;
+ private String normalSumPer = "0.0"; //鍗犳瘮;
+
+}
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/GroupData.java
new file mode 100644
index 0000000..e36dd28
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupData.java
@@ -0,0 +1,36 @@
+package com.fzzy.igds.data;
+
+import lombok.Data;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description 鐩戠淇℃伅鎬昏--鏁伴噺淇℃伅灏佽
+ * @Author CZT
+ * @Date 2025/11/29 10:56
+ */
+@Data
+public class GroupData implements Serializable {
+
+ /**
+ * 鐩戠搴撳尯淇℃伅
+ */
+ private Integer companyNum = 0; //浼佷笟涓暟
+ private Integer deptNum = 0; //搴撶偣涓暟
+ private Integer depotNum = 0; //浠撳簱涓暟
+ private Integer depotCirNum = 0; //绛掍粨涓暟
+
+ /**
+ * 鐩戠鏁伴噺
+ */
+ private String foodSum = "0.000"; //鏁ｇ伯鏁伴噺(鍚�)
+ private String packFoodSum = "0.000"; //鎴愬搧绮暟閲�(鍚�)
+
+ /**
+ * 鍒嗗搧绉嶅簱瀛�
+ */
+ private List<String> xaxis = new ArrayList<>(); //鍝佺鏌辩姸鍥�--X杞存暟鎹�
+ private List<String> seriesData = new ArrayList<>(); //鍝佺鏌辩姸鍥�--X杞村搴旀暟鍊�
+
+}
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 c316d5b..be8b58c 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,6 +2,7 @@
import com.fzzy.group.manager.GroupManager;
import com.fzzy.igds.constant.Constant;
+import com.fzzy.igds.data.GisData;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.domain.DicArea;
import com.fzzy.igds.domain.Slogan;
@@ -119,6 +120,10 @@
List<Dept> deptList = groupManager.getAllDept(user.getCompanyId());
view.put("deptList", deptList);
+ //缁熻淇℃伅
+ GisData gisData = groupManager.getGisData();
+ view.put("gisData", gisData);
+
return prefix + "/gis";
}
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 6ab869d..adfc479 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,16 +1,22 @@
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.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.utils.ContextUtil;
+import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import java.text.DecimalFormat;
+import java.util.*;
/**
* @Description
@@ -25,6 +31,8 @@
private DicAreaService dicAreaService;
@Resource
private CoreDeptService deptService;
+ @Resource
+ private DepotService depotService;
/**
* 鑾峰彇鐪佸強涓嬪睘甯傚窞闆嗗悎
@@ -105,4 +113,71 @@
public List<Dept> getAllDept(String companyId) {
return deptService.listDept(null, companyId, null);
}
+
+ /**
+ * 缁熻gis鏁版嵁锛屽彧缁熻鐧诲綍浜轰笅灞炵殑鏁版嵁缁熻
+ * @return
+ */
+ public GisData getGisData() {
+
+ GisData gisData = new GisData();
+
+ //鏌ヨ浼婄妬涓嬪睘鍖哄幙
+ //鍖哄幙
+ List<DicArea> dicAreaList = dicAreaService.listData("654000", null, null);
+
+ //缁熻鍖哄幙涓嬪簱鍖烘暟
+ LinkedHashMap<String, Integer> valuePieChart = new LinkedHashMap<>();
+ LinkedHashMap<String, String> namePieChart = new LinkedHashMap<>();
+ if (null != dicAreaList && !dicAreaList.isEmpty()) {
+ for (DicArea dicArea : dicAreaList) {
+ valuePieChart.put(dicArea.getCode(), 0);
+ namePieChart.put(dicArea.getCode(), dicArea.getName());
+ }
+ }
+ List<Dept> deptList = deptService.getDeptData();
+ if (null != deptList && !deptList.isEmpty()) {
+ //搴撳尯鎬绘暟
+ gisData.setDeptNum(deptList.size());
+ for (Dept dept : deptList) {
+ if (StringUtils.isBlank(dept.getXzqhdm()) || null == valuePieChart.get(dept.getXzqhdm())) {
+ if(null == valuePieChart.get("999999")){
+ valuePieChart.put("999999", 0);
+ namePieChart.put("999999", "鍏朵粬鍖哄幙");
+ }
+ dept.setXzqhdm("999999");
+ }
+ valuePieChart.put(dept.getXzqhdm(), valuePieChart.get(dept.getXzqhdm()) + 1);
+ }
+ }
+
+ if(gisData.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)));
+ }
+ }
+
+ //缁熻閲嶉噺
+ List<Depot> depotLisst = depotService.getData(ContextUtil.getCompanyId(), ContextUtil.subDeptId(null), false);
+ if (null != depotLisst && !depotLisst.isEmpty()) {
+ for (Depot depot : depotLisst) {
+ if(null == depot.getStorageReal()){
+ depot.setStorageReal(0.0);
+ }
+ gisData.setSum(gisData.getSum() + depot.getStorageReal());
+ if(StringUtils.isNotBlank(depot.getPledgeBank())){
+ gisData.setBankSum(gisData.getBankSum() + depot.getStorageReal());
+ }else{
+ gisData.setNormalSum(gisData.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));
+ }
+
+ return gisData;
+ }
}
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 49a036c..7a908ab 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
@@ -1,5 +1,4 @@
//------------------------------------------------------------------------------------------------
-var breedChart = null;
/**
* 楗煎浘鍔犺浇
@@ -18,7 +17,7 @@
return params.name + ': ' + params.value;
}
},
- color: ['#00d2eb', '#16e2ad', '#ffb517', '#ec3c48', '#8767ff', '#297aff', '#ee3c90'],
+ color: ['#FF6B6B','#4ECDC4','#45B7D1','#96CEB4','#FECA57','#FF9FF3','#54A0FF','#5F27CD','#00D2D3','#FF7675','#208620'],
series: [
{
name: '',
@@ -40,57 +39,6 @@
}
}
-/**
- * 鍫嗗彔鏌辩姸鍥惧姞杞�
- * @param obj
- * @param id
- */
-// 姝ｅ父鏁版嵁
-var listData = [{
- value: 8,
- name: '娴嬭瘯1'
-},
- {
- value: 2,
- name: '娴嬭瘯2'
- },
- {
- value: 83,
- name: '娴嬭瘯3'
- },
- {
- value: 22,
- name: '娴嬭瘯4'
- },
- {
- value: 22,
- name: '娴嬭瘯5'
- }
-];
-// 寮傚父鏁版嵁
-var listData1 = [{
- value: 20,
- name: '娴嬭瘯1'
-},
- {
- value: 10,
- name: '娴嬭瘯2'
- },
- {
- value: 4,
- name: '娴嬭瘯3'
- },
- {
- value: 20,
- name: '娴嬭瘯4'
- },
- {
- value: 20,
- name: '娴嬭瘯5'
- }
-];
-
-
function toThousands(num) {
num = num.toString().split("."); // 鍒嗛殧灏忔暟鐐�
var arr = num[0].split("").reverse(); // 杞崲鎴愬瓧绗︽暟缁勫苟涓斿�掑簭鎺掑垪
@@ -111,37 +59,24 @@
}
-
-function barChartLoad(data, id) {
- var dom = document.getElementById('ss');
+function barChartLoad(id) {
+ var dom = document.getElementById(id);
var barChart = echarts.init(dom);
var predata = [];
var ydata = [];
- if (data) {
- for (var i = 0; i < data.typeChartPie.length; i++) {
- if (data.typeChartPie[i].name == "鐪佺骇鍌ㄥ绮�") {
- predata[0] = data.typeChartPie[i].percent;
- ydata[0] = data.typeChartPie[i].value;
- }
- if (data.typeChartPie[i].name == "鍏朵粬绮") {
- predata[1] = data.typeChartPie[i].percent;
- ydata[1] = data.typeChartPie[i].value;
- }
- if (data.typeChartPie[i].name == "鐪佺骇鍌ㄥ娌�") {
- predata[2] = data.typeChartPie[i].percent;
- ydata[2] = data.typeChartPie[i].value;
- }
- if (data.typeChartPie[i].name == "鍏朵粬娌�") {
- predata[3] = data.typeChartPie[i].percent;
- ydata[3] = data.typeChartPie[i].value;
- }
- }
+ if (gisData) {
+ predata[0] = gisData.sumPer;
+ ydata[0] = gisData.sum;
+
+ predata[1] = gisData.bankSumPer;
+ ydata[1] = gisData.bankSum;
+
+ predata[2] = gisData.normalSumPer;
+ ydata[2] = gisData.normalSum;
} else {
- predata = [50, 30, 10, 10];
- ydata = [3733.230, 1825.356, 2523.248, 2005.123];
+ predata = [100, 50, 50];
+ ydata = [1000, 500, 500];
}
- console.log(ydata);
- console.log(predata);
var option = {
grid: {
top: '10%',
@@ -228,7 +163,7 @@
axisTick: {
show: false
},
- data: ['鐪佺骇鍌ㄥ绮�', '鍏朵粬绮', '鐪佺骇鍌ㄥ娌�', '鍏跺畠娌�'],
+ data: ['鎬婚噸閲�', '璐ㄦ娂閲嶉噺', '闈炶川鎶奸噸閲�'],
},
{
type: "category",
@@ -298,82 +233,5 @@
}
]
};
-
barChart.setOption(option);
- /* if (id === 'breedChart') {
- breedChart = pieChart;
- } */
-
-
-}
-
-window.onload = function () {
- barChartLoad(null);
- /*绮鍝佺*/
- window.onresize = function (e) {
- if (breedChart) {
- breedChart.resize();
- }
- }
- // ajaxFoodNum();
-}
-
-/**
- * 鑾峰彇楗肩姸鍥炬暟鎹�
- */
-function ajaxFoodNum() {
-
- var data = {
- "county": county,
- "type": type,
- "companyId": companyId
- };
-
- $.ajax({
- type: "POST",
- url: "../../visual/amount-food-number",
- dataType: "json",
- contentType: "application/json;charset=UTF-8",
- data: JSON.stringify(data),
- success: function (result) {
- if (result.code == "0000") {
- var data = result.data;
- renderFoodNum(data);
- }
- },
- error: function (error) {
-
- }
- });
-}
-
-//鏇存柊楗肩姸鍥句俊鎭�
-function renderFoodNum(data) {
- if (data.allSum.length > 8) {
- $("#foodSum").css("font-size", "25px");
- } else {
- $("#foodSum").css("font-size", "32px");
- }
- $("#foodSum").html(data.allSum);
-
- var foodNumPerHtml = "";
- var color = ["0, 228, 250", "22, 226, 173", "255, 181, 23", "238, 60, 72", "135, 103, 255", "41, 122, 255", "238, 60, 144", "0, 228, 250", "22, 226, 173", "255, 181, 23", "238, 60, 72", "135, 103, 255", "41, 122, 255", "238, 60, 144"];
- for (var i = 0; i < data.varietyChartPie.length; i++) {
- foodNumPerHtml += "" +
- "<li>\n" +
- "\t\t\t\t\t\t\t\t\t<div class=\"con\" style=\"background-color: rgba(" + color[i] + ",.05);\">\n" +
- "\t\t\t\t\t\t\t\t\t\t<div class=\"dot\" style=\"background-color: rgb(" + color[i] + ");\"></div>\n" +
- "\t\t\t\t\t\t\t\t\t\t<div class=\"num\" style=\"color: rgb(" + color[i] + ");\">" + data.varietyChartPie[i].percent + "%</div>\n" +
- "\t\t\t\t\t\t\t\t\t\t<div class=\"type\">" + data.varietyChartPie[i].name + "</div>\n" +
- "\t\t\t\t\t\t\t\t\t</div>\n" +
- "\t\t\t\t\t\t\t\t</li>";
- }
- $("#foodNumPer").html(foodNumPerHtml);
- if (data.varietyChartPie.length > 0) {
- var varietyChart = breedChart;
- varietyChart.option.series[0].data = data.varietyChartPie;
- varietyChart.chart.setOption(varietyChart.option, true);
- breedChart = varietyChart;
- }
- barChartLoad(data);
}
\ No newline at end of file
diff --git a/fzzy-igdss-web/src/main/resources/static/group/gis.js b/fzzy-igdss-web/src/main/resources/static/group/gis.js
index 2dcb88d..6e104f9 100644
--- a/fzzy-igdss-web/src/main/resources/static/group/gis.js
+++ b/fzzy-igdss-web/src/main/resources/static/group/gis.js
@@ -6,6 +6,7 @@
var markers = [];//鐐规爣璁�
var type = "0";
var county = "all";
+var breedChart = null;
//var switch2AreaNode2;
@@ -29,19 +30,33 @@
//鍒濆鍖栧湴鍥�
initMap();
- //宸︿晶鍥捐〃
+ //鍒濆鍖栧乏渚у浘琛�
pieChartLoad(
[
- {value: "0.000", name: '绋昏胺'},
- {value: "0.000", name: '鐜夌背'},
- {value: "0.000", name: '灏忛害'}
+ {value: "0", name: '浼婂畞甯�'},
+ {value: "0", name: '濂庡悲甯�'},
+ {value: "0", name: '闇嶅皵鏋滄柉甯�'},
+ {value: "0", name: '浼婂畞鍘�'},
+ {value: "0", name: '瀵熷竷鏌ュ皵閿′集鑷不鍘�'},
+ {value: "0", name: '闇嶅煄鍘�'},
+ {value: "0", name: '宸╃暀鍘�'},
+ {value: "0", name: '鏂版簮鍘�'},
+ {value: "0", name: '鏄嫃鍘�'},
+ {value: "0", name: '鐗瑰厠鏂幙'},
+ {value: "0", name: '灏煎嫆鍏嬪幙'}
],
'breedChart'
);
+ window.onresize = function (e) {
+ if (breedChart) {
+ breedChart.resize();
+ }
+ }
//娓叉煋閮ㄩ棬
renderList();
+ renderNum();
//瀹氫綅鍒版柊鐤嗙渷
setTimeout(function () {
positioning("650000");
@@ -353,6 +368,28 @@
}
}
+function renderNum() {
+ $("#foodSum").html(gisData.deptNum);
+
+ var foodNumPerHtml = '';
+ var color = ["0, 228, 250", "22, 226, 173", "255, 181, 23", "238, 60, 72", "135, 103, 255", "41, 122, 255", "238, 60, 144", "0, 228, 250", "22, 226, 173", "255, 181, 23", "238, 60, 72", "135, 103, 255", "41, 122, 255", "238, 60, 144"];
+ for (var i = 0; i < gisData.deptList.length; i++) {
+ foodNumPerHtml += '<li><div class="con" style="background-color: rgba('+color[i]+',.05);">';
+ foodNumPerHtml += '<div class="dot" style="background-color: rgb('+color[i]+');"></div>';
+ foodNumPerHtml += '<div class="num" style="color: rgb('+color[i]+');">'+gisData.deptList[i].percent+'%</div>';
+ foodNumPerHtml += '<div class="type">'+gisData.deptList[i].name+'</div>';
+ foodNumPerHtml += '</div></li>';
+ }
+ $("#foodNumPer").html(foodNumPerHtml);
+ if (gisData.deptList.length > 0) {
+ var varietyChart = breedChart;
+ varietyChart.option.series[0].data = gisData.deptList;
+ varietyChart.chart.setOption(varietyChart.option, true);
+ breedChart = varietyChart;
+ }
+ barChartLoad("ss");
+}
+
/**
* 鑾峰彇鍦板浘琛屾斂鍖哄煙棰滆壊
* @param adcode
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 e046375..30cf5e1 100644
--- a/fzzy-igdss-web/src/main/resources/static/group/index.js
+++ b/fzzy-igdss-web/src/main/resources/static/group/index.js
@@ -1,9 +1,4 @@
var nowClientWidth = document.documentElement.clientWidth; // 褰撳墠瑙嗗彛瀹藉害
-var pieVarietyChart = null; // 鍝佺楗肩姸鍥� -- 绮
-var pieTypeChart = null; // 鎬ц川楗肩姸鍥� -- 绮
-var pieLevelChart = null; // 绛夌骇楗肩姸鍥� -- 绮
-var pieYearChart = null; // 骞翠唤楗肩姸鍥� -- 绮
-var pieAreaChart = null; // 鍖哄煙楗肩姸鍥� -- 绮
var hisVarietyChart = null; // 鍝佺鏌辩姸鍥�
var deptAreaAllList = null; // 鎵�鏈夊簱鍖哄垪琛ㄤ俊鎭�
var deptAreaList = null; // 瀛樻斁鍒囨崲搴撳尯鍒楄〃淇℃伅
@@ -37,29 +32,33 @@
initTime();
// 鍒濆鍖栧浘琛�
initChart();
+ //鍒濆鍖栨爣璇�
initDicSlogan();
//鍒濆鍖栧湴鍥�
initMap();
-
//鍔犺浇鎸囧畾鍦板尯鍦板浘
renderMapPoints("涔岄瞾鏈ㄩ綈甯�,鍏嬫媺鐜涗緷甯�,鍚愰瞾鐣競,鍝堝瘑甯�,鏄屽悏鍥炴棌鑷不宸�,鍗氬皵濉旀媺钂欏彜鑷不宸�,宸撮煶閮钂欏彜鑷不宸�,闃垮厠鑻忓湴鍖�,鍏嬪瓬鍕掕嫃鏌皵鍏嬪瓬鑷不宸�,鍠�浠�鍦板尯,鍜岀敯鍦板尯,浼婄妬鍝堣惃鍏嬭嚜娌诲窞,濉斿煄鍦板尯,闃垮嫆娉板湴鍖�");
- // 璇锋眰搴撳尯淇℃伅
- // ajaxDeptArea();
- // 鑾峰彇鍏徃淇℃伅
- // ajaxCompany();
- // 璇锋眰绮鏁伴噺缁熻淇℃伅
+
+ //TODO 缁熻鐩稿叧鏁伴噺淇℃伅锛屽寘鍚簱鐐瑰強绮鏁伴噺
// ajaxFoodNum();
- // 璇锋眰鑾峰彇搴撳尯鍔ㄦ�佷俊鎭�
+
+ //TODO 璇锋眰鐩戠搴撳尯淇℃伅
+ // ajaxDeptArea();
+
+ //TODO 璇锋眰AI浜嬩欢淇℃伅
// ajaxMsg();
- // 婊氬姩
+
+ //TODO 璇锋眰鎶撴媿璺熻釜淇℃伅
+ // ajaxFoodNum();
+
+ //鎶撴媿璺熻釜婊氬姩
jQuery(".block2").slide({ mainCell: ".bd ul", autoPage: true, effect: "topLoop", autoPlay: true, vis: 4 });
jQuery(".follow").slide({ mainCell: ".bd ul", autoPlay: true, effect: "leftMarquee", vis: 5, interTime: 50 });
}
// socket淇℃伅杩斿洖铏曠悊
function socketOnMessage(pocket) {
- //console.log(pocket);
- if (pocket.bizId == "slogan") {
+ if (pocket.bizId === "slogan") {
var data = pocket.data;
dicSlogan = data;
initDicSlogan();
@@ -581,43 +580,6 @@
hisVarietyChart = hisFoodVariety;
}
- /*----- 楗煎浘 -----*/
- // 鍝佺 -- 绮
- if (data.varietyChartPie.length > 0) {
- var varietyChart = pieVarietyChart;
- varietyChart.option.series[0].data = data.varietyChartPie;
- varietyChart.chart.setOption(varietyChart.option, true);
- pieVarietyChart = varietyChart;
- }
- // 鎬ц川 -- 绮
- if (data.typeChartPie.length > 0) {
- var typeChart = pieTypeChart;
- typeChart.option.series[0].data = data.typeChartPie;
- typeChart.chart.setOption(typeChart.option, true);
- pieTypeChart = typeChart;
- }
- // 绛夌骇 -- 绮
- if (data.levelChartPie.length > 0) {
- var levelChart = pieLevelChart;
- levelChart.option.series[0].data = data.levelChartPie;
- levelChart.chart.setOption(levelChart.option, true);
- pieLevelChart = levelChart;
- }
- // 骞翠唤 -- 绮
- if (data.yearChartPie.length > 0) {
- var yearChart = pieYearChart;
- yearChart.option.series[0].data = data.yearChartPie;
- yearChart.chart.setOption(yearChart.option, true);
- pieYearChart = yearChart;
- }
- // 鍖哄煙 -- 绮
- if (data.areaChartPie.length > 0) {
- var areaChart = pieAreaChart;
- areaChart.option.series[0].data = data.areaChartPie;
- areaChart.chart.setOption(areaChart.option, true);
- pieAreaChart = areaChart;
- }
-
// 绮鐩戠鏁伴噺鍒囨崲
foodNumSwitch();
// 绮楗煎浘鍒囨崲
@@ -752,26 +714,6 @@
*/
function initScrollbar() {
- if (pieVarietyChart) {
- pieVarietyChart.resize();
- }
-
- if (pieTypeChart) {
- pieTypeChart.resize();
- }
-
- if (pieLevelChart) {
- pieLevelChart.resize();
- }
-
- if (pieYearChart) {
- pieYearChart.resize();
- }
-
- if (pieAreaChart) {
- pieAreaChart.resize();
- }
-
if (hisVarietyChart) {
hisVarietyChart.resize();
}
@@ -806,59 +748,6 @@
['灏忛害', '鐜夌背', '绋昏胺', '鎴愬搧绮�', '鎴愬搧娌�', '鍏朵粬'],
[1000, 1200, 1500, 1300, 1100, 1600]
);
-
- // /* 鍝佺 - 绮 */
- // pieChartLoad(
- // [
- // {value: 0, name: '绋昏胺'},
- // {value: 0, name: '鐜夌背'},
- // {value: 0, name: '灏忛害'}
- // ],
- // 'pieVarietyChart'
- // );
- // /* 鎬ц川 - 绮 */
- // pieChartLoad(
- // [
- // {value: 0, name: '鐪佺骇鍌ㄥ'},
- // {value: 0, name: '甯傜骇鍌ㄥ'},
- // {value: 0, name: '鍘跨骇鍌ㄥ'}
- // ],
- // 'pieTypeChart'
- // );
- // /* 绛夌骇 - 绮 */
- // pieChartLoad(
- // [
- // {value: 0, name: '涓�绛�'},
- // {value: 0, name: '浜岀瓑'},
- // {value: 0, name: '涓夌瓑'},
- // {value: 0, name: '鍥涚瓑'},
- // {value: 0, name: '浜旂瓑'},
- // {value: 0, name: '绛夊'}
- // ],
- // 'pieLevelChart'
- // );
- // /* 骞翠唤 - 绮 */
- // pieChartLoad(
- // [
- // {value: 0, name: '2019'},
- // {value: 0, name: '2020'},
- // {value: 0, name: '2021'},
- // {value: 0, name: '2022'},
- // {value: 0, name: '2023'}
- //
- // ],
- // 'pieYearChart'
- // );
- // /* 鍦板煙 - 绮 */
- // pieChartLoad(
- // [
- // {value: 0, name: '2019'},
- // {value: 0, name: '2020'},
- // {value: 0, name: '2021'},
- // {value: 0, name: '2022'},
- // {value: 0, name: '2023'}
- // ], 'pieAreaChart'
- // );
}
/**
@@ -978,97 +867,6 @@
};
myChart.setOption(options);
hisVarietyChart = {"chart": myChart, "option": options};
-}
-
-/**
- * 楗煎浘鍔犺浇
- *
- * @param obj
- * @param id
- */
-function pieChartLoad(data, id) {
- var dom = document.getElementById(id);
- var pieChart = echarts.init(dom);
-
- var option = {
- tooltip: {
- trigger: 'item'
- },
- legend: {
- bottom: 10,
- right: 10,
- left: 10,
- textStyle: {
- color: '#fff',
- fontSize: 12
- },
- itemWidth: 8,
- itemHeight: 8,
- icon: "circle",
- // 浣跨敤鍥炶皟鍑芥暟
- formatter:function(name) {
-
- var than = option.series[0].data;
- var total = 0;
- var tarValue;
- for (var i = 0, l = than.length; i < l; i++) {
- total += Number(than[i].value);
- if (than[i].name == name) {
- tarValue = Number(than[i].value);
- }
- }
- var p = 0.0;
- if(total > 0){
- p = (tarValue / total) * 100;
- }
- return name + " " + " " + p.toFixed(2) + "%";
- }
- },
-
- color: ['#26a2cf', '#d36b37', '#d49327', '#2d6be9', '#36b994', '#bc2032', '#d3614f'],
- series: [
- {
- name: '',
- type: 'pie',
- radius: ['20%', '50%'],
- center: ['center', '30%'],
- avoidLabelOverlap: false,
- itemStyle: {
- borderRadius: 10,
- borderColor: '#041636',
- borderWidth: 8,
- },
- label: {
- show: false,
- color: '#fff',
- formatter: '{b}\n{d}%',
- fontSize: nowSize(16),
- lineHeight: nowSize(25),
- },
- labelLine: {
- show: true,
- lineStyle: {
- cap: 'round',
- }
- },
- data: data
- }
- ]
- };
-
- pieChart.setOption(option);
-
- if (id === 'pieVarietyChart') {
- pieVarietyChart = {"chart": pieChart, "option": option};
- } else if (id === 'pieTypeChart') {
- pieTypeChart = {"chart": pieChart, "option": option};
- } else if (id === 'pieLevelChart') {
- pieLevelChart = {"chart": pieChart, "option": option};
- } else if (id === 'pieYearChart') {
- pieYearChart = {"chart": pieChart, "option": option};
- } else if (id === 'pieAreaChart') {
- pieAreaChart = {"chart": pieChart, "option": option};
- }
}
/**
diff --git a/fzzy-igdss-web/src/main/resources/templates/group/gis.html b/fzzy-igdss-web/src/main/resources/templates/group/gis.html
index 134285d..a1de508 100644
--- a/fzzy-igdss-web/src/main/resources/templates/group/gis.html
+++ b/fzzy-igdss-web/src/main/resources/templates/group/gis.html
@@ -92,8 +92,8 @@
<div class="chartbox">
<div class="chart" id="breedChart"></div>
<div class="txt">
- <div class="n" id="foodSum">1433331 </div>
- <div class="p">鍚� </div>
+ <div class="n" id="foodSum">10 </div>
+ <div class="p">涓� </div>
</div>
</div>
</div>
@@ -102,99 +102,78 @@
<li>
<div class="con" style="background-color: rgba(0, 228, 250,.05);">
<div class="dot" style="background-color: rgb(0, 228, 250);"></div>
- <div class="num" style="color: rgb(0, 228, 250);">42.2%</div>
- <div class="type">娣峰悎灏忛害</div>
+ <div class="num" style="color: rgb(0, 228, 250);">0%</div>
+ <div class="type">浼婂畞甯�</div>
</div>
</li>
<li>
<div class="con" style="background-color: rgba(22, 226, 173,.05);">
<div class="dot" style="background-color: rgb(22, 226, 173);"></div>
- <div class="num" style="color: rgb(22, 226, 173);">12.6%</div>
- <div class="type">灏忛害</div>
+ <div class="num" style="color: rgb(22, 226, 173);">0%</div>
+ <div class="type">濂庡悲甯�</div>
</div>
</li>
<li>
<div class="con" style="background-color: rgba(255, 181, 23,.05);">
<div class="dot" style="background-color: rgb(255, 181, 23);"></div>
- <div class="num" style="color: rgb(255, 181, 23);">21.0%</div>
- <div class="type">鐜夌背</div>
+ <div class="num" style="color: rgb(255, 181, 23);">0%</div>
+ <div class="type">闇嶅皵鏋滄柉甯�</div>
</div>
</li>
<li>
<div class="con" style="background-color: rgba(238, 60, 72,.05);">
<div class="dot" style="background-color: rgb(238, 60, 72);"></div>
- <div class="num" style="color: rgb(238, 60, 72);">5.8%</div>
- <div class="type">绋昏胺</div>
+ <div class="num" style="color: rgb(238, 60, 72);">90%</div>
+ <div class="type">浼婂畞鍘�</div>
</div>
</li>
<li>
<div class="con" style="background-color: rgba(135, 103, 255,.05);">
<div class="dot" style="background-color: rgb(135, 103, 255);"></div>
- <div class="num" style="color: rgb(135, 103, 255);">0.9%</div>
- <div class="type">闈掔</div>
+ <div class="num" style="color: rgb(135, 103, 255);">0%</div>
+ <div class="type">瀵熷竷鏌ュ皵閿′集鑷不鍘�</div>
</div>
</li>
<li>
<div class="con" style="background-color: rgba(41, 122, 255,.05);">
<div class="dot" style="background-color: rgb(41, 122, 255);"></div>
- <div class="num" style="color: rgb(41, 122, 255);">10.2%</div>
- <div class="type">鑻﹁崬楹�</div>
+ <div class="num" style="color: rgb(41, 122, 255);">0%</div>
+ <div class="type">闇嶅煄鍘�</div>
</div>
</li>
<li>
<div class="con" style="background-color: rgba(238, 60, 144,.05);">
<div class="dot" style="background-color: rgb(238, 60, 144);"></div>
- <div class="num" style="color: rgb(238, 60, 144);">16.2%</div>
- <div class="type">澶ц眴</div>
+ <div class="num" style="color: rgb(238, 60, 144);">0%</div>
+ <div class="type">宸╃暀鍘�</div>
</div>
</li>
<li>
<div class="con" style="background-color: rgba(0, 228, 250,.05);">
<div class="dot" style="background-color: rgb(0, 228, 250);"></div>
- <div class="num" style="color: rgb(0, 228, 250);">42.2%</div>
- <div class="type">娣峰悎灏忛害</div>
+ <div class="num" style="color: rgb(0, 228, 250);">0%</div>
+ <div class="type">鏂版簮鍘�</div>
</div>
</li>
<li>
<div class="con" style="background-color: rgba(22, 226, 173,.05);">
<div class="dot" style="background-color: rgb(22, 226, 173);"></div>
- <div class="num" style="color: rgb(22, 226, 173);">12.6%</div>
- <div class="type">灏忛害</div>
+ <div class="num" style="color: rgb(22, 226, 173);">0%</div>
+ <div class="type">鏄嫃鍘�</div>
</div>
</li>
<li>
<div class="con" style="background-color: rgba(255, 181, 23,.05);">
<div class="dot" style="background-color: rgb(255, 181, 23);"></div>
- <div class="num" style="color: rgb(255, 181, 23);">21.0%</div>
- <div class="type">鐜夌背</div>
+ <div class="num" style="color: rgb(255, 181, 23);">0%</div>
+ <div class="type">鐗瑰厠鏂幙</div>
</div>
</li>
<li>
<div class="con" style="background-color: rgba(238, 60, 72,.05);">
- <div class="dot" style="background-color: rgb(238, 60, 72);"></div>
- <div class="num" style="color: rgb(238, 60, 72);">5.8%</div>
- <div class="type">绋昏胺</div>
- </div>
- </li>
- <li>
- <div class="con" style="background-color: rgba(135, 103, 255,.05);">
- <div class="dot" style="background-color: rgb(135, 103, 255);"></div>
- <div class="num" style="color: rgb(135, 103, 255);">0.9%</div>
- <div class="type">闈掔</div>
- </div>
- </li>
- <li>
- <div class="con" style="background-color: rgba(41, 122, 255,.05);">
- <div class="dot" style="background-color: rgb(41, 122, 255);"></div>
- <div class="num" style="color: rgb(41, 122, 255);">10.2%</div>
- <div class="type">鑻﹁崬楹�</div>
- </div>
- </li>
- <li>
- <div class="con" style="background-color: rgba(238, 60, 144,.05);">
- <div class="dot" style="background-color: rgb(238, 60, 144);"></div>
- <div class="num" style="color: rgb(238, 60, 144);">16.2%</div>
- <div class="type">澶ц眴</div>
+ <div class="dot" style="background-color: rgb(32,134,32);"></div>
+ <div class="num" style="color: rgb(32,134,32);">10%</div>
+ <div class="type">灏煎嫆鍏嬪幙</div>
</div>
</li>
</ul>
@@ -202,7 +181,6 @@
</div>
<div class="m-box2">
<div class="item">
-
<div class="bot">
<div class="chart" id="ss"></div>
</div>
@@ -430,16 +408,10 @@
</div>
-
-
- <!-- <script src="../js/bootstrap.min.js" type="text/javascript"></script> -->
-
- <script>
+ <script th:inline="javascript">
window._AMapSecurityConfig = {
securityJsCode:'39051edca2c561cb80d8f49b4624ab17',
}
- </script>
- <script th:inline="javascript">
var userId = [[${loginUser.loginName}]];
var companyId = [[${loginUser.companyId}]];
var deptId = [[${deptId}]];
@@ -449,6 +421,7 @@
var bizType = [[${bizType}]];
var bizTag = [[${bizTag}]];
var dicSlogan = [[${dicSlogan}]];
+ var gisData = [[${gisData}]];
var defaultAreaCode = [[${defaultAreaCode}]];
</script>
<script th:src="@{https://webapi.amap.com/maps?v=2.0&key=5249315a4ba00ea7212898d4449b8c0e&plugin=AMap.DistrictSearch}" src="https://webapi.amap.com/maps?v=2.0&key=5249315a4ba00ea7212898d4449b8c0e"></script>
--
Gitblit v1.9.3