From a1c2fecb75c9c8fef3345dee6d071faae6d3dccd Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 28 Feb 2023 14:19:37 +0800
Subject: [PATCH] 模型加载的更改
---
src/components/map/index.vue | 12 ++-
src/views/house/index.vue | 132 +++++++++++--------------------------------
2 files changed, 43 insertions(+), 101 deletions(-)
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 74af151..9ed09b0 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2022-08-18 17:00:30
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2023-02-28 10:21:15
+ * @LastEditTime: 2023-02-28 14:16:16
* @FilePath: \srs-police-affairs\src\components\map\index.vue
* @Description: 公用地图组件
*
@@ -507,7 +507,10 @@
* @return {*}
*/
highOrLightChange (type) {
- this.removeMxTileset('sdTilesetLayer')
+ this.removeMxTileset('sdTilesetLayer', this.housingIndent)
+
+ // this.addMxTileset('sdTilesetLayer', `${tile3DUrl}/sf3d/361102/model/wanda/tileset.json`, this.housingIndent)
+
if (this.tilesetLayerType == type) {
this.tilesetLayerType = ''
@@ -533,8 +536,9 @@
* @return {*}
*/
housingIndent (e) {
- console.log(this.$route.path, 456)
- // if(this.$route.path == ' ')
+ if (this.$route.path == '/layout/house') {
+ this.$EventBus.$emit('housingIndent', e)
+ }
},
// 模型的点击事件
diff --git a/src/views/house/index.vue b/src/views/house/index.vue
index 7fe62b3..40e4ecb 100644
--- a/src/views/house/index.vue
+++ b/src/views/house/index.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2022-08-18 16:18:17
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2023-02-28 09:41:08
+ * @LastEditTime: 2023-02-28 13:52:26
* @FilePath: \srs-police-affairs\src\views\house\index.vue
* @Description: 小区-栋-层-房屋
*
@@ -140,9 +140,9 @@
<div class="two">
<div>
<div>98</div>
- <div>户籍人口</div>
- </div>
- <div>
+ <div>户籍人口</div>
+ </div>
+ <div>
<div style="color:#0E88FF">20</div>
<div>流动人口</div>
</div>
@@ -164,17 +164,17 @@
<div>
<div>120</div>
<div>出租</div>
- </div>
- <div>
- <div>160</div>
- <div>自住</div>
- </div>
- <div>
- <div>8</div>
- <div>空置</div>
- </div>
- </div>
- </div>-->
+ </div>
+ <div>
+ <div>160</div>
+ <div>自住</div>
+ </div>
+ <div>
+ <div>8</div>
+ <div>空置</div>
+ </div>
+ </div>
+ </div>-->
<div class="house-element-info" v-if="isShowHouseBox">
<!-- 选择单元 -->
<div class="condo" v-show="isShowUnitChoose">
@@ -219,17 +219,17 @@
<div>
<span class="zizhu"></span>
自住
- </div>
- <div>
- <span class="kongzhi"></span>
- 空置
- </div>
- <div>
- <span class="shangye"></span>
- 商业
- </div>
- </div>
- </div>-->
+ </div>
+ <div>
+ <span class="kongzhi"></span>
+ 空置
+ </div>
+ <div>
+ <span class="shangye"></span>
+ 商业
+ </div>
+ </div>
+ </div>-->
<el-main v-loading="pictLoading" element-loading-background="rgba(17, 38, 163, .1)"
element-loading-text="数据正在加载中" element-loading-spinner="el-icon-loading"
v-show="isShowHouseBox">
@@ -266,8 +266,8 @@
<!-- :class="[{ 'chuzu': value.houseType == '出租' }, { 'zizhu': value.houseType == '自住' }, { 'kongzhi': value.houseType == '空置' }, { 'shangye': value.houseType == '商业' }]" -->
{{ value.properties.fojcu }}
<!-- <div class="flow"></div>
- <div class="focus"></div>
- <div class="warning"></div>-->
+ <div class="focus"></div>
+ <div class="warning"></div>-->
</div>
</div>
</div>
@@ -469,54 +469,6 @@
</template>
<script>
-
-let tile3DUrl = ''
-
-if (process.env.NODE_ENV == 'development') {
- // 开发
- tile3DUrl = window.BASE_URL_CONFIG.VUE_APP_OUTER_NET_TILEURL
-} else {
- // 部署
- tile3DUrl = window.BASE_URL_CONFIG.VUE_APP_INTRANET_TILEURL
-}
-
-let label = [
- '01',
- '02',
- '03',
- '04',
- '05',
- '06',
- '07',
- '08',
- '09',
- '10',
- '11',
- '12',
- '13',
- '14',
- '15',
- '16',
- '17',
- '18',
- '19',
- '20',
- '21',
- '22',
- '23',
- '24',
- '25',
- '26',
- '27',
- '28',
- '29',
- '30',
- '31',
- '32',
- '33',
- '34'
-]
-
let circleLayer = null
let timer = []
@@ -668,6 +620,10 @@
that.housingPoliceSiteClick(params)
})
+ this.$EventBus.$on('housingIndent', (e) => {
+ that.housingIndent(e)
+ })
+
window.addEventListener('resize', this.setTableHeight)
},
@@ -682,23 +638,6 @@
this.searchHouse = this.$route.query.searchName
- // all 轻量
- // all1 高精
-
- label.forEach(item => {
- this.$EventBus.$emit('addMxTileset', {
- titlesetName: 'sdTilesetLayer',
- titlesetUrl: `${tile3DUrl}/sf3d/361102/model/all/${item}/tileset.json`,
- incident: that.getAoiByPtStd
- })
- })
-
- this.$EventBus.$emit('addMxTileset', {
- titlesetName: 'sdTilesetLayer',
- titlesetUrl: `${tile3DUrl}/sf3d/361102/model/wanda/tileset.json`,
- incident: that.getAoiByPtStd
- })
-
if (wallLayer == null) {
wallLayer = new global.DC.VectorLayer('wallLayer')
global.viewer.addLayer(wallLayer)
@@ -710,6 +649,9 @@
},
methods: {
+ housingIndent (e) {
+ this.getAoiByPtStd(e)
+ },
/**
* @description: 顶部搜索条件更改
* @param {*} val
@@ -1512,10 +1454,6 @@
},
destroyed () {
- this.$EventBus.$emit('removeMxTileset', {
- titlesetName: 'sdTilesetLayer'
- })
-
this.$store.commit('SET_DETAILSPOPUP', {
showBox: false,
showBtn: false
--
Gitblit v1.9.3