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/place/index.vue | 121 ++++++++++++++++++++++++----------------
1 files changed, 73 insertions(+), 48 deletions(-)
diff --git a/src/views/place/index.vue b/src/views/place/index.vue
index 7368bab..60db9df 100644
--- a/src/views/place/index.vue
+++ b/src/views/place/index.vue
@@ -18,17 +18,19 @@
</template>
<template slot-scope="{row, size}" slot="confirmFlag">
- <el-tag :size="size" :type="showConfirmFlag(row.confirmFlag).type">{{ showConfirmFlag(row.confirmFlag).text
- }}</el-tag>
+ <el-tag :size="size" :type="showConfirmFlag(row.confirmFlag).type">{{
+ showConfirmFlag(row.confirmFlag).text
+ }}</el-tag>
</template>
<template slot-scope="{row, size}" slot="source">
<el-tag :size="size" :type="showSource(row.source).type">{{ showSource(row.source).text
- }}</el-tag>
+ }}</el-tag>
</template>
<template slot="menuLeft">
- <el-button size="small" icon="el-icon-delete" plain v-if="permission.place_delete" @click="handleDelete">删 除
+ <el-button size="small" icon="el-icon-delete" plain v-if="permission.place_delete"
+ @click="handleDelete">删 除
</el-button>
</template>
@@ -82,7 +84,7 @@
import baseAllInfo from './components/baseAllInfo'
export default {
- data () {
+ data() {
//手机号格式校验
let validatorPhone = function (rule, value, callback) {
@@ -143,9 +145,6 @@
trigger: "blur",
},],
},
-
-
-
{
width: 110,
label: "场所负责人",
@@ -159,7 +158,6 @@
trigger: "blur",
},],
},
-
{
width: 120,
overHidden: true,
@@ -191,7 +189,6 @@
}
],
},
-
{
width: 110,
label: "所属街道",
@@ -242,7 +239,6 @@
},
],
},
-
{
width: 110,
overHidden: true,
@@ -279,8 +275,6 @@
},
],
},
-
-
{
span: 7,
label: "场所标签",
@@ -300,7 +294,6 @@
trigger: "blur",
},],
},
-
{
span: 5,
label: "",
@@ -315,7 +308,6 @@
dataType: "string",
hide: true,
},
-
{
span: 12,
label: "标签颜色",
@@ -355,6 +347,13 @@
}
],
hide: true,
+ rules: [
+ {
+ required: true,
+ message: "请选择九小场所",
+ trigger: "blur",
+ },
+ ],
},
{
span: 12,
@@ -386,6 +385,13 @@
}
],
hide: true,
+ rules: [
+ {
+ required: true,
+ message: "请选择阵地",
+ trigger: "blur",
+ },
+ ],
},
{
span: 12,
@@ -402,7 +408,28 @@
value: "dictKey",
},
},
-
+ {
+ span: 12,
+ label: "三级消防单位",
+ prop: "threeFireProtection",
+ labelWidth: 120,
+ type: "select",
+ dicData: [{
+ label: "是",
+ value: 1,
+ },
+ {
+ label: "否",
+ value: 2,
+ }
+ ],
+ hide: true,
+ rules: [{
+ required: false,
+ message: "请选择三级消防单位",
+ trigger: "blur",
+ },],
+ },
{
width: 110,
label: "场所照片",
@@ -417,7 +444,7 @@
name: 'name',
url: "link",
},
- span: 12,
+ span: 24,
},
{
width: 156,
@@ -428,7 +455,7 @@
type: 'map',
dataType: "string",
minWidth: 250,
- span: 12,
+ span: 24,
value: [117.966460, 28.431002, ""],
rules: [
{
@@ -446,7 +473,7 @@
span: 24,
rules: [
{
- required: true,
+ required: false,
message: "请输入场所备注",
trigger: "blur",
},
@@ -462,7 +489,6 @@
hide: true,
prop: "lng",
},
-
{
width: 96,
slot: true,
@@ -473,7 +499,6 @@
hide: true,
prop: "lat",
},
-
{
width: 100,
addDisplay: false,
@@ -524,7 +549,7 @@
}
},
- provide () {
+ provide() {
return {
placeElement: this,
}
@@ -534,7 +559,7 @@
watch: {
'form.isNine': {
- handler (newData) {
+ handler(newData) {
if (newData) {
let nineTypeColumn = this.findObject(
this.option.column,
@@ -550,7 +575,7 @@
},
},
'form.isFront': {
- handler (newData) {
+ handler(newData) {
if (newData) {
let frontTypeColumn = this.findObject(
this.option.column,
@@ -569,7 +594,7 @@
computed: {
...mapGetters(["permission", "userInfo"]),
- permissionList () {
+ permissionList() {
return {
addBtn: this.vaildData(this.permission.place_add, true),
viewBtn: this.vaildData(this.permission.place_view, true),
@@ -577,7 +602,7 @@
editBtn: this.vaildData(this.permission.place_edit, true),
}
},
- ids () {
+ ids() {
let ids = []
this.selectionList.forEach((ele) => {
ids.push(ele.id)
@@ -585,7 +610,7 @@
return ids.join(",")
},
- showConfirmFlag () {
+ showConfirmFlag() {
return (data) => {
let tags = {
text: '',
@@ -617,7 +642,7 @@
}
},
- showSource () {
+ showSource() {
return (data) => {
let tags = {
text: '',
@@ -640,7 +665,7 @@
}
},
- showLocation () {
+ showLocation() {
return (data) => {
if (data != null && data.indexOf(',') != -1) {
data = data.split(',')
@@ -652,7 +677,7 @@
}
},
- decimalProcessing () {
+ decimalProcessing() {
return (data) => {
if (data != null) {
return Number(data).toFixed(6)
@@ -662,7 +687,7 @@
}
},
- textDispose () {
+ textDispose() {
return (row, flag, type) => {
if (row[flag] || row[type] == null) {
return row[type]
@@ -677,11 +702,11 @@
}
},
methods: {
- showStringDispose (row, type) {
+ showStringDispose(row, type) {
row[type] = !row[type]
},
- locationDispose (data) {
+ locationDispose(data) {
data = data.split(',')
return {
@@ -691,16 +716,16 @@
}
},
- auditCur (row) {
+ auditCur(row) {
this.curAuditRow = row
this.auditBasePopup = true
},
- ManageTenants (item) {
+ ManageTenants(item) {
this.$refs.BaseAllInfo.initOpen(item)
},
- rowSave (row, done, loading) {
+ rowSave(row, done, loading) {
if (row.imageUrls.length > 0) {
var urls = []
var split = row.imageUrls.split(",").filter(item => item != '')
@@ -739,7 +764,7 @@
)
},
- rowUpdate (row, index, done, loading) {
+ rowUpdate(row, index, done, loading) {
if (row.imageUrls.length > 0) {
var urls = []
var split = row.imageUrls.split(",").filter(item => item != '')
@@ -778,7 +803,7 @@
)
},
- rowDel (row) {
+ rowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@@ -797,26 +822,26 @@
})
},
- searchReset () {
+ searchReset() {
this.query = {}
this.onLoad(this.page)
},
- searchChange (params, done) {
+ searchChange(params, done) {
this.query = params
this.page.currentPage = 1
this.onLoad(this.page, params)
done()
},
- selectionChange (list) {
+ selectionChange(list) {
this.selectionList = list
},
- selectionClear () {
+ selectionClear() {
this.selectionList = []
this.$nextTick(() => {
this.$refs.crud && this.$refs.crud.toggleSelection()
})
},
- handleDelete () {
+ handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据")
return
@@ -839,7 +864,7 @@
})
},
- beforeOpen (done, type) {
+ beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
getPlace(this.form.id).then((res) => {
this.form = res.data.data
@@ -871,16 +896,16 @@
}
},
- currentChange (currentPage) {
+ currentChange(currentPage) {
this.page.currentPage = currentPage
},
- sizeChange (pageSize) {
+ sizeChange(pageSize) {
this.page.pageSize = pageSize
},
- refreshChange () {
+ refreshChange() {
this.onLoad(this.page, this.query)
},
- onLoad (page, params = {}) {
+ onLoad(page, params = {}) {
this.loading = true
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then((res) => {
--
Gitblit v1.9.3