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

pull/11/head
liujun 2024-02-27 16:50:32 +08:00
commit 8c334a40cb
2 changed files with 2 additions and 2 deletions

View File

@ -5,7 +5,7 @@
"author": "", "author": "",
"private": true, "private": true,
"scripts": { "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", "start": "npm run dev",
"unit": "jest --config test/unit/jest.conf.js --coverage", "unit": "jest --config test/unit/jest.conf.js --coverage",
"e2e": "node test/e2e/runner.js", "e2e": "node test/e2e/runner.js",

View File

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