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

@ -82,7 +82,7 @@ import myMap from "@/components/XyMap"
Vue.component('my-map',myMap)
import afTableColumn from 'af-table-column'
Vue.use(afTableColumn,{
fontSize: 16
fontSize: 14
})
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 {
font-size: 16px!important;
}

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

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

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

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

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

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

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

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

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

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

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

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

Loading…
Cancel
Save