From a66a9f47fe6ae37f347e081669b1ccb29bbbbdfd Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 10 Feb 2023 10:25:15 +0800
Subject: [PATCH] 现有人员，责任区-人员列表显示
---
src/styles/base/index.scss | 73 +++++++++-----
src/styles/media/index.scss | 5
src/views/home/index.vue | 159 ++++++++++++++++---------------
src/api/dept/index.js | 39 ++++---
src/views/home/components/leftContainer.vue | 4
5 files changed, 153 insertions(+), 127 deletions(-)
diff --git a/src/api/dept/index.js b/src/api/dept/index.js
index ec958de..61ca695 100644
--- a/src/api/dept/index.js
+++ b/src/api/dept/index.js
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2022-11-30 15:18:29
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2023-02-03 11:50:17
+ * @LastEditTime: 2023-02-10 10:22:04
* @FilePath: \srs-police-affairs\src\api\dept\index.js
* @Description:
*
@@ -290,7 +290,27 @@
})
}
-// 获取该责任区下的人员列表信息
+// 获取现有房屋
+export const getHouseStatisticInfo = (deptId, isFollow) => {
+ return request({
+ url: `/api/houseStatistic/houseStatistic/getHouseStatisticInfo`,
+ method: 'get',
+ params: {
+ deptId,
+ isFollow
+ }
+ })
+}
+
+/**
+ * @description: 原来获取户籍人口下责任区-人口信息，已作废
+ * @param {*} current
+ * @param {*} areaId
+ * @param {*} policeName
+ * @param {*} phone
+ * @param {*} size
+ * @return {*}
+ */
export const getAreaPage = (current, areaId, policeName, phone, size) => {
return request({
url: `/api/policeStationInfo/policeStationInfo/getAreaPage`,
@@ -303,17 +323,4 @@
size
}
})
-}
-
-
-// 获取现有房屋
-export const getHouseStatisticInfo = (deptId, isFollow) => {
- return request({
- url: `/api/houseStatistic/houseStatistic/getHouseStatisticInfo`,
- method: 'get',
- params: {
- deptId,
- isFollow
- }
- })
-}
+}
\ No newline at end of file
diff --git a/src/styles/base/index.scss b/src/styles/base/index.scss
index 6a1dab2..a8db6f8 100644
--- a/src/styles/base/index.scss
+++ b/src/styles/base/index.scss
@@ -241,8 +241,8 @@
margin: 0 !important;
display: flex;
flex-direction: column;
- width: 700px;
- height: 400px;
+ width: 1000px;
+ height: 700px;
top: 50%;
left: 50% !important;
transform: translate(-50%, -50%);
@@ -288,7 +288,8 @@
display: flex;
margin-bottom: 10px;
padding-left: 10px;
- &>div{
+
+ &>div {
display: flex;
height: 32px;
line-height: 32px;
@@ -313,14 +314,17 @@
color: rgba(238, 238, 238, 0.7);
}
}
- &>div:first-child input{
+
+ &>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{
+
+ .el-button {
padding: 6px 10px;
}
@@ -356,28 +360,31 @@
transform: translate(-50%, -50%);
.el-dialog__header {
- height:40px;
+ height: 40px;
line-height: 40px;
}
.el-table__header-wrapper {
- height:60px;
+ height: 60px;
line-height: 60px;
}
- .el-table .cell{
- font-size: 16px;
+
+ .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;
+
+ .el-table th.el-table__cell>.cell {
+ font-size: 16px;
}
}
+
.el-pagination.is-background .el-pager li:not(.disabled).active {
- color: #C0C4CC!important;
+ color: #C0C4CC !important;
}
@@ -385,7 +392,8 @@
display: flex;
margin-bottom: 10px;
padding-left: 10px;
- &>div{
+
+ &>div {
display: flex;
height: 32px;
line-height: 32px;
@@ -410,14 +418,17 @@
color: rgba(238, 238, 238, 0.7);
}
}
- &>div:first-child input{
+
+ &>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{
+
+ .el-button {
padding: 6px 10px;
}
@@ -437,39 +448,44 @@
transform: translate(-50%, -50%);
.el-dialog__header {
- height:40px;
+ height: 40px;
line-height: 40px;
}
.el-table__header-wrapper {
- height:60px;
+ height: 60px;
line-height: 60px;
}
- .el-table .cell{
- font-size: 16px;
+
+ .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;
+
+ .el-table th.el-table__cell>.cell {
+ font-size: 16px;
}
}
+
.el-table {
height: calc(100% - 40px);
margin-bottom: 10px;
}
+
.el-pagination.is-background .el-pager li:not(.disabled).active {
- color: #C0C4CC!important;
+ color: #C0C4CC !important;
}
.header {
display: flex;
margin-bottom: 10px;
padding-left: 10px;
- &>div{
+
+ &>div {
display: flex;
height: 32px;
line-height: 32px;
@@ -494,17 +510,20 @@
color: rgba(238, 238, 238, 0.7);
}
}
- &>div:first-child input{
+
+ &>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{
+
+ .el-button {
padding: 6px 10px;
}
-
+
}
}
}
@@ -759,4 +778,4 @@
.select-on-tab {
box-shadow: 0 2px 2px $menu-tab-shadow;
color: #fff;
-}
+}
\ No newline at end of file
diff --git a/src/styles/media/index.scss b/src/styles/media/index.scss
index 428dc89..0cd1d64 100644
--- a/src/styles/media/index.scss
+++ b/src/styles/media/index.scss
@@ -1953,8 +1953,8 @@
}
.el-dialog {
- width: countSizeVw(700, 1920);
- height: countSizeVh(400);
+ width: countSizeVw(1000, 1920);
+ height: countSizeVh(700);
}
.el-dialog .el-dialog__header {
@@ -2286,7 +2286,6 @@
.el-table__body-wrapper {
height: calc(100% - countSizeVh(60));
}
-
}
.policeSituation-details-box {
diff --git a/src/views/home/components/leftContainer.vue b/src/views/home/components/leftContainer.vue
index 1bf7451..09d8437 100644
--- a/src/views/home/components/leftContainer.vue
+++ b/src/views/home/components/leftContainer.vue
@@ -937,10 +937,6 @@
keyPersonmyChart.on('click', async params => {
this.$emit('showkeypersondetail', params.name)
})
- /**
- * @description:
- * @return {*}
- */
},
/**
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index e9e44be..2784233 100644
--- a/src/views/home/index.vue
+++ b/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-02-09 10:07:57
+ * @LastEditTime: 2023-02-10 10:20:15
* @FilePath: \srs-police-affairs\src\views\home\index.vue
* @Description: 小区-栋-层-房屋
*
@@ -85,8 +85,8 @@
:close-on-click-modal="true" class="area-details-box">
<div class="header">
<div>
- 负责人：
- <input type="text" v-model="peoplePoliceName" placeholder="请输入负责人名称" />
+ 人员名称：
+ <input type="text" v-model="peoplePoliceName" placeholder="请输入人员名称" />
</div>
<div>
联系电话：
@@ -95,24 +95,55 @@
<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="peopleInfoList" 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 label="序号" type="index" align="center">
- <template slot-scope="scope">
- <span>{{(peoplePage.currentPage - 1) * peoplePage.pageSize + scope.$index + 1}}</span>
- </template>
- </el-table-column>
- <el-table-column prop="name" label="责任区名称"></el-table-column>
- <el-table-column prop="policeName" label="负责人"></el-table-column>
- <el-table-column prop="phone" label="联系电话"></el-table-column>
- <el-table-column prop="areaNum" label="人口总数"></el-table-column>
+ <el-table-column prop="realName" label="姓名"></el-table-column>
+ <el-table-column prop="address" label="地址"></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" ref="tablePagination">
<el-pagination background layout="prev, pager, next" :page-size="peoplePage.pageSize"
:total="peoplePage.total" :current-page="peoplePage.currentPage"
@current-change="handlePeopleCurrentChange"></el-pagination>
+ </div>
+ </el-dialog>
+
+
+ <el-dialog :title="keyPersonTitle" :modal="true" :visible.sync="keyPersonVisible"
+ :before-close="personInfoClose" :close-on-click-modal="true" class="keyPerson-details-box">
+ <div class="header">
+ <div>
+ 人员名称：
+ <input type="text" v-model="peoplePoliceName" placeholder="请输入人员名称" />
+ </div>
+ <div>
+ 联系电话：
+ <input type="text" v-model="peopleCallPhone" placeholder="请输入联系电话" />
+ </div>
+ <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="keyPersonDetailArr" 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="zdryxl" label="重点人员类型"></el-table-column>
+ <el-table-column prop="realName" label="姓名"></el-table-column>
+ <el-table-column prop="address" label="地址"></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" ref="tablePagination">
+ <el-pagination background layout="prev, pager, next" :page-size="peoplePage.pageSize"
+ :total="peoplePage.total" :current-page="peoplePage.currentPage"
+ @current-change="handlePersonPageChange"></el-pagination>
</div>
</el-dialog>
@@ -182,39 +213,6 @@
<el-pagination background layout="prev, pager, next" :page-size="landPage.pageSize"
:total="landPage.total" :current-page="landPage.currentPage"
@current-change="landHandleCurrentChange"></el-pagination>
- </div>
- </el-dialog>
-
- <el-dialog :title="keyPersonTitle" :modal="true" :visible.sync="keyPersonVisible"
- :before-close="personInfoClose" :close-on-click-modal="true" class="keyPerson-details-box">
- <div class="header">
- <div>
- 人员名称：
- <input type="text" v-model="peoplePoliceName" placeholder="请输入人员名称" />
- </div>
- <div>
- 联系电话：
- <input type="text" v-model="peopleCallPhone" placeholder="请输入联系电话" />
- </div>
- <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="keyPersonDetailArr" 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="zdryxl" label="重点人员类型"></el-table-column>
- <el-table-column prop="realName" label="姓名"></el-table-column>
- <el-table-column prop="address" label="地址"></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" ref="tablePagination">
- <el-pagination background layout="prev, pager, next" :page-size="peoplePage.pageSize"
- :total="peoplePage.total" :current-page="peoplePage.currentPage"
- @current-change="handlePersonPageChange"></el-pagination>
</div>
</el-dialog>
@@ -449,7 +447,7 @@
import geoJson from './444.json'
import { getPanoramaList } from "@/api/panorama"
-import { getAreaPage, getResidentialQuartersList, getPersonInfoPage } from '@/api/dept/index.js'
+import { getResidentialQuartersList, getPersonInfoPage } from '@/api/dept/index.js'
import monitoringList from '@/assets/data/monitoring.js'
import leftContainer from './components/leftContainer'
@@ -1425,27 +1423,6 @@
this.$refs.RegionSelect.style.left = (bodyWidth - domWidth) / 2 + 'px'
},
- showpeopledetail (id, name) {
- this.peopleTitle = name
- this.peopleVisible = true
- this.peopleSearchQuery.id = id
- this.getPeopleInfoList(this.peoplePage.currentPage, this.peopleSearchQuery.id)
- },
-
- getPeopleInfoList (current, areaId, policeName = '', phone = '') {
- getAreaPage(current, areaId, policeName, phone, this.peoplePage.pageSize).then(res => {
- if (res.data.code == 200) {
- this.peopleInfoList = res.data.data.records
- this.peoplePage.total = res.data.data.total
- }
- })
- },
-
- handlePeopleCurrentChange (currentPage) {
- this.peoplePage.currentPage = currentPage
- this.getPeopleInfoList(this.peoplePage.currentPage, this.peopleSearchQuery.id, this.peoplePoliceName, this.peopleCallPhone)
- },
-
showlanddetail (name, type, id) {
this.landVisible = true
this.landTitle = name
@@ -1554,13 +1531,36 @@
},
/**
+ * @description: 显示户籍人口列表
+ * @param {*} id
+ * @param {*} name
+ * @return {*}
+ */
+ showpeopledetail (id, name) {
+ this.peopleTitle = name
+ this.peopleSearchQuery.id = id
+ this.getPersonInfoPage(1)
+ this.peopleVisible = true
+ },
+
+ /**
+ * @description: 户籍人口列表分页切换
+ * @param {*} currentPage
+ * @return {*}
+ */
+ handlePeopleCurrentChange (currentPage) {
+ this.peoplePage.currentPage = currentPage
+ this.getPersonInfoPage(1)
+ },
+
+ /**
* @description: 显示重点人员列表
* @param {*} name 当前类别名称
* @return {*}
*/
showkeypersondetail (name) {
this.keyPersonTitle = name
- this.getPersonInfoPage()
+ this.getPersonInfoPage(2)
this.keyPersonVisible = true
},
@@ -1572,18 +1572,19 @@
handlePersonPageChange (current) {
this.peoplePage.currentPage = current
- this.getPersonInfoPage()
+ this.getPersonInfoPage(2)
},
/**
* @description: 获取重点人员列表信息
* @return {*}
*/
- getPersonInfoPage () {
+ getPersonInfoPage (status) {
getPersonInfoPage({
- status: 2,
+ status,
depaId: this.userInfo.dept_id,
- zdryxl: this.keyPersonTitle,
+ areaId: status === 2 ? '' : this.peopleSearchQuery.id,
+ zdryxl: status === 2 ? this.keyPersonTitle : '',
realName: this.peoplePoliceName,
phone: this.peopleCallPhone,
current: this.peoplePage.currentPage,
@@ -1591,7 +1592,11 @@
}).then(res => {
this.peoplePage.total = res.data.data.total
- this.keyPersonDetailArr = res.data.data.records
+ if (status === 2) {
+ this.keyPersonDetailArr = res.data.data.records
+ } else {
+ this.peopleInfoList = res.data.data.records
+ }
})
},
@@ -1706,9 +1711,9 @@
this.peoplePage.currentPage = 1
if (this.peopleVisible == true) {
- this.getPeopleInfoList(this.peoplePage.currentPage, this.peopleSearchQuery.id, this.peoplePoliceName, this.peopleCallPhone)
+ this.getPersonInfoPage(1)
} else if (this.keyPersonVisible == true) {
- this.getPersonInfoPage()
+ this.getPersonInfoPage(2)
}
},
@@ -1722,9 +1727,9 @@
this.peoplePage.currentPage = 1
if (this.peopleVisible == true) {
- this.getPeopleInfoList(this.peoplePage.currentPage, this.peopleSearchQuery.id)
+ this.getPersonInfoPage(1)
} else if (this.keyPersonVisible == true) {
- this.getPersonInfoPage()
+ this.getPersonInfoPage(2)
}
},
--
Gitblit v1.9.3