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

guanqb

2022-10-25 a375248c491d36b8ff2c6728038c08e1a3bf7283

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

 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: 2022-10-24 16:40:25
 * @LastEditTime: 2022-10-25 15:17:44
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 * 
@@ -179,6 +179,9 @@
            <div class="layers-control-btn panorama">
                <el-checkbox v-model="panoramaLayerShow" @change="panoramaChange">全景</el-checkbox>
            </div>
            <div class="layers-control-btn activity">
                <el-checkbox v-model="activityLayerShow" @change="activityChange">活动</el-checkbox>
            </div>
        </div>

        <div class="bottom-container">
@@ -277,6 +280,24 @@
            :modal="true"
            :visible.sync="panoramaVisible"
            :before-close="panoramaBeforeClose"
            :close-on-click-modal="true"
        >
            <div
                style="display: flex; align-items: center; justify-content: center; width: 100%; height: 480px;"
            >
                <iframe
                    src="http://vr.jxpskj.com/JXSFKZQJ/QJ/"
                    style="width: 100%; height: 100%;"
                    frameborder="0"
                ></iframe>
            </div>
        </el-dialog>

        <el-dialog
            :title="activityTitle"
            :modal="true"
            :visible.sync="activityVisible"
            :before-close="activityBeforeClose"
            :close-on-click-modal="true"
        >
            <div
@@ -480,11 +501,14 @@
            phoneLayerShow: false,
            monitoringLayerShow: false,
            panoramaLayerShow: false,
            activityLayerShow: false,
            dialogTitle: '',
            dialogVisible: false,
            panoramaTitle: '',
            activityTitle: '',
            equimentTitle: '',
            panoramaVisible: false,
            activityVisible: false,
            equimentVisible: false,
            phoneDetails: {},
            phoneTitle: '',
@@ -501,6 +525,13 @@
                lat: 28.677213,
                alt: 100,
                url: '/img/icon/map-panorama.png'
            }],
            activityList: [{
                name: '1号活动',
                lng: 116.094171,
                lat: 28.621832,
                alt: 100,
                url: '/img/icon/activity.png'
            }],
            underwayArr: [
                { 'activityName': '进行活动1', 'startTime': '2022-10-01', 'endTime': '2022-10-02', 'scale': '1000' },
@@ -1292,6 +1323,24 @@
            }
        },

        activityChange (e) {
            if (e == true) {
                this.activityList.forEach(item => {
                    this.$EventBus.$emit('layerPointAdd', {
                        layerName: 'activityLayers',
                        type: "billboard",
                        params: item,
                        incident: this.activitySiteClick
                    })
                })
            } else {
                this.$EventBus.$emit('mapClearLayer', {
                    layerName: 'activityLayers',
                    type: 'VectorLayer'
                })
            }
        },

        siteClick (e) {
            this.dialogTitle = e.overlay.attrParams.name
            this.dialogVisible = true
@@ -1312,6 +1361,11 @@
            this.panoramaVisible = true
        },

        activitySiteClick (e) {
            // this.activityTitle = e.overlay.attrParams.name
            // this.activityVisible = true
        },

        phoneSiteClick (e) {
            this.phoneTitle = e.overlay.attrParams.name
            this.phoneDetails = e.overlay.attrParams
@@ -1328,6 +1382,10 @@

        panoramaBeforeClose () {
            this.panoramaVisible = false
        },

        activityBeforeClose () {
            this.activityVisible = false
        },

        equimentBeforeClose () {
@@ -1763,6 +1821,11 @@
            type: 'VectorLayer'
        })

        this.$EventBus.$emit('mapClearLayer', {
            layerName: 'activityLayers',
            type: 'VectorLayer'
        })

        cylinderLayer.clear()
        cylinderLayer.remove()
        cylinderLayer = null
@@ -2039,6 +2102,20 @@
                }
            }
        }

        .activity {
            :deep(.el-checkbox__inner) {
                background: rgb(251, 222, 201);
                border-color: rgb(251, 222, 201);
            }

            :deep(.is-checked) {
                .el-checkbox__inner {
                    background: rgb(241, 145, 73);
                    border-color: rgb(241, 145, 73);
                }
            }
        }
    }

    .bottom-container {