BJ_web_developers / msgovcloud

Commit ebfd261643f57a61f76611375515dc5a821d4d3f

Authored by liuqimichale
2 parents f5c3ad04 83b68eb5

Merge branch 'sysprojectms_test' 

# Conflicts:
#	js/common/unit.js
Inline Side-by-side
Showing 17 changed files with 116 additions and 140 deletions
.gitignore 0 → 100644
  View file @ebfd261
  1 +
  2 +.idea/
.project 0 → 100644
  View file @ebfd261
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<projectDescription>
  3 + <name>sysprojectms</name>
  4 + <comment></comment>
  5 + <projects>
  6 + </projects>
  7 + <buildSpec>
  8 + <buildCommand>
  9 + <name>com.aptana.ide.core.unifiedBuilder</name>
  10 + <arguments>
  11 + </arguments>
  12 + </buildCommand>
  13 + </buildSpec>
  14 + <natures>
  15 + <nature>com.aptana.projects.webnature</nature>
  16 + </natures>
  17 + <filteredResources>
  18 + <filter>
  19 + <id>1502423714354</id>
  20 + <name></name>
  21 + <type>26</type>
  22 + <matcher>
  23 + <id>org.eclipse.ui.ide.multiFilter</id>
  24 + <arguments>1.0-name-matches-false-false-node_modules</arguments>
  25 + </matcher>
  26 + </filter>
  27 + </filteredResources>
  28 +</projectDescription>
css/common.css
  View file @ebfd261
@@ -14,7 +14,6 @@ ul{ @@ -14,7 +14,6 @@ ul{
14 } 14 }
15 body,ul,li{ 15 body,ul,li{
16 list-style:none; 16 list-style:none;
17 -  
18 } 17 }
19 .fl{ 18 .fl{
20 float: left; 19 float: left;
css/parkhotarea.css
  View file @ebfd261
@@ -27,6 +27,7 @@ a:link,a:visited,a:hover,a:active{ @@ -27,6 +27,7 @@ a:link,a:visited,a:hover,a:active{
27 } 27 }
28 /*地图停车场弹窗*/ 28 /*地图停车场弹窗*/
29 .parkpop-contenttop{ 29 .parkpop-contenttop{
  30 + font-family: "Microsoft YaHei";
30 width: 220px; 31 width: 220px;
31 height: 170px; 32 height: 170px;
32 /*padding: 8px;*/ 33 /*padding: 8px;*/
css/parkquery.css
  View file @ebfd261
@@ -599,7 +599,9 @@ a:link,a:visited,a:hover,a:active{ @@ -599,7 +599,9 @@ a:link,a:visited,a:hover,a:active{
599 background: rgba(30,43,103,.5); 599 background: rgba(30,43,103,.5);
600 border: 1px solid #07337b; 600 border: 1px solid #07337b;
601 z-index: 1; 601 z-index: 1;
  602 + font-family: "Microsoft YaHei" !important;
602 } 603 }
  604 +
603 .parkpop-main{ 605 .parkpop-main{
604 width: 202px; 606 width: 202px;
605 height: 152px; 607 height: 152px;
@@ -670,4 +672,5 @@ a:link,a:visited,a:hover,a:active{ @@ -670,4 +672,5 @@ a:link,a:visited,a:hover,a:active{
670 font-size: 14px; 672 font-size: 14px;
671 color: #fff; 673 color: #fff;
672 text-align: center; 674 text-align: center;
  675 + font-family: "Microsoft YaHei" !important;
673 } 676 }
674 \ No newline at end of file 677 \ No newline at end of file
img/index_titbg.png
View file @ebfd261

16.4 KB | W: | H:

14.8 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
img/zte_itslogo.png
View file @ebfd261

16.5 KB | W: | H:

3.08 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
js/common/unit.js
  View file @ebfd261
@@ -8,15 +8,20 @@ @@ -8,15 +8,20 @@
8 8
9 sysComm = { 9 sysComm = {
10 sysCode: '1001',//系统编码 10 sysCode: '1001',//系统编码
11 - cityId:91,//市id  
12 - provId:5,//省id  
13 - point_lng:118.917132,//赤峰市万达广场经度  
14 - point_lat:42.255586,//赤峰市万达广场纬度(118.917132,42.255586) 11 + cityId:309,//市id
  12 + provId:23,//省id
  13 + cityName:'眉山市',//城市
  14 + areaName:'眉山市东坡区',
  15 + point_lng:103.839461,//赤峰市万达广场经度
  16 + point_lat:30.044922,//赤峰市万达广场纬度(118.917132,42.255586)
  17 + centerpoint_lng:103.839461,//热点区域中心点
  18 + centerpoint_lat:30.044922,//维多利购物广场坐标（118.967899,42.279838）
15 grantType: 'PASSWORD',//授权模式 19 grantType: 'PASSWORD',//授权模式
16 clientType: 'WEB'//客户端类型 20 clientType: 'WEB'//客户端类型
17 } 21 }
18 22
19 23
  24 +// var baseUrl = 'http://192.168.1.196:8099/';// url公用地址
20 25
21 var baseUrl = 'http://120.26.116.79:8094/';// url公用地址 26 var baseUrl = 'http://120.26.116.79:8094/';// url公用地址
22 //var baseUrl = 'http://127.0.0.1:8099/';// url公用地址 27 //var baseUrl = 'http://127.0.0.1:8099/';// url公用地址
js/lib/meishan.js 0 → 100644
  View file @ebfd261
  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});}));
0 \ No newline at end of file 2 \ No newline at end of file
js/pagejs/dataanalysis.js
  View file @ebfd261
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 var pie_option = { 49 var pie_option = {
50 tooltip : { 50 tooltip : {
51 trigger: 'item', 51 trigger: 'item',
52 - formatter: "{b} : {c}个 ({d}%)" 52 + formatter: "{b} : {c}辆 ({d}%)"
53 }, 53 },
54 series : [ 54 series : [
55 { 55 {
@@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@
88 fontSize: 14, 88 fontSize: 14,
89 89
90 }, 90 },
91 - formatter: '{b}:{c}个\n 占比{d}%' 91 + formatter: '{b}:{c}辆\n 占比{d}%'
92 } 92 }
93 }, 93 },
94 labelLine: { 94 labelLine: {
@@ -138,7 +138,7 @@ @@ -138,7 +138,7 @@
138 color: '#fff', 138 color: '#fff',
139 fontSize: 14 139 fontSize: 14
140 }, 140 },
141 - formatter: '{b}:{c}个\n 占比{d}%' 141 + formatter: '{b}:{c}辆\n 占比{d}%'
142 } 142 }
143 }, 143 },
144 labelLine: { 144 labelLine: {
@@ -974,9 +974,9 @@ @@ -974,9 +974,9 @@
974 974
975 var map; //Map实例 975 var map; //Map实例
976 //后台传过来 976 //后台传过来
977 -var currentLat = 118.922316;  
978 -var currentLon = 42.25953;  
979 -var my ={ title: "我的位置"}; 977 +/*var currentLat = 118.922316;
  978 +var currentLon = 42.25953;*/
  979 +// var my ={ title: "我的位置"};
980 980
981 981
982 map_init() 982 map_init()
@@ -984,9 +984,10 @@ function map_init() { @@ -984,9 +984,10 @@ function map_init() {
984 984
985 map = new BMap.Map("allmap", {enableMapClick: false}); 985 map = new BMap.Map("allmap", {enableMapClick: false});
986 //第1步：设置地图中心点，当前城市 986 //第1步：设置地图中心点，当前城市
987 - var point = new BMap.Point(currentLat,currentLon); 987 + var point = new BMap.Point(sysComm.point_lng,sysComm.point_lat);
988 //第2步：初始化地图,设置中心点坐标和地图级别。 988 //第2步：初始化地图,设置中心点坐标和地图级别。
989 map.centerAndZoom(point, 13); 989 map.centerAndZoom(point, 13);
  990 + map.setCurrentCity(sysComm.cityName);
990 //第3步：启用滚轮放大缩小 991 //第3步：启用滚轮放大缩小
991 map.enableScrollWheelZoom(true); 992 map.enableScrollWheelZoom(true);
992 993
js/pagejs/guidance.js
  View file @ebfd261
@@ -436,18 +436,18 @@ $(function () { @@ -436,18 +436,18 @@ $(function () {
436 "Title": "行政区划", 436 "Title": "行政区划",
437 "inputName": "selected1_value", 437 "inputName": "selected1_value",
438 // 默认选中的值（参数值写需要选中的select的value值） 438 // 默认选中的值（参数值写需要选中的select的value值）
439 - "selected": "923", 439 + "selected": "2703",
440 Succee: function () { 440 Succee: function () {
441 // console.log($("input[name='selected1_value']").attr('value')); 441 // console.log($("input[name='selected1_value']").attr('value'));
442 // var checktext; 442 // var checktext;
443 checkText = $(".sel-title").eq(0).text(); 443 checkText = $(".sel-title").eq(0).text();
444 if (checkText == "全部") { 444 if (checkText == "全部") {
445 - checktext = "赤峰市" 445 + checktext = sysComm.cityName
446 } else if (checkText == "其他") { 446 } else if (checkText == "其他") {
447 // map.clearOverlays(); 447 // map.clearOverlays();
448 - checktext = "赤峰市"; 448 + checktext = sysComm.cityName;
449 } else { 449 } else {
450 - checktext = "赤峰市" + checkText; 450 + checktext = sysComm.cityName + checkText;
451 } 451 }
452 getBoundary(checktext); 452 getBoundary(checktext);
453 453
@@ -455,7 +455,7 @@ $(function () { @@ -455,7 +455,7 @@ $(function () {
455 } 455 }
456 }); 456 });
457 457
458 - getBoundary("赤峰市红山区"); 458 + getBoundary(sysComm.areaName);
459 serfun(); 459 serfun();
460 } 460 }
461 } 461 }
@@ -524,6 +524,8 @@ $(function () { @@ -524,6 +524,8 @@ $(function () {
524 list_wrap_height(); 524 list_wrap_height();
525 } else { 525 } else {
526 $('#list_wrap').css('height', 'auto'); 526 $('#list_wrap').css('height', 'auto');
  527 + $('#list_wrap').perfectScrollbar('destroy');
  528 + $('#list_wrap').perfectScrollbar();
527 } 529 }
528 530
529 console.log('请求数据ajax'); 531 console.log('请求数据ajax');
@@ -605,6 +607,7 @@ $(function () { @@ -605,6 +607,7 @@ $(function () {
605 dataState:1, 607 dataState:1,
606 levels: levels 608 levels: levels
607 }; 609 };
  610 +
608 $.ajax({ 611 $.ajax({
609 type: "post", 612 type: "post",
610 url: dataUrl.util.listGuideScreenByAreaCodes(), 613 url: dataUrl.util.listGuideScreenByAreaCodes(),
@@ -780,12 +783,12 @@ $(function () { @@ -780,12 +783,12 @@ $(function () {
780 var serText=$(".ser_text").val(); 783 var serText=$(".ser_text").val();
781 784
782 if (checkText == "全部") { 785 if (checkText == "全部") {
783 - checktext = "赤峰市" 786 + checktext = sysComm.cityName;
784 } else if (checkText == "其他") { 787 } else if (checkText == "其他") {
785 // map.clearOverlays(); 788 // map.clearOverlays();
786 - checktext = "赤峰市"; 789 + checktext = sysComm.cityName;
787 } else { 790 } else {
788 - checktext = "赤峰市" + checkText; 791 + checktext = sysComm.cityName + checkText;
789 } 792 }
790 if(serText!=""&&serText!=null&&serText!=undefined||selValue!='诱导级别'){ 793 if(serText!=""&&serText!=null&&serText!=undefined||selValue!='诱导级别'){
791 map.clearOverlays(); 794 map.clearOverlays();
@@ -804,22 +807,17 @@ $(function () { @@ -804,22 +807,17 @@ $(function () {
804 //地图调用 sta 807 //地图调用 sta
805 808
806 var map; //Map实例 809 var map; //Map实例
807 -//后台传过来  
808 -var currentLat = 118.922316;  
809 -var currentLon = 42.25953;  
810 -var my = {title: "万达广场"}; 810 +// var my = {title: "万达广场"};
811 //数据 811 //数据
812 var guideData = []; 812 var guideData = [];
813 //地图数据加载 813 //地图数据加载
814 814
815 -  
816 -  
817 map = new BMap.Map('allmap', {enableMapClick: false}); 815 map = new BMap.Map('allmap', {enableMapClick: false});
818 //第1步：设置地图中心点，当前城市 816 //第1步：设置地图中心点，当前城市
819 -var point = new BMap.Point(currentLat, currentLon); 817 +var point = new BMap.Point(sysComm.point_lng,sysComm.point_lat);
820 //第2步：初始化地图,设置中心点坐标和地图级别。 818 //第2步：初始化地图,设置中心点坐标和地图级别。
821 map.centerAndZoom(point, 13); 819 map.centerAndZoom(point, 13);
822 -map.setCurrentCity("赤峰"); // 设置地图显示的城市 此项是必须设置的 820 +map.setCurrentCity(sysComm.cityName); // 设置地图显示的城市 此项是必须设置的
823 //第3步：启用滚轮放大缩小 821 //第3步：启用滚轮放大缩小
824 map.enableScrollWheelZoom(true); 822 map.enableScrollWheelZoom(true);
825 //第4步：向地图中添加缩放控件 823 //第4步：向地图中添加缩放控件
js/pagejs/index.js
  View file @ebfd261
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 //selectedMode:true,//选中模式，表示是否支持多个选中，默认关闭 24 //selectedMode:true,//选中模式，表示是否支持多个选中，默认关闭
25 name:name, 25 name:name,
26 type:'map', 26 type:'map',
27 - map:'chifeng', 27 + map:'meishan',
28 28
29 // markPoint:{ 29 // markPoint:{
30 // symbol:'circle' 30 // symbol:'circle'
@@ -70,52 +70,29 @@ @@ -70,52 +70,29 @@
70 70
71 { 71 {
72 name: '', 72 name: '',
73 - coord: [118.973508,42.147919], 73 + coord: [103.729882,30.136356],
74 }, 74 },
75 { 75 {
76 name: '', 76 name: '',
77 - coord: [118.528685,42.498721], 77 + coord: [103.789673,30.268198],
78 }, 78 },
79 { 79 {
80 name: '', 80 name: '',
81 - coord: [117.337082,42.934712], 81 + coord: [103.806921,29.789424],
82 }, 82 },
83 { 83 {
84 name: '', 84 name: '',
85 - coord: [120.016476,42.428608], 85 + coord: [104.164518,30.059866],
86 }, 86 },
87 { 87 {
88 name: '', 88 name: '',
89 - coord: [119.294298,42.159577], 89 + coord: [103.383783,30.04186],
90 }, 90 },
91 { 91 {
92 name: '', 92 name: '',
93 - coord: [118.390652,41.816981],  
94 - },  
95 - {  
96 - name: '',  
97 - coord: [119.026903,42.764439],  
98 - },  
99 - {  
100 - name: '',  
101 - coord: [118.662191,43.951086],  
102 - },  
103 - {  
104 - name: '',  
105 - coord: [118.730749,41.616497],  
106 - },  
107 - {  
108 - name: '',  
109 - coord: [118.053212,43.750996],  
110 - },  
111 - {  
112 - name: '',  
113 - coord: [119.393627,44.411986],  
114 - },  
115 - {  
116 - name: '',  
117 - coord: [120.070303,44.345238], 93 + coord: [103.26535,29.914721],
118 }, 94 },
  95 +
119 ], 96 ],
120 label:{ 97 label:{
121 normal:{ 98 normal:{
@@ -130,54 +107,30 @@ @@ -130,54 +107,30 @@
130 107
131 data:[ 108 data:[
132 { 109 {
133 - name:'红山区', 110 + name:'东坡区',
134 value:0, 111 value:0,
135 112
136 }, 113 },
137 { 114 {
138 - name:'松山区', 115 + name:'彭山区',
139 value:0 116 value:0
140 }, 117 },
141 { 118 {
142 - name:'元宝山区', 119 + name:'青神县',
143 value:0 120 value:0
144 }, 121 },
145 { 122 {
146 - name:'阿鲁科尔沁旗', 123 + name:'仁寿县',
147 value:0 124 value:0
148 }, 125 },
149 { 126 {
150 - name:'巴林左旗', 127 + name:'丹棱县',
151 value:0 128 value:0
152 }, 129 },
153 { 130 {
154 - name:'巴林右旗', 131 + name:'洪雅县',
155 value:0 132 value:0
156 - },  
157 - {  
158 - name:'林西县',  
159 - value:0  
160 - },  
161 - {  
162 - name:'克什克腾旗',  
163 - value:0  
164 - },  
165 - {  
166 - name:'翁牛特旗',  
167 - value:0  
168 - },  
169 - {  
170 - name:'喀喇沁旗',  
171 - value:0  
172 - },  
173 - {  
174 - name:'宁城县',  
175 - value:0  
176 - },  
177 - {  
178 - name:'敖汉旗',  
179 - value:0  
180 - }, 133 + }
181 ], 134 ],
182 135
183 136
@@ -249,10 +202,10 @@ @@ -249,10 +202,10 @@
249 radar: 202 radar:
250 { 203 {
251 indicator: [ 204 indicator: [
252 - {text: '红山区', max: 100},  
253 - {text: '松山区', max: 100},  
254 - {text: '元宝山区', max: 100},  
255 - {text: '其他', max: 100} 205 + {text: '', max: 100},
  206 + {text: '', max: 100},
  207 + {text: '', max: 100},
  208 + {text: '', max: 100}
256 ], 209 ],
257 name: { 210 name: {
258 textStyle: { 211 textStyle: {
@@ -338,7 +291,7 @@ @@ -338,7 +291,7 @@
338 } 291 }
339 ] 292 ]
340 }; 293 };
341 - radarechart.setOption(radar_echart_option,true); 294 + radarechart.setOption(radar_echart_option,true);
342 295
343 296
344 //左中柱图bar_l_echart 297 //左中柱图bar_l_echart
@@ -792,8 +745,11 @@ @@ -792,8 +745,11 @@
792 bar_l_option.xAxis.data.push(countryName); 745 bar_l_option.xAxis.data.push(countryName);
793 746
794 countryIndex[countryName] = i; 747 countryIndex[countryName] = i;
  748 + //拼图
  749 + var serieData = {name:countryName,value:0};
  750 + dataCount[i]=serieData;
795 } 751 }
796 - 752 + bar_l_option.xAxis.data.push("其他");
797 var req= { 753 var req= {
798 sysCode:sysComm.sysCode, 754 sysCode:sysComm.sysCode,
799 cityId:sysComm.cityId 755 cityId:sysComm.cityId
@@ -903,7 +859,7 @@ @@ -903,7 +859,7 @@
903 }, 859 },
904 xAxis: { 860 xAxis: {
905 gridLineWidth: 0, 861 gridLineWidth: 0,
906 - categories: ['红山区', '松山区', '元宝山区', '其他'], 862 + categories: bar_l_option.xAxis.data,
907 labels: { 863 labels: {
908 style: { 864 style: {
909 color: '#fff',//颜色 865 color: '#fff',//颜色
@@ -932,7 +888,7 @@ @@ -932,7 +888,7 @@
932 888
933 }); 889 });
934 890
935 - bar_l_option.xAxis.data.push("其他"); 891 +
936 var serieData = {value:otherParkLotNum, name:"其他"}; 892 var serieData = {value:otherParkLotNum, name:"其他"};
937 dataCount.push(serieData); 893 dataCount.push(serieData);
938 894
@@ -1151,11 +1107,13 @@ @@ -1151,11 +1107,13 @@
1151 ], 1107 ],
1152 series : [ 1108 series : [
1153 { 1109 {
  1110 + barWidth : 30,//柱图宽度
1154 barGap:'20', 1111 barGap:'20',
1155 barGap:'30%', 1112 barGap:'30%',
1156 data:[] 1113 data:[]
1157 }, 1114 },
1158 { 1115 {
  1116 + barWidth : 30,//柱图宽度
1159 barGap:'30%', 1117 barGap:'30%',
1160 data:[] 1118 data:[]
1161 } 1119 }
@@ -1280,7 +1238,8 @@ @@ -1280,7 +1238,8 @@
1280 //该设备该区域数量 1238 //该设备该区域数量
1281 var equCount = equCountryMap[countryName]; 1239 var equCount = equCountryMap[countryName];
1282 if(countryIndex[countryName]==null || countryIndex[countryName]==undefined){ 1240 if(countryIndex[countryName]==null || countryIndex[countryName]==undefined){
1283 - otherNums += equCount; 1241 + //临时备注设备
  1242 + // otherNums += equCount;
1284 }else{ 1243 }else{
1285 var index = countryIndex[countryName]; 1244 var index = countryIndex[countryName];
1286 serisItem.data[index] = equCount; 1245 serisItem.data[index] = equCount;
@@ -1347,6 +1306,7 @@ @@ -1347,6 +1306,7 @@
1347 yAxis: { 1306 yAxis: {
1348 allowDecimals: false, 1307 allowDecimals: false,
1349 min: 0, 1308 min: 0,
  1309 + minRange: 1,
1350 gridLineWidth: 0, 1310 gridLineWidth: 0,
1351 title: { 1311 title: {
1352 text: '' 1312 text: ''
js/pagejs/parkheat.js
  View file @ebfd261
@@ -309,7 +309,7 @@ if(!isSupportCanvas()){ @@ -309,7 +309,7 @@ if(!isSupportCanvas()){
309 alert('热力图目前只支持有canvas支持的浏览器,您所使用的浏览器不能使用热力图功能~') 309 alert('热力图目前只支持有canvas支持的浏览器,您所使用的浏览器不能使用热力图功能~')
310 } 310 }
311 311
312 -heatmapOverlay = new BMapLib.HeatmapOverlay({"radius":20}); 312 +heatmapOverlay = new BMapLib.HeatmapOverlay({"radius":50});
313 map.addOverlay(heatmapOverlay); 313 map.addOverlay(heatmapOverlay);
314 heatmapOverlay.setDataSet({data:points,max:10}); 314 heatmapOverlay.setDataSet({data:points,max:10});
315 315
js/pagejs/parkhotarea.js
  View file @ebfd261
@@ -245,9 +245,7 @@ @@ -245,9 +245,7 @@
245 245
246 // 百度地图API功能 246 // 百度地图API功能
247 var map; //Map实例 247 var map; //Map实例
248 -//后台传过来  
249 -var currentLat = 118.967899;  
250 -var currentLon = 42.279838; 248 +
251 //热点区域中心点 249 //热点区域中心点
252 var centerData=[ 250 var centerData=[
253 /*{ 251 /*{
@@ -285,7 +283,7 @@ var freeBerthData={ @@ -285,7 +283,7 @@ var freeBerthData={
285 } 283 }
286 var marker ={}; 284 var marker ={};
287 map = new BMap.Map('allmap',{enableMapClick:false}); // 创建Map实例 285 map = new BMap.Map('allmap',{enableMapClick:false}); // 创建Map实例
288 -var point = new BMap.Point(currentLat,currentLon); 286 +var point = new BMap.Point(sysComm.centerpoint_lng,sysComm.centerpoint_lat);
289 map.enableScrollWheelZoom(); 287 map.enableScrollWheelZoom();
290 //第5步：设置地图风格 288 //第5步：设置地图风格
291 map.setMapStyle({ 289 map.setMapStyle({
js/pagejs/parkquery.js
  View file @ebfd261
@@ -403,27 +403,7 @@ var clear_flag = false; @@ -403,27 +403,7 @@ var clear_flag = false;
403 }; 403 };
404 })(jQuery); 404 })(jQuery);
405 var parkData = [ 405 var parkData = [
406 - // {  
407 - // parkNo: "001",  
408 - // pointX: "118.970907",  
409 - // pointY: "42.27894",  
410 - // allnum: "270",  
411 - // free: "0"  
412 - // },  
413 - // {  
414 - // parkNo: "002",  
415 - // pointX: "118.963558",  
416 - // pointY: "42.278059",  
417 - // allnum: "260",  
418 - // free: "5"  
419 - // },  
420 - // {  
421 - // parkNo: "003",  
422 - // pointX: "118.951988",  
423 - // pointY: "42.276645",  
424 - // allnum: "300",  
425 - // free: "150"  
426 - // } 406 +
427 ]; 407 ];
428 $(function () { 408 $(function () {
429 var checktext; 409 var checktext;
@@ -465,23 +445,23 @@ $(function () { @@ -465,23 +445,23 @@ $(function () {
465 "Title": "行政区划", 445 "Title": "行政区划",
466 "inputName": "selected1_value", 446 "inputName": "selected1_value",
467 // 默认选中的值（参数值写需要选中的select的value值） 447 // 默认选中的值（参数值写需要选中的select的value值）
468 - "selected": "923", 448 + "selected": "2703",
469 Succee: function () { 449 Succee: function () {
470 // console.log($("input[name='selected1_value']").attr('value')); 450 // console.log($("input[name='selected1_value']").attr('value'));
471 checkText = $(".sel-title").eq(0).text(); 451 checkText = $(".sel-title").eq(0).text();
472 if (checkText == "全部") { 452 if (checkText == "全部") {
473 - checktext = "赤峰市" 453 + checktext = sysComm.cityName
474 } else if (checkText == "其他") { 454 } else if (checkText == "其他") {
475 //map.clearOverlays(); 455 //map.clearOverlays();
476 - checktext = "赤峰市"; 456 + checktext = sysComm.cityName;
477 } else { 457 } else {
478 - checktext = "赤峰市" + checkText; 458 + checktext = sysComm.cityName + checkText;
479 } 459 }
480 getBoundary(checktext); 460 getBoundary(checktext);
481 serfun(); 461 serfun();
482 } 462 }
483 }); 463 });
484 - // getBoundary("赤峰市红山区"); 464 + getBoundary(sysComm.areaName);
485 serfun(); 465 serfun();
486 map.centerAndZoom(point, 15); 466 map.centerAndZoom(point, 15);
487 467
@@ -549,6 +529,8 @@ $(function () { @@ -549,6 +529,8 @@ $(function () {
549 list_wrap_height(); 529 list_wrap_height();
550 } else { 530 } else {
551 $('#list_wrap').css('height', 'auto'); 531 $('#list_wrap').css('height', 'auto');
  532 + // $('#list_wrap').perfectScrollbar('destroy');
  533 + // $('#list_wrap').perfectScrollbar();
552 } 534 }
553 535
554 // console.log('请求数据ajax'); 536 // console.log('请求数据ajax');
@@ -838,12 +820,12 @@ $(function () { @@ -838,12 +820,12 @@ $(function () {
838 checkText = $(".sel-title").eq(0).text(); 820 checkText = $(".sel-title").eq(0).text();
839 var serText=$.trim($(".ser_text").val()); 821 var serText=$.trim($(".ser_text").val());
840 if (checkText == "全部") { 822 if (checkText == "全部") {
841 - checktext = "赤峰市" 823 + checktext = sysComm.cityName
842 } else if (checkText == "其他") { 824 } else if (checkText == "其他") {
843 //map.clearOverlays(); 825 //map.clearOverlays();
844 - checktext = "赤峰市"; 826 + checktext = sysComm.cityName;
845 } else { 827 } else {
846 - checktext = "赤峰市" + checkText; 828 + checktext = sysComm.cityName + checkText;
847 } 829 }
848 if(serText!=""&&serText!=null&&serText!=undefined){ 830 if(serText!=""&&serText!=null&&serText!=undefined){
849 serfun(); 831 serfun();
@@ -876,15 +858,13 @@ $(document).on(&#39;click&#39;, &#39;.cont-callback&#39;, function () { @@ -876,15 +858,13 @@ $(document).on(&#39;click&#39;, &#39;.cont-callback&#39;, function () {
876 //地图调用部分 858 //地图调用部分
877 var map; //Map实例 859 var map; //Map实例
878 //后台传过来 860 //后台传过来
879 -var currentLat = 118.922316;  
880 -var currentLon = 42.25953;  
881 861
882 map = new BMap.Map('allmap', {enableMapClick: false}); 862 map = new BMap.Map('allmap', {enableMapClick: false});
883 //第1步：设置地图中心点，当前城市 863 //第1步：设置地图中心点，当前城市
884 -var point = new BMap.Point(currentLat, currentLon); 864 +var point = new BMap.Point(sysComm.point_lng,sysComm.point_lat);
885 //第2步：初始化地图,设置中心点坐标和地图级别。 865 //第2步：初始化地图,设置中心点坐标和地图级别。
886 map.centerAndZoom(point, 13); 866 map.centerAndZoom(point, 13);
887 -map.setCurrentCity("赤峰"); // 设置地图显示的城市 此项是必须设置的 867 +//map.setCurrentCity(sysComm.cityName); // 设置地图显示的城市 此项是必须设置的
888 //第3步：启用滚轮放大缩小 868 //第3步：启用滚轮放大缩小
889 map.enableScrollWheelZoom(true); 869 map.enableScrollWheelZoom(true);
890 //第4步：向地图中添加缩放控件 870 //第4步：向地图中添加缩放控件
pages/index.html
  View file @ebfd261
@@ -130,7 +130,7 @@ @@ -130,7 +130,7 @@
130 <script src="https://img.hcharts.cn/highcharts/highcharts.js"></script> 130 <script src="https://img.hcharts.cn/highcharts/highcharts.js"></script>
131 <script src="https://img.hcharts.cn/highcharts/highcharts-3d.js"></script> 131 <script src="https://img.hcharts.cn/highcharts/highcharts-3d.js"></script>
132 <script src="https://img.hcharts.cn/highcharts-plugins/highcharts-zh_CN.js"></script> 132 <script src="https://img.hcharts.cn/highcharts-plugins/highcharts-zh_CN.js"></script>
133 -<script src="../js/lib/chifeng.js"></script> 133 +<script src="../js/lib/meishan.js"></script>
134 <script src="../js/common/header-footer.js"></script> 134 <script src="../js/common/header-footer.js"></script>
135 <script src="../js/common/common.js"></script> 135 <script src="../js/common/common.js"></script>
136 <script src="../js/common/unit.js"></script> 136 <script src="../js/common/unit.js"></script>
pages/parkquery.html
  View file @ebfd261
@@ -42,10 +42,10 @@ @@ -42,10 +42,10 @@
42 <div class="parkquery-cont con"> 42 <div class="parkquery-cont con">
43 <div style="display:inline-block;width: 108px;height: 36px;margin-right: 8px"> 43 <div style="display:inline-block;width: 108px;height: 36px;margin-right: 8px">
44 <select class="select01" id="select01"> 44 <select class="select01" id="select01">
45 - <option value="923">红山区</option> 45 + <!-- <option value="923">红山区</option>
46 <option value="925">松山区</option> 46 <option value="925">松山区</option>
47 <option value="923,924,925,926,927,928,929,930,931,932,933,934">全部</option> 47 <option value="923,924,925,926,927,928,929,930,931,932,933,934">全部</option>
48 - <option value="924,926,927,928,929,930,931,932,933,934">其他</option> 48 + <option value="924,926,927,928,929,930,931,932,933,934">其他</option>-->
49 </select> 49 </select>
50 </div> 50 </div>
51 51