diff --git a/src/router/index.js b/src/router/index.js index 8c31809..e9d0173 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -80,15 +80,15 @@ export const publicRoutes = [ icon: "personnel-manage" } }, - { - path: "/user/publicSecurity", - name: "publicSecurity", - component: () => import("@/views/backOfficeSystem/systemConfig/publicSecurity/index"), - meta: { - title: "公安机关要素", - icon: "personnel-manage" - } - }, + // { + // path: "/user/publicSecurity", + // name: "publicSecurity", + // component: () => import("@/views/backOfficeSystem/systemConfig/publicSecurity/index"), + // meta: { + // title: "公安机关要素", + // icon: "personnel-manage" + // } + // }, { path: "/dict/detail", name: "dictDetail", diff --git a/src/views/backOfficeSystem/AlarmLinkage/PatrolLine/index.vue b/src/views/backOfficeSystem/AlarmLinkage/PatrolLine/index.vue index b4e9143..f626aea 100644 --- a/src/views/backOfficeSystem/AlarmLinkage/PatrolLine/index.vue +++ b/src/views/backOfficeSystem/AlarmLinkage/PatrolLine/index.vue @@ -15,6 +15,9 @@ + @@ -50,16 +53,17 @@ const showDetail = ref(false); // 控制详情弹窗显示 const searchConfiger = ref([ { label: "必巡线名称", - prop: "bxxmc", + prop: "bxxMc", placeholder: "必巡线名称", showType: "input" }, { label: "所属辖区", - prop: "ssbmdm", - placeholder: "分县局", - showType: "department" + prop: "ssxq", + placeholder: "请选择", + showType: "select", + options:D_BZ_XZQHDM } ]); @@ -80,7 +84,7 @@ const pageData = reactive({ controlsWidth: 200, tableColumn: [ { label: "必巡线名称", prop: "bxxMc" }, - { label: "所属辖区", prop: "ssbm" }, + { label: "所属辖区", prop: "ssxq", showSolt: true }, { label: "必巡线类型", prop: "bxxLx", showSolt: true }, { label: "必巡点数量", prop: "bxds", showSolt: true } ] diff --git a/src/views/backOfficeSystem/AlarmLinkage/SecurityPersonnel/index.vue b/src/views/backOfficeSystem/AlarmLinkage/SecurityPersonnel/index.vue index 7df3298..a5636c3 100644 --- a/src/views/backOfficeSystem/AlarmLinkage/SecurityPersonnel/index.vue +++ b/src/views/backOfficeSystem/AlarmLinkage/SecurityPersonnel/index.vue @@ -56,7 +56,7 @@ const searchConfiger = ref([ }, { label: "证件号码", - prop: "sfzh", + prop: "zjhm", placeholder: "证件号码", showType: "input" }, diff --git a/src/views/backOfficeSystem/AlarmLinkage/sectionalState/components/detailForm.vue b/src/views/backOfficeSystem/AlarmLinkage/sectionalState/components/detailForm.vue index 2aacea1..d939213 100644 --- a/src/views/backOfficeSystem/AlarmLinkage/sectionalState/components/detailForm.vue +++ b/src/views/backOfficeSystem/AlarmLinkage/sectionalState/components/detailForm.vue @@ -17,40 +17,47 @@ import { qcckGet } from "@/api/qcckApi.js"; import FormMessage from "@/components/aboutTable/FormMessage.vue"; import MyTable from "@/components/aboutTable/MyTable.vue"; -import { ref, reactive } from 'vue'; - +import { ref, reactive, watch,defineProps } from 'vue'; +const props = defineProps({ + dic: { + type: Object, + default: { + D_BZ_XZQHDM: [] + } + } +}) const dialogForm = ref(false); const listQuery = ref({}); -const formList = reactive([ - [ - { label: "日期", prop: "sbrq", type: "input" }, - { label: "所属辖区", prop: "ssxq", type: "input" }, - ], - [ - { label: "巡逻路线", prop: "xllx", type: "input" }, - { label: "地址", prop: "dz", type: "input" }, - ], - [ - { label: "上报人", prop: "sbrxm", type: "input" }, - { label: "街面状况", prop: "jmzk", type: "date" }, - ], - [ - { label: "状况描述", prop: "zkms", type: "input" }, - ], -]) +const formList = ref() // 初始化数据 const init = (row) => { dialogForm.value = true; - pageData.tableConfiger.loading = true; qcckGet({}, `/mosty-jbld/jbjmzk/${row.id}`).then(res => { listQuery.value = res || []; - pageData.tableConfiger.loading = false; - pageData.tableData = [...res.mjList, ...res.baList] }).catch(() => { - pageData.tableConfiger.loading = false; }) }; - +watch(() => props.dic, (val) => { + if (val.D_BZ_XZQHDM) { + formList.value = [ + [ + { label: "日期", prop: "sbrq", type: "input" }, + { label: "所属辖区", prop: "ssxq", type: "select", options: props.dic.D_BZ_XZQHDM }, + ], + [ + { label: "巡逻路线", prop: "xllx", type: "input" }, + { label: "地址", prop: "dz", type: "input" }, + ], + [ + { label: "上报人", prop: "sbrxm", type: "input" }, + { label: "街面状况", prop: "jmzk", type: "date" }, + ], + [ + { label: "状况描述", prop: "zkms", type: "input" }, + ], + ] + } +}) const close = () => { dialogForm.value = false; }; diff --git a/src/views/backOfficeSystem/AlarmLinkage/sectionalState/index.vue b/src/views/backOfficeSystem/AlarmLinkage/sectionalState/index.vue index f940bf7..8895679 100644 --- a/src/views/backOfficeSystem/AlarmLinkage/sectionalState/index.vue +++ b/src/views/backOfficeSystem/AlarmLinkage/sectionalState/index.vue @@ -13,6 +13,9 @@ + @@ -23,7 +26,7 @@ }"> - +