Merge remote-tracking branch 'origin/master'

linwei

2024-02-07 803629e0e53b3d367615f42b1b22fa7aef2b05a1

Merge remote-tracking branch 'origin/master'

 src/views/publicSecurity/keynotePlaceManage.vue

@@ -184,6 +184,18 @@
                        trigger: "blur",
                    },],
                    align: 'center'
                }, {
                    label: "九小场所类型",
                    prop: "nineType",
                    dicUrl: "/api/blade-system/dict-biz/tree?code=nineType",
                    props: {
                        label: "title",
                        value: "key",
                    },
                    // type: 'select',
                    // search: true,
                    align: 'center',
                    width: 120,
                },
                {
                    width: 100,

 src/views/publicSecurity/positionManage/TransactRegist.vue

@@ -186,6 +186,19 @@
                    align: 'center'
                },
                {
                    label: "阵地类型",
                    prop: "frontType",
                    dicUrl: "/api/blade-system/dict-biz/tree?code=frontType",
                    props: {
                        label: "title",
                        value: "key",
                    },
                    // type: 'select',
                    // search: true,
                    align: 'center',
                    width: 120,
                },
                {
                    width: 100,
                    addDisplay: false,
                    editDisplay: false,
@@ -536,7 +549,7 @@

<style lang="scss" scoped>
:deep(.cur-container-box) {
    padding: 0;
    padding: 0 !important;
}

.avue-upload__icon {