From 824e60d65da4e54de2af4f424c3931e970357399 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 14 Jul 2021 10:05:13 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfptweb-publicSecurity

---
 src/views/realTimePolice/real.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index d6766a5..0694e52 100644
--- a/src/views/realTimePolice/real.vue
+++ b/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",

--
Gitblit v1.9.3