From e89c71a26d0e99970bd01a508c03d6e567aeff6a Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Mon, 06 Jul 2020 10:22:41 +0800
Subject: [PATCH] 国控图标

---
 src/main/webapp/img/ico06.png     |    0 
 src/main/webapp/img/ico08.png     |    0 
 src/main/webapp/img/ico05.png     |    0 
 src/main/webapp/js/newmoralmap.js |    9 +++++++++
 4 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/main/webapp/img/ico05.png b/src/main/webapp/img/ico05.png
new file mode 100644
index 0000000..6cd62d5
--- /dev/null
+++ b/src/main/webapp/img/ico05.png
Binary files differ
diff --git a/src/main/webapp/img/ico06.png b/src/main/webapp/img/ico06.png
new file mode 100644
index 0000000..c935127
--- /dev/null
+++ b/src/main/webapp/img/ico06.png
Binary files differ
diff --git a/src/main/webapp/img/ico08.png b/src/main/webapp/img/ico08.png
new file mode 100644
index 0000000..7659832
--- /dev/null
+++ b/src/main/webapp/img/ico08.png
Binary files differ
diff --git a/src/main/webapp/js/newmoralmap.js b/src/main/webapp/js/newmoralmap.js
index 7966162..1ce953b 100644
--- a/src/main/webapp/js/newmoralmap.js
+++ b/src/main/webapp/js/newmoralmap.js
@@ -648,6 +648,15 @@
     moralMap.MoralMarker = function (option) {
         var _option = option;
         var _pointObj = new BMap.Point(_option['longitude'], _option['latitude']);
+        if (_option["description"]=="���������"){
+            _option["state"]="5";
+        }
+        if (_option["description"]=="���������"){
+            _option["state"]="6";
+        }
+        if (_option["description"]=="���������"){
+            _option["state"]="8";
+        }
         var _iconObj = _getMapIcon(_option["state"]);
         this._point = _pointObj;
 

--
Gitblit v1.8.0