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

shuishen

2023-01-15 c307d9d1ea6e65d8478307ce134a2f76454f1717

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

 src/api/home/index.js

@@ -138,4 +138,18 @@
            deviceId: '36110000002009999000'
        }
    })
}

// 获取现有地详情弹窗
export const getLandDetail = (type, policeStationId, policeName, phone) => {
    return request({
        url: `/api/policeStationInfo/policeStationInfo/page`,
        method: 'get',
        params: {
            type,
            policeStationId,
            policeName,
            phone
        }
    })
}

 src/styles/base/index.scss

@@ -308,13 +308,73 @@
        display: flex;
        flex-direction: column;
        width: 630px;
        height: 300px;
        height: 500px;
        top: 50%;
        left: 50% !important;
        transform: translate(-50%, -50%);

        .el-dialog__header {
            height:40px;
            line-height: 40px;
        }

        .el-table__header-wrapper {
            height:60px;
            line-height: 60px;
        }
        .el-table .cell{
            font-size:  16px;
            height: 30px;
            line-height: 30px;
        }

        .el-dialog__body {
            flex: 1;
            .el-table th.el-table__cell>.cell{
                font-size:  16px;
            } 
        }

        .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{
                padding: 6px 10px;
            }
            
        }
    }
}

 src/styles/media/index.scss

@@ -1987,12 +1987,21 @@
                    }

                    .land-details-box {
                       .el-dialog__header {
                        height: countSizeVh(40);
                        line-height: countSizeVh(40);
                    }
                       .el-table__header-wrapper {
                            height: countSizeVh(60);
                            line-height: countSizeVh(40);
                        }
                        .el-dialog__header span {
                            font-size: countSizeVh(18);
                        }

                        .el-dialog .el-dialog__body {
                            font-size: countSizeVh(16);
                            height: calc(100% - countSizeVh(100));
                        }

                        .el-dialog__header button {
@@ -2002,7 +2011,49 @@

                        .el-dialog {
                            width: countSizeVw(630, 1920);
                            height: countSizeVh(300);
                            height: countSizeVh(500);
                        }

                        .el-table th.el-table__cell>.cell{
                            font-size:  countSizeVh(16);
                        }

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

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

                        .header {
                            margin-bottom:  countSizeVh(10);
                            padding-left:  countSizeVh(10);
                            
                            &>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-radius:  countSizeVh(5);
                                }
                            }
                            &>div:first-child input{
                                width: countSizeVw(120, 1920);
                            }
                            .el-button--primary {
                                border:  countSizeVh(1) solid rgba(29, 92, 228, 0.6);
                            }
                            .el-button{
                                padding:  countSizeVh(6) countSizeVw(10, 1920);
                                font-size:  countSizeVh(16);
                            }
                        }
                    }


 src/views/home/components/leftContainer.vue

@@ -214,20 +214,6 @@
            ],
            peopleTitle: '',
            peopleVisible: false,
            landDetailArr1: [
                { 'housingEastate': '阳光小区', 'location': 'XXXXXXXX', 'area': '2122亩', 'superintendent': '王大壮', 'phone': '154XXXX6666' },
                { 'housingEastate': '美丽小区', 'location': 'XXXXXXXX', 'area': '1335亩', 'superintendent': '王二壮', 'phone': '154XXXX6666' },
                { 'housingEastate': '快乐小区', 'location': 'XXXXXXXX', 'area': '4122亩', 'superintendent': '王三壮', 'phone': '154XXXX6666' },
                { 'housingEastate': '健康小区', 'location': 'XXXXXXXX', 'area': '2555亩', 'superintendent': '王四壮', 'phone': '154XXXX6666' },
                { 'housingEastate': '斯哒地小区', 'location': 'XXXXXX', 'area': '1922亩', 'superintendent': '王美丽', 'phone': '154XXXX6666' },
            ],
            landDetailArr2: [
                { 'housingEastate': '责任区1', 'location': 'XXXXXXXX', 'area': '2122亩', 'superintendent': '王大壮', 'phone': '154XXXX6666' },
                { 'housingEastate': '责任区2', 'location': 'XXXXXXXX', 'area': '1335亩', 'superintendent': '王二壮', 'phone': '154XXXX6666' },
                { 'housingEastate': '责任区3', 'location': 'XXXXXXXX', 'area': '4122亩', 'superintendent': '王三壮', 'phone': '154XXXX6666' },
                { 'housingEastate': '责任区4', 'location': 'XXXXXXXX', 'area': '2555亩', 'superintendent': '王四壮', 'phone': '154XXXX6666' },
                { 'housingEastate': '责任区5', 'location': 'XXXXXX', 'area': '1922亩', 'superintendent': '王美丽', 'phone': '154XXXX6666' },
            ],
            keyPersonDetailArr: [
                { name: '张某某', sex: '女', 'address': 'XXXXXX', 'phone': '132XXXX6666', 'policeStation': '车站所', 'housingEastate': '责任区1', 'type': '涉恐人员' },
                { name: '李某某', sex: '男', 'address': 'XXXXXX', 'phone': '132XXXX6666', 'policeStation': '车站所', 'housingEastate': '责任区2', 'type': '涉稳人员' },
@@ -790,12 +776,10 @@

        clickLandChart () {
            landMyChart.on('click', params => {
                this.landVisible = true
                this.landTitle = params.name
                if (this.tabTypeThree == 0) {
                    this.$emit('showlanddetail', params.name, this.landDetailArr1)
                    this.$emit('showlanddetail', params.name, 2, params.data.id)
                } else {
                    this.$emit('showlanddetail', params.name, this.landDetailArr2)
                    this.$emit('showlanddetail', params.name, 1, params.data.id)
                }
            })
        },
@@ -1018,7 +1002,7 @@
                    let countArr = []
                    res.data.data.data.forEach(item => {
                        nameArr.push(item.name.replace('派出', ''))
                        countArr.push(item.count)
                        countArr.push({ value: item.count, id: item.id })
                    })
                    this.villageOptionData = [nameArr, countArr]
                } else {
@@ -1028,7 +1012,7 @@
                    let countArr = []
                    res.data.data.data.forEach(item => {
                        nameArr.push(item.name.replace('派出', ''))
                        countArr.push(item.count)
                        countArr.push({ value: item.count, id: item.id })
                    })
                    this.areaOptionData = [nameArr, countArr]
                }
@@ -1036,6 +1020,10 @@
            })
        },





    },

    destroyed () {

 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-01-14 11:32:08
 * @LastEditTime: 2023-01-15 15:49:07
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 *
@@ -35,10 +35,10 @@
            </div>
            <!-- <div class="layers-control-btn moitor">
                <el-checkbox v-model="monitoringLayerShow" @change="monitoringChange">监控</el-checkbox>
            </div> -->
            </div>-->
            <!-- <div class="layers-control-btn panorama">
                <el-checkbox v-model="panoramaLayerShow" @change="panoramaChange">全景</el-checkbox>
            </div> -->
            </div>-->
            <div class="layers-control-btn police-situation">
                <el-checkbox v-model="policeSituationLayerShow" @change="policeSituationChange">警情</el-checkbox>
            </div>
@@ -137,14 +137,26 @@

        <el-dialog :title="landTitle" :modal="true" :visible.sync="landVisible" :before-close="landBeforeClose"
            :close-on-click-modal="true" class="land-details-box">
            <div class="header">
                <div>
                    负责人：
                    <input type="text" v-model="policeName" placeholder="请输入负责人名称" />
                </div>
                <div>
                    联系电话：
                    <input type="text" v-model="callPhone" placeholder="请输入联系电话" />
                </div>
                <el-button type="primary" icon="el-icon-search" @click="searchLandDetail">搜索</el-button>
                <el-button type="primary" icon="el-icon-delete" @click="clearLandDetailSearchValue">清空</el-button>
            </div>

            <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': 'pointer' }">
                <el-table-column prop="housingEastate" label="小区名称" width="100"></el-table-column>
                <el-table-column prop="location" label="位置" width="140"></el-table-column>
                <el-table-column prop="area" label="面积" width="120"></el-table-column>
                <el-table-column prop="superintendent" label="负责人" width="120"></el-table-column>
                <el-table-column prop="phone" label="联系电话" width="120"></el-table-column>
                <el-table-column prop="name" label="责任区名称" v-if="this.landType == 1"></el-table-column>
                <el-table-column prop="aoiName" label="小区名称" v-if="this.landType == 2"></el-table-column>
                <el-table-column prop="policeName" label="负责人"></el-table-column>
                <el-table-column prop="phone" label="联系电话"></el-table-column>
            </el-table>
        </el-dialog>

@@ -404,7 +416,7 @@
import { convertStringToList } from "@/utils/geometryStringTool"

import { getDevices } from '@/api/video/index.js'
import { getActAsPoliceList, getEquipmentPaging, getPoliceStationTree, getEquipmentAll } from "@/api/home/index.js"
import { getActAsPoliceList, getEquipmentPaging, getPoliceStationTree, getEquipmentAll, getLandDetail } from "@/api/home/index.js"

export default {
    data () {
@@ -481,6 +493,9 @@
            policeSituationHistoryType: 0,
            policeSituationDetailObj: {},
            CJdata: {},
            landType: '',
            policeName: '',
            callPhone: '',

        }
    },
@@ -505,6 +520,7 @@

        this.getEquipmentAll({ type: 0 })
        this.getEquipmentAll({ type: 1 })

    },

    mounted () {
@@ -1149,10 +1165,12 @@
            this.peopleVisible = true
        },

        showlanddetail (name, arr) {
        showlanddetail (name, type, id) {
            this.landVisible = true
            this.landTitle = name
            this.landDetailArr = arr
            this.landType = type
            this.landDetailId = id
            this.getLandDetail(type, id, '', '')
        },

        // 获取设备分页数据
@@ -1333,6 +1351,23 @@
            return index + 1
        },

        clearLandDetailSearchValue () {
            this.policeName = ''
            this.callPhone = ''
            this.getLandDetail(this.landType, this.landDetailId, this.policeName, this.callPhone)
        },

        searchLandDetail () {
            console.log(666)
            this.getLandDetail(this.landType, this.landDetailId, this.policeName, this.callPhone)
        },

        getLandDetail (type, policeStationId, policeName, phone) {
            getLandDetail(type, policeStationId, policeName, phone).then(res => {
                this.landDetailArr = res.data.data.records
            })
        },


    },


 src/views/house/index.vue

@@ -582,20 +582,6 @@
                <el-table-column prop="phone" label="电话"></el-table-column>
                <el-table-column prop="cardNo" label="身份证号"></el-table-column>
            </el-table>
            <!-- <h3 style="text-align:left;margin:10px 0 10px 0">户室人员信息</h3> -->
            <!-- <el-table
                :data="houseDate"
                :header-cell-style="{'text-align':'center','background-color':'#203c60','borderColor':'#324e75'}"
                :cell-style="{'text-align':'center','borderColor':'#324e75'}"
            >
                <el-table-column prop="name" label="姓名"></el-table-column>
                <el-table-column prop="peopleType" label="重点人员"></el-table-column>
                <el-table-column prop="nation" label="民族"></el-table-column>
                <el-table-column prop="sex" label="性别"></el-table-column>
                <el-table-column prop="age" label="年龄"></el-table-column>
                <el-table-column prop="telephone" label="电话" width="120"></el-table-column>
                <el-table-column prop="workplace" label="工作地" width="180"></el-table-column>
            </el-table>-->
        </el-dialog>

        <el-dialog