From 4522ab3fe8bd45ee753ef187448c1e884bbc601f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 18 Apr 2024 11:09:27 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web
---
src/views/patrolList/patrolRecord.vue | 694 +++++++++++++++++++++++++++++----------------------------
1 files changed, 348 insertions(+), 346 deletions(-)
diff --git a/src/views/patrolList/patrolRecord.vue b/src/views/patrolList/patrolRecord.vue
index 3f16efe..e1d2332 100644
--- a/src/views/patrolList/patrolRecord.vue
+++ b/src/views/patrolList/patrolRecord.vue
@@ -1,51 +1,50 @@
<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" @on-load="onLoad">
- <template slot-scope="{type,size,row }" slot="menu">
- <el-button icon="el-icon-detail" :size="size" :type="type" @click.stop="getDetail(row)">
- 详情
- </el-button>
- </template>
- <template slot-scope="{type,size,row }" slot="menu">
- <el-button icon="el-icon-detail" :size="size" :type="type" @click.stop="getDetail(row)">
- 详情
- </el-button>
- </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" @on-load="onLoad">
+ <template slot-scope="{type,size,row }" slot="menu">
+ <el-button icon="el-icon-detail" :size="size" :type="type" @click.stop="getDetail(row)">
+ 详情
+ </el-button>
+ </template>
+ <template slot-scope="{type,size,row }" slot="menu">
+ <el-button icon="el-icon-detail" :size="size" :type="type" @click.stop="getDetail(row)">
+ 详情
+ </el-button>
+ </template>
- <template slot-scope="{row, size}" slot="principalPhone">
- <el-button :size="size" type="text" @click="showStringDispose(row, 'principalPhoneflag')"
- v-text="textDispose(row, 'principalPhoneflag', 'principalPhone')">
- </el-button>
- </template>
- </avue-crud>
+ <template slot-scope="{row, size}" slot="principalPhone">
+ <el-button :size="size" type="text" @click="showStringDispose(row, 'principalPhoneflag')"
+ v-text="textDispose(row, 'principalPhoneflag', 'principalPhone')">
+ </el-button>
+ </template>
+ </avue-crud>
- <el-drawer title="巡查详情" :visible.sync="isDetail" :append-to-body="true" size="60%" direction="rtl">
+ <el-drawer title="巡查详情" :visible.sync="isDetail" :append-to-body="true" size="60%" direction="rtl">
- <el-card class="trackClass" style="overflow-y: auto">
+ <el-card class="trackClass" style="overflow-y: auto">
+
+ <el-collapse v-model="activeNames" @change="handleChange">
+ <div v-for="(item, index) in 10" :key="index">
+ <el-collapse-item title="一致性 Consistency" name="1">
+ <div>{{ index }}
<el-collapse v-model="activeNames" @change="handleChange">
- <div v-for="(item, index) in 10" :key="index">
- <el-collapse-item title="一致性 Consistency" name="1">
- <div>{{ index }}
-
- <el-collapse v-model="activeNames" @change="handleChange">
- <div v-for="(item, index) in 3" :key="index">
- <el-collapse-item title="er致性 Consistency" name="1">
- <div>在界面中一致：所有的元素和结构需保持一致，比如：设计样式、图标和文本、元素的位置等。{{ index }}</div>
- </el-collapse-item>
- </div>
- </el-collapse>
- </div>
- </el-collapse-item>
- </div>
+ <div v-for="(item, index) in 3" :key="index">
+ <el-collapse-item title="er致性 Consistency" name="1">
+ <div>在界面中一致：所有的元素和结构需保持一致，比如：设计样式、图标和文本、元素的位置等。{{ index }}</div>
+ </el-collapse-item>
+ </div>
</el-collapse>
+ </div>
+ </el-collapse-item>
+ </div>
+ </el-collapse>
- <!-- <el-form :model="form" label-position="right" size="mini" class="taskinfoForm" label-width="70px">
+ <!-- <el-form :model="form" label-position="right" size="mini" class="taskinfoForm" label-width="70px">
<el-row>
<el-col :span="24">
<el-form-item label="巡查内容">
@@ -71,351 +70,354 @@
</el-row>
</el-form> -->
- </el-card>
+ </el-card>
- <!-- <DcMap v-if="isDetail" :is-detail="isDetail" :range="form.taskRoute" :patrolRoute="form.patrolRoute">
+ <!-- <DcMap v-if="isDetail" :is-detail="isDetail" :range="form.taskRoute" :patrolRoute="form.patrolRoute">
</DcMap> -->
- </el-drawer>
+ </el-drawer>
- </basic-container>
+ </basic-container>
</template>
<script>
-import {
+ import {
getList,
remove,
add,
update,
getDetail,
getPatrolGroupTree
-} from "@/api/patrol/placeChek"
+ } from "@/api/patrol/placeChek"
-import website from '@/config/website'
+ import website from '@/config/website'
-// import {
-// getDistrictTree
-// } from "@/api/district/index"
+ // import {
+ // getDistrictTree
+ // } from "@/api/district/index"
-import {
+ import {
mapGetters
-} from "vuex"
+ } from "vuex"
-export default {
- data () {
- return {
- isDetail: false,
- form: {},
- query: {},
- loading: true,
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0,
+ export default {
+ data() {
+ return {
+ isDetail: false,
+ form: {},
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ datetime: "",
+ selectionList: [],
+ option: {
+ labelWidth: 120,
+ searchLabelWidth: 96,
+ searchShow: true,
+ searchMenuSpan: 3,
+ // menuWidth: 450,
+ // menu: false,
+ height: "auto",
+ calcHeight: 54,
+ dialogWidth: 950,
+ tip: false,
+ border: true,
+ addBtn: false,
+ delBtn: false,
+ //stripe:true,
+ index: true,
+ editBtn: false,
+ viewBtn: false,
+ // selection: true,
+ excelBtn: true,
+ dialogClickModal: false,
+ header: false,
+ column: [{
+ label: "所属街道",
+ prop: "streetName",
+ span: 24,
+ row: true,
+ searchSpan: 4,
+ search: true,
},
- datetime: "",
- selectionList: [],
- option: {
- labelWidth: 120,
- searchLabelWidth: 96,
- searchShow: true,
- searchMenuSpan: 3,
- // menuWidth: 450,
- // menu: false,
- height: "auto",
- calcHeight: 54,
- dialogWidth: 950,
- tip: false,
- border: true,
- addBtn: false,
- delBtn: false,
- //stripe:true,
- index: true,
- editBtn: false,
- viewBtn: false,
- // selection: true,
- excelBtn: true,
- dialogClickModal: false,
- header:false,
- column: [{
- label: "所属街道",
- prop: "streetName",
- span: 24,
- row: true,
- searchSpan: 4,
- search: true,
- },
- {
- label: "所属社区",
- prop: "communityName",
- span: 24,
- row: true,
- searchSpan: 4,
- search: true,
- },
- {
- label: "所属网格",
- prop: "gridName",
- span: 24,
- row: true,
- searchSpan: 4,
- search: true,
- },
- {
- label: "场所名称",
- prop: "placeName",
- span: 24,
- row: true,
- searchSpan: 4,
- search: true,
- },
- {
- label: "场所隐患",
- prop: "remark",
- span: 24,
- row: true,
- searchSpan: 4,
- },
-
- {
- label: "场所负责人",
- prop: "principal",
- span: 24,
- row: true,
- searchSpan: 4,
- search: true,
- },
-
- {
- label: "场所负责人电话",
- prop: "principalPhone",
- span: 24,
- row: true,
- searchSpan: 4,
- slot: true
- },
- {
- label: "场所地址",
- prop: "location",
- span: 24,
- row: true,
- searchSpan: 4,
- searchLabelWidth: 46,
- },
- {
- width: 110,
- label: "签名",
- prop: "signaturePath",
- type: "upload",
- listType: "picture-img",
- span: 24,
- },
- {
- label: "创建时间",
- prop: "createTime",
- span: 24,
- row: true,
- searchSpan: 4,
- searchLabelWidth: 46,
- },
- ],
+ {
+ label: "所属社区",
+ prop: "communityName",
+ span: 24,
+ row: true,
+ searchSpan: 4,
+ search: true,
},
- data: [],
+ {
+ label: "所属网格",
+ prop: "gridName",
+ span: 24,
+ row: true,
+ searchSpan: 4,
+ search: true,
+ },
+ {
+ label: "场所名称",
+ prop: "placeName",
+ span: 24,
+ row: true,
+ searchSpan: 4,
+ search: true,
+ },
+ {
+ label: "场所隐患",
+ prop: "remark",
+ span: 24,
+ row: true,
+ searchSpan: 4,
+ },
- patrolTree: [],
- }
+ {
+ label: "场所负责人",
+ prop: "principal",
+ span: 24,
+ row: true,
+ searchSpan: 4,
+ search: true,
+ },
+
+ {
+ label: "场所负责人电话",
+ prop: "principalPhone",
+ span: 24,
+ row: true,
+ searchSpan: 4,
+ slot: true
+ },
+ {
+ label: "场所地址",
+ prop: "location",
+ span: 24,
+ row: true,
+ searchSpan: 4,
+ searchLabelWidth: 46,
+ },
+ {
+ width: 110,
+ label: "签名",
+ prop: "signaturePath",
+ type: "upload",
+ listType: "picture-img",
+ span: 24,
+ },
+ {
+ label: "创建时间",
+ prop: "createTime",
+ span: 24,
+ row: true,
+ searchSpan: 4,
+ searchLabelWidth: 46,
+ },
+ ],
+ },
+ data: [],
+
+ patrolTree: [],
+ }
},
watch: {
- "form.articleType": {
- handler (val) {
- if (val) {
- var videoUrl = this.findObject(this.option.column, "videoUrl")
- var content = this.findObject(this.option.column, "content")
- if (val.indexOf('ksp') != -1) {
- videoUrl.display = true
- content.display = false
- videoUrl.rules = [{
- required: false,
- message: "请选择视频",
- trigger: "blur",
- },]
- } else {
- videoUrl.display = false
- content.display = true
- videoUrl.rules = ""
- }
- }
- },
- immediate: true,
- }
+ "form.articleType": {
+ handler(val) {
+ if (val) {
+ var videoUrl = this.findObject(this.option.column, "videoUrl")
+ var content = this.findObject(this.option.column, "content")
+ if (val.indexOf('ksp') != -1) {
+ videoUrl.display = true
+ content.display = false
+ videoUrl.rules = [{
+ required: false,
+ message: "请选择视频",
+ trigger: "blur",
+ }, ]
+ } else {
+ videoUrl.display = false
+ content.display = true
+ videoUrl.rules = ""
+ }
+ }
+ },
+ immediate: true,
+ }
},
computed: {
- ...mapGetters(["permission", "userInfo"]),
- permissionList () {
- return {
- addBtn: this.vaildData(this.permission.article_add, true),
- viewBtn: this.vaildData(this.permission.article_view, true),
- delBtn: this.vaildData(this.permission.article_delete, true),
- editBtn: this.vaildData(this.permission.article_edit, true),
- }
- },
-
- textDispose () {
- return (row, flag, type) => {
- if (row[flag] || row[type] == null) {
- return row[type]
- } else {
- if (type == 'principalIdCard') {
- return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
- } else {
- return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
- }
- }
- }
+ ...mapGetters(["permission", "userInfo"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.article_add, true),
+ viewBtn: this.vaildData(this.permission.article_view, true),
+ delBtn: this.vaildData(this.permission.article_delete, true),
+ editBtn: this.vaildData(this.permission.article_edit, true),
}
+ },
+
+ textDispose() {
+ return (row, flag, type) => {
+ if (row[flag] || row[type] == null) {
+ return row[type]
+ } else {
+ if (type == 'principalIdCard') {
+ return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
+ } else {
+ return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
+ }
+ }
+ }
+ }
},
methods: {
- showStringDispose (row, type) {
- row[type] = !row[type]
- },
+ showStringDispose(row, type) {
+ row[type] = !row[type]
+ },
- getDetail (row) {
- this.isDetail = true
- },
- searchReset () {
- this.query = {}
+ getDetail(row) {
+ this.isDetail = true
+ },
+ 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.$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)
- },
- 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.$message({
+ type: "success",
+ message: "操作成功!",
+ })
this.$refs.crud.toggleSelection()
- },
- handleDelete () {
- if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据")
- return
+ })
+ },
+ beforeOpen(done, type) {
+ if (["edit", "view"].includes(type)) {
+ getNotice(this.form.id).then((res) => {
+ let data = res.data.data
+ // data.forEach(item=>{
+ if (data.url.length > 0) {
+ var urls = []
+ var names = data.url.split(",")
+ names.forEach(name => {
+ urls.push(website.minioUrl + name)
+ })
+ data.url = urls.join(",")
}
- this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
+ data.articleList = JSON.parse(data.articleRange)
+ this.form = data
+ })
+ }
+ // con
+ done()
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query)
+ },
+ onLoad(page, params = {}) {
+ this.loading = true
+ getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then((res) => {
+ const data = res.data.data
+ this.page.total = data.total
+ this.data = data.records
+ this.data.forEach(item => {
+ this.$set(item, 'principalPhoneflag', false)
+ if (item.signaturePath.length > 0) {
+ var urls = []
+ var names = item.signaturePath.split(",")
+ names.forEach(name => {
+ urls.push(website.minioUrl + name)
+ })
+ item.signaturePath = urls.join(",")
+ }
+ })
+ this.loading = false
+ this.selectionClear()
+ })
+ getPatrolGroupTree({
+ type: 1,
+ childType: 1
+ }).then((res) => {
+ const data = res.data.data
+ this.patrolTree = data
+ // const column = this.findObject(this.option.column, "articleList")
+ // column.dicData = res.data.data
+ this.loading = false
+ })
+ },
+ updateFb(row) {
+ if (row.publish == "0") {
+ row.publish = "1"
+ } else {
+ row.publish = "0"
+ }
+ if (row.url.length > 0) {
+ var urls = []
+ var split = row.url.split(",")
+ split.forEach(url => {
+ var names = url.split("jczz/")
+ urls.push(names[1])
+ })
+ row.url = urls.join(",")
+ }
+ update(row).then(
+ () => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
})
- .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)) {
- getNotice(this.form.id).then((res) => {
- let data = res.data.data
- // data.forEach(item=>{
- if (data.url.length > 0) {
- var urls = []
- var names = data.url.split(",")
- names.forEach(name => {
- urls.push(website.minioUrl + name)
- })
- data.url = urls.join(",")
- }
- data.articleList = JSON.parse(data.articleRange)
- this.form = data
- })
- }
- // con
done()
- },
- currentChange (currentPage) {
- this.page.currentPage = currentPage
- },
- sizeChange (pageSize) {
- this.page.pageSize = pageSize
- },
- refreshChange () {
- this.onLoad(this.page, this.query)
- },
- onLoad (page, params = {}) {
- this.loading = true
- getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then((res) => {
- const data = res.data.data
- this.page.total = data.total
- this.data = data.records
- this.data.forEach(item => {
- this.$set(item, 'principalPhoneflag', false)
- if (item.signaturePath.length > 0) {
- var urls = []
- var names = item.signaturePath.split(",")
- names.forEach(name => {
- urls.push(website.minioUrl + name)
- })
- item.signaturePath = urls.join(",")
- }
- })
- this.loading = false
- this.selectionClear()
- })
- getPatrolGroupTree({}).then((res) => {
- const data = res.data.data
- this.patrolTree = data
- // const column = this.findObject(this.option.column, "articleList")
- // column.dicData = res.data.data
- this.loading = false
- })
- },
- updateFb (row) {
- if (row.publish == "0") {
- row.publish = "1"
- } else {
- row.publish = "0"
- }
- if (row.url.length > 0) {
- var urls = []
- var split = row.url.split(",")
- split.forEach(url => {
- var names = url.split("jczz/")
- urls.push(names[1])
- })
- row.url = urls.join(",")
- }
- update(row).then(
- () => {
- this.onLoad(this.page)
- this.$message({
- type: "success",
- message: "操作成功!",
- })
- done()
- },
- (error) => {
- window.console.log(error)
- loading()
- }
- )
- },
+ },
+ (error) => {
+ window.console.log(error)
+ loading()
+ }
+ )
+ },
},
-}
+ }
</script>
<style>
-.avue-upload__icon {
+ .avue-upload__icon {
line-height: 6;
-}
-</style>
\ No newline at end of file
+ }
+</style>
--
Gitblit v1.9.3