Skip to content

H
house-type
Commit e742a3e7 authored by wangjiankun's avatar wangjiankun
Browse files
Options

fix: 地图坐标转换 --- 高德=>百度 样式细节优化 

feat: 新增暂无数据、暂无图片样式、搜索框样式
parent 619dee82
Hide whitespace changes
Inline Side-by-side
Showing with 286 additions and 155 deletions
src/assets/icons/svg/houseNoData.svg 0 → 100644
View file @ e742a3e7
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M514.880452 630.557515L289.843802 383.742193 136.830494 675.585807v80.406889h760.044122c-96.798118-86.070212-300.939144-270.210711-300.939143-270.21071l-81.055021 144.775529z m264.237779-185.757214c42.224941 0 76.426541-35.236442 76.426541-78.768489 0-43.485064-34.202805-78.790174-76.426541-78.790174-42.108085 0-76.332574 35.305111-76.332575 78.790174-0.001205 43.532047 34.224489 78.768489 76.332575 78.768489zM18.070588 97.581176v831.066353h986.895059V97.581176H18.070588z m937.343097 778.223135H71.00416l-0.042165-722.048904H900.120094v0.046984h55.292386l0.001205 722.00192z" /></svg>
\ No newline at end of file
src/assets/icons/svg/noData.svg 0 → 100644
View file @ e742a3e7
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M170.666667 726.552381a355.961905 63.390476 0 1 0 711.923809 0 355.961905 63.390476 0 1 0-711.923809 0Z" fill="#edeff8" /><path d="M648.533333 195.047619m29.257143 0l78.019048 0q29.257143 0 29.257143 29.257143l0 458.361905q0 29.257143-29.257143 29.257143l-78.019048 0q-29.257143 0-29.257143-29.257143l0-458.361905q0-29.257143 29.257143-29.257143Z" fill="#ffffff" /><path d="M746.057143 185.295238h9.752381a39.009524 39.009524 0 0 1 39.009524 39.009524v448.609524a39.009524 39.009524 0 0 1-39.009524 39.009524h-9.752381V185.295238z" fill="#f2f4fc" /><path d="M677.790476 195.047619a29.257143 29.257143 0 0 0-29.257143 29.257143v458.361905a29.257143 29.257143 0 0 0 29.257143 29.257143h78.019048a29.257143 29.257143 0 0 0 29.257143-29.257143V224.304762a29.257143 29.257143 0 0 0-29.257143-29.257143H677.790476z m0-9.752381h78.019048a39.009524 39.009524 0 0 1 39.009524 39.009524v458.361905a39.009524 39.009524 0 0 1-39.009524 39.009523H677.790476a39.009524 39.009524 0 0 1-39.009524-39.009523V224.304762a39.009524 39.009524 0 0 1 39.009524-39.009524z" fill="#adb6c4" /><path d="M453.485714 360.838095m29.257143 0l78.019048 0q29.257143 0 29.257143 29.257143l0 292.571429q0 29.257143-29.257143 29.257143l-78.019048 0q-29.257143 0-29.257143-29.257143l0-292.571429q0-29.257143 29.257143-29.257143Z" fill="#ffffff" /><path d="M551.009524 350.715124h9.752381a39.009524 39.009524 0 0 1 39.009524 39.009524V682.666667a39.009524 39.009524 0 0 1-39.009524 39.009523h-9.752381V350.715124z" fill="#f2f4fc" /><path d="M482.742857 360.838095a29.257143 29.257143 0 0 0-29.257143 29.257143v292.571429a29.257143 29.257143 0 0 0 29.257143 29.257143h78.019048a29.257143 29.257143 0 0 0 29.257143-29.257143V390.095238a29.257143 29.257143 0 0 0-29.257143-29.257143H482.742857z m0-9.752381h78.019048a39.009524 39.009524 0 0 1 39.009524 39.009524v292.571429a39.009524 39.009524 0 0 1-39.009524 39.009523H482.742857a39.009524 39.009524 0 0 1-39.009524-39.009523V390.095238a39.009524 39.009524 0 0 1 39.009524-39.009524z" fill="#adb6c4" /><path d="M258.438095 507.12381m29.257143 0l78.019048 0q29.257143 0 29.257143 29.257142l0 146.285715q0 29.257143-29.257143 29.257143l-78.019048 0q-29.257143 0-29.257143-29.257143l0-146.285715q0-29.257143 29.257143-29.257142Z" fill="#ffffff" /><path d="M355.961905 505.28061h9.752381a39.009524 39.009524 0 0 1 39.009524 39.009523V672.914286a39.009524 39.009524 0 0 1-39.009524 39.009524h-9.752381V505.28061z" fill="#f2f4fc" /><path d="M287.695238 507.12381a29.257143 29.257143 0 0 0-29.257143 29.257142v146.285715a29.257143 29.257143 0 0 0 29.257143 29.257143h78.019048a29.257143 29.257143 0 0 0 29.257143-29.257143V536.380952a29.257143 29.257143 0 0 0-29.257143-29.257142h-78.019048z m0-9.752381h78.019048a39.009524 39.009524 0 0 1 39.009524 39.009523v146.285715a39.009524 39.009524 0 0 1-39.009524 39.009523h-78.019048a39.009524 39.009524 0 0 1-39.009524-39.009523V536.380952a39.009524 39.009524 0 0 1 39.009524-39.009523z" fill="#adb6c4" /><path d="M51.453562 197.241905l4.369067-8.718629c5.851429 2.925714 11.663848 5.724648 17.437257 8.387048l-4.096 8.855162a656.14019 656.14019 0 0 1-17.710324-8.523581z m35.693714 16.510781l3.813181-8.972191c6.026971 2.545371 11.995429 4.963962 17.934629 7.236267l-3.491353 9.108724c-6.046476-2.321067-12.12221-4.778667-18.246704-7.3728z m36.815238 14.072685l3.130515-9.235504c6.18301 2.096762 12.317257 4.037486 18.402742 5.822171l-2.740419 9.362286c-6.222019-1.823695-12.483048-3.803429-18.792838-5.948953z m38.014781 11.117715l2.311315-9.479315c6.329295 1.540876 12.609829 2.90621 18.822095 4.096l-1.823695 9.586591a397.526552 397.526552 0 0 1-19.309715-4.213029z m38.736457 7.392304l1.316572-9.654857c6.436571 0.877714 12.804876 1.560381 19.114666 2.048l-0.750933 9.723124a340.884724 340.884724 0 0 1-19.680305-2.116267z m39.672686 3.052496l0.146286-9.752381c6.456076 0.097524 12.853638-0.019505 19.182933-0.351086l0.497372 9.752381c-6.534095 0.331581-13.14621 0.44861-19.826591 0.351086z m40.043276-2.116267l-1.18979-9.674362c6.368305-0.78019 12.668343-1.794438 18.900114-3.023238l1.891962 9.576838c-6.465829 1.26781-12.999924 2.311314-19.602286 3.120762z m38.463391-7.548343l-2.564876-9.401295a259.11101 259.11101 0 0 0 18.275961-5.714895l3.257296 9.186743c-6.251276 2.21379-12.580571 4.193524-18.968381 5.929447z m37.653943-13.321752l-3.920458-8.933181a269.487543 269.487543 0 0 0 17.261715-8.328533l4.544609 8.630857c-5.90019 3.101257-11.858895 5.97821-17.885866 8.630857z m35.371885-18.646553l-5.129752-8.289523a297.174552 297.174552 0 0 0 15.9744-10.630096l5.656381 7.948191c-5.432076 3.871695-10.932419 7.528838-16.501029 10.971428z m32.582705-23.210666l-6.134248-7.567848a341.762438 341.762438 0 0 0 14.599315-12.522057l6.5536 7.216762c-4.944457 4.486095-9.947429 8.777143-15.018667 12.873143z m29.588724-26.819048l-6.924191-6.875428c4.456838-4.495848 8.874667-9.167238 13.224229-14.014172l7.246019 6.534095c-4.456838 4.95421-8.97219 9.732876-13.546057 14.345753z m25.619505-28.350171l-7.509334-6.222019c4.047238-4.87619 8.045714-9.918171 11.995429-15.116191l7.762895 5.909943c-4.037486 5.295543-8.113981 10.435048-12.24899 15.428267z m25.35619-21.445486l-1.004495-9.703619c8.56259-0.877714 16.003657-0.516876 21.728305 1.726171l-3.549867 9.079467c-3.939962-1.540876-10.025448-1.8432-17.173943-1.102019z m21.016381 12.444038l9.596343 1.784686a52.409295 52.409295 0 0 1-8.328533 19.894857l-7.996953-5.578362c3.257295-4.681143 5.69539-10.522819 6.729143-16.091429z m-19.407238 25.258667l0.8192 9.723124c-6.436571 0.546133-12.746362-2.08701-18.451505-7.792153a34.581943 34.581943 0 0 1-2.720914-3.072l7.665371-6.026971c0.633905 0.799695 1.277562 1.531124 1.950477 2.204038 3.774171 3.774171 7.33379 5.266286 10.727619 4.973714z m-19.836343-23.161905l-9.498819 2.204038a78.730971 78.730971 0 0 1-1.8432-20.714057l9.752381 0.37059a69.0176 69.0176 0 0 0 1.589638 18.139429z m1.189791-36.668952l-9.440305-2.467353c1.696914-6.485333 4.05699-12.912152 7.070476-19.182933l8.786895 4.232533a95.856152 95.856152 0 0 0-6.417066 17.417753z m15.886628-33.197105l-7.889676-5.7344c3.920457-5.393067 8.367543-10.522819 13.341257-15.350248l6.79741 6.992457c-4.573867 4.447086-8.660114 9.157486-12.248991 14.092191z m26.86781-25.892572l-5.090743-8.318781a81.54941 81.54941 0 0 1 18.997638-8.35779l2.82819 9.342781a71.84579 71.84579 0 0 0-16.735085 7.33379zM566.301257 15.60381l-1.111771-9.684115c6.280533-0.731429 12.970667-1.072762 20.060647-1.043505l-0.048762 9.752381c-6.709638-0.029257-13.009676 0.292571-18.900114 0.975239z m37.858743-0.03901L605.037714 5.851429c6.280533 0.555886 12.834133 1.365333 19.6608 2.408838l-1.492114 9.645104a302.275048 302.275048 0 0 0-19.0464-2.340571z m38.46339 5.851429l1.960229-9.557334c6.212267 1.277562 12.609829 2.730667 19.212191 4.359315l-2.340572 9.469561a493.685029 493.685029 0 0 0-18.831848-4.271542z m36.961524 9.069714l2.633143-9.401295c6.114743 1.716419 12.395276 3.579124 18.822095 5.558857l-2.886704 9.323276c-6.339048-1.969981-12.53181-3.803429-18.578286-5.490591z m33.645715 2.691657l4.349561 8.728381-17.437257 8.718629-4.369066-8.718629 17.456762-8.728381z m-34.894019 17.44701l4.359314 8.718628-17.456762 8.728381-4.349562-8.728381 17.44701-8.718628zM668.174629 77.433905l4.749409-8.523581c5.822171 3.247543 11.50781 6.241524 17.047162 9.0112l-4.349562 8.728381a422.599924 422.599924 0 0 1-17.447009-9.216z m35.440152 17.544533l3.822933-8.97219a247.612952 247.612952 0 0 0 17.866362 6.826666l-3.120762 9.245257c-5.997714-2.018743-12.190476-4.388571-18.568533-7.099733z m37.878248 12.561067l2.126019-9.518324a135.977448 135.977448 0 0 0 18.685562 2.847695l-0.789943 9.723124a145.720076 145.720076 0 0 1-20.021638-3.052495z m39.936 3.735162l-0.03901-9.752381a390.3488 390.3488 0 0 0 19.2512-0.604648l0.526629 9.732876c-7.070476 0.390095-13.653333 0.585143-19.738819 0.624153z m39.448381-2.038248l-0.848458-9.713371a812.061257 812.061257 0 0 0 19.29021-1.930972l1.082514 9.693867c-6.807162 0.760686-13.321752 1.414095-19.524266 1.950476z m38.931504-4.310552l-1.267809-9.66461c6.202514-0.809448 12.619581-1.696914 19.260952-2.652647l1.404343 9.654857c-6.690133 0.965486-13.155962 1.852952-19.397486 2.6624z" fill="#edeff8" /><path d="M877.714286 126.780952a24.380952 24.380952 0 1 1 0-48.761904 24.380952 24.380952 0 0 1 0 48.761904z m0-19.504762a4.87619 4.87619 0 1 0 0-9.75238 4.87619 4.87619 0 0 0 0 9.75238z" fill="#edeff8" /><path d="M354.908648 292.142324c22.918095-5.090743 38.122057-23.239924 47.025981-50.263772 3.179276-9.654857 5.305295-19.748571 6.563352-29.647238a157.725257 157.725257 0 0 0 1.063009-11.761371c-15.145448-29.598476-33.821257-38.005029-68.900571-38.697448-17.729829-0.351086-36.298362 7.158248-54.486552 20.021638a168.472381 168.472381 0 0 0-23.483734 20.167924c-10.659352 29.32541-21.650286 46.538362-33.762743 50.634362 30.866286 38.287848 72.586971 51.414552 125.981258 39.545905z m-134.173258-48.693638c9.333029 2.594133 20.948114-11.927162 33.119086-45.719162l0.955734-1.609143a152.849067 152.849067 0 0 1 7.070476-7.060724 178.13699 178.13699 0 0 1 18.656304-15.223467c19.738819-13.955657 40.150552-22.215924 60.318477-21.816076 38.775467 0.770438 60.854857 10.922667 77.980038 45.182781l0.536381 1.072762-0.019505 1.199543a90.033981 90.033981 0 0 1-0.195048 3.900952c-0.195048 3.023238-0.516876 6.407314-0.975238 10.083962a169.340343 169.340343 0 0 1-6.982705 31.461181c-9.879162 29.969067-27.296914 50.770895-54.184228 56.749105-60.37699 13.409524-107.880838-3.549867-141.55581-50.692876l-8.016457-11.215238 13.292495 3.6864z" fill="#adb6c4" /><path d="M388.027733 228.293486c-12.561067 8.835657-21.172419 12.073448-43.924723 18.39299a314.514286 314.514286 0 0 0-6.241524 1.794438c-23.92259 7.177752-63.185676 13.7216-117.906286 19.680305l-1.053257-9.693867c54.174476-5.90019 92.94019-12.366019 116.150857-19.329219 1.872457-0.555886 3.774171-1.102019 6.436571-1.8432 21.699048-6.036724 29.569219-8.991695 40.920991-16.978895 6.056229-4.26179 15.60381-13.799619 28.389181-28.476952l1.043505-1.189791 1.550628-0.351085c7.587352-1.735924 13.263238-4.583619 17.134934-8.455315 4.174019-4.164267 10.493562-13.643581 18.714819-28.203885l8.484571 4.798171c-8.630857 15.301486-15.311238 25.326933-20.294705 30.3104-4.973714 4.973714-11.780876 8.513829-20.304457 10.678857-12.775619 14.570057-22.401219 24.156648-29.101105 28.867048z" fill="#adb6c4" /><path d="M302.470095 166.970514l9.45981-2.360076c6.290286 25.161143 12.561067 40.833219 18.2272 46.4896 5.656381 5.666133 21.328457 11.936914 46.4896 18.2272l-2.360076 9.45981c-26.858057-6.709638-43.690667-13.448533-51.03421-20.782324-7.33379-7.343543-14.072686-24.185905-20.782324-51.03421z" fill="#adb6c4" /><path d="M372.014324 230.6048l6.904686 6.904686C366.806552 249.621943 360.838095 258.564876 360.838095 263.314286c0 5.558857 3.052495 14.696838 9.235505 27.072609l-8.718629 4.369067C354.538057 281.122133 351.085714 270.765105 351.085714 263.314286c0-8.250514 7.041219-18.812343 20.92861-32.709486zM253.58141 215.010743l9.713371-0.916724c1.004495 10.600838 3.998476 19.582781 8.952686 27.014095 4.26179 6.397562 12.209981 9.040457 24.644266 7.606857l1.111772 9.693867c-15.740343 1.813943-27.306667-2.048-33.870019-11.897905-5.880686-8.825905-9.391543-19.348724-10.552076-31.50019z" fill="#adb6c4" /><path d="M282.819048 253.561905h9.752381c0 11.800381 2.837943 20.323962 8.328533 25.8048 5.354057 5.36381 17.232457 8.328533 35.557181 8.328533v9.752381c-20.675048 0-34.816-3.530362-42.461867-11.176229-7.509333-7.519086-11.176229-18.510019-11.176228-32.709485z" fill="#b5bdc9" /><path d="M946.049219 633.836495C932.181333 633.456152 921.6 631.447162 921.6 629.028571s10.581333-4.427581 24.449219-4.807923c0.380343-13.867886 2.389333-24.449219 4.807924-24.449219s4.427581 10.581333 4.807924 24.449219c13.867886 0.380343 24.449219 2.389333 24.449219 4.807923s-10.581333 4.427581-24.449219 4.807924c-0.380343 13.867886-2.389333 24.449219-4.807924 24.449219s-4.427581-10.581333-4.807924-24.449219zM146.353981 482.67459C132.486095 482.294248 121.904762 480.285257 121.904762 477.866667s10.581333-4.427581 24.449219-4.807924C146.734324 459.190857 148.743314 448.609524 151.161905 448.609524s4.427581 10.581333 4.807924 24.449219c13.867886 0.380343 24.449219 2.389333 24.449219 4.807924s-10.581333 4.427581-24.449219 4.807923C155.589486 496.542476 153.580495 507.12381 151.161905 507.12381s-4.427581-10.581333-4.807924-24.44922z" fill="#edeff8" /><path d="M316.874362 971.181105h78.058057v48.459581h-8.231009v-5.032229h-61.596039v5.032229h-8.231009v-48.459581z m-3.31581-34.055315h14.17021v-8.455314h7.996952v8.455314h18.402743v6.855924h-18.39299v8.513829c6.358552-0.390095 12.385524-0.78019 18.051657-1.199543-0.292571 2.6624-0.526629 5.139505-0.682667 7.431314-5.675886 0.263314-11.4688 0.565638-17.36899 0.906972v9.147733h-7.996953v-8.679619c-8.874667 0.565638-18.0224 1.209295-27.433447 1.930971l-0.916724-7.762895c10.054705-0.390095 19.504762-0.8192 28.340419-1.316571v-8.972191h-23.425219v-6.972952c2.672152-3.842438 5.295543-8.113981 7.889676-12.795124h-11.995429v-6.865676h15.477029c1.794438-3.657143 3.559619-7.53859 5.315048-11.654095l7.889676 2.633143c-1.453105 3.042743-2.935467 6.046476-4.456838 9.020952h30.856533v6.865676h-34.4064c-2.360076 4.417829-4.798171 8.718629-7.314286 12.912152z m47.776915-21.484495a294.794971 294.794971 0 0 0 45.602133-3.998476l2.633143 7.538591a656.364495 656.364495 0 0 1-40.355353 3.315809v14.511543h42.179048v6.855924h-16.34499v24.000609h-7.996953v-23.990857H368.64c-1.414095 10.396038-5.149257 19.036648-11.205486 25.941333-1.823695-1.755429-3.959467-3.666895-6.397562-5.724647 6.855924-7.080229 10.288762-17.134933 10.288762-30.164114v-18.285715z m-36.230096 91.886934h61.596039v-11.312762h-61.596039v11.312762z m61.596039-29.257143h-61.596039v11.195733h61.596039v-11.195733z m33.09958-26.399696h44.802439c1.59939-7.928686 2.555124-16.774095 2.857447-26.526476h-38.970514v-8.903924h92.803657v8.913677h-44.227048c-0.536381 9.752381-1.531124 18.588038-2.974476 26.516723h55.881143v8.913677h-57.831619c-5.783162 25.746286-21.7088 45.70941-47.767162 59.879619a73.9328 73.9328 0 0 0-6.173257-8.113981c22.713295-11.351771 37.488152-28.603733 44.344076-51.765638h-42.744686v-8.913677z m58.514286 17.134934h9.264762v30.056838c0 6.026971 2.779429 9.030705 8.338286 9.030705h15.662324c5.168762 0 8.113981-2.243048 8.796647-6.738896 0.604648-4.349562 1.072762-9.986438 1.365334-16.920381 2.896457 1.072762 6.10499 2.174781 9.606095 3.31581a322.072381 322.072381 0 0 1-2.057753 17.027657c-0.994743 7.626362-6.397562 11.42979-16.227961 11.429791h-19.768077c-9.986438 0-14.979657-5.256533-14.979657-15.7696v-31.431924z m132.876191-61.47901l9.137981 1.365334a197.866057 197.866057 0 0 1-5.597867 20.6848h34.972038v7.772647h-7.197257c-1.901714 22.401219-6.777905 40.189562-14.628572 53.374781a73.220876 73.220876 0 0 0 23.542248 20.577524c-2.438095 3.345067-4.495848 6.358552-6.173257 9.020952a88.405333 88.405333 0 0 1-23.200914-21.484495 109.568 109.568 0 0 1-25.02461 22.625524 65.360457 65.360457 0 0 0-6.51459-7.197257c10.669105-7.011962 19.309714-14.969905 25.941333-23.893334-6.173257-10.659352-10.24-22.966857-12.229486-36.903009-1.59939 2.818438-3.2768 5.441829-5.022476 7.879924a89.692648 89.692648 0 0 0-5.714895-7.314286c8.835657-12.726857 14.735848-28.22339 17.710324-46.518857z m-73.601219 65.935848h17.36899c1.67741-2.896457 3.31581-5.861181 4.9152-8.913676l8.23101 2.633143c-1.219048 2.135771-2.438095 4.222781-3.657143 6.280533h27.999085v7.431314a54.10621 54.10621 0 0 1-13.146209 19.6608c4.193524 1.979733 8.465067 3.959467 12.804876 5.948953l-5.032228 7.879923a516.086248 516.086248 0 0 0-14.735848-7.996952c-8.611352 6.163505-19.465752 11.039695-32.572952 14.628571a420.132571 420.132571 0 0 1-3.8912-8.006704c11.127467-2.516114 20.538514-6.134248 28.233142-10.8544-6.5536-3.354819-13.409524-6.787657-20.577523-10.288762 2.438095-3.510857 4.807924-7.119238 7.089981-10.8544h-13.029181v-7.548343z m1.258057-39.302095h26.282666v-25.609753h8.465067v25.6h21.942857v7.548343h-21.942857v6.9632l3.423086-3.881447c7.089981 5.178514 13.029181 9.752381 17.827352 13.711847l-5.480838 6.397562c-4.193524-3.959467-9.450057-8.416305-15.7696-13.360762v13.019429h-8.465067v-15.993905a114.102857 114.102857 0 0 1-24.224914 19.085409 134.826667 134.826667 0 0 0-4.9152-6.972952 126.800457 126.800457 0 0 0 26.399695-18.968381h-23.542247v-7.548343z m94.510324 3.189028h-21.367467c-0.380343 0.994743-0.799695 1.950476-1.258057 2.857448 1.365333 16.149943 5.178514 29.978819 11.42979 41.486628 6.095238-11.117714 9.8304-25.902324 11.195734-44.344076z m-78.623696 51.882667c5.412571 2.438095 10.971429 4.993219 16.676572 7.665371 5.266286-4.495848 9.38179-9.79139 12.346514-15.896381h-23.766552c-1.755429 2.82819-3.510857 5.56861-5.266286 8.240762z m35.654705-77.824l7.089981 4.681143c-4.193524 5.49059-8.387048 10.561829-12.580571 15.213714-1.745676-1.531124-3.803429-3.130514-6.163505-4.807924 3.959467-4.651886 7.850667-9.674362 11.654095-15.086933z m-48.566857 5.032228l6.51459-4.456838c3.423086 4.193524 6.972952 8.679619 10.630096 13.477791l-7.089981 5.032228a320.843581 320.843581 0 0 0-10.054705-14.053181z m164.756724 63.653791h23.542247V965.583238h-26.624c-0.848457 23.425219-6.251276 41.525638-16.237714 54.281752a100.732343 100.732343 0 0 0-6.163505-7.197257c9.518324-11.732114 14.277486-29.744762 14.277486-54.057447v-44.568381h67.427962v33.13859h-8.221257v-3.540114h-50.975695v14.170209h26.516723v-11.995428h8.23101v11.995428h30.164114v7.772648H738.352762v14.511543h23.766552v38.629181h-8.231009v-6.631619h-39.077791v6.631619h-8.231009v-38.629181z m-51.2-11.546819a744.399238 744.399238 0 0 0 15.7696-4.5056v-26.116876h-14.404267v-8.23101h14.404267v-21.825828h8.455314v21.825828h12.463543v8.23101h-12.463543v23.483733a498.346667 498.346667 0 0 0 10.630095-3.4816c0.078019 3.423086 0.302324 6.397562 0.682667 8.913676-3.920457 1.258057-7.694629 2.49661-11.312762 3.705905v34.57219c0 8.611352-3.774171 12.990171-11.312762 13.14621a176.128 176.128 0 0 1-10.513067-0.117029 113.859048 113.859048 0 0 0-1.365333-9.479314c4.183771 0.458362 7.382552 0.682667 9.596343 0.682667 3.423086 0 5.139505-1.950476 5.139505-5.831924v-30.164114c-5.217524 1.755429-10.093714 3.423086-14.628572 5.022476l-1.141028-9.8304z m99.201219-46.967467h-50.975695v14.511543h50.975695v-14.511543z m-0.682667 66.052876h-39.087543v17.03741h39.077791v-17.03741z" fill="#9ba6b7" /></svg>
\ No newline at end of file
src/components/Layout/index.vue
View file @ e742a3e7
......@@ -30,7 +30,9 @@
class="hamburger-container"
/>
<breadcrumb />
<async-search class="main-search"></async-search>
<div style="width: 100%">
<async-search class="main-search"></async-search>
</div>
<el-dropdown class="avatar-container" trigger="click">
<div class="avatar-wrapper">
<img v-if="avatar" :src="avatar" class="user-avatar" />
......@@ -177,8 +179,7 @@ export default {
.avatar-container {
height: 50px;
display: inline-block;
position: absolute;
right: 35px;
margin: 0 15px
.avatar-wrapper {
cursor: pointer;
margin-top: 5px;
......@@ -195,7 +196,7 @@ export default {
}
.el-icon-caret-bottom {
position: absolute;
right: -20px;
right: -10px;
top: 25px;
font-size: 12px;
}
......
src/components/mapOverlay/index.vue
View file @ e742a3e7
......@@ -48,16 +48,19 @@
const lng = this.position.lng
const lat = this.position.lat
const pixel = map.pointToOverlayPixel(new BMap.Point(lng, lat))
el.style.left = pixel.x - this.width / 2 + 'px'
el.style.top = pixel.y - this.height / 2 + 'px'
el.style.left = pixel.x - this.overlyWidth / 2 + 'px'
el.style.top = pixel.y - this.overlyHeigth / 2 + 'px'
}
},
computed: {
style () {
return
}
overlyWidth() {
return this.width || 100
},
overlyHeigth() {
return this.height || 20
}
}
}
</script>
<style scoped lang="stylus">
......
src/components/multilHeaderTable/index.vue
View file @ e742a3e7
......@@ -25,7 +25,7 @@
</el-row>
</div>
<div class="table_body" v-if="tableData instanceof Array" :style="{ width: bodyWidth + '%'}">
<div class="productionName">
<div class="productionName" v-if="tableData.length > 0">
<el-col :span="24 / tableData.length" v-for="(item,index) in tableData" :key="index" style="min-width: 200px">
<el-row :class="{'dataCell':true, 'prodName': index < 2}">{{item.productionName}}</el-row>
<el-col class="productionDetail" :span="24 / item.productionProperties.length" v-for="(item2,index) in item.productionProperties" :key="index">
......@@ -41,6 +41,12 @@
</el-col>
</el-col>
</div>
<div v-else style="height: 100%;display: flex;align-items: center;">
<div style="width: 100%;text-align: center;margin: auto">
<svg-icon icon-class="houseNoData" style="width: 200px;height: 200px" />
<div>暂无数据</div>
</div>
</div>
</div>
<div class="table_body" v-else :style="{ width: bodyWidth + '%'}">
<el-col :span="24" style="min-width: 120px">
......
src/router/index.js
View file @ e742a3e7
......@@ -30,14 +30,14 @@ let routes = [
{
path: '/regionalPlate',
hidden: false,
meta: { title: '户型查询', icon: 'el-icon-discover' },
meta: { title: '板块&区域', icon: 'el-icon-discover' },
component: Layout,
children: [
{
path: '/regionalPlate',
name: 'regionalPlate',
hidden: false,
meta: { title: '户型查询' },
meta: { title: '板块&区域' },
component: () => import('@/views/RegionalPlate/index.vue'),
}
]
......
src/views/ProductAnalysis/index.vue
View file @ e742a3e7
......@@ -63,53 +63,61 @@
</div>
</div>
<el-card :body-style="{padding: '0'}">
<div class="supplyDealCharts" v-if="showMode === 0">
<div style="width: 50%">
<ve-pie :data="pieData" :legend="{ bottom: 20 }" :colors="colorsArr" :settings="pieSettings"></ve-pie>
<!-- 各产品 供应套数与详细信息表格-->
<table cellspacing="0" cellpadding="0" class="table">
<tr>
<th>产品类型</th>
<th>产品供应数量</th>
<th>开间数</th>
<th>居室数</th>
<th>厅数</th>
<th>卫生间数</th>
</tr>
<tr v-for="item in pieData.rows">
<td>{{item.productionPie}}</td>
<td>{{item.supplication}}</td>
<td>{{item.kjNum || 0}}</td>
<td>{{item.jsNum || 0}}</td>
<td>{{item.tingNum || 0}}</td>
<td>{{item.wsjNum || 0}}</td>
</tr>
</table>
<div class="container" v-if="showMode === 0">
<div class="noData" style="height: 500px;display: flex;align-items: center;justify-content: center"
v-if="pieData.rows.length === 0 && histogramData.rows.length === 0 &&productionProjectData.length === 0">
<svg-icon icon-class="noData" style="width: 250px;height: 250px"></svg-icon>
</div>
<div style="width: 50%">
<ve-histogram :data="histogramData" :extend="extend" :legend="{ bottom: 20 }" :colors="colorsArr" :settings="chartSettings"></ve-histogram>
<!-- 各房屋 面宽表格详情-->
<table cellspacing="0" cellpadding="0" class="table">
<tr>
<th>产品类型</th>
<th>南向面宽</th>
<th>起居室面宽</th>
<th>主卧面宽</th>
<th>客卧面宽</th>
</tr>
<tr v-for="item in histogramTableData">
<td>{{item.production}}</td>
<td>{{item.nxmkAvg}}</td>
<td>{{item.qjsmkAvg || 0}}</td>
<td>{{item.zwmkAvg || 0}}</td>
<td>{{item.kwmkAvg || 0}}</td>
</tr>
</table>
<div v-else>
<div class="supplyDealCharts">
<div style="width: 50%">
<ve-pie :data="pieData" :legend="{ bottom: 20 }" :colors="colorsArr" :settings="pieSettings"></ve-pie>
<!-- 各产品 供应套数与详细信息表格-->
<table cellspacing="0" cellpadding="0" class="table">
<tr>
<th>产品类型</th>
<th>产品供应数量</th>
<th>开间数</th>
<th>居室数</th>
<th>厅数</th>
<th>卫生间数</th>
</tr>
<tr v-for="item in pieData.rows">
<td>{{item.productionPie}}</td>
<td>{{item.supplication}}</td>
<td>{{item.kjNum || 0}}</td>
<td>{{item.jsNum || 0}}</td>
<td>{{item.tingNum || 0}}</td>
<td>{{item.wsjNum || 0}}</td>
</tr>
</table>
</div>
<div style="width: 50%">
<ve-histogram :data="histogramData" :extend="extend" :legend="{ bottom: 20 }" :colors="colorsArr" :settings="chartSettings"></ve-histogram>
<!-- 各房屋 面宽表格详情-->
<table cellspacing="0" cellpadding="0" class="table">
<tr>
<th>产品类型</th>
<th>南向面宽</th>
<th>起居室面宽</th>
<th>主卧面宽</th>
<th>客卧面宽</th>
</tr>
<tr v-for="item in histogramTableData">
<td>{{item.production}}</td>
<td>{{item.nxmkAvg}}</td>
<td>{{item.qjsmkAvg || 0}}</td>
<td>{{item.zwmkAvg || 0}}</td>
<td>{{item.kwmkAvg || 0}}</td>
</tr>
</table>
</div>
</div>
<div class="supplyAnalysisTable" v-if="showMode === 0">
<multi-header-table :header-width="42" :body-width="58" :header-data="headerTable" :table-data="productionProjectData"></multi-header-table>
</div>
</div>
</div>
<div class="supplyAnalysisTable" v-if="showMode === 0">
<multi-header-table :header-width="42" :body-width="58" :header-data="headerTable" :table-data="productionProjectData"></multi-header-table>
</div>
<div v-if="showMode === 1" class="supplyDealUnitType">
<div class="mainUnit blueBorder" v-for="(item, index) in unitHouseTypeData" :key="index">
<h2 class="unitHeader" style="padding: 0 15px">{{item.productGroupName}}</h2>
......@@ -126,6 +134,12 @@
:total="item.children.length">
</el-pagination>
</div>
<div v-if="unitHouseTypeData.length === 0" style="height: 500px;display: flex;align-items: center">
<div style="width: 50%;text-align: center;margin: auto">
<svg-icon icon-class="houseNoData" style="width: 200px;height: 200px" />
<div>暂无数据</div>
</div>
</div>
</div>
</el-card>
</section>
......@@ -377,7 +391,7 @@
this.regionVal = plateAnalysisQuery.adminRegion ? plateAnalysisQuery.adminRegion : ''
this.plateVal = plateAnalysisQuery.regionId ? plateAnalysisQuery.regionId : ''
this.timeVal = plateAnalysisQuery.year ? plateAnalysisQuery.year: new Date().getFullYear()
this.areaInterval = plateAnalysisQuery.unitArea ? plateAnalysisQuery.unitArea.areaMin + '-' + plateAnalysisQuery.unitArea.areaMax : '0-70'
this.areaInterval = plateAnalysisQuery.areaVal ? plateAnalysisQuery.areaVal : '0-70'
} else {
res.data.forEach(item => {
if(!this.plateMap[item.adminRegionId]) {
......@@ -388,6 +402,7 @@
this.regionVal = item.adminRegionId
this.plateVal = item.resultRegionDTOS[0].regionId
this.timeVal = new Date().getFullYear()
this.areaInterval = '0-70'
}
})
}
......@@ -412,7 +427,9 @@
} else {
this.houseTypeVal = res.data[0] ? res.data[0].businessId : '0-70'
}
callback()
if(callback) {
callback()
}
})
},
// 获取户型信息----产品户型图与图片
......@@ -427,6 +444,20 @@
areaMax: this.areaInterval.split('-')[1]
}
}
// 处理后的格式
// [
// {
// produtGroupName: '产品组名',
// children: [
// {
// unitHouse: '几室几厅几卫',
// unitName: '楼盘名',
// unitArea: "房屋面积",
// fileUrl: '户型图url'
// }
// ]
// }
// ]
plateAnalysisHouseImg(temp).then(res => {
let productionList = []
let pageList = []
......@@ -458,6 +489,13 @@
this.pageList = pageList
this.unitHouseTypeData = productionList
// 假分页
// 格式
// {
// '产品组名': {
// 'page1': Array(6)
// }
// }
// 注意截取数组不要用splice 要用slice
const productionListCopy = JSON.parse(JSON.stringify(productionList))
productionListCopy.forEach(item => {
if(!this.pageListMap[item.productGroupName]) {
......@@ -496,16 +534,15 @@
})
},
beforeDestroy() {
sessionStorage.setItem('plateAnalysisQuery', JSON.stringify({
adminRegion: this.regionVal,
regionId: this.plateVal,
year: this.timeVal,
productType: this.houseTypeVal,
unitArea: {
areaMin: this.areaInterval.split('-')[0],
areaMax: this.areaInterval.split('-')[1]
}
}))
if(this.regionVal && this.plateVal) {
sessionStorage.setItem('plateAnalysisQuery', JSON.stringify({
adminRegion: this.regionVal,
regionId: this.plateVal,
year: this.timeVal,
productType: this.houseTypeVal,
areaVal: this.areaInterval
}))
}
}
}
</script>
......
src/views/RegionalPlate/index.vue
View file @ e742a3e7
......@@ -15,7 +15,7 @@
@click.native.stop="setShowToPlate(item)"
:key="index + 'region'"
v-for="(item,index) in dataType.region"
:position="{ lng:item.longitude, lat: item.latitude }"
:position="{lng: item.longitude, lat: item.latitude}"
:type="'circle'"
:text="item.name"
:num="item.projectSize"
......@@ -34,7 +34,7 @@
@click.native.stop="setShowToPlateRegion(item)"
:key="index + 'plate'"
v-for="(item,index) in dataType.plate"
:position="{ lng:item.longitude, lat: item.latitude }"
:position="{lng: item.longitude, lat: item.latitude}"
:type="'circle'"
:text="item.name"
:num="item.projectSize"
......@@ -54,7 +54,7 @@
@click.native.stop="toPropertyDetail(item.businessId)"
:key="index + 'plateRegion' + 'property'"
v-for="(item,index) in dataType.plateRegion.resultBnsProjectDTOS"
:position="{ lng:item.longitude, lat: item.latitude }"
:position="{lng: item.longitude, lat: item.latitude}"
:type="'square'"
:text="item.name"
:fontSize="12"
......@@ -70,7 +70,7 @@
@click.native.stop="collapseItemShow(index)"
:key="index+ 'soild' + 'plateRegion'"
v-for="(item,index) in dataType.plateRegion.resultBnsLandDTOS"
:position="{ lng:item.longitude, lat: item.latitude }"
:position="{lng: item.longitude, lat: item.latitude}"
:type="'square'"
:text="item.code"
:fontSize="12"
......@@ -94,7 +94,7 @@
@click.native.stop="showTowerInfo(item)"
:key="index + 'property'"
v-for="(item,index) in dataType.property"
:position="{ lng:item.longitude, lat: item.latitude }"
:position="{lng: item.longitude, lat: item.latitude}"
:type="'icon'"
:text="item.name"
:text-color="'#ffffff'"
......@@ -122,7 +122,7 @@
{{item.title}}
</div>
<div :class="{'plateRegionDetailShowContainer': true }">
{{dataType.plateRegion[item.prop] || '---'}}
{{dataType.plateRegion.plateInfo[item.prop] || '---'}}
</div>
</el-col>
</div>
......@@ -130,8 +130,8 @@
<el-collapse accordion v-model="soildInfoChange" class="sys-collapse">
<el-card :body-style="{padding: '0'}" class="box-card" v-for="(item,index) in dataType.plateRegion.resultBnsLandDTOS" :key="index">
<el-collapse-item :title="item.code" :name="index">
<p>行政分区：{{dataType.plateRegion.adminRegionName || '--'}}</p>
<p>所属板块: {{dataType.plateRegion.name || '--'}}</p>
<p>行政分区：{{dataType.plateRegion.plateInfo.adminRegionName || '--'}}</p>
<p>所属板块: {{dataType.plateRegion.plateInfo.name || '--'}}</p>
<p>土地面积：{{item.landArea || '--'}}m<sup>2</sup></p>
<p>容积率：{{item.plotRatio || '--'}}%</p>
<p>建筑面积：{{item.builtArea || '--'}}m<sup>2</sup></p>
......@@ -148,14 +148,15 @@
<div v-if="infotType === 2" style="margin-top: 10px;text-align: left">
<el-card v-for="(item, index) in dataType.plateRegion.resultBnsProjectDTOS" class="box-card distanceCard" :key="index" :body-style="{ padding: '0'}">
<div class="imgContainer" >
<img width="150" height="120" :src="imgUrlHeader + item.fileUrl" alt="无法加载" @click.stop="toPropertyDetail(item.businessId)">
<img width="150" height="120" :src="item.fileUrl ? imgUrlHeader + item.fileUrl : require('@assets/img/noPicture.png')" alt="无法加载"
@click.stop="toPropertyDetail(item.businessId)">
</div>
<div class="infomationContainer">
<div class="propertyListName" style="color: #1482f0" @click="toPropertyDetail(item.businessId)">{{item.name}}</div>
<p>价格：{{item.price || '--'}}/m<sup>2</sup></p>
<p>产品类型: {{item.productType || '--'}}</p>
<p>占地面积：{{item.landArea || '--'}}<sup>2</sup></p>
<p>建筑面积：{{item.totalArea || '--'}}<sup>2</sup></p>
<p>占地面积：{{item.landArea || '--'}}m<sup>2</sup></p>
<p>建筑面积：{{item.totalArea || '--'}}m<sup>2</sup></p>
<p>容积率：{{item.plotRatio || '--'}}</p>
<p>开盘时间：{{item.openTime || '--'}}</p>
</div>
......@@ -164,7 +165,8 @@
</div>
<div v-else-if="showType === 'property'" class="dealWidth">
<div class="searchDetailFlex">
<img style="cursor: pointer" @click="toPropertyDetail(propertyDetailData.businessId)" height="200" :src="imgUrlHeader + propertyDetailData.fileUrl" alt="">
<img style="cursor: pointer" @click="toPropertyDetail(propertyDetailData.businessId)" height="200"
:src="propertyDetailData.fileUrl ? imgUrlHeader + propertyDetailData.fileUrl: require('@assets/img/noPicture.png')" alt="">
<p @click="toPropertyDetail(propertyDetailData.businessId)" class="propertyName">{{propertyDetailData.name || '---'}}</p>
<p class="propertyDetail" v-html="'价格'+'：' + propertyDetailData.price + '/m<sup>2</sup>'"></p>
<p class="propertyDetail">{{'产品类型'+ '：' + propertyDetailData.productType}}</p>
......@@ -214,17 +216,19 @@
region: [],
plate: [],
plateRegion: {
plateInfo: {},
resultBnsProjectDTOS: [],
resultBnsLandDTOS: []
},
property: []
}, // 四种的楼房显示类型 数据预览
allData: [],
showType: 'region', // 控制楼房显示的变量
zoomType: {
region: 10,
plate: 11,
plateRegion: 12,
property: 12
region: 11,
plate: 12,
plateRegion: 13,
property: 13
}, // 根据行政区、板块、楼盘控制地图放大倍数
state: 'all', // 楼盘销售状态 在售 售完
solidState: 'all', //土拍的拍卖状态
......@@ -232,8 +236,6 @@
soldOutState: true, // 售罄楼盘状态切换
infotType: 0, // 板块区域详情 详细信息切换
detailShow: false, // 是否展示详细信息
mapTool: null, // map类
BMapTool: null, // BMap类
soildInfoChange: '', // 土拍信息 折叠面板绑定变量
propertyDetailData: {
}, // 搜索后点击楼盘 展示详情数据
......@@ -254,7 +256,8 @@
name: '开盘时间',
defaultSetting: ''
}
} // key/value 对应
}, // key/value 对应
BMapTool: null
}
},
methods: {
......@@ -303,11 +306,19 @@
},
setShowToPlate (item) {
queryPlateByRegionId(item.businessId).then(res => {
this.showType = 'plate'
this.map.center.lng = res.data[0] ? res.data[0].longitude :item.longitude
this.map.center.lat = res.data[0] ? res.data[0].latitude :item.latitude
this.map.setZoom = this.zoomType['plate']
this.dataType['plate'] = res.data
for(let i =0, l = res.data.length; i < l; i++) {
this.transform(res.data[i].longitude, res.data[i].latitude).then(point => {
res.data[i].longitude = point.lng
res.data[i].latitude = point.lat
if(i === l - 1) {
this.showType = 'plate'
this.map.center.lng = res.data[0] ? res.data[0].longitude :item.longitude
this.map.center.lat = res.data[0] ? res.data[0].latitude :item.latitude
this.map.setZoom = this.zoomType['plate']
this.dataType['plate'] = res.data
}
})
}
}).catch(e => {
this.$message({
type: 'error',
......@@ -318,17 +329,42 @@
},
setShowToPlateRegion (item) {
queryPlateDetailById(item.businessId).then(res => {
let info = JSON.parse(JSON.stringify(res.data))
delete info.resultBnsProjectDTOS
delete info.resultBnsLandDTOS
this.showType = 'plateRegion'
this.map.center.lng = item.longitude
this.map.center.lat = item.latitude
this.map.setZoom = this.zoomType['plateRegion']
this.detailShow = true
this.dataType.plateRegion.plateInfo = info
if(res.data.resultBnsProjectDTOS && res.data.resultBnsProjectDTOS.length > 0) {
this.map.center.lng = res.data.resultBnsProjectDTOS[0].longitude
this.map.center.lat = res.data.resultBnsProjectDTOS[0].latitude
for(let i = 0, l = res.data.resultBnsProjectDTOS.length; i < l ; i++) {
this.transform(res.data.resultBnsProjectDTOS[i].longitude, res.data.resultBnsProjectDTOS[i].latitude).then(point => {
res.data.resultBnsProjectDTOS[i].longitude = point.lng
res.data.resultBnsProjectDTOS[i].latitude = point.lat
if(i === l - 1) {
this.dataType.plateRegion.resultBnsProjectDTOS = res.data.resultBnsProjectDTOS
console.log(this.data.plateRegion.resultBnsProjectDTOS)
}
})
}
} else {
this.map.center.lng = item.longitude
this.map.center.lat = item.latitude
this.dataType.plateRegion.resultBnsProjectDTOS = []
}
if(res.data.resultBnsLandDTOS &&res.data.resultBnsLandDTOS.length > 0) {
for(let i = 0, l = res.data.resultBnsLandDTOS.length; i < l ; i++) {
this.transform(res.data.resultBnsLandDTOS[i].longitude, res.data.resultBnsLandDTOS[i].latitude).then(point => {
res.data.resultBnsLandDTOS[i].longitude = point.lng
res.data.resultBnsLandDTOS[i].latitude = point.lat
if(i === l - 1) {
this.dataType.plateRegion.resultBnsLandDTOS = res.data.resultBnsLandDTOS
}
})
}
} else {
this.dataType.plateRegion.resultBnsLandDTOS = []
}
this.map.setZoom = this.zoomType['plateRegion']
this.dataType.plateRegion = res.data
this.detailShow = true
}).catch(e => {
this.$message({
type: 'error',
......@@ -352,42 +388,63 @@
// }
return {target, type}
},
mapLoaded () {
mapLoaded ({ BMap }) {
this.BMapTool = BMap
if(this.$route.query && this.$route.query.type && this.$route.query.data) {
const searchResult = this.$route.query
if(searchResult.type === 'plateRegion') {
this.showType = 'plateRegion'
const resultData = JSON.parse(searchResult.data)
this.map.center.lng = resultData.longitude
this.map.center.lat = resultData.latitude
this.map.setZoom = this.zoomType.plateRegion
this.dataType.plateRegion = resultData
this.transform(resultData.longitude, resultData.latitude).then(point => {
this.showType = 'plateRegion'
this.map.center.lng = point.lng
this.map.center.lat = point.lat
this.map.setZoom = this.zoomType.plateRegion
this.dataType.plateRegion = resultData
})
} else {
this.showType = 'property'
const resultData = JSON.parse(searchResult.data)
this.map.center.lng = averagePosition(resultData).longitude
this.map.center.lat = averagePosition(resultData).latitude
this.map.setZoom = this.zoomType.property
this.dataType.property = resultData
this.propertyDetailData = this.dataType.property[0]
for(let i = 0, l= resultData.length; i < l ; i++) {
this.transform(resultData[i].longitude, resultData[i].latitude).then(point => {
resultData[i].longitude = point.lng
resultData[i].latitude = point.lat
if (i === l -1) {
this.showType = 'property'
this.map.center.lng = averagePosition(resultData).longitude
this.map.center.lat = averagePosition(resultData).latitude
this.map.setZoom = this.zoomType.property
this.dataType.property = resultData
this.propertyDetailData = this.dataType.property[0]
}
})
}
}
} else {
// 若无传递值 则查询全部区域及其下属数目信息
queryAllRegions().then(res => {
let arr = []
let i = 0
res.data.forEach(item => {
if(item.remarks) {
arr.push({
businessId: item.businessId,
code: item.code,
name: item.name,
projectSize: item.projectSize,
longitude: Number(item.remarks.split(',')[0]),
latitude: Number(item.remarks.split(',')[1])
i++
let long = Number(item.remarks.split(',')[0])
let lat = Number(item.remarks.split(',')[1])
this.transform(long, lat, BMap).then(point => {
arr.push({
businessId: item.businessId,
code: item.code,
name: item.name,
projectSize: item.projectSize,
longitude: point.lng,
latitude:point.lat
})
if(i === arr.length) {
this.dataType.region = arr
}
})
}
})
this.dataType.region = arr
//
// this.dataType.region = arr
}).catch(e => {
this.$message({
type: 'error',
......@@ -396,47 +453,67 @@
return e
})
}
},
transform(lng, lat) {
return new Promise((resolve, reject) => {
// type = 3 高德地图、腾讯地图 转 百度地图
const position = new this.BMapTool.Point(lng,lat)
new this.BMapTool.Convertor().translate([ position ], 3, 5 , (data) => {
if(data.status === 0) {
resolve(data.points[0])
} else {
reject(data)
}
})
})
},
GDmapPositionTransform(lng, lat) {
var X_PI = Math.PI * 3000.0 / 180.0;
var x = lng, y = lat;
var z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * X_PI);
var theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * X_PI);
var bd_lng = z * Math.cos(theta) + 0.0065;
var bd_lat = z * Math.sin(theta) + 0.006;
return {
lat: bd_lat,
lng: bd_lng
};
}
},
created() {
window.eventBus.$on('searchParamChange', (searchResult) => {
if(searchResult.type === 'plateRegion') {
this.showType = 'plateRegion'
const resultDetail = JSON.parse(searchResult.data) || {}
this.map.center.lng = resultDetail.longitude
this.map.center.lat = resultDetail.latitude
this.map.setZoom = this.zoomType.plateRegion
this.dataType.plateRegion = resultDetail
this.detailShow = true
const resultData = JSON.parse(searchResult.data)
this.transform(resultData.longitude, resultData.latitude).then(point => {
this.showType = 'plateRegion'
this.map.center.lng = point.lng
this.map.center.lat = point.lat
this.map.setZoom = this.zoomType.plateRegion
this.dataType.plateRegion = resultData
})
} else {
this.showType = 'property'
const resultDetail = JSON.parse(searchResult.data) || {}
this.map.center.lng = averagePosition(resultDetail).longitude
this.map.center.lat = averagePosition(resultDetail).latitude
this.map.setZoom = this.zoomType.property
this.dataType.property = resultDetail
this.propertyDetailData = this.dataType.property[0]
this.detailShow = true
const resultData = JSON.parse(searchResult.data)
for(let i = 0, l= resultData.length; i < l ; i++) {
this.transform(resultData[i].longitude, resultData[i].latitude).then(point => {
resultData[i].longitude = point.lng
resultData[i].latitude = point.lat
if (i === l -1) {
this.showType = 'property'
this.map.center.lng = averagePosition(resultData).longitude
this.map.center.lat = averagePosition(resultData).latitude
this.map.setZoom = this.zoomType.property
this.dataType.property = resultData
this.propertyDetailData = this.dataType.property[0]
this.detailShow = true
}
})
}
}
})
},
computed: {
plateRegionColum () {
return plateRegionDetail
},
GDmapPositionTransform() {
return (lng,lat) => {
var X_PI = Math.PI * 3000.0 / 180.0;
var x = lng, y = lat;
var z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * X_PI);
var theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * X_PI);
var bd_lng = z * Math.cos(theta) + 0.0065;
var bd_lat = z * Math.sin(theta) + 0.006;
return {
lng: bd_lng,
lat: bd_lat
};
}
}
}
}
......@@ -466,6 +543,8 @@
width: calc(100% - 20px);
overflow: hidden;
margin: auto;
height 100%
overflow-y auto
}
.tools{
background-color: #cccccc;
......@@ -538,7 +617,6 @@
.RegionalPlateMain{
.plateDetailShow {
height 100%
overflow-y auto
.sys-collapse{
border: none;
.el-collapse-item__header{
......
src/views/plateSupplyData/index.vue
View file @ e742a3e7
......@@ -145,7 +145,7 @@
show: true,
position: "top",
formatter:function(params){ //标签内容
if(params.data == 0) { return '0' }
if(params.data == 0) { return '' }
return (params.data * 100 ).toFixed(0) + '%'
}
}
......@@ -160,7 +160,7 @@
position: "top",
formatter:function(params){ //标签内容
console.log(params.data, 'sssssssssssssssssss')
if(params.data == 0) { return '0' }
if(params.data == 0) { return '' }
return params.data.toFixed(2)
}
}
......
src/views/propertiesDetail/index.vue
View file @ e742a3e7
......@@ -279,7 +279,7 @@
show: true,
position: "top",
formatter:function(params){ //标签内容
if(params.data == 0) { return '0' }
if(params.data == 0) { return '' }
return params.data.toFixed(2)
}
}
......@@ -293,7 +293,7 @@
show: true,
position: "top",
formatter:function(params){ //标签内容
if(params.data == 0) { return '0' }
if(params.data == 0) { return '' }
return (params.data * 100 ).toFixed(0) + '%'
}
}
......@@ -453,7 +453,11 @@
queryAnalysisById(this.propertyId).then(res => {
console.log(JSON.stringify(res.data))
// 饼图图表数据
this.houseUnitCharts.rows = res.data.pieDetilDtoList
res.data.pieDetilDtoList.forEach(item => {
if(item.supplication && item.supplication > 0) {
this.houseUnitCharts.rows.push(item)
}
})
// 饼图表格数据
this.houseUnitTable = res.data.pieDetilTableList
this.houseWidthTable = res.data.barDetilDtoList
......
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