shuishen
2023-04-07 e2f341b73943753e6ea96cf6d85a09ce070e2ee1
社区、电子沙盘
11 files modified
289 ■■■■ changed files
src/components/map/index.vue 12 ●●●●● patch | view | raw | blame | history
src/styles/base/index.scss 85 ●●●● patch | view | raw | blame | history
src/styles/media/index.scss 34 ●●●●● patch | view | raw | blame | history
src/views/activity/components/policeCarChange.vue 23 ●●●● patch | view | raw | blame | history
src/views/activity/components/policePersonChange.vue 28 ●●●● patch | view | raw | blame | history
src/views/activity/components/polygonPlot.vue 32 ●●●● patch | view | raw | blame | history
src/views/activity/components/polylinePlot.vue 14 ●●●● patch | view | raw | blame | history
src/views/activity/components/twoDrawBtnBox.vue 35 ●●●●● patch | view | raw | blame | history
src/views/activity/index.vue 10 ●●●●● patch | view | raw | blame | history
src/views/home/components/bottomContainer.vue 12 ●●●● patch | view | raw | blame | history
src/views/house/index.vue 4 ●●●● patch | view | raw | blame | history
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-04-06 17:27:53
 * @LastEditTime: 2023-04-06 18:45:53
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 公用地图组件
 * 
@@ -274,8 +274,6 @@
            // })
            // layer.addOverlay(wall)
            // 判断是否支持图像渲染像素化处理
            if (global.DC.Namespace.Cesium.FeatureDetection.supportsImageRenderingPixelated()) {
                global.viewer.setOptions({
@@ -289,7 +287,7 @@
            // global.viewer.addTerrain(terrain)
            // 内网
            that.switchImg()
            // that.switchImg()
            // 外网
            global.viewer.imageryLayers.addImageryProvider(
@@ -615,8 +613,7 @@
         */
        highOrLightChange (type, status = '') {
            this.$EventBus.$emit('showHouseingTileset', {
                curType: this.tilesetLayerType,
                type,
                type: 'remove'
            })
            label.forEach(item => {
@@ -643,8 +640,7 @@
                    })
                this.$EventBus.$emit('showHouseingTileset', {
                    curType: this.tilesetLayerType,
                    type,
                    type: 'add'
                })
            }
        },
src/styles/base/index.scss
@@ -664,8 +664,8 @@
    .el-dialog {
        display: flex;
        flex-direction: column;
        width: 320px;
        height: 220px;
        width: 360px;
        height: 240px;
        .el-dialog__body {
            position: relative;
@@ -676,7 +676,17 @@
                height: 100%;
                top: 0;
                left: 0;
                &>.input-box {
                    margin-bottom: 10px;
                    display: flex;
                    align-items: center;
                    justify-content: center;
                    height: 36px;
                    position: relative;
                }
            }
            .el-button {
                padding: 0;
@@ -699,10 +709,9 @@
        }
        .el-tree {
            height: 100px;
            overflow-y: scroll;
            position: absolute;
            top: 46px;
            height: 100px;
            top: 36px;
            width: calc(100% - 16px);
            background-color: rgba(8, 56, 185, 0.6);
            z-index: 99;
@@ -728,8 +737,6 @@
        .line {
            display: flex;
            justify-content: left;
            position: absolute;
            top: 48px;
        }
        .value-name-box {
@@ -767,8 +774,8 @@
    .el-dialog {
        display: flex;
        flex-direction: column;
        width: 320px;
        height: 180px;
        width: 360px;
        height: 240px;
        .el-dialog__body {
            position: relative;
@@ -779,6 +786,19 @@
                height: 100%;
                top: 0;
                left: 0;
                &>.input-box {
                    margin-bottom: 10px;
                    display: flex;
                    align-items: center;
                    justify-content: center;
                    height: 36px;
                    position: relative;
                    &>div {
                        width: 100%;
                    }
                }
            }
            .el-button {
@@ -803,6 +823,7 @@
        .police-btn-box {
            position: absolute;
            left: 0;
            bottom: 16px;
            width: 100%;
        }
@@ -810,8 +831,6 @@
        .line {
            display: flex;
            justify-content: left;
            position: absolute;
            top: 48px;
        }
        .value-name-box {
@@ -850,8 +869,8 @@
    .el-dialog {
        display: flex;
        flex-direction: column;
        width: 300px;
        height: 190px;
        width: 360px;
        height: 240px;
        .el-dialog__body {
            .el-button {
@@ -920,8 +939,8 @@
    .el-dialog {
        display: flex;
        flex-direction: column;
        width: 320px;
        height: 186px;
        width: 360px;
        height: 240px;
        .el-dialog__body {
            .el-button {
@@ -942,6 +961,22 @@
                display: flex;
                justify-content: left;
                margin-bottom: 10px;
                input {
                    outline: none;
                    width: 80px;
                    height: 28px;
                    background-color: rgba(8, 56, 185, 0.5);
                    border: none;
                    color: #fff;
                    border-radius: 4px;
                    padding-left: 15px;
                }
                input:focus {
                    border-color: #409EFF;
                    border: 1px solid #409EFF;
                }
            }
            .alpha {
@@ -995,8 +1030,8 @@
    .el-dialog {
        display: flex;
        flex-direction: column;
        width: 300px;
        height: 140px;
        width: 360px;
        height: 240px;
        .el-dialog__body {
            .el-button {
@@ -1018,6 +1053,22 @@
                display: flex;
                // justify-content: center;
                margin-bottom: 10px;
                input {
                    outline: none;
                    width: 80px;
                    height: 28px;
                    background-color: rgba(8, 56, 185, 0.5);
                    border: none;
                    color: #fff;
                    border-radius: 4px;
                    padding-left: 15px;
                }
                input:focus {
                    border-color: #409EFF;
                    border: 1px solid #409EFF;
                }
            }
            .value-name-box {
src/styles/media/index.scss
@@ -2267,6 +2267,10 @@
                            &>div {
                                padding: countSizeVh(14);
                                padding-top: 0;
                                &>.input-box {
                                    height: 36px;
                                }
                            }
                        }
@@ -2276,8 +2280,8 @@
                        }
                        .el-dialog {
                            width: countSizeVw(320, 1920);
                            height: countSizeVh(220);
                            width: countSizeVw(360, 1920);
                            height: countSizeVh(240);
                        }
                        .el-dialog .el-dialog__body .el-button {
@@ -2293,7 +2297,7 @@
                        .el-tree {
                            height: countSizeVh(240);
                            top: countSizeVh(46);
                            top: countSizeVh(36);
                            width: calc(100% - countSizeVw(16, 1920));
                        }
@@ -2309,10 +2313,6 @@
                            height: countSizeVh(32);
                            line-height: countSizeVh(32);
                            width: countSizeVw(100, 1920);
                        }
                        .line {
                            top: countSizeVh(52);
                        }
                        .area {
@@ -2351,18 +2351,14 @@
                            bottom: countSizeVh(16);
                        }
                        .line {
                            top: countSizeVh(52);
                        }
                        .el-dialog__header button {
                            font-size: countSizeVh(18);
                            right: countSizeVw(10, 1920);
                        }
                        .el-dialog {
                            width: countSizeVw(320, 1920);
                            height: countSizeVh(220);
                            width: countSizeVw(360, 1920);
                            height: countSizeVh(240);
                        }
                        .el-dialog .el-dialog__body .el-button {
@@ -2394,8 +2390,8 @@
                    .edit-line-box {
                        .el-dialog {
                            width: countSizeVw(300, 1920);
                            height: countSizeVh(190);
                            width: countSizeVw(360, 1920);
                            height: countSizeVh(240);
                            .el-dialog__body {
                                .el-button {
@@ -2437,8 +2433,8 @@
                    .add-polygon-box {
                        .el-dialog {
                            width: countSizeVw(340, 1920);
                            height: countSizeVh(220);
                            width: countSizeVw(360, 1920);
                            height: countSizeVh(240);
                            .el-dialog__body {
                                .el-button {
@@ -2470,8 +2466,8 @@
                    .edit-plot-box {
                        .el-dialog {
                            width: countSizeVw(340, 1920);
                            height: countSizeVh(220);
                            width: countSizeVw(360, 1920);
                            height: countSizeVh(240);
                            .el-dialog__body {
                                .el-button {
src/views/activity/components/policeCarChange.vue
@@ -3,10 +3,19 @@
        <el-dialog title="选择警车" :visible.sync="policeChooseCarVisible" :before-close="cancel" :modal="true"
            :modal-append-to-body="false" :close-on-click-modal="false" class="choose-policeCar-box">
            <div>
                <el-select size="small" v-model="policeType" placeholder="请选择" :disabled="isChoosePoliceElementDisabled">
                    <el-option v-for="item in policeOption" :key="item.value" :label="item.label"
                        :value="item.value"></el-option>
                </el-select>
                <div class="input-box">
                    <el-input size="small" ref="searchTreeInput" v-model="carRemark" placeholder="请输入描述"
                        style="cursor: pointer;"></el-input>
                </div>
                <div class="input-box">
                    <el-select size="small" v-model="policeType" placeholder="请选择"
                        :disabled="isChoosePoliceElementDisabled">
                        <el-option v-for="item in policeOption" :key="item.value" :label="item.label"
                            :value="item.value"></el-option>
                    </el-select>
                </div>
                <div class="line">
                    <div class="value-name-box">选择颜色:</div>
                    <div class="pick-color-box">
@@ -51,6 +60,7 @@
            policeType: '',
            pointAreaWidth: '100',
            chooseCarColor: '',
            carRemark: '',
            policeIconIsCreated: false,
            policeChooseCarVisible: false,
            isChoosePoliceElementDisabled: false,
@@ -87,6 +97,7 @@
            overlayObj = overlay
            this.chooseCarColor = '#FF0000'
            this.policeType = ''
            this.carRemark = ''
            this.policeChooseCarVisible = true
        },
@@ -97,6 +108,7 @@
            this.policeType = e.overlay.attrParams.data.carId
            this.pointAreaWidth = e.overlay.attrParams.data.width != '-1' ? e.overlay.attrParams.data.width : 100
            this.chooseCarColor = e.overlay.attrParams.data.color != '' ? e.overlay.attrParams.data.color : '#FF0000'
            this.carRemark = e.overlay.attrParams.data.remark
            this.policeIconIsCreated = true
            this.policeChooseCarVisible = true
        },
@@ -122,6 +134,7 @@
                        altitude: `${overlayObj.position.alt}`,
                        securityId: this.showingSecurityId,
                        type: 3,
                        remark: this.carRemark,
                        color: this.chooseCarColor,
                        width: this.pointAreaWidth
                    })
@@ -139,7 +152,7 @@
                        type: 'warning'
                    })
                } else {
                    this.$parent.updateActivityCar({ id: this.curElId, carId: this.policeType, color: this.chooseCarColor, width: this.pointAreaWidth }, policeOverlayData.overlay)
                    this.$parent.updateActivityCar({ id: this.curElId, carId: this.policeType, color: this.chooseCarColor, remark: this.carRemark, width: this.pointAreaWidth }, policeOverlayData.overlay)
                    this.policeChooseCarVisible = false
                }
                this.policeIconIsCreated = false
src/views/activity/components/policePersonChange.vue
@@ -3,12 +3,21 @@
        <el-dialog title="选择警员" :visible.sync="policeChooseVisible" :before-close="cancel" :modal="true"
            :modal-append-to-body="false" :close-on-click-modal="false" class="choose-police-box">
            <div>
                <el-input ref="searchTreeInput" v-model="searchPoliceTreeName" @input="searchInputTree"
                    @focus="searchTreeShowFlag = true" @blur="searchTreeShowFlag = false" placeholder="请选择警员"
                    style="cursor: pointer;"></el-input>
                <el-tree :data="policeTreeData" :props="policeDefaultProps" @node-click="handlePoliceNodeClick"
                    @mousedown.native="preventFocusLost" ref="policeTree" :filter-node-method="filterPoliceNode"
                    v-show="searchTreeShowFlag"></el-tree>
                <div class="input-box">
                    <el-input size="small" ref="searchTreeInput" v-model="personRemark" placeholder="请输入描述"
                        style="cursor: pointer;"></el-input>
                </div>
                <div class="input-box">
                    <el-input size="small" ref="searchTreeInput" v-model="searchPoliceTreeName" @input="searchInputTree"
                        @focus="searchTreeShowFlag = true" @blur="searchTreeShowFlag = false" placeholder="请选择警员"
                        style="cursor: pointer;"></el-input>
                    <el-tree :data="policeTreeData" :props="policeDefaultProps" @node-click="handlePoliceNodeClick"
                        @mousedown.native="preventFocusLost" ref="policeTree" :filter-node-method="filterPoliceNode"
                        v-show="searchTreeShowFlag"></el-tree>
                </div>
                <div class="line">
                    <div class="value-name-box">选择颜色:</div>
                    <div class="pick-color-box">
@@ -16,6 +25,7 @@
                        </el-color-picker>
                    </div>
                </div>
                <div class="line area" v-show="false">
                    <div class="value-name-box">预警范围:</div>
                    <div class="width-box">
@@ -25,6 +35,7 @@
                        <div class="units">米</div>
                    </div>
                </div>
                <div class="police-btn-box">
                    <el-button @click="determine" v-show="!isChoosePoliceElementDisabled">确定</el-button>
                    <el-button @click="deletePoliceElement"
@@ -57,6 +68,7 @@
            choosePoliceColor: '',
            searchPoliceTreeId: '',
            searchPoliceTreeName: '',
            personRemark: '',
            policeChooseVisible: false,
            policeIconIsCreated: false,
            searchTreeShowFlag: false,
@@ -93,6 +105,7 @@
            overlayObj = overlay
            this.searchPoliceTreeId = ''
            this.searchPoliceTreeName = ''
            this.personRemark = ''
            this.choosePoliceColor = '#FF0000'
            this.policeChooseVisible = true
        },
@@ -104,6 +117,7 @@
            this.pointAreaWidth = e.overlay.attrParams.data.width != '-1' ? e.overlay.attrParams.data.width : 100
            this.choosePoliceColor = e.overlay.attrParams.data.color != '' ? e.overlay.attrParams.data.color : '#FF0000'
            this.searchPoliceTreeId = e.overlay.attrParams.data.policemanId
            this.personRemark = e.overlay.attrParams.data.remark
            this.searchPoliceTreeName = this.platFn(this.policeTreeData).find(item => item.id == e.overlay.attrParams.data.policemanId).name
            this.policeIconIsCreated = true
            this.policeChooseVisible = true
@@ -183,7 +197,7 @@
                        type: 'warning'
                    })
                } else {
                    this.$parent.updateActivityPolice({ id: this.curElId, policemanId: this.searchPoliceTreeId, color: this.choosePoliceColor, width: this.pointAreaWidth }, policeOverlayData.overlay)
                    this.$parent.updateActivityPolice({ id: this.curElId, policemanId: this.searchPoliceTreeId, color: this.choosePoliceColor, width: this.pointAreaWidth, remark: this.personRemark }, policeOverlayData.overlay)
                    this.policeChooseVisible = false
                }
                this.policeIconIsCreated = false
src/views/activity/components/polygonPlot.vue
@@ -3,20 +3,27 @@
        <el-dialog title="修改标绘" :visible.sync="editPlotVisible" :modal="true" :close-on-click-modal="false"
            :modal-append-to-body="false" class="edit-plot-box">
            <div>
                <div class="value-name-box">描述:</div>
                <div class="input-width-box" style="flex: 1;">
                    <input style="width: 100%;" type="text" v-model="polygonRemark" placeholder="请输入..." />
                </div>
            </div>
            <div>
                <div class="value-name-box">选择标绘颜色:</div>
                <div class="pick-color-box">
                    <el-color-picker v-model="choosePlotColor" :predefine="predefineColors" size="small">
                    </el-color-picker>
                </div>
            </div>
            <div v-show="!polygonName" class="placeholder"></div>
            <div>
                <div class="value-name-box">设置透明度:</div>
                <div class="alpha">
                    <el-slider :min="1" v-model="choosePlotColorAlpha" :format-tooltip="formatTooltip"></el-slider>
                </div>
            </div>
            <div v-show="!polygonName" class="placeholder"></div>
            <div class="edit-plot-btn-box">
                <el-button @click="savePlot">保存</el-button>
                <el-button @click="editPlot">编辑</el-button>
@@ -27,6 +34,13 @@
        <el-dialog title="新增标绘" :visible.sync="polygonAddVisible" :modal="true" :close-on-click-modal="false"
            :modal-append-to-body="false" class="add-polygon-box" :before-close="cancelSavePolygon">
            <div class="line">
                <div class="value-name-box">描述:</div>
                <div class="input-width-box" style="flex: 1;">
                    <input style="width: 100%;" type="text" v-model="polygonRemark" placeholder="请输入..." />
                </div>
            </div>
            <div class="line" v-show="isNeedPolygonType">
                <div class="value-name-box">选择类型:</div>
                <div class="select-type">
@@ -36,6 +50,7 @@
                    </el-select>
                </div>
            </div>
            <div class="line">
                <div class="value-name-box">选择标绘颜色:</div>
                <div class="pick-color-box">
@@ -49,7 +64,7 @@
                    <el-slider :min="1" v-model="choosePlotColorAlpha" :format-tooltip="formatTooltip"></el-slider>
                </div>
            </div>
            <div class="placeholder" v-show="!isNeedPolygonType"></div>
            <div class="add-polygon-btn-box">
                <el-button @click="savePolygonInfo">保存</el-button>
                <el-button @click="cancelSavePolygon">取消</el-button>
@@ -94,6 +109,7 @@
                '#c7158577'
            ],
            choosePlotColor: '#409EFF',
            polygonRemark: '',
            choosePlotColorAlpha: 48,
            polygonAreaType: 1,
            isNeedPolygonType: false,
@@ -133,6 +149,7 @@
            this.isNeedPolygonType = false
            this.choosePlotColor = color
            this.polygonRemark = ''
            this.choosePlotColorAlpha = 100
            this.polygonAddVisible = true
        },
@@ -142,6 +159,7 @@
            polygonPlotData = positions
            this.plotSaveType = type
            this.choosePlotColor = '#409EFF'
            this.polygonRemark = ''
            this.choosePlotColorAlpha = 48
            if (type == 5) {
@@ -158,6 +176,7 @@
        setCurOver (e) {
            plotOverlayData = e
            this.polygonRemark = e.overlay.attrParams.remark
            this.choosePlotColor = e.overlay.attrParams.color != '' ? e.overlay.attrParams.color.slice(0, 7) : '#409EFF'
            this.choosePlotColorAlpha = e.overlay.attrParams.color != '' ? Number(e.overlay.attrParams.color.split(',')[1]) : 100
@@ -225,7 +244,11 @@
        // 保存标绘修改
        savePlot () {
            this.$parent.updateSecurityPlot({ id: plotOverlayData.overlay.attrParams.id, color: this.choosePlotColor + ',' + this.choosePlotColorAlpha }, plotOverlayData.overlay)
            this.$parent.updateSecurityPlot({
                id: plotOverlayData.overlay.attrParams.id,
                color: this.choosePlotColor + ',' + this.choosePlotColorAlpha,
                remark: this.polygonRemark
            }, plotOverlayData.overlay)
            this.editPlotVisible = false
        },
@@ -258,6 +281,7 @@
                position: positionStr,
                type: this.plotSaveType,
                color: this.choosePlotColor + ',' + this.choosePlotColorAlpha,
                remark: this.polygonRemark,
                areaType: this.polygonAreaType,
                altitude: polygonAltArray
            })
src/views/activity/components/polylinePlot.vue
@@ -6,6 +6,12 @@
        <el-dialog :title="lineEditTitle" :visible.sync="lineEditVisible" :modal="true" :close-on-click-modal="false"
            :modal-append-to-body="false" class="edit-line-box" :before-close="cancelSaveLine">
            <div>
                <div class="value-name-box">描述:</div>
                <div class="input-width-box" style="flex: 1;">
                    <input style="width: 100%;" type="text" v-model="lineRemark" placeholder="请输入..." />
                </div>
            </div>
            <div>
                <div class="value-name-box">设置缓冲范围:</div>
                <div class="input-width-box">
                    <input type="text" v-model="lineWidth" placeholder="请输入..." />
@@ -48,6 +54,7 @@
        return {
            lineEditTitle: '修改巡逻路线',
            isLineEdit: true,
            lineRemark: "",
            lineWidth: 100,
            chooseColor: '#1CA085',
            policeIconId: {},
@@ -75,6 +82,7 @@
        addPopupShow (positions, altitude) {
            this.lineEditTitle = '新增巡逻路线'
            this.chooseColor = '#1CA085'
            this.lineRemark = ''
            this.lineWidth = 100
            this.isLineEdit = false
            polygonAltArray = altitude
@@ -94,6 +102,7 @@
            curLinePosition = e.overlay.attrParams.linePositionStr
            curLinePolygonPosition = e.overlay.attrParams.polygonPositionStr
            this.lineRemark = e.overlay.attrParams.remark
            this.lineWidth = e.overlay.attrParams.width != -1 ? e.overlay.attrParams.width : 100
            this.chooseColor = e.overlay.attrParams.color != '' ? e.overlay.attrParams.color : '#1CA085'
            this.policeIconId = e.overlay.attrParams.id
@@ -122,7 +131,7 @@
        // 保存巡逻路线信息
        saveLineInfo () {
            this.$parent.updateActivityCar({ id: this.policeIconId, color: this.chooseColor, width: this.lineWidth }, polylineOverlay.overlay)
            this.$parent.updateActivityCar({ id: this.policeIconId, color: this.chooseColor, width: this.lineWidth, remark: this.lineRemark }, polylineOverlay.overlay)
            this.lineEditVisible = false
        },
@@ -168,7 +177,8 @@
                securityId: this.showingSecurityId,
                type: 1,
                color: this.chooseColor,
                width: this.lineWidth
                width: this.lineWidth,
                remark: this.lineRemark
            })
        },
src/views/activity/components/twoDrawBtnBox.vue
@@ -26,6 +26,41 @@
                    </li>
                </ul>
            </div>
            <div>
                <span>作战标绘:</span>
                <ul>
                    <li>
                        <button @click="drawArrow('attack_arrow', 1)" title="进攻箭头">进攻箭头</button>
                    </li>
                    <li>
                        <button @click="drawArrow('double_arrow', 2)" title="双箭头">双箭头</button>
                    </li>
                    <li>
                        <button @click="drawArrow('fine_arrow', 3)" title="直箭头">直箭头</button>
                    </li>
                    <li>
                        <button @click="drawArrow('tailed_attack_arrow', 4)" title="燕尾箭头">燕尾箭头</button>
                    </li>
                    <li>
                        <button @click="drawThreeArrow('polygon', 'polygon', 'polygon')" title="多边形">多边形</button>
                    </li>
                    <li>
                        <button @click="drawThreeArrow('brokenline', 'brokenline', 'brokenline')" title="折线">折线</button>
                    </li>
                </ul>
            </div>
            <div>
                <span>巡逻路线:</span>
                <ul>
                    <li>
                        <!-- <el-button
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ></el-button>-->
                        <button @click="drawThreeArrow('polyline', 'policecar')" title="巡逻路线">
                            <img src="/img/icon/route1.png" style="height:100%" />
                        </button>
                    </li>
                </ul>
            </div>
        </div>
    </div>
</template>
src/views/activity/index.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-03-24 16:36:55
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-04-06 17:25:00
 * @LastEditTime: 2023-04-07 09:51:28
 * @FilePath: \srs-police-affairs\src\views\activity\index.vue
 * @Description: 
 * 
@@ -434,7 +434,8 @@
    methods: {
        activeDeletePolygon () {
            getSecurityPlotList(this.showingSecurityId).then(res => {
            const securityId = this.showingSecurityId
            getSecurityPlotList(securityId).then(res => {
                // 要素资源
                this.normalPeopleList = res.data.data.filter(item => item.type == 6)
                this.protectedPeopleList = res.data.data.filter(item => item.type == 7)
@@ -451,12 +452,13 @@
        },
        activeDeleteLineOrPoint (type) {
            const securityId = this.showingSecurityId
            if (type == 'policeman') {
                getSecurityPoliceList(this.showingSecurityId).then(res => {
                getSecurityPoliceList(securityId).then(res => {
                    this.chooseActivityPoliceManList = res.data.data.filter(item => item.type == 3)
                })
            } else {
                getSecurityCarList(this.showingSecurityId).then(res => {
                getSecurityCarList(securityId).then(res => {
                    this.chooseActivityPoliceCarList = res.data.data.filter(item => item.type == 3)
                    this.chooseActivityLineList = res.data.data.filter(item => item.type == 1)
                })
src/views/home/components/bottomContainer.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-01-13 15:52:59
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-04-06 17:52:48
 * @LastEditTime: 2023-04-06 18:10:22
 * @FilePath: \srs-police-affairs\src\views\home\components\bottomContainer.vue
 * @Description: 
 * 
@@ -54,7 +54,7 @@
                </ul>
                <!-- <vue-seamless-scroll v-if="policeSituationRealtimeArr.length > 0" :data="policeSituationRealtimeArr"
                                                                                                                                                                                                                                                                    class="warp" :class-option="classOption"> -->
                                                                                                                                                                                                                                                                                    class="warp" :class-option="classOption"> -->
                <div v-if="policeSituationRealtimeArr.length > 0" :data="policeSituationRealtimeArr" class="warp"
                    :class-option="classOption">
                    <el-carousel indicator-position="none" direction="vertical" @change="changeAlarm">
@@ -98,8 +98,8 @@
                    <el-table-column :show-overflow-tooltip="true" prop="BJLX" label="报警类型"></el-table-column>
                    <el-table-column :show-overflow-tooltip="true" prop="position" label="坐标" width="60">
                        <template slot-scope="scope">
                            <el-button v-show="position == '有'" @click.stop="policeSituationClick(scope.row)" type="text"
                                size="small" title="定位">
                            <el-button v-show="scope.row.position == '有'" @click.stop="policeSituationClick(scope.row)"
                                type="text" size="small" title="定位">
                                <i class="el-icon-location" style="color: #1AFA29;"></i>
                            </el-button>
                        </template>
@@ -346,7 +346,7 @@
                        const bjlxText = BjlxData.filter(i => item.BJLX == i.BJLX)[0].VALUE || ''
                        if (item.JJDWMC.indexOf('上饶市公安局') != -1) item.JJDWMC = item.JJDWMC.replace(/上饶市公安局/, '市局')
                        if (item.JJDWMC.indexOf('信州区分局') != -1) item.JJDWMC = item.JJDWMC.replace(/信州区分局/, '')
                        if (item.JJDWMC.indexOf('信州') != -1) item.JJDWMC = item.JJDWMC.replace(/信州/, '')
                        return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB, position: item.ZDDWYZB && item.ZDDWYZB != 0 ? '有' : '无', BJLX: bjlxText }
@@ -483,7 +483,7 @@
                        const bjlxText = BjlxData.filter(i => item.BJLX == i.BJLX)[0].VALUE || ''
                        if (item.JJDWMC.indexOf('上饶市公安局') != -1) item.JJDWMC = item.JJDWMC.replace(/上饶市公安局/, '市局')
                        if (item.JJDWMC.indexOf('信州区分局') != -1) item.JJDWMC = item.JJDWMC.replace(/信州区分局/, '')
                        if (item.JJDWMC.indexOf('信州') != -1) item.JJDWMC = item.JJDWMC.replace(/信州/, '')
                        return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB, position: item.ZDDWYZB && item.ZDDWYZB != 0 ? '有' : '无', BJLX: bjlxText }
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-04-06 17:55:01
 * @LastEditTime: 2023-04-06 18:13:00
 * @FilePath: \srs-police-affairs\src\views\house\index.vue
 * @Description: 小区-栋-层-房屋
 * 
@@ -633,7 +633,7 @@
        },
        showHouseingTileset (params) {
            if (params.curType == params.type) {
            if (params.type == 'remove') {
                this.$EventBus.$emit('unbindMxClick', this.getAoiByPtStd)
            } else {
                this.$EventBus.$emit('registerMxClick', this.getAoiByPtStd)