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 | 92 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 69 insertions(+), 23 deletions(-)
diff --git a/src/views/patrolList/patrolRecord.vue b/src/views/patrolList/patrolRecord.vue
index 6cdee2b..e1d2332 100644
--- a/src/views/patrolList/patrolRecord.vue
+++ b/src/views/patrolList/patrolRecord.vue
@@ -9,24 +9,53 @@
详情
</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>
<el-drawer title="巡查详情" :visible.sync="isDetail" :append-to-body="true" size="60%" direction="rtl">
<el-card class="trackClass" style="overflow-y: auto">
- <el-form :model="form" label-position="right" size="mini" class="taskinfoForm" label-width="70px">
+
+ <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>
+ </el-collapse>
+
+ <!-- <el-form :model="form" label-position="right" size="mini" class="taskinfoForm" label-width="70px">
<el-row>
<el-col :span="24">
- <el-form-item label="巡检状态">
- <el-input :disabled="true" v-model="form.$status" autocomplete="off"></el-input>
+ <el-form-item label="巡查内容">
+ <el-input :disabled="true" v-model="form.content" autocomplete="off"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item label="巡查内容">
- <el-input :disabled="true" v-model="form.content" autocomplete="off"></el-input>
+ <el-form-item label="巡检状态">
+ <el-input :disabled="true" v-model="form.$status" autocomplete="off"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -39,7 +68,8 @@
</el-col>
</el-row>
- </el-form>
+ </el-form> -->
+
</el-card>
<!-- <DcMap v-if="isDetail" :is-detail="isDetail" :range="form.taskRoute" :patrolRoute="form.patrolRoute">
@@ -54,22 +84,18 @@
import {
getList,
remove,
- update,
add,
- getNotice,
- upcomment
+ update,
+ getDetail,
+ getPatrolGroupTree
} from "@/api/patrol/placeChek"
-
- import {
- addPd,
- } from "@/api/discuss/publicDiscuss"
import website from '@/config/website'
- import {
- getDistrictTree
- } from "@/api/district/index"
+ // import {
+ // getDistrictTree
+ // } from "@/api/district/index"
import {
mapGetters
@@ -110,6 +136,7 @@
// selection: true,
excelBtn: true,
dialogClickModal: false,
+ header: false,
column: [{
label: "所属街道",
prop: "streetName",
@@ -165,6 +192,7 @@
span: 24,
row: true,
searchSpan: 4,
+ slot: true
},
{
label: "场所地址",
@@ -194,7 +222,7 @@
},
data: [],
- districtTree: [],
+ patrolTree: [],
}
},
watch: {
@@ -232,8 +260,24 @@
}
},
+ 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]
+ },
getDetail(row) {
this.isDetail = true
@@ -313,6 +357,7 @@
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(",")
@@ -325,13 +370,14 @@
this.loading = false
this.selectionClear()
})
- getDistrictTree({
- filterFlag: 1
+ getPatrolGroupTree({
+ type: 1,
+ childType: 1
}).then((res) => {
const data = res.data.data
- this.districtTree = data
- const column = this.findObject(this.option.column, "articleList")
- column.dicData = res.data.data
+ this.patrolTree = data
+ // const column = this.findObject(this.option.column, "articleList")
+ // column.dicData = res.data.data
this.loading = false
})
},
@@ -374,4 +420,4 @@
.avue-upload__icon {
line-height: 6;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3