From 450fa7ffab10285506b0c9aa2b0869d9580608ac Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 11 Jan 2024 14:26:15 +0800
Subject: [PATCH] 重点人员
---
src/views/article/components/publicSignUpChild.vue | 3
src/views/publicSecurity/components/communityKeyNotePersonnel.vue | 418 ++++++++++++++++++++++++++++++++++
src/api/userHouse/list/userHouseList.js | 13 +
src/views/article/components/deitDiscussion.vue | 145 +-----------
src/views/publicSecurity/keynotePersonnelManage.vue | 84 +++---
src/views/propertySupervision/residentSupervision.vue | 8
src/views/publicSecurity/components/userHouseList.vue | 6
7 files changed, 501 insertions(+), 176 deletions(-)
diff --git a/src/api/userHouse/list/userHouseList.js b/src/api/userHouse/list/userHouseList.js
index 17d396c..6edb9ce 100644
--- a/src/api/userHouse/list/userHouseList.js
+++ b/src/api/userHouse/list/userHouseList.js
@@ -88,7 +88,18 @@
export const statisticalLabels = (current, size, params) => {
return request({
- url: '/api/blade-householdLabel/householdLabel/statisticalLabels',
+ url: '/api/blade-householdLabel/householdLabel/getRegionStatisticalLabels',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+export const getCommunityStatisticalLabels = (current, size, params) => {
+ return request({
+ url: '/api/blade-householdLabel/householdLabel/getCommunityStatisticalLabels',
method: 'get',
params: {
...params,
diff --git a/src/views/article/components/deitDiscussion.vue b/src/views/article/components/deitDiscussion.vue
index 8d81e53..5ac6b3a 100644
--- a/src/views/article/components/deitDiscussion.vue
+++ b/src/views/article/components/deitDiscussion.vue
@@ -10,35 +10,7 @@
-->
<template>
<div>
- <el-dialog title="" append-to-body :visible.sync="popupTableShow" width="80%" :before-close="handleClose">
- <span slot="title" class="dialog-footer">
- {{ ontitle }}
- </span>
- <div id="" v-if="editFlag">
- <avue-form @submit="handleSubmit" :option="optionDiscuss" @reset-change="handleReset" v-model="disCussFrom">
- </avue-form>
- </div>
-
- <div id="" v-if="!editFlag">
- <avue-crud :table-loading="loading" :option="optionList" :data="data" v-model="form" ref="crud"
- @row-update="rowUpdate" @row-del="rowDel">
- <template slot="menuLeft" v-if="!editFlag">
- <el-button type="primary" size="small" plain icon="el-icon-circle-plus-outline" @click="add()">添加
- </el-button>
- </template>
- <template #icon="scope">
- <i :class="scope.row.icon" style="font-size:14px"></i>
- </template>
- <template #menu="{ row, size }">
- <el-button v-if="row.level === 1" :size="size" text type="primary" @click="edit(row)">编辑</el-button>
- <el-button v-if="row.level === 1" :size="size" text type="danger" @click="deletes(row)">删除</el-button>
- <el-button v-if="row.level === 2" :size="size" text type="primary" @click="openUser(row, 1)">
- 选择此项人数：{{ row.number }} 详情</el-button>
- </template>
- </avue-crud>
- </div>
- </el-dialog>
<el-dialog title="" append-to-body :visible.sync="popupTableUserShow" width="50%" :before-close="userHandleClose">
<avue-crud :data="userData" :page="userPage" :option="userOption"></avue-crud>
@@ -60,6 +32,9 @@
} from "@/api/discuss/userTopics"
+ import website from '@/config/website'
+
+
import {
getLists,
getList,
@@ -74,116 +49,11 @@
return {
popupTableShow: false,
popupTableUserShow: false,
-
loading: true,
-
- ontitle: '编辑议题',
- editFlag: false,
-
- disCussFrom: {
- discussContent: '',
- optionRange: 0,
- sort: 1,
- optionContent: '',
- optionDetail: '',
- number: '',
- createTime: '',
- updateTime: '',
- deleteFlag: '',
- articleId: '',
- parentId: '',
- level: '',
- children: [{
- optionContent: '',
- optionDetail: '',
- number: '',
- createTime: '',
- updateTime: '',
- deleteFlag: '',
- articleId: '',
- parentId: '',
- level: '',
- }]
- },
- optionDiscuss: {
- emptyText: '取消',
- column: [{
- label: '议题',
- prop: 'discussContent',
- type: 'input',
- row: true,
- },
- {
- label: '选项范围',
- prop: 'optionRange',
- type: 'radio',
- button: true,
- row: true,
- dicData: [{
- label: '多选',
- value: 1
- }, {
- label: '单选',
- value: 0
- }]
- },
- {
- label: '排序',
- prop: 'sort',
- controlsPosition: '',
- type: 'number'
- },
- {
- label: '选项内容',
- prop: 'children',
- type: 'dynamic',
- span: 24,
- children: {
- column: [{
- label: '选项标题',
- prop: 'optionContent',
- type: 'input',
- rules: [{
- required: true,
- message: '请输入选项标题',
- trigger: 'blur'
- }]
- }, {
- label: '选项说明',
- prop: 'optionDetail',
- type: 'input',
- }]
- }
- },
- ]
- },
-
// 表单数据
form: {},
data: [],
- optionList: {
- headerAlign: 'center',
- align: 'center',
- border: true,
- addBtn: false,
- editBtn: false,
- delBtn: false,
- defaultExpandAll: true,
- rowKey: 'id',
- rowParentKey: 'parentId',
- column: [{
- label: '标题',
- prop: 'discussContent',
- },
- {
- label: '选项内容',
- prop: 'optionContent',
- }
- ]
- },
-
articleId: '',
-
userData: [],
userOption: {
addBtn: false,
@@ -194,6 +64,11 @@
}, {
label: '头像',
prop: 'avatar'
+ }, {
+ label: '签名',
+ type: 'upload',
+ listType: "picture-img",
+ prop: 'signaturePath'
}, {
label: '手机',
prop: 'phone'
@@ -362,6 +237,10 @@
if (item.avatar.length > 0) {
item.avatar = website.minioUrl + item.avatar
}
+ if (item.signaturePath && item.signaturePath.length > 0) {
+ item.signaturePath = website.minioUrl + item.signaturePath
+ // console.log("=====>", item.signaturePath)
+ }
})
})
},
diff --git a/src/views/article/components/publicSignUpChild.vue b/src/views/article/components/publicSignUpChild.vue
index b0d1ebe..3c68b2b 100644
--- a/src/views/article/components/publicSignUpChild.vue
+++ b/src/views/article/components/publicSignUpChild.vue
@@ -177,8 +177,9 @@
if (item.avatar.length > 0) {
item.avatar = website.minioUrl + item.avatar
}
- if (item.signaturePath.length > 0) {
+ if (item.signaturePath && item.signaturePath.length > 0) {
item.signaturePath = website.minioUrl + item.signaturePath
+ console.log("=====>", item.signaturePath)
}
})
this.loading = false
diff --git a/src/views/propertySupervision/residentSupervision.vue b/src/views/propertySupervision/residentSupervision.vue
new file mode 100644
index 0000000..02409e3
--- /dev/null
+++ b/src/views/propertySupervision/residentSupervision.vue
@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/views/publicSecurity/components/communityKeyNotePersonnel.vue b/src/views/publicSecurity/components/communityKeyNotePersonnel.vue
new file mode 100644
index 0000000..95a6bba
--- /dev/null
+++ b/src/views/publicSecurity/components/communityKeyNotePersonnel.vue
@@ -0,0 +1,418 @@
+<template>
+ <basic-container>
+ <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
+ v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
+ @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+ @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange">
+
+ <template slot-scope="scope" slot="menu">
+ <el-button type="text" size="small" icon="el-icon-view" plain @click="lookDetail(scope.row)">查 看
+ </el-button>
+ </template>
+ </avue-crud>
+
+ <el-dialog title="" append-to-body :visible.sync="auditBasePopup" width="80%">
+ <userHouseList ref="userHouseList"></userHouseList>
+ </el-dialog>
+ </basic-container>
+</template>
+
+<script>
+ import {
+ getCommunityStatisticalLabels
+ } from "@/api/userHouse/list/userHouseList"
+
+ import {
+ mapGetters
+ } from "vuex"
+
+ import website from '@/config/website'
+
+ import userHouseList from '../components/userHouseList.vue'
+
+ export default {
+ data() {
+ return {
+ taskType: 0,
+ curRow: {},
+ roleBox: false,
+
+ form: {},
+ query: {},
+ loading: true,
+
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ datetime: "",
+ selectionList: [],
+ option: {
+ height: "auto",
+ calcHeight: 54,
+ dialogWidth: 950,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 280,
+ // menu: false,
+ border: true,
+ //stripe:true,
+ index: true,
+ // viewBtn: true,
+ editBtn: false,
+ delBtn: false,
+ addBtn: false,
+ // selection: true,
+ dialogClickModal: false,
+ column: [{
+ span: 12,
+ label: "所属社区",
+ prop: "communityName",
+ align: 'center',
+ searchSpan: 4,
+ // search: true,
+ // hide: true,
+ },
+ {
+ span: 12,
+ label: "刑释解教人员",
+ prop: "number1",
+ align: 'center',
+ searchSpan: 4,
+ },
+ {
+ span: 12,
+ label: "肇事肇祸精神障碍患者",
+ prop: "number2",
+ align: 'center',
+ searchSpan: 4,
+ },
+ {
+ span: 12,
+ label: "一般精神障碍患者",
+ prop: "number3",
+ align: 'center',
+ searchSpan: 4,
+ },
+ {
+ span: 12,
+ label: "重点对象",
+ prop: "number4",
+ align: 'center',
+ searchSpan: 4,
+ },
+ {
+ span: 12,
+ label: "取保候审",
+ prop: "number5",
+ align: 'center',
+ searchSpan: 4,
+ },
+ ],
+ },
+ data: [],
+ regionCode: '',
+
+ auditBasePopup: false,
+ }
+ },
+
+ provide() {
+ return {
+ placeElement: this,
+ }
+ },
+
+ components: {
+ userHouseList,
+ },
+
+ watch: {},
+
+ computed: {
+ ...mapGetters(["permission", "userInfo"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.place_add, true),
+ viewBtn: this.vaildData(this.permission.place_view, true),
+ delBtn: this.vaildData(this.permission.place_delete, true),
+ editBtn: this.vaildData(this.permission.place_edit, true),
+ }
+ },
+ ids() {
+ let ids = []
+ this.selectionList.forEach((ele) => {
+ ids.push(ele.id)
+ })
+ return ids.join(",")
+ },
+
+ },
+ methods: {
+ init(row) {
+ this.regionCode = row.regionCode
+ this.onLoad(this.page, this.query)
+ // console.log(JSON.stringify(row))
+ },
+
+ colseDetail() {
+ this.auditBasePopup = false
+ this.onLoad(this.page)
+ },
+
+ lookDetail(row) {
+ this.auditBasePopup = true
+ var that = this
+ this.$nextTick(() => {
+ that.$refs.userHouseList.init(row)
+ })
+ },
+
+ auditCur(row) {
+ this.curAuditRow = row
+ this.auditBasePopup = true
+ },
+
+ roleBoxClose() {
+ this.curRow = {}
+ },
+
+ ManageTenants(item) {
+ this.curRow = item
+ this.roleBox = true
+ },
+
+ rowSave(row, done, loading) {
+ if (row.imageUrls.length > 0) {
+ var urls = []
+ var split = row.imageUrls.split(",").filter(item => item != '')
+ split.forEach(url => {
+ var names = url.split("jczz/")
+ urls.push(names[1])
+ })
+ row.imageUrls = urls.join(",")
+ }
+
+ let label = row.label
+
+ if (row.smallLabel != '') {
+ label = label + ',' + row.smallLabel
+ }
+
+ delete row.smallLabel
+
+ add({
+ ...row,
+ label
+ }).then(
+ () => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ done()
+ },
+ (error) => {
+ window.console.log(error)
+ loading()
+ }
+ )
+ },
+
+ rowUpdate(row, index, done, loading) {
+ if (row.imageUrls.length > 0) {
+ var urls = []
+ var split = row.imageUrls.split(",").filter(item => item != '')
+ split.forEach(url => {
+ var names = url.split("jczz/")
+ urls.push(names[1])
+ })
+ row.imageUrls = urls.join(",")
+ }
+
+ let label = row.label
+
+ if (row.smallLabel != '') {
+ label = label + ',' + row.smallLabel
+ }
+
+ delete row.smallLabel
+
+ update({
+ ...row,
+ label
+ }).then(
+ () => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ done()
+ },
+ (error) => {
+ window.console.log(error)
+ loading()
+ }
+ )
+ },
+
+ rowDel(row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ row.isDeleted = 1
+ return removeTask(row)
+ })
+ .then(() => {
+ this.onLoad(this.page)
+
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ })
+ },
+ searchReset() {
+ this.query = {}
+ this.onLoad(this.page)
+ },
+ searchChange(params, done) {
+ this.query = params
+ this.page.currentPage = 1
+ this.onLoad(this.page, params)
+ done()
+ },
+ selectionChange(list) {
+ this.selectionList = list
+ },
+ selectionClear() {
+ this.selectionList = []
+ this.$nextTick(() => {
+ this.$refs.crud && this.$refs.crud.toggleSelection()
+ })
+ },
+ handleDelete() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据")
+ return
+ }
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(this.ids)
+ })
+ .then(() => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ this.$refs.crud.toggleSelection()
+ })
+ },
+
+ beforeOpen(done, type) {
+ if (["edit", "view"].includes(type)) {
+ // getPlace(this.form.id).then((res) => {
+ // this.form = res.data.data
+ // if (this.form.imageUrls.length) {
+ // this.form.imageUrls = this.form.imageUrls.split(",").filter(item => item != '').map(item => website
+ // .minioUrl + item).join(',')
+ // }
+ // if (this.form.placePoiLabelVOList.length) {
+ // let lebelTwo = this.form.placePoiLabelVOList.find(item => {
+ // return item.type == 2
+ // })
+ // if (lebelTwo) this.form.label = String(lebelTwo.poiCode)
+ // let lebelThree = this.form.placePoiLabelVOList.find(item => {
+ // return item.type == 3
+ // })
+ // if (lebelThree) this.form.smallLabel = String(lebelThree.poiCode)
+ // }
+ // done()
+ // })
+ } else {
+ done()
+ }
+ },
+
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage
+ this.onLoad(this.page, this.query)
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize
+ this.onLoad(this.page, this.query)
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query)
+ },
+ onLoad(page, params = {}) {
+ const {
+ dateTime
+ } = this.query
+ let values = {
+ ...params,
+ }
+ values.regionCode = this.regionCode
+ this.loading = true
+ getCommunityStatisticalLabels(page.currentPage, page.pageSize, values).then((res) => {
+ const data = res.data.data
+ this.page.total = data.total
+ this.data = data.records
+ this.data.forEach(item => {
+ if (item.imageUrls && item.imageUrls != '' && item.imageUrls != null && item.imageUrls.length) {
+ var urls = []
+ var names = item.imageUrls.split(",").filter(item => item != '')
+ names.forEach(name => {
+ urls.push(website.minioUrl + name)
+ })
+ item.imageUrls = urls.join(",")
+ }
+ })
+ this.loading = false
+ this.selectionClear()
+ })
+ }
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .avue-upload__icon {
+ line-height: 6;
+ }
+
+ .cur-container-box {
+ display: flex;
+ flex-direction: column;
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+
+ .content-box {
+ margin: 0 4px;
+ padding: 0 16px;
+ height: 0;
+ flex: 1;
+ overflow: hidden;
+ overflow-y: auto;
+ }
+
+ .footer-btn-box {
+ margin-top: 10px;
+ display: flex;
+ justify-content: center;
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/src/views/publicSecurity/components/userHouseList.vue b/src/views/publicSecurity/components/userHouseList.vue
index ea49734..73908bd 100644
--- a/src/views/publicSecurity/components/userHouseList.vue
+++ b/src/views/publicSecurity/components/userHouseList.vue
@@ -6,7 +6,7 @@
v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
:before-open="beforeOpen" :page.sync="page" @search-change="searchChange" @search-reset="searchReset"
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
- @refresh-change="refreshChange" @on-load="onLoad">
+ @refresh-change="refreshChange">
<!-- <template slot="menuLeft">
<el-button type="danger" size="small" plain icon="el-icon-delete" v-if="permission.household_delete"
@click="handleDelete">删 除
@@ -859,7 +859,9 @@
mounted() {},
methods: {
init(row) {
-
+ console.log(JSON.stringify(row))
+ this.query.regionCode = row.communityCode
+ this.onLoad(this.page, this.query)
},
onsubmit() {
if (this.labelForm.color === '#EBEDF0') {
diff --git a/src/views/publicSecurity/keynotePersonnelManage.vue b/src/views/publicSecurity/keynotePersonnelManage.vue
index 018e995..f39aa11 100644
--- a/src/views/publicSecurity/keynotePersonnelManage.vue
+++ b/src/views/publicSecurity/keynotePersonnelManage.vue
@@ -8,20 +8,11 @@
<template slot-scope="scope" slot="menu">
<el-button type="text" size="small" icon="el-icon-view" plain @click="lookDetail(scope.row)">查 看
</el-button>
- <!-- <el-button type="text" size="small" icon="el-icon-s-check" v-if="scope.row.status == 1" plain
- @click="lookDetail(scope.row,1)">审 核
- </el-button> -->
- <!-- <el-button type="text" size="small" icon="el-icon-delete" plain @click="rowDel(scope.row)">删 除
- </el-button> -->
</template>
-
</avue-crud>
-
<el-dialog title="" append-to-body :visible.sync="auditBasePopup" width="80%">
- <userHouseList ref="userHouseList"></userHouseList>
- <!-- <hotelReporting @colseDetail="colseDetail" v-if="taskType == 2" ref="hotelReporting"></hotelReporting> -->
- <!-- <labelReporting @colseDetail="colseDetail" v-if="taskType == 3" ref="labelReporting"></labelReporting> -->
+ <communityKeyNotePersonnel ref="communityKeyNotePersonnel"></communityKeyNotePersonnel>
</el-dialog>
</basic-container>
</template>
@@ -29,23 +20,16 @@
<script>
import {
statisticalLabels
- } from "/src/api/userHouse/list/userHouseList"
+ } from "@/api/userHouse/list/userHouseList"
- // import {
- // getList,
- // removeTask,
- // update,
- // add,
- // } from "@/api/task/task"
import {
mapGetters
} from "vuex"
+ import communityKeyNotePersonnel from './components/communityKeyNotePersonnel.vue'
+
import website from '@/config/website'
- import userHouseList from './components/userHouseList'
- // import hotelReporting from './components/hotelReporting'
- // import labelReporting from './components/labelReporting'
export default {
data() {
@@ -81,38 +65,58 @@
editBtn: false,
delBtn: false,
addBtn: false,
- selection: true,
+ // selection: true,
dialogClickModal: false,
- column: [
- // {
- // span: 12,
- // label: "场所名称",
- // prop: "name",
- // searchSpan: 4,
- // search: true,
- // },
- {
+ column: [{
span: 12,
label: "所属街道",
prop: "regionName",
searchSpan: 4,
align: 'center',
- search: true,
+ // search: true,
// hide: true,
},
+ // {
+ // span: 12,
+ // label: "所属社区",
+ // prop: "communityName",
+ // align: 'center',
+ // searchSpan: 4,
+ // search: true,
+ // // hide: true,
+ // },
{
span: 12,
- label: "所属社区",
- prop: "communityName",
+ label: "刑释解教人员",
+ prop: "number1",
align: 'center',
searchSpan: 4,
- search: true,
- // hide: true,
},
{
span: 12,
- label: "总数",
- prop: "numbers",
+ label: "肇事肇祸精神障碍患者",
+ prop: "number2",
+ align: 'center',
+ searchSpan: 4,
+ },
+ {
+ span: 12,
+ label: "一般精神障碍患者",
+ prop: "number3",
+ align: 'center',
+ searchSpan: 4,
+ },
+ {
+ span: 12,
+ label: "重点对象",
+ prop: "number4",
+ align: 'center',
+ searchSpan: 4,
+ },
+ {
+ span: 12,
+ label: "取保候审",
+ prop: "number5",
align: 'center',
searchSpan: 4,
},
@@ -131,7 +135,7 @@
},
components: {
- userHouseList,
+ communityKeyNotePersonnel,
// hotelReporting,
// labelReporting,
},
@@ -168,9 +172,11 @@
this.auditBasePopup = true
var that = this
this.$nextTick(() => {
- that.$refs.userHouseList.init(row)
+ that.$refs.communityKeyNotePersonnel.init(row)
})
},
+
+
auditCur(row) {
this.curAuditRow = row
this.auditBasePopup = true
--
Gitblit v1.9.3