From 309d1f9d649daa08bb9b068af014749f6d4a5bce Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 14:00:45 +0800
Subject: [PATCH] 设备和监控点父页面 筛选条件不予 编辑页面联动

---
 package.json |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 5cee727..0ca5c08 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,6 @@
   },
   "license": "MIT",
   "scripts": {
-    "precommit": "npm run lint-staged",
     "ng": "ng",
     "start": "ng serve --host=0.0.0.0",
     "serve:hmr": "ng serve -o --hmr -e=hmr",
@@ -55,9 +54,9 @@
     "angular-qq-maps": "^1.0.1",
     "angular-split": "^1.0.0-rc.0",
     "angular-tree-component": "^7.0.1",
-    "angular2-baidu-map": "^4.1.0",
+    "angular2-baidu-map": "^4.3.2",
     "core-js": "^2.5.1",
-    "echarts": "^3.8.5",
+    "echarts": "^4.0.4",
     "file-saver": "^1.3.3",
     "font-awesome": "^4.7.0",
     "jquery": "^3.3.1",
@@ -70,6 +69,7 @@
     "ng2-img-cropper": "^0.9.0",
     "ngx-color-picker": "^5.0.0",
     "ngx-countdown": "^2.0.0",
+    "ngx-echarts": "^2.0.2",
     "ngx-tinymce": "^1.0.1",
     "ngx-ueditor": "^1.1.0",
     "rxjs": "^5.5.5",

--
Gitblit v1.8.0