From 8e4be3c0e5577fddae3ae30b0ca00f8b7a6c490e Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 05 三月 2026 17:41:18 +0800
Subject: [PATCH] 建模gis监管页面修改
---
fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java | 38 +
fzzy-igdss-web/src/main/resources/static/group/gis-chart.js | 155 ++++++
fzzy-igdss-web/src/main/resources/static/group/gis.css | 669 ++++++++++++++++------------
fzzy-igdss-web/src/main/resources/static/group/gis_modeling.js | 393 ++++------------
fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java | 11
fzzy-igdss-web/src/main/resources/templates/group/gis_modeling.html | 45 +
fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupDepotData.java | 26 +
7 files changed, 741 insertions(+), 596 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupDepotData.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupDepotData.java
new file mode 100644
index 0000000..afda63e
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupDepotData.java
@@ -0,0 +1,26 @@
+package com.fzzy.igds.data;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * gis鐩戠-寤烘ā鐗堟湰锛屼粨搴撲俊鎭睍绀�
+ *
+ * @author sgj
+ * @since 2026/03/05
+ */
+@Data
+public class GroupDepotData implements Serializable {
+ /**
+ * 鐩戠搴撳尯淇℃伅
+ */
+ private String deptId; //搴撳尯缂栫爜
+ private String code; //琛屾斂鍖哄垝缂栫爜
+ private String county; //琛屾斂鍖哄悕绉�
+ private String deptName; //搴撳尯鍚嶇О
+ private String depotId; //浠撳簱缂栫爜
+ private String depotName; //浠撳簱鍚嶇О
+ private Double storageNum = 0.0; //搴撳瓨鏁�
+
+}
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 52c466c..57431f3 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
@@ -148,19 +148,20 @@
view.put("bizType", "screen");
view.put("bizTag", WebSocketPacket.BIZ_TAG_COMMON);
- view.put("defaultAreaCode", "650000");
//鑾峰彇鏂扮枂鍖哄垝淇℃伅
List<DicArea> areaList = groupManager.getBankAndChildDept("650000");
view.put("areaList", areaList);
- //鑾峰彇鏂扮枂鍙婁笅灞炲競宸�
- List<DicArea> allArea = groupManager.getArea("650000");
- view.put("allArea", allArea);
-
//鑾峰彇鎵�鏈夊簱鍖�
List<GroupDeptData> deptList = groupManager.getDeptData(user.getCompanyId());
view.put("deptList", deptList);
+ String deptId = (deptList != null && !deptList.isEmpty()) ? deptList.get(0).getDeptId() : null;
+// view.put("defaultDeptId", deptId != null ? deptId : "00");
+ view.put("defaultDeptId","5372001001");
+ //鑾峰彇鎵�鏈変粨搴�
+ List<GroupDepotData> depotList = groupManager.getDepotData(user.getCompanyId());
+ view.put("depotList", depotList);
//缁熻淇℃伅
GroupGisData groupGisData = groupManager.getGisData();
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 b974889..1a14c23 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
@@ -303,6 +303,44 @@
return list;
}
+
+ /**
+ * 鑾峰彇搴撳尯灏佽淇℃伅
+ *
+ * @param companyId
+ * @return
+ */
+ public List<GroupDepotData> getDepotData(String companyId) {
+
+ List<GroupDepotData> list = new ArrayList<>();
+ GroupDepotData depotData;
+ List<Dept> deptList = deptService.getDeptByUserType(null);
+ if (null != deptList && !deptList.isEmpty()) {
+ List<Depot> depotList;
+ for (Dept dept : deptList) {
+ //缁熻浠撳簱鏁�
+ depotList = depotService.getCacheDepotList(dept.getCompanyId(), dept.getId());
+ if (null != depotList && !depotList.isEmpty()) {
+ for (Depot depot : depotList) {
+ depotData = new GroupDepotData();
+ depotData.setDeptId(dept.getId());
+ depotData.setDeptName(dept.getKqmc());
+ depotData.setCode(dept.getXzqhdm());
+ depotData.setCounty(dept.getXzqhmc());
+ depotData.setDepotId(depot.getId());
+ depotData.setDepotName(depot.getName());
+ if (null == depot.getStorageReal()) {
+ depot.setStorageReal(0.0);
+ }
+ depotData.setStorageNum(depot.getStorageReal() / 1000);
+ list.add(depotData);
+ }
+ }
+ }
+ }
+ return list;
+ }
+
/**
* 鑾峰彇搴撳尯涓嬬洃鎺т俊鎭�
*
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 841aa77..484701a 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
@@ -234,4 +234,157 @@
]
};
barChart.setOption(option);
-}
\ No newline at end of file
+}
+
+function modelingBarChartLoad(id) {
+ var dom = document.getElementById(id);
+ var barChart = echarts.init(dom);
+ var predata = [];
+ var ydata = [];
+ if (gisData) {
+ predata[0] = gisData.bankSumPer;
+ ydata[0] = gisData.bankSum;
+ } else {
+ predata = [50];
+ ydata = [500];
+ }
+ var option = {
+ grid: {
+ top: '20%',
+ left: '2%',
+ right: '5%',
+ bottom: '1%',
+ },
+ tooltip: {
+ show: true,
+ trigger: "axis",
+ formatter: function (data) {
+ let result = '';
+ let content = '';
+ for (let i = 0; i < data.length - 1; i++) {
+ if (data[i].componentSubType === 'bar' && data[i].seriesName !== '鑳屾櫙鏉�') {
+ content += `${data[i].marker} ${data[i].seriesName}<span style='font-size:12px; float:right;margin-left:20px;'>${data[i].data}</span><br/>`
+ result = `<span style='font-size: 14px;'>${data[i].name}</span> <br/> ${content}`;
+ }
+ }
+ return result;
+ }
+ },
+ xAxis: {
+ splitLine: {
+ show: false
+ },
+ axisLabel: {
+ margin: 20,
+ show: false
+ },
+ axisTick: {
+ show: false
+ },
+ axisLine: {
+ show: false
+ }
+ },
+ yAxis: [{
+ inverse: true,
+ type: 'category',
+ splitLine: {
+ show: false
+ },
+ axisLine: {
+ show: false
+ },
+ axisLabel: {
+ align: 'left',
+ verticalAlign: 'bottom',
+ padding: [0, 0, 26, 10],
+ fontSize: "18",
+ color: '#fff',
+ formatter: function (param) {
+ return ['{img|}' + '{b|' + param + '}']
+ },
+ rich: {
+ b: {
+ fontSize: 18,
+ color: '#fff',
+ padding: [0, 0, 0, 10]
+ },
+ img: {
+ backgroundColor: {
+ image: '/img/web/group/c-i1.png',
+ },
+ width: 17,
+ align: 'left',
+ }
+ }
+ },
+ axisTick: {
+ show: false
+ },
+ data: ['璐ㄦ娂閲嶉噺'],
+ },
+ {
+ type: "category",
+ inverse: true,
+ axisTick: "none",
+ axisLine: "none",
+ show: true,
+ axisLabel: {
+ inside: true,
+ verticalAlign: "bottom",
+ textStyle: {
+ fontFamily: 'DINCond-Bold',
+ color: "#ffd12b",
+ fontSize: "20",
+ padding: [0, 0, 26, 0],
+ },
+ formatter: function (param) {
+ return toThousands(param)
+ }
+ },
+ data: ydata,
+ }
+ ],
+ series: [{
+ name: '鍗犳瘮',
+ type: 'bar',
+ stack: 'all',
+ barWidth: 12,
+ itemStyle: {
+ color: '#00e4fa'
+ },
+ data: predata,
+ z: 1
+ },
+ {
+ name: '杈呭姪鍊�',
+ type: 'pictorialBar',
+ barWidth: 12,
+ symbol: 'roundRect',
+ symbolMargin: 2,
+ symbolSize: [2, 12],
+ symbolOffset: [-2, '0%'],
+ symbolClip: true,
+ symbolRepeat: true,
+ itemStyle: {
+ color: '#082640'
+ },
+ data: [100],
+ z: 2
+ },
+ {
+ name: '鑳屾櫙鏉�',
+ type: 'bar',
+ silent: true,
+ barWidth: 12,
+ barGap: '-100%',
+ itemStyle: {
+ color: '#082640'
+ },
+ data: [100],
+ z: 0
+ }
+ ]
+ };
+ barChart.setOption(option);
+}
diff --git a/fzzy-igdss-web/src/main/resources/static/group/gis.css b/fzzy-igdss-web/src/main/resources/static/group/gis.css
index bb3ae73..5fb235b 100644
--- a/fzzy-igdss-web/src/main/resources/static/group/gis.css
+++ b/fzzy-igdss-web/src/main/resources/static/group/gis.css
@@ -1,164 +1,222 @@
@font-face {
- font-family: DINCond-Bold;
- src: url('../fonts/DINCond-Bold.otf');
+ font-family: DINCond-Bold;
+ src: url('../fonts/DINCond-Bold.otf');
}
-.i-nav3.on{
- background-image: url(../img/web/group/c-btn3.png);
+.i-nav3.on {
+ background-image: url(../img/web/group/c-btn3.png);
}
-.c-main{
- position: relative;
- height: 910px;
+
+.c-main {
+ position: relative;
+ height: 910px;
}
-.c-left{
- position: absolute;
- top: 10px;
- left: 0;
- padding-left: 20px;
- transition: .4s;
+
+.c-left {
+ position: absolute;
+ top: 10px;
+ left: 0;
+ padding-left: 20px;
+ transition: .4s;
}
-.c-left.hidden{
- transform: translateX(-518px);
+
+.c-left.hidden {
+ transform: translateX(-518px);
}
-.c-right.hidden{
- transform: translateX(380px);
+
+.c-right.hidden {
+ transform: translateX(380px);
}
-.hidden .o-btn{
- transition: .4s;
- opacity: 1;
- visibility: visible;
+
+.hidden .o-btn {
+ transition: .4s;
+ opacity: 1;
+ visibility: visible;
}
-.c-left .inner{
- padding: 90px 20px 20px;
- width: 518px;
- height: 910px;
- background: url(../img/web/group/cd-bg1.png) no-repeat center;
- background-size: 100% 100%;
- box-sizing: border-box;
+
+.c-left .inner {
+ padding: 90px 20px 20px;
+ width: 518px;
+ height: 910px;
+ background: url(../img/web/group/cd-bg1.png) no-repeat center;
+ background-size: 100% 100%;
+ box-sizing: border-box;
}
-.c-right{
- position: absolute;
- top: 0;
- right: 0;
- padding-right: 12px;
- transition: .4s;
+
+.c-right {
+ position: absolute;
+ top: 0;
+ right: 0;
+ padding-right: 12px;
+ transition: .4s;
}
-.c-right .inner{
- padding-top: 80px;
- width: 399px;
- height: 910px;
- background: url(../img/web/group/cd-bg2.png) no-repeat center;
- background-size: 100% 100%;
- box-sizing: border-box;
+
+.c-right .inner {
+ padding-top: 80px;
+ width: 399px;
+ height: 910px;
+ background: url(../img/web/group/cd-bg2.png) no-repeat center;
+ background-size: 100% 100%;
+ box-sizing: border-box;
}
-.c-left .close{
- cursor: pointer;
- width: 45px;
- height: 45px;
- position: absolute;
- top: 10px;
- right: 35px;
+
+.c-left .close {
+ cursor: pointer;
+ width: 45px;
+ height: 45px;
+ position: absolute;
+ top: 10px;
+ right: 35px;
}
-.c-right .close{
- cursor: pointer;
- width: 45px;
- height: 45px;
- position: absolute;
- top: 10px;
- right: 40px;
+
+.c-right .close {
+ cursor: pointer;
+ width: 45px;
+ height: 45px;
+ position: absolute;
+ top: 10px;
+ right: 40px;
}
-.o-btn{
- position: absolute;
- top: 50%;
- width: 89px;
- cursor: pointer;
- transform: translateY(-50%);
- opacity: 0;
- visibility: hidden;
+
+.o-btn {
+ position: absolute;
+ top: 50%;
+ width: 89px;
+ cursor: pointer;
+ transform: translateY(-50%);
+ opacity: 0;
+ visibility: hidden;
}
-.o-btn img{
- display: block;
- width: 100%;
+
+.o-btn img {
+ display: block;
+ width: 100%;
}
-.c-left .o-btn{
- left: 100%;
- margin-left: -4px;
+
+.c-left .o-btn {
+ left: 100%;
+ margin-left: -4px;
}
-.c-right .o-btn{
- right: 100%;
- margin-right: -18px;
+
+.c-right .o-btn {
+ right: 100%;
+ margin-right: -18px;
}
-.m-box1{
- display: flex;
- align-items: center;
- padding-left: 20px;
- margin-bottom: 30px;
+
+.modeling-left-topInfo-box2 {
+ background: url("../img/web/group/left-box2.png") no-repeat;
+ width: 100%;
+ height: 362px;
+ box-sizing: border-box;
+ padding: 56px 20px 20px 20px;
+ position: relative;
}
-.m-box1 .l{
- width: 212px;
- margin-right: 24px;
+
+
+.modeling-left-topInfo-kd {
+ width: 287px;
+ height: 90px;
+ margin: 20px auto;
+ overflow: hidden;
+ border-top: 1px solid #113359;
+ border-bottom: 1px solid #113359;
+ background: radial-gradient(circle, #062251, rgba(6, 35, 77, 0));
}
-.m-box1 .r{
- flex:1;
+
+.modeling-left-topInfo-ck {
+ width: 100%;
+ height: 100%;
+ color: #fff;
+ display: flex;
+ justify-content: center;
+ align-items: center;
}
-.m-box1 .chartbox{
- position: relative;
- width: 212px;
- height: 212px;
+
+.modeling-left-topInfo-kd-list li {
+ width: 100%;
}
-.m-box1 .chartbox::before{
- content: "";
- display: block;
- position: absolute;
- left: 0;
- top: 0;
- width: 100%;
- height: 100%;
- display: block;
- background: url(../img/web/group/c-bg1.png) no-repeat center;
- background-size: contain;
+
+
+.m-box1 {
+ display: flex;
+ align-items: center;
+ padding-left: 20px;
+ margin-bottom: 30px;
}
-.m-box1 .chartbox::after{
- content: "";
- display: block;
- position: absolute;
- left: 0;
- top: 0;
- width: 100%;
- height: 100%;
- display: block;
- background: url(../img/web/group/c-bg2.png) no-repeat center;
- background-size: contain;
+
+.m-box1 .l {
+ width: 212px;
+ margin-right: 24px;
}
-.m-box1 .chartbox .txt{
- position: absolute;
- top: 50%;
- left: 50%;
- margin-top: -55px;
- margin-left: -55px;
- width: 110px;
- height: 110px;
- border-radius: 50%;
- display: flex;
- align-items: center;
- justify-content: center;
- flex-direction: column;
- font-size: 16px;
- color: #fff;
- z-index: 2;
+
+.m-box1 .r {
+ flex: 1;
}
-.m-box1 .chartbox .txt .n{
- font-size: 40px;
- color: #ffd100;
- font-family: DINCond-Bold;
+
+.m-box1 .chartbox {
+ position: relative;
+ width: 212px;
+ height: 212px;
}
-.m-box1 .chart{
- width: 100%;
- height: 100%;
- position: relative;
- z-index: 3;
+
+.m-box1 .chartbox::before {
+ content: "";
+ display: block;
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ display: block;
+ background: url(../img/web/group/c-bg1.png) no-repeat center;
+ background-size: contain;
}
+
+.m-box1 .chartbox::after {
+ content: "";
+ display: block;
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ display: block;
+ background: url(../img/web/group/c-bg2.png) no-repeat center;
+ background-size: contain;
+}
+
+.m-box1 .chartbox .txt {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ margin-top: -55px;
+ margin-left: -55px;
+ width: 110px;
+ height: 110px;
+ border-radius: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-direction: column;
+ font-size: 16px;
+ color: #fff;
+ z-index: 2;
+}
+
+.m-box1 .chartbox .txt .n {
+ font-size: 40px;
+ color: #ffd100;
+ font-family: DINCond-Bold;
+}
+
+.m-box1 .chart {
+ width: 100%;
+ height: 100%;
+ position: relative;
+ z-index: 3;
+}
+
/* .m-box1 .chart::before{
content: "";
display: block;
@@ -174,170 +232,221 @@
transform: translate(-50%,-50%);
pointer-events: none;
} */
-.ul-listb1{
- height: 270px;
- overflow-y: auto;
- overflow-x: hidden;
-}
-.ul-listb1::-webkit-scrollbar {/*婊氬姩鏉℃暣浣撴牱寮�*/
- width: 6px; /*楂樺鍒嗗埆瀵瑰簲妯珫婊氬姩鏉＄殑灏哄*/
- height: 1px;
+.ul-listb1 {
+ height: 270px;
+ overflow-y: auto;
+ overflow-x: hidden;
}
-.ul-listb1::-webkit-scrollbar-thumb {/*婊氬姩鏉￠噷闈㈠皬鏂瑰潡*/
- border-radius: 6px;
- background: #00ccff;
+.ul-listb1::-webkit-scrollbar { /*婊氬姩鏉℃暣浣撴牱寮�*/
+ width: 6px; /*楂樺鍒嗗埆瀵瑰簲妯珫婊氬姩鏉＄殑灏哄*/
+ height: 1px;
}
-.ul-listb1::-webkit-scrollbar-track {/*婊氬姩鏉￠噷闈㈣建閬�*/
- border-radius: 6px;
- background: rgba(0, 204, 255,.1);
-}
-.ul-listb1 .con{
- display: flex;
- align-items: center;
- overflow: hidden;
- height: 38px;
- margin-bottom: 1px;
- padding: 0 20px;
-}
-.ul-listb1 .dot{
- width: 7px;
- height: 7px;
- border-radius: 50%;
- margin-right: 10px;
- position: relative;
-}
-.ul-listb1 .dot::before{
- content: "";
- display: block;
- width: 13px;
- height: 13px;
- border-radius: 50%;
- position: absolute;
- top: 50%;
- left: 50%;
- margin-top: -7px;
- margin-left: -7px;
- background-color: inherit;
- opacity: .5;
-}
-.ul-listb1 .num{
- font-size: 22px;
- font-family: DINCond-Bold;
-}
-.ul-listb1 .type{
- flex:1;
- text-align: right;
- text-overflow: ellipsis;
- white-space: nowrap;
- overflow: hidden;
- font-size: 14px;
- color: #fff;
-}
-.m-box2 .top{
- display: flex;
- align-items: center;
- justify-content: space-between;
-}
-.m-box2 .tit{
- font-size: 18px;
- color: #fff;
- padding-left: 25px;
- background: url(../img/web/group/c-i1.png) no-repeat left center;
- background-size: 17px;
-}
-.m-box2 .num{
- font-size: 20px;
- color: #ffd12b;
- font-family: DINCond-Bold;
-}
-.m-box2 .chart{
- height: 540px;
-}
-.m-nav{
- height: 820px;
- overflow-y: auto;
- overflow-x: hidden;
- /* padding: 0 10px 0 37px; */
- padding-right: 15px;
- padding-left: 20px;
-}
-.m-nav::-webkit-scrollbar {/*婊氬姩鏉℃暣浣撴牱寮�*/
- width: 6px; /*楂樺鍒嗗埆瀵瑰簲妯珫婊氬姩鏉＄殑灏哄*/
- height: 1px;
+.ul-listb1::-webkit-scrollbar-thumb { /*婊氬姩鏉￠噷闈㈠皬鏂瑰潡*/
+ border-radius: 6px;
+ background: #00ccff;
}
-.m-nav::-webkit-scrollbar-thumb {/*婊氬姩鏉￠噷闈㈠皬鏂瑰潡*/
- border-radius: 6px;
- background: #00ccff;
+.ul-listb1::-webkit-scrollbar-track { /*婊氬姩鏉￠噷闈㈣建閬�*/
+ border-radius: 6px;
+ background: rgba(0, 204, 255, .1);
}
-.m-nav::-webkit-scrollbar-track {/*婊氬姩鏉￠噷闈㈣建閬�*/
- border-radius: 6px;
- background: rgba(0, 204, 255,.1);
+.ul-listb1 .con {
+ display: flex;
+ align-items: center;
+ overflow: hidden;
+ height: 38px;
+ margin-bottom: 1px;
+ padding: 0 20px;
}
-.m-nav .tit{
- display: flex;
- align-items: center;
- padding-left: 16px;
+
+.ul-listb1 .dot {
+ width: 7px;
+ height: 7px;
+ border-radius: 50%;
+ margin-right: 10px;
+ position: relative;
}
-.m-nav .arr{
- width: 24px;
- height: 20px;
- background: url(../img/web/group/c-i3.png) no-repeat center;
- background-size: contain;
+
+.ul-listb1 .dot::before {
+ content: "";
+ display: block;
+ width: 13px;
+ height: 13px;
+ border-radius: 50%;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ margin-top: -7px;
+ margin-left: -7px;
+ background-color: inherit;
+ opacity: .5;
}
-.m-nav .icon{
- width: 50px;
- height: 50px;
- background: url(../img/web/group/c-i2.png) no-repeat center;
- background-size: contain;
- flex-shrink: 0;
+
+.ul-listb1 .num {
+ font-size: 22px;
+ font-family: DINCond-Bold;
}
-.m-nav .v1{
- display: flex;
- align-items: center;
- font-size: 18px;
- color: #fff;
+
+.ul-listb1 .type {
+ flex: 1;
+ text-align: right;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ overflow: hidden;
+ font-size: 14px;
+ color: #fff;
}
+
+.m-box2 .top {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+
+.m-box2 .tit {
+ font-size: 18px;
+ color: #fff;
+ padding-left: 25px;
+ background: url(../img/web/group/c-i1.png) no-repeat left center;
+ background-size: 17px;
+}
+
+.m-box2 .num {
+ font-size: 20px;
+ color: #ffd12b;
+ font-family: DINCond-Bold;
+}
+
+.m-box2 .chart {
+ height: 540px;
+}
+
+.m-box3 {
+ margin-bottom: 30px;
+}
+
+.m-box3 .top {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+
+.m-box3 .tit {
+ font-size: 18px;
+ color: #fff;
+ padding-left: 25px;
+ background: url(../img/web/group/c-i1.png) no-repeat left center;
+ background-size: 17px;
+}
+
+.m-box3 .num {
+ font-size: 20px;
+ color: #ffd12b;
+ font-family: DINCond-Bold;
+}
+
+.m-box3 .chart {
+ height: 100px;
+}
+
+.m-nav {
+ height: 820px;
+ overflow-y: auto;
+ overflow-x: hidden;
+ /* padding: 0 10px 0 37px; */
+ padding-right: 15px;
+ padding-left: 20px;
+}
+
+.m-nav::-webkit-scrollbar { /*婊氬姩鏉℃暣浣撴牱寮�*/
+ width: 6px; /*楂樺鍒嗗埆瀵瑰簲妯珫婊氬姩鏉＄殑灏哄*/
+ height: 1px;
+}
+
+.m-nav::-webkit-scrollbar-thumb { /*婊氬姩鏉￠噷闈㈠皬鏂瑰潡*/
+ border-radius: 6px;
+ background: #00ccff;
+}
+
+.m-nav::-webkit-scrollbar-track { /*婊氬姩鏉￠噷闈㈣建閬�*/
+ border-radius: 6px;
+ background: rgba(0, 204, 255, .1);
+}
+
+.m-nav .tit {
+ display: flex;
+ align-items: center;
+ padding-left: 16px;
+}
+
+.m-nav .arr {
+ width: 24px;
+ height: 20px;
+ background: url(../img/web/group/c-i3.png) no-repeat center;
+ background-size: contain;
+}
+
+.m-nav .icon {
+ width: 50px;
+ height: 50px;
+ background: url(../img/web/group/c-i2.png) no-repeat center;
+ background-size: contain;
+ flex-shrink: 0;
+}
+
+.m-nav .v1 {
+ display: flex;
+ align-items: center;
+ font-size: 18px;
+ color: #fff;
+}
+
/* .m-nav .two,
.m-nav .three{
padding-left: 30px;
} */
-.m-nav .three{
- padding: 19px 0 10px;
-}
-.m-nav .three >.tit{
- padding-left: 102px;
- padding-right: 14px;
- margin-bottom: 17px;
-}
-.m-nav .two >.con >.tit{
- padding-left: 55px;
-}
-.m-nav .three{
- background-color: rgba(6, 133, 255,.1);
-}
-.m-nav .three .icon{
- width: 16px;
- height: 16px;
- background-image: url(../img/web/group/c-i4.png);
- margin: 4px 8px 0 0;
-}
-.m-nav .three .v1{
- align-items: flex-start;
-}
-.m-nav .sub{
- display: none;
+.m-nav .three {
+ padding: 19px 0 10px;
}
-.c-cen{
- position: absolute;
- top: 10px;
- /*left: 540px;*/
- /*right: 420px;*/
- display: flex;
- align-items: center;
- bottom: 10px;
+.m-nav .three > .tit {
+ padding-left: 102px;
+ padding-right: 14px;
+ margin-bottom: 17px;
+}
+
+.m-nav .two > .con > .tit {
+ padding-left: 55px;
+}
+
+.m-nav .three {
+ background-color: rgba(6, 133, 255, .1);
+}
+
+.m-nav .three .icon {
+ width: 16px;
+ height: 16px;
+ background-image: url(../img/web/group/c-i4.png);
+ margin: 4px 8px 0 0;
+}
+
+.m-nav .three .v1 {
+ align-items: flex-start;
+}
+
+.m-nav .sub {
+ display: none;
+}
+
+.c-cen {
+ position: absolute;
+ top: 10px;
+ /*left: 540px;*/
+ /*right: 420px;*/
+ display: flex;
+ align-items: center;
+ bottom: 10px;
}
\ No newline at end of file
diff --git a/fzzy-igdss-web/src/main/resources/static/group/gis_modeling.js b/fzzy-igdss-web/src/main/resources/static/group/gis_modeling.js
index d7fec1d..80ed304 100644
--- a/fzzy-igdss-web/src/main/resources/static/group/gis_modeling.js
+++ b/fzzy-igdss-web/src/main/resources/static/group/gis_modeling.js
@@ -1,9 +1,5 @@
var colors = {};
var map;
-var disProvince;//琛屾斂鍖洪鑹叉覆鏌�
-var deptListMap = {};
-var allAreaMap = {};
-var markers = [];//鐐规爣璁�
var type = "0";
var county = "all";
var breedChart = null;
@@ -19,24 +15,12 @@
const data = event.data;
if (data && data.type === "CLICK_BUILDING") {
- alert(`鐐瑰嚮浜嗕粨搴� ${data.data.uid}`);
+ // alert(`鐐瑰嚮浜嗕粨搴� ${data.data.uid}`);
+ renderDepotMess(data.data.uid);
}
});
$(function () {
- //鎵�鏈夊簱鍖�
- if (deptList) {
- for (var i = 0; i < deptList.length; i++) {
- deptListMap[deptList[i].deptId] = deptList[i];
- }
- }
- //鎵�鏈夌渷甯�
- if (allArea) {
- for (var i = 0; i < allArea.length; i++) {
- allAreaMap[allArea[i].code] = allArea[i];
- }
- }
-
//鍒濆鍖栨椂闂�
initTime();
initDicSlogan();
@@ -91,10 +75,91 @@
});
// 鍒濆鍖朩ebSocket
- initWS(companyId, bizType, bizTag, userId);
+ // initWS(companyId, bizType, bizTag, userId);
+
+ renderDeptMess(defaultDeptId);
});
-// socket淇℃伅杩斿洖铏曠悊
+function renderDeptMess(deptId) {
+ //浠巇eptList涓壘鍒癲eptid
+ console.log("鍒囨崲搴撳尯deptid")
+ console.log(deptId)
+ console.log(deptList)
+ for (let i = 0; i < deptList.length; i++) {
+ if( deptId == deptList[i].deptId){
+ let htmlMess=`
+ <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 >${deptList[i].county}</span>
+ </div>
+ <div class="panel-content">
+ <h2 class="right-topInfo-kd-h" >${deptList[i].deptName}</h2>
+ <div class="right-topInfo-kd">
+ <div class="right-topInfo-kd-item">
+ <h3>褰撴棩鍏ュ簱鍗曟暟锛堜釜锛�</h3>
+ <p >${deptList[i].inNum}</p>
+ </div>
+ <div class="right-topInfo-kd-item">
+ <h3>褰撴棩鍑哄簱鍗曟暟锛堜釜锛�</h3>
+ <p >${deptList[i].outNum}</p>
+ </div>
+ </div>
+ <ul class="right-topInfo-kd-list right-topInfo-jg">
+ <li>
+ <p >${deptList[i].depotNumber}</p>
+ <h3>浠撳簱鏁帮紙涓級</h3>
+ </li>
+ <li>
+ <p >${deptList[i].depotBankNumber}</p>
+ <h3>璐ㄦ娂浠撴暟锛堜釜锛�</h3>
+ </li>
+ <li>
+ <p >${deptList[i].storageNum}</p>
+ <h3>搴撳瓨鏁帮紙鍚級</h3>
+ </li>
+ </ul>
+ </div>`;
+ $("#areaInformation").html(htmlMess);
+ }
+ }
+}
+
+
+function renderDepotMess(depotId) {
+ console.log("鍒囨崲浠撳簱depotId")
+ console.log(depotId)
+ console.log(depotList)
+ for (let i = 0; i < depotList.length; i++) {
+ if( depotId == depotList[i].depotId){
+
+ let htmlMess=`
+ <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>${depotList[i].county}</span>
+ </div>
+ <div class="panel-content">
+ <h2 class="right-topInfo-kd-h">${depotList[i].deptName}</h2>
+ <div class="modeling-left-topInfo-kd">
+ <div class="modeling-left-topInfo-ck">
+ <h1>${depotList[i].depotName}</h1>
+ </div>
+ </div>
+ <ul class="modeling-left-topInfo-kd-list right-topInfo-jg">
+ <li>
+ <p>${depotList[i].storageNum}</p>
+ <h3>搴撳瓨鏁帮紙鍚級</h3>
+ </li>
+ </ul>
+ </div>
+ `;
+ $("#areaInformation").html(htmlMess);
+ }
+ }
+
+}
+
function socketOnMessage(pocket) {
//console.log(pocket);
if (pocket.bizId == "slogan") {
@@ -141,98 +206,8 @@
}
// 鏂规浜岋細鐩存帴淇敼src锛堜細閲嶆柊鍔犺浇椤甸潰锛�
// iframe.src = `http://172.67.157.132:5000?uid=${uid}`;
-}
-
-/**
- * 鑾峰彇甯傚窞涓嬪簱鍖轰俊鎭�
- */
-function getDeptArea(province, city, county) {
- var list = [];
- if (deptList) {
- //鐪�
- if (province && province.length > 0) {
- var str1 = province.substring(0, 2);
- for (var i = 0; i < deptList.length; i++) {
- if (deptList[i].code.startsWith(str1)) {
- list.push(deptList[i]);
- }
- }
- }
- //甯傚窞
- if (city && city.length > 0) {
- var str2 = city.substring(0, 4);
- for (var i = 0; i < deptList.length; i++) {
- if (deptList[i].code.startsWith(str2)) {
- list.push(deptList[i]);
- }
- }
- }
- //鍖哄幙
- if (county && county.length > 0) {
- for (var i = 0; i < deptList.length; i++) {
- if (deptList[i].code === county) {
- list.push(deptList[i]);
- }
- }
- }
- }
-
- return list;
-}
-
-/**
- * 鐢ㄦ埛鐐瑰嚮鍩庡競鎴栬�呭幙绾у尯绾ф覆鏌撳簱鍖虹偣浣�
- */
-function renderAreas(code) {
- var d = allAreaMap[code];
- if (d) {
- closeInfoWindow();
- removeColor();
- delMarker();
- renderColor(code);
- var a = [];
- //鐪�
- if ("1" == d.type) {
- a = getDeptArea(code, "", "");
- }
- //甯傚窞
- if ("2" == d.type) {
- a = getDeptArea("", code, "")
- }
- //鍖哄幙
- if ("3" == d.type) {
- a = getDeptArea("", "", code)
- }
- if (a && a.length > 0) {
- for (var i = 0; i < a.length; i++) {
- addMarker(a[i], false);
- }
- }
- //鍒锋柊鏁版嵁
- county = code;
- // ajaxFoodNum();
- } else {
- console.log("娌℃湁鑾峰彇鍒拌琛屾斂鍖哄垝:" + code);
- }
-}
-
-/**
- * 娓叉煋搴撳尯淇℃伅寮圭獥
- * @param deptAreaId
- */
-function showAreaInfo(deptAreaId) {
- var d = deptListMap[deptAreaId];
- if (d) {
- closeInfoWindow();
- removeColor();
- delMarker();
- //map.setCity(d.deptCounty);
- // map.setZoom(10);
- renderColor(d.deptCounty);
- addMarker(d, true);
- } else {
- console.log("娌℃湁鑾峰彇鍒拌搴撳尯:" + deptAreaId);
- }
+ //鍒囨崲搴撳尯鐨勫簱鐐逛俊鎭�
+ renderDeptMess(deptid);
}
/**
@@ -254,7 +229,7 @@
(areaList[i].name ? areaList[i].name : "") +
"</a>" +
"</div>";
- if (areaList[i].children && areaList[i].children.length > 0) { //璐ㄦ娂閾惰
+ if (areaList[i].children && areaList[i].children.length > 0) {
childs = areaList[i].children;
for (var j = 0; j < childs.length; j++) {
html += "<ul class=\"sup-menu-ul menu-h\">" +
@@ -266,24 +241,21 @@
(childs[j].name ? childs[j].name : "") +
"</a>" +
"</div>";
- if (childs[j].children && childs[j].children.length > 0) { //甯傚窞
+ if (childs[j].children && childs[j].children.length > 0) {
childsItem = childs[j].children;
- for (var j = 0; j < childsItem.length; j++) {
- html += "<ul class=\"sup-menu-ul menu-h\">" +
- "<li>" +
- "<div class=\"sup-menu-h\">" +
- "<i class=\"i-icon fl\"><img src=\"/img/web/group/icon-sj.png\"/></i>" +
- "<a href=\"###\" onclick=\"clickDept('" + childsItem[j].code + "')\">" +
- "<span class=\"i-icon32 fl\"><img src=\"/img/web/group/c-i2.png\"/></span>" +
- (childsItem[j].name ? childsItem[j].name : "") +
- "</a>" +
+ for (var k = 0; k < childsItem.length; k++) {
+ html += "<div class=\"sup-menu-box\">" +
+ "<p>" +
+ "<span class=\"i-icon32 fl\"><img src=\"/img/web/group/icon-kuqu.png\"/></span>" +
+ "<a href=\"#\" onclick=\"clickDept('" + childsItem[k].code + "')\">" + childsItem[k].name + "</a>" +
+ "</p>" +
"</div>";
- html += "</li></ul>";
}
}
+ html += "</li>" +
+ "</ul>";
}
}
-
html += "</div>" +
"</div>";
}
@@ -291,6 +263,7 @@
$("#menuDiv").html(html);
}
}
+
function renderNum() {
$("#foodSum").html(gisData.deptNum);
@@ -317,7 +290,7 @@
varietyChart.chart.setOption(varietyChart.option, true);
breedChart = varietyChart;
}
- barChartLoad("ss");
+ modelingBarChartLoad("ss");
}
@@ -342,164 +315,6 @@
-/**
- *
- *澧炲姞搴撳尯鐐逛綅
- * tag 鏄惁鐩存帴鏄剧ず淇℃伅寮圭獥
- */
-function addMarker(deptArea, tag) {
- if (deptArea) {
- var markerContent = " <div class=\"right-map-item right-map-item2\"style=' left: 0px !important; top: 0px !important;'>" +
- // " <p>澶╁簻鏂板尯</p>" +
- " <span class=\"map-round\"></span>" +
- " </div>";
- var position = [deptArea.jd, deptArea.wd];
- var marker = new AMap.Marker({
- position: position,
- // 灏� html 浼犵粰 content
- content: markerContent,
- // 浠� icon 鐨� [center bottom] 涓哄師鐐�
- // achor:'center',
- offset: new AMap.Pixel(-25, -25)
-
- });
- markers.push(marker);
- // 灏� markers 娣诲姞鍒板湴鍥�
- map.add(marker);
-
- var infoWinodw = new AMap.InfoWindow({
- isCustom: true, //浣跨敤鑷畾涔夌獥浣�
- content: createInfoWindow(deptArea),
- achor: 'bottom-center',
- offset: new AMap.Pixel(0, 0)
- });
- //榧犳爣鐐瑰嚮marker寮瑰嚭鑷畾涔夌殑淇℃伅绐椾綋
- marker.on('click', function () {
- infoWinodw.open(map, marker.getPosition());
- });
- if (tag) {
- infoWinodw.open(map, marker.getPosition());
- }
- } else {
- console.log("搴撳尯涓虹┖");
- }
-}
-
-/**
- *
- *鍒犻櫎搴撳尯鐐逛綅
- */
-function delMarker() {
- if (map) {
- map.remove(markers);
- }
-}
-
-//鍏抽棴淇℃伅绐椾綋
-function closeInfoWindow() {
- if (map) {
- map.clearInfoWindow();
- }
-}
-
-/**
- * 鍒涘缓淇℃伅绐楀彛
- */
-function createInfoWindow(deptArea) {
- var deptAreaId = deptArea.deptId;
- var content = "<div class=\"BMap_bubble_pop\" style=\"padding: 0px 8px; position: relative; top:0px !important;left:0px !important;cursor: default; border: 1px solid rgb(221, 221, 221); background-color: rgb(255, 255, 255); border-radius: 10px; left: 837px; top: -46px; width: 376px;\">" +
- "<div class=\"BMap_bubble_top\" style=\"height:31px\">" +
- "<div class=\"BMap_bubble_title\" style=\"line-height: 30px; overflow: hidden; height: 30px; white-space: nowrap; color: rgb(51, 51, 51); width: 376px;\">" +
- "</div>" +
- "<div class=\"BMap_bubble_buttons\" style=\"float:right;position:absolute;top:-2px;right:0px;height:30px;\">" +
- "<div style=\"cursor: pointer; display: none;\">" +
- "<div style=\"position:absolute;top:9px;width:10px;height:10px;-moz-user-select:none;cursor:pointer;z-index:10000;display:none\">脳</div>" +
- "</div>" +
- "<div style=\"cursor:pointer;width:32px;height:30px;color:#ccc\">" +
- "<div style=\"position:absolute;top:2px;right:12px;text-align:center;line-height:30px;-moz-user-select:none;cursor:pointer;z-index:10000;font-size:20px\">脳</div>" +
- "</div>" +
- "</div>" +
- "</div>" +
- "<div class=\"BMap_bubble_center\" style=\"z-index: 3; position: relative; height: 324px; width: 376px;\">" +
- "<div class=\"BMap_bubble_content\" style=\"font-size: 14px; line-height: 24px; position: absolute; top: 2px; color: rgb(85, 85, 85); width: 364px; height: 324px; overflow: auto;\">" +
- '<div style=\"height:100%;box-sizing:border-box;\">' +
- '<div style="height: 34px;">' +
- '<div style="width: 320px;float: left;">';
- if (deptArea.deptName.length > 17) {
- content += '<h3 style="margin:0 0 10px 0;line-height:24px;font-size:14px;color:#fff;">' + (deptArea.deptName ? deptArea.deptName : "娌℃湁鑾峰彇鍒板簱鍖轰俊鎭�") + '</h3>';
- } else {
- content += '<h3 style="margin:0 0 10px 0;line-height:24px;font-size:18px;color:#fff;">' + (deptArea.deptName ? deptArea.deptName : "娌℃湁鑾峰彇鍒板簱鍖轰俊鎭�") + '</h3>';
- }
- content += '</div>' +
- '<div style="width: 40px;float: left;">' +
- '<img style="height: 20px;" src="/img/web/group/icon_close.png" onclick="closeInfoWindow()"></img>' +
- '</div>' +
- '</div>' +
-
- '<p style="line-height:24px;font-size:12px;color:#fff;margin-right: 15px;"><img src="/img/web/group/icon-address.png" alt="" style="float:left;width: 16px;height: 16px;margin-right:3px;margin-top: 5px;"/>' + (deptArea.county ? deptArea.county : "娌℃湁鑾峰彇鍒板簱鍖轰俊鎭�") + '</P>' +
- '<div class="right-topInfo-kd " style="height: 80px;width: 270px;margin: 5px auto 10px auto;">' +
- '<div class="right-topInfo-kd-item">' +
- '<h3>褰撴棩鍏ュ簱鍗曟暟(涓�)</h3>' +
- '<p>' + (deptArea.inNum) + '</p>' +
- '</div>' +
- '<div class="right-topInfo-kd-item">' +
- '<h3>褰撴棩鍑哄簱鍗曟暟(涓�)</h3>' +
- '<p>' + (deptArea.outNum) + '</p>' +
- '</div>' +
- '</div>' +
- '<ul class="right-topInfo-kd-list right-topInfo-jg sup-topInfo-list">' +
- '<li>';
- if (deptArea.depotNumber && (deptArea.depotNumber + "").length > 4) {
- content += '<p style="font-size: 22px">' + (deptArea.depotNumber) + '</p>';
- } else {
- content += '<p style="font-size: 22px">' + (deptArea.depotNumber) + '</p>';
-
- }
- content += '<h3>浠撳簱鏁�(涓�)</h3>' +
- '</li>' +
- '<li>';
- if (deptArea.depotBankNumber && (deptArea.depotBankNumber + "").length > 4) {
- content += '<p style="font-size: 22px">' + (deptArea.depotBankNumber) + '</p>';
- } else {
- content += '<p style="font-size: 22px">' + (deptArea.depotBankNumber) + '</p>';
- }
- content += '<h3>璐ㄦ娂浠撴暟(涓�)</h3>' +
- '</li>' +
- '<li>' +
- '<p style="font-size: 22px" >' + (deptArea.storageNum) + '</p>' +
- '<h3>搴撳瓨鏁帮紙鍚級</h3>' +
- '</li>' +
- '</ul>' +
- '<a href="javaScript:;" onclick="toHomeDetail(\'' + deptAreaId + '\')" class="sup-deatil-link"><img src="/img/web/group/spu-detail-btn.png" alt="" style="width:100%;height:100%;"/></a>' +
- '</div>' +
- "</div></div><div class=\"BMap_bubble_bottom\" style=\"display: block; z-index: 2; position: absolute; width: 376px;\">" +
- "</div><img style=\"z-index: 1; position: absolute; width: 58px; height: 31px; left: 159px; bottom: -30px; top: 356px;\" src=\"http://webmap0.bdimg.com/image/api/iw_tail.png\"></div>";
-
- return content;
-}
-
-/**
- * 璋冪敤鐖惰妭鐐规柟娉曟墽琛岋紝榛樿閫�鍑哄叏灞忓苟杩涘叆鍚庡彴
- * @param id
- */
-function toHomeDetail(id) {
- var url = "/index?deptId=" + id;
- window.parent.open(url, "_self");
-};
-
-/**
- * 鏍规嵁琛屾斂缂栫爜娓叉煋棰滆壊锛屽競绾т細灏嗕笅闈㈡墍鏈夊尯娓叉煋锛屽尯绾у彧娓叉煋褰撳墠鍖�
- * @param adcode
- */
-function renderColor(adcode) {
- switch2AreaNode(adcode);
-}
-
-function removeColor() {
- // if (disProvince) {
- // disProvince.setMap(null);
- // }
-}
/**
* 鏍煎紡鍖栨棩鏈�
@@ -527,16 +342,6 @@
return fmt;
}
-/**
- *鑾峰彇褰撳墠鏄熸湡鍑�
- */
-function getWeekDate() {
- var now = new Date();
- var day = now.getDay();
- var weeks = new Array("鏄熸湡鏃�", "鏄熸湡涓�", "鏄熸湡浜�", "鏄熸湡涓�", "鏄熸湡鍥�", "鏄熸湡浜�", "鏄熸湡鍏�");
- var week = weeks[day];
- return week;
-}
/**
* 鏍煎紡鍖栨棩鏈�
diff --git a/fzzy-igdss-web/src/main/resources/templates/group/gis_modeling.html b/fzzy-igdss-web/src/main/resources/templates/group/gis_modeling.html
index 78953b3..c5a7264 100644
--- a/fzzy-igdss-web/src/main/resources/templates/group/gis_modeling.html
+++ b/fzzy-igdss-web/src/main/resources/templates/group/gis_modeling.html
@@ -90,12 +90,11 @@
<div class="c-cen">
<iframe
id="gisFrame"
- src="http://172.67.157.132:5000?uid=5372001001"
+ th:src="@{http://172.67.157.132:5000(uid=${defaultDeptId})}"
frameborder="0"
style=" width: 100%;height: 100vh;border: none;"
></iframe>
</div>
-
<div class="c-left">
<div class="o-btn">
<!-- <img src="../images/visual/c-btn1.png" alt="">-->
@@ -195,11 +194,33 @@
</ul>
</div>
</div>
- <div class="m-box2">
+ <div class="m-box3">
<div class="item">
<div class="bot">
<div class="chart" id="ss"></div>
</div>
+ </div>
+ </div>
+
+ <div class="modeling-left-topInfo-box2" id="areaInformation">
+ <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>涔岄瞾鏈ㄩ綈甯�</span>
+ </div>
+ <div class="panel-content">
+ <h2 class="right-topInfo-kd-h">搴撳尯1</h2>
+ <div class="modeling-left-topInfo-kd">
+ <div class="modeling-left-topInfo-ck">
+ <h1>涓�鍙蜂粨搴�</h1>
+ </div>
+ </div>
+ <ul class="modeling-left-topInfo-kd-list right-topInfo-jg">
+ <li>
+ <p>0</p>
+ <h3>搴撳瓨鏁帮紙鍚級</h3>
+ </li>
+ </ul>
</div>
</div>
</div>
@@ -222,7 +243,7 @@
<div class="tit">
<div class="arr"></div>
<a href="javascript:;" class="v1"><i class="icon"></i><span
- class="t">涔岄瞾鏈ㄩ綈甯�</span></a>
+ class="t">鏂扮枂寤鸿</span></a>
</div>
<div class="sub three">
<div class="tit">
@@ -239,7 +260,7 @@
<div class="tit">
<div class="arr"></div>
<a href="javascript:;" class="v1"><i class="icon"></i><span
- class="t">鍏嬫媺鐜涗緷甯�</span></a>
+ class="t">鏂扮枂鍐滆</span></a>
</div>
<div class="sub three">
<div class="tit">
@@ -256,7 +277,7 @@
<div class="tit">
<div class="arr"></div>
<a href="javascript:;" class="v1"><i class="icon"></i><span
- class="t">鍚愰瞾鐣競</span></a>
+ class="t">鏃犺川鎶奸摱琛�</span></a>
</div>
<div class="sub three">
<div class="tit">
@@ -280,33 +301,25 @@
</div>
<script th:inline="javascript">
- window._AMapSecurityConfig = {
- securityJsCode: '39051edca2c561cb80d8f49b4624ab17',
- }
var userId = [[${loginUser.loginName}]];
var companyId = [[${loginUser.companyId}]];
var deptId = [[${deptId}]];
var areaList = [[${areaList}]];
- var allArea = [[${allArea}]];
var deptList = [[${deptList}]];
+ var defaultDeptId = [[${defaultDeptId}]];
+ var depotList = [[${depotList}]];
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>
<!-- UI缁勪欢搴� 1.0 -->
-<script th:src="@{https://webapi.amap.com/ui/1.1/main.js?v=1.1.1}"
- src="//webapi.amap.com/ui/1.1/main.js?v=1.1.1"></script>
<script th:src="@{/js/jquery.min.js}"></script>
<script th:src="@{/js/plugins/echarts/echarts.js}"></script>
<script th:src="@{/common/constant.js}"></script>
<script th:src="@{/common/igds-common.js}"></script>
<script th:src="@{/group/gis_modeling.js}"></script>
-<script th:src="@{/group/gis-map.js}"></script>
<script th:src="@{/group/gis-chart.js}"></script>
</body>
--
Gitblit v1.9.3