master
xy 2 years ago
parent 86802158e9
commit 3ada773d19

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 37 KiB

File diff suppressed because one or more lines are too long

@ -1,9 +1,9 @@
<template> <template>
<div class="navbar"> <div class="navbar">
<img class="navbar-bkg" :src="require('@/assets/navbar-bkg.png')" alt=""> <img class="navbar-bkg" :src="require('@/assets/navbar-bkg.png')" alt="">
<div class="logo-mini"> <!-- <div class="logo-mini">-->
<img :src="require('@/assets/logo-mini.png')" alt=""> <!-- <img :src="require('@/assets/logo-mini.png')" alt="">-->
</div> <!-- </div>-->
<div class="logo"> <div class="logo">
<img :src="require('@/assets/logo1.png')" alt=""> <img :src="require('@/assets/logo1.png')" alt="">
</div> </div>
@ -106,10 +106,10 @@
display: flex; display: flex;
float: left; float: left;
align-items: center; align-items: center;
margin-left: 23px; //margin-left: 23px;
& > img { & > img {
height: 33%; height: 64%;
} }
} }
.hamburger-container { .hamburger-container {

@ -82,7 +82,7 @@ import myMap from "@/components/XyMap"
Vue.component('my-map',myMap) Vue.component('my-map',myMap)
import afTableColumn from 'af-table-column' import afTableColumn from 'af-table-column'
Vue.use(afTableColumn,{ Vue.use(afTableColumn,{
fontSize: 16 fontSize: 14
}) })
Vue.prototype.$integrateData = (target,value) => { Vue.prototype.$integrateData = (target,value) => {

@ -91,5 +91,5 @@
} }
.el-menu-item,.el-submenu__title,.el-table,.el-descriptions,.v-table .el-table__header th,.el-form-item__label,.el-input { .el-menu-item,.el-submenu__title,.el-table,.el-descriptions,.v-table .el-table__header th,.el-form-item__label,.el-input {
font-size: 16px!important;
} }

@ -559,13 +559,11 @@ export default {
data() { data() {
return { return {
wxAreas: [ wxAreas: [
"宜兴市", "‌姑苏区",
"惠山区", "虎丘区",
"新吴区", "吴中区",
"梁溪区", "相城区",
"江阴市", "吴江区",
"滨湖区",
"锡山区",
], ],
customForm: { customForm: {
customFormId: "", customFormId: "",

@ -59,13 +59,7 @@ export default {
width: 80, width: 80,
formatter: (data, row, value) => { formatter: (data, row, value) => {
let map = new Map([ let map = new Map([
[1, "宜兴市"], [1, "泸县"],
[2, "惠山区"],
[3, "新吴区"],
[4, "梁溪区"],
[5, "江阴市"],
[6, "滨湖区"],
[7, "锡山区"],
]); ]);
return map.get(value); return map.get(value);
}, },

@ -91,13 +91,11 @@ export default {
data() { data() {
return { return {
wxAreas: [ wxAreas: [
"宜兴市", "‌姑苏区",
"惠山区", "虎丘区",
"新吴区", "吴中区",
"梁溪区", "相城区",
"江阴市", "吴江区",
"滨湖区",
"锡山区",
], ],
codeUri: "", codeUri: "",
showModal: false, showModal: false,

@ -617,13 +617,11 @@ export default {
data() { data() {
return { return {
wxAreas: [ wxAreas: [
"宜兴市", "‌姑苏区",
"惠山区", "虎丘区",
"新吴区", "吴中区",
"梁溪区", "相城区",
"江阴市", "吴江区",
"滨湖区",
"锡山区",
], ],
customForm: { customForm: {
customFormId: "", customFormId: "",

@ -333,7 +333,7 @@ export default {
table: [], table: [],
list: [], list: [],
mapHeight: 0, mapHeight: 0,
center: [120.283692, 31.614211], center: [121.160530, 31.299468],
isShowInfoWindow: false, isShowInfoWindow: false,
openData: {}, openData: {},
infoWindow: null, infoWindow: null,
@ -342,13 +342,11 @@ export default {
polygons: [], polygons: [],
markerList: [], markerList: [],
wxAreas: [ wxAreas: [
"宜兴市", "‌姑苏区",
"惠山区", "虎丘区",
"新吴区", "吴中区",
"梁溪区", "相城区",
"江阴市", "吴江区",
"滨湖区",
"锡山区",
], ],
units: new Map([ units: new Map([
["dengjimianji", "m²"], ["dengjimianji", "m²"],
@ -493,7 +491,7 @@ export default {
this.addCluster(); this.addCluster();
}, },
init(adcode = ["320200"]) { init(adcode = ["320500","510500"]) {
let winHeight = document let winHeight = document
.querySelector("#app") .querySelector("#app")
?.getBoundingClientRect()?.height; ?.getBoundingClientRect()?.height;
@ -531,31 +529,33 @@ export default {
let district = new AMap.DistrictSearch(opts); let district = new AMap.DistrictSearch(opts);
district.setLevel("district"); district.setLevel("district");
// //
district.search(`${adcode}`, (status, result) => { //
// this.map.remove(this.polygons);
this.map.remove(this.polygons); this.polygons = [];
this.polygons = []; adcode.forEach(i => {
// district.search(`${i}`, (status, result) => {
let bounds = result.districtList[0]?.boundaries; //
if (bounds) { let bounds = result.districtList[0]?.boundaries;
for (let i = 0, l = bounds.length; i < l; i++) { if (bounds) {
// polygon for (let i = 0, l = bounds.length; i < l; i++) {
let polygon = new AMap.Polygon({ // polygon
map: this.map, let polygon = new AMap.Polygon({
strokeWeight: 1, map: this.map,
path: bounds[i], strokeWeight: 1,
fillOpacity: 0.2, path: bounds[i],
fillColor: "#3579c788", fillOpacity: 0.2,
strokeColor: "#3579c7", fillColor: "#3579c788",
}); strokeColor: "#3579c7",
polygon.on('click',e => { });
console.log('polygon',e) polygon.on('click',e => {
}) console.log('polygon',e)
this.polygons.push(polygon); })
this.map.setFitView(polygon); this.polygons.push(polygon);
this.map.setFitView(polygon);
}
} }
} });
}); })
}); });
}, },

@ -10,7 +10,7 @@
import Vue from 'vue' import Vue from 'vue'
import * as echarts from 'echarts' import * as echarts from 'echarts'
import 'echarts-gl' import 'echarts-gl'
import WUXI from '@/assets/wuxi.json' import SUZHOU from '@/assets/suzhou.json'
import tooltip from './tooltip.vue' import tooltip from './tooltip.vue'
export default { export default {
@ -20,13 +20,11 @@ export default {
data() { data() {
return { return {
areas: new Map([ areas: new Map([
[1,"宜兴市"], [1,"‌姑苏区"],
[2,"惠山区"], [2,"虎丘区"],
[3,"新吴区"], [3,"吴中区"],
[4,"梁溪区"], [4,"相城区"],
[5,"江阴市"], [5,"吴江区"],
[6,"滨湖区"],
[7,"锡山区"]
]), ]),
chart: "", chart: "",
label: { label: {
@ -66,7 +64,7 @@ export default {
methods: { methods: {
initMap () { initMap () {
echarts.registerMap("wuxi", WUXI); echarts.registerMap("suzhou", SUZHOU);
this.chart = echarts.init(document.querySelector("#map")) this.chart = echarts.init(document.querySelector("#map"))
this.setOption() this.setOption()
this.chart.on("click", params => { this.chart.on("click", params => {
@ -99,8 +97,8 @@ export default {
// }, // },
series: [{ series: [{
type: 'map3D', // mapmap3D type: 'map3D', // mapmap3D
map: 'wuxi', // map: 'suzhou', //
name: "无锡", name: "苏州",
label: { label: {
// //
show: false, // () [ default: false ] show: false, // () [ default: false ]
@ -156,7 +154,7 @@ export default {
}, },
},{ },{
zlevel: 20, zlevel: 20,
map: 'wuxi', map: 'suzhou',
type: "map3D", type: "map3D",
regionHeight: 2, regionHeight: 2,
itemStyle: { itemStyle: {
@ -194,7 +192,7 @@ export default {
// find.originalData.push(item) // find.originalData.push(item)
// } // }
// }) // })
lands.forEach(item => { houses.forEach(item => {
let find = temp.find(v => v.tag === item.area) let find = temp.find(v => v.tag === item.area)
if (find) { if (find) {
find.value++; find.value++;

@ -559,13 +559,11 @@ export default {
data() { data() {
return { return {
wxAreas: [ wxAreas: [
"宜兴市", "‌姑苏区",
"惠山区", "虎丘区",
"新吴区", "吴中区",
"梁溪区", "相城区",
"江阴市", "吴江区",
"滨湖区",
"锡山区",
], ],
nowAssets: [], nowAssets: [],
houseDialog: false, houseDialog: false,

@ -382,13 +382,11 @@ export default {
data() { data() {
return { return {
wxAreas: [ wxAreas: [
"宜兴市", "‌姑苏区",
"惠山区", "虎丘区",
"新吴区", "吴中区",
"梁溪区", "相城区",
"江阴市", "吴江区",
"滨湖区",
"锡山区",
], ],
isShowOldData: true, isShowOldData: true,
nowAssets: [], nowAssets: [],

@ -956,13 +956,11 @@ export default {
data() { data() {
return { return {
wxAreas: [ wxAreas: [
"宜兴市", "‌姑苏区",
"惠山区", "虎丘区",
"新吴区", "吴中区",
"梁溪区", "相城区",
"江阴市", "吴江区",
"滨湖区",
"锡山区",
], ],
isShowOldData: true, isShowOldData: true,
nowAssets: [], nowAssets: [],

@ -269,9 +269,8 @@
left: 10.2%; left: 10.2%;
} }
.title-img { .title-img {
opacity: 0;
display: block; display: block;
height: 8vh; width: 14vw;
object-fit: contain; object-fit: contain;
margin: 16.11vh auto 0; margin: 16.11vh auto 0;
} }

@ -34,13 +34,11 @@ export default {
data() { data() {
return { return {
wxAreas: [ wxAreas: [
"宜兴市", "‌姑苏区",
"惠山区", "虎丘区",
"新吴区", "吴中区",
"梁溪区", "相城区",
"江阴市", "吴江区",
"滨湖区",
"锡山区",
], ],
chart: null, chart: null,
data: { houseList:[], landList:[] }, data: { houseList:[], landList:[] },

@ -202,13 +202,11 @@ export default {
spanArr1: [], spanArr1: [],
pos1: 0, pos1: 0,
areas: new Map([ areas: new Map([
[1,"宜兴市"], [1,"‌姑苏区"],
[2,"惠山区"], [2,"虎丘区"],
[3,"新吴区"], [3,"吴中区"],
[4,"梁溪区"], [4,"相城区"],
[5,"江阴市"], [5,"吴江区"],
[6,"滨湖区"],
[7,"锡山区"]
]) ])
} }
}, },

Loading…
Cancel
Save