~admin/srs-police-affairs.git

parent: 65434fec | patch | commit | ignore whitespace

guanqb

2023-04-02 10f96d147b77cb2d99cb131e559b3ed8ee3622d6

修改

3 files modified

	src/styles/base/index.scss	6 ●●●●● patch \| view \| raw \| blame \| history
	src/styles/media/index.scss	60 ●●●●● patch \| view \| raw \| blame \| history
	src/views/house/index.vue	113 ●●●●● patch \| view \| raw \| blame \| history

 src/styles/base/index.scss

@@ -452,8 +452,12 @@
            flex: 1;
        }

        .el-main {
            width: 100%;
            padding: 0;
        }

        .el-table {
            height: calc(100% - 40px);
            margin-bottom: 10px;
        }


 src/styles/media/index.scss

@@ -2080,13 +2080,71 @@
                    .keyPerson-details-box {
                        .el-dialog {
                            width: countSizeVw(1000, 1920);
                            height: countSizeVh(700);
                            height: countSizeVh(800);
                        }

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

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

                        .el-dialog__header {
                            height: countSizeVh(40);
                            line-height: countSizeVh(40);
                        }

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

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

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

                        .el-table {
                            height: calc(100% - countSizeVh(50));

                            margin-bottom: countSizeVh(10);
                        }

                        .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 {

 src/views/house/index.vue

@@ -33,39 +33,39 @@
            <div v-show="contentShow" class="result-content" ref="resultContentBox">
                <el-main v-loading="villageInfoLoading" element-loading-background="rgba(0, 0, 0, 0.2)"
                    element-loading-text="数据正在加载中" element-loading-spinner="el-icon-loading">
                
                <div class="housing-estate-info" ref="housingEstateInfoBox">
                    <div class="housing-title">
                        {{ villageInfo.name }}
                        <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>
                    </div>
                    <div class="housing-introduce">
                        <div>
                            <div class="l">分类属性：</div>
                            <div class="r">{{ villageInfo.type_name ? villageInfo.type_name : '暂无数据' }}</div>
                    <div class="housing-estate-info" ref="housingEstateInfoBox">
                        <div class="housing-title">
                            {{ villageInfo.name }}
                            <div class="progress"></div>
                        </div>
                        <div>
                            <div class="l">所属辖区：</div>
                            <div class="r">{{ villageInfo.policeStationName ? villageInfo.policeStationName : '暂无数据' }}
                        <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>
                        </div>
                        <div class="housing-introduce">
                            <div>
                                <div class="l">分类属性：</div>
                                <div class="r">{{ villageInfo.type_name ? villageInfo.type_name : '暂无数据' }}</div>
                            </div>
                            <div>
                                <div class="l">所属辖区：</div>
                                <div class="r">{{ villageInfo.policeStationName ? villageInfo.policeStationName : '暂无数据' }}
                                </div>
                            </div>
                            <div>
                                <div class="l">责任民警：</div>
                                <div class="r">{{ villageInfo.policeName ? villageInfo.policeName : '暂无数据' }}</div>
                            </div>
                            <div>
                                <div class="l">标准地址：</div>
                                <div class="r">{{ villageInfo.address ? villageInfo.address : '暂无数据' }}</div>
                            </div>
                        </div>
                        <div>
                            <div class="l">责任民警：</div>
                            <div class="r">{{ villageInfo.policeName ? villageInfo.policeName : '暂无数据' }}</div>
                        </div>
                        <div>
                            <div class="l">标准地址：</div>
                            <div class="r">{{ villageInfo.address ? villageInfo.address : '暂无数据' }}</div>
                        </div>
                    </div>
                </div>
                </el-main>


@@ -185,7 +185,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>
@@ -352,29 +352,32 @@
                <el-button type="primary" icon="el-icon-search" @click="searchPeopleDetail">搜索</el-button>
                <el-button type="primary" icon="el-icon-delete" @click="clearPeopleDetailSearchValue">清空</el-button>
            </div>
            <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' }"
                v-loading="keyPeopleLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                element-loading-background="rgba(17, 38, 163, 1)">
                <el-table-column label="序号" type="index" width="50" align="center">
                    <template slot-scope="scope">
                        <span>{{ (peoplePage.currentPage - 1) * peoplePage.pageSize + scope.$index + 1 }}</span>
                    </template>
                </el-table-column>
                <el-table-column prop="zdryxl" label="重点人员类型" v-if="keyPeopleType == 2"></el-table-column>
                <el-table-column prop="realName" label="姓名"></el-table-column>
                <el-table-column prop="cardNo" label="身份证号"></el-table-column>
                <el-table-column prop="address" label="地址" v-if="false"></el-table-column>
                <el-table-column prop="phone" label="电话"></el-table-column>
                <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">
                <el-pagination background layout="prev, pager, next" :page-size="peoplePage.pageSize"
                    :total="peoplePage.total" :current-page="peoplePage.currentPage"
                    @current-change="peopleHandleCurrentChange"></el-pagination>
            </div>
            <el-main v-loading="keyPeopleLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                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' }"
                    :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>
                        </template>
                    </el-table-column>
                    <el-table-column prop="zdryxl" label="重点人员类型" v-if="keyPeopleType == 2"></el-table-column>
                    <el-table-column prop="realName" label="姓名"></el-table-column>
                    <el-table-column prop="cardNo" label="身份证号"></el-table-column>
                    <el-table-column prop="address" label="地址" v-if="false"></el-table-column>
                    <el-table-column prop="phone" label="电话"></el-table-column>
                    <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">
                    <el-pagination background layout="prev, pager, next" :page-size="peoplePage.pageSize"
                        :total="peoplePage.total" :current-page="peoplePage.currentPage"
                        @current-change="peopleHandleCurrentChange"></el-pagination>
                </div>
            </el-main>

        </el-dialog>
    </div>
</template>
@@ -409,6 +412,7 @@
        return {
            // 下拉搜索--树状数据相关
            searchTreeShowFlag: false,
            peopleNoDataText: '暂无人口数据',
            keyPeopleLoading: false,
            isHaveNoPic: false,
            residentLoading: false,
@@ -1104,6 +1108,7 @@
            this.keyPeopleType = status
            this.peoplePage.currentPage = 1
            this.keyPersonTitle = status == 1 ? "户籍人口详情" : "重点人口详情"
            this.peopleNoDataText = status == 1 ? "暂无户籍人口数据" : "暂无重点人口数据"
            this.keyPeopleLoading = true
            this.getVillagePersonInfo(
                "",
@@ -1809,7 +1814,7 @@
                                flex: 1;
                                display: flex;
                                justify-content: center;
                                border-right: 1px solid #fff;
                                border-right: 1px solid #fff !important;

                                &>div {
                                    cursor: default;
@@ -1828,7 +1833,7 @@
                            }

                            &>div:last-child {
                                border: none;
                                border-right: 1px solid transparent !important;
                            }
                        }
                    }

			@@ -452,8 +452,12 @@
			flex: 1;
			}

			.el-main {
			width: 100%;
			padding: 0;
			}

			.el-table {
			height: calc(100% - 40px);
			margin-bottom: 10px;
			}

			@@ -2080,13 +2080,71 @@
			.keyPerson-details-box {
			.el-dialog {
			width: countSizeVw(1000, 1920);
			height: countSizeVh(700);
			height: countSizeVh(800);
			}

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

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

			.el-dialog__header {
			height: countSizeVh(40);
			line-height: countSizeVh(40);
			}

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

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

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

			.el-table {
			height: calc(100% - countSizeVh(50));

			margin-bottom: countSizeVh(10);
			}

			.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 {

			@@ -33,39 +33,39 @@
			<div v-show="contentShow" class="result-content" ref="resultContentBox">
			<el-main v-loading="villageInfoLoading" element-loading-background="rgba(0, 0, 0, 0.2)"
			element-loading-text="数据正在加载中" element-loading-spinner="el-icon-loading">

			<div class="housing-estate-info" ref="housingEstateInfoBox">
			<div class="housing-title">
			{{ villageInfo.name }}
			<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>
			</div>
			<div class="housing-introduce">
			<div>
			<div class="l">分类属性：</div>
			<div class="r">{{ villageInfo.type_name ? villageInfo.type_name : '暂无数据' }}</div>
			<div class="housing-estate-info" ref="housingEstateInfoBox">
			<div class="housing-title">
			{{ villageInfo.name }}
			<div class="progress"></div>
			</div>
			<div>
			<div class="l">所属辖区：</div>
			<div class="r">{{ villageInfo.policeStationName ? villageInfo.policeStationName : '暂无数据' }}
			<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>
			</div>
			<div class="housing-introduce">
			<div>
			<div class="l">分类属性：</div>
			<div class="r">{{ villageInfo.type_name ? villageInfo.type_name : '暂无数据' }}</div>
			</div>
			<div>
			<div class="l">所属辖区：</div>
			<div class="r">{{ villageInfo.policeStationName ? villageInfo.policeStationName : '暂无数据' }}
			</div>
			</div>
			<div>
			<div class="l">责任民警：</div>
			<div class="r">{{ villageInfo.policeName ? villageInfo.policeName : '暂无数据' }}</div>
			</div>
			<div>
			<div class="l">标准地址：</div>
			<div class="r">{{ villageInfo.address ? villageInfo.address : '暂无数据' }}</div>
			</div>
			</div>
			<div>
			<div class="l">责任民警：</div>
			<div class="r">{{ villageInfo.policeName ? villageInfo.policeName : '暂无数据' }}</div>
			</div>
			<div>
			<div class="l">标准地址：</div>
			<div class="r">{{ villageInfo.address ? villageInfo.address : '暂无数据' }}</div>
			</div>
			</div>
			</div>
			</el-main>


			@@ -185,7 +185,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>
			@@ -352,29 +352,32 @@
			<el-button type="primary" icon="el-icon-search" @click="searchPeopleDetail">搜索</el-button>
			<el-button type="primary" icon="el-icon-delete" @click="clearPeopleDetailSearchValue">清空</el-button>
			</div>
			<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' }"
			v-loading="keyPeopleLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
			element-loading-background="rgba(17, 38, 163, 1)">
			<el-table-column label="序号" type="index" width="50" align="center">
			<template slot-scope="scope">
			<span>{{ (peoplePage.currentPage - 1) * peoplePage.pageSize + scope.$index + 1 }}</span>
			</template>
			</el-table-column>
			<el-table-column prop="zdryxl" label="重点人员类型" v-if="keyPeopleType == 2"></el-table-column>
			<el-table-column prop="realName" label="姓名"></el-table-column>
			<el-table-column prop="cardNo" label="身份证号"></el-table-column>
			<el-table-column prop="address" label="地址" v-if="false"></el-table-column>
			<el-table-column prop="phone" label="电话"></el-table-column>
			<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">
			<el-pagination background layout="prev, pager, next" :page-size="peoplePage.pageSize"
			:total="peoplePage.total" :current-page="peoplePage.currentPage"
			@current-change="peopleHandleCurrentChange"></el-pagination>
			</div>
			<el-main v-loading="keyPeopleLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
			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' }"
			: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>
			</template>
			</el-table-column>
			<el-table-column prop="zdryxl" label="重点人员类型" v-if="keyPeopleType == 2"></el-table-column>
			<el-table-column prop="realName" label="姓名"></el-table-column>
			<el-table-column prop="cardNo" label="身份证号"></el-table-column>
			<el-table-column prop="address" label="地址" v-if="false"></el-table-column>
			<el-table-column prop="phone" label="电话"></el-table-column>
			<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">
			<el-pagination background layout="prev, pager, next" :page-size="peoplePage.pageSize"
			:total="peoplePage.total" :current-page="peoplePage.currentPage"
			@current-change="peopleHandleCurrentChange"></el-pagination>
			</div>
			</el-main>

			</el-dialog>
			</div>
			</template>
			@@ -409,6 +412,7 @@
			return {
			// 下拉搜索--树状数据相关
			searchTreeShowFlag: false,
			peopleNoDataText: '暂无人口数据',
			keyPeopleLoading: false,
			isHaveNoPic: false,
			residentLoading: false,
			@@ -1104,6 +1108,7 @@
			this.keyPeopleType = status
			this.peoplePage.currentPage = 1
			this.keyPersonTitle = status == 1 ? "户籍人口详情" : "重点人口详情"
			this.peopleNoDataText = status == 1 ? "暂无户籍人口数据" : "暂无重点人口数据"
			this.keyPeopleLoading = true
			this.getVillagePersonInfo(
			"",
			@@ -1809,7 +1814,7 @@
			flex: 1;
			display: flex;
			justify-content: center;
			border-right: 1px solid #fff;
			border-right: 1px solid #fff !important;

			&>div {
			cursor: default;
			@@ -1828,7 +1833,7 @@
			}

			&>div:last-child {
			border: none;
			border-right: 1px solid transparent !important;
			}
			}
			}