|
@@ -169,7 +169,7 @@
|
|
|
<img src="~@/assets/image/cyyd/fk.png" />
|
|
|
<div class="name">回答</div>
|
|
|
</div>
|
|
|
- <p>为您找到以下{{ xgdk ? xgdk.length : 0 }}个地块</p>
|
|
|
+ <p class='xg-des'>为您找到以下{{ xgdk ? xgdk.length : 0 }}个地块</p>
|
|
|
<div class="table-panel">
|
|
|
<template v-if="xgdk && xgdk.length > 0">
|
|
|
<div
|
|
@@ -183,10 +183,11 @@
|
|
|
>
|
|
|
<div class="number">{{ i + 1 }}</div>
|
|
|
<div class="content">
|
|
|
- <h3>{{ citem.dkmc }}</h3>
|
|
|
+ <h3>{{ citem.name }}</h3>
|
|
|
<p>
|
|
|
- 面积:{{ citem.dkmj ? citem.dkmj.toFixed(2) : '-' }}亩
|
|
|
- 土地用途:{{ citem.tdyt ? citem.tdyt : '-' }}
|
|
|
+ <span>面积:{{ citem.area ? citem.area.toFixed(2) : '-' }}亩</span>
|
|
|
+ <span>单价:{{ citem.unit_price ? citem.unit_price.toFixed(2) : '-' }}</span>
|
|
|
+ <span>行政区:{{ citem.county ? citem.county : '-' }}</span>
|
|
|
</p>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -451,6 +452,99 @@ export default {
|
|
|
startTime: 0,
|
|
|
showIndentify: false,
|
|
|
detailData: null,
|
|
|
+ // detailData: {
|
|
|
+ // 'id': 48668,
|
|
|
+ // 'OBJECTID': null,
|
|
|
+ // 'xzq': null,
|
|
|
+ // 'xzqmc': '萧山区',
|
|
|
+ // 'xzqdm': '330109',
|
|
|
+ // 'dkmc': '湘湖国家旅游度假区建设工矿仓储项目',
|
|
|
+ // 'dkbh': '萧政工出[2025]11号',
|
|
|
+ // 'dkmj': 60.714,
|
|
|
+ // 'tdyt': '工业用地',
|
|
|
+ // 'jzdj': null,
|
|
|
+ // 'kfq': null,
|
|
|
+ // 'dkid': '1895353609416212480',
|
|
|
+ // 'dklx': '立即可用',
|
|
|
+ // 'is_valid': null,
|
|
|
+ // 'dlmc': null,
|
|
|
+ // 'group_name': null,
|
|
|
+ // 'shape_leng': null,
|
|
|
+ // 'lysx': 1,
|
|
|
+ // 'kfqdm': null,
|
|
|
+ // 'kfqmc': null,
|
|
|
+ // 'tdzl': null,
|
|
|
+ // 'kfcd': null,
|
|
|
+ // 'is_bdz': null,
|
|
|
+ // 'bzd_gdzctz': null,
|
|
|
+ // 'bzd_mjss': null,
|
|
|
+ // 'bzd_dwnh': null,
|
|
|
+ // 'bzd_dwpf': null,
|
|
|
+ // 'rjl_min': null,
|
|
|
+ // 'rjl_max': null,
|
|
|
+ // 'is_publish': null,
|
|
|
+ // 'lxr': null,
|
|
|
+ // 'lxdh': null,
|
|
|
+ // 'lxdz': null,
|
|
|
+ // 'cryear': null,
|
|
|
+ // 'crway': null,
|
|
|
+ // 'wgyy': null,
|
|
|
+ // 'qjurl': null,
|
|
|
+ // 'syzt': 1,
|
|
|
+ // 'remark': null,
|
|
|
+ // 'district_code': null,
|
|
|
+ // 'district': null,
|
|
|
+ // 'available_sequence': 1,
|
|
|
+ // 'sde_ecgap_klyzy_area': null,
|
|
|
+ // 'development_degree': 0,
|
|
|
+ // 'use': 1,
|
|
|
+ // 'plot_ratio_start': 1.5,
|
|
|
+ // 'plot_ratio_end': 2,
|
|
|
+ // 'investment_scale': 420,
|
|
|
+ // 'tax': 40,
|
|
|
+ // 'unit_energy_consumption_added': '≥13.8万元/吨标煤',
|
|
|
+ // 'unit_emission_added': '≥5640万元/吨',
|
|
|
+ // 'bz': null,
|
|
|
+ // 'create_time': null,
|
|
|
+ // 'create_worker_id': null,
|
|
|
+ // 'update_time': null,
|
|
|
+ // 'update_worker_id': null,
|
|
|
+ // 'is_pub': 1,
|
|
|
+ // 'image_url': null,
|
|
|
+ // 'intr_url': null,
|
|
|
+ // 'zyid': '1895353609416212480',
|
|
|
+ // 'bzdj': null,
|
|
|
+ // 'is_bzd': 1,
|
|
|
+ // 'sskfq': null,
|
|
|
+ // 'introduce': null,
|
|
|
+ // 'xmid': null,
|
|
|
+ // 'coord': '[120.1791595,30.036971]',
|
|
|
+ // 'sde_ecgap_klyzy_fid': null,
|
|
|
+ // 'dksyh': '1895353609416212480',
|
|
|
+ // 'reason_for_invalid': null,
|
|
|
+ // 'is_nz': 1,
|
|
|
+ // 'is_tg': 1,
|
|
|
+ // 'contact_address': null,
|
|
|
+ // 'is_ng': null,
|
|
|
+ // 'file_name': null,
|
|
|
+ // 'address': '位于萧山区义桥镇,东至空地,南至空地,西至空地,北至云临路。',
|
|
|
+ // 'period': 30,
|
|
|
+ // 'status': 1,
|
|
|
+ // 'crfs': 2,
|
|
|
+ // 'xzt_url': null,
|
|
|
+ // 'data_from': 'from dealland',
|
|
|
+ // 'image_id': null,
|
|
|
+ // 'name': '湘湖国家旅游度假区建设工矿仓储项目',
|
|
|
+ // 'sfsj': 1,
|
|
|
+ // 'isbuild': null,
|
|
|
+ // 'is_incircle': null,
|
|
|
+ // 'circlename': null,
|
|
|
+ // 'instance_id': '01954d7c502234619461953e090100e3',
|
|
|
+ // 'sde_ecgap_klyzy_area_1': 60.714,
|
|
|
+ // 'shape_Length': null,
|
|
|
+ // 'shape_Area': null
|
|
|
+ //
|
|
|
+ // },
|
|
|
legend: [
|
|
|
// {
|
|
|
// name: "可利用资源",
|
|
@@ -1168,7 +1262,7 @@ export default {
|
|
|
'?service=WFS&version=1.0.0&request=GetFeature&typeName=' +
|
|
|
window.ApplicationConfig.gdLayerName +
|
|
|
'&maxFeatures=50&outputFormat=application%2Fjson&cql_filter=dkmc=\'' +
|
|
|
- item.dkmc +
|
|
|
+ item.name +
|
|
|
'\''
|
|
|
axios.get(query).then((data) => {
|
|
|
console.log(data)
|
|
@@ -1279,7 +1373,11 @@ export default {
|
|
|
|
|
|
bounds.extend(geos.getBounds())
|
|
|
})
|
|
|
- this.map.fitBounds(bounds)
|
|
|
+ try {
|
|
|
+ this.map.fitBounds(bounds)
|
|
|
+ } catch (e) {
|
|
|
+ console.log('fitBounds error: ', e)
|
|
|
+ }
|
|
|
},
|
|
|
//详情页tab切换地图绘制相关清空
|
|
|
toggleInfoTab() {
|
|
@@ -1412,34 +1510,36 @@ export default {
|
|
|
}
|
|
|
const bounds = L.latLngBounds()
|
|
|
this.xgdk.forEach((item, i) => {
|
|
|
- var center = item.center_wkt
|
|
|
- .substring(6, item.center_wkt.length - 1)
|
|
|
- .replace(' ', ',')
|
|
|
- var centerList = center.split(',')
|
|
|
- var className = 'point-div-icon'
|
|
|
- var myIcon = L.divIcon({
|
|
|
- html: i > -1 ? '<div>' + (i + 1) + '<div>' : '<div><div>',
|
|
|
- className: className,
|
|
|
- //图标大小
|
|
|
- iconSize: [32, 32]
|
|
|
- })
|
|
|
- var marker = L.marker([centerList[1], centerList[0]], {
|
|
|
- icon: myIcon,
|
|
|
- properties: { p: i }
|
|
|
- }).addTo(this.map)
|
|
|
- let that = this
|
|
|
- marker.on('mouseover', function (e) {
|
|
|
- that.hoverDkIndex = i
|
|
|
- })
|
|
|
- marker.on('mouseout', function (e) {
|
|
|
- that.hoverDkIndex = -1
|
|
|
- })
|
|
|
- marker.on('click', function (e) {
|
|
|
- that.showDetailModal(that.xgdk[i], i)
|
|
|
- })
|
|
|
- this.dkMarkerLayer.push(marker)
|
|
|
- var pointLng = L.latLngBounds([[centerList[1], centerList[0]]])
|
|
|
- bounds.extend(pointLng)
|
|
|
+ if (item.center_wkt) {
|
|
|
+ var center = item.center_wkt
|
|
|
+ .substring(6, item.center_wkt.length - 1)
|
|
|
+ .replace(' ', ',')
|
|
|
+ var centerList = center.split(',')
|
|
|
+ var className = 'point-div-icon'
|
|
|
+ var myIcon = L.divIcon({
|
|
|
+ html: i > -1 ? '<div>' + (i + 1) + '<div>' : '<div><div>',
|
|
|
+ className: className,
|
|
|
+ //图标大小
|
|
|
+ iconSize: [32, 32]
|
|
|
+ })
|
|
|
+ var marker = L.marker([centerList[1], centerList[0]], {
|
|
|
+ icon: myIcon,
|
|
|
+ properties: { p: i }
|
|
|
+ }).addTo(this.map)
|
|
|
+ let that = this
|
|
|
+ marker.on('mouseover', function (e) {
|
|
|
+ that.hoverDkIndex = i
|
|
|
+ })
|
|
|
+ marker.on('mouseout', function (e) {
|
|
|
+ that.hoverDkIndex = -1
|
|
|
+ })
|
|
|
+ marker.on('click', function (e) {
|
|
|
+ that.showDetailModal(that.xgdk[i], i)
|
|
|
+ })
|
|
|
+ this.dkMarkerLayer.push(marker)
|
|
|
+ var pointLng = L.latLngBounds([[centerList[1], centerList[0]]])
|
|
|
+ bounds.extend(pointLng)
|
|
|
+ }
|
|
|
})
|
|
|
this.map.fitBounds(bounds)
|
|
|
},
|
|
@@ -1611,6 +1711,7 @@ export default {
|
|
|
item.exec_res.indexOf('\n```json\n') > -1
|
|
|
) {
|
|
|
lastUpRes = responses[index]
|
|
|
+ console.log('lastUpRes: ', lastUpRes)
|
|
|
}
|
|
|
})
|
|
|
const user_request = responseData.user_request
|
|
@@ -1657,6 +1758,7 @@ export default {
|
|
|
// dk.sort(function (a, b) {
|
|
|
// return b.comprehensive_score - a.comprehensive_score;
|
|
|
// });
|
|
|
+ console.log('dk: ', dk)
|
|
|
T.xgdk = dk
|
|
|
T.clearMark()
|
|
|
T.showXgdkCenterPoint()
|
|
@@ -1901,11 +2003,11 @@ export default {
|
|
|
z-index: 19;
|
|
|
|
|
|
.name-panel {
|
|
|
- height: 48px;
|
|
|
+ padding: 10px 0;
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
justify-content: space-between;
|
|
|
- border-bottom: 1px solid #eceef1;
|
|
|
+ //border-bottom: 1px solid #eceef1;
|
|
|
|
|
|
.name {
|
|
|
font-family: Microsoft YaHei;
|
|
@@ -1923,7 +2025,6 @@ export default {
|
|
|
.layer-legend {
|
|
|
width: 100%;
|
|
|
height: calc(100% - 62px);
|
|
|
- padding: 20px 0px 0px 8px;
|
|
|
|
|
|
.item {
|
|
|
list-style: none;
|
|
@@ -2450,6 +2551,10 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ .xg-des {
|
|
|
+ margin-bottom: 10px;
|
|
|
+ }
|
|
|
+
|
|
|
.table-panel {
|
|
|
padding-bottom: 20px;
|
|
|
|