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

guanqb

2023-02-09 8909a6c2c4fe707c4f5337157c64006b85e0f02d

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

 src/views/home/components/rightContainer.vue

@@ -419,9 +419,9 @@
                        return {
                            equimentType: item.type == '车辆' ? 0 : 1,
                            name: item.type,
                            value: item.count,
                            working: item.online,
                            fault: item.offline,
                            value: Number(item.count),
                            working: Number(item.online),
                            fault: Number(item.offline),
                            label: twoColor[index]
                        }
                    })

 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-02-06 10:35:26
 * @LastEditTime: 2023-02-08 17:15:57
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 *
@@ -35,7 +35,7 @@
            </div>
            <!-- <div class="layers-control-btn moitor">
                <el-checkbox v-model="monitoringLayerShow" @change="monitoringChange">监控</el-checkbox>
            </div>-->
            </div> -->
            <!-- <div class="layers-control-btn panorama">
                <el-checkbox v-model="panoramaLayerShow" @change="panoramaChange">全景</el-checkbox>
            </div>-->
@@ -901,7 +901,6 @@
            if (e == true) {
                if (this.cameraList.length > 0) {
                    this.cameraList.forEach(item => {

                        if (item.longitude && item.latitude) {
                            this.$EventBus.$emit('layerPointAdd', {
                                layerName: 'cameraLayers',
@@ -914,7 +913,7 @@
                                    alt: 100,
                                    url: '/img/icon/camera.png'
                                },
                                incident: this.phoneSiteClick
                                incident: this.siteClick
                            })
                        }

@@ -1020,7 +1019,8 @@

        siteClick (e) {
            this.dialogEquimentVideoTitle = e.overlay.attrParams.name
            this.dialogEquimentVideoVisible = true

            this.play(e.overlay.attrParams)
        },

        dialogBeforeClose () {
@@ -1121,7 +1121,6 @@
                }
            })
        },


        multPolyganToList (data) {
            let ployganStringList = []