Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfptweb-public...

shuishen

2021-07-14 824e60d65da4e54de2af4f424c3931e970357399

 src/views/realTimePolice/real.vue

@@ -168,7 +168,7 @@
          dialogClickModal: false,
          column: [
            {
              label: "警情类型",
              label: "任务类型",
              prop: "alarmType",
              search: false,
              searchSpan: 3,
@@ -185,7 +185,7 @@
                "/api/blade-system/dict-biz/child-list?parentId=1356523651644043266",
            },
            {
              label: "报警时间",
              label: "下发时间",
              type: "datetime",
              width: 160,
              format: "yyyy-MM-dd HH:mm:ss",