Merge branch 'xy-ly' of http://dev.xinyingpower.com:8080/git/xymp/frontend into xy-ly

2 years ago · c3d7ad3d97
parent 87e904bec6 9cdfef7f50
commit c3d7ad3d97
2 changed files with 191 additions and 1729 deletions
--- a/src/router/index.js
+++ b/src/router/index.js
@ -113,14 +113,6 @@ const routes = [
        meta: { title: "拍照时间表设置", icon: "el-icon-setting" },
      },

-      {
-        path: "/imageSettings",
-        component: () =>
-          import(
-            /* webpackChunkName: "tabs" */ "../views/imageSettings/index.vue"
-          ),
-        meta: { title: "图像采集装置设置", icon: "el-icon-picture-outline" },
-      },
      {
        path: "/imageSettings",
        component: () =>
--- a/src/views/alarmHandling/index.vue
+++ b/src/views/alarmHandling/index.vue