Merge branch 'test' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into test

src/router/index.js

@@ -282,44 +282,44 @@ router.beforeEach((to, from, next) => {
       url: "visual/heart/index",
       children: [],
     },
-    // {
+    {
-    //   icon: "icon-setting",
+      icon: "icon-setting",
-    //   id: "44rq22222q2222",
+      id: "44rq22222q2222",
-    //   name: "AI安防",
+      name: "AI安防",
-    //   // url: "visual/basicinfo/basicInfoMain",
+      // url: "visual/basicinfo/basicInfoMain",
-    //   children: [
+      children: [
-    //     {
+        {
-    //       url: "/visual/ai/index",
+          url: "/visual/ai/index",
-    //       name: "AI安防",
+          name: "AI安防",
-    //       id: "5feawfwa111111efwa57",
+          id: "5feawfwa111111efwa57",
-    //     },
+        },
-    //     {
+        {
-    //       url: "/visual/ai/renliu",
+          url: "/visual/ai/renliu",
-    //       name: "人流数据",
+          name: "人流数据",
-    //       id: "5fwaefwae222112fawef58",
+          id: "5fwaefwae222112fawef58",
-    //     },
+        },
-    //     {
+        {
-    //       url: "/visual/ai/cheliu",
+          url: "/visual/ai/cheliu",
-    //       name: "车流数据",
+          name: "车流数据",
-    //       id: "erawerwecsxefwaw",
+          id: "erawerwecsxefwaw",
-    //     },
+        },
-    //     {
+        {
-    //       url: "/visual/ai/shebei",
+          url: "/visual/ai/shebei",
-    //       name: "设备数据",
+          name: "设备数据",
-    //       id: "zfzffewaf",
+          id: "zfzffewaf",
-    //     },
+        },
-    //     {
+        {
-    //       url: "/visual/ai/gongdan",
+          url: "/visual/ai/gongdan",
-    //       name: "工单数据",
+          name: "工单数据",
-    //       id: "fewafwafewaefddd",
+          id: "fewafwafewaefddd",
-    //     },
+        },
-    //     {
+        {
-    //       url: "/visual/ai/yujing",
+          url: "/visual/ai/yujing",
-    //       name: "预警事件",
+          name: "预警事件",
-    //       id: "545345fdsfs",
+          id: "545345fdsfs",
-    //     },
+        },
-    //   ],
+      ],
-    // },
+    },
   ];
   fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]);
 

src/views/modules/importRecord/index.vue

@@ -22,7 +22,7 @@
               >导入中</span
             >
             <span
-              v-else-if="scope.row.processStatus == 'finished'"
+              v-else-if="scope.row.processStatus == 'finished_success'"
               >已完成</span
             >
             <a target="_blank"