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

guanqb

2023-02-15 ee16b656bff2ba6f8b78d68915b7b0c624fa5643

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

 src/components/map/components/mapPopup.vue

@@ -20,7 +20,7 @@
                                    </div>
                                    <div class="close" @click="closePopup" title="关闭"></div>
                                </div>
                                <div class="change-btn" v-show="showBtn">
                                <div class="change-btn" v-show="detailsPopup.showBtn">
                                    <div
                                        @click="currentBtn = '接警信息'"
                                        :class="{ on: currentBtn == '接警信息' }"
@@ -153,6 +153,16 @@
        ])
    },

    watch: {
        detailsPopup: {
            handler (newData, oldData) {
                if (newData.showBox == false) {
                    this.currentBtn = '接警信息'
                }
            }
        }
    },

    mounted () {

        if (this.getWidth() > 7000) {

 src/styles/media/index.scss

@@ -1,4 +1,4 @@
@media screen and (min-width: 1920px) {
@media screen and (max-height: 9000px) {

    html,
    body {
@@ -2602,107 +2602,6 @@

        .el-table__body-wrapper {
            height: calc(100% - countSizeVh(36)) !important;
        }
    }

}

@media screen and (max-height: 975px) {
    .left-container {
        .mypath {
            transform-origin: top;
            transform: scale(1.1, 1);
        }
    }
}

@media screen and (min-width: 7296px) {

    html,
    body {
        font-size: countSizeVh(16) !important;

        #app {

            .wrapper {
                width: 100vw;
                height: 100%;

                .main-header {
                    width: 100vw;
                    height: maxCountSizeVh(60);

                    .user-infor {
                        width: maxCountSizeVh(60);
                        height: maxCountSizeVh(60);
                        line-height: maxCountSizeVh(60);
                        font-size: 2.16vh;
                    }
                }

                .main-content {

                    .left-container,
                    .right-container {
                        top: maxCountSizeVh(60);
                        width: countSizeVw(1520, 7296);
                        height: calc(100% - maxCountSizeVh(60));

                        .person-box,
                        .land-box,
                        .case-box,
                        .crowd-box {
                            height: maxCountSizeVh(320);
                        }


                        .person-box,
                        .house-box,
                        .land-box,
                        .case-box,
                        .alert-box,
                        .crowd-box {


                            .title {
                                height: 17.6%;
                            }

                            .sub-title {
                                line-height: maxCountSizeVh(36);
                            }

                            .sub-tab {
                                padding: maxCountSizeVh(10);

                                .tab {

                                    &>div {
                                        height: maxCountSizeVh(22);
                                        line-height: maxCountSizeVh(22);
                                    }
                                }
                            }
                        }

                        .person-box {
                            .back {
                                top: maxCountSizeVh(102);
                            }
                        }
                    }

                    .bottom-container {
                        left: countSizeVw(1520, 7296);
                        width: calc(100% - countSizeVw(1520, 7296) * 2);
                        height: calc((100% - maxCountSizeVh(60)) / 3);
                    }

                    .region-select {
                        top: maxCountSizeVh(80);
                    }
                }
            }
        }
    }


 src/views/activity/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-13 10:11:42
 * @LastEditTime: 2023-02-14 15:28:15
 * @FilePath: \srs-police-affairs\src\views\activity\index.vue
 * @Description: 安保活动
 *
@@ -1224,6 +1224,24 @@
                layerName: 'newDrawLayers',
                type: 'VectorLayer'
            })

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

            if (item.activityArea && item.activityArea.length > 0) {
                let polyGonData = item.activityArea.slice(11, item.activityArea.length - 1)
                polyGonData = polyGonData.replace(/,/g, ";")
                polyGonData = polyGonData.replace(/ /g, ",")

                this.$EventBus.$emit('layerPolygonAdd', {
                    layerName: 'polygonLayer',
                    positions: polyGonData,
                    material: global.DC.Namespace.Cesium.Color.fromBytes(139, 195, 74, 100)
                })
            }

            this.getSecurityPoliceList(item.id, this.policeSwitch)
            this.getSecurityCarList(item.id, this.policeSwitch, this.polylineBtnSwitch)
            this.getSecurityPlotList(item.id, this.arrowBtnSwitch)
@@ -1932,6 +1950,11 @@
            type: 'VectorLayer'
        })

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

        analyseLayer.clear()
        arrowsListLayer.clear()


 src/views/home/components/rightContainer.vue

@@ -702,7 +702,7 @@
        clickEquimentChart () {
            equipmentmyChart.on('click', params => {
                // 设备类型，摄像头弹窗显示，其他弹窗显示，【记录仪列显示，警车列显示，手台列显示】，遍历数组
                if (params.data.equimentType) {
                if ('equimentType' in params.data) {
                    this.$emit('showequimentdetail', params.data.name, params.data.equimentType, 'type')
                } else {
                    this.$emit('showequimentdetail', params.data.name, params.data.online, 'online')

 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-13 09:58:57
 * @LastEditTime: 2023-02-14 10:29:23
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 *
@@ -1959,6 +1959,11 @@
    },

    destroyed () {
        this.$store.commit('SET_DETAILSPOPUP', {
            showBox: false,
            showBtn: false
        })

        this.$EventBus.$emit('mapRemoveLayer', {
            layerName: 'polygonLayer',
            type: 'VectorLayer'

 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-10 16:12:13
 * @LastEditTime: 2023-02-14 10:29:36
 * @FilePath: \srs-police-affairs\src\views\house\index.vue
 * @Description: 小区-栋-层-房屋
 * 
@@ -1534,6 +1534,10 @@
        // this.$EventBus.$emit('removeMxTileset', {
        //     titlesetName: 'sdTilesetLayer'
        // })
        this.$store.commit('SET_DETAILSPOPUP', {
            showBox: false,
            showBtn: false
        })

        this.$parent.$parent.resize('0px')
        this.$EventBus.$emit('mapClearLayer', {

 src/views/layout/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:24
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-02-09 16:50:28
 * @LastEditTime: 2023-02-14 10:55:48
 * @FilePath: \srs-police-affairs\src\views\layout\index.vue
 * @Description: 
 * 
@@ -167,14 +167,6 @@
                {
                    menuName: '安保活动',
                    path: '/layout/activity'
                },
                {
                    menuName: '运维管理',
                    openExternal: true,
                    // 内网
                    path: 'http://10.141.11.11:8081/#/security/security'
                    // 外网
                    // path: 'http://192.168.0.109:1888/#/security/security'
                }
            ],

@@ -196,6 +188,17 @@
    created () {
        this.currentUrl = this.$route.path
        this.init()

        if (JSON.parse(getUserInfo()).dept_id == '1123598813738675201') {
            this.menuRightList.push({
                menuName: '运维管理',
                openExternal: true,
                // 内网
                path: 'http://10.141.11.11:8081/#/security/security'
                // 外网
                // path: 'http://192.168.0.109:1888/#/security/security'
            })
        }
    },

    watch: {