Commit 21216612 authored by 周远喜's avatar 周远喜

地图ok

parent 0816c9d9
...@@ -200,4 +200,18 @@ henq.getArry = (arryList) => {//得到数据字典对应的label和value,用 ...@@ -200,4 +200,18 @@ henq.getArry = (arryList) => {//得到数据字典对应的label和value,用
}); });
return arry; return arry;
} }
henq.random=(minNum, maxNum)=> {
switch (arguments.length) {
case 1:
return parseInt(Math.random() * minNum + 1, 10);
break;
case 2:
return parseInt(Math.random() * ( maxNum - minNum + 1 ) + minNum, 10);
//或者 Math.floor(Math.random()*( maxNum - minNum + 1 ) + minNum );
break;
default:
return 0;
break;
}
}
export default henq; export default henq;
...@@ -30,7 +30,11 @@ export default { ...@@ -30,7 +30,11 @@ export default {
], ],
script: [{ script: [{
src: '/config.js' src: '/config.js'
}], }
// ,{
// src:'http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js'
// }
],
link: [{ link: [{
rel: 'icon', rel: 'icon',
type: 'image/x-icon', type: 'image/x-icon',
......
...@@ -3492,6 +3492,34 @@ ...@@ -3492,6 +3492,34 @@
"resolved": "http://r.cnpmjs.org/bluebird/download/bluebird-3.7.2.tgz", "resolved": "http://r.cnpmjs.org/bluebird/download/bluebird-3.7.2.tgz",
"integrity": "sha1-nyKcFb4nJFT/qXOs4NvueaGww28=" "integrity": "sha1-nyKcFb4nJFT/qXOs4NvueaGww28="
}, },
"bmaplib.curveline": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/bmaplib.curveline/-/bmaplib.curveline-1.0.0.tgz",
"integrity": "sha512-9wcFMVhiYxNPqpvsLDAADn3qDhNzXp2mA6VyHSHg2XOAgSooC7ZiujdFhy0sp+0QYjTfJ/MjmLuNoUg2HHxH4Q=="
},
"bmaplib.heatmap": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/bmaplib.heatmap/-/bmaplib.heatmap-1.0.4.tgz",
"integrity": "sha512-rmhqUARBpUSJ9jXzUI2j7dIOqnc38bqubkx/8a349U2qtw/ulLUwyzRD535OrA8G7w5cz4aPKm6/rNvUAarg/Q=="
},
"bmaplib.lushu": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/bmaplib.lushu/-/bmaplib.lushu-1.0.7.tgz",
"integrity": "sha512-LVvgpESPii6xGxyjnQjq8u+ic4NjvhdCPV/RiSS/PGTUdZKeTDS7prSpleJLZH3ES0+oc0gYn8bw0LtPYUSz2w=="
},
"bmaplib.markerclusterer": {
"version": "1.0.13",
"resolved": "https://registry.npmjs.org/bmaplib.markerclusterer/-/bmaplib.markerclusterer-1.0.13.tgz",
"integrity": "sha512-VrLyWSiuDEVNi0yUfwOhFQ6z1oEEHS4w36GNu3iASu6p52QIx9uAXMUkuSCHReNR0bj2Cp9SA1dSx5RpojXajQ==",
"requires": {
"bmaplib.texticonoverlay": "^1.0.2"
}
},
"bmaplib.texticonoverlay": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/bmaplib.texticonoverlay/-/bmaplib.texticonoverlay-1.0.2.tgz",
"integrity": "sha512-4ZTWr4ZP3B6qEWput5Tut16CfZgII38YwM3bpyb4gFTQyORlKYryFp9WHWrwZZaHlOyYDAXG9SX0hka43jTADg=="
},
"bn.js": { "bn.js": {
"version": "4.11.8", "version": "4.11.8",
"resolved": "http://r.cnpmjs.org/bn.js/download/bn.js-4.11.8.tgz", "resolved": "http://r.cnpmjs.org/bn.js/download/bn.js-4.11.8.tgz",
...@@ -11304,6 +11332,14 @@ ...@@ -11304,6 +11332,14 @@
"integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
"dev": true "dev": true
}, },
"linkify-it": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
"integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
"requires": {
"uc.micro": "^1.0.1"
}
},
"lint-staged": { "lint-staged": {
"version": "7.3.0", "version": "7.3.0",
"resolved": "http://r.cnpmjs.org/lint-staged/download/lint-staged-7.3.0.tgz", "resolved": "http://r.cnpmjs.org/lint-staged/download/lint-staged-7.3.0.tgz",
...@@ -11923,6 +11959,25 @@ ...@@ -11923,6 +11959,25 @@
"object-visit": "^1.0.0" "object-visit": "^1.0.0"
} }
}, },
"markdown-it": {
"version": "8.4.2",
"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz",
"integrity": "sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==",
"requires": {
"argparse": "^1.0.7",
"entities": "~1.1.1",
"linkify-it": "^2.0.0",
"mdurl": "^1.0.1",
"uc.micro": "^1.0.5"
},
"dependencies": {
"entities": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
"integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
}
}
},
"marked": { "marked": {
"version": "0.3.19", "version": "0.3.19",
"resolved": "http://r.cnpmjs.org/marked/download/marked-0.3.19.tgz", "resolved": "http://r.cnpmjs.org/marked/download/marked-0.3.19.tgz",
...@@ -11949,6 +12004,11 @@ ...@@ -11949,6 +12004,11 @@
"resolved": "http://r.cnpmjs.org/mdn-data/download/mdn-data-2.0.4.tgz", "resolved": "http://r.cnpmjs.org/mdn-data/download/mdn-data-2.0.4.tgz",
"integrity": "sha1-aZs8OKxvHXKAkaZGULZdOIUC/Vs=" "integrity": "sha1-aZs8OKxvHXKAkaZGULZdOIUC/Vs="
}, },
"mdurl": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
"integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
},
"media-typer": { "media-typer": {
"version": "0.3.0", "version": "0.3.0",
"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
...@@ -21853,6 +21913,11 @@ ...@@ -21853,6 +21913,11 @@
"resolved": "http://r.cnpmjs.org/ua-parser-js/download/ua-parser-js-0.7.21.tgz", "resolved": "http://r.cnpmjs.org/ua-parser-js/download/ua-parser-js-0.7.21.tgz",
"integrity": "sha1-hTz5zpP2QvZxdCc8w0Vlrm8wh3c=" "integrity": "sha1-hTz5zpP2QvZxdCc8w0Vlrm8wh3c="
}, },
"uc.micro": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
"integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
},
"uglify-js": { "uglify-js": {
"version": "3.4.10", "version": "3.4.10",
"resolved": "http://r.cnpmjs.org/uglify-js/download/uglify-js-3.4.10.tgz", "resolved": "http://r.cnpmjs.org/uglify-js/download/uglify-js-3.4.10.tgz",
...@@ -22193,6 +22258,18 @@ ...@@ -22193,6 +22258,18 @@
"resolved": "http://r.cnpmjs.org/vue/download/vue-2.6.11.tgz", "resolved": "http://r.cnpmjs.org/vue/download/vue-2.6.11.tgz",
"integrity": "sha1-dllNh31LEiNEBuhONSdcbVFBJcU=" "integrity": "sha1-dllNh31LEiNEBuhONSdcbVFBJcU="
}, },
"vue-baidu-map": {
"version": "0.21.22",
"resolved": "https://registry.npmjs.org/vue-baidu-map/-/vue-baidu-map-0.21.22.tgz",
"integrity": "sha512-WQMPCih4UTh0AZCKKH/OVOYnyAWjfRNeK6BIeoLmscyY5aF8zzlJhz/NOHLb3mdztIpB0Z6aohn4Jd9mfCSjQw==",
"requires": {
"bmaplib.curveline": "^1.0.0",
"bmaplib.heatmap": "^1.0.4",
"bmaplib.lushu": "^1.0.7",
"bmaplib.markerclusterer": "^1.0.13",
"markdown-it": "^8.4.0"
}
},
"vue-class-component": { "vue-class-component": {
"version": "7.2.3", "version": "7.2.3",
"resolved": "https://registry.npm.taobao.org/vue-class-component/download/vue-class-component-7.2.3.tgz", "resolved": "https://registry.npm.taobao.org/vue-class-component/download/vue-class-component-7.2.3.tgz",
......
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
"ua-parser-js": "^0.7.18", "ua-parser-js": "^0.7.18",
"v-viewer": "^1.5.1", "v-viewer": "^1.5.1",
"view-design": "^4.1.3", "view-design": "^4.1.3",
"vue-baidu-map": "^0.21.22",
"vue-echarts": "^4.0.3", "vue-echarts": "^4.0.3",
"vue-i18n": "^8.15.5", "vue-i18n": "^8.15.5",
"vue-json-viewer": "^2.2.8", "vue-json-viewer": "^2.2.8",
......
This diff is collapsed.
...@@ -37,7 +37,7 @@ import ResourceSelect from '@/components/page/resourceSelect.vue' ...@@ -37,7 +37,7 @@ import ResourceSelect from '@/components/page/resourceSelect.vue'
import StoreTree from '@/components/page/storeTree.vue' import StoreTree from '@/components/page/storeTree.vue'
import StoreSelect from '@/components/page/storeSelect.vue' import StoreSelect from '@/components/page/storeSelect.vue'
import clipboard from 'clipboard'; import clipboard from 'clipboard';
import BaiduMap from 'vue-baidu-map'
// import i18n from '@/i18n'; // import i18n from '@/i18n';
import radioButton from '@/components/page/radioButton.vue' import radioButton from '@/components/page/radioButton.vue'
import InputIcon from '@/components/page/inputIcon.vue' import InputIcon from '@/components/page/inputIcon.vue'
...@@ -147,7 +147,10 @@ export default ({ ...@@ -147,7 +147,10 @@ export default ({
i18n: (key, value) => app.i18n.t(key, value) i18n: (key, value) => app.i18n.t(key, value)
}) })
Vue.use(iViewPro); Vue.use(iViewPro);
Vue.use(BaiduMap, {
// ak 是在百度地图开发者平台申请的密钥 详见 http://lbsyun.baidu.com/apiconsole/key */
ak: 'NMVkIGzyFBL6g3ekXIZqIYMCnvz74YOc'
})
Vue.prototype.$log = { Vue.prototype.$log = {
...util.log, ...util.log,
push(data) { push(data) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment