From 8b679c8269611f389929af0a8d87cafc30159183 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Thu, 21 Sep 2023 10:24:07 +0800
Subject: [PATCH] fix:政府站点修改
---
src/components/map/pickCoordinate1.vue | 159 +++---
src/components/map/pickCoordinate.vue | 84 ++-
package-lock.json | 644 +++++++++++++--------------
src/views/device/govMonitorPoint.vue | 440 +++++++-----------
4 files changed, 616 insertions(+), 711 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index df69bf0..dd433fc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,7 +1,7 @@
{
"name": "vue-alain",
"version": "0.2.0",
- "lockfileVersion": 2,
+ "lockfileVersion": 1,
"requires": true,
"packages": {
"": {
@@ -21618,7 +21618,7 @@
},
"@types/parse-json": {
"version": "4.0.0",
- "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
+ "resolved": "https://registry.npmmirror.com/@types/parse-json/-/parse-json-4.0.0.tgz",
"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
"dev": true,
"optional": true
@@ -22021,205 +22021,6 @@
"tslint": "^5.20.1",
"webpack": "^4.0.0",
"yorkie": "^2.0.0"
- },
- "dependencies": {
- "ansi-styles": {
- "version": "4.3.0",
- "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995778321&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
- "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
- "dev": true,
- "optional": true,
- "requires": {
- "color-convert": "^2.0.1"
- }
- },
- "chalk": {
- "version": "4.1.1",
- "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.1.tgz?cache=0&sync_timestamp=1618995355917&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.1.tgz",
- "integrity": "sha1-yAs/qyi/Y3HmhjMl7uZ+YYt35q0=",
- "dev": true,
- "optional": true,
- "requires": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- }
- },
- "color-convert": {
- "version": "2.0.1",
- "resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz",
- "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
- "dev": true,
- "optional": true,
- "requires": {
- "color-name": "~1.1.4"
- }
- },
- "color-name": {
- "version": "1.1.4",
- "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
- "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
- "dev": true,
- "optional": true
- },
- "cosmiconfig": {
- "version": "6.0.0",
- "resolved": "https://registry.npm.taobao.org/cosmiconfig/download/cosmiconfig-6.0.0.tgz",
- "integrity": "sha1-2k/uhTxS9rHmk19BwaL8UL1KmYI=",
- "dev": true,
- "optional": true,
- "requires": {
- "@types/parse-json": "^4.0.0",
- "import-fresh": "^3.1.0",
- "parse-json": "^5.0.0",
- "path-type": "^4.0.0",
- "yaml": "^1.7.2"
- }
- },
- "fork-ts-checker-webpack-plugin-v5": {
- "version": "npm:fork-ts-checker-webpack-plugin@5.2.1",
- "resolved": "https://registry.nlark.com/fork-ts-checker-webpack-plugin/download/fork-ts-checker-webpack-plugin-5.2.1.tgz?cache=0&sync_timestamp=1621373256935&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ffork-ts-checker-webpack-plugin%2Fdownload%2Ffork-ts-checker-webpack-plugin-5.2.1.tgz",
- "integrity": "sha1-eTJthpeXkG+osk4qvPlCH8gFRQ0=",
- "dev": true,
- "optional": true,
- "requires": {
- "@babel/code-frame": "^7.8.3",
- "@types/json-schema": "^7.0.5",
- "chalk": "^4.1.0",
- "cosmiconfig": "^6.0.0",
- "deepmerge": "^4.2.2",
- "fs-extra": "^9.0.0",
- "memfs": "^3.1.2",
- "minimatch": "^3.0.4",
- "schema-utils": "2.7.0",
- "semver": "^7.3.2",
- "tapable": "^1.0.0"
- }
- },
- "fs-extra": {
- "version": "9.1.0",
- "resolved": "https://registry.nlark.com/fs-extra/download/fs-extra-9.1.0.tgz",
- "integrity": "sha1-WVRGDHZKjaIJS6NVS/g55rmnyG0=",
- "dev": true,
- "optional": true,
- "requires": {
- "at-least-node": "^1.0.0",
- "graceful-fs": "^4.2.0",
- "jsonfile": "^6.0.1",
- "universalify": "^2.0.0"
- }
- },
- "has-flag": {
- "version": "4.0.0",
- "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1618847009337&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz",
- "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
- "dev": true,
- "optional": true
- },
- "import-fresh": {
- "version": "3.3.0",
- "resolved": "https://registry.nlark.com/import-fresh/download/import-fresh-3.3.0.tgz",
- "integrity": "sha1-NxYsJfy566oublPVtNiM4X2eDCs=",
- "dev": true,
- "optional": true,
- "requires": {
- "parent-module": "^1.0.0",
- "resolve-from": "^4.0.0"
- }
- },
- "jsonfile": {
- "version": "6.1.0",
- "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.1.0.tgz?cache=0&sync_timestamp=1604161917513&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-6.1.0.tgz",
- "integrity": "sha1-vFWyY0eTxnnsZAMJTrE2mKbsCq4=",
- "dev": true,
- "optional": true,
- "requires": {
- "graceful-fs": "^4.1.6",
- "universalify": "^2.0.0"
- }
- },
- "lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.nlark.com/lru-cache/download/lru-cache-6.0.0.tgz",
- "integrity": "sha1-bW/mVw69lqr5D8rR2vo7JWbbOpQ=",
- "dev": true,
- "optional": true,
- "requires": {
- "yallist": "^4.0.0"
- }
- },
- "parse-json": {
- "version": "5.2.0",
- "resolved": "https://registry.npm.taobao.org/parse-json/download/parse-json-5.2.0.tgz?cache=0&sync_timestamp=1610966646988&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fparse-json%2Fdownload%2Fparse-json-5.2.0.tgz",
- "integrity": "sha1-x2/Gbe5UIxyWKyK8yKcs8vmXU80=",
- "dev": true,
- "optional": true,
- "requires": {
- "@babel/code-frame": "^7.0.0",
- "error-ex": "^1.3.1",
- "json-parse-even-better-errors": "^2.3.0",
- "lines-and-columns": "^1.1.6"
- }
- },
- "path-type": {
- "version": "4.0.0",
- "resolved": "https://registry.nlark.com/path-type/download/path-type-4.0.0.tgz",
- "integrity": "sha1-hO0BwKe6OAr+CdkKjBgNzZ0DBDs=",
- "dev": true,
- "optional": true
- },
- "resolve-from": {
- "version": "4.0.0",
- "resolved": "https://registry.nlark.com/resolve-from/download/resolve-from-4.0.0.tgz",
- "integrity": "sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY=",
- "dev": true,
- "optional": true
- },
- "schema-utils": {
- "version": "2.7.0",
- "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-2.7.0.tgz",
- "integrity": "sha1-FxUfdtjq5n+793lgwzxnatn078c=",
- "dev": true,
- "optional": true,
- "requires": {
- "@types/json-schema": "^7.0.4",
- "ajv": "^6.12.2",
- "ajv-keywords": "^3.4.1"
- }
- },
- "semver": {
- "version": "7.3.5",
- "resolved": "https://registry.npm.taobao.org/semver/download/semver-7.3.5.tgz?cache=0&sync_timestamp=1616463603361&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-7.3.5.tgz",
- "integrity": "sha1-C2Ich5NI2JmOSw5L6Us/EuYBjvc=",
- "dev": true,
- "optional": true,
- "requires": {
- "lru-cache": "^6.0.0"
- }
- },
- "supports-color": {
- "version": "7.2.0",
- "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1618847145907&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
- "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
- "dev": true,
- "optional": true,
- "requires": {
- "has-flag": "^4.0.0"
- }
- },
- "universalify": {
- "version": "2.0.0",
- "resolved": "https://registry.nlark.com/universalify/download/universalify-2.0.0.tgz",
- "integrity": "sha1-daSYTv7cSwiXXFrrc/Uw0C3yVxc=",
- "dev": true,
- "optional": true
- },
- "yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npm.taobao.org/yallist/download/yallist-4.0.0.tgz",
- "integrity": "sha1-m7knkNnA7/7GO+c1GeEaNQGaOnI=",
- "dev": true,
- "optional": true
- }
}
},
"@vue/cli-plugin-unit-jest": {
@@ -22249,8 +22050,7 @@
"version": "4.5.13",
"resolved": "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.5.13.tgz",
"integrity": "sha512-I1S9wZC7iI0Wn8kw8Zh+A2Qkf6s1M6vTGBkx8boXjuzfwEEyEHRxadsVCecZc8Mkpydo0nykj+MyYF96TKFuVA==",
- "dev": true,
- "requires": {}
+ "dev": true
},
"@vue/cli-service": {
"version": "4.5.13",
@@ -22314,87 +22114,6 @@
"webpack-chain": "^6.4.0",
"webpack-dev-server": "^3.11.0",
"webpack-merge": "^4.2.2"
- },
- "dependencies": {
- "ansi-styles": {
- "version": "4.3.0",
- "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995778321&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
- "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
- "dev": true,
- "optional": true,
- "requires": {
- "color-convert": "^2.0.1"
- }
- },
- "chalk": {
- "version": "4.1.1",
- "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.1.tgz?cache=0&sync_timestamp=1618995355917&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.1.tgz",
- "integrity": "sha1-yAs/qyi/Y3HmhjMl7uZ+YYt35q0=",
- "dev": true,
- "optional": true,
- "requires": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- }
- },
- "color-convert": {
- "version": "2.0.1",
- "resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz",
- "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
- "dev": true,
- "optional": true,
- "requires": {
- "color-name": "~1.1.4"
- }
- },
- "color-name": {
- "version": "1.1.4",
- "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
- "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
- "dev": true,
- "optional": true
- },
- "has-flag": {
- "version": "4.0.0",
- "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1618847009337&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz",
- "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
- "dev": true,
- "optional": true
- },
- "loader-utils": {
- "version": "2.0.0",
- "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
- "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
- "dev": true,
- "optional": true,
- "requires": {
- "big.js": "^5.2.2",
- "emojis-list": "^3.0.0",
- "json5": "^2.1.2"
- }
- },
- "supports-color": {
- "version": "7.2.0",
- "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1622293579301&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
- "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
- "dev": true,
- "optional": true,
- "requires": {
- "has-flag": "^4.0.0"
- }
- },
- "vue-loader-v16": {
- "version": "npm:vue-loader@16.2.0",
- "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.2.0.tgz",
- "integrity": "sha1-BGpTMI3Ufljv4g3ewe3sAnzjtG4=",
- "dev": true,
- "optional": true,
- "requires": {
- "chalk": "^4.1.0",
- "hash-sum": "^2.0.0",
- "loader-utils": "^2.0.0"
- }
- }
}
},
"@vue/cli-shared-utils": {
@@ -22558,8 +22277,7 @@
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz",
"integrity": "sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ==",
- "dev": true,
- "requires": {}
+ "dev": true
},
"@vue/reactivity-transform": {
"version": "3.3.4",
@@ -22876,15 +22594,13 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
"integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
- "dev": true,
- "requires": {}
+ "dev": true
},
"ajv-keywords": {
"version": "3.5.2",
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
- "dev": true,
- "requires": {}
+ "dev": true
},
"alphanum-sort": {
"version": "1.0.2",
@@ -23156,7 +22872,7 @@
},
"at-least-node": {
"version": "1.0.0",
- "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+ "resolved": "https://registry.npmmirror.com/at-least-node/-/at-least-node-1.0.0.tgz",
"integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
"dev": true,
"optional": true
@@ -23265,8 +22981,7 @@
"version": "7.0.0-bridge.0",
"resolved": "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz",
"integrity": "sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==",
- "dev": true,
- "requires": {}
+ "dev": true
},
"babel-extract-comments": {
"version": "1.0.0",
@@ -25540,7 +25255,8 @@
"de-indent": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
- "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0="
+ "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=",
+ "dev": true
},
"deasync": {
"version": "0.1.21",
@@ -26032,8 +25748,7 @@
"echarts-liquidfill": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/echarts-liquidfill/-/echarts-liquidfill-2.0.6.tgz",
- "integrity": "sha512-p+AH0O9/BtwXMQQyhjJbMZo+GwRAgWG/DCyK5r27PQzpS0UWrgXu57MyEFc0A8Ub3sRuqEu08BuxwHICBkSWSQ==",
- "requires": {}
+ "integrity": "sha512-p+AH0O9/BtwXMQQyhjJbMZo+GwRAgWG/DCyK5r27PQzpS0UWrgXu57MyEFc0A8Ub3sRuqEu08BuxwHICBkSWSQ=="
},
"echarts-wordcloud": {
"version": "1.1.3",
@@ -27086,6 +26801,205 @@
}
}
},
+ "fork-ts-checker-webpack-plugin-v5": {
+ "version": "npm:fork-ts-checker-webpack-plugin@5.2.1",
+ "resolved": "https://registry.npmmirror.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.1.tgz",
+ "integrity": "sha512-SVi+ZAQOGbtAsUWrZvGzz38ga2YqjWvca1pXQFUArIVXqli0lLoDQ8uS0wg0kSpcwpZmaW5jVCZXQebkyUQSsw==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "@babel/code-frame": "^7.8.3",
+ "@types/json-schema": "^7.0.5",
+ "chalk": "^4.1.0",
+ "cosmiconfig": "^6.0.0",
+ "deepmerge": "^4.2.2",
+ "fs-extra": "^9.0.0",
+ "memfs": "^3.1.2",
+ "minimatch": "^3.0.4",
+ "schema-utils": "2.7.0",
+ "semver": "^7.3.2",
+ "tapable": "^1.0.0"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "4.1.2",
+ "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true,
+ "optional": true
+ },
+ "cosmiconfig": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmmirror.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
+ "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "@types/parse-json": "^4.0.0",
+ "import-fresh": "^3.1.0",
+ "parse-json": "^5.0.0",
+ "path-type": "^4.0.0",
+ "yaml": "^1.7.2"
+ }
+ },
+ "fs-extra": {
+ "version": "9.1.0",
+ "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-9.1.0.tgz",
+ "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "at-least-node": "^1.0.0",
+ "graceful-fs": "^4.2.0",
+ "jsonfile": "^6.0.1",
+ "universalify": "^2.0.0"
+ }
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true,
+ "optional": true
+ },
+ "import-fresh": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmmirror.com/import-fresh/-/import-fresh-3.3.0.tgz",
+ "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "parent-module": "^1.0.0",
+ "resolve-from": "^4.0.0"
+ }
+ },
+ "jsonfile": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-6.1.0.tgz",
+ "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "graceful-fs": "^4.1.6",
+ "universalify": "^2.0.0"
+ }
+ },
+ "lru-cache": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+ "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "yallist": "^4.0.0"
+ }
+ },
+ "parse-json": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmmirror.com/parse-json/-/parse-json-5.2.0.tgz",
+ "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "@babel/code-frame": "^7.0.0",
+ "error-ex": "^1.3.1",
+ "json-parse-even-better-errors": "^2.3.0",
+ "lines-and-columns": "^1.1.6"
+ }
+ },
+ "path-type": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmmirror.com/path-type/-/path-type-4.0.0.tgz",
+ "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+ "dev": true,
+ "optional": true
+ },
+ "resolve-from": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmmirror.com/resolve-from/-/resolve-from-4.0.0.tgz",
+ "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+ "dev": true,
+ "optional": true
+ },
+ "schema-utils": {
+ "version": "2.7.0",
+ "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-2.7.0.tgz",
+ "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "@types/json-schema": "^7.0.4",
+ "ajv": "^6.12.2",
+ "ajv-keywords": "^3.4.1"
+ }
+ },
+ "semver": {
+ "version": "7.5.4",
+ "resolved": "https://registry.npmmirror.com/semver/-/semver-7.5.4.tgz",
+ "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "lru-cache": "^6.0.0"
+ }
+ },
+ "supports-color": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ },
+ "universalify": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmmirror.com/universalify/-/universalify-2.0.0.tgz",
+ "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+ "dev": true,
+ "optional": true
+ },
+ "yallist": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+ "dev": true,
+ "optional": true
+ }
+ }
+ },
"form-data": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
@@ -27140,9 +27054,9 @@
}
},
"fs-monkey": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
- "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==",
+ "version": "1.0.4",
+ "resolved": "https://registry.npmmirror.com/fs-monkey/-/fs-monkey-1.0.4.tgz",
+ "integrity": "sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==",
"dev": true,
"optional": true
},
@@ -27492,7 +27406,8 @@
"he": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
- "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
+ "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+ "dev": true
},
"hex-color-regex": {
"version": "1.1.0",
@@ -28792,8 +28707,7 @@
"version": "7.4.6",
"resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
"integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
- "dev": true,
- "requires": {}
+ "dev": true
}
}
},
@@ -28943,8 +28857,7 @@
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
"integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
- "dev": true,
- "requires": {}
+ "dev": true
},
"jest-regex-util": {
"version": "24.9.0",
@@ -30192,13 +30105,13 @@
"dev": true
},
"memfs": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.2.2.tgz",
- "integrity": "sha512-RE0CwmIM3CEvpcdK3rZ19BC4E6hv9kADkMN5rPduRak58cNArWLi/9jFLsa4rhsjfVxMP3v0jO7FHXq7SvFY5Q==",
+ "version": "3.5.3",
+ "resolved": "https://registry.npmmirror.com/memfs/-/memfs-3.5.3.tgz",
+ "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
"dev": true,
"optional": true,
"requires": {
- "fs-monkey": "1.0.3"
+ "fs-monkey": "^1.0.4"
}
},
"memory-fs": {
@@ -31286,7 +31199,7 @@
},
"parent-module": {
"version": "1.0.1",
- "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+ "resolved": "https://registry.npmmirror.com/parent-module/-/parent-module-1.0.1.tgz",
"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
"dev": true,
"optional": true,
@@ -31296,7 +31209,7 @@
"dependencies": {
"callsites": {
"version": "3.1.0",
- "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+ "resolved": "https://registry.npmmirror.com/callsites/-/callsites-3.1.0.tgz",
"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
"dev": true,
"optional": true
@@ -33840,15 +33753,6 @@
"integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
"dev": true
},
- "string_decoder": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
- "dev": true,
- "requires": {
- "safe-buffer": "~5.1.0"
- }
- },
"string-convert": {
"version": "0.2.1",
"resolved": "https://registry.npm.taobao.org/string-convert/download/string-convert-0.2.1.tgz",
@@ -33926,6 +33830,15 @@
"requires": {
"call-bind": "^1.0.2",
"define-properties": "^1.1.3"
+ }
+ },
+ "string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "requires": {
+ "safe-buffer": "~5.1.0"
}
},
"stringify-object": {
@@ -34953,8 +34866,7 @@
"vue-class-component": {
"version": "7.2.6",
"resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-7.2.6.tgz",
- "integrity": "sha512-+eaQXVrAm/LldalI272PpDe3+i4mPis0ORiMYxF6Ae4hyuCh15W8Idet7wPUEs4N4YptgFHGys4UrgNQOMyO6w==",
- "requires": {}
+ "integrity": "sha512-+eaQXVrAm/LldalI272PpDe3+i4mPis0ORiMYxF6Ae4hyuCh15W8Idet7wPUEs4N4YptgFHGys4UrgNQOMyO6w=="
},
"vue-hot-reload-api": {
"version": "2.3.4",
@@ -35012,6 +34924,87 @@
}
}
},
+ "vue-loader-v16": {
+ "version": "npm:vue-loader@16.8.3",
+ "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
+ "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "chalk": "^4.1.0",
+ "hash-sum": "^2.0.0",
+ "loader-utils": "^2.0.0"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "4.1.2",
+ "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true,
+ "optional": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true,
+ "optional": true
+ },
+ "loader-utils": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+ "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "big.js": "^5.2.2",
+ "emojis-list": "^3.0.0",
+ "json5": "^2.1.2"
+ }
+ },
+ "supports-color": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ }
+ }
+ },
"vue-ls": {
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/vue-ls/-/vue-ls-3.2.2.tgz",
@@ -35060,6 +35053,7 @@
"version": "2.6.13",
"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.13.tgz",
"integrity": "sha512-latKAqpUjCkovB8XppW5gnZbSdYQzkf8pavsMBZYZrQcG6lAnj0EH4Ty7jMwAwFw5Cf4mybKBHlp1UTjnLPOWw==",
+ "dev": true,
"requires": {
"de-indent": "^1.0.2",
"he": "^1.1.0"
@@ -35074,14 +35068,12 @@
"vuex": {
"version": "3.6.2",
"resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz",
- "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==",
- "requires": {}
+ "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw=="
},
"vuex-class": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/vuex-class/-/vuex-class-0.3.2.tgz",
- "integrity": "sha512-m0w7/FMsNcwJgunJeM+wcNaHzK2KX1K1rw2WUQf7Q16ndXHo7pflRyOV/E8795JO/7fstyjH3EgqBI4h4n4qXQ==",
- "requires": {}
+ "integrity": "sha512-m0w7/FMsNcwJgunJeM+wcNaHzK2KX1K1rw2WUQf7Q16ndXHo7pflRyOV/E8795JO/7fstyjH3EgqBI4h4n4qXQ=="
},
"vuex-persistedstate": {
"version": "4.0.0-beta.3",
@@ -36285,7 +36277,7 @@
},
"yaml": {
"version": "1.10.2",
- "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+ "resolved": "https://registry.npmmirror.com/yaml/-/yaml-1.10.2.tgz",
"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
"dev": true,
"optional": true
diff --git a/src/components/map/pickCoordinate.vue b/src/components/map/pickCoordinate.vue
index 9f82ba7..19058e1 100644
--- a/src/components/map/pickCoordinate.vue
+++ b/src/components/map/pickCoordinate.vue
@@ -1,38 +1,65 @@
<template>
<a-modal
- title="������������"
- destroyOnClose
- :visible="true"
- @ok="addLonAndLat"
- @cancel="handleMapCancel"
- okText="������"
- class="modalStyle"
+ title="������������"
+ destroyOnClose
+ :visible="true"
+ @ok="addLonAndLat"
+ @cancel="handleMapCancel"
+ okText="������"
+ class="modalStyle"
>
- <p style="position: absolute; bottom:-3px;right: 200px"><span>���������������</span><span style="font-size: 18px;font-weight: bold">{{ mapRecord.name }}</span></p>
+ <p style="position: absolute; bottom: -3px; right: 200px">
+ <span>���������������</span
+ ><span style="font-size: 18px; font-weight: bold">{{
+ mapRecord.name
+ }}</span>
+ </p>
<div>
- <p>
- <span>���������</span><a-input v-model="keyword" style="display: inline; width: 160px;height: 26px"/>
- <span style="margin-left: 25px">���������</span><a-input disabled="disabled" v-model="lonAndLat.lng" style="display: inline; width: 160px;height: 26px"/>
- <span style="margin-left: 25px">���������</span><a-input disabled="disabled" v-model="lonAndLat.lat" style="display: inline; width: 160px;height: 26px"/>
- </p>
-<!-- :scroll-wheel-zoom="true"-->
- <baidu-map
+ <p>
+ <span>���������</span
+ ><a-input
+ v-model="keyword"
+ style="display: inline; width: 160px; height: 26px"
+ />
+ <span style="margin-left: 25px">���������</span
+ ><a-input
+ disabled="disabled"
+ v-model="lonAndLat.lng"
+ style="display: inline; width: 160px; height: 26px"
+ />
+ <span style="margin-left: 25px">���������</span
+ ><a-input
+ disabled="disabled"
+ v-model="lonAndLat.lat"
+ style="display: inline; width: 160px; height: 26px"
+ />
+ </p>
+ <!-- :scroll-wheel-zoom="true"-->
+ <baidu-map
:center="center"
:zoom="zoom"
@ready="handler"
@click="mapClick"
:scroll-wheel-zoom="true"
- style="height: 400px;width: 100%;">
- <bm-control>
- <bm-local-search :keyword="keyword" :auto-viewport="true" style="display: none" ></bm-local-search>
- <bm-marker :position="{ lng:lonAndLat.lng , lat: lonAndLat.lat}" :dragging="true" animation="BMAP_ANIMATION_BOUNCE">
- </bm-marker>
- </bm-control>
- </baidu-map>
- </div>
+ style="height: 400px; width: 100%"
+ >
+ <bm-control>
+ <bm-local-search
+ :keyword="keyword"
+ :auto-viewport="true"
+ style="display: none"
+ ></bm-local-search>
+ <bm-marker
+ :position="{ lng: lonAndLat.lng, lat: lonAndLat.lat }"
+ :dragging="true"
+ animation="BMAP_ANIMATION_BOUNCE"
+ >
+ </bm-marker>
+ </bm-control>
+ </baidu-map>
+ </div>
</a-modal>
-
</template>
<script lang="tsx">
@@ -139,13 +166,12 @@
</script>
<style lang="less">
-
-.modalStyle{
- .ant-modal{
+.modalStyle {
+ .ant-modal {
margin-left: 25%;
}
- .ant-modal-content{
- width: 800px;
+ .ant-modal-content {
+ width: 800px;
}
}
</style>
diff --git a/src/components/map/pickCoordinate1.vue b/src/components/map/pickCoordinate1.vue
index 26078de..255a951 100644
--- a/src/components/map/pickCoordinate1.vue
+++ b/src/components/map/pickCoordinate1.vue
@@ -1,13 +1,6 @@
<template>
- <a-modal
- title="������������"
- destroyOnClose
- :visible="true"
- @ok="addLonAndLat"
- @cancel="handleMapCancel"
- okText="������"
- class="modalStyle"
- >
+ <a-modal title="������������" destroyOnClose :visible="true" @ok="addLonAndLat" @cancel="handleMapCancel" okText="������"
+ class="modalStyle">
<div>
<div style="display: flex">
<div style="display: flex; width: 300px">
@@ -24,15 +17,12 @@
style="width: 160px; height: 26px"
@change="searchMap"
></a-input> -->
- <input v-model="input" id="tipinput" /><button
- @click="searchAddress"
- style="
+ <input v-model="input" id="tipinput" /><button @click="searchAddress" style="
background-color: #1890ff;
color: white;
border: none;
margin-left: 5px;
- "
- >
+ ">
������
</button>
<div id="panel"></div>
@@ -52,34 +42,17 @@
<!-- <a-input style="width: 160px; height: 26px" @focus="selectPoi" /> -->
</div>
<div>
- <span style="margin-left: 25px">���������</span
- ><a-input
- v-model="clickPoint[0]"
- style="display: inline; width: 160px; height: 26px"
- />
+ <span style="margin-left: 25px">���������</span><a-input v-model="clickPoint[0]"
+ style="display: inline; width: 160px; height: 26px" />
</div>
<div>
- <span style="margin-left: 25px">���������</span
- ><a-input
- v-model="clickPoint[1]"
- style="display: inline; width: 160px; height: 26px"
- />
+ <span style="margin-left: 25px">���������</span><a-input v-model="clickPoint[1]"
+ style="display: inline; width: 160px; height: 26px" />
</div>
</div>
- <el-amap
- ref="map"
- :center="clickPoint"
- :events="{ click: mapClick }"
- :zoom="zoom"
- :scroll-wheel-zoom="true"
- style="height: 400px; width: 100%; margin-top: 20px"
- id="amap"
- >
- <el-amap-marker
- :position="clickPoint"
- animation="AMAP_ANIMATION_BOUNCE"
- :dragging="true"
- ></el-amap-marker>
+ <el-amap ref="map" :center="clickPoint" :events="{ click: mapClick }" :zoom="zoom" :scroll-wheel-zoom="true"
+ style="height: 400px; width: 100%; margin-top: 20px" id="amap">
+ <el-amap-marker :position="clickPoint" animation="AMAP_ANIMATION_BOUNCE" :dragging="true"></el-amap-marker>
</el-amap>
<!-- :scroll-wheel-zoom="true"-->
@@ -126,8 +99,8 @@
})
export default class PickCoordinate extends Vue {
private center: any = [
- 120.726838,
- 31.3421
+ 120.726838,
+ 31.3421
]
@Prop({
type: String,
@@ -143,18 +116,18 @@
private keyword: string = ''
private zoom = 19
- private searchOption:any={
- city: '������',
- citylimit: false
+ private searchOption: any = {
+ city: '������',
+ citylimit: false
}
- @Watch('clickPoint', {deep: true, immediate: true},)
+ @Watch('clickPoint', { deep: true, immediate: true },)
private monitorMapFlag(newVal: any, oldVal: any) {
- console.log(newVal,'newVal');
- this.center= [newVal.lng,newVal.lat]
+ console.log(newVal, 'newVal');
+ this.center = [newVal.lng, newVal.lat]
}
- private num1:any=1
+ private num1: any = 1
- @Watch('lnglat', {deep: true, immediate: true})
+ @Watch('lnglat', { deep: true, immediate: true })
private lnglatWatch(newVal: any, oldVal: any) {
console.log('------------');
console.log(newVal);
@@ -165,53 +138,53 @@
// console.log(this.clickPoint,'clickPoint');
}
- private input:any=''
- private mark:any=''
-
+ private input: any = ''
+ private mark: any = ''
+
private searchAddress() {
- var map = new AMap.Map("amap", {
- resizeEnable: true
- });
- var placeSearch = new AMap.PlaceSearch({
- pageSize: 5, // ������������������������
- pageIndex: 1, // ������
- city: "������", // ���������������
- citylimit: false, //���������������������������������������������
- panel: "panel", // ���������������������������������������������
- map: map, // ���������������������������
- autoFitView: true // ������������������������������������������ Marker���������������������������������
- });
- //���������������
- placeSearch.search(this.input)
- var salf=this
- var markerone=0
- map.on('click',click);
- function click(e){
- if(markerone===1){
- map.remove(map.Marker)
- }
- salf.mapClick(e)
- map.Marker=new AMap.Marker({
- map: map,
- position: salf.clickPoint,
- animation:"AMAP_ANIMATION_BOUNCE"
- })
- markerone=1
- }
+ var map = new AMap.Map("amap", {
+ resizeEnable: true
+ });
+ var placeSearch = new AMap.PlaceSearch({
+ pageSize: 5, // ������������������������
+ pageIndex: 1, // ������
+ city: "������", // ���������������
+ citylimit: false, //���������������������������������������������
+ panel: "panel", // ���������������������������������������������
+ map: map, // ���������������������������
+ autoFitView: true // ������������������������������������������ Marker���������������������������������
+ });
+ //���������������
+ placeSearch.search(this.input)
+ var salf = this
+ var markerone = 0
+ map.on('click', click);
+ function click(e) {
+ if (markerone === 1) {
+ map.remove(map.Marker)
+ }
+ salf.mapClick(e)
+ map.Marker = new AMap.Marker({
+ map: map,
+ position: salf.clickPoint,
+ animation: "AMAP_ANIMATION_BOUNCE"
+ })
+ markerone = 1
}
+ }
// ���������������������������
- private clickPoint: any = this.lnglat === '' ? [
- 120.720262,
- 31.335757
- ] : [
- this.lnglat.split(',')[1],
- this.lnglat.split(',')[0]
+ private clickPoint: any = this.lnglat === '' ? [
+ 120.720262,
+ 31.335757
+ ] : [
+ this.lnglat.split(',')[1],
+ this.lnglat.split(',')[0]
]
private mapClick(e: any) {
// console.log(e);
- const { lng, lat } = e.lnglat
- this.clickPoint=[ lng, lat]
+ const { lng, lat } = e.lnglat
+ this.clickPoint = [lng, lat]
console.log(this.clickPoint);
}
@@ -238,13 +211,13 @@
@Emit('sendLonLat')
private sendLonLat(lonLat: any) {
- console.log(lonLat,'jia');
+ console.log(lonLat, 'jia');
return lonLat;
}
@Emit('editLonLat')
private editLonLat(lonLat: any) {
- console.log(lonLat,'gai');
+ console.log(lonLat, 'gai');
return lonLat;
}
}
@@ -255,22 +228,27 @@
.ant-modal {
margin-left: 25%;
}
+
.ant-modal-content {
width: 800px;
}
}
+
.BMap_cpyCtrl,
.anchorBL {
display: none;
}
+
/* ���������������������logo */
/deep/.amap-logo {
display: none;
opacity: 0 !important;
}
+
/deep/.amap-copyright {
opacity: 0;
}
+
.amap-sug-result {
position: absolute;
z-index: 9999 !important;
@@ -278,6 +256,7 @@
border: 1px solid #d1d1d1;
bottom: auto;
}
+
#panel {
z-index: 999;
position: absolute;
diff --git a/src/views/device/govMonitorPoint.vue b/src/views/device/govMonitorPoint.vue
index 1b10ca1..b848a5b 100644
--- a/src/views/device/govMonitorPoint.vue
+++ b/src/views/device/govMonitorPoint.vue
@@ -3,265 +3,109 @@
<div class="tableList">
<div class="tableListForm">
<a-form-model layout="horizontal">
- <a-row :gutter="15">
+ <a-row :gutter="15">
<a-col :span="5">
- <a-button
- icon="plus"
- type="primary"
- @click="() => this.handleModalVisible(true)"
- style="margin-left: 25px;"
- >������</a-button>
+ <a-button icon="plus" type="primary" @click="() => this.handleModalVisible(true)"
+ style="margin-left: 25px;">������</a-button>
</a-col>
<a-col :span="5" style="margin-left: 37%">
<a-form-model-item :wrapperCol="wrapperCol">
- <a-select
- placeholder="������������������"
- style="width: 240px;margin-top:4px"
- @change="handleChange"
- allow-clear
- show-search
- >
- <a-select-option v-for="(item,index) in stationLevel" :key="index" :value="index">
+ <a-select placeholder="������������������" style="width: 240px;margin-top:4px" @change="handleChange" allow-clear
+ show-search>
+ <a-select-option v-for="(item, index) in stationLevel" :key="index" :value="index">
{{ item }}
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
- <a-col :span="5" >
- <a-form-model-item
- :wrapperCol="wrapperCol">
+ <a-col :span="5">
+ <a-form-model-item :wrapperCol="wrapperCol">
<a-input v-model="searchName" placeholder="���������������������" allow-clear />
</a-form-model-item>
</a-col>
</a-row>
- </a-form-model
- >
+ </a-form-model>
</div>
- <av-standard-table
- :dataSource="dataSource"
- :columns="columns"
- :loading="tableLoading"
- :paginationProps="pagination"
- @tableChange="handlerTableChange"
- ></av-standard-table>
+ <av-standard-table :dataSource="dataSource" :columns="columns" :loading="tableLoading" :paginationProps="pagination"
+ @tableChange="handlerTableChange"></av-standard-table>
</div>
- <a-modal
- title="������������������"
- destroyOnClose
- :visible="addShowOrHiddenFlag"
- @ok="addOK"
- @cancel="addCancel"
- okText="������"
- >
- <a-form-model
- style="margin-top: 8px"
- :model="addForm"
- :rules="rules"
- ref="addRulesForm"
- >
- <a-form-model-item has-feedback
- :labelCol="{ span: 5 }"
- :wrapperCol="{ span: 15 }"
- label="������������"
- prop="guid">
- <a-input
- placeholder="���������������������"
- type="string"
- v-model="addForm.guid"
- />
+ <a-modal title="������������������" destroyOnClose :visible="addShowOrHiddenFlag" @ok="addOK" @cancel="addCancel" okText="������">
+ <a-form-model style="margin-top: 8px" :model="addForm" :rules="rules" ref="addRulesForm">
+ <a-form-model-item has-feedback :labelCol="{ span: 5 }" :wrapperCol="{ span: 15 }" label="������������" prop="guid">
+ <a-input placeholder="���������������������" type="string" v-model="addForm.guid" />
</a-form-model-item>
- <a-form-model-item has-feedback
- :labelCol="{ span: 5 }"
- :wrapperCol="{ span: 15 }"
- label="������"
- prop="name">
- <a-input
- placeholder="������������"
- type="string"
- v-model="addForm.name"
- />
+ <a-form-model-item has-feedback :labelCol="{ span: 5 }" :wrapperCol="{ span: 15 }" label="������" prop="name">
+ <a-input placeholder="������������" type="string" v-model="addForm.name" />
</a-form-model-item>
- <a-form-model-item
- :labelCol="{ span: 5 }"
- has-feedback
- :wrapperCol="{ span: 15 }"
- label="������"
- prop="longitude"
- >
- <a-input
- placeholder="���������������"
- type="string"
- v-model="addForm.longitude"
- />
+ <a-form-model-item :labelCol="{ span: 5 }" has-feedback :wrapperCol="{ span: 15 }" label="������" prop="longitude">
+ <a-input placeholder="���������������" type="string" v-model="addForm.longitude" />
</a-form-model-item>
- <a-form-model-item
- :labelCol="{ span: 5 }"
- has-feedback
- :wrapperCol="{ span: 15 }"
- label="������"
- prop="latitude"
- >
- <a-input
- placeholder="���������������"
- type="string"
- v-model="addForm.latitude"
- />
+ <a-form-model-item :labelCol="{ span: 5 }" has-feedback :wrapperCol="{ span: 15 }" label="������" prop="latitude">
+ <a-input placeholder="���������������" type="string" v-model="addForm.latitude" />
</a-form-model-item>
- <a-form-model-item
- :labelCol="{ span: 5 }"
- :wrapperCol="{ span: 15 }"
- label="������"
- has-feedback
- prop="position"
- >
-<!-- v-decorator="['position', { rules: [{ required: true, message: '������������������������' }] }]"-->
- <a-cascader :options="areaData" placeholder="������������" @change="positionLevel" labelInValue/>
+ <a-form-model-item :labelCol="{ span: 5 }" :wrapperCol="{ span: 15 }" label="������" has-feedback prop="position">
+ <!-- v-decorator="['position', { rules: [{ required: true, message: '������������������������' }] }]"-->
+ <a-cascader :options="areaData" placeholder="������������" @change="positionLevel" labelInValue />
</a-form-model-item>
- <a-form-model-item
- :labelCol="{ span: 5 }"
- has-feedback
- :wrapperCol="{ span: 15 }"
- label="������������"
- prop="stationLevel"
- >
- <a-select
- placeholder="������������������"
- type="string"
- allow-clear
- show-search
- v-model="addForm.stationLevel"
- >
- <a-select-option v-for="(item,index) in stationLevel" :key="index" :value = 'index'>{{ item }}</a-select-option>
+ <a-form-model-item :labelCol="{ span: 5 }" has-feedback :wrapperCol="{ span: 15 }" label="������������"
+ prop="stationLevel">
+ <a-select placeholder="������������������" type="string" allow-clear show-search v-model="addForm.stationLevel">
+ <a-select-option v-for="(item, index) in stationLevel" :key="index" :value='index'>{{ item
+ }}</a-select-option>
</a-select>
</a-form-model-item>
- <a-form-model-item
- :labelCol="{ span: 5 }"
- has-feedback
- :wrapperCol="{ span: 15 }"
- label="������"
- prop="desc"
- >
- <a-input
- placeholder="������"
- type="string"
- v-model="addForm.desc"
- />
+ <a-form-model-item :labelCol="{ span: 5 }" has-feedback :wrapperCol="{ span: 15 }" label="������" prop="desc">
+ <a-input placeholder="������" type="string" v-model="addForm.desc" />
</a-form-model-item>
</a-form-model>
</a-modal>
- <a-modal
- title="������������������"
- destroyOnClose
- :visible="editShowOrHiddenFlag"
- @ok="editSave"
- @cancel="editCancel"
- okText="������"
- >
- <a-form-model
- style="margin-top: 8px"
- :model="editForm"
- :rules="rules"
- ref="editRulesForm"
- >
- <a-form-model-item has-feedback
- :labelCol="{ span: 5 }"
- :wrapperCol="{ span: 15 }"
- label="������������"
- prop="guid">
- <a-input
- placeholder="���������������������"
- type="string"
- v-model="editForm.guid"
- />
+ <a-modal title="������������������" destroyOnClose :visible="editShowOrHiddenFlag" @ok="editSave" @cancel="editCancel"
+ okText="������">
+ <a-form-model style="margin-top: 8px" :model="editForm" :rules="rules" ref="editRulesForm">
+ <a-form-model-item has-feedback :labelCol="{ span: 5 }" :wrapperCol="{ span: 15 }" label="������������" prop="guid">
+ <a-input placeholder="���������������������" type="string" v-model="editForm.guid" />
</a-form-model-item>
- <a-form-model-item has-feedback
- :labelCol="{ span: 5 }"
- :wrapperCol="{ span: 15 }"
- label="������"
- prop="name">
- <a-input
- placeholder="������������"
- type="string"
- v-model="editForm.name"
- />
+ <a-form-model-item has-feedback :labelCol="{ span: 5 }" :wrapperCol="{ span: 15 }" label="������" prop="name">
+ <a-input placeholder="������������" type="string" v-model="editForm.name" />
</a-form-model-item>
- <a-form-model-item
- :labelCol="{ span: 5 }"
- has-feedback
- :wrapperCol="{ span: 15 }"
- label="������"
- prop="longitude"
- >
- <a-input
- placeholder="���������������"
- type="string"
- v-model="editForm.longitude"
- />
+ <a-form-model-item :labelCol="{ span: 5 }" has-feedback :wrapperCol="{ span: 15 }" label="������" prop="longitude">
+ <a-input placeholder="���������������" type="string" v-model="editForm.longitude" />
</a-form-model-item>
- <a-form-model-item
- :labelCol="{ span: 5 }"
- has-feedback
- :wrapperCol="{ span: 15 }"
- label="������"
- prop="latitude"
- >
- <a-input
- placeholder="���������������"
- type="string"
- v-model="editForm.latitude"
- />
+ <a-form-model-item :labelCol="{ span: 5 }" has-feedback :wrapperCol="{ span: 15 }" label="������" prop="latitude">
+ <a-input placeholder="���������������" type="string" v-model="editForm.latitude" />
</a-form-model-item>
- <a-form-model-item
- :labelCol="{ span: 5 }"
- :wrapperCol="{ span: 15 }"
- label="������"
- has-feedback
- prop="position"
- >
+ <a-form-model-item :labelCol="{ span: 5 }" :wrapperCol="{ span: 15 }" label="������" has-feedback prop="position">
<!-- v-decorator="['position', { rules: [{ required: true, message: '������������������������' }] }]"-->
- <a-cascader v-model="editForm.position" :options="areaData" placeholder="������������������"
- @change="positionLevel" labelInValue/>
+ <a-cascader v-model="editForm.position" :options="areaData" placeholder="������������������" @change="positionLevel"
+ labelInValue />
</a-form-model-item>
- <a-form-model-item
- :labelCol="{ span: 5 }"
- has-feedback
- :wrapperCol="{ span: 15 }"
- label="������������"
- prop="stationLevel"
- >
- <a-select
- placeholder="������������������"
- type="string"
- allow-clear
- show-search
- v-model="editForm.stationLevel"
- >
- <a-select-option v-for="(item,index) in stationLevel" :key="index" :value = 'index'>{{ item }}</a-select-option>
+ <a-form-model-item :labelCol="{ span: 5 }" has-feedback :wrapperCol="{ span: 15 }" label="������������"
+ prop="stationLevel">
+ <a-select placeholder="������������������" type="string" allow-clear show-search v-model="editForm.stationLevel">
+ <a-select-option v-for="(item, index) in stationLevel" :key="index" :value='index'>{{ item
+ }}</a-select-option>
</a-select>
</a-form-model-item>
- <a-form-model-item
- :labelCol="{ span: 5 }"
- has-feedback
- :wrapperCol="{ span: 15 }"
- label="������"
- prop="desc"
- >
- <a-input
- placeholder="������"
- type="string"
- v-model="editForm.desc"
- />
+ <a-form-model-item :labelCol="{ span: 5 }" has-feedback :wrapperCol="{ span: 15 }" label="������" prop="desc">
+ <a-input placeholder="������" type="string" v-model="editForm.desc" />
+ </a-form-model-item>
+ </a-form-model>
+ </a-modal>
+ <a-modal title="������������������" destroyOnClose :visible="editSiteShowOrHiddenFlag" :rules="siteRules" @ok="editSiteSave"
+ @cancel="editSiteCancel" okText="������">
+ <a-form-model style="margin-top: 8px" :model="editSiteForm" ref="editSiteRulesForm">
+ <a-form-model-item has-feedback :labelCol="{ span: 5 }" :wrapperCol="{ span: 15 }" label="������������" prop="guid">
+ <a-input placeholder="���������������������" type="string" v-model="editSiteForm.guid" />
</a-form-model-item>
</a-form-model>
</a-modal>
</a-card>
-
</template>
<script lang="tsx">
-import {Component, Vue, Watch} from "vue-property-decorator";
+import { Component, Vue, Watch } from "vue-property-decorator";
import org from '@/util/org'
import { get, post } from "@/util/request";
@Component({
@@ -271,7 +115,7 @@
export default class govMonitorPoint extends Vue {
// ������������
private wrapperCol: any = {
- sm: {span: 16}//������������������������
+ sm: { span: 16 }//������������������������
}
// ������id������������
private stationLevelId: any = ''
@@ -316,38 +160,46 @@
// ���������������������������
private tableLoading: boolean = false
// ������
- private dataSource: any[] =[]
+ private dataSource: any[] = []
// ������������������������
private addShowOrHiddenFlag: boolean = false
// ������������������������
private editShowOrHiddenFlag: boolean = false
+
+ private editSiteShowOrHiddenFlag: boolean = false
// ������������������������
private areaData: any = JSON.parse(JSON.stringify(org))
// ���������������������������
private rules: any = {
guid: [
- {required: true, message: '������������������������', trigger: ['change', 'blur']},
+ { required: true, message: '������������������������', trigger: ['change', 'blur'] },
],
name: [
- {required: true, message: '������������������', trigger: ['change', 'blur']},
+ { required: true, message: '������������������', trigger: ['change', 'blur'] },
],
longitude: [
- {required: true, message: '������������������', trigger: ['change', 'blur']},
+ { required: true, message: '������������������', trigger: ['change', 'blur'] },
],
latitude: [
- {required: true, message: '������������������', trigger: ['change', 'blur']},
+ { required: true, message: '������������������', trigger: ['change', 'blur'] },
],
position: [
- {required: true, message: '���������������������', trigger: ['change', 'blur']},
+ { required: true, message: '���������������������', trigger: ['change', 'blur'] },
],
stationLevel: [
- {required: true, message: '���������������������', trigger: ['change', 'blur']},
+ { required: true, message: '���������������������', trigger: ['change', 'blur'] },
+ ]
+ }
+ private siteRules: any = {
+ guid: [
+ { required: true, message: '������������������������', trigger: ['change', 'blur'] },
]
}
// ������������������
private stationLevel: any = {}
// ������������������������record
private editBeforeRecord: any = null
+ private editBeforeSiteRecord: any = null
// ������������������
private addForm: any = {
guid: '',
@@ -369,6 +221,11 @@
stationLevel: undefined,
desc: ''
}
+ // ������������������
+ private editSiteForm: any = {
+ id: -1,
+ guid: ''
+ }
// ������������
private pagination: any = {
total: 0,
@@ -380,7 +237,7 @@
// ������������������������
@Watch('searchName', {
deep: true,
- immediate:true
+ immediate: true
})
private watchName(newVal: string, oldVal: string) {
this.searchName = newVal
@@ -398,7 +255,7 @@
this.queryGovDatas()
}
//���������������������
- private handleChange(selectedItems:any) {
+ private handleChange(selectedItems: any) {
if (selectedItems) {
this.stationLevelId = selectedItems
} else {
@@ -411,28 +268,28 @@
private positionLevel(val: any, selectedOptions: any) {
if (selectedOptions && selectedOptions.length > 0) {
this.addForm.position = selectedOptions
- }else {
+ } else {
this.addForm.position = undefined
}
}
// ���������������������
private selectDatas() {
get("dict/data/query?type=stationLevel ", {}).then(res => {
- if (res.data.code === 0) {
- this.stationLevel = res.data.data
- }
- })
- .catch(err => {
- console.log(err);
- });
+ if (res.data.code === 0) {
+ this.stationLevel = res.data.data
+ }
+ })
+ .catch(err => {
+ console.log(err);
+ });
}
// ������������������������
private queryGovDatas() {
get('govMonitorPoint/getGovMonitorPointByCondition', {
- current: this.pagination.current,
- size: this.pagination.pageSize,
- name: this.searchName,
- stationLevel: this.stationLevelId
+ current: this.pagination.current,
+ size: this.pagination.pageSize,
+ name: this.searchName,
+ stationLevel: this.stationLevelId
}).then((res: any) => {
if (res.data.code === 0) {
this.pagination.total = res.data.data.totalNumber;
@@ -440,7 +297,7 @@
const govDatas = res.data.data.govMonitorPointList
if (govDatas.length > 0) {
for (let i = 0; i < govDatas.length; i++) {
- for (let j = 0; j <govDatas[i].position.length ; j++) {
+ for (let j = 0; j < govDatas[i].position.length; j++) {
govDatas[i].stationLevelName = this.stationLevel[govDatas[i].stationLevel]
}
}
@@ -451,7 +308,7 @@
}
// ������������
private handleModalVisible(flag: boolean) {
- this.addShowOrHiddenFlag = flag
+ this.addShowOrHiddenFlag = flag
}
// ������������
private addOK() {
@@ -504,7 +361,7 @@
this.addShowOrHiddenFlag = false
}
// ������������
- private editShow(flag:boolean, record: any) {
+ private editShow(flag: boolean, record: any) {
this.editShowOrHiddenFlag = flag
this.editBeforeRecord = record
const positon = []
@@ -522,6 +379,54 @@
desc: record.desc === undefined ? '' : record.desc
}
}
+ // ������������
+ private editSiteShow(flag: boolean, record: any) {
+ this.editSiteShowOrHiddenFlag = flag
+ this.editBeforeSiteRecord = record
+ const positon = []
+ positon.push(record.provinceCode)
+ positon.push(record.cityCode)
+ positon.push(record.areaCode)
+ this.editSiteForm = {
+ id: record.id,
+ guid: record.guid
+ }
+ }
+ // ������������������
+ private editSiteSave() {
+ this.$refs.editSiteRulesForm.validate((valid: any) => {
+ if (valid) {
+ const guid = this.editSiteForm.guid === this.editBeforeSiteRecord.guid ? null : this.editSiteForm.guid
+ if (!(guid)) {
+ this.$message.warning('������������')
+ } else {
+ get('govMonitorPoint/updateGuid', {
+ id: this.editSiteForm.id,
+ guid
+ }).then((res: any) => {
+ if (res.data.code === 0) {
+ this.$message.success(res.data.message)
+ this.editSiteForm = {
+ id: -1,
+ guid: ''
+ }
+ this.editSiteShowOrHiddenFlag = false
+ this.queryGovDatas()
+ } else {
+ this.$message.warning(res.data.message)
+ }
+ })
+ }
+ }
+ })
+ }
+ private editSiteCancel() {
+ this.editForm = {
+ id: -1,
+ guid: ''
+ }
+ this.editSiteShowOrHiddenFlag = false
+ }
// ������������
private editSave() {
this.$refs.editRulesForm.validate((valid: any) => {
@@ -530,12 +435,12 @@
const guid = this.editForm.guid === this.editBeforeRecord.guid ? null : this.editForm.guid
const longitude = this.editForm.longitude === this.editBeforeRecord.longitude ? null : this.editForm.longitude
const latitude = this.editForm.latitude === this.editBeforeRecord.latitude ? null : this.editForm.latitude
- const position = (this.editForm.position[0] ===this.editBeforeRecord.provinceCode &&
- this.editForm.position[1] ===this.editBeforeRecord.cityCode &&
- this.editForm.position[2] ===this.editBeforeRecord.areaCode) ? null : this.editForm.position
+ const position = (this.editForm.position[0] === this.editBeforeRecord.provinceCode &&
+ this.editForm.position[1] === this.editBeforeRecord.cityCode &&
+ this.editForm.position[2] === this.editBeforeRecord.areaCode) ? null : this.editForm.position
const stationLevel = this.editForm.stationLevel === this.editBeforeRecord.stationLevel ? null : this.editForm.stationLevel
const desc = this.editBeforeRecord.desc === undefined ? (this.editForm.desc === '' ? null : this.editForm.desc) :
- this.editForm.desc === this.editBeforeRecord.desc ? null : this.editForm.desc
+ this.editForm.desc === this.editBeforeRecord.desc ? null : this.editForm.desc
if (!(name || guid || longitude || latitude || position || stationLevel || desc)) {
this.$message.warning('������������')
} else {
@@ -546,8 +451,8 @@
longitude,
latitude,
provinceCode: position === null ? null : position[0],
- cityCode: position === null ? null : position[1],
- areaCode: position === null ? null : position[2],
+ cityCode: position === null ? null : position[1],
+ areaCode: position === null ? null : position[2],
stationLevel,
desc
}).then((res: any) => {
@@ -604,26 +509,29 @@
// ������������������
private opRender(text: string, record: any, index: number) {
return (
- <div>
- <a onClick={() => this.editShow(true, record)}>
- {" "}
- ������{" "}
- </a>
- <a-divider type="vertical"/>
- <a-popconfirm
- title="������������������"
- ok-text="������"
- cancel-text="������"
- onConfirm={() => this.delete(record)}
- >
- <a href="#">������</a>
- </a-popconfirm>
- </div>
+ <div>
+ <a onClick={() => this.editShow(true, record)}>
+ {" "}
+ ������{" "}
+ </a>
+ <a-divider type="vertical" />
+ <a-popconfirm
+ title="������������������"
+ ok-text="������"
+ cancel-text="������"
+ onConfirm={() => this.delete(record)}
+ >
+ <a href="#">������</a>
+ </a-popconfirm>
+ <a-divider type="vertical" />
+ <a onClick={() => this.editSiteShow(true, record)}>
+ {" "}
+ ������������������{" "}
+ </a>
+ </div>
)
}
}
</script>
-<style scoped>
-
-</style>
+<style scoped></style>
--
Gitblit v1.8.0