From 89df34337367e50abd1a7fffdc2534856f4e534d Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Mon, 27 May 2024 17:38:42 +0800 Subject: [PATCH] 1 --- .env.development | 1 + .env.production | 5 +- .env.staging | 5 +- package.json | 4 +- public/favicon.ico | Bin 4286 -> 4286 bytes src/api/user.js | 8 +- src/assets/wuxi.json | 1 + src/components/Charts/echart/index.vue | 66 ++++ src/components/Charts/echart/theme.json | 490 ++++++++++++++++++++++++ src/components/Charts/index.vue | 358 +++++++++++++++++ src/const/addProps.js | 3 +- src/main.js | 4 + src/mixin/drawMixin.js | 57 +++ src/router/index.js | 11 +- src/styles/scss/_variables.scss | 98 +++++ src/styles/scss/style.scss | 186 +++++++++ src/utils/createDialog.js | 1 + src/views/assets/history.vue | 5 + src/views/component/detail.vue | 27 +- src/views/component/detailCpn.vue | 2 +- src/views/component/map.vue | 2 +- src/views/component/table.vue | 30 +- src/views/dataShow/btns.vue | 102 +++++ src/views/dataShow/header.vue | 88 +++++ src/views/dataShow/index.vue | 92 +++++ src/views/dataShow/map.vue | 38 ++ src/views/dataShow/right1.vue | 79 ++++ src/views/dataShow/right2.vue | 104 +++++ vue.config.js | 4 +- 29 files changed, 1847 insertions(+), 24 deletions(-) create mode 100644 src/assets/wuxi.json create mode 100644 src/components/Charts/echart/index.vue create mode 100644 src/components/Charts/echart/theme.json create mode 100644 src/components/Charts/index.vue create mode 100644 src/mixin/drawMixin.js create mode 100644 src/styles/scss/_variables.scss create mode 100644 src/styles/scss/style.scss create mode 100644 src/views/dataShow/btns.vue create mode 100644 src/views/dataShow/header.vue create mode 100644 src/views/dataShow/index.vue create mode 100644 src/views/dataShow/map.vue create mode 100644 src/views/dataShow/right1.vue create mode 100644 src/views/dataShow/right2.vue diff --git a/.env.development b/.env.development index 75069b2..c02a891 100644 --- a/.env.development +++ b/.env.development @@ -4,3 +4,4 @@ ENV='development' # base api VUE_APP_BASE_API=http://wuxiwuye.ali251.langye.net/ VUE_APP_UPLOAD_API=http://wuxiwuye.ali251.langye.net/api/admin/upload-file +VUE_APP_PREVIEW=http://view.ali251.langye.net:8012/onlinePreview diff --git a/.env.production b/.env.production index 16a6996..2a2b744 100644 --- a/.env.production +++ b/.env.production @@ -2,5 +2,6 @@ ENV = 'production' # base api -VUE_APP_BASE_API=http://wuxiwuye.ali251.langye.net/ -VUE_APP_UPLOAD_API=http://wuxiwuye.ali251.langye.net/api/admin/upload-file \ No newline at end of file +VUE_APP_BASE_API=http://192.168.1.31:9001/ +VUE_APP_UPLOAD_API=http://192.168.1.31:9001/api/admin/upload-file +VUE_APP_PREVIEW=http://192.168.1.31:8012/onlinePreview diff --git a/.env.staging b/.env.staging index a8793a0..c91aa42 100644 --- a/.env.staging +++ b/.env.staging @@ -4,5 +4,6 @@ NODE_ENV = production ENV = 'staging' # base api -VUE_APP_BASE_API = '/stage-api' - +VUE_APP_BASE_API=http://wuxiwuye.ali251.langye.net/ +VUE_APP_UPLOAD_API=http://wuxiwuye.ali251.langye.net/api/admin/upload-file +VUE_APP_PREVIEW=http://view.ali251.langye.net:8012/onlinePreview diff --git a/package.json b/package.json index a74f64a..a7c0476 100644 --- a/package.json +++ b/package.json @@ -14,13 +14,15 @@ "test:ci": "npm run lint && npm run test:unit" }, "dependencies": { + "@jiaminghi/data-view": "^2.10.0", "@smallwei/avue": "^2.9.15", "@tinymce/tinymce-vue": "^3.0.1", "af-table-column": "^1.0.3", "avue-plugin-map": "^1.0.1", "axios": "0.18.1", "core-js": "3.6.5", - "echarts": "^4.2.1", + "echarts": "^5.4.1", + "echarts-gl": "^2.0.9", "element-ui": "2.15.13", "file-saver": "^2.0.5", "html2canvas": "^1.4.1", diff --git a/public/favicon.ico b/public/favicon.ico index c48d62c70f9e0f3bdbcd34689dc9b18b57cf93b5..f01a355f083299c1b59ee11c38c92ccc2d45891c 100644 GIT binary patch literal 4286 zcmb`LYiJx*6vuB&wTNPiZ$U{uNk8ca!N&(N2qK8-ZhWAAv4~coil7leq%>;VO|6z% z+K8>%ilIpqTT$AoC22xaA2qS|Wt28))5a!!#4PQWnc3NycNU!R+q-k` zx%YqWoqNumjZ$^^Yiv~fRNZrxx?U+Y51>jl0oLmaZM9xj>Jeq7=7Yqg;1J!RjSC|N+t8Ub1~L~fO>~P21o=R>dt^4!BQ{}(C4CYN9~2wQmGmYtA8#MjV^7 z7;6!j1tQmh_24?t1?YF2aci+Tk1^pxvJPdD54;DLgS8-9d-;5^mN!?|qYZ7N{pbEn z0P1NU^50P|02YYsYj->+_J)_lYEMSC>wfJmVy}Nu?6uFDZBmJ0*fxMd{hM)rK#x(X zkGa?%JT2ad!{T3<7H9KfvEF$|tYr@ugF2^cvH0iD!S;~YYZjQ+f$NLCoz(l0et_42 zaowGsw?yoV!Yg;6PqN>vlI*vui$NXR^aWd|dx=S(YcmdR1=PM8>;chh_U>ci9sN}# zYm1*gBjWpzFn~5ceOkn|#XGWBEc7*wn@YSH=2hlX?#*c1m5+;e@(;-!+$GLuuj^+J zOtSow+RnyS$&C!^J{I~K$4w;$&~_ErP{BqxhJN;EPhfp}MI5VKIA3FDB)5O3_|t#u zK2`LYA8!ZStLl#*%qw8&JrU0U+rrC3pDOxU=q?0*Rn^Dd_r`vc?3Q-0Lb6*8unjie z=y06*^VzHh(^d8H{N2GGv6e=}U1=P`#vSaA^ZcpLTx&jKn8)6KLcEC)arb-?JO9y^ zeb~1`E~I`BU@S)LQ)sVxN^(QnbnLmiyW{J_mhqY!-Uc6@#Ms7sydK(&gL3_4&Ejlo zMc&Ei9p&!s3i4f)ZDAdr2W@%zRtE9-s>yGjudSdnQlEME!{^06Jr?Ny^cC{SqrskL zT$_N6`|}pv$D14#yJMm08T&l-2>zIEF;@_W{5_h0e+}@4i_J#2Kz~{oY{H5c+a{gTx zybI`asKcm_GgYr=m|MK5F@3f;oo`4HIB&eE(Lf%y?k`{CtZs>(Qz|h7y?cRv4?uYb zm;@2_K^$bauan%q?{F3ki8pyv=UC2HGd&^RsUte?yltLD3z*sPkS&6+y>Tw{lEgH^DDhS2b*5-0=O3F{Z&z{LSxv!9wp=B8L$cL0Dpp$ z;278owu1M-{ou-A9jpK5l>T}Vr6i}+5?iT;v{G}9D>b`6puP?NJ|HRpMeIxWYg4Me T9~{Sc9Ge=@y3dEEwAIPKH*y=7 literal 4286 zcmbVQ33O9s7Jii}E;9l;9tMw!3=T)n9JII~I}{WL#2Jr&TE(Zw!Y zBgz+siLxm%n#e~JHIa{<6lKpz#puP`^l|fFwPgKsLYL)gki97Er9P&A|)YoyF z`nw&}-({yhZzBzKJE^a;nYwOQP@6KDELk6sE_R7SeROt=Az}4zSuAc{=8rNj$`=c@ zXWn~Qb!6s2#L(Vc6i!`DH(-m|YazcwO&txF$YV$&Z+#whn6Hq(RYM(?Lh81a!yha4 zy6bQ~gZrV0T4Yd57ry0EM+VzV!@t)D=3~{qiGnG4%|uniobz?5?+<#6nLNfGcP({V zu5x?67A5&ws;S4Rqh61hdYL_smAdVf@bfyg!!LGyz}E&pOw?L&jP&uVyy~MfcDgiY z?r+Nf^nd!GjhTb_L)zwHA7bh6ZsqZG+sY764faT<)^Y_k?S`RekVLYRuh6ZPoGQ2T#~O zK8K2W+(v5rdIy0E3XdT=xH0zw;V6q;^5QOY+D7i#?J(pT<9ly(mfG=ZUYa6*#iM)0gjtmbLn?C;aHt5)FwIoDnxUlYV zQ9i5MrB0?k@R)JS-ztJ%iPVtxK5UP=%eE+gmb|7sa*LU;8%M^3NP)5AC1>|9-1!gMDC_Xf&)R|{aZ}a{H-dUD^@$Kj#_R+P|cwUBm1#@ zt0j{N`2t2YWH_;s+}f{jTnY@nM!i&!F44iy;1T*Dan6O0MP4$ocRbamtik>dQRN;1-z8+t-VQ$`WKLU;^N*um z%E+3tl`3`z_{i$QoW23RU!t_h+n1XyM9Tsg{Os2cc-(J$~iU|Q{Sh+NZ~OZMRW z(>eP1kUoY@KYCb?tCss^-0j25N@CK5!SC*|FoBW2K!TUb+I$t9z!}XaX~8rdgUmS zAeTQ!Jok_#a}(|*s{f*)=dkndxkxoNTJ&qo<0UC(< zPne7N9|Yc!uw8-vn~hq1f!9vp-eB`ugN^t9>V_xfIK%q#DT^4Z%OF1$Oy zdM1mX%@~XiwyR+QT%q@DAEtxmj7{i+nZPm?F})8z;=z%Ph~;ChLDrm)0=A)5cXR`@ zAvr6LK~vR;-_PS`^NT+2HLEFk>9dBDi$ZjYMUCFtTw@-pjOo0m+EHJcsOf3m+N}GB z`YpkjEfZ`7yP+M|F*oG#T43{zz4QPy_nEu)o}&Y$8=f?!Q*#&Mftq7h3f^Oa?h^>?Xl2MecTe4w=S1+g!M|Mk#6l7 zvK8zC7oYwv4(S`oTbqv__zLd}tUqwu;B4jIVD!ypyoWG*tlkFv?YsxH+>jvlxh2-@ z&5t0TLSx=m%phL|V>XgmvbG>D6?m0G&T0jpquO<;(4NnEA6AB=Cc$T37yEuj_2<^0 zk31JRhaSPWUh~Cc(Be(7eT4TU)^8l;Qa;bIykidQ&_vE%m9tnFnSpc)%)F;pPgYCk zmD@|d;IT8zm{zm-i_NmF6>;G4KGenU5$_b}-5AuzXw?0EsLw~>#|z-%pOG^O>hct~ z&1S#BUN7>B84~(iT@PK&=6dI>Itl(s$zF00dUF`PKZei!ZZREPDB)V>F=k-iI>zhS*HT5++?}L~ zn4N7(UOnEJxZ;l4kt2Gr@GpE*OXt5K%9on$C5L#;`kf*T4fb;U+}baBF8xkDcvQ@_ zy2D(+`Nw)ocXK5;bB_12KtCx(@5n{3+fJ$@bMlNyE1#+in=pd=i1BYexN2h9wIEH@ z;(73++>-hCVUH=BYa*))Rzu7eHcztf%qbiCN2I%tCLu%yZkz zo=vPpJm$VmJ3e2B-kg9wZyFY53-oHq{LOeC`$he^jo-2LLnj(9ejuQ?jMm034pmED zPSD1_Vy#PkZ@^Zt7qO>OJ7zDIW47GdG|o@f^WnD-wOxbf#xPUzn^PE`9p>~OGWEUJ zaIau1lnAZ2QbrpSUk|~IzEzBxmL|$y)#+mAxb$(;`t)%x`k^1qqCB)xBbyedjb8Y6 zed?c{z_U}3OLgjd_r7z1ibt_05gHVP1-*jsq*oBeS_R?W;=mfU7ymwBOZfj^{65?} Wsu;_P{n*}EPcmD>g0P1$*Z&(_T##%4 diff --git a/src/api/user.js b/src/api/user.js index e12d073..427e613 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -12,7 +12,8 @@ export function getInfo(token) { return request({ url: '/api/admin/auth/me', method: 'post', - params: { token } + params: { token }, + isLoading: false, }) } @@ -27,6 +28,7 @@ export function getAuthMenu(token) { return request({ url: '/api/admin/auth/permissions', method: 'get', - params: { token } + params: { token }, + isLoading: false }) -} \ No newline at end of file +} diff --git a/src/assets/wuxi.json b/src/assets/wuxi.json new file mode 100644 index 0000000..95cf7f8 --- /dev/null +++ b/src/assets/wuxi.json @@ -0,0 +1 @@ +{"type":"FeatureCollection","features":[{"type":"Feature","properties":{"adcode":320205,"name":"锡山区","center":[120.357298,31.585559],"centroid":[120.482864,31.624824],"childrenNum":0,"level":"district","parent":{"adcode":320200},"subFeatureIndex":0,"acroutes":[100000,320000,320200]},"geometry":{"type":"MultiPolygon","coordinates":[[[[120.581713,31.727632],[120.580257,31.726329],[120.576,31.726153],[120.56806,31.722957],[120.562412,31.723062],[120.551953,31.726734],[120.546968,31.725977],[120.541755,31.723397],[120.535129,31.721653],[120.528504,31.725818],[120.518284,31.734896],[120.50853,31.724762],[120.507336,31.724119],[120.504827,31.713825],[120.498288,31.713402],[120.496312,31.710417],[120.491022,31.70965],[120.492163,31.711905],[120.491272,31.713719],[120.487297,31.715445],[120.485125,31.713728],[120.471907,31.712513],[120.46261,31.716132],[120.461339,31.714503],[120.458309,31.7132],[120.456701,31.710725],[120.452824,31.711456],[120.451173,31.707255],[120.44685,31.706084],[120.432948,31.705309],[120.430309,31.704604],[120.427376,31.70249],[120.41986,31.704498],[120.415375,31.704604],[120.411041,31.703538],[120.402982,31.699522],[120.399398,31.699998],[120.398106,31.697408],[120.394174,31.699231],[120.390307,31.699513],[120.384909,31.695171],[120.382857,31.694202],[120.3776,31.693383],[120.376981,31.690978],[120.378056,31.684407],[120.379349,31.682037],[120.383204,31.679491],[120.389373,31.677932],[120.390981,31.676689],[120.391176,31.674478],[120.382629,31.667377],[120.378751,31.665685],[120.374765,31.660962],[120.368716,31.655781],[120.368075,31.653499],[120.366326,31.653419],[120.362644,31.655349],[120.360461,31.655323],[120.357811,31.652714],[120.345288,31.65245],[120.345266,31.646017],[120.346668,31.636128],[120.343257,31.63664],[120.340683,31.635485],[120.334905,31.636199],[120.334123,31.637821],[120.329985,31.638737],[120.323903,31.636146],[120.317723,31.634551],[120.315779,31.632012],[120.314606,31.619072],[120.314432,31.612989],[120.31794,31.613792],[120.321741,31.613562],[120.340042,31.610486],[120.350013,31.610838],[120.352587,31.607479],[120.352848,31.603847],[120.349231,31.602762],[120.341096,31.60308],[120.340792,31.599958],[120.342334,31.598274],[120.34581,31.590876],[120.347135,31.581326],[120.345886,31.575858],[120.349557,31.574455],[120.348394,31.570857],[120.346135,31.569516],[120.348905,31.565847],[120.351881,31.568035],[120.362753,31.569031],[120.366913,31.57009],[120.369367,31.573397],[120.372028,31.573679],[120.37811,31.576025],[120.380435,31.575875],[120.385051,31.573776],[120.387321,31.573441],[120.388646,31.570919],[120.392588,31.567408],[120.39677,31.569516],[120.39374,31.573538],[120.394804,31.573635],[120.394522,31.57674],[120.399615,31.580197],[120.414267,31.580691],[120.415733,31.583425],[120.419404,31.581026],[120.422543,31.580823],[120.429288,31.577286],[120.434099,31.576466],[120.439237,31.574676],[120.444178,31.576475],[120.448968,31.571095],[120.448545,31.569631],[120.451477,31.568255],[120.45176,31.5665],[120.455116,31.568061],[120.457831,31.564171],[120.46085,31.565838],[120.466715,31.566791],[120.46614,31.564674],[120.473112,31.563986],[120.472819,31.561066],[120.47623,31.560511],[120.477033,31.558905],[120.481693,31.55954],[120.481334,31.554883],[120.486971,31.555941],[120.490707,31.557414],[120.498647,31.554697],[120.503295,31.552686],[120.504523,31.549493],[120.502774,31.544552],[120.505967,31.542099],[120.504544,31.538791],[120.506782,31.537476],[120.508096,31.534926],[120.513016,31.531547],[120.516959,31.529817],[120.518914,31.527453],[120.523888,31.529244],[120.528786,31.526588],[120.522606,31.521452],[120.52265,31.517869],[120.521455,31.515672],[120.523519,31.514524],[120.521542,31.512609],[120.518251,31.512759],[120.519196,31.508929],[120.521129,31.507402],[120.521118,31.504507],[120.519598,31.504604],[120.518295,31.501718],[120.519804,31.500888],[120.522389,31.504631],[120.525267,31.502583],[120.5253,31.499229],[120.528613,31.497887],[120.531024,31.495327],[120.533055,31.490675],[120.534999,31.487921],[120.542971,31.487612],[120.546197,31.487912],[120.547793,31.486244],[120.552062,31.483825],[120.551236,31.48213],[120.553441,31.477027],[120.555233,31.477866],[120.555244,31.480294],[120.553007,31.486738],[120.549086,31.489175],[120.548043,31.495089],[120.548499,31.497402],[120.551616,31.500632],[120.555201,31.507579],[120.559849,31.508964],[120.568549,31.512371],[120.576923,31.517498],[120.585775,31.524532],[120.589826,31.526967],[120.592758,31.52755],[120.593986,31.525502],[120.595636,31.517145],[120.598569,31.516166],[120.600035,31.51861],[120.602349,31.51899],[120.605759,31.525247],[120.60426,31.530867],[120.605118,31.535685],[120.602913,31.53827],[120.602805,31.541182],[120.60502,31.546078],[120.599264,31.54846],[120.597548,31.563862],[120.595962,31.571492],[120.594572,31.576008],[120.587045,31.583389],[120.584254,31.585144],[120.573838,31.585947],[120.570428,31.585665],[120.567419,31.583998],[120.573035,31.577472],[120.568256,31.576299],[120.563629,31.579597],[120.553072,31.575082],[120.550215,31.575011],[120.548,31.576599],[120.546848,31.579685],[120.547782,31.583283],[120.545078,31.585717],[120.54309,31.601739],[120.546251,31.604693],[120.553104,31.60561],[120.557058,31.600302],[120.566464,31.601933],[120.568343,31.606183],[120.567126,31.609172],[120.570026,31.609445],[120.577086,31.614162],[120.584482,31.613439],[120.591488,31.611499],[120.596266,31.613298],[120.6006,31.617115],[120.592107,31.62504],[120.595571,31.631395],[120.589587,31.636525],[120.595854,31.643761],[120.592128,31.650282],[120.586643,31.651816],[120.583429,31.651957],[120.571731,31.655781],[120.561066,31.655693],[120.558589,31.658504],[120.566789,31.659931],[120.568625,31.665174],[120.568766,31.668593],[120.566377,31.676143],[120.566626,31.678672],[120.564161,31.67891],[120.562858,31.680513],[120.566094,31.683112],[120.566235,31.685393],[120.568049,31.685199],[120.570059,31.688908],[120.572405,31.689692],[120.576836,31.689463],[120.575587,31.691824],[120.578367,31.689947],[120.578118,31.6937],[120.584917,31.69281],[120.587024,31.696166],[120.592802,31.700817],[120.595734,31.705608],[120.600231,31.706876],[120.600806,31.708849],[120.599079,31.710716],[120.596788,31.710822],[120.590836,31.712997],[120.589848,31.714115],[120.58509,31.714432],[120.58458,31.71792],[120.582451,31.721169],[120.581713,31.727632]]]]}},{"type":"Feature","properties":{"adcode":320206,"name":"惠山区","center":[120.303543,31.681019],"centroid":[120.210639,31.65177],"childrenNum":0,"level":"district","parent":{"adcode":320200},"subFeatureIndex":1,"acroutes":[100000,320000,320200]},"geometry":{"type":"MultiPolygon","coordinates":[[[[120.074955,31.554424],[120.085143,31.557194],[120.091562,31.559258],[120.102054,31.563545],[120.112882,31.568864],[120.111514,31.570733],[120.113762,31.572083],[120.118661,31.572859],[120.119301,31.575381],[120.122408,31.577128],[120.128913,31.577533],[120.132063,31.579227],[120.134018,31.582225],[120.135995,31.582146],[120.14956,31.587384],[120.153927,31.589501],[120.161551,31.59413],[120.16255,31.576987],[120.163061,31.573662],[120.165189,31.566844],[120.168144,31.5647],[120.173346,31.564118],[120.175323,31.561631],[120.176735,31.556585],[120.179157,31.555474],[120.181611,31.556991],[120.183697,31.560458],[120.184435,31.564991],[120.186336,31.565935],[120.194482,31.561269],[120.197371,31.561551],[120.199054,31.564974],[120.196947,31.566738],[120.197914,31.568634],[120.213684,31.574605],[120.217084,31.57681],[120.220266,31.576528],[120.220983,31.579562],[120.214043,31.590832],[120.215476,31.592578],[120.222156,31.592666],[120.228358,31.594553],[120.234787,31.594359],[120.240576,31.592331],[120.242531,31.59249],[120.246105,31.600523],[120.244106,31.608846],[120.241565,31.615969],[120.24516,31.618102],[120.246289,31.6208],[120.243878,31.625384],[120.248233,31.626627],[120.253012,31.626741],[120.262331,31.619583],[120.265481,31.621567],[120.266491,31.625578],[120.269728,31.630778],[120.283108,31.6292],[120.282935,31.626521],[120.290168,31.626538],[120.300258,31.624881],[120.305287,31.62288],[120.312553,31.618825],[120.314606,31.619072],[120.315779,31.632012],[120.317723,31.634551],[120.323903,31.636146],[120.329985,31.638737],[120.334123,31.637821],[120.334905,31.636199],[120.340683,31.635485],[120.343257,31.63664],[120.346668,31.636128],[120.345266,31.646017],[120.345288,31.65245],[120.357811,31.652714],[120.360461,31.655323],[120.362644,31.655349],[120.366326,31.653419],[120.368075,31.653499],[120.368716,31.655781],[120.374765,31.660962],[120.378751,31.665685],[120.382629,31.667377],[120.391176,31.674478],[120.390981,31.676689],[120.389373,31.677932],[120.383204,31.679491],[120.379349,31.682037],[120.378056,31.684407],[120.376981,31.690978],[120.3776,31.693383],[120.371322,31.691612],[120.366619,31.689137],[120.360135,31.687481],[120.349209,31.689128],[120.346624,31.691145],[120.336013,31.694396],[120.333862,31.698192],[120.319395,31.700746],[120.311336,31.700253],[120.298423,31.698932],[120.292558,31.69909],[120.283662,31.7019],[120.282435,31.70338],[120.276157,31.723168],[120.273714,31.724603],[120.264384,31.722692],[120.261104,31.721002],[120.256933,31.72013],[120.254446,31.724365],[120.248646,31.726928],[120.237361,31.728363],[120.228857,31.727306],[120.224991,31.724779],[120.220494,31.723969],[120.215357,31.724321],[120.206451,31.726065],[120.203942,31.728891],[120.202921,31.735372],[120.203779,31.740381],[120.201161,31.753269],[120.197056,31.752706],[120.183947,31.749915],[120.183121,31.753296],[120.178657,31.758401],[120.17239,31.75804],[120.169023,31.760962],[120.159998,31.759079],[120.155621,31.756843],[120.155241,31.752283],[120.156077,31.751509],[120.155968,31.742045],[120.154752,31.741429],[120.156131,31.737942],[120.157684,31.730696],[120.155979,31.729569],[120.155176,31.727086],[120.158108,31.725924],[120.158075,31.722393],[120.16141,31.718069],[120.159477,31.717206],[120.158912,31.713948],[120.155979,31.712601],[120.156837,31.703829],[120.153166,31.70212],[120.15359,31.699143],[120.147703,31.69821],[120.14527,31.697065],[120.143858,31.689965],[120.143,31.688327],[120.149365,31.686221],[120.151027,31.684829],[120.151037,31.682398],[120.143272,31.676073],[120.128533,31.684636],[120.126709,31.678725],[120.126024,31.673844],[120.125883,31.657843],[120.124482,31.648238],[120.121115,31.638147],[120.119486,31.630893],[120.116423,31.62995],[120.104476,31.628769],[120.10238,31.625877],[120.093962,31.618085],[120.084242,31.611808],[120.075585,31.607118],[120.07489,31.595364],[120.070622,31.590956],[120.068526,31.590127],[120.064692,31.586961],[120.061814,31.583072],[120.057067,31.5804],[120.055775,31.576669],[120.059457,31.57263],[120.05937,31.56904],[120.056155,31.563404],[120.058208,31.559523],[120.063899,31.555571],[120.069188,31.552492],[120.071827,31.554371],[120.074955,31.554424]]]]}},{"type":"Feature","properties":{"adcode":320211,"name":"滨湖区","center":[120.266053,31.550228],"centroid":[120.196869,31.446922],"childrenNum":0,"level":"district","parent":{"adcode":320200},"subFeatureIndex":2,"acroutes":[100000,320000,320200]},"geometry":{"type":"MultiPolygon","coordinates":[[[[120.100153,31.335332],[120.110232,31.264001],[120.173715,31.30881],[120.209611,31.345668],[120.253121,31.366098],[120.308143,31.393266],[120.335546,31.407359],[120.355823,31.416459],[120.353293,31.461496],[120.359169,31.46795],[120.361221,31.471853],[120.357083,31.47384],[120.354998,31.488539],[120.359755,31.489907],[120.360429,31.491408],[120.354792,31.500879],[120.354031,31.500765],[120.351718,31.507879],[120.356269,31.509379],[120.362579,31.513439],[120.357453,31.518399],[120.347135,31.527338],[120.338055,31.529138],[120.334612,31.52657],[120.331679,31.522511],[120.330495,31.518805],[120.325695,31.516898],[120.323533,31.513077],[120.322121,31.513836],[120.313639,31.513227],[120.31126,31.514013],[120.307329,31.517401],[120.308241,31.520737],[120.310087,31.520269],[120.311532,31.521699],[120.310294,31.526605],[120.307937,31.524946],[120.303842,31.525114],[120.298227,31.523596],[120.295316,31.525847],[120.29675,31.528291],[120.297076,31.531432],[120.293046,31.532332],[120.291971,31.535262],[120.287855,31.535306],[120.287637,31.537626],[120.285096,31.549828],[120.285368,31.551451],[120.288267,31.554936],[120.289907,31.558191],[120.283,31.565512],[120.27985,31.570195],[120.279524,31.574755],[120.280643,31.577904],[120.27707,31.580497],[120.271954,31.579915],[120.271009,31.581229],[120.268011,31.580338],[120.269065,31.578856],[120.263189,31.578495],[120.25904,31.580259],[120.255489,31.580603],[120.250102,31.583045],[120.244454,31.587657],[120.242531,31.59249],[120.240576,31.592331],[120.234787,31.594359],[120.228358,31.594553],[120.222156,31.592666],[120.215476,31.592578],[120.214043,31.590832],[120.220983,31.579562],[120.220266,31.576528],[120.217084,31.57681],[120.213684,31.574605],[120.197914,31.568634],[120.196947,31.566738],[120.199054,31.564974],[120.197371,31.561551],[120.194482,31.561269],[120.186336,31.565935],[120.184435,31.564991],[120.183697,31.560458],[120.181611,31.556991],[120.179157,31.555474],[120.176735,31.556585],[120.175323,31.561631],[120.173346,31.564118],[120.168144,31.5647],[120.165189,31.566844],[120.163061,31.573662],[120.16255,31.576987],[120.161551,31.59413],[120.153927,31.589501],[120.14956,31.587384],[120.135995,31.582146],[120.134018,31.582225],[120.132063,31.579227],[120.128913,31.577533],[120.122408,31.577128],[120.119301,31.575381],[120.118661,31.572859],[120.113762,31.572083],[120.111514,31.570733],[120.112882,31.568864],[120.102054,31.563545],[120.091562,31.559258],[120.085143,31.557194],[120.074955,31.554424],[120.079561,31.555033],[120.081537,31.553418],[120.080191,31.55146],[120.082319,31.550286],[120.085339,31.550904],[120.097329,31.548743],[120.096949,31.547252],[120.099056,31.546299],[120.096732,31.543573],[120.095038,31.544173],[120.094169,31.541932],[120.096786,31.541138],[120.09948,31.542338],[120.101717,31.542002],[120.103151,31.538782],[120.10112,31.536841],[120.100729,31.533797],[120.102054,31.533523],[120.101587,31.529959],[120.103857,31.52815],[120.102358,31.527391],[120.10238,31.523146],[120.103955,31.521011],[120.103412,31.518557],[120.100501,31.516828],[120.103227,31.512998],[120.107093,31.513068],[120.10743,31.511983],[120.111025,31.514039],[120.115771,31.519105],[120.117542,31.518037],[120.11626,31.516228],[120.120257,31.514983],[120.118378,31.51193],[120.118834,31.505504],[120.121984,31.505354],[120.12206,31.508479],[120.12319,31.511338],[120.129739,31.504701],[120.127501,31.501471],[120.123581,31.499202],[120.117607,31.493235],[120.111188,31.48514],[120.108733,31.480991],[120.105682,31.470493],[120.110069,31.461531],[120.091356,31.453186],[120.089987,31.45474],[120.087793,31.453416],[120.078757,31.450007],[120.060966,31.440424],[120.054786,31.434286],[120.044566,31.406228],[120.039711,31.378127],[120.040157,31.364498],[120.041905,31.361024],[120.044859,31.358805],[120.057252,31.356126],[120.093658,31.353138],[120.096145,31.352493],[120.100436,31.33939],[120.100153,31.335332]]]]}},{"type":"Feature","properties":{"adcode":320213,"name":"梁溪区","center":[120.296595,31.575706],"centroid":[120.299797,31.580629],"childrenNum":0,"level":"district","parent":{"adcode":320200},"subFeatureIndex":3,"acroutes":[100000,320000,320200]},"geometry":{"type":"MultiPolygon","coordinates":[[[[120.345886,31.575858],[120.347135,31.581326],[120.34581,31.590876],[120.342334,31.598274],[120.340792,31.599958],[120.341096,31.60308],[120.349231,31.602762],[120.352848,31.603847],[120.352587,31.607479],[120.350013,31.610838],[120.340042,31.610486],[120.321741,31.613562],[120.31794,31.613792],[120.314432,31.612989],[120.314606,31.619072],[120.312553,31.618825],[120.305287,31.62288],[120.300258,31.624881],[120.290168,31.626538],[120.282935,31.626521],[120.283108,31.6292],[120.269728,31.630778],[120.266491,31.625578],[120.265481,31.621567],[120.262331,31.619583],[120.253012,31.626741],[120.248233,31.626627],[120.243878,31.625384],[120.246289,31.6208],[120.24516,31.618102],[120.241565,31.615969],[120.244106,31.608846],[120.246105,31.600523],[120.242531,31.59249],[120.244454,31.587657],[120.250102,31.583045],[120.255489,31.580603],[120.25904,31.580259],[120.263189,31.578495],[120.269065,31.578856],[120.268011,31.580338],[120.271009,31.581229],[120.271954,31.579915],[120.27707,31.580497],[120.280643,31.577904],[120.279524,31.574755],[120.27985,31.570195],[120.283,31.565512],[120.289907,31.558191],[120.288267,31.554936],[120.285368,31.551451],[120.285096,31.549828],[120.287637,31.537626],[120.287855,31.535306],[120.291971,31.535262],[120.293046,31.532332],[120.297076,31.531432],[120.29675,31.528291],[120.295316,31.525847],[120.298227,31.523596],[120.303842,31.525114],[120.307937,31.524946],[120.310294,31.526605],[120.311532,31.521699],[120.310087,31.520269],[120.308241,31.520737],[120.307329,31.517401],[120.31126,31.514013],[120.313639,31.513227],[120.322121,31.513836],[120.323533,31.513077],[120.325695,31.516898],[120.330495,31.518805],[120.331679,31.522511],[120.334612,31.52657],[120.338055,31.529138],[120.347135,31.527338],[120.346505,31.528573],[120.335502,31.538967],[120.33799,31.543652],[120.343073,31.545408],[120.334514,31.55677],[120.324391,31.556762],[120.323642,31.559911],[120.32122,31.559558],[120.323077,31.562248],[120.322491,31.567946],[120.320405,31.568687],[120.323718,31.569869],[120.31958,31.569993],[120.319656,31.573723],[120.317614,31.574755],[120.317332,31.572912],[120.313954,31.573891],[120.317017,31.574438],[120.315094,31.575919],[120.316571,31.578415],[120.316843,31.576475],[120.319091,31.577551],[120.317506,31.579624],[120.319015,31.581326],[120.321046,31.579553],[120.319189,31.578953],[120.323805,31.572321],[120.325673,31.573679],[120.323631,31.575461],[120.32702,31.575778],[120.327052,31.5742],[120.32967,31.574041],[120.329518,31.569657],[120.326879,31.570866],[120.326346,31.569349],[120.331332,31.568343],[120.333167,31.569746],[120.333015,31.571527],[120.330202,31.572427],[120.329844,31.574014],[120.332516,31.573873],[120.330593,31.576819],[120.332005,31.577992],[120.334156,31.576493],[120.334253,31.573812],[120.336762,31.573706],[120.336784,31.575187],[120.340346,31.575038],[120.342844,31.576228],[120.345886,31.575858]]]]}},{"type":"Feature","properties":{"adcode":320214,"name":"新吴区","center":[120.352782,31.550966],"centroid":[120.429487,31.506686],"childrenNum":0,"level":"district","parent":{"adcode":320200},"subFeatureIndex":4,"acroutes":[100000,320000,320200]},"geometry":{"type":"MultiPolygon","coordinates":[[[[120.347135,31.527338],[120.357453,31.518399],[120.362579,31.513439],[120.356269,31.509379],[120.351718,31.507879],[120.354031,31.500765],[120.354792,31.500879],[120.360429,31.491408],[120.359755,31.489907],[120.354998,31.488539],[120.357083,31.47384],[120.361221,31.471853],[120.359169,31.46795],[120.353293,31.461496],[120.355823,31.416459],[120.418818,31.448382],[120.422641,31.448991],[120.426584,31.445441],[120.430537,31.446395],[120.435001,31.442606],[120.437477,31.443047],[120.431721,31.448647],[120.438172,31.44877],[120.460177,31.445485],[120.474437,31.446571],[120.480552,31.449132],[120.485418,31.449901],[120.484799,31.447481],[120.487026,31.44862],[120.495758,31.447931],[120.495421,31.451093],[120.501406,31.457557],[120.505044,31.457964],[120.50853,31.45565],[120.512364,31.45708],[120.513852,31.456189],[120.517361,31.457831],[120.515981,31.460233],[120.516003,31.464427],[120.523845,31.468357],[120.526017,31.46833],[120.5311,31.466608],[120.53615,31.467094],[120.537312,31.468365],[120.543568,31.470264],[120.54636,31.473133],[120.553441,31.477027],[120.551236,31.48213],[120.552062,31.483825],[120.547793,31.486244],[120.546197,31.487912],[120.542971,31.487612],[120.534999,31.487921],[120.533055,31.490675],[120.531024,31.495327],[120.528613,31.497887],[120.5253,31.499229],[120.525267,31.502583],[120.522389,31.504631],[120.519804,31.500888],[120.518295,31.501718],[120.519598,31.504604],[120.521118,31.504507],[120.521129,31.507402],[120.519196,31.508929],[120.518251,31.512759],[120.521542,31.512609],[120.523519,31.514524],[120.521455,31.515672],[120.52265,31.517869],[120.522606,31.521452],[120.528786,31.526588],[120.523888,31.529244],[120.518914,31.527453],[120.516959,31.529817],[120.513016,31.531547],[120.508096,31.534926],[120.506782,31.537476],[120.504544,31.538791],[120.505967,31.542099],[120.502774,31.544552],[120.504523,31.549493],[120.503295,31.552686],[120.498647,31.554697],[120.490707,31.557414],[120.486971,31.555941],[120.481334,31.554883],[120.481693,31.55954],[120.477033,31.558905],[120.47623,31.560511],[120.472819,31.561066],[120.473112,31.563986],[120.46614,31.564674],[120.466715,31.566791],[120.46085,31.565838],[120.457831,31.564171],[120.455116,31.568061],[120.45176,31.5665],[120.451477,31.568255],[120.448545,31.569631],[120.448968,31.571095],[120.444178,31.576475],[120.439237,31.574676],[120.434099,31.576466],[120.429288,31.577286],[120.422543,31.580823],[120.419404,31.581026],[120.415733,31.583425],[120.414267,31.580691],[120.399615,31.580197],[120.394522,31.57674],[120.394804,31.573635],[120.39374,31.573538],[120.39677,31.569516],[120.392588,31.567408],[120.388646,31.570919],[120.387321,31.573441],[120.385051,31.573776],[120.380435,31.575875],[120.37811,31.576025],[120.372028,31.573679],[120.369367,31.573397],[120.366913,31.57009],[120.362753,31.569031],[120.351881,31.568035],[120.348905,31.565847],[120.346135,31.569516],[120.348394,31.570857],[120.349557,31.574455],[120.345886,31.575858],[120.342844,31.576228],[120.340346,31.575038],[120.336784,31.575187],[120.336762,31.573706],[120.334253,31.573812],[120.334156,31.576493],[120.332005,31.577992],[120.330593,31.576819],[120.332516,31.573873],[120.329844,31.574014],[120.330202,31.572427],[120.333015,31.571527],[120.333167,31.569746],[120.331332,31.568343],[120.326346,31.569349],[120.326879,31.570866],[120.329518,31.569657],[120.32967,31.574041],[120.327052,31.5742],[120.32702,31.575778],[120.323631,31.575461],[120.325673,31.573679],[120.323805,31.572321],[120.319189,31.578953],[120.321046,31.579553],[120.319015,31.581326],[120.317506,31.579624],[120.319091,31.577551],[120.316843,31.576475],[120.316571,31.578415],[120.315094,31.575919],[120.317017,31.574438],[120.313954,31.573891],[120.317332,31.572912],[120.317614,31.574755],[120.319656,31.573723],[120.31958,31.569993],[120.323718,31.569869],[120.320405,31.568687],[120.322491,31.567946],[120.323077,31.562248],[120.32122,31.559558],[120.323642,31.559911],[120.324391,31.556762],[120.334514,31.55677],[120.343073,31.545408],[120.33799,31.543652],[120.335502,31.538967],[120.346505,31.528573],[120.347135,31.527338]]]]}},{"type":"Feature","properties":{"adcode":320281,"name":"江阴市","center":[120.275891,31.910984],"centroid":[120.30383,31.832235],"childrenNum":0,"level":"district","parent":{"adcode":320200},"subFeatureIndex":5,"acroutes":[100000,320000,320200]},"geometry":{"type":"MultiPolygon","coordinates":[[[[120.581713,31.727632],[120.584352,31.734465],[120.585601,31.735407],[120.589435,31.73494],[120.593323,31.738171],[120.594822,31.741138],[120.598754,31.742802],[120.600024,31.744625],[120.597668,31.75503],[120.594833,31.760434],[120.588533,31.762556],[120.589402,31.766182],[120.58874,31.771603],[120.584243,31.782146],[120.580735,31.784795],[120.57071,31.793779],[120.558383,31.78571],[120.555852,31.786872],[120.555483,31.794069],[120.548923,31.792054],[120.546229,31.791922],[120.544502,31.789468],[120.544394,31.787136],[120.531556,31.787796],[120.531154,31.793207],[120.526516,31.795548],[120.523942,31.801293],[120.522541,31.80629],[120.523693,31.810531],[120.529959,31.814674],[120.530839,31.81704],[120.529319,31.821324],[120.531306,31.827851],[120.528808,31.831351],[120.521977,31.834183],[120.517393,31.837947],[120.514428,31.841527],[120.508292,31.84369],[120.503274,31.841711],[120.502057,31.85215],[120.496073,31.860881],[120.492261,31.86547],[120.490881,31.871335],[120.484593,31.87442],[120.471299,31.879203],[120.468822,31.879616],[120.466574,31.887791],[120.466498,31.889979],[120.449544,31.891948],[120.436847,31.895604],[120.424998,31.898399],[120.40774,31.905518],[120.402385,31.907381],[120.40131,31.90536],[120.39791,31.90616],[120.396411,31.908181],[120.392067,31.905307],[120.390905,31.907926],[120.38857,31.909218],[120.385138,31.909534],[120.385214,31.911722],[120.38265,31.910949],[120.379761,31.912188],[120.379349,31.914148],[120.381065,31.918884],[120.390481,31.925852],[120.391252,31.928602],[120.390307,31.932195],[120.385996,31.935621],[120.375341,31.941727],[120.373527,31.946435],[120.371594,31.954956],[120.368878,31.961086],[120.370703,31.99082],[120.353054,31.980635],[120.294165,31.954886],[120.262994,31.941841],[120.236601,31.932907],[120.205875,31.931519],[120.175247,31.933829],[120.134811,31.939381],[120.064909,31.955465],[120.022399,31.967752],[120.01485,31.955149],[120.010832,31.953805],[120.008779,31.951293],[120.007649,31.947999],[120.008192,31.94033],[120.007399,31.935929],[120.011342,31.929331],[120.014405,31.927073],[120.022409,31.919692],[120.014991,31.914754],[120.005477,31.911889],[120.000894,31.905571],[120.001915,31.901484],[119.997831,31.894348],[120.000188,31.892537],[120.002555,31.8891],[120.006324,31.889127],[120.008518,31.885496],[120.009018,31.882868],[120.014774,31.881787],[120.01069,31.875546],[120.010223,31.873814],[120.013199,31.871686],[120.010506,31.867809],[120.007997,31.866886],[120.007997,31.8638],[120.005097,31.862543],[120.003272,31.859158],[119.995029,31.855939],[119.990217,31.854867],[119.990152,31.852809],[119.992911,31.84945],[119.99681,31.848984],[119.997342,31.845941],[120.000459,31.845616],[120.001187,31.840559],[120.000709,31.837859],[120.003685,31.838598],[120.003359,31.828246],[120.006292,31.825317],[120.009811,31.826989],[120.011331,31.823849],[120.014557,31.824948],[120.019292,31.822802],[120.022225,31.826654],[120.02279,31.828669],[120.025277,31.831677],[120.028763,31.832116],[120.030251,31.831272],[120.032011,31.826074],[120.044979,31.821755],[120.047966,31.825713],[120.051887,31.829152],[120.056698,31.831976],[120.056405,31.833348],[120.060489,31.834517],[120.080299,31.84748],[120.085469,31.853055],[120.098665,31.855553],[120.114088,31.855342],[120.117401,31.855007],[120.122809,31.859342],[120.144228,31.858929],[120.146161,31.862481],[120.151657,31.864187],[120.158119,31.867835],[120.168795,31.870165],[120.175888,31.870209],[120.182719,31.864855],[120.185185,31.860415],[120.184251,31.856124],[120.180493,31.849002],[120.1768,31.844499],[120.172521,31.840867],[120.173194,31.838774],[120.16999,31.836065],[120.167079,31.835485],[120.164093,31.832697],[120.163919,31.830287],[120.165494,31.825564],[120.172043,31.823004],[120.17049,31.817251],[120.172217,31.814947],[120.177886,31.814137],[120.179244,31.812853],[120.176192,31.807267],[120.174248,31.801029],[120.181242,31.79399],[120.185098,31.787681],[120.186108,31.783633],[120.192527,31.767352],[120.196556,31.764774],[120.198109,31.762459],[120.201628,31.764008],[120.203399,31.761042],[120.200618,31.759818],[120.200814,31.758551],[120.203703,31.759193],[120.205441,31.757063],[120.204137,31.754484],[120.205745,31.753384],[120.201161,31.753269],[120.203779,31.740381],[120.202921,31.735372],[120.203942,31.728891],[120.206451,31.726065],[120.215357,31.724321],[120.220494,31.723969],[120.224991,31.724779],[120.228857,31.727306],[120.237361,31.728363],[120.248646,31.726928],[120.254446,31.724365],[120.256933,31.72013],[120.261104,31.721002],[120.264384,31.722692],[120.273714,31.724603],[120.276157,31.723168],[120.282435,31.70338],[120.283662,31.7019],[120.292558,31.69909],[120.298423,31.698932],[120.311336,31.700253],[120.319395,31.700746],[120.333862,31.698192],[120.336013,31.694396],[120.346624,31.691145],[120.349209,31.689128],[120.360135,31.687481],[120.366619,31.689137],[120.371322,31.691612],[120.3776,31.693383],[120.382857,31.694202],[120.384909,31.695171],[120.390307,31.699513],[120.394174,31.699231],[120.398106,31.697408],[120.399398,31.699998],[120.402982,31.699522],[120.411041,31.703538],[120.415375,31.704604],[120.41986,31.704498],[120.427376,31.70249],[120.430309,31.704604],[120.432948,31.705309],[120.44685,31.706084],[120.451173,31.707255],[120.452824,31.711456],[120.456701,31.710725],[120.458309,31.7132],[120.461339,31.714503],[120.46261,31.716132],[120.471907,31.712513],[120.485125,31.713728],[120.487297,31.715445],[120.491272,31.713719],[120.492163,31.711905],[120.491022,31.70965],[120.496312,31.710417],[120.498288,31.713402],[120.504827,31.713825],[120.507336,31.724119],[120.50853,31.724762],[120.518284,31.734896],[120.528504,31.725818],[120.535129,31.721653],[120.541755,31.723397],[120.546968,31.725977],[120.551953,31.726734],[120.562412,31.723062],[120.56806,31.722957],[120.576,31.726153],[120.580257,31.726329],[120.581713,31.727632]]]]}},{"type":"Feature","properties":{"adcode":320282,"name":"宜兴市","center":[119.820538,31.364384],"centroid":[119.787423,31.352315],"childrenNum":0,"level":"district","parent":{"adcode":320200},"subFeatureIndex":6,"acroutes":[100000,320000,320200]},"geometry":{"type":"MultiPolygon","coordinates":[[[[120.100153,31.335332],[120.089585,31.332449],[120.068743,31.336879],[120.060662,31.339143],[120.041764,31.34588],[120.032076,31.353377],[120.023702,31.364948],[120.020943,31.374203],[120.021074,31.383006],[120.027851,31.409047],[120.03453,31.418597],[120.037604,31.425894],[120.044251,31.46969],[120.046195,31.479782],[120.043361,31.486094],[120.045489,31.490252],[120.037626,31.494754],[120.036203,31.497878],[120.030979,31.500209],[120.022084,31.501736],[120.018489,31.50464],[120.015795,31.505443],[120.009083,31.504454],[120.005553,31.503316],[119.997157,31.508117],[119.996919,31.501338],[119.996115,31.497499],[119.989924,31.50373],[119.981539,31.511471],[119.973567,31.515857],[119.973795,31.528361],[119.971721,31.535967],[119.966171,31.537194],[119.958796,31.540264],[119.948359,31.543379],[119.942483,31.546325],[119.94157,31.547684],[119.935629,31.552712],[119.921369,31.549863],[119.911062,31.548257],[119.90247,31.547746],[119.897594,31.546749],[119.890121,31.546546],[119.87762,31.546925],[119.864,31.546017],[119.861882,31.546264],[119.860069,31.543052],[119.856202,31.538835],[119.852955,31.534282],[119.847796,31.5298],[119.84192,31.528467],[119.832351,31.529191],[119.820697,31.537247],[119.807403,31.548504],[119.804101,31.54989],[119.792176,31.553383],[119.778904,31.554689],[119.768553,31.553789],[119.763905,31.554442],[119.755976,31.557026],[119.74795,31.558773],[119.746114,31.560272],[119.737251,31.561481],[119.733265,31.563157],[119.727759,31.562125],[119.725619,31.561031],[119.721199,31.556867],[119.715247,31.555985],[119.712901,31.558305],[119.712694,31.560325],[119.710044,31.568555],[119.709968,31.575999],[119.707318,31.577472],[119.699791,31.576554],[119.698021,31.581414],[119.694567,31.584192],[119.694122,31.587966],[119.690342,31.595241],[119.684955,31.604023],[119.677885,31.603318],[119.674985,31.604226],[119.67303,31.609322],[119.666774,31.6106],[119.661148,31.610186],[119.657944,31.609304],[119.64982,31.60516],[119.644128,31.604711],[119.639382,31.600258],[119.641239,31.596176],[119.641131,31.592851],[119.640055,31.590797],[119.642488,31.588672],[119.642684,31.582357],[119.646789,31.577683],[119.644443,31.572956],[119.640653,31.569084],[119.637655,31.568211],[119.63078,31.563677],[119.627934,31.55992],[119.61779,31.559364],[119.613315,31.557899],[119.607863,31.55318],[119.605278,31.549219],[119.601227,31.539029],[119.595883,31.535306],[119.593603,31.532209],[119.59307,31.529279],[119.58852,31.520111],[119.58613,31.514171],[119.584783,31.507314],[119.583621,31.504542],[119.579266,31.503148],[119.574259,31.505805],[119.568883,31.506775],[119.567015,31.504719],[119.567025,31.494798],[119.566406,31.492812],[119.567981,31.490419],[119.571652,31.488566],[119.573118,31.482624],[119.57515,31.480797],[119.57301,31.472039],[119.571891,31.471103],[119.565179,31.471385],[119.563572,31.468507],[119.565146,31.464339],[119.58411,31.465822],[119.588335,31.466688],[119.588357,31.464577],[119.591745,31.463059],[119.59143,31.460878],[119.589519,31.458352],[119.588433,31.454873],[119.590029,31.45225],[119.589595,31.447658],[119.587868,31.445803],[119.583317,31.446059],[119.582589,31.444823],[119.582524,31.437501],[119.578343,31.434551],[119.578256,31.432228],[119.576703,31.430726],[119.567514,31.432369],[119.556914,31.433897],[119.554557,31.433888],[119.554818,31.426141],[119.554383,31.422051],[119.553004,31.421981],[119.553905,31.417263],[119.556034,31.415143],[119.553797,31.415399],[119.553351,31.411724],[119.546639,31.413243],[119.536484,31.408216],[119.535974,31.406078],[119.537364,31.40143],[119.539666,31.400732],[119.541111,31.398585],[119.541741,31.394715],[119.540687,31.390155],[119.535702,31.381733],[119.534833,31.378039],[119.530434,31.370826],[119.528164,31.36524],[119.527589,31.360334],[119.528523,31.344969],[119.530728,31.339293],[119.53051,31.330875],[119.52672,31.327152],[119.520029,31.318247],[119.51966,31.313418],[119.522929,31.310924],[119.523679,31.301142],[119.527187,31.29794],[119.533671,31.294269],[119.535094,31.290907],[119.531401,31.287864],[119.533041,31.285404],[119.530912,31.279946],[119.530956,31.277663],[119.535528,31.275964],[119.535669,31.272505],[119.530478,31.268965],[119.532183,31.258586],[119.531553,31.2564],[119.527122,31.25232],[119.528588,31.247506],[119.522593,31.242169],[119.529066,31.23931],[119.530793,31.237283],[119.534475,31.236761],[119.536115,31.233494],[119.544152,31.226864],[119.551233,31.224952],[119.553851,31.221048],[119.550745,31.21617],[119.552558,31.212389],[119.552971,31.208635],[119.552765,31.201083],[119.554296,31.191678],[119.553188,31.183168],[119.553579,31.179156],[119.552374,31.177969],[119.548963,31.177942],[119.546378,31.176038],[119.543022,31.17548],[119.536625,31.167889],[119.532596,31.159093],[119.534518,31.158109],[119.541382,31.152333],[119.545835,31.14785],[119.554188,31.143996],[119.560259,31.140718],[119.564039,31.135871],[119.571326,31.129013],[119.574096,31.113991],[119.576507,31.110269],[119.581992,31.108647],[119.592115,31.110056],[119.599782,31.10917],[119.602802,31.112139],[119.609775,31.123811],[119.613728,31.129181],[119.616052,31.130094],[119.621972,31.130032],[119.63078,31.131255],[119.638122,31.135526],[119.637775,31.140488],[119.641554,31.148116],[119.645768,31.150464],[119.649374,31.154105],[119.656401,31.155283],[119.660072,31.15896],[119.662516,31.159855],[119.66294,31.164798],[119.663733,31.165958],[119.672606,31.167995],[119.678048,31.16819],[119.679275,31.167118],[119.68275,31.160501],[119.693297,31.156958],[119.698727,31.153069],[119.703875,31.151899],[119.707937,31.154025],[119.710316,31.158862],[119.713107,31.167614],[119.715888,31.169572],[119.723708,31.169758],[119.732864,31.171494],[119.738609,31.173585],[119.74051,31.173416],[119.74467,31.169882],[119.747754,31.169661],[119.753163,31.171406],[119.755357,31.170777],[119.762286,31.173363],[119.765653,31.173779],[119.773039,31.178049],[119.779327,31.178784],[119.784606,31.176011],[119.786626,31.173762],[119.790492,31.173204],[119.792513,31.171459],[119.793392,31.168057],[119.789352,31.162158],[119.789233,31.159686],[119.791274,31.156612],[119.794066,31.156205],[119.798019,31.157436],[119.800995,31.156338],[119.806599,31.149392],[119.809858,31.148524],[119.813583,31.149614],[119.823304,31.154132],[119.829375,31.158269],[119.829744,31.161387],[119.82792,31.163363],[119.823445,31.165825],[119.823782,31.168226],[119.826464,31.173204],[119.82817,31.17447],[119.831808,31.172451],[119.837575,31.173673],[119.842148,31.168757],[119.8476,31.167579],[119.851304,31.167827],[119.856267,31.170121],[119.859406,31.168828],[119.86664,31.168314],[119.875242,31.162353],[119.878359,31.16082],[119.883463,31.161538],[119.885245,31.162875],[119.891305,31.16431],[119.900211,31.169182],[119.913103,31.169572],[119.920011,31.170918],[120.110232,31.264001],[120.100153,31.335332]]]]}}]} diff --git a/src/components/Charts/echart/index.vue b/src/components/Charts/echart/index.vue new file mode 100644 index 0000000..d6cb724 --- /dev/null +++ b/src/components/Charts/echart/index.vue @@ -0,0 +1,66 @@ + + + + + diff --git a/src/components/Charts/echart/theme.json b/src/components/Charts/echart/theme.json new file mode 100644 index 0000000..ce81aba --- /dev/null +++ b/src/components/Charts/echart/theme.json @@ -0,0 +1,490 @@ +{ + "color": [ + "#2d8cf0", + "#19be6b", + "#ff9900", + "#E46CBB", + "#9A66E4", + "#ed3f14" + ], + "backgroundColor": "rgba(0,0,0,0)", + "textStyle": {}, + "title": { + "textStyle": { + "color": "#516b91" + }, + "subtextStyle": { + "color": "#93b7e3" + } + }, + "line": { + "itemStyle": { + "normal": { + "borderWidth": "2" + } + }, + "lineStyle": { + "normal": { + "width": "2" + } + }, + "symbolSize": "6", + "symbol": "emptyCircle", + "smooth": true + }, + "radar": { + "itemStyle": { + "normal": { + "borderWidth": "2" + } + }, + "lineStyle": { + "normal": { + "width": "2" + } + }, + "symbolSize": "6", + "symbol": "emptyCircle", + "smooth": true + }, + "bar": { + "itemStyle": { + "normal": { + "barBorderWidth": 0, + "barBorderColor": "#ccc" + }, + "emphasis": { + "barBorderWidth": 0, + "barBorderColor": "#ccc" + } + } + }, + "pie": { + "itemStyle": { + "normal": { + "borderWidth": 0, + "borderColor": "#ccc" + }, + "emphasis": { + "borderWidth": 0, + "borderColor": "#ccc" + } + } + }, + "scatter": { + "itemStyle": { + "normal": { + "borderWidth": 0, + "borderColor": "#ccc" + }, + "emphasis": { + "borderWidth": 0, + "borderColor": "#ccc" + } + } + }, + "boxplot": { + "itemStyle": { + "normal": { + "borderWidth": 0, + "borderColor": "#ccc" + }, + "emphasis": { + "borderWidth": 0, + "borderColor": "#ccc" + } + } + }, + "parallel": { + "itemStyle": { + "normal": { + "borderWidth": 0, + "borderColor": "#ccc" + }, + "emphasis": { + "borderWidth": 0, + "borderColor": "#ccc" + } + } + }, + "sankey": { + "itemStyle": { + "normal": { + "borderWidth": 0, + "borderColor": "#ccc" + }, + "emphasis": { + "borderWidth": 0, + "borderColor": "#ccc" + } + } + }, + "funnel": { + "itemStyle": { + "normal": { + "borderWidth": 0, + "borderColor": "#ccc" + }, + "emphasis": { + "borderWidth": 0, + "borderColor": "#ccc" + } + } + }, + "gauge": { + "itemStyle": { + "normal": { + "borderWidth": 0, + "borderColor": "#ccc" + }, + "emphasis": { + "borderWidth": 0, + "borderColor": "#ccc" + } + } + }, + "candlestick": { + "itemStyle": { + "normal": { + "color": "#edafda", + "color0": "transparent", + "borderColor": "#d680bc", + "borderColor0": "#8fd3e8", + "borderWidth": "2" + } + } + }, + "graph": { + "itemStyle": { + "normal": { + "borderWidth": 0, + "borderColor": "#ccc" + } + }, + "lineStyle": { + "normal": { + "width": 1, + "color": "#aaa" + } + }, + "symbolSize": "6", + "symbol": "emptyCircle", + "smooth": true, + "color": [ + "#2d8cf0", + "#19be6b", + "#f5ae4a", + "#9189d5", + "#56cae2", + "#cbb0e3" + ], + "label": { + "normal": { + "textStyle": { + "color": "#eee" + } + } + } + }, + "map": { + "itemStyle": { + "normal": { + "areaColor": "#f3f3f3", + "borderColor": "#516b91", + "borderWidth": 0.5 + }, + "emphasis": { + "areaColor": "rgba(165,231,240,1)", + "borderColor": "#516b91", + "borderWidth": 1 + } + }, + "label": { + "normal": { + "textStyle": { + "color": "#000" + } + }, + "emphasis": { + "textStyle": { + "color": "rgb(81,107,145)" + } + } + } + }, + "geo": { + "itemStyle": { + "normal": { + "areaColor": "#f3f3f3", + "borderColor": "#516b91", + "borderWidth": 0.5 + }, + "emphasis": { + "areaColor": "rgba(165,231,240,1)", + "borderColor": "#516b91", + "borderWidth": 1 + } + }, + "label": { + "normal": { + "textStyle": { + "color": "#000" + } + }, + "emphasis": { + "textStyle": { + "color": "rgb(81,107,145)" + } + } + } + }, + "categoryAxis": { + "axisLine": { + "show": true, + "lineStyle": { + "color": "#cccccc" + } + }, + "axisTick": { + "show": false, + "lineStyle": { + "color": "#333" + } + }, + "axisLabel": { + "show": true, + "textStyle": { + "color": "#fff" + } + }, + "splitLine": { + "show": false, + "lineStyle": { + "color": [ + "#eeeeee" + ] + } + }, + "splitArea": { + "show": false, + "areaStyle": { + "color": [ + "rgba(250,250,250,0.05)", + "rgba(200,200,200,0.02)" + ] + } + } + }, + "valueAxis": { + "axisLine": { + "show": true, + "lineStyle": { + "color": "#cccccc" + } + }, + "axisTick": { + "show": false, + "lineStyle": { + "color": "#333" + } + }, + "axisLabel": { + "show": true, + "textStyle": { + "color": "#fff" + } + }, + "splitLine": { + "show": false, + "lineStyle": { + "color": [ + "#eeeeee" + ] + } + }, + "splitArea": { + "show": false, + "areaStyle": { + "color": [ + "rgba(250,250,250,0.05)", + "rgba(200,200,200,0.02)" + ] + } + } + }, + "logAxis": { + "axisLine": { + "show": true, + "lineStyle": { + "color": "#cccccc" + } + }, + "axisTick": { + "show": false, + "lineStyle": { + "color": "#333" + } + }, + "axisLabel": { + "show": true, + "textStyle": { + "color": "#999999" + } + }, + "splitLine": { + "show": true, + "lineStyle": { + "color": [ + "#eeeeee" + ] + } + }, + "splitArea": { + "show": false, + "areaStyle": { + "color": [ + "rgba(250,250,250,0.05)", + "rgba(200,200,200,0.02)" + ] + } + } + }, + "timeAxis": { + "axisLine": { + "show": true, + "lineStyle": { + "color": "#cccccc" + } + }, + "axisTick": { + "show": false, + "lineStyle": { + "color": "#333" + } + }, + "axisLabel": { + "show": true, + "textStyle": { + "color": "#999999" + } + }, + "splitLine": { + "show": true, + "lineStyle": { + "color": [ + "#eeeeee" + ] + } + }, + "splitArea": { + "show": false, + "areaStyle": { + "color": [ + "rgba(250,250,250,0.05)", + "rgba(200,200,200,0.02)" + ] + } + } + }, + "toolbox": { + "iconStyle": { + "normal": { + "borderColor": "#999" + }, + "emphasis": { + "borderColor": "#666" + } + } + }, + "legend": { + "textStyle": { + "color": "#fff" + } + }, + "tooltip": { + "axisPointer": { + "lineStyle": { + "color": "#ccc", + "width": 1 + }, + "crossStyle": { + "color": "#ccc", + "width": 1 + } + } + }, + "timeline": { + "lineStyle": { + "color": "#8fd3e8", + "width": 1 + }, + "itemStyle": { + "normal": { + "color": "#8fd3e8", + "borderWidth": 1 + }, + "emphasis": { + "color": "#8fd3e8" + } + }, + "controlStyle": { + "normal": { + "color": "#8fd3e8", + "borderColor": "#8fd3e8", + "borderWidth": 0.5 + }, + "emphasis": { + "color": "#8fd3e8", + "borderColor": "#8fd3e8", + "borderWidth": 0.5 + } + }, + "checkpointStyle": { + "color": "#8fd3e8", + "borderColor": "rgba(138,124,168,0.37)" + }, + "label": { + "normal": { + "textStyle": { + "color": "#8fd3e8" + } + }, + "emphasis": { + "textStyle": { + "color": "#8fd3e8" + } + } + } + }, + "visualMap": { + "color": [ + "#516b91", + "#59c4e6", + "#a5e7f0" + ] + }, + "dataZoom": { + "backgroundColor": "rgba(0,0,0,0)", + "dataBackgroundColor": "rgba(255,255,255,0.3)", + "fillerColor": "rgba(167,183,204,0.4)", + "handleColor": "#a7b7cc", + "handleSize": "100%", + "textStyle": { + "color": "#333" + } + }, + "markPoint": { + "label": { + "normal": { + "textStyle": { + "color": "#eee" + } + }, + "emphasis": { + "textStyle": { + "color": "#eee" + } + } + } + } +} diff --git a/src/components/Charts/index.vue b/src/components/Charts/index.vue new file mode 100644 index 0000000..32bcd39 --- /dev/null +++ b/src/components/Charts/index.vue @@ -0,0 +1,358 @@ + + + diff --git a/src/const/addProps.js b/src/const/addProps.js index edd8a70..7c58bf8 100644 --- a/src/const/addProps.js +++ b/src/const/addProps.js @@ -20,7 +20,8 @@ export const addPropsMap = new Map([ ["datetime", { type: 'datetime', clearable: true, - valueFormat: 'yyyy-MM-dd mm:hh:ss', + format: "yyyy-MM-dd HH:mm:ss", + valueFormat: 'yyyy-MM-dd HH:mm:ss', pickerOptions: { shortcuts: [{ text: '今天', diff --git a/src/main.js b/src/main.js index f203997..11a417e 100644 --- a/src/main.js +++ b/src/main.js @@ -18,6 +18,7 @@ import './styles/viewui-mine.less'; import base from "./utils/common" Vue.use(ViewUI); import moment from "moment" +moment.locale('zh-CN'); Vue.prototype.$moment = moment; Vue.prototype.base = base; import '@/icons' // icon @@ -115,6 +116,9 @@ amapKeys.forEach(key => { import { defineDirective } from './draggable'; defineDirective(); + +import dataV from "@jiaminghi/data-view"; +Vue.use(dataV); new Vue({ el: '#app', router, diff --git a/src/mixin/drawMixin.js b/src/mixin/drawMixin.js new file mode 100644 index 0000000..b3a3747 --- /dev/null +++ b/src/mixin/drawMixin.js @@ -0,0 +1,57 @@ +// 屏幕适配 mixin 函数 + +// * 默认缩放值 +const scale = { + width: '1', + height: '1', +} + +// * 设计稿尺寸（px） +const baseWidth = 1920 +const baseHeight = 1080 + +// * 需保持的比例（默认1.77778） +const baseProportion = parseFloat((baseWidth / baseHeight).toFixed(5)) + +export default { + data() { + return { + // * 定时函数 + drawTiming: null + } + }, + mounted () { + this.calcRate() + window.addEventListener('resize', this.resize) + }, + beforeDestroy () { + window.removeEventListener('resize', this.resize) + }, + methods: { + calcRate () { + const appRef = this.$refs["appRef"] + if (!appRef) return + // 当前宽高比 + const currentRate = parseFloat((window.innerWidth / window.innerHeight).toFixed(5)) + if (appRef) { + if (currentRate > baseProportion) { + // 表示更宽 + scale.width = ((window.innerHeight * baseProportion) / baseWidth).toFixed(5) + scale.height = (window.innerHeight / baseHeight).toFixed(5) + appRef.style.transform = `scale(${scale.width}, ${scale.height}) translate(-50%, -50%)` + } else { + // 表示更高 + scale.height = ((window.innerWidth / baseProportion) / baseHeight).toFixed(5) + scale.width = (window.innerWidth / baseWidth).toFixed(5) + appRef.style.transform = `scale(${scale.width}, ${scale.height}) translate(-50%, -50%)` + } + } + }, + resize () { + clearTimeout(this.drawTiming) + this.drawTiming = setTimeout(() => { + this.calcRate() + }, 200) + } + }, +} diff --git a/src/router/index.js b/src/router/index.js index 2c2eaaf..b2d892e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -68,7 +68,16 @@ export const constantRoutes = [ title: '系统首页', icon: 'dashboard' } - }, ] + } ] + }, + { + path: "/dataShow", + name: '数据展示', + component: () => import('@/views/dataShow/index'), + meta: { + title: "大屏展示", + icon: "dashboard" + } } ] diff --git a/src/styles/scss/_variables.scss b/src/styles/scss/_variables.scss new file mode 100644 index 0000000..80edb92 --- /dev/null +++ b/src/styles/scss/_variables.scss @@ -0,0 +1,98 @@ +// 颜色 +$colors: ( + "primary": #1A5CD7, + "info-1": #4394e4, + "info": #4b67af, + "white": #ffffff, + "light": #f9f9f9, + "grey-1": #999999, + "grey": #666666, + "dark-1": #5f5f5f, + "dark": #222222, + "black-1": #171823, + "black": #000000, + "icon": #5cd9e8 +); + +// 字体大小 +$base-font-size: 0.2rem; +$font-sizes: ( + xxs: 0.1, + //8px + xs: 0.125, + //10px + sm: 0.2875, + //12px + md: 0.1625, + //13px + lg: 0.175, + //14px + xl: 0.2, + //16px + xxl: 0.225, + //18px + xxxl: 0.25 //20px,,,, +); + +// 宽高 +.w-100 { + width: 100%; +} +.h-100 { + height: 100%; +} + +//flex +.d-flex { + display: flex; +} +.flex-column { + flex-direction: column; +} +.flex-wrap { + flex-wrap: wrap; +} +.flex-nowrap { + flex-wrap: nowrap; +} +$flex-jc: ( + start: flex-start, + end: flex-end, + center: center, + between: space-between, + around: space-around, + evenly: space-evenly, +); + +$flex-ai: ( + start: flex-start, + end: flex-end, + center: center, + stretch: stretch, +); + +.flex-1 { + flex: 1; +} + +//.mt-1 => margin top +//spacing +$spacing-types: ( + m: margin, + p: padding, +); +$spacing-directions: ( + t: top, + r: right, + b: bottom, + l: left, +); +$spacing-base-size: 0.5rem; +$spacing-sizes: ( + 0: 0, + 1: 0.5, + 2: 1, + 3: 1.5, + 4: 2, + 5: 2.5, +); diff --git a/src/styles/scss/style.scss b/src/styles/scss/style.scss new file mode 100644 index 0000000..300e99d --- /dev/null +++ b/src/styles/scss/style.scss @@ -0,0 +1,186 @@ +@import "./variables"; + +// 全局样式 +* { + margin: 0; + padding: 0; + list-style-type: none; + outline: none; + box-sizing: border-box; +} + +html { + margin: 0; + padding: 0; +} + +body { + font-family: Arial, Helvetica, sans-serif; + line-height: 1.2em; + background-color: #f1f1f1; + margin: 0; + padding: 0; + overflow: hidden; +} + +a { + color: #343440; + text-decoration: none; +} + +.clearfix { + &::after { + content: ""; + display: table; + height: 0; + line-height: 0; + visibility: hidden; + clear: both; + } +} + +//浮动 +.float-r { + float: right; +} + +//浮动 +.float-l { + float: left; +} + +// 字体加粗 +.fw-b { + font-weight: bold; +} + +//文章一行显示，多余省略号显示 +.title-item { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.bg-color-black { + background-color: rgba(19, 25, 47, 0.6); +} + +.bg-color-blue { + background-color: #1a5cd7; +} + +.colorBlack { + color: #272727 !important; + + &:hover { + color: #272727 !important; + } +} + +.colorGrass { + color: #33cea0; + + &:hover { + color: #33cea0 !important; + } +} + +.colorRed { + color: #ff5722; + + &:hover { + color: #ff5722 !important; + } +} + +.colorText { + color: #d3d6dd !important; + + &:hover { + color: #d3d6dd !important; + } +} + +.colorBlue { + color: #257dff !important; + + &:hover { + color: #257dff !important; + } +} + +//颜色 +@each $colorkey, $color in $colors { + .text-#{$colorkey} { + color: $color; + } + + .bg-#{$colorkey} { + background-color: $color; + } +} + +//对齐 +@each $var in (left, center, right) { + .text-#{$var} { + text-align: $var !important; + } +} + +//flex +@each $key, $value in $flex-jc { + .jc-#{$key} { + justify-content: $value; + } +} + +@each $key, $value in $flex-ai { + .ai-#{$key} { + align-items: $value; + } +} + +//字体 +@each $fontkey, $fontvalue in $font-sizes { + .fs-#{$fontkey} { + font-size: $fontvalue * $base-font-size; + } +} + +//.mt-1 => margin top +//spacing + +@each $typekey, $type in $spacing-types { + //.m-1 + @each $sizekey, $size in $spacing-sizes { + .#{$typekey}-#{$sizekey} { + #{$type}: $size * $spacing-base-size; + } + } + + //.mx-1 + @each $sizekey, $size in $spacing-sizes { + .#{$typekey}x-#{$sizekey} { + #{$type}-left: $size * $spacing-base-size; + #{$type}-right: $size * $spacing-base-size; + } + + .#{$typekey}y-#{$sizekey} { + #{$type}-top: $size * $spacing-base-size; + #{$type}-bottom: $size * $spacing-base-size; + } + } + + //.mt-1 + @each $directionkey, $direction in $spacing-directions { + @each $sizekey, $size in $spacing-sizes { + .#{$typekey}#{$directionkey}-#{$sizekey} { + #{$type}-#{$direction}: $size * $spacing-base-size; + } + } + } + + .#{$typekey} { + #{$type}: 0; + } +} diff --git a/src/utils/createDialog.js b/src/utils/createDialog.js index 34a3022..b1a87e4 100644 --- a/src/utils/createDialog.js +++ b/src/utils/createDialog.js @@ -267,6 +267,7 @@ export class CreateDialog { attrs: { href: file.url, download: file.name, + target: "_blank", }, class: { "uploaded-a": diff --git a/src/views/assets/history.vue b/src/views/assets/history.vue index 444788e..8ff226a 100644 --- a/src/views/assets/history.vue +++ b/src/views/assets/history.vue @@ -52,6 +52,11 @@ export default { list: [], table: [ + { + prop: "fashengshijian", + label: "发生时间", + width: 200 + }, { prop: "mianjitiaozheng", label: "面积调整", diff --git a/src/views/component/detail.vue b/src/views/component/detail.vue index a12b3bd..a688018 100644 --- a/src/views/component/detail.vue +++ b/src/views/component/detail.vue @@ -58,6 +58,12 @@ >{{ contentFormat(item) }}{{ units.get(item.field) }} + +
+ {{ detail.hasOwnProperty('id_houses_land_id_relation') ? (detail.id_houses_land_id_relation ? detail.id_houses_land_id_relation.name : '') : (detail.land_id_lands_id_relation ? detail.land_id_lands_id_relation.name : '') }} + 查看 +
+ @@ -102,7 +108,7 @@