Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

guanqb

2023-01-16 ef7dffeb01cacc18fcc2d7df4f55ca3067221db7

Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

 src/api/dept/index.js

@@ -233,14 +233,16 @@
}

// 获取该责任区下的人员列表信息
export const getAreaPage = (current, size, areaId) => {
export const getAreaPage = (current, size, areaId,policeName,phone) => {
    return request({
        url: `/api/policeStationInfo/policeStationInfo/getAreaPage`,
        method: 'get',
        params: {
            current,
            size,
            areaId
            areaId,
            policeName,
            phone
        }
    })
}

 src/styles/base/index.scss

@@ -255,7 +255,7 @@
        .el-dialog__body {
            flex: 1;
            display: flex;
            flex-direction: row;
            flex-direction: column;
            flex-wrap: wrap;
            justify-self: flex-start;
            align-content: flex-start;
@@ -282,6 +282,48 @@
                }
            }
        }
    }

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

    }
}

@@ -332,7 +374,7 @@
            flex: 1;
            .el-table th.el-table__cell>.cell{
                font-size:  16px;
            } 
            }
        }

        .header {
@@ -374,7 +416,7 @@
            .el-button{
                padding: 6px 10px;
            }
            

        }
    }
}
@@ -409,7 +451,7 @@
            flex: 1;
            .el-table th.el-table__cell>.cell{
                font-size:  16px;
            } 
            }
        }
        .el-table {
            height: calc(100% - 40px);
@@ -713,4 +755,4 @@
.select-on-tab {
    box-shadow: 0 2px 2px $menu-tab-shadow;
    color: #fff;
}
}

 src/views/home/index.vue

@@ -582,6 +582,11 @@
                pageSize: 5,
                currentPage: 1
            },
            peopleSearchQuery: {
                id: "",
                policeName: "",
                phone: "",
            },
            houseList: [],
            carList: [],
            cameraList: [],
@@ -1311,9 +1316,8 @@

        showpeopledetail (id, name) {
            this.peopleTitle = name
            this.peopleId = id
            this.getPeopleInfoList()
            this.peopleVisible = true
            this.peopleSearchQuery.id = id
            this.getPeopleInfoList(this.peopleSearchQuery.id, "", "")
        },

        getPeopleInfoList () {