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

shuishen

2023-04-03 c1295c4934b9f481fc90d302cdd2a0cffabd84f1

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

 src/store/getters.js

@@ -16,7 +16,8 @@
    videoListPopup: (state) => state.popupParams.videoListPopup,
    videoListPopupData: (state) => state.popupParams.videoListPopupData,
    mapSearchPopup: (state) => state.popupParams.mapSearchPopup,
    mapSearchPopupData: (state) => state.popupParams.mapSearchPopupData
    mapSearchPopupData: (state) => state.popupParams.mapSearchPopupData,
    houseDeepDataPopup: (state) => state.popupParams.houseDeepDataPopup
}

export default getters

 src/store/modules/popupParams.js

@@ -24,6 +24,7 @@
        videoListPopupData: {},

        mapSearchPopup: false,
        houseDeepDataPopup: false,
        mapSearchPopupData: {}
    },

@@ -55,6 +56,10 @@
            state.mapSearchPopup = mapSearchPopup
        },

        SET_HOUSEDEEPDATAPOPUP (state, mapSearchPopup) {
            state.houseDeepDataPopup = mapSearchPopup
        },

        SET_MAPSEARCHPOPUPDATA (state, mapSearchPopupData) {
            state.mapSearchPopupData = mapSearchPopupData
        }

 src/styles/base/index.scss

@@ -299,6 +299,92 @@
            }

        }

        .el-main {
            padding: 0;
        }
    }
}

.keyPerson-details-box-two {
    .el-dialog {
        display: flex;
        flex-direction: column;
        width: 1000px;
        height: 560px;

        .el-table__header-wrapper {
            height: 60px;
            line-height: 60px;
        }

        .el-table .cell {
            height: 30px;
            line-height: 30px;
        }

        .el-dialog__body {
            flex: 1;
        }

        .el-pagination.is-background .el-pager li:not(.disabled).active {
            color: #C0C4CC !important;
        }

        .header {
            display: flex;
            margin-bottom: 10px;
            padding-left: 10px;

            &>div {
                display: flex;
                height: 32px;
                line-height: 32px;
                margin-right: 10px;

                input {
                    width: 150px;
                    height: 32px;
                    font-size: 12px;
                    text-indent: 1em;
                    color: #ffffff;
                    background-color: rgba(24, 79, 202, 0.6);
                    border: 1px solid rgb(0, 92, 169);
                    border-radius: 5px;
                }

                input:focus {
                    outline: none;
                }

                input::-webkit-input-placeholder {
                    color: rgba(238, 238, 238, 0.7);
                }
            }

            &>div:first-child input {
                width: 120px;
            }

            .el-button--primary {
                background-color: rgba(29, 92, 228, 0.6);
                border: 1px solid rgba(29, 92, 228, 0.6);
            }

            .el-button--primary:hover {
                background: #66b1ff !important;
                border-color: #66b1ff !important;
            }

            .el-button {
                padding: 6px 10px;
            }

        }

        .el-main {
            padding: 0;
        }
    }
}


 src/styles/media/index.scss

@@ -500,6 +500,10 @@

                                    &>.floor-content {

                                        .build-item {
                                            height: countSizeVh(100);
                                        }

                                        .build-info {
                                            height: countSizeVh(100);

@@ -2042,6 +2046,64 @@
                        }
                    }

                    .keyPerson-details-box-two {
                        .el-dialog {
                            width: countSizeVw(1000, 1920);
                            height: countSizeVh(560);
                        }

                        .el-dialog__header button {
                            font-size: countSizeVh(18);
                            right: countSizeVw(10, 1920);
                        }

                        .el-main {
                            height: calc(100% - countSizeVh(50)) !important;
                        }

                        .el-dialog .el-dialog__body .el-table {
                            height: calc(100% - countSizeVh(40)) !important;
                        }

                        .el-table__header-wrapper {
                            height: countSizeVh(60);
                            line-height: countSizeVh(60);
                        }

                        .el-table .cell {
                            height: countSizeVh(30);
                            line-height: countSizeVh(30);
                        }

                        .header {
                            margin-bottom: countSizeVh(10);
                            padding-left: countSizeVw(10, 1920);

                            &>div {
                                height: countSizeVh(32);
                                line-height: countSizeVh(32);
                                margin-right: countSizeVw(10, 1920);

                                input {
                                    width: countSizeVw(150, 1920);
                                    height: countSizeVh(32);
                                    font-size: countSizeVh(12);
                                    border: countSizeVh(1) solid rgb(0, 92, 169);
                                    border-radius: countSizeVh(5);
                                }
                            }

                            &>div:first-child input {
                                width: countSizeVw(120, 1920);
                            }

                            .el-button--primary {
                                border: countSizeVh(1) solid rgba(29, 92, 228, 0.6);
                            }

                        }
                    }

                    .policeSituation-details-box {
                        .el-dialog {
                            width: countSizeVw(800, 1920);

 src/views/house/index.vue

@@ -40,8 +40,6 @@
                            <div class="progress"></div>
                        </div>
                        <div class="housing-bg">


                            <img :src="villageInfo.pic_url" alt="" v-show="villageInfo.pic_url">
                            <el-empty :image-size="120" description="暂无照片"
                                v-show="!villageInfo.pic_url && isHaveNoPic == true"></el-empty>
@@ -85,9 +83,9 @@
                    <div class="floor-content" v-show="subNavType == 1">
                        <el-main v-loading="BuildListLoading" element-loading-background="rgba(0, 0, 0, 0.2)"
                            element-loading-text="数据正在加载中" element-loading-spinner="el-icon-loading"
                            style="overflow:hidden;padding:0px;">
                            style="overflow:hidden;padding:0px;" class="build-item">

                            <div class="build-info">
                            <div class="build-info" v-show="!BuildListLoading">
                                <div class="nextBtn" @click="lastBtn" v-show="lastBtnShow == true">
                                    <i class="el-icon-caret-left"></i>
                                </div>
@@ -189,7 +187,7 @@
                                                <!-- :class="[{ 'chuzu': value.houseType == '出租' }, { 'zizhu': value.houseType == '自住' }, { 'kongzhi': value.houseType == '空置' }, { 'shangye': value.houseType == '商业' }]" -->
                                                {{ value.properties.fojcu }}
                                                <!-- <div class="flow"></div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        <div class="warning"></div>-->
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    <div class="warning"></div>-->
                                            </div>
                                        </div>
                                    </div>
@@ -239,28 +237,32 @@
                </div>

                <div class="police-info" v-if="navType == 1" ref="policeTableBox">
                    <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' }"
                        :row-class-name="tableRowClassName" @row-click="clickData" empty-text="暂无警情信息">
                        <el-table-column prop="JJDWMC" :show-overflow-tooltip="true" label="接警单位"
                            min-width="34%"></el-table-column>
                        <el-table-column label="报警时间" min-width="26%">
                            <template slot-scope="scope">
                                <span>{{ scope.row.BJSJ.substring(0, 10) }}</span>
                            </template>
                        </el-table-column>
                        <el-table-column prop="JJYXM" :show-overflow-tooltip="true" label="接警员"
                            min-width="20%"></el-table-column>
                        <el-table-column prop="BJRXM" :show-overflow-tooltip="true" label="报警人"
                            min-width="20%"></el-table-column>
                    </el-table>
                    <el-main v-loading="policeInfoLoading" element-loading-text="拼命加载中"
                        element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
                        <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' }"
                            :row-class-name="tableRowClassName" @row-click="clickData" :empty-text="jqNoDataText">
                            <el-table-column prop="JJDWMC" :show-overflow-tooltip="true" label="接警单位"
                                min-width="34%"></el-table-column>
                            <el-table-column label="报警时间" min-width="26%">
                                <template slot-scope="scope">
                                    <span>{{ scope.row.BJSJ.substring(0, 10) }}</span>
                                </template>
                            </el-table-column>
                            <el-table-column prop="JJYXM" :show-overflow-tooltip="true" label="接警员"
                                min-width="20%"></el-table-column>
                            <el-table-column prop="BJRXM" :show-overflow-tooltip="true" label="报警人"
                                min-width="20%"></el-table-column>
                        </el-table>

                    <div class="pages all-pagination-sty" ref="ElPagination">
                        <el-pagination background layout="prev, pager, next" :page-size="callPolicePage.pageSize"
                            :page-count="callPolicePage.count" :current-page="callPolicePage.currentPage"
                            @current-change="handleCurrentChange"></el-pagination>
                    </div>
                        <div class="pages all-pagination-sty" ref="ElPagination">
                            <el-pagination background layout="prev, pager, next" :page-size="callPolicePage.pageSize"
                                :page-count="callPolicePage.count" :current-page="callPolicePage.currentPage"
                                @current-change="handleCurrentChange"></el-pagination>
                        </div>
                    </el-main>

                </div>
            </div>
        </div>
@@ -343,7 +345,7 @@
        </el-dialog>

        <el-dialog :title="keyPersonTitle" :modal="false" :visible.sync="keyPersonVisible"
            :before-close="keyPersonBeforeClose" :close-on-click-modal="true" class="keyPerson-details-box">
            :before-close="keyPersonBeforeClose" :close-on-click-modal="true" class="keyPerson-details-box-two">
            <div class="header">
                <div>
                    姓名：
@@ -360,7 +362,8 @@
                element-loading-background="rgba(0, 0, 0, 0.2)">
                <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' }">
                    :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }"
                    :empty-text="peopleNoDataText">
                    <el-table-column label="序号" type="index" width="50" align="center">
                        <template slot-scope="scope">
                            <span>{{ (peoplePage.currentPage - 1) * peoplePage.pageSize + scope.$index + 1 }}</span>
@@ -374,7 +377,7 @@
                    <el-table-column prop="policeStationName" label="所属派出所"></el-table-column>
                    <el-table-column prop="areaName" label="所属责任区"></el-table-column>
                </el-table>
                <div class="pages all-pagination-sty" ref="tablePagination">
                <div class="pages all-pagination-sty" ref="tablePagination" v-show="!keyPeopleLoading">
                    <el-pagination background layout="prev, pager, next" :page-size="peoplePage.pageSize"
                        :total="peoplePage.total" :current-page="peoplePage.currentPage"
                        @current-change="peopleHandleCurrentChange"></el-pagination>
@@ -415,8 +418,10 @@
        return {
            // 下拉搜索--树状数据相关
            searchTreeShowFlag: false,
            peopleNoDataText: '暂无人口数据',
            peopleNoDataText: ' ',
            jqNoDataText: ' ',
            keyPeopleLoading: false,
            policeInfoLoading: false,
            isHaveNoPic: false,
            residentLoading: false,
            searchTreeName: "",
@@ -709,7 +714,6 @@
                circleLayer = null
            }
            this.subNavType = 1
            this.getResidentialQuartersInfo(current.id, "361102")
            this.getSearchExtensivelyBgAoiDeepdata(
                "ebf48ecaa1fd436fa3d40c4600aa051f",
                "361100",
@@ -725,6 +729,8 @@
            this.navType = e.target.dataset.type

            if (this.navType == 1) {
                this.policeInfoLoading = true
                this.jqNoDataText = '  '
                this.callPolicePage.currentPage = 1
                this.getAlarmList()
            } else {
@@ -738,6 +744,7 @@
        getSearchExtensivelyBgAoiDeepdata (ak, region, ids, infos) {
            this.villageInfoLoading = true
            this.BuildListLoading = true
            this.buildingList = []
            getSearchExtensivelyBgAoiDeepdata(ak, region, ids, infos).then((res) => {
                let baseUrl
                if (process.env.NODE_ENV == "development") {
@@ -748,7 +755,7 @@
                    baseUrl = "http://10.141.11.11/"
                }

                


                // 小区名称类型地址
                let villageData = res.data.result[0]
@@ -785,7 +792,6 @@
                    res.data.result[0].deep_infos.deep_info.length
                ) {
                    let deepData = res.data.result[0].deep_infos.deep_info
                    console.log("deepData------", deepData)
                    this.parkingLotData = []
                    this.comeOutData = []
                    this.businessData = []
@@ -806,7 +812,6 @@
                    res.data.result[0].children_infos.length
                ) {
                    let buildData = res.data.result[0].children_infos
                    this.buildingList = []
                    buildData.forEach((item) => {
                        this.buildingList.push({
                            name: `${item.sname}`,
@@ -850,7 +855,6 @@

                if (res.data != null && houseData.nwwqd.features != []) {
                    let unitData = houseData.nwwqd.features
                    console.log(unitData.length, 223366)
                    this.floorInfo.house_num = unitData.length
                    if (houseData.hwtxa.features.length > 1) {
                        this.isShowUnitChoose = true
@@ -976,7 +980,9 @@
            this.floorInfo.floor_num = item.floor_num
            // 获取户籍人口重点人口数据
            this.choosedBuildId = item.build_id
            // 重点人口户籍人口
            this.getVillagePersonStatisticInfoByBuildId(item.build_id)
            // 楼栋单元楼层户室查询
            this.getHouses(item.build_id, "361102", aoiArr)
            console.log("buildingClick-end")
            this.floorsType = 1
@@ -1121,16 +1127,20 @@
                siteWd: `${row.y}`,
                siteGd: 1000,
            })
            this.$EventBus.$emit("layerPointAdd", {
                layerName: "deepDataLayer",
                type: "label",
                params: {
                    lng: `${row.x}`,
                    lat: `${row.y}`,
                    alt: 1,
                    text: row.name,
                },

            var popup = new global.DC.DivForms(global.viewer, {
                domId: 'houseDeepDataPopup',
                position: [
                    global.DC.Transform.transformWGS84ToCartesian(
                        new global.DC.Position(
                            Number(row.x),
                            Number(row.y),
                            0
                        )
                    )
                ]
            })

            this.$EventBus.$emit("layerPointAdd", {
                layerName: "deepDataLayer",
                type: "billboard",
@@ -1148,8 +1158,9 @@
            this.keyPeopleType = status
            this.peoplePage.currentPage = 1
            this.keyPersonTitle = status == 1 ? "户籍人口详情" : "重点人口详情"
            this.peopleNoDataText = status == 1 ? "暂无户籍人口数据" : "暂无重点人口数据"
            this.peopleNoDataText = ' '
            this.keyPeopleLoading = true
            this.personDetailArr = []
            this.getVillagePersonInfo(
                "",
                this.choosedBuildId,
@@ -1159,9 +1170,12 @@

        // 获取历史接警记录
        getAlarmList () {
            circleLayer.clear()
            circleLayer.remove()
            circleLayer = null
            if (circleLayer != null) {
                circleLayer.clear()
                circleLayer.remove()
                circleLayer = null
            }

            circleLayer = new global.DC.PrimitiveLayer("circleLayer")
            global.viewer.addLayer(circleLayer)

@@ -1184,7 +1198,6 @@
                            lat: item.ZDDWYZB,
                        }
                    })

                    this.callPoliceData.forEach((item, index) => {
                        if (item.lng != "" && item.lat != "") {
                            let center = new global.DC.Position(item.lng, item.lat)
@@ -1214,9 +1227,18 @@
                    })
                } else {
                    this.callPoliceData = []
                    setTimeout(() => {
                        this.jqNoDataText = '暂无报警信息'
                        this.policeInfoLoading = false
                    }, 500)
                }

                this.setTableHeight()
            }).catch(res => {
                setTimeout(() => {
                    this.jqNoDataText = '暂无报警信息'
                    this.policeInfoLoading = false
                }, 500)
            })
        },

@@ -1293,11 +1315,15 @@
        // 分页选择事件
        handleCurrentChange (currentPage) {
            this.callPolicePage.currentPage = currentPage
            this.policeInfoLoading = true
            this.jqNoDataText = '  '
            this.getAlarmList()
        },

        peopleHandleCurrentChange (currentPage) {
            this.keyPeopleLoading = true
            this.peoplePage.currentPage = currentPage
            this.personDetailArr = []
            this.getVillagePersonInfo(
                "",
                this.choosedBuildId,
@@ -1351,15 +1377,35 @@
                phone
            ).then((res) => {
                if (buildId) {
                    this.personDetailArr = res.data.data.records
                    setTimeout(() => {
                        this.personDetailArr = res.data.data.records
                    }, 500)

                    this.peoplePage.pageSize = res.data.data.size
                    this.peoplePage.total = res.data.data.total
                    setTimeout(() => {
                        this.keyPeopleLoading = false
                        this.residentLoading = false
                        if (res.data.data.records.length == 0) {
                            if (status == '') {
                                this.peopleNoDataText = '暂无户籍人口信息'
                            } else {
                                this.peopleNoDataText = '暂无重点人口信息'
                            }
                        }
                    }, 500)
                } else {
                    this.houseDate = res.data.data.records
                }
            }).catch((res) => {
                setTimeout(() => {
                    this.keyPeopleLoading = false
                    this.residentLoading = false
                    if (status == '') {
                        this.peopleNoDataText = '暂无户籍人口信息'
                    } else {
                        this.peopleNoDataText = '暂无重点人口信息'
                    }
                }, 500)
            })
        },
@@ -1370,6 +1416,7 @@
            this.callPhone = ""
            this.peopleName = ""
            this.peoplePage.currentPage = 1
            this.personDetailArr = []
            this.getVillagePersonInfo(
                "",
                this.choosedBuildId,
@@ -1382,6 +1429,7 @@
        searchPeopleDetail () {
            this.keyPeopleLoading = true
            this.peoplePage.currentPage = 1
            this.personDetailArr = []
            this.getVillagePersonInfo(
                "",
                this.choosedBuildId,
@@ -2170,6 +2218,10 @@
            }

            .police-info {
                .el-main {
                    padding: 0;
                }

                .tableClass {
                    margin: 0 auto;
                    width: 600px;

 vue.config.js

@@ -161,8 +161,8 @@
        proxy: {
            "/api": {
                // target用于配置你允许访问数据的计算机名称，即是你的api接口的服务器地址
                target: "http://localhost:82",
                // target: "http://192.168.0.103: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