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

shuishen

2024-01-08 3433896def51edfb5c41e6fe10c1156049c80d3b

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

 src/api/task/bailReporting.js

@@ -11,6 +11,17 @@
    },
  });
};
export const getList = (current, size, params) => {
  return request({
    url: '/api/blade-taskBailReportingEvent/taskBailReportingEvent/page',
    method: 'get',
    params: {
      ...params,
      current,
      size,
    }
  })
}

export const update = (row) => {
  return request({

 src/views/article/discussionManage.vue

@@ -199,6 +199,27 @@
              span: 24,
            },
            {
              label: "文章类型",
              prop: "articleType",
              addDisplay: true,
              editDisplay: true,
              viewDisplay: true,
              searchSpan: 3,
              checkStrictly: true,
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=investigateType",
              props: {
                label: "dictValue",
                value: "dictKey",
              },
              search: true,
              type: "tree",
              rules: [{
                required: true,
                message: "请选择文章类型",
                trigger: "blur",
              }, ],
            },
            {
              label: "发布时间",
              prop: "createTime",
              type: "date",

 src/views/publicSecurity/bailReporting.vue

@@ -32,6 +32,7 @@

  import {
    update as bailReportingUpdate,
    getList as bailReportingGetList
  } from "@/api/task/bailReporting"

  import {
@@ -78,24 +79,86 @@
          selection: true,
          dialogClickModal: false,
          column: [{
              label: "所属街道",
              // hide: true,
              searchSpan: 4,
              search: true,
              parent: false,
              prop: "streetCode",
              type: "tree",
              dicUrl: "/api/blade-system/region/getTownTree",
              props: {
                label: "name",
                value: "id"
              },
              rules: [{
                required: true,
                message: "请选择所属街道",
                trigger: "blur",
              }, ],
            }, {
              // hide: true,
              parent: false,
              searchSpan: 4,
              label: "所属社区",
              prop: "neiCode",
              search: true,
              type: "tree",
              dicUrl: "/api/blade-system/region/tree",
              props: {
                label: "name",
                value: "id",
              },
              cascader: ["gridId"],
              rules: [{
                required: true,
                message: "请选择所属社区",
                trigger: "blur",
              }, ],
            }, {
              label: "小区",
              prop: "aoiCode",
              searchSpan: 4,
              type: 'tree',
              search: true,
              parent: false,
              dicUrl: `/api/blade-district/district/getDistrictTree`,
              props: {
                label: "name",
                value: "aoiCode"
              },
              // defaultExpandedKeys: ["361102003"],
              span: 12,
              label: "场所名称",
              labelWidth: 120,
              // width: 220,
              // overHidden: true,
              rules: [{
                required: true,
                message: "请选择小区",
                trigger: "blur",
              }, ],
              // disabled: true
              display: true,
              // hide: true,
            },
            {
              span: 12,
              label: "名称",
              prop: "name",
              searchSpan: 4,
              search: true,
            }, {
              span: 12,
              label: "地址",
              prop: "addressName",
              label: "电话",
              prop: "phone",
              searchSpan: 4,
              search: true,
            },
            {
              label: "创建时间",
              prop: "createTime",
              searchSpan: 4,

            },

            {
              addDisplay: false,
              editDisplay: false,
@@ -123,12 +186,18 @@
              prop: 'reportType',
              type: 'radio',
              slot: true,
              search: true,
              // search: true,
              dicData: [{
                label: '取保候审',
                value: 1
              }, ]
            },
            {
              span: 12,
              label: "地址",
              prop: "addressName",
              searchSpan: 4,
            },
          ],
        },
        data: [],

 src/views/publicSecurity/keynotePlaceManage.vue

@@ -79,16 +79,91 @@
          selection: true,
          dialogClickModal: false,
          column: [{
              span: 12,
              label: "场所名称",
              prop: "name",
              searchSpan: 4,
              label: "所属街道",
              // hide: true,
              search: true,
              parent: false,
              searchSpan: 4,
              prop: "streetCode",
              type: "tree",
              dicUrl: "/api/blade-system/region/getTownTree",
              props: {
                label: "name",
                value: "id"
              },
              rules: [{
                required: true,
                message: "请输入场所名称",
                message: "请选择所属街道",
                trigger: "blur",
              }, ],
            }, {
              // hide: true,
              search: true,
              parent: false,
              searchSpan: 4,
              label: "所属社区",
              prop: "neiCode",
              // search: false,
              type: "tree",
              dicUrl: "/api/blade-system/region/tree",
              props: {
                label: "name",
                value: "id",
              },
              rules: [{
                required: true,
                message: "请选择所属社区",
                trigger: "blur",
              }, ],
            }, {
              // hide: true,
              search: true,
              parent: false,
              searchSpan: 4,
              label: "小区",
              prop: "aoiCode",
              // search: false,
              type: "tree",
              dicUrl: "/api/blade-district/district/getDistrictTree",
              props: {
                label: "name",
                value: "aoiCode"
              },
              rules: [{
                required: true,
                message: "请选择小区",
                trigger: "blur",
              }, ],
            },
            // {
            //   span: 12,
            //   label: "场所名称",
            //   prop: "name",
            //   searchSpan: 4,
            //   search: true,
            // },
            {
              span: 12,
              label: "名称",
              prop: "realName",
              searchSpan: 4,
              search: true,
            }, {
              span: 12,
              label: "电话",
              prop: "phone",
              searchSpan: 4,
              search: true,
            }, {
              span: 12,
              label: "地址",
              prop: "addressName",
              searchSpan: 4,
            }, {
              label: "创建时间",
              prop: "createTime",
              searchSpan: 4,

            }, {
              span: 12,
              label: "地址",
@@ -100,8 +175,7 @@
                message: "请输入场所名称",
                trigger: "blur",
              }, ],
            },
            {
            }, {
              label: "创建时间",
              prop: "createTime",
              searchSpan: 4,
@@ -126,8 +200,7 @@
                label: '未通过',
                value: 3
              }]
            },
            {
            }, {
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
@@ -136,6 +209,7 @@
              type: 'radio',
              slot: true,
              search: true,
              searchSpan: 3,
              dicData: [{
                label: '旅馆安全',
                value: 2