From 59d3a1bdb70e787547600356489ccdd8f893cd3f Mon Sep 17 00:00:00 2001 From: xyq <392009588@qq.com> Date: Thu, 15 Sep 2022 09:30:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF=E7=9B=98=E6=B4=BB=E6=96=B9=E5=BC=8F=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/onlineHome/homestead/circulation.js | 17 +- src/api/onlineHome/phfs/phfs.js | 10 + src/components/Map/MapGisObtain.vue | 217 ++++++++++ src/router/index.js | 18 + src/views/onlineHome/phfs/zzjy/zzjyAdd.vue | 416 ++++++++++++++++++++ src/views/onlineHome/phfs/zzjy/zzjyList.vue | 181 +++++++++ src/views/onlineHome/workbench.vue | 59 +++ 7 files changed, 917 insertions(+), 1 deletion(-) create mode 100644 src/api/onlineHome/phfs/phfs.js create mode 100644 src/components/Map/MapGisObtain.vue create mode 100644 src/views/onlineHome/phfs/zzjy/zzjyAdd.vue create mode 100644 src/views/onlineHome/phfs/zzjy/zzjyList.vue diff --git a/src/api/onlineHome/homestead/circulation.js b/src/api/onlineHome/homestead/circulation.js index 5f79538b..a71e12f9 100644 --- a/src/api/onlineHome/homestead/circulation.js +++ b/src/api/onlineHome/homestead/circulation.js @@ -32,7 +32,22 @@ export function zjdzd(){ method:'get' }) } - +// 查询权利人列表 +export function obligeeList(query) { + return request({ + url: '/house/obligee/obligeeHouselist', + method: 'get', + params: query + }) +} +// 条件查询使用权人列表 +export function selectTHouseBaseObligeeMapList(query) { + return request({ + url: '/house/obligee/selectTHouseBaseObligeeMapList', + method: 'get', + params: query + }) +} //权利人代码 export function getByZjddm(data){ return request({ diff --git a/src/api/onlineHome/phfs/phfs.js b/src/api/onlineHome/phfs/phfs.js new file mode 100644 index 00000000..9c196d13 --- /dev/null +++ b/src/api/onlineHome/phfs/phfs.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +//查询列表 +export function getList(data){ + return request({ + url:'/house/phxxb/list', + method:'get', + params:data + }) +} diff --git a/src/components/Map/MapGisObtain.vue b/src/components/Map/MapGisObtain.vue new file mode 100644 index 00000000..47b9b87a --- /dev/null +++ b/src/components/Map/MapGisObtain.vue @@ -0,0 +1,217 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 27542f2e..665f38d5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -942,6 +942,24 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/onlineHome/homestead/paidUtilize/paidUtilizeAdd'], resolve) }, + { + path: '/zzjyList', + name: 'zzjyList', + meta: { + title: '自主经营列表', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/zzjy/zzjyList'], resolve) + }, + { + path: '/zzjyAdd', + name: 'zzjyAdd', + meta: { + title: '添加自主经营', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/phfs/zzjy/zzjyAdd'], resolve) + }, { path: '/task', name: 'task', diff --git a/src/views/onlineHome/phfs/zzjy/zzjyAdd.vue b/src/views/onlineHome/phfs/zzjy/zzjyAdd.vue new file mode 100644 index 00000000..bd55bb50 --- /dev/null +++ b/src/views/onlineHome/phfs/zzjy/zzjyAdd.vue @@ -0,0 +1,416 @@ + + + + + diff --git a/src/views/onlineHome/phfs/zzjy/zzjyList.vue b/src/views/onlineHome/phfs/zzjy/zzjyList.vue new file mode 100644 index 00000000..e2f9d087 --- /dev/null +++ b/src/views/onlineHome/phfs/zzjy/zzjyList.vue @@ -0,0 +1,181 @@ + + + + + diff --git a/src/views/onlineHome/workbench.vue b/src/views/onlineHome/workbench.vue index 275c988f..92b6fecb 100644 --- a/src/views/onlineHome/workbench.vue +++ b/src/views/onlineHome/workbench.vue @@ -523,6 +523,63 @@ --> + + + + + + +
+
+ +
+
+

自主经营

+
+ +
+
+ +
+
+

出租经营

+
+ +
+
+ +
+
+

入股经营

+
+ +
+
+ +
+
+

合作经营

+
+ +
+
+ +
+
+

整治利用

+
+ +
+
@@ -651,6 +708,8 @@ this.$router.push({ path: "/supervisionList" }); } else if (data == 'paidUtilizeList') { this.$router.push({ path: "/paidUtilizeList" }); + }else if (data == 'zzjyList') { + this.$router.push({ path: "/zzjyList" }); } } else { this.$dialog.alert({ From fad4a46511241a2f5a19558d4aa45c885f0eb1fe Mon Sep 17 00:00:00 2001 From: xyq <392009588@qq.com> Date: Thu, 15 Sep 2022 09:48:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF=E7=9B=98=E6=B4=BB=E6=96=B9=E5=BC=8F=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/images/onlineHome/icon_czjy.png | Bin 0 -> 634 bytes static/images/onlineHome/icon_hzjy.png | Bin 0 -> 720 bytes static/images/onlineHome/icon_rgjy.png | Bin 0 -> 857 bytes static/images/onlineHome/icon_zzjy.png | Bin 0 -> 833 bytes static/images/onlineHome/icon_zzly.png | Bin 0 -> 688 bytes 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 static/images/onlineHome/icon_czjy.png create mode 100644 static/images/onlineHome/icon_hzjy.png create mode 100644 static/images/onlineHome/icon_rgjy.png create mode 100644 static/images/onlineHome/icon_zzjy.png create mode 100644 static/images/onlineHome/icon_zzly.png diff --git a/static/images/onlineHome/icon_czjy.png b/static/images/onlineHome/icon_czjy.png new file mode 100644 index 0000000000000000000000000000000000000000..909ed96478b7d935aa9bf83fc7803255cf1c629f GIT binary patch literal 634 zcmV-=0)_pFP)P000;W1^@s654Bdt00004b3#c}2nYxW zd%3d9P83WN%@140E#1;!4v zg80779E~%N>H#_w?MY~eQSFg7zGfVOk_a8J3~&1 ze&ktduhQ0&_Es&BZ~aD}+Sc*_g26@`_X!Xjab}PoEz(@;O{~3*DU9mCJV=Ln0JNIH z_SyxJ3<@3Dkj8~TrkTrcG^$oAh(1}nmTt{nAlX?=9HY6u_rWffTBi$>CC%bNIz?+I9psb9(2AE4e zm@apC>pBBc$`BS|L=PlF#{@9iGcal}ksj~MI2_)PF4Du~K-LaoL&hA|cPEP-M$Qs< z+^JiWkJbPXZw^cfujlTqon(2C{TZYOJTTyrZCp=%&o9w(m2k4l9_OSNJ=O+;K_*sY z+LJ4tLXsNVl5Zj9RWuN8}gB0EWSz3xX(8&Ig&qBKq&%Fa1Xs U0)Z^nGXMYp07*qoM6N<$g3(S4H2?qr literal 0 HcmV?d00001 diff --git a/static/images/onlineHome/icon_hzjy.png b/static/images/onlineHome/icon_hzjy.png new file mode 100644 index 0000000000000000000000000000000000000000..4fceebc337f63fa8d7a8edd480f071c3631978b3 GIT binary patch literal 720 zcmV;>0x$iEP)FMG#~Z5kVm2!~$tx&@ciA z2@WKKghtVzNux}vfnX1UsDVNeB&3CpQ4fkBit-(SuTI||dtbKOea^Yzf{%Oe-v3(v z+0S#MC4q?Jco)rs@CyDw4%S0t6$BeDWO@7*PBmqUS~!^Z5%llRV`oqg_Q?8`QuIWT&XfN(i9bRH zwh%@~_}&G5==P=>1g5c|CQP!Z)1}EvfA1L$^k#<#L zI1B7+hRDrX1MPY3eLr3xI+S5hMZewFu5^&x3TseG&!|^OC$kdKKmk+KgJz$nt0lL? zUF4kzv``Z2u(Tq0l2+XIF-B~#WKW|2^Yr~B`ew>oQO}?B$(@$L z90Kj-q|k769^SeF@>XaX%+w?%%RmLPq8fw8p213fYmM}tNHx&vXGJ>(?>vKL{B8uj z50VYCDlfJ_ben36R)9{Tw(O!JWN?Oxx8V-dCtcmSg700004b3#c}2nYxW zd`Fe=&% zU0e<$VK@v8?_U_t!Cnq|6Awusyqw7axC2MwHq^1`Ypx}^bN2S;+hEYR5*PtX+56D7 zir-|c;=`8ziT&$$babEAH^3_NniannuD(;N{n*|^!VQd58Qh0rZ?5OB9;~`qC^@{(5_h16lLz2DT(7mT}#r2UHvVlcE zf@SR<5bndK<6xGx_}qYwg==s+j21`(hw0~5AH=*-OvQz~uYjp=5wd)Kh7Y=9F$@3; z=!rK4WAYu$BGYXk7(4?y3`W6II0*~D+pqk~=U6j@9}MOkFko6Y8hSu1fBo&v%nVDu z3d|5&f*zO%ClGHk6|JU9Cc7E4o=_N;d}lDIS|#3OBdh~c^*I=9#l2k_dgZZ*y7QqN zbWd#?OW$5p2xd(IsBsl^%_TUbxIQ&o>kB2~DJJ~n&I zU9F8}Z&2%5Tf>?iycfeK@IcpI0MqdUYf2Qi>~%#cA3V8D5Bn-uXu*7j$>7aB(A+OX z>xJT`+Igr019BEjH7#mvt!mk0Yp}f@hH)?h_CRIO*~)l5{u7zsrqvRd9u`P000;W1^@s654Bdt00004b3#c}2nYxW zd``ajQe&U?>I zCUqFCR;w429#8?@8S@6~7hpI^66ey9lxYZFLw7s`|H>SLMwjJ*bXL&qf~;8-?++4! zcVTz|NHPirah9NPgk);iWUFkmZ6gT;kFhXIGpkS3hQHP2N$%lj|5p_CnIvYTn+d+5 z|NPG+q3mmA6`)^_?ii?oH{c{hBYC3Gjl0NAc+_OmN`m4o%a=vHMZXf=4FiKmU@bTe zHe&xQOO#1Aiiaaf4T)7$i*5*xSI~V#HxNCMonbu(*`6Fpo&C-r8?vHEVrdl|Jn*(b zFm0^jIeG)91G$9SZ$sY7$iJ{|0MGUWy1_`I(GY^ed6E!tAM;+Y6}$%v!EJC3pX&vQ zRgl${+x{%c5d;@YNVM||wgAs=5x4^evQ=b#snl3K=&K1ES#?}f_R(Q88T~x48}tEx z2}ZF0RFqVxeo#AXl8%)?VBe2|RbW1d{co~<0BqTZJXxru7hNSwk{(j7j%LY_z4z(9pHSBc_Eg7OJF~KCLxLMOPA;2KAwrp!Vj`L z7*1pMES3R-jfXiV;|0)P`7QiT1wX$vpNikNwe-;n4pW%@<#pCJ!oaBs_zr>nw}Kjz z7iAck>vT*=5{>?5h9Fkpk8In|(?rj&FQgxxKR3-XB7%1ZJLk3vI#v>#z1qIv9%KX9 z7T0EK66raDcfe=5UX)CyGl_v}A+UsT_~*hT8fC#dR#MiU|B?R!F*Ha5lN8>i00000 LNkvXXu0mjf$Od|R literal 0 HcmV?d00001 diff --git a/static/images/onlineHome/icon_zzly.png b/static/images/onlineHome/icon_zzly.png new file mode 100644 index 0000000000000000000000000000000000000000..1e19744995bad7270046281a870725b89f67525d GIT binary patch literal 688 zcmV;h0#E&kP)P000;W1^@s654Bdt00004b3#c}2nYxW zd!CHr2@GM#0oq*zzW0; zv;utJ&2A>A$sOaEnVk!}n|*J85{i?abvPU*av4iX$tZHKwckmqqA2)gSCO+Q_)NBi z1^?35gZhzk13fj{jllM)c)vgtd?3dM2_Rd^QilOZE+aFOPn>1Tw*_JVukwH;%+_6H zIM((PWTS)B|DvzX#{%FNKrHR2t_{ zjoumx`!h+nq|&2XBtU}xm`norPhex510j=%z{?nnNZqRPpC6x z0F+6Y*mU8@P&9W!;uCj;A7zrvBp)z#f|en@S~E=a1SguxmlX!U?g;?QJwd(cd`A*U zJ;oI7#-$0@acx1!#1W?!CFV6+jlYQ2${*)I#zO4*; zGqF3t6!9NUBk2K6W)D+HG<}qONO(Zksd9Ff%SM<$)R({j`r_$_M4b!Xn@Nh%Uv=M; W$3O!AIF>K~0000 Date: Thu, 15 Sep 2022 13:45:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Map/MapGisObtain.vue | 129 ++++++++++++--------- src/views/onlineHome/phfs/zzjy/zzjyAdd.vue | 6 +- 2 files changed, 78 insertions(+), 57 deletions(-) diff --git a/src/components/Map/MapGisObtain.vue b/src/components/Map/MapGisObtain.vue index 47b9b87a..2f813638 100644 --- a/src/components/Map/MapGisObtain.vue +++ b/src/components/Map/MapGisObtain.vue @@ -72,27 +72,28 @@ export default { name: "天地图文字标注--卫星影像图", resolution:Math.random() * 0.00000001 }); + //加载地图 + that.map = new ol.Map({ + controls: ol.control.defaults({attribution: false, zoom: false, rotate: false}).extend([]), //隐藏放大缩小按钮 + layers: [aerial, yingxzi], + projection: projection, + target: that.uuidMap, + view: new ol.View({ + //center: ol.proj.fromLonLat([115.452752, 31.789033]), + zoom: 15, + minZoom: 5, //地图缩小限制 + maxZoom: 18.3, //地图放大限制 + }), + interactions: ol.interaction.defaults({ + pinchRotate: false // 移动端禁止地图旋转 + }), + //view: new ol.View({ol.view.getResolution() + Math.random() * 0.00000001)});//随机数缩放实现刷新 + }); if (response.data.length > 0) { //setTimeout(() => { for (var i = 0; response.data.length > i; i++) { - //加载地图 - that.map = new ol.Map({ - controls: ol.control.defaults({attribution: false, zoom: false, rotate: false}).extend([]), //隐藏放大缩小按钮 - layers: [aerial, yingxzi], - projection: projection, - target: that.uuidMap, - view: new ol.View({ - //center: ol.proj.fromLonLat([115.452752, 31.789033]), - zoom: 15, - minZoom: 5, //地图缩小限制 - maxZoom: 18.3, //地图放大限制 - }), - interactions: ol.interaction.defaults({ - pinchRotate: false // 移动端禁止地图旋转 - }), - //view: new ol.View({ol.view.getResolution() + Math.random() * 0.00000001)});//随机数缩放实现刷新 - }); //图层查询定位开始 ---------start + console.log( response.data[i].zjdzd.theGeom); hc_land = new ol.layer.Vector({ title: "add Layer", source: new ol.source.Vector({ @@ -121,6 +122,7 @@ export default { var minYMap = hc_land.values_.source.featuresRtree_.rbush_.data.minY; //定位查询位置 var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置 + console.log(center); that.map.getView().animate({ // 只设置需要的属性即可 center: center, // 中心点 @@ -130,45 +132,64 @@ export default { resolution:Math.random() * 0.00000001, }); } - that.map.on("singleclick", function (evt) { - console.info(1111111); - let feature = that.map.forEachFeatureAtPixel( - evt.pixel, - (feature) => feature - ); - document.getElementById(that.uuidMap).innerHTML = ''; - - if (feature) { - that.map.removeLayer(geo_zjdzd); - this.closeMoule= null; - //图层查询定位开始 ---------start - geo_zjdzd = new ol.layer.Vector({ - title: "add Layer", - source: new ol.source.Vector({ - projection: projection, - features: new ol.format.GeoJSON().readFeatures("{\n" + - " \"type\": \"Feature\",\n" + - " \"geometry\":" + feature.values_.zjdzd.theGeom + "}"), - }), - style: new ol.style.Style({ - fill: new ol.style.Fill({ - //矢量图层填充颜色,以及透明度 - color: "rgb(204, 255, 255,0.5)", - }), - stroke: new ol.style.Stroke({ - //边界样式 - color: "#00FFFF", - width: 8, - }), - }), - }); - that.map.addLayer(geo_zjdzd); - that.closeMoule = feature.values_.zjddm; - } - }); } var geo_zjdzd; - console.log("1111"); + that.map.on("singleclick", function (evt) { + let feature = that.map.forEachFeatureAtPixel( + evt.pixel, + (feature) => feature + ); + //document.getElementById(that.uuidMap).innerHTML = ''; + if (feature && (feature !==undefined)) { + that.map.removeLayer(geo_zjdzd); + var aleft = []; + for(var i=0;i - - - + + +