Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

guanqb

2023-03-16 cf91030254f2a155778f4411143df06b57df186e

Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

 public/static/config.js

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-02-21 14:16:56
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-03-06 10:22:12
 * @LastEditTime: 2023-03-16 09:35:36
 * @FilePath: \srs-police-affairs\public\static\config.js
 * @Description: 
 * 
@@ -41,7 +41,6 @@
    VUE_APP_INTRANET_HTURL: 'http://10.141.11.11:8081/#/',

    // 栅格地图的
    // VUE_APP_MAP_YX: 'http://10.141.11.11:80/ysapi',
    VUE_APP_MAP_YX: 'http://10.141.11.11:80/data/dom',
    VUE_APP_MAP_YX: 'http://10.141.11.11:80/ysapi',
    VUE_APP_MAP_SL: 'http://10.141.11.11:80/slapi',
}

 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-03-15 11:44:38
 * @LastEditTime: 2023-03-15 16:24:05
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 公用地图组件
 * 
@@ -561,11 +561,10 @@
                this.removeMxTileset(`sdTilesetLayer${item}`, this.housingIndent)
            })

            this.addMxTileset('sdTilesetLayer', `${tile3DUrl}/sf3d/361102/model/wanda/tileset.json`, this.housingIndent)
            // this.addMxTileset('sdTilesetLayer', `${tile3DUrl}/sf3d/361102/model/wanda/tileset.json`, this.housingIndent)

            if (this.tilesetLayerType == type) {
                this.tilesetLayerType = ''

            } else {
                this.tilesetLayerType = type

@@ -607,6 +606,7 @@
            baseLayers = global.viewer.imageryLayers.addImageryProvider(
                new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
                    url: `${window.BASE_URL_CONFIG.VUE_APP_MAP_YX}/{z}/{x}/{y}.png`,
                    minimumLevel: 0
                })
            )


 src/views/home/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-03-14 16:48:21
 * @LastEditTime: 2023-03-16 09:34:42
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 *
@@ -1025,7 +1025,7 @@
            if (e == true) {
                this.$EventBus.$emit('layerShow', {
                    layerName: 'carLayers',
                    flag: false
                    flag: true
                })
            } else {
                this.$EventBus.$emit('layerShow', {