~admin/srs-police-affairs.git

parent: 5712810d | patch | commit | ignore whitespace

guanqb

2023-04-03 79c259717df5edd12f885660fee5faae70a85fa2

修改

5 files modified

	src/store/getters.js	3 ●●●●● patch \| view \| raw \| blame \| history
	src/store/modules/popupParams.js	5 ●●●●● patch \| view \| raw \| blame \| history
	src/styles/base/index.scss	86 ●●●●● patch \| view \| raw \| blame \| history
	src/styles/media/index.scss	62 ●●●●● patch \| view \| raw \| blame \| history
	src/views/house/index.vue	46 ●●●●● patch \| view \| raw \| blame \| history

 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);

@@ -2030,6 +2034,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>
@@ -347,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>
                    姓名：
@@ -379,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>
@@ -746,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") {
@@ -756,7 +755,7 @@
                    baseUrl = "http://10.141.11.11/"
                }

                


                // 小区名称类型地址
                let villageData = res.data.result[0]
@@ -813,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}`,
@@ -1129,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",
@@ -1158,6 +1160,7 @@
            this.keyPersonTitle = status == 1 ? "户籍人口详情" : "重点人口详情"
            this.peopleNoDataText = ' '
            this.keyPeopleLoading = true
            this.personDetailArr = []
            this.getVillagePersonInfo(
                "",
                this.choosedBuildId,
@@ -1320,6 +1323,7 @@
        peopleHandleCurrentChange (currentPage) {
            this.keyPeopleLoading = true
            this.peoplePage.currentPage = currentPage
            this.personDetailArr = []
            this.getVillagePersonInfo(
                "",
                this.choosedBuildId,
@@ -1373,7 +1377,9 @@
                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
@@ -1410,6 +1416,7 @@
            this.callPhone = ""
            this.peopleName = ""
            this.peoplePage.currentPage = 1
            this.personDetailArr = []
            this.getVillagePersonInfo(
                "",
                this.choosedBuildId,
@@ -1422,6 +1429,7 @@
        searchPeopleDetail () {
            this.keyPeopleLoading = true
            this.peoplePage.currentPage = 1
            this.personDetailArr = []
            this.getVillagePersonInfo(
                "",
                this.choosedBuildId,

			@@ -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

			@@ -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
			}

			@@ -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;
			}
			}
			}

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

			&>.floor-content {

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

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

			@@ -2030,6 +2034,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);

			@@ -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>
			@@ -347,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>
			姓名：
			@@ -379,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>
			@@ -746,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") {
			@@ -756,7 +755,7 @@
			baseUrl = "http://10.141.11.11/"
			}




			// 小区名称类型地址
			let villageData = res.data.result[0]
			@@ -813,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}`,
			@@ -1129,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",
			@@ -1158,6 +1160,7 @@
			this.keyPersonTitle = status == 1 ? "户籍人口详情" : "重点人口详情"
			this.peopleNoDataText = ' '
			this.keyPeopleLoading = true
			this.personDetailArr = []
			this.getVillagePersonInfo(
			"",
			this.choosedBuildId,
			@@ -1320,6 +1323,7 @@
			peopleHandleCurrentChange (currentPage) {
			this.keyPeopleLoading = true
			this.peoplePage.currentPage = currentPage
			this.personDetailArr = []
			this.getVillagePersonInfo(
			"",
			this.choosedBuildId,
			@@ -1373,7 +1377,9 @@
			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
			@@ -1410,6 +1416,7 @@
			this.callPhone = ""
			this.peopleName = ""
			this.peoplePage.currentPage = 1
			this.personDetailArr = []
			this.getVillagePersonInfo(
			"",
			this.choosedBuildId,
			@@ -1422,6 +1429,7 @@
			searchPeopleDetail () {
			this.keyPeopleLoading = true
			this.peoplePage.currentPage = 1
			this.personDetailArr = []
			this.getVillagePersonInfo(
			"",
			this.choosedBuildId,