Merge branch 'master' into shibei_master

src/router/index.js

@@ -299,10 +299,10 @@ router.beforeEach((to, from, next) => {
       children: [
         {
           url: "/visual/ai/index",
-          name: "视频监控",
+          name: "AI安防",
           id: "5feawfwa111111efwa57",
         },
-       /* {
+        {
           url: "/visual/ai/renliu",
           name: "人流数据",
           id: "5fwaefwae222112fawef58",
@@ -321,10 +321,10 @@ router.beforeEach((to, from, next) => {
           url: "/visual/ai/gongdan",
           name: "工单数据",
           id: "fewafwafewaefddd",
-        },*/
+        },
         {
           url: "/visual/ai/yujing",
-          name: "预警分析",
+          name: "预警事件",
           id: "545345fdsfs",
         },
       ],