Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

shuishen

2024-04-18 4522ab3fe8bd45ee753ef187448c1e884bbc601f

 src/views/place/index.vue

@@ -18,7 +18,8 @@
            </template>

            <template slot-scope="{row, size}" slot="confirmFlag">
                <el-tag :size="size" :type="showConfirmFlag(row.confirmFlag).type">{{ showConfirmFlag(row.confirmFlag).text
                <el-tag :size="size" :type="showConfirmFlag(row.confirmFlag).type">{{
            showConfirmFlag(row.confirmFlag).text
                }}</el-tag>
            </template>

@@ -28,7 +29,8 @@
            </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>

@@ -407,6 +409,28 @@
                        },
                    },
                    {
                        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: "场所照片",
                        prop: "imageUrls",
@@ -420,7 +444,7 @@
                            name: 'name',
                            url: "link",
                        },
                        span: 12,
                        span: 24,
                    },
                    {
                        width: 156,
@@ -431,7 +455,7 @@
                        type: 'map',
                        dataType: "string",
                        minWidth: 250,
                        span: 12,
                        span: 24,
                        value: [117.966460, 28.431002, ""],
                        rules: [
                            {