From a96e7a6704cb34ece8835066ff9f069014062e3d Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 30 三月 2021 21:32:36 +0800
Subject: [PATCH] 文件合并方法
---
public/static/SolidWaste.json | 176 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 110 insertions(+), 66 deletions(-)
diff --git a/public/static/SolidWaste.json b/public/static/SolidWaste.json
index 3a16382..132f6bf 100644
--- a/public/static/SolidWaste.json
+++ b/public/static/SolidWaste.json
@@ -1,81 +1,125 @@
{
"Result": {
"IsSuccess": 1,
- "code": 1,
"ErrorMsg": "",
"DataInfo": [
{
- "StoragePlaceId": 124.0,
- "StoragePlaceName": "鑱氶啔閮ㄥ嵄闄╁簾鐗╂殏瀛樼偣",
- "HazaWasteStorageDate": "0001-01-01T00:00:00",
- "HazaWasteCatgrName": null,
- "SurplusQuantityWarning": 0,
- "LongDayWarning": 0,
- "DesignFloorArea": 95.0,
- "HazaWasteName": null,
- "EstimateFloorArea": 0.0,
- "HazaWasteDeptName": null,
- "SurplusFloorArea": 95.0,
- "HazaWasteStorageDays": 0.0,
- "StorageQty": 0.0,
- "HazaWasteStorageQty": 0.0,
- "positionX": 32.22118377685547,
- "positionY": 118.78057479858398
+ "StoragePlaceId": 0,
+ "Name": "宸撮櫟鐭冲寲 鍙栨按鍗曞厓骞叉偿鏆傚瓨搴�",
+ "StorageQtyMax": 0,
+ "Longitude": 113.38361,
+ "Latitude": 29.9008,
+ "SortNum": 0,
+ "DesignFloorArea": 0,
+ "VideoCoding": null,
+ "VideoURL": null,
+ "DaysAlarm": 0,
+ "MarginAlarm": 0
},
{
- "StoragePlaceId": 123.0,
- "StoragePlaceName": "鍖栧伐閮ㄥ嵄闄╁簾鐗╂殏瀛樼偣",
- "HazaWasteStorageDate": "0001-01-01T00:00:00",
- "HazaWasteCatgrName": null,
- "SurplusQuantityWarning": 0,
- "LongDayWarning": 0,
- "DesignFloorArea": 260.0,
- "HazaWasteName": null,
- "EstimateFloorArea": 0.0,
- "HazaWasteDeptName": null,
- "SurplusFloorArea": 260.0,
- "HazaWasteStorageDays": 0.0,
- "StorageQty": 0.0,
- "HazaWasteStorageQty": 0.0,
- "positionX": 32.23122596740723,
- "positionY": 118.7743091583252
+ "StoragePlaceId": 1,
+ "Name": "宸撮櫟鐭冲寲 鍚夊婀栫伆濉�",
+ "StorageQtyMax": 0,
+ "Longitude": 113.14089,
+ "Latitude": 29.4181,
+ "SortNum": 0,
+ "DesignFloorArea": 0,
+ "VideoCoding": null,
+ "VideoURL": null,
+ "DaysAlarm": 0,
+ "MarginAlarm": 0
},
{
- "StoragePlaceId": 127.0,
- "StoragePlaceName": "鐐兼补閮ㄥ嵄闄╁簾鐗╂殏瀛樼偣",
- "HazaWasteStorageDate": "0001-01-01T00:00:00",
- "HazaWasteCatgrName": null,
- "SurplusQuantityWarning": 0,
- "LongDayWarning": 0,
- "DesignFloorArea": 351.0,
- "HazaWasteName": null,
- "EstimateFloorArea": 0.0,
- "HazaWasteDeptName": null,
- "SurplusFloorArea": 351.0,
- "HazaWasteStorageDays": 0.0,
- "StorageQty": 0.0,
- "HazaWasteStorageQty": 0.0,
- "positionX": 32.222299575805664,
- "positionY": 118.74950408935547
+ "StoragePlaceId": 2,
+ "Name": "闀垮箔鐐煎寲 鍏瓧闂ㄥ瀮鍦惧～鍩嬪満",
+ "StorageQtyMax": 0,
+ "Longitude": 113.3916666667,
+ "Latitude": 29.6394444444,
+ "SortNum": 0,
+ "DesignFloorArea": 0,
+ "VideoCoding": null,
+ "VideoURL": null,
+ "DaysAlarm": 0,
+ "MarginAlarm": 0
},
{
- "StoragePlaceId": 126.0,
- "StoragePlaceName": "鐑儍閮ㄥ嵄闄╁簾鐗╂殏瀛樼偣",
- "HazaWasteStorageDate": "0001-01-01T00:00:00",
- "HazaWasteCatgrName": null,
- "SurplusQuantityWarning": 0,
- "LongDayWarning": 1.0,
- "DesignFloorArea": 54.0,
- "HazaWasteName": null,
- "EstimateFloorArea": 0.0,
- "HazaWasteDeptName": null,
- "SurplusFloorArea": 54.0,
- "HazaWasteStorageDays": 0.0,
- "StorageQty": 1.0,
- "HazaWasteStorageQty": 0.0,
- "positionX": 32.23092555999756,
- "positionY": 118.75735759735107
+ "StoragePlaceId": 3,
+ "Name": "涓煩鐭冲寲 鐏版福鍦�",
+ "StorageQtyMax": 0,
+ "Longitude": 114.5192083333,
+ "Latitude": 30.6201666667,
+ "SortNum": 0,
+ "DesignFloorArea": 0,
+ "VideoCoding": null,
+ "VideoURL": null,
+ "DaysAlarm": 0,
+ "MarginAlarm": 0
+ },
+ {
+ "StoragePlaceId": 4,
+ "Name": "瀹夊簡鐭冲寲 灞卞彛搴熸福濉煁鍦�",
+ "StorageQtyMax": 0,
+ "Longitude": 116.960599,
+ "Latitude": 30.541509,
+ "SortNum": 0,
+ "DesignFloorArea": 0,
+ "VideoCoding": null,
+ "VideoURL": null,
+ "DaysAlarm": 0,
+ "MarginAlarm": 0
+ },
+ {
+ "StoragePlaceId": 5,
+ "Name": "瀹夊簡鐭冲寲 鐑數闄堝鍐茬伆鍦�",
+ "StorageQtyMax": 0,
+ "Longitude": 116.986949,
+ "Latitude": 30.534486,
+ "SortNum": 0,
+ "DesignFloorArea": 0,
+ "VideoCoding": null,
+ "VideoURL": null,
+ "DaysAlarm": 0,
+ "MarginAlarm": 0
+ },
+ {
+ "StoragePlaceId": 6,
+ "Name": "楂樻ˉ鐭冲寲 娴锋花鐮佸ご闄勮繎婊╂秱",
+ "StorageQtyMax": 0,
+ "Longitude": 121.55,
+ "Latitude": 31.63,
+ "SortNum": 0,
+ "DesignFloorArea": 0,
+ "VideoCoding": null,
+ "VideoURL": null,
+ "DaysAlarm": 0,
+ "MarginAlarm": 0
+ },
+ {
+ "StoragePlaceId": 7,
+ "Name": "宸濈淮鍖栧伐 鐢熷寲姹℃偿鏂欎粨",
+ "StorageQtyMax": 0,
+ "Longitude": 107.02342004,
+ "Latitude": 29.79235333,
+ "SortNum": 0,
+ "DesignFloorArea": 0,
+ "VideoCoding": null,
+ "VideoURL": null,
+ "DaysAlarm": 0,
+ "MarginAlarm": 0
+ },
+ {
+ "StoragePlaceId": 8,
+ "Name": "宸濈淮鍖栧伐 鎺掓偿姘存偿楗兼枡浠�",
+ "StorageQtyMax": 0,
+ "Longitude": 107.02315181,
+ "Latitude": 29.78832166,
+ "SortNum": 0,
+ "DesignFloorArea": 0,
+ "VideoCoding": null,
+ "VideoURL": null,
+ "DaysAlarm": 0,
+ "MarginAlarm": 0
}
]
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0