Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-aff...

guanqb

2023-04-06 6e6cd42b8c87190a32326f34fc924668b59896c1

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-affairs

 public/icons/Government.png

 public/icons/activity.png

 public/icons/airport.png

 public/icons/arrow.png

 public/icons/bank.png

 public/icons/bhdx.png

 public/icons/bubble.png

 public/icons/business.png

 public/icons/camera.png

 public/icons/car-btn.png

 public/icons/car.png

 public/icons/car3.png

 public/icons/clear.png

 public/icons/comeOut.png

 public/icons/del.png

 public/icons/dt.png

 public/icons/end.png

 public/icons/end1.png

 public/icons/hotel.png

 public/icons/house.png

 public/icons/icon1.png

 public/icons/icon2.png

 public/icons/icon3.png

 public/icons/jq.png

 public/icons/keypeople.png

 public/icons/kindergarten.png

 public/icons/location.png

 public/icons/lockpick-shop.png

 public/icons/man3.png

 public/icons/map-panorama.png

 public/icons/metal.png

 public/icons/monitor.png

 public/icons/orgin.png

 public/icons/orgin1.png

 public/icons/overlook.png

 public/icons/p-b-camera.png

 public/icons/p-b-talk.png

 public/icons/p-biao.png

 public/icons/p-talk.png

 public/icons/pCar.png

 public/icons/pPhone.png

 public/icons/park.png

 public/icons/phone.png

 public/icons/police-people-btn.png

 public/icons/police-people.png

 public/icons/police.png

 public/icons/position.png

 public/icons/printing.png

 public/icons/ptqz.png

 public/icons/real-car-ok.png

 public/icons/real-car.png

 public/icons/real-phone-ok.png

 public/icons/real-phone.png

 public/icons/real-public-recorder-ok.png

 public/icons/real-public-recorder.png

 public/icons/real-recorder-ok.png

 public/icons/recorder.png

 public/icons/route.png

 public/icons/route1.png

 public/icons/school.png

 public/icons/supermarket.png

 public/icons/user-back.png

 public/icons/user-quit.png

 public/icons/video-off.png

 public/icons/video.png

 public/icons/wxrw.png

 public/icons/zf.png

 public/img/icon/video-off.png

 public/img/icon/video.png

 src/components/assemble/index.vue

@@ -10,8 +10,8 @@
-->
<template>
    <div>
        <el-dialog :title="dialogTile" :modal="true" :visible.sync="dialogVisible" :before-close="beforClose"
            :close-on-click-modal="true" class="equiment-details-box-two">
        <el-dialog :title="dialogTile" :visible.sync="dialogVisible" :before-close="beforClose" :modal="true"
            :close-on-click-modal="false" class="equiment-details-box-two">
            <div class="header">
                <div>
                    设备名称：
@@ -22,7 +22,7 @@
                <el-button type="primary" icon="el-icon-delete" @click="clearSearchEquiment">清空</el-button>
            </div>
            <el-main v-loading="equimentLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                element-loading-background="rgba(0, 0, 0, 0.2)">
                element-loading-background="rgba(0, 0, 0, 0.5)">
                <el-table :data="currentData" style="width: 100%"
                    :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                    :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }" v-show="!equimentLoading">

 src/components/imagesSelect/index.vue

@@ -2,14 +2,14 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-04-04 16:24:42
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-04-04 18:28:44
 * @LastEditTime: 2023-04-06 10:37:52
 * @FilePath: \srs-police-affairs\src\components\imagesSelect\index.vue
 * @Description: 
 * 
 * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved. 
-->
<template>
    <div class="container">
    <div class="container" v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.5)">
        <div v-for="(item, index) in imageUrls" :key="index" @click.stop="curImgClick(item)">
            <div class="content">
                <img :src="item.url" alt="">
@@ -28,7 +28,8 @@

    data () {
        return {
            imageUrls: []
            imageUrls: [],
            loading: false
        }
    },

@@ -38,17 +39,15 @@

    methods: {
        requireImage () {
            axios.get('/images').then(res => {
            axios.get('/icons').then(res => {
                res.data.forEach(item => {
                    this.imageUrls.push({
                        url: `/images/${item}`,
                        url: `/icons/${item}`,
                        name: item.substring(0, item.length - 4)
                    })


                })

                console.log(this.imageUrls, 4555)
                this.loading = false
            })
        },

@@ -65,21 +64,33 @@
    // left: 0;
    // bottom: -10px;
    display: flex;
    flex-wrap: wrap;

    width: 400px;
    width: 560px;
    height: 360px;
    overflow-x: hidden;
    overflow-y: auto;
    background: $el-dialog-bg-color;
    border-radius: 10px;

    &>div {
        padding: 6px;
        margin: 10px;
        width: 60px;
        height: 80px;
        width: 100px;
        height: 60px;
        cursor: pointer;
        border: 1px solid #fff;
        border-radius: 8px;
        box-sizing: content-box;

        &:hover {
            color: #409EFF;
            border-color: #409EFF;
        }

        .content {
            position: relative;
            height: 60px;
            height: 40px;

            img {
                position: absolute;
@@ -88,15 +99,15 @@
                right: 0;
                bottom: 0;
                margin: auto;
                width: 60px;
                height: 60px;
                width: 40px;
                height: 40px;
            }
        }

        .name {
            height: 20px;
            line-height: 20px;
            font-size: 14px;
            font-size: 12px;
        }
    }
}

 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-05 04:31:12
 * @LastEditTime: 2023-04-06 11:02:18
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 公用地图组件
 * 
@@ -86,8 +86,6 @@
        <assemble-box></assemble-box>

        <video-row-click-popup></video-row-click-popup>

        <!-- <images-select></images-select> -->
    </div>
</template>

@@ -631,6 +629,8 @@

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


            } else {
                this.tilesetLayerType = type

@@ -641,6 +641,11 @@
                    label.forEach(item => {
                        this.addMxTileset(`sdTilesetLayer${item}`, `${tile3DUrl}/sf3d/361102/model/all1/${item}/tileset.json`)
                    })

                this.$EventBus.$emit('showHouseingTileset', {
                    curType: this.tilesetLayerType,
                    type,
                })
            }
        },


 src/components/playVideo/index.vue

@@ -10,8 +10,8 @@
-->
<template>
    <div>
        <el-dialog :title="title" :modal="true" :visible.sync="visibleFlag" :before-close="dialogBeforeClose"
            :close-on-click-modal="true" class="car-video-box">
        <el-dialog :title="title" :visible.sync="visibleFlag" :before-close="dialogBeforeClose" :modal="true"
            :close-on-click-modal="false" class="car-video-box">
            <video autoplay controls width="100%" height="100%" ref="videoElement" id="videoElement"
                style="object-fit: fill"></video>
        </el-dialog>

 src/views/activity/components/customImageBox.vue

@@ -10,8 +10,8 @@
-->
<template>
    <div>
        <el-dialog :title="curDialogTitle" :visible.sync="curDialogShow" class="activity-custom-img-box"
            :before-close="closeCurDialog">
        <el-dialog :title="curDialogTitle" :modal="true" :close-on-click-modal="false" :visible.sync="curDialogShow"
            class="activity-custom-img-box" :before-close="closeCurDialog">
            <div class="describe">
                <div class="label">
                    描述

 src/views/activity/components/policeCarChange.vue

@@ -1,7 +1,7 @@
<template>
    <div>
        <el-dialog title="选择警车" :modal="false" :visible.sync="policeChooseCarVisible" :before-close="cancel"
            :close-on-click-modal="true" class="choose-policeCar-box">
        <el-dialog title="选择警车" :visible.sync="policeChooseCarVisible" :before-close="cancel" :modal="true"
            :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"

 src/views/activity/components/policePersonChange.vue

@@ -1,7 +1,7 @@
<template>
    <div>
        <el-dialog title="选择警员" :modal="false" :visible.sync="policeChooseVisible" :before-close="cancel"
            :close-on-click-modal="true" class="choose-police-box">
        <el-dialog title="选择警员" :visible.sync="policeChooseVisible" :before-close="cancel" :modal="true"
            :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="请选择警员"

 src/views/activity/components/polygonPlot.vue

@@ -1,6 +1,6 @@
<template>
    <div>
        <el-dialog title="修改标绘" :modal="false" :visible.sync="editPlotVisible" :close-on-click-modal="true"
        <el-dialog title="修改标绘" :visible.sync="editPlotVisible" :modal="true" :close-on-click-modal="false"
            class="edit-plot-box">
            <div>
                <div class="value-name-box">选择标绘颜色：</div>
@@ -25,7 +25,7 @@
            </div>
        </el-dialog>

        <el-dialog title="新增标绘" :modal="false" :visible.sync="polygonAddVisible" :close-on-click-modal="true"
        <el-dialog title="新增标绘" :visible.sync="polygonAddVisible" :modal="true" :close-on-click-modal="false"
            class="add-polygon-box" :before-close="cancelSavePolygon">
            <div class="line" v-show="isNeedPolygonType">
                <div class="value-name-box">选择类型：</div>

 src/views/activity/components/polylinePlot copy.vue

New file
@@ -0,0 +1,34 @@



<template>
    <el-dialog :title="lineEditTitle" :visible.sync="lineEditVisible" :modal="true" :close-on-click-modal="false"
        class="edit-line-box" :before-close="cancelSaveLine">

        <div style="position: relative; width: 80px; height: 36px;">
            <images-select></images-select>
        </div>

    </el-dialog>
</template>

<script>

export default {
    inject: ['userInfo'],

    props: ['showingSecurityId'],

    data () {
        return {

        }
    },

    methods: {

    },
}
</script>

<style lang="scss" scoped></style>

 src/views/activity/components/polylinePlot.vue

@@ -3,7 +3,7 @@

<template>
    <div>
        <el-dialog :title="lineEditTitle" :modal="false" :visible.sync="lineEditVisible" :close-on-click-modal="true"
        <el-dialog :title="lineEditTitle" :visible.sync="lineEditVisible" :modal="true" :close-on-click-modal="false"
            class="edit-line-box" :before-close="cancelSaveLine">
            <div>
                <div class="value-name-box">设置缓冲范围：</div>

 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-02 15:53:23
 * @LastEditTime: 2023-04-06 10:10:42
 * @FilePath: \srs-police-affairs\src\views\activity\index.vue
 * @Description: 
 * 
@@ -555,7 +555,7 @@
                lock: true,
                text: '拼命加载中',
                spinner: 'el-icon-loading',
                background: 'rgba(0, 0, 0, 0.2)'
                background: 'rgba(0, 0, 0, 0.5)'
            })
        },


 src/views/home/components/dialog/areaDetailsBox.vue

@@ -1,7 +1,7 @@
<template>
    <!-- 户籍人口 -->
    <el-dialog :title="peopleTitle" :modal="true" :visible.sync="peopleVisible" :before-close="personInfoClose"
        :close-on-click-modal="true" class="area-details-box">
    <el-dialog :title="peopleTitle" :visible.sync="peopleVisible" :before-close="personInfoClose" :modal="true"
        :close-on-click-modal="false" class="area-details-box">
        <div class="header">
            <div>
                人员名称：
@@ -16,7 +16,7 @@
        </div>

        <div v-loading="curLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
            element-loading-background="rgba(0, 0, 0, 0.2)" class="body">
            element-loading-background="rgba(0, 0, 0, 0.5)" class="body">
            <el-table :data="peopleInfoList" style="width: 100%"
                :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }">

 src/views/home/components/dialog/keyPersonBox.vue

@@ -1,7 +1,7 @@
<template>
    <!-- 重点人员 -->
    <el-dialog :title="keyPersonTitle" :modal="true" :visible.sync="keyPersonVisible" :before-close="personInfoClose"
        :close-on-click-modal="true" class="keyPerson-details-box">
    <el-dialog :title="keyPersonTitle" :visible.sync="keyPersonVisible" :before-close="personInfoClose" :modal="true"
        :close-on-click-modal="false" class="keyPerson-details-box">
        <div class="header" v-show="userInfo.dept_id != '1596020515064381442'">
            <div>
                人员名称：
@@ -16,7 +16,7 @@
        </div>

        <div v-loading="curLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
            element-loading-background="rgba(0, 0, 0, 0.2)" class="body">
            element-loading-background="rgba(0, 0, 0, 0.5)" class="body">
            <el-table :data="keyPersonDetailArr" style="width: 100%"
                :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }">

 src/views/home/components/dialog/landDetailsBox.vue

@@ -1,6 +1,6 @@
<template>
    <el-dialog :title="landTitle" :modal="true" :visible.sync="landVisible" :before-close="landBeforeClose"
        :close-on-click-modal="true" class="land-details-box">
    <el-dialog :title="landTitle" :visible.sync="landVisible" :before-close="landBeforeClose" :modal="true"
        :close-on-click-modal="false" class="land-details-box">
        <div class="header">
            <div v-show="landType == 2">
                小区名称：
@@ -22,7 +22,7 @@
            <el-button type="primary" icon="el-icon-delete" @click="clearLandDetailSearchValue">清空</el-button>
        </div>
        <div v-loading="curLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
            element-loading-background="rgba(0, 0, 0, 0.2)" class="body">
            element-loading-background="rgba(0, 0, 0, 0.5)" class="body">
            <el-table :data="landDetailArr" style="width: 100%"
                :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }">

 src/views/home/components/leftContainer.vue

@@ -8,7 +8,7 @@
                    </div>
                </div>
                <el-main v-loading="personEchartsLoading" element-loading-text="拼命加载中"
                    element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
                    element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.5)">
                    <div class="sub-tab" v-show="peopletype == 0">
                        <div class="tab" :class="{ 'select-on-tab': tabType == 0 }" @click="personTabClick(0)">
                            <div class="tab-title-small">户籍人口:</div>
@@ -41,10 +41,10 @@
                <defs>
                    <path id="border-box-8-path-974b4d7cfafa444396861ca1d1173c8c"
                        d="M0.27,0.03c52.66,0,105.34,0,158,0c1.67,2,3.33,4,5,6c1,0.33,2,0.67,3,1c1.33,1.67,2.67,3.33,4,5
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
                        fill="transparent" />
                    <radialGradient id="border-box-8-gradient-974b4d7cfafa444396861ca1d1173c8c" cx="50%" cy="50%" r="50%">
                        <stop offset="0%" stop-color="#fff" stop-opacity="1" />
@@ -54,10 +54,10 @@
                        <circle cx="0" cy="0" r="150" fill="url(#border-box-8-gradient-974b4d7cfafa444396861ca1d1173c8c)">
                            <animateMotion dur="8s"
                                path="M0.27,0.03c52.66,0,105.34,0,158,0c1.67,2,3.33,4,5,6c1,0.33,2,0.67,3,1c1.33,1.67,2.67,3.33,4,5
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
                                rotate="auto" repeatCount="indefinite" />
                        </circle>
                    </mask>
@@ -74,7 +74,7 @@
            <div class="box">
                <div class="title">现有住宅</div>
                <el-main v-loading="houseEchartsLoading" element-loading-text="拼命加载中"
                    element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
                    element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.5)">
                    <div class="sub-tab">
                        <div class="tab" :class="{ 'select-on-tab': tabTypeTwo == 0 }" @click="houseTabClick(0)">
                            <div class="tab-title-small">实有楼栋:</div>
@@ -101,7 +101,7 @@
            <div class="box">
                <div class="title">现有小区</div>
                <el-main v-loading="landEchartsLoading" element-loading-text="拼命加载中"
                    element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
                    element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.5)">
                    <div class="sub-tab" v-show="isAllPoliceStation">
                        <div class="tab" :class="{ 'select-on-tab': tabTypeThree == 0 }" @click="landTabClick(0)">
                            <div class="tab-title-small">小区:</div>

 src/views/home/components/rightContainer.vue

@@ -11,7 +11,7 @@
                        :header-cell-style="{ 'text-align': 'center' }"
                        :cell-style="{ 'text-align': 'center', borderColor: '#324e75' }" :row-class-name="tableRowClassName"
                        :empty-text="schedulingNoDataText" v-loading="schedulingLoading" element-loading-text="拼命加载中"
                        element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
                        element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.5)">
                        <el-table-column prop="dept" label="值班单位"></el-table-column>
                        <el-table-column prop="person" label="姓名"></el-table-column>
                        <el-table-column prop="contact" label="联系方式"></el-table-column>
@@ -29,7 +29,7 @@
                        :show-header="false" :header-cell-style="{ 'text-align': 'center' }"
                        :cell-style="{ 'text-align': 'left', borderColor: '#324e75' }" :row-class-name="tableRowClassName"
                        v-loading="schedulingLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                        element-loading-background="rgba(0, 0, 0, 0.2)">
                        element-loading-background="rgba(0, 0, 0, 0.5)">
                        <el-table-column :show-overflow-tooltip="true" v-for="(item, index) in transTitle" :label="item"
                            :key="index" align="center">
                            <template slot-scope="scope">
@@ -60,7 +60,7 @@
                    </div>
                </div>
                <el-main v-loading="eventChangeEchartsLoading" element-loading-text="拼命加载中"
                    element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
                    element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.5)">
                    <div id="EventChangeEcharts" class="echarts-box"></div>
                </el-main>
            </div>
@@ -106,7 +106,7 @@
            <div class="box">
                <div class="title">现有设备</div>
                <el-main v-loading="equipmentEchartsLoading" element-loading-text="拼命加载中"
                    element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
                    element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.5)">
                    <div class="sub-tab">
                        <div class="tab" :class="{ 'select-on-tab': linetype == 0 }" @click="initEquipmentEcharts(0)">
                            <div class="tab-title-small">设备种类</div>

 src/views/home/components/schedulingList.vue

@@ -1,8 +1,8 @@
<template>
    <!-- 值班table -->
    <div>
        <el-dialog :title="schedulingTitle" :modal="true" :visible.sync="schedulingVisible"
            :before-close="schedulingBeforeClose" :close-on-click-modal="true" class="area-details-box">
        <el-dialog :title="schedulingTitle" :visible.sync="schedulingVisible" :before-close="schedulingBeforeClose"
            :modal="true" :close-on-click-modal="false" class="area-details-box">
            <div class="header">
                <div>
                    <span>值班人：</span>
@@ -14,7 +14,7 @@
                <el-button type="primary" icon="el-icon-delete" @click="clearSearchScheduling">清空</el-button>
            </div>
            <el-main v-loading="chedulingLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                element-loading-background="rgba(0, 0, 0, 0.2)">
                element-loading-background="rgba(0, 0, 0, 0.5)">
                <el-table :data="schedulingTableData" style="width: 100%"
                    :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                    :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }">

 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-04-05 03:13:21
 * @LastEditTime: 2023-04-06 10:11:54
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 *
@@ -57,14 +57,14 @@
                :options="housingOptions" :optionsName="'name'" :selectAllClass="selectHouseClass"></map-select>
        </div>

        <el-dialog :title="panoramaTitle" :modal="true" :visible.sync="panoramaVisible" :before-close="panoramaBeforeClose"
            :close-on-click-modal="true" class="panorama-details-box">
        <el-dialog :title="panoramaTitle" :visible.sync="panoramaVisible" :before-close="panoramaBeforeClose" :modal="true"
            :close-on-click-modal="false" class="panorama-details-box">
            <!-- <iframe src="http://vr.jxpskj.com/JXSFKZQJ/QJ/" style="width: 100%; height: 100%;" frameborder="0"></iframe>-->
            <iframe :src="panoramaVrUrl" style="width: 100%; height: 100%;" frameborder="0"></iframe>
        </el-dialog>

        <el-dialog :title="phoneTitle" :modal="true" :visible.sync="phoneVisible" :before-close="phoneBeforeClose"
            :close-on-click-modal="true" class="phone-details-box">
        <el-dialog :title="phoneTitle" :visible.sync="phoneVisible" :before-close="phoneBeforeClose" :modal="true"
            :close-on-click-modal="false" class="phone-details-box">
            <div class="item">
                <div>责任人：</div>
                <div>{{ phoneDetails.person }}</div>
@@ -83,8 +83,8 @@
            </div>
        </el-dialog>

        <el-dialog :title="equimentTitle" :modal="true" :visible.sync="equimentVisible" :before-close="equimentBeforeClose"
            :close-on-click-modal="true" class="equiment-details-box">
        <el-dialog :title="equimentTitle" :visible.sync="equimentVisible" :before-close="equimentBeforeClose" :modal="true"
            :close-on-click-modal="false" class="equiment-details-box">
            <div class="header">
                <div>
                    设备名称：
@@ -96,7 +96,7 @@
            </div>

            <div v-loading="equimentLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                element-loading-background="rgba(0, 0, 0, 0.2)" class="body">
                element-loading-background="rgba(0, 0, 0, 0.5)" class="body">
                <el-table :data="equimentTableData" style="width: 100%"
                    :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                    :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }"
@@ -140,8 +140,8 @@
        </el-dialog>


        <el-dialog title="警情信息" :modal="true" :visible.sync="policeSituationVisible" :modal-append-to-body="false"
            :before-close="policeSituationBeforeClose" :close-on-click-modal="true" class="policeSituation-details-box">
        <el-dialog title="警情信息" :visible.sync="policeSituationVisible" :modal="true" :close-on-click-modal="false"
            :before-close="policeSituationBeforeClose" class="policeSituation-details-box">
            <div class="btn-change">
                <div :class="{ on: policeInformationType == '接警信息' }" @click="alarmOrActAsPolice('接警信息')">接警信息</div>
                <div :class="{ on: policeInformationType == '出警信息' }" @click="alarmOrActAsPolice('出警信息')">出警信息</div>
@@ -266,17 +266,17 @@
            <div v-show="policeInformationType == '出警信息' && JSON.stringify(CJdata) == '{}'" class="box no-data">暂无数据</div>
        </el-dialog>

        <el-dialog :title="dialogEquimentVideoTitle" :modal="true" :visible.sync="dialogEquimentVideoVisible"
            :before-close="dialogBeforeClose" :close-on-click-modal="true" class="car-video-box">
        <el-dialog :title="dialogEquimentVideoTitle" :visible.sync="dialogEquimentVideoVisible"
            :before-close="dialogBeforeClose" :modal="true" :close-on-click-modal="false" class="car-video-box">
            <video-loading v-show="videoPlayShow"></video-loading>

            <video autoplay controls width="100%" height="100%" ref="videoElement" id="videoElement"
                style="object-fit: fill"></video>
        </el-dialog>

        <el-dialog title="学校" :modal="false" :visible.sync="xxPopupShow" :before-close="landBeforeClose"
            :close-on-click-modal="true" class="land-details-box" v-loading="houseLoading" element-loading-text="拼命加载中"
            element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
        <el-dialog title="学校" :visible.sync="xxPopupShow" :before-close="landBeforeClose" :modal="true"
            :close-on-click-modal="false" class="land-details-box" v-loading="houseLoading" element-loading-text="拼命加载中"
            element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.5)">
            <el-table :data="houseArr" style="width: 100%"
                :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }"
@@ -1069,7 +1069,7 @@
                lock: true,
                text: '拼命加载中',
                spinner: 'el-icon-loading',
                background: 'rgba(0, 0, 0, 0.2)'
                background: 'rgba(0, 0, 0, 0.5)'
            })
        },


 src/views/house/2.js

File was deleted

 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-05 17:43:24
 * @LastEditTime: 2023-04-06 10:06:43
 * @FilePath: \srs-police-affairs\src\views\house\index.vue
 * @Description: 小区-栋-层-房屋
 * 
@@ -31,7 +31,7 @@
            </div>

            <div v-show="contentShow" class="result-content" ref="resultContentBox">
                <el-main v-loading="villageInfoLoading" element-loading-background="rgba(0, 0, 0, 0.2)"
                <el-main v-loading="villageInfoLoading" element-loading-background="rgba(0, 0, 0, 0.5)"
                    element-loading-text="数据正在加载中" element-loading-spinner="el-icon-loading"
                    style="overflow:hidden;padding:0px;">
                    <div class="housing-estate-info" ref="housingEstateInfoBox">
@@ -81,7 +81,7 @@
                    </div>

                    <div class="floor-content" v-show="subNavType == 1">
                        <el-main v-loading="BuildListLoading" element-loading-background="rgba(0, 0, 0, 0.2)"
                        <el-main v-loading="BuildListLoading" element-loading-background="rgba(0, 0, 0, 0.5)"
                            element-loading-text="数据正在加载中" element-loading-spinner="el-icon-loading"
                            style="overflow:hidden;padding:0px;" class="build-item">

@@ -154,7 +154,7 @@
                                    </el-select>
                                </div>
                            </div>
                            <el-main v-loading="pictLoading" element-loading-background="rgba(0, 0, 0, 0.2)"
                            <el-main v-loading="pictLoading" element-loading-background="rgba(0, 0, 0, 0.5)"
                                element-loading-text="数据正在加载中" element-loading-spinner="el-icon-loading"
                                style="overflow:hidden;padding:0px;">
                                <div class="floor-outBox" v-show="!pictLoading && isHaveResidentData">
@@ -189,7 +189,7 @@
                                                :class="{ on: floorChoosed == value.properties.fojcu }">
                                                {{ value.properties.fojcu }}
                                                <!-- <div class="flow"></div>
                                                                     <div class="warning"></div>-->
                                                                                 <div class="warning"></div>-->
                                            </div>
                                        </div>
                                    </div>
@@ -206,7 +206,7 @@
                            :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }"
                            :row-class-name="tableRowClassName" @row-click="deepDataRowClick($event, 'comeOut')"
                            :empty-text="houseDeepNoDataText" v-loading="houseDeepLoading" element-loading-text="拼命加载中"
                            element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
                            element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.5)">
                            <el-table-column prop="name" label="名称" width="180"
                                :show-overflow-tooltip="true"></el-table-column>
                            <el-table-column prop="x" label="经度" width="100"></el-table-column>
@@ -220,7 +220,7 @@
                            :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }"
                            :row-class-name="tableRowClassName" @row-click="deepDataRowClick($event, 'park')"
                            :empty-text="houseDeepNoDataText" v-loading="houseDeepLoading" element-loading-text="拼命加载中"
                            element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
                            element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.5)">
                            <el-table-column prop="name" label="名称" width="180"
                                :show-overflow-tooltip="true"></el-table-column>
                            <el-table-column prop="x" label="经度" width="100"></el-table-column>
@@ -235,7 +235,7 @@
                            :row-class-name="tableRowClassName" @row-click="deepDataRowClick($event, 'business')"
                            @sort-change="sortDevName" :empty-text="houseDeepNoDataText" v-loading="houseDeepLoading"
                            element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                            element-loading-background="rgba(0, 0, 0, 0.2)">
                            element-loading-background="rgba(0, 0, 0, 0.5)">
                            <el-table-column sortable="custom" prop="name" label="名称" width="180"
                                :show-overflow-tooltip="true"></el-table-column>
                            <el-table-column prop="x" label="经度" width="100"></el-table-column>
@@ -246,7 +246,7 @@

                <div class="police-info" v-if="navType == 1" ref="policeTableBox">
                    <el-main v-loading="policeInfoLoading" element-loading-text="拼命加载中"
                        element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
                        element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.5)">
                        <el-table :data="callPoliceData" style="width: 100%" :height="currentTableHeight"
                            :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                            :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }"
@@ -271,7 +271,7 @@

        <map-search-box></map-search-box>

        <el-dialog title="报警信息" :modal="true" :visible.sync="policeSituationVisible" :append-to-body="true"
        <el-dialog title="报警信息" :visible.sync="policeSituationVisible" :append-to-body="true" :modal="true"
            :close-on-click-modal="false" :before-close="policeSituationBeforeClose" class="policeSituation-details-box">
            <div class="box">
                <div class="item">
@@ -333,7 +333,7 @@
            </div>
        </el-dialog>

        <el-dialog :title="residentDetailsTitle" :modal="true" :visible.sync="residentDetailsShow" :append-to-body="true"
        <el-dialog :title="residentDetailsTitle" :visible.sync="residentDetailsShow" :append-to-body="true" :modal="true"
            :close-on-click-modal="false" :before-close="residentDetailsClose" class="resident-details-box" width="24%">
            <el-table :data="houseDate"
                :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
@@ -346,7 +346,7 @@
            </el-table>
        </el-dialog>

        <el-dialog :title="keyPersonTitle" :modal="true" :visible.sync="keyPersonVisible" :append-to-body="true"
        <el-dialog :title="keyPersonTitle" :visible.sync="keyPersonVisible" :append-to-body="true" :modal="true"
            :close-on-click-modal="false" :before-close="keyPersonBeforeClose" class="keyPerson-details-box-two">
            <div class="header">
                <div>
@@ -361,7 +361,7 @@
                <el-button type="primary" icon="el-icon-delete" @click="clearPeopleDetailSearchValue">清空</el-button>
            </div>
            <el-main v-loading="keyPeopleLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                element-loading-background="rgba(0, 0, 0, 0.2)">
                element-loading-background="rgba(0, 0, 0, 0.5)">
                <el-table :data="personDetailArr" style="width: 100%"
                    :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                    :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }"

 src/views/login/index.vue

@@ -125,7 +125,8 @@
                    const loading = this.$loading({
                        lock: true,
                        text: '登录中,请稍后。。。',
                        spinner: "el-icon-loading"
                        spinner: "el-icon-loading",
                        background: 'rgba(0, 0, 0, 0.5)'
                    })
                    this.$store.dispatch("LoginByUsername", this.loginForm).then((res) => {
                        //跳转首页

 src/views/police/index.vue

@@ -13,7 +13,7 @@
    <div class="police-page container">
        <div v-show="boxShow" class="container-content">
            <el-main v-loading="equimentLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                element-loading-background="rgba(0, 0, 0, 0.2)" style="overflow: hidden;padding: 0px;">
                element-loading-background="rgba(0, 0, 0, 0.5)" style="overflow: hidden;padding: 0px;">
                <div class="switch-box" v-show="!detailFlag">
                    资源类别：
                    <el-select v-model="typeValue" @change="navClick" placeholder="请选择" class="type-select-css">
@@ -129,8 +129,8 @@
            </div>
        </div>

        <el-dialog :title="dialogTitle" :modal="false" :visible.sync="dialogVisible" :before-close="dialogBeforeClose"
            :close-on-click-modal="true" class="car-video-box">
        <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" :before-close="dialogBeforeClose" :modal="true"
            :close-on-click-modal="false" class="car-video-box">
            <video-loading v-show="videoPlayShow"></video-loading>

            <video autoplay controls width="100%" height="100%" ref="videoElement" id="videoElement"

 src/views/policeInfor/index.vue

@@ -81,8 +81,9 @@
            </div>
        </div>

        <el-dialog title="警情信息" :modal="true" :visible.sync="policeSituationVisible" :modal-append-to-body="false"
            :before-close="policeSituationBeforeClose" :close-on-click-modal="true" class="policeSituation-details-box">
        <el-dialog title="警情信息" :visible.sync="policeSituationVisible" :modal-append-to-body="false"
            :before-close="policeSituationBeforeClose" :modal="true" :close-on-click-modal="false"
            class="policeSituation-details-box">
            <div class="btn-change">
                <div :class="{ on: policeInformationType == '接警信息' }" @click="alarmOrActAsPolice('接警信息')">接警信息</div>
                <div :class="{ on: policeInformationType == '出警信息' }" @click="alarmOrActAsPolice('出警信息')">出警信息</div>
@@ -302,7 +303,7 @@
                lock: true,
                text: '拼命加载中',
                spinner: 'el-icon-loading',
                background: 'rgba(0, 0, 0, 0.2)'
                background: 'rgba(0, 0, 0, 0.5)'
            })
        },


 src/views/video/list.vue

@@ -80,15 +80,15 @@

        <map-search-box></map-search-box>

        <el-dialog :title="dialogTitle" :modal="false" :visible.sync="dialogVisible" :before-close="dialogBeforeClose"
            :close-on-click-modal="true" class="car-video-box">
        <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" :before-close="dialogBeforeClose" :modal="true"
            :close-on-click-modal="false" class="car-video-box">
            <video-loading v-show="videoPlayShow"></video-loading>

            <video id="videoElement" autoplay controls width="100%" height="100%" style="object-fit: fill"></video>
        </el-dialog>

        <el-dialog :title="drawDialogTitle" :modal="false" :visible.sync="drawDialogVisible"
            :before-close="drawDialogBeforeClose" :close-on-click-modal="true" class="video-draw-box">
        <el-dialog :title="drawDialogTitle" :visible.sync="drawDialogVisible" :before-close="drawDialogBeforeClose"
            :modal="true" :close-on-click-modal="false" class="video-draw-box">
            <div v-show="inputpopup">
                <div>距离：</div>
                <div>
@@ -684,7 +684,7 @@
                lock: true,
                text: '拼命加载中',
                spinner: 'el-icon-loading',
                background: 'rgba(0, 0, 0, 0.2)'
                background: 'rgba(0, 0, 0, 0.5)'
            })
        },


 src/views/video/region.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-22 16:21:34
 * @LastEditTime: 2023-04-06 10:08:15
 * @FilePath: \srs-police-affairs\src\views\video\region.vue
 * @Description: 辖区管理
 * 
@@ -35,9 +35,9 @@
                                <el-table-column prop="name" label="范围名称" min-width="50%"></el-table-column>
                                <el-table-column prop="extent" label="长度km/面积㎡" min-width="50%">
                                    <!-- <template slot-scope="scope">
                                                                                    <span>{{ scope.row.extent }}</span>
                                                                                    <span>千米</span>
                                                                                </template>-->
                                                                                            <span>{{ scope.row.extent }}</span>
                                                                                            <span>千米</span>
                                                                                        </template>-->
                                </el-table-column>
                                <el-table-column prop="id" label="操作" min-width="50%">
                                    <template slot-scope="scope">
@@ -231,12 +231,12 @@
        </div>
        <!-- <div class="deleteVideo" v-show="isShowVideo.video1" @click="deleteVideo">关闭</div> -->

        <el-dialog :title="dialogTitle" :modal="false" :visible.sync="dialogVisible" :before-close="dialogBeforeClose"
            :close-on-click-modal="true" class="car-video-box">
        <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" :before-close="dialogBeforeClose" :modal="true"
            :close-on-click-modal="false" class="car-video-box">
            <video id="videoElement" autoplay controls width="100%" height="100%" style="object-fit: fill"></video>
        </el-dialog>

        <el-dialog title="范围设置" :modal="false" :visible.sync="editRangeVisible" :close-on-click-modal="true"
        <el-dialog title="范围设置" :visible.sync="editRangeVisible" :modal="true" :close-on-click-modal="false"
            class="edit-range-box">
            <div class="line">
                <div class="value-name-box">选择范围颜色：</div>

 vue.config.js

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-09-07 09:37:07
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-04-05 01:24:12
 * @LastEditTime: 2023-04-06 09:48:46
 * @FilePath: \srs-police-affairs\vue.config.js
 * @Description:
 *
@@ -161,8 +161,8 @@
        proxy: {
            "/api": {
                // target用于配置你允许访问数据的计算机名称，即是你的api接口的服务器地址
                // target: "http://localhost:82",
                target: "http://192.168.0.100:82",
                target: "http://localhost:82",
                // target: "http://192.168.0.100:82",
                // target: "http://17.20.10.3:82",
                // target: "http://10.141.11.11:8081/api",
                // ws: true, //启用webSocket6566