diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..df30947 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ + +.idea/ diff --git a/.project b/.project new file mode 100644 index 0000000..b4b5b26 --- /dev/null +++ b/.project @@ -0,0 +1,28 @@ + + + sysprojectms + + + + + + com.aptana.ide.core.unifiedBuilder + + + + + + com.aptana.projects.webnature + + + + 1502423714354 + + 26 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-node_modules + + + + diff --git a/css/common.css b/css/common.css index ec061cf..d3b91a2 100644 --- a/css/common.css +++ b/css/common.css @@ -14,7 +14,6 @@ ul{ } body,ul,li{ list-style:none; - } .fl{ float: left; diff --git a/css/parkhotarea.css b/css/parkhotarea.css index e25a4db..ddf59be 100644 --- a/css/parkhotarea.css +++ b/css/parkhotarea.css @@ -27,6 +27,7 @@ a:link,a:visited,a:hover,a:active{ } /*地图停车场弹窗*/ .parkpop-contenttop{ + font-family: "Microsoft YaHei"; width: 220px; height: 170px; /*padding: 8px;*/ diff --git a/css/parkquery.css b/css/parkquery.css index 1d6855a..2391cdd 100644 --- a/css/parkquery.css +++ b/css/parkquery.css @@ -599,7 +599,9 @@ a:link,a:visited,a:hover,a:active{ background: rgba(30,43,103,.5); border: 1px solid #07337b; z-index: 1; + font-family: "Microsoft YaHei" !important; } + .parkpop-main{ width: 202px; height: 152px; @@ -670,4 +672,5 @@ a:link,a:visited,a:hover,a:active{ font-size: 14px; color: #fff; text-align: center; + font-family: "Microsoft YaHei" !important; } \ No newline at end of file diff --git a/img/index_titbg.png b/img/index_titbg.png index e5d9642..ae6b033 100644 --- a/img/index_titbg.png +++ b/img/index_titbg.png diff --git a/img/zte_itslogo.png b/img/zte_itslogo.png index ed665c8..8e21851 100644 --- a/img/zte_itslogo.png +++ b/img/zte_itslogo.png diff --git a/js/common/unit.js b/js/common/unit.js index ad03d22..e3d0e03 100644 --- a/js/common/unit.js +++ b/js/common/unit.js @@ -8,15 +8,20 @@ sysComm = { sysCode: '1001',//系统编码 - cityId:91,//市id - provId:5,//省id - point_lng:118.917132,//赤峰市万达广场经度 - point_lat:42.255586,//赤峰市万达广场纬度(118.917132,42.255586) + cityId:309,//市id + provId:23,//省id + cityName:'眉山市',//城市 + areaName:'眉山市东坡区', + point_lng:103.839461,//赤峰市万达广场经度 + point_lat:30.044922,//赤峰市万达广场纬度(118.917132,42.255586) + centerpoint_lng:103.839461,//热点区域中心点 + centerpoint_lat:30.044922,//维多利购物广场坐标（118.967899,42.279838） grantType: 'PASSWORD',//授权模式 clientType: 'WEB'//客户端类型 } +// var baseUrl = 'http://192.168.1.196:8099/';// url公用地址 var baseUrl = 'http://120.26.116.79:8094/';// url公用地址 //var baseUrl = 'http://127.0.0.1:8099/';// url公用地址 diff --git a/js/lib/meishan.js b/js/lib/meishan.js new file mode 100644 index 0000000..fdd3f32 --- /dev/null +++ b/js/lib/meishan.js @@ -0,0 +1 @@ +(function (root, factory) {if (typeof define === 'function' && define.amd) {define(['exports', 'echarts'], factory);} else if (typeof exports === 'object' && typeof exports.nodeName !== 'string') {factory(exports, require('echarts'));} else {factory({}, root.echarts);}}(this, function (exports, echarts) {var log = function (msg) {if (typeof console !== 'undefined') {console && console.error && console.error(msg);}};if (!echarts) {log('ECharts is not Loaded');return;}if (!echarts.registerMap) {log('ECharts Map is not loaded');return;}echarts.registerMap('meishan', {"type":"FeatureCollection","features":[{"type":"Feature","id":"511403","properties":{"name":"彭山区","cp":[103.872949,30.193056],"childNum":3},"geometry":{"type":"MultiPolygon","coordinates":[["@@B@HADABBD@B@BBDDDH@AB@BADA@@@A@AA@@@A@@@@@A@@A@@BA@@AA@AA@@@AAC@AA@@A@@BA@A@A@BA@@AAAA@@DA@@@A@@@@@A@@D@@@BABA@@@@@A@@CAAAA@@@@C@A@@@AB@AA@@A@@AA@AAAAA@A@@@@AA@@B@AA@@@@A@@A@A@AAA@AB@@@BCB@BAB@BBBA@@@@@B@BB@@A@@@@@@B@@BB@@A@ABA@A@AB@@@@@@BBAF@B@BA@ABC@A@@BAB@FBD@@@BB@@@B@FCDAF@@@BB@DBBFBB@F@@A@@EAA@@A"],["@@BCBABCMCED@DIBEAGEFIAAEAICIAEIEGGOCG@GJIHC@GAACC@SAKBCB@FNBBD@BCBEFMHAADAB@BLGNGVMAGAACGGIHGBA@A@ABABADABCDAD@DA@@JAH@FCDABA@CAA@CEECAC@KAA@@@AEAGAE@@DCJEBABA@CCEAE@ABCDA@ABAEKGIEGCIEIGHOHKHGFCBEDGDEBC@OHEBEBKBI@EAIKAECEEM@I@CBAACCEECE@CBEFALAJAHBJBHBHAFABGFIBC@CA@@@I@AA@A@A@G@GBEBAB@@CF@BCBCBC@CBI@A@A@EBGBABCBEDCBCHCBC@C@CBAAE@EAC@EBGBC@IBEBCBCBABADABC@@@C@G@C@AA@@ACAACAC@EDIFCBCB@@GBI@C@IFIDEBCDEJCFCHAHAN@F@D@B@BDF@@AD@B@@@BHF@B@B@DCDAF@F@BBBB@D@D@F@H@B@@B@BG@EB@B@BFJBBADENGNCDCBE@DFBBD@BAB@@BBBDDBBB@D@JCB@B@B@@BBD@D@DILIL@D@B@BBBDBF@H@B@BAFEB@BBDBB@FA@@BB@N@DDDB@DBH@D@BADAB@B@BB@@@D@DADAD@BB@FJDBDDLDFDJFNHFBD@FAJCF@B@J@V@DBF@FAN@FAB@B@@@B@DBDBDBFBB@FB@@@@@@N@DBDBDJ@BD@@A@C@I@ABADADGBABA@ABEBABA@A@A@CDAB@HBFBHBH@D@HADABB@DBHBDB@A@BBD@DBBD@B@DABADCFAB@DBBBDDBDBB@JDDAF@D@FADAFBDA@@@A@@@AECAACAAA@C@ABCBE@@DCBADG@ABEFCDCBABADCDCDADAD@D@DABCDA@C"],["@@@EBEDIDGAIEKEGECUNMHKH@ABABCGBENAFADC@AAEMA@ADBL@TDDBB@HGDIJ@HDHHPFHFJJBJDFBBBLDLDNDDABADAB@BA@A@C@@AMAA@@@EBCBCBCDA@@DABA@@DABCBA@C@ABAA@@E@AACCAICCECCAE"]],"encodeOffsets":[[[106186,30997]],[[106462,31043]],[[106469,30986]]]}},{"type":"Feature","id":"511402","properties":{"name":"东坡区","cp":[103.831863,30.042308],"childNum":1},"geometry":{"type":"Polygon","coordinates":["@@AA@AAIC@AAEBCBAB@BBD@B@BCBE@A@@A@ABIAAC@CBEDEFGFC@E@@A@@CBCDABA@CAAAAC@CBC@@BABADACAA@A@A@CBA@ADABA@A@E@CA@AECCCCAAA@@ABAB@@CDCFCDIFG@EBG@EBCBCDCFCF@BAB@@ABGLGDIAGIAMAIAI@E@IBGFAJANIDGBCB@@A@IBKGAOBQFGBGBG@A@IBG@G@GBK@SCMAOCMEA@EDI@AB@BC@@@AB@@CBA@@@@BBB@B@@BBB@@D@@ABEDAAA@KBCBA@@BAFAB@BB@@BB@@BABABE@A@AB@B@BBBDB@B@BA@C@ECC@EB@@AB@BBB@BAB@@@@EBC@@@@B@BDD@BBD@@AB@BBJAB@BCBC@EBEBA@CDCBEBCBKBC@C@A@@ABCBE@@AAEAAAAAC@AAC@A@I@GAABA@ABA@A@@@C@A@CAIGCA@A@C@@A@AAEBA@CB@@@@CBCB@BB@EDABGBCBCBB@@B@B@BCBAB@B@F@B@DCBCF@B@BBB@B@B@@CD@@AB@@A@@@EAGAA@C@A@@@CF@BABA@A@C@A@A@C@CCA@C@IDCBEBABABAD@B@@DB@@@BBB@B@B@@@BADA@ABC@@BABBB@@BBB@DBHD@BA@@BABEHAD@B@D@BBB@@BBFDB@@B@BLP@@FJHPBJ@@@@DBB@BB@@AFGNEFABC@C@AACGA@A@ABGFABADBDA@C@C@C@CCAC@@CACACAC@A@CDAD@DADAD@BC@A@A@@A@EACA@A@A@A@AB@BCN@BADADAD@DBL@FBF@D@BADABABG@CBGHEFCDABAB@B@B@LDH@BD@D@FAD@B@@BBDABBBBDFLBBHJDBDBDBF@B@@B@B@@ABCBADCFAH@D@DBBBDBF@FBDBBDBDBPFDBHDBBFFBDBBBBBBBB@BB@@B@@@BB@@B@@@@@B@@@@@@A@@@@B@@@@@@@@@@A@@@@@@@@@AB@@@@@@@B@@A@@B@@@BA@@BA@@B@@A@@B@@AB@BA@@B@@A@@B@@@B@@@BAB@B@@@@@@@B@@@@HBLDJDPDFBB@BBB@BFBD@@BBFBFBNF@@B@FAB@B@B@FHBBJ@BBFBD@F@JAHAB@@A@ACCACAABABAB@D@DBDBBBDFLRBFDJ@@B@BABADCBC@CDABAHARID@B@BD@J@BEL@B@FB@@BABEFAB@B@DBFDHBDFBB@B@LBLBTBHBFBJDHF@@@@BAB@BBB@B@@@@B@@B@@B@AB@@B@@B@B@BBBBB@@BB@@@BBA@@B@@@B@D@@B@BBDB@@@B@@@@ABAB@@C@@@@B@@@@@B@@CB@@BBBB@@ABB@B@B@@AB@@@BBD@BB@@B@@BBB@@AB@@@BB@@@@@B@@@B@@B@B@@CBABA@@B@@BBBDBB@@F@DADCHMFMBCAAEI@A@AFAH@@A@AA@G@E@C@C@A@AA@A@EBEDC@C@A@AGE@A@@@ABC@@CE@A@A@C@EBMBGDGDEFIDCFAJCJED@J@HA@@DADAJEFCD@DBBBBD@@BBD@H@D@@@D@BABCBADADAFAJAD@HAFAD@FBF@BBDAD@D@DADGDAFCDABAHAFAB@B@J@DAD@DADA@ADE@@BAFAHAH@B@B@B@@B@J@@DBD@JAHEBABEAGAGAIBGBIBKFEDAF@FDDFBDAB@D@JFNDFBFJLFBJ@LAFAFAPGD@FAHCFCDAHELGPGHG@O@GDEDCHIFIDIFOBEDK@K@M@GAEEQAC@A@AAACCCCAAAAAAACBCBCBA@A@A@CBCBABC@@@C@@AAGECC@A@ABABA@A@CAA@@AAAAACAA@A@ABCFG@@@A@@A@ABABC@@@AAA@BA@A@AAAEACAA@AA@A@ADCDC@@@A@A@ACEAACAC@EBCHABC@C@GCEA@@CBC@E@A@ABA@@B@B@@@@@BABAAC@AC@A@CA@A@A@@@@BCB@A@A@C@A@A@@@ADCBAD@D@D@BAD@BADADABAHAD@B@H@B@B@@A@ACGBCBCBCDGBA@C@C@C@GBE@ABC@ABCBA@EBABAB@B@BC@@@CAAEECECA@A@@FECB@GCECCECECEASFEDEBCBA@IBIBCCC@A@AC"],"encodeOffsets":[[106404,30622]]}},{"type":"Feature","id":"511421","properties":{"name":"仁寿县","cp":[104.133995,29.995635],"childNum":3},"geometry":{"type":"MultiPolygon","coordinates":[["@@AC@B@@@@BB"],["@@B@@@@A@@A@A@@B@@B@@@@@@@"],["@@CACAAAA@EACAAAAAG@A@A@AACEACA@CDA@ABA@AAA@@AAAA@ABABABA@A@AAAA@A@A@ACAC@A@A@@A@A@AAAAACAA@A@AAA@C@AACACA@A@@BC@CA@BADAB@DCBAB@JEBEBA@EAAAACAAACAG@A@A@CBEB@BEDAB@DABGFA@CBCA@AA@@AAEAAA@CAAA@@@E@AA@@ACAA@AAA@@A@C@AAA@ACAACAA@A@C@AAA@@A@@AC@@AAA@A@A@A@AAAAACAAAAA@CAAA@A@ABCBA@@ABC@ABCAA@AAACCAC@A@GAA@@AAC@AA@A@@AA@ABC@AAAAE@AAACAAACA@@C@A@ABABCBA@A@C@CAEAA@A@A@@BA@@B@BDBBBABA@@@C@C@A@CBCBAB@@@B@B@BB@HB@@@DA@ABG@A@E@AD@B@@DBDBBB@B@B@BC@C@@@@@@@@B@@@BA@A@A@A@@@AD@D@B@B@BBBBDB@@B@BADABA@CBABA@C@CACCA@A@A@ABAA@ABC@E@A@@AAEBA@E@A@A@AAA@A@A@AB@BBDBBAD@BABA@A@AB@@ABBD@B@BA@AB@B@D@BBBB@BDDDBB@BABABA@A@AAA@AAAGCAEAG@AB@DBNDH@@@DBB@BBB@@@BB@AB@BA@@BA@@@ABA@C@CA@@A@ABAD@@CDA@A@A@A@ABA@CBC@G@CBC@E@EAA@AA@@@MCAA@A@CDCDA@C@EAC@AB@@@BADABMDABCFA@ABAF@FADCDCFC@A@A@A@@BA@@@A@CBABBDBB@DABE@@@IDA@A@GEA@CBA@ABAD@@@DADADABABC@A@ADADCDA@ADA@@BAD@B@FAFGDABAB@@EDABAB@B@BBBBBBBH@B@D@BBBBBD@BAB@DBB@BDFBBBDDDBDB@JBBB@F@B@D@B@B@B@@ABA@E@A@CAAAA@CBAD@D@@@D@D@D@BABABCBEBA@A@EBEAC@A@A@C@A@ABCBABA@AAAA@@C@A@AB@DBF@B@BD@DBB@DFDFBBBB@@BBBF@D@B@@@D@B@B@B@BAD@@CBCBAB@B@D@B@BA@A@AAA@AA@A@A@@CAA@A@EDCB@B@BA@A@A@@B@BA@ABCBCB@@EAACCAC@A@EAA@CBABC@EBA@CAA@AAAAACAAAC@AAAAAAA@@AAAA@AAACAC@A@AAEA@AAAAAA@A@C@ABA@ABADA@CBCBA@CB@CCC@@A@ABABBJ@JJFDHJFNDBBJDLHFHBHANGBECGEGEI@GBCDGJOXABEF@@@BDBDFFFBB@D@@ADA@A@ABAB@FABAD@BAD@BAF@H@D@D@DABCHADADADDH@B@BA@A@G@A@C@GBABCBCBABC@ABC@C@C@ABCD@B@@@B@B@D@B@BDA@A@@B@B@B@@D@BBDD@BBBA@A@@@@@A@AB@BAB@F@D@DA@@FBHDD@D@BADGFAD@DBBBDF@B@B@B@@CDCD@B@BBBB@DBFBBB@B@BABB@BB@@D@BABAB@@@@B@@EHAD@B@BBBBDBBBB@@BB@D@BABAB@B@BDDHFBB@@@D@@ADABAD@D@B@BABADADBDBBBBBBDDDDBB@B@BBDFRBF@H@N@LCLAFEPCJEJGJCDCF@H@PFJDJFHHJFLAB@BCBAD@BBFDF@DABABIFCD@@BFBHBF@@B@LBD@DBFF@DBB@DABCBEDG@IB@@CBC@CBADCBABAB@B@BABGHHJDHBBBHFDFHFLBJCHCJAF@FBFDDDFJDDBBD@B@FB@@@@@@@B@DCDCDCBCBA@@DCBA@@B@B@FA@@HB@@DB@@HD@@BB@@DB@@D@@@DAB@DB@@FDBBD@@ABC@E@@@@BA@AD@@@FDLD@@LD@@D@B@@@BC@C@@@ABA@@BABA@@B@@@D@BB@@DD@@BBB@@@B@BC@@BCBC@@BAA@DC@ABA@@DA@@D@DBDBB@B@BA@@BA@A@@AA@A@@@A@A@@B@@@BAB@DBFBA@D@DABABCBABEBABA@@DAPCDAB@B@BABC@@@A@@@CBCDA@@DA@@D@D@@@JBBB@@DD@@B@BBBBHBFBBBDB@@BBFDDD@@BBDB@B@@BB@D@H@@@B@D@D@A@F@B@DBB@D@B@@DDBBB@@BDLBBBDDBDBBBBBBD@@BBBH@B@D@B@@@BBDDB@@DB@@BB@DDDA@BDBDBHBFAF@B@BDBBB@@BBFFBDBBBD@@@@BBB@D@B@B@@ABEBADABADG@CB@BAD@BBFDDBBB@@D@FAFCJAHCF@BADABC@C@@ACAAA@AA@ABG@C@G@C@AKI@A@A@ABC@C@@AC@@@A@@@ABADADCB@@@BBFFB@B@B@@@@A@C@@BABADCBA@AA@ACCC@@A@CA@@@@CCECAA@A@A@ABCBADAFA@@B@FGDA@ADBD@B@B@LE@@D@B@JB@AB@BADGHK@E@CAA@A@A@A@ABABCB@@AB@FDDBB@DBB@@ADCHEBCFCJEDAF@F@B@BADE@CB@BAB@B@D@NDFBFBB@@@BABCBADAB@@ABABAD@HAF@JAB@BA@@LGHEFABABA@AAAAAA@A@MBC@@@ACBABCFGHAJCHEXCB@@@FGBABG@A@CDQ@C@ABC@A@AAACGHIDCDAB@DAJ@DBD@D@@@BA@@@ABC@ABCDADCBG@A@CBADE@AGCA@@A@AHIFCLGD@D@DBB@B@@B@BAB@B@BB@@BBB@D@BBB@BNEBBHBB@DA@A@A@@@A@AHEDCBA@@AA@AB@@ADAF@F@DBFDD@B@JABABABC@AAAAAICAA@AB@B@B@D@DAB@@A@AEEACEAA@CAG@A@AA@A@ABE@CDCNKDCBA@C@@A@@@E@KDGBC@EAAAAAACACAC@A@A@CBAB@BAD@B@FBD@B@@@@A@@AAOMAAAE@@@CBABAB@BA@@@A@AAACAAIAA@A@A@A@AAI@@CAAA@@@A@@BAB@DC@@B@D@B@@BB@BBBBB@DAB@DA@@DAB@BA@@FCBADC@CA@EA@AAA@CAA@AAA@@AAAEAAAAA@CC@A@AAC@AAAAE@E@@ACA@@A@GBC@@D@@BBBDBB@@@B@@A@AAA@A@AB@BA@@B@HAH@BABABC@@B@@C@A@AAA@@AAEBA@A@AAA@@A@ABADCBAB@BABABABEBCBA@@BAD@D@@@BA@A@A@CBCAC@AACAA@ABA@ABAD@B@FAFABADC@@BCB@@A@A@ACECCCAA@A@@A@C@@@A@AAE@ABC@ABA@ABCB@D@B@BA@A@@@AAAAAAAA@EAC@C@@ACCCEACCEAA@AAA@B@@@@A@@@@@@@@@@@@A@A@@B@@B@@@A@@@A@AAE@A@CAA@@ACAEACBG@CBEDA@C@A@A@A@AACAA@EAAAAACB@BADADADABABBDBB@B@BDD@DBB@DAB@BADABABAAAEEAAAAAA@A@A@AAA@AAAE@@AAAAA@AAAECA@A@CBA@A@AC@AEAA@ABIBAA@@CGCECEAACGCEAGAA@CAA@EBA@E@EBAACAAAACACAEAEC@AAC@A@A@AC@A@E@A@ABCBC@EACACBC@CACAAAA@C@ABABABC@A@A@@BABABAB@DADCHABAB@@C@A@CA"]],"encodeOffsets":[[[106992,30571]],[[106735,31009]],[[106902,30462]]]}},{"type":"Feature","id":"511425","properties":{"name":"青神县","cp":[103.846688,29.831357],"childNum":1},"geometry":{"type":"Polygon","coordinates":["@@AC@C@CAAABA@@AB@@AA@@BA@ABC@EBCBABAB@BGNA@ADABABE@E@C@A@@@ABABAB@BCDADA@ABA@AB@@CBC@A@A@@A@ADABC@A@AAA@AA@AAC@C@A@A@A@AACCAAA@@AC@C@CAAAC@AAC@C@AB@BAD@D@F@DB@BBB@BB@B@BABAF@D@D@BAF@@CHABABABA@CBABAB@DABABEFABAB@BBB@BBD@DCD@D@B@BBD@@BBB@BB@@D@FCB@BAB@DADBB@DBBBBBDA@@D@DBDBFDFB@ABAHADCJED@@B@BAHAD@B@D@@DDBDDBB@B@DBD@B@B@BB@BAHDD@D@BABCBC@CBA@AB@DBBBF@B@DA@A@E@C@A@CBA@ABAB@D@D@BBB@D@B@BBBBBBBBDBB@DAB@BABA@ABCBAB@@@B@BAB@BBBFD@B@D@BABA@A@GACACBA@IDA@@BB@BFBBBBB@FBB@B@@BBBEHAD@@ABGF@@J@FCB@NFPDNBTDL@HAH@H@JAB@H@HAHAREPAHBAL@J@BA@ADCHMJIBEBAH@J@FBJBJBNHJJBHCHKBA@@BA@ADEDEDCDAFAH@FAH@JEDCDEDC@@BABA@@BBDBDDFD@BDBF@B@B@BABCB@DAB@B@B@DBCBABAB@@AD@DBDBBDBB@BADCDA@@@BF@D@HEFEFCDAD@BBAJ@B@BB@F@DA@A@AAC@ABADAFABBD@BJ@BBBBDB@D@DDJAJAB@DAFAFCTEFBFDFDDDDF@HDABAPWHIDCHAJ@HFHFFDHABMAGEGKGICAAMCIECGIE@IAI@@A@@AAGCCAAA@AAGAAA@A@CFA@ABABEBABAFAB@BC@A@@@C@AABKCA@GAABA@ABA@AB@BABCBA@A@@@CAAACAC@A@GAA@AA@A@EAI@ADGBABAHGBA@AC@A@AAA@AAAAEE@CAG@ACAGACAGC@@A@ECA@@AEBAAAE@ABCBALBBABABIAEAAC@GFA@CAAAEO@C@G@E@A@AACAAAAACCAC@C@C@I@E@CBA@I@G@EBABEBEBCAAA@CAG@CC@GCCACCAAAAA@A@C@A@C@A@A@ABC@E@EAC@CAA@AAKIKIEEC@ECA@C@CBA@C@CCIAG@CAAA"],"encodeOffsets":[[106269,30424]]}},{"type":"Feature","id":"511424","properties":{"name":"丹棱县","cp":[103.512783,30.01521],"childNum":2},"geometry":{"type":"MultiPolygon","coordinates":[["@@D@HBB@@B@@BAB@@A@@BAB@@@@@BABA@@@A@@CAGAA@E@A@@@@@A@@@AB@BAD@B@@BB@@"],["@@BAB@BA@ABCB@B@B@D@@@@AACBCBAB@DA@CCECAA@CAA@AAAA@AAAA@AAA@A@ABA@EAC@CBAAAAAA@AA@CB@@C@CBA@ABA@@@A@A@@@A@@@A@A@A@A@@@@B@BA@ADA@A@C@A@AAA@AB@B@@BB@BA@@B@BA@ABE@@@ABAD@BC@E@CAAAC@@AEBAB@B@B@B@BBB@@FF@BADIJGL@@AFELGJEJCBGLGLKNILGHGBKEIKEEKCOHIBO@KAGDILA@GJGFCAGACAQEC@CAEAC@CBGBOFABOHEDEDKHKHGFABEDEBOHIDCBIDKAICGIGKEKCGCEGAE@EBCFELAJ@@@JAHEJCJCB@B@B@BMBCBAB@B@DABA@A@@@AAAEA@A@A@ABBD@@BFBBBFBBA@@BEDA@@B@BDB@B@DBBHB@BBJDJDJBDDD@@BFB@@BFFHJPNFDLHBBB@LBB@DBBBBDBJFJDDHFB@B@DABABA@AAACG@AFEJEDABBLDFBD@JAH@D@FBBBBD@B@H@BBBDDBBBFFP@@F@B@@CFO@A@A@@BAB@DBHDB@BAB@DGBABA@@BB@B@H@DFJBBBBB@B@BADCDAD@F@DBFBBBDAH@FDBBBBBBDDBDBBBBDDDD@BDBFBBBBDB@DBBAHMB@B@D@FDBB@B@D@B@D@BBB@B@@B@@@B@DABA@@BA@A@AEC@A@ABCBABEFGBEDCB@HAB@F@FBDBDDDFBFBD@DAD@@@BAB@DCDGFEBEBABCDEL@DDDF@HBFADCDCD@B@@@FBBBB@@ABA@GACAE@ABADADCDA@ADG@CBC@C@CB@@@BBB@FLDFNRNNDBB@HC@C@CBGDEBCDABA@@@A@AA@E@CACACAGIAAEKACAABAAC@AA@C@EBC@C@@ACG@K@A@ABABADCFEHGDAH@BABABC@A@CAE@EAK@CBCBCBC@ADM@ABAB@B@B@B@BD@F@BB@B@D@@ABCBC@CBCDCB@D@DBDBDB@@BDDDD@D@D@B@ACBCBAHEBAB@B@DHBBD@D@BAFEHMBE@@AAA@CA@@@@AIGOEI@@KO@A@AA@ECAA@@AA@A@C@ABCFGBA@AB@@AGCCAA@AA@@AABA@AD@BAB@BC@A@@@A@AAA@A@@CA@@@ABCBABAFADAJCD@B@DDD@B@B@D@B@B@BA@ADE@@B@D@B@HBFB@@B@@@BA@@DC@@@A@AAA@A@ADEDA@C@A@E@ABADA@A@A@AA@@AE@AABCB@BABABADC@E@E@@AACCECAAIEA@AAA@ABCB@BAAEA@A@@@A"]],"encodeOffsets":[[[105920,30849]],[[106058,30612]]]}},{"type":"Feature","id":"511423","properties":{"name":"洪雅县","cp":[103.372863,29.90489],"childNum":2},"geometry":{"type":"MultiPolygon","coordinates":[["@@A@@D@@@BB@@B@@AB@@@B@BB@@@B@B@@@@B@@ABB@@@B@@@@@BB@B@@@BA@ABA@@BA@@B@B@@@@@BAB@@@@@@@B@@B@@@@B@@BB@@B@@BB@@BB@@@@BB@@@@B@@B@@BBAF@HABABABE@A@C@CBK@CAC@A@A@C@@@CAACAC@A@IDEBABA@A@"],["@@A@@AAEACAEBAAAAACCAACE@AA@A@ABE@GACCA@CECEAAAAABKFGDABG@IBK@EAI@E@I@EAA@C@EBA@@AAA@KBABC@@AA@ABC@C@@AG@A@A@@BEEKACBCBEDGHEBC@C@A@CACCGACAAC@ABABAH@B@F@DCB@@CAA@A@A@@BABA@A@C@AB@B@@@B@D@BA@@@A@A@CCAAA@A@ABBB@B@D@@ABADABCDADADBBFFHB@B@@ADCB@@G@C@CBA@AHA@ABAA@@A@@CGIIGGCCBCBCBG@@@A@@@A@@BA@A@@@@C@@@@A@A@ABADA@ABABA@E@@@E@@@C@CAA@A@@@A@A@@@A@@@C@@A@@ACACA@C@EBA@@AAA@IACAEAAECCAEACCCECA@EAE@C@ADD@AAC@AEEAEACAALGBABEACAACAKECAGIAAAA@AAC@C@M@EBEHKAAEEEEAA@AAA@ABADELGBA@A@IACAABA@@JA@BD@@@B@@@@@@@B@@@@@BBDB@@@@EF@B@DB@F@DBHBFBB@B@BABAA@@AA@@AA@A@@@A@@@A@@@AA@@@@A@@@@@@AFEBAD@D@BABCBA@ABAB@F@FDFBDDDBBDBJBF@DADGFAD@BBBDBD@D@DABADA@ABAAAAAAC@@BADEBC@EDABC@CBCD@D@HDD@DBDABABEBGGDC@CACAAA@CGECCKCGCICECICC@ACAC@EBADO@CAAIAAAACCIACAAACA@E@EAECEGACEAG@EACA@CBEAA@AAAIAGBODEBEAEACCGE@ADCBCDKACACBKACA@AAA@A@A@@@@@@AA@A@@@AA@@CAAC@@@@ACAEAE@CAA@A@@BAJO@@BA@@DGDEBC@@@A@@BCDE@@@A@@EE@@A@AA@AAC@@AA@A@A@AACCEAAAA@CB@BADADAB@B@D@F@@@@@B@@@BBB@@@DB@@B@@@@@D@DAJ@F@FADAACCCCCGCECACEI@AAE@AACC@C@AAGCEAKCM@IBMFOAM@MBMBOBKAKAEAAEEGAQ@IAMAMCG@CAK@IKEQCO@MDEBEBEDCDEFCBABGDG@E@E@EC@C@CAAEAE@CBCAGAEAC@EACCECE@EDE@GDEBEDCFGFGBEFCDCDEBE@CCG@GAMFIDGBG@C@@AEAGGGGCGCEGIIGIEGCCACCAECCCEECAC@@BCBC@ECBCBC@GBI@MBQ@QAG@E@CBMDKDSFUFQFKBMLMJKLKLEHCDKJGHGDIHGFGH@FBHFH@@JNNNRNBDBHBFBDFFFHFFLRHHLHHFJDJDPFLDJFHFFDFFDFBFDJAP@N@NFRFPFJDN@NCJAL@FBDAJBNAN@PBFFFFFFD@D@DCDEBADAF@FBFDD@D@DAFADADCDAFDBD@@BL@fRF@D@@@@CB@FENGHEFAJAL@J@FBBBBBBB@@@@BFDDBD@D@BBDBB@@BBB@@@@@@@B@@@@@@@F@FBB@BADABCBA@C@ABA@@@@B@BAB@B@BAB@BCBCBA@CACAAAA@A@CDADAD@F@F@D@DADABCB@@@@A@C@@BA@@B@@@@AB@@CAC@A@@BECC@EBCDC@@B@D@D@BBDDBBB@@@LFHDDBB@BABABAB@B@D@B@DBD@B@D@B@D@@@@@DDBBBBBB@BBFBDD@BABABCDCBCDAD@D@FADEFEDCLIFCHALAJ@DBBBBD@BEH@BAD@DA@@BCDCB@B@B@@@B@B@BBBBB@D@DABAB@D@B@B@@@DNLFFFB@@@B@D@B@BCDEFAB@DABABADABJBFBHBDDFBDB@DAD@DBD@BABCBIDGBCBGBA@AB@BAFBFFBFDFBHDFBHBFBBF@D@FAHAFABAHAFABCHGJCDELABABCHCJITAJAFCJENGNAHADABKJKFKHKFGHGJCF@JDJHHBBBBFFFJHDNFLDLBHBJBPFNBFBFBDBPNFDDFFDDDH@H@D@D@DA@ABCB@B@B@BBBD@BBDAD@BCD@B@B@DABCDAFAD@@BB@BB@B@FAJ@H@F@D@FDBBFDB@BBB@DAD@F@DDBD@D@DAD@BBBBBBD@BBDDBDBBB@BA@ABEDID@@@B@B@@@BD@BBJ@DBD@BB@@BAB@B@B@BFBB@@B@B@BA@C@ABADANA@A@A@ADADIFIBG@I@@BIFKDEFAF@HBDFDHFLHLHJJDLBJCDAJCPGFAFCBAHELGLGFCFCPGBAPEHADAD@FBDBD@RFDBHBDBHEHIB@JKHCLBP@JAPGLDFFJLLFHAHGJKLMHKHKDAFIHIFKBE@@HKJIBC@AEE@@AA@A@A@A@ABAFAAA@A@C@ABAB@DANBBA@@@@@A@@@AECA@@A@AB@@AA@@@@A@@A@@A@@A@@AA@@AA@@@AA@@@@A@@AA@A@@@@A@@AAAAA@@@@@@BCAC@AA@A@@BA@ABAB@B@@@AAB@@@@@@@@BB@@@D@@@@A@@B@@@B@@@@A@A@A@@B@@A@A@@BA@@@AA@@A@@@CC@AA"]],"encodeOffsets":[[[106002,30560]],[[105998,30559]]]}}],"UTF8Encoding":true});})); \ No newline at end of file diff --git a/js/pagejs/dataanalysis.js b/js/pagejs/dataanalysis.js index 78056d6..c004630 100644 --- a/js/pagejs/dataanalysis.js +++ b/js/pagejs/dataanalysis.js @@ -49,7 +49,7 @@ var pie_option = { tooltip : { trigger: 'item', - formatter: "{b} : {c}个 ({d}%)" + formatter: "{b} : {c}辆 ({d}%)" }, series : [ { @@ -88,7 +88,7 @@ fontSize: 14, }, - formatter: '{b}:{c}个\n 占比{d}%' + formatter: '{b}:{c}辆\n 占比{d}%' } }, labelLine: { @@ -138,7 +138,7 @@ color: '#fff', fontSize: 14 }, - formatter: '{b}:{c}个\n 占比{d}%' + formatter: '{b}:{c}辆\n 占比{d}%' } }, labelLine: { @@ -974,9 +974,9 @@ var map; //Map实例 //后台传过来 -var currentLat = 118.922316; -var currentLon = 42.25953; -var my ={ title: "我的位置"}; +/*var currentLat = 118.922316; +var currentLon = 42.25953;*/ +// var my ={ title: "我的位置"}; map_init() @@ -984,9 +984,10 @@ function map_init() { map = new BMap.Map("allmap", {enableMapClick: false}); //第1步：设置地图中心点，当前城市 - var point = new BMap.Point(currentLat,currentLon); + var point = new BMap.Point(sysComm.point_lng,sysComm.point_lat); //第2步：初始化地图,设置中心点坐标和地图级别。 map.centerAndZoom(point, 13); + map.setCurrentCity(sysComm.cityName); //第3步：启用滚轮放大缩小 map.enableScrollWheelZoom(true); diff --git a/js/pagejs/guidance.js b/js/pagejs/guidance.js index aa67c6d..69edcff 100644 --- a/js/pagejs/guidance.js +++ b/js/pagejs/guidance.js @@ -436,18 +436,18 @@ $(function () { "Title": "行政区划", "inputName": "selected1_value", // 默认选中的值（参数值写需要选中的select的value值） - "selected": "923", + "selected": "2703", Succee: function () { // console.log($("input[name='selected1_value']").attr('value')); // var checktext; checkText = $(".sel-title").eq(0).text(); if (checkText == "全部") { - checktext = "赤峰市" + checktext = sysComm.cityName } else if (checkText == "其他") { // map.clearOverlays(); - checktext = "赤峰市"; + checktext = sysComm.cityName; } else { - checktext = "赤峰市" + checkText; + checktext = sysComm.cityName + checkText; } getBoundary(checktext); @@ -455,7 +455,7 @@ $(function () { } }); - getBoundary("赤峰市红山区"); + getBoundary(sysComm.areaName); serfun(); } } @@ -524,6 +524,8 @@ $(function () { list_wrap_height(); } else { $('#list_wrap').css('height', 'auto'); + $('#list_wrap').perfectScrollbar('destroy'); + $('#list_wrap').perfectScrollbar(); } console.log('请求数据ajax'); @@ -605,6 +607,7 @@ $(function () { dataState:1, levels: levels }; + $.ajax({ type: "post", url: dataUrl.util.listGuideScreenByAreaCodes(), @@ -780,12 +783,12 @@ $(function () { var serText=$(".ser_text").val(); if (checkText == "全部") { - checktext = "赤峰市" + checktext = sysComm.cityName; } else if (checkText == "其他") { // map.clearOverlays(); - checktext = "赤峰市"; + checktext = sysComm.cityName; } else { - checktext = "赤峰市" + checkText; + checktext = sysComm.cityName + checkText; } if(serText!=""&&serText!=null&&serText!=undefined||selValue!='诱导级别'){ map.clearOverlays(); @@ -804,22 +807,17 @@ $(function () { //地图调用 sta var map; //Map实例 -//后台传过来 -var currentLat = 118.922316; -var currentLon = 42.25953; -var my = {title: "万达广场"}; +// var my = {title: "万达广场"}; //数据 var guideData = []; //地图数据加载 - - map = new BMap.Map('allmap', {enableMapClick: false}); //第1步：设置地图中心点，当前城市 -var point = new BMap.Point(currentLat, currentLon); +var point = new BMap.Point(sysComm.point_lng,sysComm.point_lat); //第2步：初始化地图,设置中心点坐标和地图级别。 map.centerAndZoom(point, 13); -map.setCurrentCity("赤峰"); // 设置地图显示的城市 此项是必须设置的 +map.setCurrentCity(sysComm.cityName); // 设置地图显示的城市 此项是必须设置的 //第3步：启用滚轮放大缩小 map.enableScrollWheelZoom(true); //第4步：向地图中添加缩放控件 diff --git a/js/pagejs/index.js b/js/pagejs/index.js index ad047b4..d5ab4ef 100644 --- a/js/pagejs/index.js +++ b/js/pagejs/index.js @@ -24,7 +24,7 @@ //selectedMode:true,//选中模式，表示是否支持多个选中，默认关闭 name:name, type:'map', - map:'chifeng', + map:'meishan', // markPoint:{ // symbol:'circle' @@ -70,52 +70,29 @@ { name: '', - coord: [118.973508,42.147919], + coord: [103.729882,30.136356], }, { name: '', - coord: [118.528685,42.498721], + coord: [103.789673,30.268198], }, { name: '', - coord: [117.337082,42.934712], + coord: [103.806921,29.789424], }, { name: '', - coord: [120.016476,42.428608], + coord: [104.164518,30.059866], }, { name: '', - coord: [119.294298,42.159577], + coord: [103.383783,30.04186], }, { name: '', - coord: [118.390652,41.816981], - }, - { - name: '', - coord: [119.026903,42.764439], - }, - { - name: '', - coord: [118.662191,43.951086], - }, - { - name: '', - coord: [118.730749,41.616497], - }, - { - name: '', - coord: [118.053212,43.750996], - }, - { - name: '', - coord: [119.393627,44.411986], - }, - { - name: '', - coord: [120.070303,44.345238], + coord: [103.26535,29.914721], }, + ], label:{ normal:{ @@ -130,54 +107,30 @@ data:[ { - name:'红山区', + name:'东坡区', value:0, }, { - name:'松山区', + name:'彭山区', value:0 }, { - name:'元宝山区', + name:'青神县', value:0 }, { - name:'阿鲁科尔沁旗', + name:'仁寿县', value:0 }, { - name:'巴林左旗', + name:'丹棱县', value:0 }, { - name:'巴林右旗', + name:'洪雅县', value:0 - }, - { - name:'林西县', - value:0 - }, - { - name:'克什克腾旗', - value:0 - }, - { - name:'翁牛特旗', - value:0 - }, - { - name:'喀喇沁旗', - value:0 - }, - { - name:'宁城县', - value:0 - }, - { - name:'敖汉旗', - value:0 - }, + } ], @@ -249,10 +202,10 @@ radar: { indicator: [ - {text: '红山区', max: 100}, - {text: '松山区', max: 100}, - {text: '元宝山区', max: 100}, - {text: '其他', max: 100} + {text: '', max: 100}, + {text: '', max: 100}, + {text: '', max: 100}, + {text: '', max: 100} ], name: { textStyle: { @@ -338,7 +291,7 @@ } ] }; - radarechart.setOption(radar_echart_option,true); + radarechart.setOption(radar_echart_option,true); //左中柱图bar_l_echart @@ -792,8 +745,11 @@ bar_l_option.xAxis.data.push(countryName); countryIndex[countryName] = i; + //拼图 + var serieData = {name:countryName,value:0}; + dataCount[i]=serieData; } - + bar_l_option.xAxis.data.push("其他"); var req= { sysCode:sysComm.sysCode, cityId:sysComm.cityId @@ -903,7 +859,7 @@ }, xAxis: { gridLineWidth: 0, - categories: ['红山区', '松山区', '元宝山区', '其他'], + categories: bar_l_option.xAxis.data, labels: { style: { color: '#fff',//颜色 @@ -932,7 +888,7 @@ }); - bar_l_option.xAxis.data.push("其他"); + var serieData = {value:otherParkLotNum, name:"其他"}; dataCount.push(serieData); @@ -1151,11 +1107,13 @@ ], series : [ { + barWidth : 30,//柱图宽度 barGap:'20', barGap:'30%', data:[] }, { + barWidth : 30,//柱图宽度 barGap:'30%', data:[] } @@ -1280,7 +1238,8 @@ //该设备该区域数量 var equCount = equCountryMap[countryName]; if(countryIndex[countryName]==null || countryIndex[countryName]==undefined){ - otherNums += equCount; + //临时备注设备 + // otherNums += equCount; }else{ var index = countryIndex[countryName]; serisItem.data[index] = equCount; @@ -1347,6 +1306,7 @@ yAxis: { allowDecimals: false, min: 0, + minRange: 1, gridLineWidth: 0, title: { text: '' diff --git a/js/pagejs/parkheat.js b/js/pagejs/parkheat.js index 885a99c..dfc38da 100644 --- a/js/pagejs/parkheat.js +++ b/js/pagejs/parkheat.js @@ -309,7 +309,7 @@ if(!isSupportCanvas()){ alert('热力图目前只支持有canvas支持的浏览器,您所使用的浏览器不能使用热力图功能~') } -heatmapOverlay = new BMapLib.HeatmapOverlay({"radius":20}); +heatmapOverlay = new BMapLib.HeatmapOverlay({"radius":50}); map.addOverlay(heatmapOverlay); heatmapOverlay.setDataSet({data:points,max:10}); diff --git a/js/pagejs/parkhotarea.js b/js/pagejs/parkhotarea.js index e9be512..109003c 100644 --- a/js/pagejs/parkhotarea.js +++ b/js/pagejs/parkhotarea.js @@ -245,9 +245,7 @@ // 百度地图API功能 var map; //Map实例 -//后台传过来 -var currentLat = 118.967899; -var currentLon = 42.279838; + //热点区域中心点 var centerData=[ /*{ @@ -285,7 +283,7 @@ var freeBerthData={ } var marker ={}; map = new BMap.Map('allmap',{enableMapClick:false}); // 创建Map实例 -var point = new BMap.Point(currentLat,currentLon); +var point = new BMap.Point(sysComm.centerpoint_lng,sysComm.centerpoint_lat); map.enableScrollWheelZoom(); //第5步：设置地图风格 map.setMapStyle({ diff --git a/js/pagejs/parkquery.js b/js/pagejs/parkquery.js index e9cacad..1d4b6d2 100644 --- a/js/pagejs/parkquery.js +++ b/js/pagejs/parkquery.js @@ -403,27 +403,7 @@ var clear_flag = false; }; })(jQuery); var parkData = [ - // { - // parkNo: "001", - // pointX: "118.970907", - // pointY: "42.27894", - // allnum: "270", - // free: "0" - // }, - // { - // parkNo: "002", - // pointX: "118.963558", - // pointY: "42.278059", - // allnum: "260", - // free: "5" - // }, - // { - // parkNo: "003", - // pointX: "118.951988", - // pointY: "42.276645", - // allnum: "300", - // free: "150" - // } + ]; $(function () { var checktext; @@ -465,23 +445,23 @@ $(function () { "Title": "行政区划", "inputName": "selected1_value", // 默认选中的值（参数值写需要选中的select的value值） - "selected": "923", + "selected": "2703", Succee: function () { // console.log($("input[name='selected1_value']").attr('value')); checkText = $(".sel-title").eq(0).text(); if (checkText == "全部") { - checktext = "赤峰市" + checktext = sysComm.cityName } else if (checkText == "其他") { //map.clearOverlays(); - checktext = "赤峰市"; + checktext = sysComm.cityName; } else { - checktext = "赤峰市" + checkText; + checktext = sysComm.cityName + checkText; } getBoundary(checktext); serfun(); } }); - // getBoundary("赤峰市红山区"); + getBoundary(sysComm.areaName); serfun(); map.centerAndZoom(point, 15); @@ -549,6 +529,8 @@ $(function () { list_wrap_height(); } else { $('#list_wrap').css('height', 'auto'); + // $('#list_wrap').perfectScrollbar('destroy'); + // $('#list_wrap').perfectScrollbar(); } // console.log('请求数据ajax'); @@ -838,12 +820,12 @@ $(function () { checkText = $(".sel-title").eq(0).text(); var serText=$.trim($(".ser_text").val()); if (checkText == "全部") { - checktext = "赤峰市" + checktext = sysComm.cityName } else if (checkText == "其他") { //map.clearOverlays(); - checktext = "赤峰市"; + checktext = sysComm.cityName; } else { - checktext = "赤峰市" + checkText; + checktext = sysComm.cityName + checkText; } if(serText!=""&&serText!=null&&serText!=undefined){ serfun(); @@ -876,15 +858,13 @@ $(document).on('click', '.cont-callback', function () { //地图调用部分 var map; //Map实例 //后台传过来 -var currentLat = 118.922316; -var currentLon = 42.25953; map = new BMap.Map('allmap', {enableMapClick: false}); //第1步：设置地图中心点，当前城市 -var point = new BMap.Point(currentLat, currentLon); +var point = new BMap.Point(sysComm.point_lng,sysComm.point_lat); //第2步：初始化地图,设置中心点坐标和地图级别。 map.centerAndZoom(point, 13); -map.setCurrentCity("赤峰"); // 设置地图显示的城市 此项是必须设置的 +//map.setCurrentCity(sysComm.cityName); // 设置地图显示的城市 此项是必须设置的 //第3步：启用滚轮放大缩小 map.enableScrollWheelZoom(true); //第4步：向地图中添加缩放控件 diff --git a/pages/index.html b/pages/index.html index 088ad4d..d1bc93c 100644 --- a/pages/index.html +++ b/pages/index.html @@ -130,7 +130,7 @@ - + diff --git a/pages/parkquery.html b/pages/parkquery.html index 3d142bf..e71eca9 100644 --- a/pages/parkquery.html +++ b/pages/parkquery.html @@ -42,10 +42,10 @@