From 71c663091d05b11c41f78d8e75cb8b3db63b9cbc Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期六, 29 五月 2021 16:26:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 public/assets/environmentRiskPoint.json |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/public/assets/environmentRiskPoint.json b/public/assets/environmentRiskPoint.json
index a8da368..7a65236 100644
--- a/public/assets/environmentRiskPoint.json
+++ b/public/assets/environmentRiskPoint.json
@@ -1,7 +1,7 @@
 [
   [
     {
-      "no": 1,
+      "no": 0,
       "company": "鎵瓙鐭冲寲",
       "plate": "鐐兼补鏉垮潡",
       "unitname": "鑺崇儍鍘傘�佺偧娌瑰巶",
@@ -10,10 +10,10 @@
       "after": "R4(115.48)M1(10)E1",
       "Longitude": 118.7936111111,
       "Latitude": 32.2583305556,
-      "iconType": 1
+      "riskLevel": 1
     },
     {
-      "no": 2,
+      "no": 0,
       "company": "鎵瓙鐭冲寲",
       "plate": "鍖栧伐鏉垮潡",
       "unitname": "姘村巶",
@@ -22,7 +22,7 @@
       "after": "R3(25)M1(10)E1",
       "Longitude": 118.8174111111,
       "Latitude": 32.2429611111,
-      "iconType": 1
+      "riskLevel": 1
     }
   ],[
       {
@@ -35,10 +35,10 @@
         "after": "R3(90)M2(25)E1",
         "Longitude": 113.36571,
         "Latitude": 29.54677,
-        "iconType": 2
+        "riskLevel": 2
       },
       {
-        "no": 2,
+        "no": 1,
         "company": "闀垮箔鐐煎寲",
         "plate": "鍖栧伐鏉垮潡",
         "unitname": "娓彛閮�",
@@ -47,11 +47,11 @@
         "after": "Q3(29)M3(30)E1",
         "Longitude": 113.2917,
         "Latitude": 29.60036,
-        "iconType": 2
+        "riskLevel": 2
       }
   ],[
       {
-        "no": 1,
+        "no": 2,
         "company": "闀垮箔鐐煎寲",
         "plate": "鍖栧伐鏉垮潡",
         "unitname": "娓彛閮�",
@@ -60,7 +60,7 @@
         "after": "Q3(19)M3(30)E1",
         "Longitude": 113.27935,
         "Latitude": 29.59832,
-        "iconType": 3
+        "riskLevel": 3
       },
       {
         "no": 2,
@@ -72,11 +72,11 @@
         "after": "R3(2.1)M3(30)E2",
         "Longitude": 113.28155,
         "Latitude": 29.59842,
-        "iconType": 3
+        "riskLevel": 3
       }
   ],[
       {
-        "no": 1,
+        "no": 3,
         "company": "涓煩鐭冲寲",
         "plate": "鐐兼补鏉垮潡",
         "unitname": "鐐兼补浜岄儴",
@@ -85,7 +85,7 @@
         "after": "R3M2E1",
         "Longitude": 114.44016,
         "Latitude": 30.65305,
-        "iconType": 4
+        "riskLevel": 4
       }
   ]
 ]

--
Gitblit v1.8.0