From 4b19b71b1b656b29116a269f298ce467fddc3c44 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Wed, 20 Mar 2024 18:37:07 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_app
---
/dev/null | 11 -
pages.json | 37 +++--
api/police/police.js | 9 +
subPackage/police/people.vue | 272 +++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 304 insertions(+), 25 deletions(-)
diff --git a/api/police/police.js b/api/police/police.js
index 73e0f96..7a75dfe 100644
--- a/api/police/police.js
+++ b/api/police/police.js
@@ -25,4 +25,13 @@
method: 'post',
data: data
})
+}
+
+// 重点人员记录
+export const gethouseholdPage = (params) => {
+ return http.request({
+ url: '/blade-household/household/page',
+ method: 'get',
+ params: params
+ })
}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 6339ae2..8cc9aad 100644
--- a/pages.json
+++ b/pages.json
@@ -99,7 +99,16 @@
}
}
- ],
+ ,{
+ "path" : "subPackage/police/people",
+ "style" :
+ {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ],
"subPackages": [
//数据驾驶舱
{
@@ -954,7 +963,7 @@
}
}
]
- },
+ }
{
"root": "subPackage/reside",
@@ -999,18 +1008,18 @@
]
},
- {
- "root": "subPackage/people",
- "pages": [{
- "path": "people",
- "style": {
- "navigationBarTitleText": "",
- "navigationBarBackgroundColor": "#fff",
- "navigationBarTextStyle": "black",
- "enablePullDownRefresh": false
- }
- }]
- }
+ // {
+ // "root": "subPackage/people",
+ // "pages": [{
+ // "path": "people",
+ // "style": {
+ // "navigationBarTitleText": "",
+ // "navigationBarBackgroundColor": "#fff",
+ // "navigationBarTextStyle": "black",
+ // "enablePullDownRefresh": false
+ // }
+ // }]
+ // }
],
diff --git a/subPackage/people/people.vue b/subPackage/people/people.vue
deleted file mode 100644
index cd26590..0000000
--- a/subPackage/people/people.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
- <view>
-
- </view>
-</template>
-
-<script>
-</script>
-
-<style>
-</style>
\ No newline at end of file
diff --git a/subPackage/police/people.vue b/subPackage/police/people.vue
new file mode 100644
index 0000000..b8a5861
--- /dev/null
+++ b/subPackage/police/people.vue
@@ -0,0 +1,272 @@
+<template>
+ <view>
+ <u-sticky>
+ <view class="bgc-ff">
+ <view class="tab">
+ <!-- <u-tabs :list="tabList" :current="tabIndex" @click="changeTab" :inactiveStyle="{color:'#999999'}"
+ :activeStyle="{color:'#017BFC'}">
+ </u-tabs> -->
+ <view class="search flex j-c-s-b a-i-c">
+ <!-- <view class="tab-filter flex j-c-c a-i-c" @click="showDateModal">
+ <text class="f-28">时间筛选</text>
+ <u-icon name="arrow-down"></u-icon>
+ </view> -->
+ <u-search placeholder="请输入需要查询信息的名称" v-model="keyword" :clearabled="true" :showAction="true"
+ :animation="true" @search="searchConfirm" @clear="clearConfirm"></u-search>
+ </view>
+ </view>
+ </view>
+ </u-sticky>
+
+ <view class="list">
+ <view class="list-item bgc-ff mb-20" v-for="(i,k) in list" :key="k" @click="navTo(i.id,i.status)">
+ <view class="item-title flex a-i-c j-c-s-b mb-20">
+ <text class="f-32 fw">{{i.aoiName==null?'':i.aoiName}}</text>
+ <!-- <u-tag v-if="i.status == 1" text="待处置" type="warning" plain plainFill></u-tag> -->
+ <!-- <u-tag v-if="i.status == 2" text="已处置" type="success" plain plainFill></u-tag> -->
+ </view>
+ <view class="item-row flex a-i-c j-c-s-b">
+ <text class="f-28">名称:</text>
+ <text class="f-28 c-66">{{i.name}}</text>
+ </view>
+
+ <view class="item-row flex a-i-c j-c-s-b">
+ <text class="f-28">标签:</text>
+ <view v-for="(item,index) in i.householdLabelList" :key="index">
+ <text class="f-28 c-66">{{item.labelName}}</text>
+ </view>
+
+ </view>
+ <view class="item-row flex a-i-c j-c-s-b">
+ <text class="f-28">地址:</text>
+ <text class="address f-28 c-66">{{i.currentAddress || ""}}</text>
+ </view>
+ </view>
+ </view>
+ <u-toast ref="uToast"></u-toast>
+ <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
+ <date-range-modal ref="dateRane" @comfirm="handleComfirmDate" @rest="handleRestDate" />
+ </view>
+</template>
+
+<script>
+ import {
+ gethouseholdPage
+ } from "@/api/police/police"
+ import dateRangeModal from '@/components/dateRangeModal/modal.vue';
+ export default {
+ components: {
+ dateRangeModal
+ },
+ data() {
+ return {
+ tabList: [{
+ name: "全部",
+ status: "",
+ },
+ {
+ name: "待处置",
+ status: 1,
+ },
+ {
+ name: "已处置",
+ status: 2
+ }
+ ],
+ tabIndex: 0,
+ currentStatus: "",
+ list: [],
+ loadingStatus: 'nomore',
+ currentPage: 1,
+ frequency: '',
+ reportType: "",
+ selectDate: [],
+ houseCode: "",
+ keyword: "",
+ labelType: ''
+ }
+ },
+
+ onLoad(option) {
+ console.log(option);
+ if (option.type == 1) {
+ this.labelType = option.type
+ uni.setNavigationBarTitle({
+ title: '重点人员管理'
+ })
+ } else {
+ this.labelType = option.type
+ uni.setNavigationBarTitle({
+ title: '关注人群'
+ })
+ }
+ // this.getList()
+ },
+
+ onShow() {
+ this.resetParams();
+ this.getList()
+ },
+
+ onReachBottom() {
+ this.currentPage++
+ this.getList()
+ },
+
+ methods: {
+ searchConfirm() {
+ this.resetParams()
+ this.getList()
+ },
+ clearConfirm() {
+ this.keyword = ''
+ this.searchConfirm()
+ },
+ changeTab(e) {
+ this.tabIndex = e.index;
+ this.currentStatus = e.status;
+ this.resetParams();
+ this.getList();
+ },
+ resetParams() {
+ this.list = [];
+ this.currentPage = 1;
+ },
+ getList() {
+
+ this.$nextTick(() => {
+ this.loadingStatus = 'loadingmore'
+ this.$refs.uToast.show({
+ type: 'loading',
+ message: '正在加载',
+ duration: 9999999
+ })
+ })
+ let params = {
+ current: this.currentPage,
+ size: 20,
+ status: this.currentStatus,
+ searchKey: this.keyword
+ }
+
+ if (this.selectDate.length) {
+ params.startTime = this.selectDate[0],
+ params.endTime = this.selectDate[1]
+ }
+ params.labelType = this.labelType
+
+ gethouseholdPage(params).then(res => {
+ if (res.code != 200) {
+ uni.showToast({
+ title: '数据请求失败',
+ icon: 'error'
+ })
+ return
+ }
+ let records = res.data.records;
+ this.list = [...this.list, ...records]
+ this.$nextTick(() => {
+ this.$refs.uToast.isShow = false
+ })
+ this.loadingStatus = 'nomore'
+ })
+ },
+ navTo(id, status) {
+ uni.navigateTo({
+ url: `./policeSituationDetail?id=${id}`,
+ complete: (res) => {
+ console.log(res)
+ }
+ })
+ // this.navToDetail(reportType, id)
+ },
+
+ navToEdit(reportType, id, type) {
+ if (reportType == 1) {
+ this.$u.func.globalNavigator(`/subPackage/label/bail?id=${id}`)
+ } else if (reportType == 2) {
+ this.$u.func.globalNavigator(`/subPackage/label/check?id=${id}`)
+ } else if (reportType == 5) {
+ this.$u.func.globalNavigator(`/subPackage/label/form?id=${id}`)
+ }
+ },
+
+ navToDetail(reportType, id, type) {
+ if (reportType == 1) {
+ this.$u.func.globalNavigator(`bailReportDetail?id=${id}`)
+ } else if (reportType == 7) {
+ this.$u.func.globalNavigator(`selfCheckDetail?id=${id}`)
+ } else if (reportType == 5) {
+ this.$u.func.globalNavigator(`labelReportDetail?id=${id}`)
+ } else {
+ this.$u.func.globalNavigator(`checkReform?id=${id}`)
+ }
+
+
+ },
+
+ showDateModal() {
+ this.$refs.dateRane.open();
+ },
+
+ handleRestDate() {
+ this.selectDate = [];
+ this.resetParams();
+ this.getList()
+ },
+ handleComfirmDate(val) {
+ this.selectDate = val;
+ this.resetParams();
+ this.getList()
+ }
+
+ }
+ }
+</script>
+
+<style lang="scss">
+ page {
+ background-color: #F5F5F5;
+ }
+
+
+
+ .tab {
+ // width: 100%;
+
+ }
+
+ .search {
+ padding: 20rpx 20rpx;
+ }
+
+ // .tab /deep/.u-tabs__wrapper__nav__item {
+ // flex: 1;
+ // }
+ .tab-filter {
+ padding: 0 20rpx;
+ }
+
+ .list {
+ margin: 20rpx 30rpx 0;
+ }
+
+ .list-item {
+ padding: 0 30rpx 20rpx;
+ border-radius: 8rpx;
+
+ .item-title {
+ padding: 30rpx 0;
+ border-bottom: 1px solid #F5F5F5;
+ }
+
+ .item-row {
+ padding: 10rpx 0;
+
+ .address {
+ width: 65%;
+ text-align: right;
+ }
+ }
+ }
+</style>
\ No newline at end of file
--
Gitblit v1.9.3