guanqb
2024-01-25 ce8dc44aa8bc69819da87d33d14a7734deeb140d
扫码应用分页加loading、智能搜索接口对接
3 files modified
181 ■■■■■ changed files
src/api/dept/index.js 9 ●●●●● patch | view | raw | blame | history
src/views/intelligentSearch/index.vue 149 ●●●● patch | view | raw | blame | history
src/views/scanOrCode/index.vue 23 ●●●●● patch | view | raw | blame | history
src/api/dept/index.js
@@ -282,6 +282,15 @@
    })
}
// 户籍人口、重点人口信息-----智能搜索
export const getVillagePersonInfoBySearch = (params) => {
    return request({
        url: `/api/villagePersonInfo/villagePersonInfo/page`,
        method: 'get',
        params
    })
}
// 户籍人口、重点人口信息
export const getPicURL = (resBusId) => {
    return request({
src/views/intelligentSearch/index.vue
@@ -14,7 +14,7 @@
        <div v-show="boxShow" class="container-content" ref="containerContent">
            <div class="time-select" ref="timeSelect">
                <div class="search-item-box">
                    <el-input size="small" placeholder="请输入(姓名、手机号、身份证号、住址)" v-model="searchText" clearable></el-input>
                    <el-input size="small" placeholder="请输入(姓名、手机号、身份证号、住址)" v-model="searchKey" clearable></el-input>
                    <el-button @click="searchBtn" icon="el-icon-search" class="bjnr-btn">搜索</el-button>
                    <el-button @click="clearRow" icon="el-icon-delete" class="bjnr-btn">清除</el-button>
                </div>
@@ -25,9 +25,9 @@
                    :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                    :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }"
                    :row-class-name="tableRowClassName" class="police-infor-table">
                    <el-table-column prop="name" :show-overflow-tooltip="true" label="姓名"></el-table-column>
                    <el-table-column prop="tel" :show-overflow-tooltip="true" label="手机号"></el-table-column>
                    <el-table-column prop="card" :show-overflow-tooltip="true" label="身份证号"></el-table-column>
                    <el-table-column prop="realName" :show-overflow-tooltip="true" label="姓名"></el-table-column>
                    <el-table-column prop="phone" :show-overflow-tooltip="true" label="手机号"></el-table-column>
                    <el-table-column prop="cardNo" :show-overflow-tooltip="true" label="身份证号"></el-table-column>
                    <!-- <el-table-column prop="address" :show-overflow-tooltip="true" label="住址"></el-table-column> -->
                    <el-table-column label="操作" align="center">
                        <template slot-scope="scope">
@@ -56,6 +56,9 @@
<script>
import { initMapPosition } from '@/utils/mapPositionInit'
import {
    getVillagePersonInfoBySearch,
} from "@/api/dept/index.js"
let loading = null
@@ -65,15 +68,14 @@
    data () {
        return {
            popupTile: '详情信息',
            searchText: '',
            searchKey: '',
            realEmptyText: "",
            currentTableHeight: 0,
            tableData: [],
            boxShow: false,
            pages: {
                total: 0,
                pageSize: 22,
                pageSize: 10,
                count: 0,
                currentPage: 1
            },
@@ -128,54 +130,64 @@
        getRowData (row) {
            let data = [
                {
                    label: '与户主关系',
                    prop: 'relation',
                    value: row.relation,
                    type: 'popup'
                },
                {
                    label: '名字',
                    prop: 'real_name',
                    value: row.name
                    prop: 'realName',
                    value: row.realName,
                    type: 'popup'
                },
                {
                    label: '身份证号',
                    prop: 'cardNo',
                    value: row.cardNo,
                    type: 'popup'
                },
                {
                    label: '人口类型',
                    prop: 'personType',
                    value: row.personType == 1 ? '户籍人口' : '实有人口',
                    type: 'popup'
                },
                {
                    label: '地址',
                    prop: 'address',
                    value: row.address
                },
                {
                    label: '身份证号',
                    prop: 'card_no',
                    value: '362121199212246538'
                    value: row.address,
                    type: 'popup'
                },
                {
                    label: '新地址',
                    prop: 're_address',
                    value: '江西省上饶市'
                    prop: 'reAddress',
                    value: row.reAddress.replace('江西省上饶市', ''),
                    type: 'detail'
                },
                {
                    label: '审查状态',
                    prop: 'status',
                    value: '未审查'
                },
                {
                    label: '人口类型',
                    prop: 'person_type',
                    value: '户籍人口'
                },
                {
                    label: '社区局村委会',
                    prop: 'neightborhoood',
                    value: '某村委会'
                },
                {
                    label: '与户主关系',
                    prop: 'relation',
                    value: '夫妻'
                    value: row.status,
                    type: 'detail'
                },
                {
                    label: '审查时间',
                    prop: 'sctime',
                    value: '2023-12-12'
                    value: row.sctime,
                    type: 'detail'
                },
                {
                    label: '社区局村委会',
                    prop: 'neightborhoood',
                    value: row.neightborhoood,
                    type: 'detail'
                },
                {
                    label: '重点人员细类',
                    prop: 'zdryxl',
                    value: '无'
                    value: row.zdryxl,
                    type: 'detail'
                }
            ]
            return data
@@ -190,8 +202,8 @@
        // 点击定位
        rowClick (row) {
            this.$EventBus.$emit('toPosition', {
                siteJd: row.lng,
                siteWd: row.lat,
                siteJd: row.x,
                siteWd: row.y,
                siteGd: 200
            })
            this.$EventBus.$emit('mapClearLayer', {
@@ -203,8 +215,8 @@
                type: "billboard",
                params: {
                    ...row,
                    lng: row.lng,
                    lat: row.lat,
                    lng: row.x,
                    lat: row.y,
                    alt: 1,
                    url: `/img/icon/location.png`
                },
@@ -214,17 +226,15 @@
            this.$store.commit('SET_DIALOGDETAILPOPUP', true)
            this.$store.commit('SET_DIALOGDETAILPOPUPDATA', {
                ...data
            })
            this.$store.commit('SET_DIALOGDETAILPOPUPDATA', data)
            // 商业模拟数据
            var dialogDetailPopup = new global.DC.DivForms(global.viewer, {
                domId: 'dialogDetailPopup',
                position: [
                    global.DC.Transform.transformWGS84ToCartesian(
                        new global.DC.Position(
                            Number(row.lng),
                            Number(row.lat),
                            Number(row.x),
                            Number(row.y),
                            0
                        )
                    )
@@ -243,39 +253,32 @@
        // 获取列表
        getList () {
            this.loading()
            let params = {
                searchText: this.searchText,
                searchKey: this.searchKey,
                size: this.pages.pageSize,
                current: this.pages.currentPage
                current: this.pages.currentPage,
                detpt: JSON.parse(sessionStorage.getItem("userInfo")).dept_id
            }
            console.log('getList', params)
            this.tableData = [
                {
                    name: '张三',
                    tel: '13366668888',
                    lng: 112.22,
                    lat: 33.22,
                    card: '362123199912125454',
                    address: '江西省上饶市某某区某某街道某某小区某栋111'
                },
                {
                    name: '李四',
                    tel: '13366668877',
                    lng: 124.22,
                    lat: 30.22,
                    card: '362123199912125454',
                    address: '江西省上饶市某某区某某街道某某小区某栋222'
                },
                {
                    name: '王五',
                    tel: '13366668866',
                    lng: 126.22,
                    lat: 36.22,
                    card: '362123199912125454',
                    address: '江西省上饶市某某区某某街道某某小区某栋133'
            getVillagePersonInfoBySearch(params).then(res => {
                console.log('getVillagePersonInfoBySearch', res.data.data.records)
                if (res.data.data.records.length > 0) {
                    res.data.data.records.forEach(item => {
                        if (item.status == 0) {
                            item.status = '未审查'
                        } else if (item.status == 1) {
                            item.status = '审查正常'
                        } else if (item.status == 2) {
                            item.status = '审查异常'
                        }
                    })
                }
            ]
            this.pages.total = 30
                this.tableData = res.data.data.records
                this.pages.total = res.data.data.total
                setTimeout(() => {
                    loading && loading.close()
                }, 500)
            })
        },
        searchBtn () {
src/views/scanOrCode/index.vue
@@ -611,6 +611,7 @@
        // 获取列表
        getList () {
            this.loading()
            let params = {
                searchKey: this.searchKey,
                size: this.pages.pageSize,
@@ -627,8 +628,6 @@
            } else if (this.typeValue == 5) {//扫码上报
                this.getAddressManageList(params)
            }
        },
        searchBtn () {
@@ -672,6 +671,10 @@
        getAppOwerRenterRegistrantList (params) {
            getAppOwerRenterRegistrantList(params).then(res => {
                this.tableData = res.data.data.records
                this.pages.total = res.data.data.total
                setTimeout(() => {
                    loading && loading.close()
                }, 500)
            })
        },
@@ -679,6 +682,10 @@
        getAppOwerRenterRegistrantCohabitList (params) {
            getAppOwerRenterRegistrantCohabitList(params).then(res => {
                this.tableData = res.data.data.records
                this.pages.total = res.data.data.total
                setTimeout(() => {
                    loading && loading.close()
                }, 500)
            })
        },
@@ -697,6 +704,10 @@
                    })
                }
                this.tableData = res.data.data.records
                this.pages.total = res.data.data.total
                setTimeout(() => {
                    loading && loading.close()
                }, 500)
            })
        },
@@ -704,6 +715,10 @@
        getAppEmploymentRegistrationList (params) {
            getAppEmploymentRegistrationList(params).then(res => {
                this.tableData = res.data.data.records
                this.pages.total = res.data.data.total
                setTimeout(() => {
                    loading && loading.close()
                }, 500)
            })
        },
@@ -729,6 +744,10 @@
                    })
                }
                this.tableData = res.data.data.records
                this.pages.total = res.data.data.total
                setTimeout(() => {
                    loading && loading.close()
                }, 500)
            })
        },