Skip to content

S
supervise-front
Commit 223d15c2 by niuxiaolin
Options

替换OA 和Bmap

parent ab2f809c
Showing with 82 additions and 10 deletions
angular.json
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
], ],
"scripts":[ "scripts":[
"src/getscript.js",
"src/assets/GeoUtils.js", "src/assets/GeoUtils.js",
"src/assets/mapv.js" "src/assets/mapv.js"
], ],
......
package-lock.json
...@@ -3718,12 +3718,14 @@ ...@@ -3718,12 +3718,14 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -3738,17 +3740,20 @@ ...@@ -3738,17 +3740,20 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -3865,7 +3870,8 @@ ...@@ -3865,7 +3870,8 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -3877,6 +3883,7 @@ ...@@ -3877,6 +3883,7 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -3891,6 +3898,7 @@ ...@@ -3891,6 +3898,7 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -3898,12 +3906,14 @@ ...@@ -3898,12 +3906,14 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.3.5", "version": "2.3.5",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -3922,6 +3932,7 @@ ...@@ -3922,6 +3932,7 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -4002,7 +4013,8 @@ ...@@ -4002,7 +4013,8 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -4014,6 +4026,7 @@ ...@@ -4014,6 +4026,7 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -4135,6 +4148,7 @@ ...@@ -4135,6 +4148,7 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
......
publish-to-backend.ps1 0 → 100644
$msg = "latest ui $(get-date)"
git pull
git add .
git commit -m $msg
git push
Remove-Item -Recurse -Force D:\\projects\\ems-inspect\\src\\main\\resources\\static
mkdir D:\\projects\\ems-inspect\\src\\main\\resources\\static
Copy-Item D:\\projects\\ems-inspect-front\\dist\\* -Destination D:\\projects\\ems-inspect\\src\\main\\resources\\static\\ -Recurse
cd ../ems-inspect
git pull
git add .
git commit -m $msg
git push
\ No newline at end of file
src/app/main/main.component.ts
...@@ -131,6 +131,7 @@ export class MainComponent implements OnInit { ...@@ -131,6 +131,7 @@ export class MainComponent implements OnInit {
lng: 112.43176242674386, lng: 112.43176242674386,
zoom: 10, zoom: 10,
}}); }});
(window as any).map=this.map;
this.map.setMapStyleV2({ styleJson: theme }); this.map.setMapStyleV2({ styleJson: theme });
this.map.enableScrollWheelZoom(true); this.map.enableScrollWheelZoom(true);
this.map.centerAndZoom("山西省",11); this.map.centerAndZoom("山西省",11);
......
src/assets/getscript.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/map_load.js 0 → 100644
var bmapcfg = {
'imgext' : '.jpg', //瓦片图的后缀 根据需要修改，一般是 .png .jpg
'tiles_dir' : '', //普通瓦片图的地址，为空默认在tiles/ 目录
};
var scripts = document.getElementsByTagName("script");
var JS__FILE__ = scripts[scripts.length - 1].getAttribute("src"); //获得当前js文件路径
bmapcfg.home = JS__FILE__.substr(0, JS__FILE__.lastIndexOf("/")+1); //地图API主目录
(function(){
window.BMap_loadScriptTime = (new Date).getTime();
//加载地图API主文件
document.write('<script type="text/javascript" src="'+bmapcfg.home+'getscript.js"></script>');
})();
src/getscript.js
...@@ -3179,6 +3179,7 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6"; ...@@ -3179,6 +3179,7 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
return c return c
} }
;function pa(a, b) { ;function pa(a, b) {
if (/^http/.test(a)) return;//修改 屏蔽ak验证，若调用外部资源直接返回
if (b) { if (b) {
var c = (1E5 * Math.random()).toFixed(0); var c = (1E5 * Math.random()).toFixed(0);
D._rd["_cbk" + c] = function(a) { D._rd["_cbk" + c] = function(a) {
...@@ -3354,7 +3355,15 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6"; ...@@ -3354,7 +3355,15 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
} }
f.OB = t; f.OB = t;
f.Pd.Wm.length = 0; f.Pd.Wm.length = 0;
0 == a.length ? f.XJ() : pa(f.tF.$O + "&mod=" + a.join(",")) // 0 == a.length ? f.XJ() : pa(f.tF.$O + "&mod=" + a.join(","))
console.log(a);
if(a.length>0){
for(i=0;i<a.length;i++){
mf="/assets/modules/"+a[i]+'.js';
pa(mf);
console.log('load moudle:'+mf);
}
}
}, 1)); }, 1));
e.Ke = this.tj.RO e.Ke = this.tj.RO
} }
...@@ -5943,7 +5952,11 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6"; ...@@ -5943,7 +5952,11 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
var b = this.map.va(); var b = this.map.va();
if (!this.map.Nd() && (a ? this.map.U.e_ = a : a = this.map.U.e_, if (!this.map.Nd() && (a ? this.map.U.e_ = a : a = this.map.U.e_,
a)) a))
for (var c = s, c = "2" == D.Nt ? [D.url.proto + D.url.domain.main_domain_cdn.other[0] + "/"] : [D.url.proto + D.url.domain.main_domain_cdn.baidu[0] + "/", D.url.proto + D.url.domain.main_domain_cdn.baidu[1] + "/", D.url.proto + D.url.domain.main_domain_cdn.baidu[2] + "/"], e = 0, f; f = this.mm[e]; e++) for (var c = s,
c =["/assets/test"],
e = 0, f;
f = this.mm[e];
e++)
if (f.RZ == p) { if (f.RZ == p) {
b.m.pc = 18; b.m.pc = 18;
f.getTilesUrl = function(b, e) { f.getTilesUrl = function(b, e) {
......
src/index.html
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico"> <link rel="icon" type="image/x-icon" href="favicon.ico">
<script src="/assets/map_load.js"></script>
<link rel="stylesheet" href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css" /> <link rel="stylesheet" href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css" />
<style> <style>
body{ body{
......
src/map_load.js 0 → 100644
var bmapcfg = {
'imgext' : '.jpg', //瓦片图的后缀 根据需要修改，一般是 .png .jpg
'tiles_dir' : '', //普通瓦片图的地址，为空默认在tiles/ 目录
};
var scripts = document.getElementsByTagName("script");
var JS__FILE__ = scripts[scripts.length - 1].getAttribute("src"); //获得当前js文件路径
bmapcfg.home = JS__FILE__.substr(0, JS__FILE__.lastIndexOf("/")+1); //地图API主目录
(function(){
window.BMap_loadScriptTime = (new Date).getTime();
//加载地图API主文件
document.write('<script type="text/javascript" src="'+bmapcfg.home+'getscript.js"></script>');
})();
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