From 6f65ecb0451eda10a8bfa48cd2a98ee4cba2a0fb Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Sat, 01 Apr 2023 14:43:41 +0800
Subject: [PATCH] 1
---
vue.config.js | 4 ++--
src/components/map/index.vue | 2 +-
src/views/home/components/rightContainer.vue | 1 -
src/views/home/components/leftContainer.vue | 24 ++++++++++++++++--------
4 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 046f88a..7b2ce6d 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -438,7 +438,7 @@
// global.viewer.scene.morphTo2D(1)
// 清除控制台
- console.clear()
+ // console.clear()
function isEleFullScreen () {
const fullScreenEle =
diff --git a/src/views/home/components/leftContainer.vue b/src/views/home/components/leftContainer.vue
index 51d4845..e1117b3 100644
--- a/src/views/home/components/leftContainer.vue
+++ b/src/views/home/components/leftContainer.vue
@@ -45,10 +45,10 @@
<defs>
<path id="border-box-8-path-974b4d7cfafa444396861ca1d1173c8c"
d="M0.27,0.03c52.66,0,105.34,0,158,0c1.67,2,3.33,4,5,6c1,0.33,2,0.67,3,1c1.33,1.67,2.67,3.33,4,5
- c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
- c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
- c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
- c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
+ c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
+ c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
+ c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
+ c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
fill="transparent" />
<radialGradient id="border-box-8-gradient-974b4d7cfafa444396861ca1d1173c8c" cx="50%" cy="50%" r="50%">
<stop offset="0%" stop-color="#fff" stop-opacity="1" />
@@ -58,10 +58,10 @@
<circle cx="0" cy="0" r="150" fill="url(#border-box-8-gradient-974b4d7cfafa444396861ca1d1173c8c)">
<animateMotion dur="8s"
path="M0.27,0.03c52.66,0,105.34,0,158,0c1.67,2,3.33,4,5,6c1,0.33,2,0.67,3,1c1.33,1.67,2.67,3.33,4,5
- c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
- c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
- c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
- c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
+ c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
+ c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
+ c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
+ c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
rotate="auto" repeatCount="indefinite" />
</circle>
</mask>
@@ -686,6 +686,14 @@
},
houseTabClick (type) {
+ this.tabTypeTwo = type
+
+ this.disposeHouseEchart()
+ if (type == 0) {
+ this.getHouseStatisticInfo(2)
+ } else {
+ this.getHouseStatisticInfo(1)
+ }
},
initLandOptions (xDate, yDate) {
diff --git a/src/views/home/components/rightContainer.vue b/src/views/home/components/rightContainer.vue
index 729487d..53b2e20 100644
--- a/src/views/home/components/rightContainer.vue
+++ b/src/views/home/components/rightContainer.vue
@@ -303,7 +303,6 @@
})]
})
-
this.$nextTick(() => {
this.tableHeight =
this.$refs.Container.offsetHeight -
diff --git a/vue.config.js b/vue.config.js
index ec9184f..e050350 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -161,8 +161,8 @@
proxy: {
"/api": {
// target用于配置你允许访问数据的计算机名称，即是你的api接口的服务器地址
- target: "http://localhost:82",
- // target: "http://192.168.0.100:82",
+ // target: "http://localhost:82",
+ target: "http://192.168.0.100:82",
// target: "http://17.20.10.3:82",
// target: "http://10.141.11.11:8081/api",
// ws: true, //启用webSocket6566
--
Gitblit v1.9.3