Merge remote-tracking branch 'origin/dev' into dev

package.json

@@ -5,7 +5,7 @@
   "author": "",
   "private": true,
   "scripts": {
-    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js  --host 192.168.0.45",
+    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js  --host 192.168.151.43",
     "start": "npm run dev",
     "unit": "jest --config test/unit/jest.conf.js --coverage",
     "e2e": "node test/e2e/runner.js",

src/views/map/components/fengongsi_index.vue

@@ -209,7 +209,7 @@ export default {
     getMeteorologicalinfo() {
       this.listLoading = true
       requestFN(
-        '/map/listbymeteorological',
+        '/map/listbymeteorologicalByCorpinfo',
         {
           CORPINFO_ID: this.corpInfoId,
           GANGKOU: this.gangkou