diff --git a/main.js b/main.js deleted file mode 100644 index eb88707..0000000 --- a/main.js +++ /dev/null @@ -1,68 +0,0 @@ -import Vue from 'vue' -import App from './App.vue' -import router from './router' -import store from './store' - -// 引入ant-design -import Antd from 'ant-design-vue' -// import 'ant-design-vue/dist/antd.less' -import '@/assets/css/antstyle.less' -Vue.use(Antd) - -// 引入datav -import dataV from '@jiaminghi/data-view' -Vue.use(dataV) - -// 引入vuescroll -import vuescroll from 'vuescroll'; -Vue.use(vuescroll, { - ops: { - mode: 'native', - sizeStrategy: 'percent', - detectResize: true, - }, // 在这里设置全局默认配置 - name: 'vuescroll' // 在这里自定义组件名字，默认是vueScroll -}); - -// 按需引入vue-awesome图标 -import Icon from 'vue-awesome/components/Icon' -import 'vue-awesome/icons/chart-bar.js' -import 'vue-awesome/icons/chart-area.js' -import 'vue-awesome/icons/chart-pie.js' -import 'vue-awesome/icons/chart-line.js' -import 'vue-awesome/icons/align-left.js' - -// 全局注册图标 -Vue.component('icon', Icon) - -// 适配flex -import '@/common/flexible.js' - -// 引入全局css -import './assets/css/style.scss' - - -//引入echart -import echarts from 'echarts' -Vue.prototype.$echarts = echarts - -Vue.config.productionTip = false - -// 获取配置文件 -import axios from 'axios' -import service from '@/utils/request' -axios.get('static/project.config.json').then((result) => { - console.log('get config') - Vue.prototype.baseConfig = result.data - document.title = result.data.title // 首先设置网页的title - service.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 - new Vue({ - router, - store, - render: (h) => h(App), - }).$mount('#app') -}).catch((error) => { - console.log('get baseConfig error...' + error) -}) - - diff --git a/main.js b/main.js deleted file mode 100644 index eb88707..0000000 --- a/main.js +++ /dev/null @@ -1,68 +0,0 @@ -import Vue from 'vue' -import App from './App.vue' -import router from './router' -import store from './store' - -// 引入ant-design -import Antd from 'ant-design-vue' -// import 'ant-design-vue/dist/antd.less' -import '@/assets/css/antstyle.less' -Vue.use(Antd) - -// 引入datav -import dataV from '@jiaminghi/data-view' -Vue.use(dataV) - -// 引入vuescroll -import vuescroll from 'vuescroll'; -Vue.use(vuescroll, { - ops: { - mode: 'native', - sizeStrategy: 'percent', - detectResize: true, - }, // 在这里设置全局默认配置 - name: 'vuescroll' // 在这里自定义组件名字，默认是vueScroll -}); - -// 按需引入vue-awesome图标 -import Icon from 'vue-awesome/components/Icon' -import 'vue-awesome/icons/chart-bar.js' -import 'vue-awesome/icons/chart-area.js' -import 'vue-awesome/icons/chart-pie.js' -import 'vue-awesome/icons/chart-line.js' -import 'vue-awesome/icons/align-left.js' - -// 全局注册图标 -Vue.component('icon', Icon) - -// 适配flex -import '@/common/flexible.js' - -// 引入全局css -import './assets/css/style.scss' - - -//引入echart -import echarts from 'echarts' -Vue.prototype.$echarts = echarts - -Vue.config.productionTip = false - -// 获取配置文件 -import axios from 'axios' -import service from '@/utils/request' -axios.get('static/project.config.json').then((result) => { - console.log('get config') - Vue.prototype.baseConfig = result.data - document.title = result.data.title // 首先设置网页的title - service.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 - new Vue({ - router, - store, - render: (h) => h(App), - }).$mount('#app') -}).catch((error) => { - console.log('get baseConfig error...' + error) -}) - - diff --git a/package-lock.json b/package-lock.json index 2a1c2dc..cbed09c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,11 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@amap/amap-jsapi-loader": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz", + "integrity": "sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==" + }, "@ant-design/colors": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-3.2.2.tgz", @@ -1146,6 +1151,19 @@ } } }, + "@terraformer/arcgis": { + "version": "2.1.2", + "resolved": "https://registry.npmmirror.com/@terraformer/arcgis/-/arcgis-2.1.2.tgz", + "integrity": "sha512-IvdfqehcNAUtKU1OFMKwPT8EvdKlVFZ7q7ZKzkIF8XzYZIVsZLuXuOS1UBdRh5u/o+X5Gax7jiZhD8U/4TV+Jw==", + "requires": { + "@terraformer/common": "^2.1.2" + } + }, + "@terraformer/common": { + "version": "2.1.2", + "resolved": "https://registry.npmmirror.com/@terraformer/common/-/common-2.1.2.tgz", + "integrity": "sha512-cwPdTFzIpekZhZRrgDEkqLKNPoqbyCBQHiemaovnGIeUx0Pl336MY/eCxzJ5zXkrQLVo9zPalq/vYW5HnyKevQ==" + }, "@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npm.taobao.org/@types/color-name/download/@types/color-name-1.1.1.tgz", @@ -1177,6 +1195,12 @@ "@types/node": "*" } }, + "@types/json-schema": { + "version": "7.0.11", + "resolved": "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.11.tgz", + "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", + "dev": true + }, "@types/minimatch": { "version": "3.0.3", "resolved": "https://registry.npm.taobao.org/@types/minimatch/download/@types/minimatch-3.0.3.tgz", @@ -3432,6 +3456,15 @@ "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", "dev": true }, + "copy-anything": { + "version": "2.0.6", + "resolved": "https://registry.npmmirror.com/copy-anything/-/copy-anything-2.0.6.tgz", + "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==", + "dev": true, + "requires": { + "is-what": "^3.14.1" + } + }, "copy-concurrently": { "version": "1.0.5", "resolved": "https://registry.npm.taobao.org/copy-concurrently/download/copy-concurrently-1.0.5.tgz", @@ -4895,6 +4928,15 @@ "estraverse": "^4.1.0" } }, + "esri-leaflet": { + "version": "3.0.8", + "resolved": "https://registry.npmmirror.com/esri-leaflet/-/esri-leaflet-3.0.8.tgz", + "integrity": "sha512-mLb4pRfDAbkG1YhuajD22erLXIAtrF1R32hmgmlJNI3t47n6KjTppCb8lViia0O7+GDORXFuJ9Lj9RkpsaKhSA==", + "requires": { + "@terraformer/arcgis": "^2.1.0", + "tiny-binary-search": "^1.0.3" + } + }, "estraverse": { "version": "4.3.0", "resolved": "https://registry.npm.taobao.org/estraverse/download/estraverse-4.3.0.tgz", @@ -6619,6 +6661,13 @@ "integrity": "sha1-dQ49tYYgh7RzfrrIIH/9HvJ7Jfw=", "dev": true }, + "image-size": { + "version": "0.5.5", + "resolved": "https://registry.npmmirror.com/image-size/-/image-size-0.5.5.tgz", + "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==", + "dev": true, + "optional": true + }, "import-cwd": { "version": "2.1.0", "resolved": "https://registry.npm.taobao.org/import-cwd/download/import-cwd-2.1.0.tgz", @@ -7085,6 +7134,12 @@ "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", "dev": true }, + "is-what": { + "version": "3.14.1", + "resolved": "https://registry.npmmirror.com/is-what/-/is-what-3.14.1.tgz", + "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==", + "dev": true + }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npm.taobao.org/is-windows/download/is-windows-1.0.2.tgz", @@ -7159,6 +7214,11 @@ } } }, + "js-cookie": { + "version": "2.2.1", + "resolved": "https://registry.npmmirror.com/js-cookie/-/js-cookie-2.2.1.tgz", + "integrity": "sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==" + }, "js-message": { "version": "1.0.5", "resolved": "https://registry.npm.taobao.org/js-message/download/js-message-1.0.5.tgz", @@ -7195,6 +7255,11 @@ "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", "dev": true }, + "jsencrypt": { + "version": "3.3.0", + "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.0.tgz", + "integrity": "sha512-OPfQMUU3pJ6KKTvKzr83jePHfyD1zWiWeLtRU9yIWjcbaRWm8MuXIu1/eQlDXPwDZrUjZy+9HVamS2Kmwrvz/Q==" + }, "jsesc": { "version": "2.5.2", "resolved": "https://registry.npm.taobao.org/jsesc/download/jsesc-2.5.2.tgz", @@ -7320,6 +7385,110 @@ "invert-kv": "^2.0.0" } }, + "leaflet": { + "version": "1.9.2", + "resolved": "https://registry.npmmirror.com/leaflet/-/leaflet-1.9.2.tgz", + "integrity": "sha512-Kc77HQvWO+y9y2oIs3dn5h5sy2kr3j41ewdqCMEUA4N89lgfUUfOBy7wnnHEstDpefiGFObq12FdopGRMx4J7g==" + }, + "less": { + "version": "3.13.1", + "resolved": "https://registry.npmmirror.com/less/-/less-3.13.1.tgz", + "integrity": "sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==", + "dev": true, + "requires": { + "copy-anything": "^2.0.1", + "errno": "^0.1.1", + "graceful-fs": "^4.1.2", + "image-size": "~0.5.0", + "make-dir": "^2.1.0", + "mime": "^1.4.1", + "native-request": "^1.0.5", + "source-map": "~0.6.0", + "tslib": "^1.10.0" + }, + "dependencies": { + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "dev": true, + "optional": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "optional": true + } + } + }, + "less-loader": { + "version": "6.2.0", + "resolved": "https://registry.npmmirror.com/less-loader/-/less-loader-6.2.0.tgz", + "integrity": "sha512-Cl5h95/Pz/PWub/tCBgT1oNMFeH1WTD33piG80jn5jr12T4XbxZcjThwNXDQ7AG649WEynuIzO4b0+2Tn9Qolg==", + "dev": true, + "requires": { + "clone": "^2.1.2", + "less": "^3.11.3", + "loader-utils": "^2.0.0", + "schema-utils": "^2.7.0" + }, + "dependencies": { + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "ajv-keywords": { + "version": "3.5.2", + "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "dev": true + }, + "clone": { + "version": "2.1.2", + "resolved": "https://registry.npmmirror.com/clone/-/clone-2.1.2.tgz", + "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==", + "dev": true + }, + "json5": { + "version": "2.2.1", + "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.1.tgz", + "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", + "dev": true + }, + "loader-utils": { + "version": "2.0.3", + "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.3.tgz", + "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "schema-utils": { + "version": "2.7.1", + "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-2.7.1.tgz", + "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.5", + "ajv": "^6.12.4", + "ajv-keywords": "^3.5.2" + } + } + } + }, "leven": { "version": "3.1.0", "resolved": "https://registry.npm.taobao.org/leven/download/leven-3.1.0.tgz", @@ -8044,6 +8213,13 @@ "resolved": "https://registry.npmjs.org/nanopop/-/nanopop-2.1.0.tgz", "integrity": "sha512-jGTwpFRexSH+fxappnGQtN9dspgE2ipa1aOjtR24igG0pv6JCxImIAmrLRHX+zUF5+1wtsFVbKyfP51kIGAVNw==" }, + "native-request": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/native-request/-/native-request-1.1.0.tgz", + "integrity": "sha512-uZ5rQaeRn15XmpgE0xoPL8YWqcX90VtCFglYwAgkvKM5e8fog+vePLAhHxuuv/gRkrQxIeh5U3q9sMNUrENqWw==", + "dev": true, + "optional": true + }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npm.taobao.org/natural-compare/download/natural-compare-1.4.0.tgz", @@ -11116,6 +11292,11 @@ "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", "dev": true }, + "tiny-binary-search": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/tiny-binary-search/-/tiny-binary-search-1.0.3.tgz", + "integrity": "sha512-STSHX/L5nI9WTLv6wrzJbAPbO7OIISX83KFBh2GVbX1Uz/vgZOU/ANn/8iV6t35yMTpoPzzO+3OQid3mifE0CA==" + }, "tinycolor2": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz", @@ -11756,6 +11937,11 @@ "integrity": "sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=", "dev": true }, + "vuescroll": { + "version": "4.17.5", + "resolved": "https://registry.npmmirror.com/vuescroll/-/vuescroll-4.17.5.tgz", + "integrity": "sha512-TjzRp0OpF99SiulIFw2txoT5tbUyCT0IaMiMw87r1shbQ6Mi94ZcEJ294ihEaiVcHHDpTm9oEudIkWThz7HUPQ==" + }, "vuex": { "version": "3.1.3", "resolved": "https://registry.npm.taobao.org/vuex/download/vuex-3.1.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvuex%2Fdownload%2Fvuex-3.1.3.tgz", diff --git a/main.js b/main.js deleted file mode 100644 index eb88707..0000000 --- a/main.js +++ /dev/null @@ -1,68 +0,0 @@ -import Vue from 'vue' -import App from './App.vue' -import router from './router' -import store from './store' - -// 引入ant-design -import Antd from 'ant-design-vue' -// import 'ant-design-vue/dist/antd.less' -import '@/assets/css/antstyle.less' -Vue.use(Antd) - -// 引入datav -import dataV from '@jiaminghi/data-view' -Vue.use(dataV) - -// 引入vuescroll -import vuescroll from 'vuescroll'; -Vue.use(vuescroll, { - ops: { - mode: 'native', - sizeStrategy: 'percent', - detectResize: true, - }, // 在这里设置全局默认配置 - name: 'vuescroll' // 在这里自定义组件名字，默认是vueScroll -}); - -// 按需引入vue-awesome图标 -import Icon from 'vue-awesome/components/Icon' -import 'vue-awesome/icons/chart-bar.js' -import 'vue-awesome/icons/chart-area.js' -import 'vue-awesome/icons/chart-pie.js' -import 'vue-awesome/icons/chart-line.js' -import 'vue-awesome/icons/align-left.js' - -// 全局注册图标 -Vue.component('icon', Icon) - -// 适配flex -import '@/common/flexible.js' - -// 引入全局css -import './assets/css/style.scss' - - -//引入echart -import echarts from 'echarts' -Vue.prototype.$echarts = echarts - -Vue.config.productionTip = false - -// 获取配置文件 -import axios from 'axios' -import service from '@/utils/request' -axios.get('static/project.config.json').then((result) => { - console.log('get config') - Vue.prototype.baseConfig = result.data - document.title = result.data.title // 首先设置网页的title - service.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 - new Vue({ - router, - store, - render: (h) => h(App), - }).$mount('#app') -}).catch((error) => { - console.log('get baseConfig error...' + error) -}) - - diff --git a/package-lock.json b/package-lock.json index 2a1c2dc..cbed09c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,11 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@amap/amap-jsapi-loader": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz", + "integrity": "sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==" + }, "@ant-design/colors": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-3.2.2.tgz", @@ -1146,6 +1151,19 @@ } } }, + "@terraformer/arcgis": { + "version": "2.1.2", + "resolved": "https://registry.npmmirror.com/@terraformer/arcgis/-/arcgis-2.1.2.tgz", + "integrity": "sha512-IvdfqehcNAUtKU1OFMKwPT8EvdKlVFZ7q7ZKzkIF8XzYZIVsZLuXuOS1UBdRh5u/o+X5Gax7jiZhD8U/4TV+Jw==", + "requires": { + "@terraformer/common": "^2.1.2" + } + }, + "@terraformer/common": { + "version": "2.1.2", + "resolved": "https://registry.npmmirror.com/@terraformer/common/-/common-2.1.2.tgz", + "integrity": "sha512-cwPdTFzIpekZhZRrgDEkqLKNPoqbyCBQHiemaovnGIeUx0Pl336MY/eCxzJ5zXkrQLVo9zPalq/vYW5HnyKevQ==" + }, "@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npm.taobao.org/@types/color-name/download/@types/color-name-1.1.1.tgz", @@ -1177,6 +1195,12 @@ "@types/node": "*" } }, + "@types/json-schema": { + "version": "7.0.11", + "resolved": "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.11.tgz", + "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", + "dev": true + }, "@types/minimatch": { "version": "3.0.3", "resolved": "https://registry.npm.taobao.org/@types/minimatch/download/@types/minimatch-3.0.3.tgz", @@ -3432,6 +3456,15 @@ "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", "dev": true }, + "copy-anything": { + "version": "2.0.6", + "resolved": "https://registry.npmmirror.com/copy-anything/-/copy-anything-2.0.6.tgz", + "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==", + "dev": true, + "requires": { + "is-what": "^3.14.1" + } + }, "copy-concurrently": { "version": "1.0.5", "resolved": "https://registry.npm.taobao.org/copy-concurrently/download/copy-concurrently-1.0.5.tgz", @@ -4895,6 +4928,15 @@ "estraverse": "^4.1.0" } }, + "esri-leaflet": { + "version": "3.0.8", + "resolved": "https://registry.npmmirror.com/esri-leaflet/-/esri-leaflet-3.0.8.tgz", + "integrity": "sha512-mLb4pRfDAbkG1YhuajD22erLXIAtrF1R32hmgmlJNI3t47n6KjTppCb8lViia0O7+GDORXFuJ9Lj9RkpsaKhSA==", + "requires": { + "@terraformer/arcgis": "^2.1.0", + "tiny-binary-search": "^1.0.3" + } + }, "estraverse": { "version": "4.3.0", "resolved": "https://registry.npm.taobao.org/estraverse/download/estraverse-4.3.0.tgz", @@ -6619,6 +6661,13 @@ "integrity": "sha1-dQ49tYYgh7RzfrrIIH/9HvJ7Jfw=", "dev": true }, + "image-size": { + "version": "0.5.5", + "resolved": "https://registry.npmmirror.com/image-size/-/image-size-0.5.5.tgz", + "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==", + "dev": true, + "optional": true + }, "import-cwd": { "version": "2.1.0", "resolved": "https://registry.npm.taobao.org/import-cwd/download/import-cwd-2.1.0.tgz", @@ -7085,6 +7134,12 @@ "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", "dev": true }, + "is-what": { + "version": "3.14.1", + "resolved": "https://registry.npmmirror.com/is-what/-/is-what-3.14.1.tgz", + "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==", + "dev": true + }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npm.taobao.org/is-windows/download/is-windows-1.0.2.tgz", @@ -7159,6 +7214,11 @@ } } }, + "js-cookie": { + "version": "2.2.1", + "resolved": "https://registry.npmmirror.com/js-cookie/-/js-cookie-2.2.1.tgz", + "integrity": "sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==" + }, "js-message": { "version": "1.0.5", "resolved": "https://registry.npm.taobao.org/js-message/download/js-message-1.0.5.tgz", @@ -7195,6 +7255,11 @@ "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", "dev": true }, + "jsencrypt": { + "version": "3.3.0", + "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.0.tgz", + "integrity": "sha512-OPfQMUU3pJ6KKTvKzr83jePHfyD1zWiWeLtRU9yIWjcbaRWm8MuXIu1/eQlDXPwDZrUjZy+9HVamS2Kmwrvz/Q==" + }, "jsesc": { "version": "2.5.2", "resolved": "https://registry.npm.taobao.org/jsesc/download/jsesc-2.5.2.tgz", @@ -7320,6 +7385,110 @@ "invert-kv": "^2.0.0" } }, + "leaflet": { + "version": "1.9.2", + "resolved": "https://registry.npmmirror.com/leaflet/-/leaflet-1.9.2.tgz", + "integrity": "sha512-Kc77HQvWO+y9y2oIs3dn5h5sy2kr3j41ewdqCMEUA4N89lgfUUfOBy7wnnHEstDpefiGFObq12FdopGRMx4J7g==" + }, + "less": { + "version": "3.13.1", + "resolved": "https://registry.npmmirror.com/less/-/less-3.13.1.tgz", + "integrity": "sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==", + "dev": true, + "requires": { + "copy-anything": "^2.0.1", + "errno": "^0.1.1", + "graceful-fs": "^4.1.2", + "image-size": "~0.5.0", + "make-dir": "^2.1.0", + "mime": "^1.4.1", + "native-request": "^1.0.5", + "source-map": "~0.6.0", + "tslib": "^1.10.0" + }, + "dependencies": { + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "dev": true, + "optional": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "optional": true + } + } + }, + "less-loader": { + "version": "6.2.0", + "resolved": "https://registry.npmmirror.com/less-loader/-/less-loader-6.2.0.tgz", + "integrity": "sha512-Cl5h95/Pz/PWub/tCBgT1oNMFeH1WTD33piG80jn5jr12T4XbxZcjThwNXDQ7AG649WEynuIzO4b0+2Tn9Qolg==", + "dev": true, + "requires": { + "clone": "^2.1.2", + "less": "^3.11.3", + "loader-utils": "^2.0.0", + "schema-utils": "^2.7.0" + }, + "dependencies": { + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "ajv-keywords": { + "version": "3.5.2", + "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "dev": true + }, + "clone": { + "version": "2.1.2", + "resolved": "https://registry.npmmirror.com/clone/-/clone-2.1.2.tgz", + "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==", + "dev": true + }, + "json5": { + "version": "2.2.1", + "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.1.tgz", + "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", + "dev": true + }, + "loader-utils": { + "version": "2.0.3", + "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.3.tgz", + "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "schema-utils": { + "version": "2.7.1", + "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-2.7.1.tgz", + "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.5", + "ajv": "^6.12.4", + "ajv-keywords": "^3.5.2" + } + } + } + }, "leven": { "version": "3.1.0", "resolved": "https://registry.npm.taobao.org/leven/download/leven-3.1.0.tgz", @@ -8044,6 +8213,13 @@ "resolved": "https://registry.npmjs.org/nanopop/-/nanopop-2.1.0.tgz", "integrity": "sha512-jGTwpFRexSH+fxappnGQtN9dspgE2ipa1aOjtR24igG0pv6JCxImIAmrLRHX+zUF5+1wtsFVbKyfP51kIGAVNw==" }, + "native-request": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/native-request/-/native-request-1.1.0.tgz", + "integrity": "sha512-uZ5rQaeRn15XmpgE0xoPL8YWqcX90VtCFglYwAgkvKM5e8fog+vePLAhHxuuv/gRkrQxIeh5U3q9sMNUrENqWw==", + "dev": true, + "optional": true + }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npm.taobao.org/natural-compare/download/natural-compare-1.4.0.tgz", @@ -11116,6 +11292,11 @@ "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", "dev": true }, + "tiny-binary-search": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/tiny-binary-search/-/tiny-binary-search-1.0.3.tgz", + "integrity": "sha512-STSHX/L5nI9WTLv6wrzJbAPbO7OIISX83KFBh2GVbX1Uz/vgZOU/ANn/8iV6t35yMTpoPzzO+3OQid3mifE0CA==" + }, "tinycolor2": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz", @@ -11756,6 +11937,11 @@ "integrity": "sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=", "dev": true }, + "vuescroll": { + "version": "4.17.5", + "resolved": "https://registry.npmmirror.com/vuescroll/-/vuescroll-4.17.5.tgz", + "integrity": "sha512-TjzRp0OpF99SiulIFw2txoT5tbUyCT0IaMiMw87r1shbQ6Mi94ZcEJ294ihEaiVcHHDpTm9oEudIkWThz7HUPQ==" + }, "vuex": { "version": "3.1.3", "resolved": "https://registry.npm.taobao.org/vuex/download/vuex-3.1.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvuex%2Fdownload%2Fvuex-3.1.3.tgz", diff --git a/package.json b/package.json index f8d7343..7e79fae 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "axios": "^0.21.1", "core-js": "^3.6.4", "echarts": "^4.6.0", + "esri-leaflet": "^3.0.8", "js-cookie": "^2.2.1", "jsencrypt": "^3.0.0-rc.1", "leaflet": "^1.7.1", diff --git a/main.js b/main.js deleted file mode 100644 index eb88707..0000000 --- a/main.js +++ /dev/null @@ -1,68 +0,0 @@ -import Vue from 'vue' -import App from './App.vue' -import router from './router' -import store from './store' - -// 引入ant-design -import Antd from 'ant-design-vue' -// import 'ant-design-vue/dist/antd.less' -import '@/assets/css/antstyle.less' -Vue.use(Antd) - -// 引入datav -import dataV from '@jiaminghi/data-view' -Vue.use(dataV) - -// 引入vuescroll -import vuescroll from 'vuescroll'; -Vue.use(vuescroll, { - ops: { - mode: 'native', - sizeStrategy: 'percent', - detectResize: true, - }, // 在这里设置全局默认配置 - name: 'vuescroll' // 在这里自定义组件名字，默认是vueScroll -}); - -// 按需引入vue-awesome图标 -import Icon from 'vue-awesome/components/Icon' -import 'vue-awesome/icons/chart-bar.js' -import 'vue-awesome/icons/chart-area.js' -import 'vue-awesome/icons/chart-pie.js' -import 'vue-awesome/icons/chart-line.js' -import 'vue-awesome/icons/align-left.js' - -// 全局注册图标 -Vue.component('icon', Icon) - -// 适配flex -import '@/common/flexible.js' - -// 引入全局css -import './assets/css/style.scss' - - -//引入echart -import echarts from 'echarts' -Vue.prototype.$echarts = echarts - -Vue.config.productionTip = false - -// 获取配置文件 -import axios from 'axios' -import service from '@/utils/request' -axios.get('static/project.config.json').then((result) => { - console.log('get config') - Vue.prototype.baseConfig = result.data - document.title = result.data.title // 首先设置网页的title - service.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 - new Vue({ - router, - store, - render: (h) => h(App), - }).$mount('#app') -}).catch((error) => { - console.log('get baseConfig error...' + error) -}) - - diff --git a/package-lock.json b/package-lock.json index 2a1c2dc..cbed09c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,11 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@amap/amap-jsapi-loader": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz", + "integrity": "sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==" + }, "@ant-design/colors": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-3.2.2.tgz", @@ -1146,6 +1151,19 @@ } } }, + "@terraformer/arcgis": { + "version": "2.1.2", + "resolved": "https://registry.npmmirror.com/@terraformer/arcgis/-/arcgis-2.1.2.tgz", + "integrity": "sha512-IvdfqehcNAUtKU1OFMKwPT8EvdKlVFZ7q7ZKzkIF8XzYZIVsZLuXuOS1UBdRh5u/o+X5Gax7jiZhD8U/4TV+Jw==", + "requires": { + "@terraformer/common": "^2.1.2" + } + }, + "@terraformer/common": { + "version": "2.1.2", + "resolved": "https://registry.npmmirror.com/@terraformer/common/-/common-2.1.2.tgz", + "integrity": "sha512-cwPdTFzIpekZhZRrgDEkqLKNPoqbyCBQHiemaovnGIeUx0Pl336MY/eCxzJ5zXkrQLVo9zPalq/vYW5HnyKevQ==" + }, "@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npm.taobao.org/@types/color-name/download/@types/color-name-1.1.1.tgz", @@ -1177,6 +1195,12 @@ "@types/node": "*" } }, + "@types/json-schema": { + "version": "7.0.11", + "resolved": "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.11.tgz", + "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", + "dev": true + }, "@types/minimatch": { "version": "3.0.3", "resolved": "https://registry.npm.taobao.org/@types/minimatch/download/@types/minimatch-3.0.3.tgz", @@ -3432,6 +3456,15 @@ "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", "dev": true }, + "copy-anything": { + "version": "2.0.6", + "resolved": "https://registry.npmmirror.com/copy-anything/-/copy-anything-2.0.6.tgz", + "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==", + "dev": true, + "requires": { + "is-what": "^3.14.1" + } + }, "copy-concurrently": { "version": "1.0.5", "resolved": "https://registry.npm.taobao.org/copy-concurrently/download/copy-concurrently-1.0.5.tgz", @@ -4895,6 +4928,15 @@ "estraverse": "^4.1.0" } }, + "esri-leaflet": { + "version": "3.0.8", + "resolved": "https://registry.npmmirror.com/esri-leaflet/-/esri-leaflet-3.0.8.tgz", + "integrity": "sha512-mLb4pRfDAbkG1YhuajD22erLXIAtrF1R32hmgmlJNI3t47n6KjTppCb8lViia0O7+GDORXFuJ9Lj9RkpsaKhSA==", + "requires": { + "@terraformer/arcgis": "^2.1.0", + "tiny-binary-search": "^1.0.3" + } + }, "estraverse": { "version": "4.3.0", "resolved": "https://registry.npm.taobao.org/estraverse/download/estraverse-4.3.0.tgz", @@ -6619,6 +6661,13 @@ "integrity": "sha1-dQ49tYYgh7RzfrrIIH/9HvJ7Jfw=", "dev": true }, + "image-size": { + "version": "0.5.5", + "resolved": "https://registry.npmmirror.com/image-size/-/image-size-0.5.5.tgz", + "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==", + "dev": true, + "optional": true + }, "import-cwd": { "version": "2.1.0", "resolved": "https://registry.npm.taobao.org/import-cwd/download/import-cwd-2.1.0.tgz", @@ -7085,6 +7134,12 @@ "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", "dev": true }, + "is-what": { + "version": "3.14.1", + "resolved": "https://registry.npmmirror.com/is-what/-/is-what-3.14.1.tgz", + "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==", + "dev": true + }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npm.taobao.org/is-windows/download/is-windows-1.0.2.tgz", @@ -7159,6 +7214,11 @@ } } }, + "js-cookie": { + "version": "2.2.1", + "resolved": "https://registry.npmmirror.com/js-cookie/-/js-cookie-2.2.1.tgz", + "integrity": "sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==" + }, "js-message": { "version": "1.0.5", "resolved": "https://registry.npm.taobao.org/js-message/download/js-message-1.0.5.tgz", @@ -7195,6 +7255,11 @@ "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", "dev": true }, + "jsencrypt": { + "version": "3.3.0", + "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.0.tgz", + "integrity": "sha512-OPfQMUU3pJ6KKTvKzr83jePHfyD1zWiWeLtRU9yIWjcbaRWm8MuXIu1/eQlDXPwDZrUjZy+9HVamS2Kmwrvz/Q==" + }, "jsesc": { "version": "2.5.2", "resolved": "https://registry.npm.taobao.org/jsesc/download/jsesc-2.5.2.tgz", @@ -7320,6 +7385,110 @@ "invert-kv": "^2.0.0" } }, + "leaflet": { + "version": "1.9.2", + "resolved": "https://registry.npmmirror.com/leaflet/-/leaflet-1.9.2.tgz", + "integrity": "sha512-Kc77HQvWO+y9y2oIs3dn5h5sy2kr3j41ewdqCMEUA4N89lgfUUfOBy7wnnHEstDpefiGFObq12FdopGRMx4J7g==" + }, + "less": { + "version": "3.13.1", + "resolved": "https://registry.npmmirror.com/less/-/less-3.13.1.tgz", + "integrity": "sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==", + "dev": true, + "requires": { + "copy-anything": "^2.0.1", + "errno": "^0.1.1", + "graceful-fs": "^4.1.2", + "image-size": "~0.5.0", + "make-dir": "^2.1.0", + "mime": "^1.4.1", + "native-request": "^1.0.5", + "source-map": "~0.6.0", + "tslib": "^1.10.0" + }, + "dependencies": { + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "dev": true, + "optional": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "optional": true + } + } + }, + "less-loader": { + "version": "6.2.0", + "resolved": "https://registry.npmmirror.com/less-loader/-/less-loader-6.2.0.tgz", + "integrity": "sha512-Cl5h95/Pz/PWub/tCBgT1oNMFeH1WTD33piG80jn5jr12T4XbxZcjThwNXDQ7AG649WEynuIzO4b0+2Tn9Qolg==", + "dev": true, + "requires": { + "clone": "^2.1.2", + "less": "^3.11.3", + "loader-utils": "^2.0.0", + "schema-utils": "^2.7.0" + }, + "dependencies": { + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "ajv-keywords": { + "version": "3.5.2", + "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "dev": true + }, + "clone": { + "version": "2.1.2", + "resolved": "https://registry.npmmirror.com/clone/-/clone-2.1.2.tgz", + "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==", + "dev": true + }, + "json5": { + "version": "2.2.1", + "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.1.tgz", + "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", + "dev": true + }, + "loader-utils": { + "version": "2.0.3", + "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.3.tgz", + "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "schema-utils": { + "version": "2.7.1", + "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-2.7.1.tgz", + "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.5", + "ajv": "^6.12.4", + "ajv-keywords": "^3.5.2" + } + } + } + }, "leven": { "version": "3.1.0", "resolved": "https://registry.npm.taobao.org/leven/download/leven-3.1.0.tgz", @@ -8044,6 +8213,13 @@ "resolved": "https://registry.npmjs.org/nanopop/-/nanopop-2.1.0.tgz", "integrity": "sha512-jGTwpFRexSH+fxappnGQtN9dspgE2ipa1aOjtR24igG0pv6JCxImIAmrLRHX+zUF5+1wtsFVbKyfP51kIGAVNw==" }, + "native-request": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/native-request/-/native-request-1.1.0.tgz", + "integrity": "sha512-uZ5rQaeRn15XmpgE0xoPL8YWqcX90VtCFglYwAgkvKM5e8fog+vePLAhHxuuv/gRkrQxIeh5U3q9sMNUrENqWw==", + "dev": true, + "optional": true + }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npm.taobao.org/natural-compare/download/natural-compare-1.4.0.tgz", @@ -11116,6 +11292,11 @@ "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", "dev": true }, + "tiny-binary-search": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/tiny-binary-search/-/tiny-binary-search-1.0.3.tgz", + "integrity": "sha512-STSHX/L5nI9WTLv6wrzJbAPbO7OIISX83KFBh2GVbX1Uz/vgZOU/ANn/8iV6t35yMTpoPzzO+3OQid3mifE0CA==" + }, "tinycolor2": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz", @@ -11756,6 +11937,11 @@ "integrity": "sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=", "dev": true }, + "vuescroll": { + "version": "4.17.5", + "resolved": "https://registry.npmmirror.com/vuescroll/-/vuescroll-4.17.5.tgz", + "integrity": "sha512-TjzRp0OpF99SiulIFw2txoT5tbUyCT0IaMiMw87r1shbQ6Mi94ZcEJ294ihEaiVcHHDpTm9oEudIkWThz7HUPQ==" + }, "vuex": { "version": "3.1.3", "resolved": "https://registry.npm.taobao.org/vuex/download/vuex-3.1.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvuex%2Fdownload%2Fvuex-3.1.3.tgz", diff --git a/package.json b/package.json index f8d7343..7e79fae 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "axios": "^0.21.1", "core-js": "^3.6.4", "echarts": "^4.6.0", + "esri-leaflet": "^3.0.8", "js-cookie": "^2.2.1", "jsencrypt": "^3.0.0-rc.1", "leaflet": "^1.7.1", diff --git a/public/static/project.config.json b/public/static/project.config.json index 1173170..19a4b3f 100644 --- a/public/static/project.config.json +++ b/public/static/project.config.json @@ -1,11 +1,11 @@ { "title": "珠海三溪科创小镇智慧园区平台", - "baseUrl": "http://36.133.150.166:20005/", + "baseUrl": "http://36.133.189.112:8082/", "singleSys": true, "city":"三溪小镇", "mapType":["leaflet"], "center":[22.289856,113.496093], - "zoom":15, + "zoom":16, "mapUrl":"https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=adbdd8e08c292f6cb4e3f0289f7d0447", "labelUrl":"https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=adbdd8e08c292f6cb4e3f0289f7d0447", "satelliteUrl":"http://t0.tianditu.gov.cn/img_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=adbdd8e08c292f6cb4e3f0289f7d0447", diff --git a/main.js b/main.js deleted file mode 100644 index eb88707..0000000 --- a/main.js +++ /dev/null @@ -1,68 +0,0 @@ -import Vue from 'vue' -import App from './App.vue' -import router from './router' -import store from './store' - -// 引入ant-design -import Antd from 'ant-design-vue' -// import 'ant-design-vue/dist/antd.less' -import '@/assets/css/antstyle.less' -Vue.use(Antd) - -// 引入datav -import dataV from '@jiaminghi/data-view' -Vue.use(dataV) - -// 引入vuescroll -import vuescroll from 'vuescroll'; -Vue.use(vuescroll, { - ops: { - mode: 'native', - sizeStrategy: 'percent', - detectResize: true, - }, // 在这里设置全局默认配置 - name: 'vuescroll' // 在这里自定义组件名字，默认是vueScroll -}); - -// 按需引入vue-awesome图标 -import Icon from 'vue-awesome/components/Icon' -import 'vue-awesome/icons/chart-bar.js' -import 'vue-awesome/icons/chart-area.js' -import 'vue-awesome/icons/chart-pie.js' -import 'vue-awesome/icons/chart-line.js' -import 'vue-awesome/icons/align-left.js' - -// 全局注册图标 -Vue.component('icon', Icon) - -// 适配flex -import '@/common/flexible.js' - -// 引入全局css -import './assets/css/style.scss' - - -//引入echart -import echarts from 'echarts' -Vue.prototype.$echarts = echarts - -Vue.config.productionTip = false - -// 获取配置文件 -import axios from 'axios' -import service from '@/utils/request' -axios.get('static/project.config.json').then((result) => { - console.log('get config') - Vue.prototype.baseConfig = result.data - document.title = result.data.title // 首先设置网页的title - service.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 - new Vue({ - router, - store, - render: (h) => h(App), - }).$mount('#app') -}).catch((error) => { - console.log('get baseConfig error...' + error) -}) - - diff --git a/package-lock.json b/package-lock.json index 2a1c2dc..cbed09c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,11 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@amap/amap-jsapi-loader": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz", + "integrity": "sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==" + }, "@ant-design/colors": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-3.2.2.tgz", @@ -1146,6 +1151,19 @@ } } }, + "@terraformer/arcgis": { + "version": "2.1.2", + "resolved": "https://registry.npmmirror.com/@terraformer/arcgis/-/arcgis-2.1.2.tgz", + "integrity": "sha512-IvdfqehcNAUtKU1OFMKwPT8EvdKlVFZ7q7ZKzkIF8XzYZIVsZLuXuOS1UBdRh5u/o+X5Gax7jiZhD8U/4TV+Jw==", + "requires": { + "@terraformer/common": "^2.1.2" + } + }, + "@terraformer/common": { + "version": "2.1.2", + "resolved": "https://registry.npmmirror.com/@terraformer/common/-/common-2.1.2.tgz", + "integrity": "sha512-cwPdTFzIpekZhZRrgDEkqLKNPoqbyCBQHiemaovnGIeUx0Pl336MY/eCxzJ5zXkrQLVo9zPalq/vYW5HnyKevQ==" + }, "@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npm.taobao.org/@types/color-name/download/@types/color-name-1.1.1.tgz", @@ -1177,6 +1195,12 @@ "@types/node": "*" } }, + "@types/json-schema": { + "version": "7.0.11", + "resolved": "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.11.tgz", + "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", + "dev": true + }, "@types/minimatch": { "version": "3.0.3", "resolved": "https://registry.npm.taobao.org/@types/minimatch/download/@types/minimatch-3.0.3.tgz", @@ -3432,6 +3456,15 @@ "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", "dev": true }, + "copy-anything": { + "version": "2.0.6", + "resolved": "https://registry.npmmirror.com/copy-anything/-/copy-anything-2.0.6.tgz", + "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==", + "dev": true, + "requires": { + "is-what": "^3.14.1" + } + }, "copy-concurrently": { "version": "1.0.5", "resolved": "https://registry.npm.taobao.org/copy-concurrently/download/copy-concurrently-1.0.5.tgz", @@ -4895,6 +4928,15 @@ "estraverse": "^4.1.0" } }, + "esri-leaflet": { + "version": "3.0.8", + "resolved": "https://registry.npmmirror.com/esri-leaflet/-/esri-leaflet-3.0.8.tgz", + "integrity": "sha512-mLb4pRfDAbkG1YhuajD22erLXIAtrF1R32hmgmlJNI3t47n6KjTppCb8lViia0O7+GDORXFuJ9Lj9RkpsaKhSA==", + "requires": { + "@terraformer/arcgis": "^2.1.0", + "tiny-binary-search": "^1.0.3" + } + }, "estraverse": { "version": "4.3.0", "resolved": "https://registry.npm.taobao.org/estraverse/download/estraverse-4.3.0.tgz", @@ -6619,6 +6661,13 @@ "integrity": "sha1-dQ49tYYgh7RzfrrIIH/9HvJ7Jfw=", "dev": true }, + "image-size": { + "version": "0.5.5", + "resolved": "https://registry.npmmirror.com/image-size/-/image-size-0.5.5.tgz", + "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==", + "dev": true, + "optional": true + }, "import-cwd": { "version": "2.1.0", "resolved": "https://registry.npm.taobao.org/import-cwd/download/import-cwd-2.1.0.tgz", @@ -7085,6 +7134,12 @@ "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", "dev": true }, + "is-what": { + "version": "3.14.1", + "resolved": "https://registry.npmmirror.com/is-what/-/is-what-3.14.1.tgz", + "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==", + "dev": true + }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npm.taobao.org/is-windows/download/is-windows-1.0.2.tgz", @@ -7159,6 +7214,11 @@ } } }, + "js-cookie": { + "version": "2.2.1", + "resolved": "https://registry.npmmirror.com/js-cookie/-/js-cookie-2.2.1.tgz", + "integrity": "sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==" + }, "js-message": { "version": "1.0.5", "resolved": "https://registry.npm.taobao.org/js-message/download/js-message-1.0.5.tgz", @@ -7195,6 +7255,11 @@ "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", "dev": true }, + "jsencrypt": { + "version": "3.3.0", + "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.0.tgz", + "integrity": "sha512-OPfQMUU3pJ6KKTvKzr83jePHfyD1zWiWeLtRU9yIWjcbaRWm8MuXIu1/eQlDXPwDZrUjZy+9HVamS2Kmwrvz/Q==" + }, "jsesc": { "version": "2.5.2", "resolved": "https://registry.npm.taobao.org/jsesc/download/jsesc-2.5.2.tgz", @@ -7320,6 +7385,110 @@ "invert-kv": "^2.0.0" } }, + "leaflet": { + "version": "1.9.2", + "resolved": "https://registry.npmmirror.com/leaflet/-/leaflet-1.9.2.tgz", + "integrity": "sha512-Kc77HQvWO+y9y2oIs3dn5h5sy2kr3j41ewdqCMEUA4N89lgfUUfOBy7wnnHEstDpefiGFObq12FdopGRMx4J7g==" + }, + "less": { + "version": "3.13.1", + "resolved": "https://registry.npmmirror.com/less/-/less-3.13.1.tgz", + "integrity": "sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==", + "dev": true, + "requires": { + "copy-anything": "^2.0.1", + "errno": "^0.1.1", + "graceful-fs": "^4.1.2", + "image-size": "~0.5.0", + "make-dir": "^2.1.0", + "mime": "^1.4.1", + "native-request": "^1.0.5", + "source-map": "~0.6.0", + "tslib": "^1.10.0" + }, + "dependencies": { + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "dev": true, + "optional": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "optional": true + } + } + }, + "less-loader": { + "version": "6.2.0", + "resolved": "https://registry.npmmirror.com/less-loader/-/less-loader-6.2.0.tgz", + "integrity": "sha512-Cl5h95/Pz/PWub/tCBgT1oNMFeH1WTD33piG80jn5jr12T4XbxZcjThwNXDQ7AG649WEynuIzO4b0+2Tn9Qolg==", + "dev": true, + "requires": { + "clone": "^2.1.2", + "less": "^3.11.3", + "loader-utils": "^2.0.0", + "schema-utils": "^2.7.0" + }, + "dependencies": { + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "ajv-keywords": { + "version": "3.5.2", + "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "dev": true + }, + "clone": { + "version": "2.1.2", + "resolved": "https://registry.npmmirror.com/clone/-/clone-2.1.2.tgz", + "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==", + "dev": true + }, + "json5": { + "version": "2.2.1", + "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.1.tgz", + "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", + "dev": true + }, + "loader-utils": { + "version": "2.0.3", + "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.3.tgz", + "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "schema-utils": { + "version": "2.7.1", + "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-2.7.1.tgz", + "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.5", + "ajv": "^6.12.4", + "ajv-keywords": "^3.5.2" + } + } + } + }, "leven": { "version": "3.1.0", "resolved": "https://registry.npm.taobao.org/leven/download/leven-3.1.0.tgz", @@ -8044,6 +8213,13 @@ "resolved": "https://registry.npmjs.org/nanopop/-/nanopop-2.1.0.tgz", "integrity": "sha512-jGTwpFRexSH+fxappnGQtN9dspgE2ipa1aOjtR24igG0pv6JCxImIAmrLRHX+zUF5+1wtsFVbKyfP51kIGAVNw==" }, + "native-request": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/native-request/-/native-request-1.1.0.tgz", + "integrity": "sha512-uZ5rQaeRn15XmpgE0xoPL8YWqcX90VtCFglYwAgkvKM5e8fog+vePLAhHxuuv/gRkrQxIeh5U3q9sMNUrENqWw==", + "dev": true, + "optional": true + }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npm.taobao.org/natural-compare/download/natural-compare-1.4.0.tgz", @@ -11116,6 +11292,11 @@ "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", "dev": true }, + "tiny-binary-search": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/tiny-binary-search/-/tiny-binary-search-1.0.3.tgz", + "integrity": "sha512-STSHX/L5nI9WTLv6wrzJbAPbO7OIISX83KFBh2GVbX1Uz/vgZOU/ANn/8iV6t35yMTpoPzzO+3OQid3mifE0CA==" + }, "tinycolor2": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz", @@ -11756,6 +11937,11 @@ "integrity": "sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=", "dev": true }, + "vuescroll": { + "version": "4.17.5", + "resolved": "https://registry.npmmirror.com/vuescroll/-/vuescroll-4.17.5.tgz", + "integrity": "sha512-TjzRp0OpF99SiulIFw2txoT5tbUyCT0IaMiMw87r1shbQ6Mi94ZcEJ294ihEaiVcHHDpTm9oEudIkWThz7HUPQ==" + }, "vuex": { "version": "3.1.3", "resolved": "https://registry.npm.taobao.org/vuex/download/vuex-3.1.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvuex%2Fdownload%2Fvuex-3.1.3.tgz", diff --git a/package.json b/package.json index f8d7343..7e79fae 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "axios": "^0.21.1", "core-js": "^3.6.4", "echarts": "^4.6.0", + "esri-leaflet": "^3.0.8", "js-cookie": "^2.2.1", "jsencrypt": "^3.0.0-rc.1", "leaflet": "^1.7.1", diff --git a/public/static/project.config.json b/public/static/project.config.json index 1173170..19a4b3f 100644 --- a/public/static/project.config.json +++ b/public/static/project.config.json @@ -1,11 +1,11 @@ { "title": "珠海三溪科创小镇智慧园区平台", - "baseUrl": "http://36.133.150.166:20005/", + "baseUrl": "http://36.133.189.112:8082/", "singleSys": true, "city":"三溪小镇", "mapType":["leaflet"], "center":[22.289856,113.496093], - "zoom":15, + "zoom":16, "mapUrl":"https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=adbdd8e08c292f6cb4e3f0289f7d0447", "labelUrl":"https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=adbdd8e08c292f6cb4e3f0289f7d0447", "satelliteUrl":"http://t0.tianditu.gov.cn/img_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=adbdd8e08c292f6cb4e3f0289f7d0447", diff --git a/src/api/overview.js b/src/api/overview.js index 7d89ee7..c9651a6 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -23,7 +23,8 @@ // 获取报警列表 export function getAlarmsNow(params) { return request({ - url: 'overview/alarmNow', + baseURL:'http://111.198.10.15:21406', + url: '/device/alarmList', method: 'get', params }) @@ -40,10 +41,11 @@ }) } -// 井查询 +// 设备查询 export function getDeviceList(params) { return request({ - url: 'overview/deviceList', + baseURL:'http://111.198.10.15:21406', + url: '/statics/deviceList', method: 'get', params }) diff --git a/main.js b/main.js deleted file mode 100644 index eb88707..0000000 --- a/main.js +++ /dev/null @@ -1,68 +0,0 @@ -import Vue from 'vue' -import App from './App.vue' -import router from './router' -import store from './store' - -// 引入ant-design -import Antd from 'ant-design-vue' -// import 'ant-design-vue/dist/antd.less' -import '@/assets/css/antstyle.less' -Vue.use(Antd) - -// 引入datav -import dataV from '@jiaminghi/data-view' -Vue.use(dataV) - -// 引入vuescroll -import vuescroll from 'vuescroll'; -Vue.use(vuescroll, { - ops: { - mode: 'native', - sizeStrategy: 'percent', - detectResize: true, - }, // 在这里设置全局默认配置 - name: 'vuescroll' // 在这里自定义组件名字，默认是vueScroll -}); - -// 按需引入vue-awesome图标 -import Icon from 'vue-awesome/components/Icon' -import 'vue-awesome/icons/chart-bar.js' -import 'vue-awesome/icons/chart-area.js' -import 'vue-awesome/icons/chart-pie.js' -import 'vue-awesome/icons/chart-line.js' -import 'vue-awesome/icons/align-left.js' - -// 全局注册图标 -Vue.component('icon', Icon) - -// 适配flex -import '@/common/flexible.js' - -// 引入全局css -import './assets/css/style.scss' - - -//引入echart -import echarts from 'echarts' -Vue.prototype.$echarts = echarts - -Vue.config.productionTip = false - -// 获取配置文件 -import axios from 'axios' -import service from '@/utils/request' -axios.get('static/project.config.json').then((result) => { - console.log('get config') - Vue.prototype.baseConfig = result.data - document.title = result.data.title // 首先设置网页的title - service.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 - new Vue({ - router, - store, - render: (h) => h(App), - }).$mount('#app') -}).catch((error) => { - console.log('get baseConfig error...' + error) -}) - - diff --git a/package-lock.json b/package-lock.json index 2a1c2dc..cbed09c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,11 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@amap/amap-jsapi-loader": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz", + "integrity": "sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==" + }, "@ant-design/colors": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-3.2.2.tgz", @@ -1146,6 +1151,19 @@ } } }, + "@terraformer/arcgis": { + "version": "2.1.2", + "resolved": "https://registry.npmmirror.com/@terraformer/arcgis/-/arcgis-2.1.2.tgz", + "integrity": "sha512-IvdfqehcNAUtKU1OFMKwPT8EvdKlVFZ7q7ZKzkIF8XzYZIVsZLuXuOS1UBdRh5u/o+X5Gax7jiZhD8U/4TV+Jw==", + "requires": { + "@terraformer/common": "^2.1.2" + } + }, + "@terraformer/common": { + "version": "2.1.2", + "resolved": "https://registry.npmmirror.com/@terraformer/common/-/common-2.1.2.tgz", + "integrity": "sha512-cwPdTFzIpekZhZRrgDEkqLKNPoqbyCBQHiemaovnGIeUx0Pl336MY/eCxzJ5zXkrQLVo9zPalq/vYW5HnyKevQ==" + }, "@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npm.taobao.org/@types/color-name/download/@types/color-name-1.1.1.tgz", @@ -1177,6 +1195,12 @@ "@types/node": "*" } }, + "@types/json-schema": { + "version": "7.0.11", + "resolved": "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.11.tgz", + "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", + "dev": true + }, "@types/minimatch": { "version": "3.0.3", "resolved": "https://registry.npm.taobao.org/@types/minimatch/download/@types/minimatch-3.0.3.tgz", @@ -3432,6 +3456,15 @@ "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", "dev": true }, + "copy-anything": { + "version": "2.0.6", + "resolved": "https://registry.npmmirror.com/copy-anything/-/copy-anything-2.0.6.tgz", + "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==", + "dev": true, + "requires": { + "is-what": "^3.14.1" + } + }, "copy-concurrently": { "version": "1.0.5", "resolved": "https://registry.npm.taobao.org/copy-concurrently/download/copy-concurrently-1.0.5.tgz", @@ -4895,6 +4928,15 @@ "estraverse": "^4.1.0" } }, + "esri-leaflet": { + "version": "3.0.8", + "resolved": "https://registry.npmmirror.com/esri-leaflet/-/esri-leaflet-3.0.8.tgz", + "integrity": "sha512-mLb4pRfDAbkG1YhuajD22erLXIAtrF1R32hmgmlJNI3t47n6KjTppCb8lViia0O7+GDORXFuJ9Lj9RkpsaKhSA==", + "requires": { + "@terraformer/arcgis": "^2.1.0", + "tiny-binary-search": "^1.0.3" + } + }, "estraverse": { "version": "4.3.0", "resolved": "https://registry.npm.taobao.org/estraverse/download/estraverse-4.3.0.tgz", @@ -6619,6 +6661,13 @@ "integrity": "sha1-dQ49tYYgh7RzfrrIIH/9HvJ7Jfw=", "dev": true }, + "image-size": { + "version": "0.5.5", + "resolved": "https://registry.npmmirror.com/image-size/-/image-size-0.5.5.tgz", + "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==", + "dev": true, + "optional": true + }, "import-cwd": { "version": "2.1.0", "resolved": "https://registry.npm.taobao.org/import-cwd/download/import-cwd-2.1.0.tgz", @@ -7085,6 +7134,12 @@ "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", "dev": true }, + "is-what": { + "version": "3.14.1", + "resolved": "https://registry.npmmirror.com/is-what/-/is-what-3.14.1.tgz", + "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==", + "dev": true + }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npm.taobao.org/is-windows/download/is-windows-1.0.2.tgz", @@ -7159,6 +7214,11 @@ } } }, + "js-cookie": { + "version": "2.2.1", + "resolved": "https://registry.npmmirror.com/js-cookie/-/js-cookie-2.2.1.tgz", + "integrity": "sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==" + }, "js-message": { "version": "1.0.5", "resolved": "https://registry.npm.taobao.org/js-message/download/js-message-1.0.5.tgz", @@ -7195,6 +7255,11 @@ "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", "dev": true }, + "jsencrypt": { + "version": "3.3.0", + "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.0.tgz", + "integrity": "sha512-OPfQMUU3pJ6KKTvKzr83jePHfyD1zWiWeLtRU9yIWjcbaRWm8MuXIu1/eQlDXPwDZrUjZy+9HVamS2Kmwrvz/Q==" + }, "jsesc": { "version": "2.5.2", "resolved": "https://registry.npm.taobao.org/jsesc/download/jsesc-2.5.2.tgz", @@ -7320,6 +7385,110 @@ "invert-kv": "^2.0.0" } }, + "leaflet": { + "version": "1.9.2", + "resolved": "https://registry.npmmirror.com/leaflet/-/leaflet-1.9.2.tgz", + "integrity": "sha512-Kc77HQvWO+y9y2oIs3dn5h5sy2kr3j41ewdqCMEUA4N89lgfUUfOBy7wnnHEstDpefiGFObq12FdopGRMx4J7g==" + }, + "less": { + "version": "3.13.1", + "resolved": "https://registry.npmmirror.com/less/-/less-3.13.1.tgz", + "integrity": "sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==", + "dev": true, + "requires": { + "copy-anything": "^2.0.1", + "errno": "^0.1.1", + "graceful-fs": "^4.1.2", + "image-size": "~0.5.0", + "make-dir": "^2.1.0", + "mime": "^1.4.1", + "native-request": "^1.0.5", + "source-map": "~0.6.0", + "tslib": "^1.10.0" + }, + "dependencies": { + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "dev": true, + "optional": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "optional": true + } + } + }, + "less-loader": { + "version": "6.2.0", + "resolved": "https://registry.npmmirror.com/less-loader/-/less-loader-6.2.0.tgz", + "integrity": "sha512-Cl5h95/Pz/PWub/tCBgT1oNMFeH1WTD33piG80jn5jr12T4XbxZcjThwNXDQ7AG649WEynuIzO4b0+2Tn9Qolg==", + "dev": true, + "requires": { + "clone": "^2.1.2", + "less": "^3.11.3", + "loader-utils": "^2.0.0", + "schema-utils": "^2.7.0" + }, + "dependencies": { + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "ajv-keywords": { + "version": "3.5.2", + "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "dev": true + }, + "clone": { + "version": "2.1.2", + "resolved": "https://registry.npmmirror.com/clone/-/clone-2.1.2.tgz", + "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==", + "dev": true + }, + "json5": { + "version": "2.2.1", + "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.1.tgz", + "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", + "dev": true + }, + "loader-utils": { + "version": "2.0.3", + "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.3.tgz", + "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "schema-utils": { + "version": "2.7.1", + "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-2.7.1.tgz", + "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.5", + "ajv": "^6.12.4", + "ajv-keywords": "^3.5.2" + } + } + } + }, "leven": { "version": "3.1.0", "resolved": "https://registry.npm.taobao.org/leven/download/leven-3.1.0.tgz", @@ -8044,6 +8213,13 @@ "resolved": "https://registry.npmjs.org/nanopop/-/nanopop-2.1.0.tgz", "integrity": "sha512-jGTwpFRexSH+fxappnGQtN9dspgE2ipa1aOjtR24igG0pv6JCxImIAmrLRHX+zUF5+1wtsFVbKyfP51kIGAVNw==" }, + "native-request": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/native-request/-/native-request-1.1.0.tgz", + "integrity": "sha512-uZ5rQaeRn15XmpgE0xoPL8YWqcX90VtCFglYwAgkvKM5e8fog+vePLAhHxuuv/gRkrQxIeh5U3q9sMNUrENqWw==", + "dev": true, + "optional": true + }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npm.taobao.org/natural-compare/download/natural-compare-1.4.0.tgz", @@ -11116,6 +11292,11 @@ "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", "dev": true }, + "tiny-binary-search": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/tiny-binary-search/-/tiny-binary-search-1.0.3.tgz", + "integrity": "sha512-STSHX/L5nI9WTLv6wrzJbAPbO7OIISX83KFBh2GVbX1Uz/vgZOU/ANn/8iV6t35yMTpoPzzO+3OQid3mifE0CA==" + }, "tinycolor2": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz", @@ -11756,6 +11937,11 @@ "integrity": "sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=", "dev": true }, + "vuescroll": { + "version": "4.17.5", + "resolved": "https://registry.npmmirror.com/vuescroll/-/vuescroll-4.17.5.tgz", + "integrity": "sha512-TjzRp0OpF99SiulIFw2txoT5tbUyCT0IaMiMw87r1shbQ6Mi94ZcEJ294ihEaiVcHHDpTm9oEudIkWThz7HUPQ==" + }, "vuex": { "version": "3.1.3", "resolved": "https://registry.npm.taobao.org/vuex/download/vuex-3.1.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvuex%2Fdownload%2Fvuex-3.1.3.tgz", diff --git a/package.json b/package.json index f8d7343..7e79fae 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "axios": "^0.21.1", "core-js": "^3.6.4", "echarts": "^4.6.0", + "esri-leaflet": "^3.0.8", "js-cookie": "^2.2.1", "jsencrypt": "^3.0.0-rc.1", "leaflet": "^1.7.1", diff --git a/public/static/project.config.json b/public/static/project.config.json index 1173170..19a4b3f 100644 --- a/public/static/project.config.json +++ b/public/static/project.config.json @@ -1,11 +1,11 @@ { "title": "珠海三溪科创小镇智慧园区平台", - "baseUrl": "http://36.133.150.166:20005/", + "baseUrl": "http://36.133.189.112:8082/", "singleSys": true, "city":"三溪小镇", "mapType":["leaflet"], "center":[22.289856,113.496093], - "zoom":15, + "zoom":16, "mapUrl":"https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=adbdd8e08c292f6cb4e3f0289f7d0447", "labelUrl":"https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=adbdd8e08c292f6cb4e3f0289f7d0447", "satelliteUrl":"http://t0.tianditu.gov.cn/img_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=adbdd8e08c292f6cb4e3f0289f7d0447", diff --git a/src/api/overview.js b/src/api/overview.js index 7d89ee7..c9651a6 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -23,7 +23,8 @@ // 获取报警列表 export function getAlarmsNow(params) { return request({ - url: 'overview/alarmNow', + baseURL:'http://111.198.10.15:21406', + url: '/device/alarmList', method: 'get', params }) @@ -40,10 +41,11 @@ }) } -// 井查询 +// 设备查询 export function getDeviceList(params) { return request({ - url: 'overview/deviceList', + baseURL:'http://111.198.10.15:21406', + url: '/statics/deviceList', method: 'get', params }) diff --git a/src/components/leafletMap/leafletMap.vue b/src/components/leafletMap/leafletMap.vue index 434553b..188fead 100644 --- a/src/components/leafletMap/leafletMap.vue +++ b/src/components/leafletMap/leafletMap.vue @@ -7,7 +7,6 @@