From 902a537974ce0374d68d9e717febab7157a69286 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 13 十月 2022 09:43:54 +0800
Subject: [PATCH] 冲突

---
 src/router/route.ts |   24 ------------------------
 1 files changed, 0 insertions(+), 24 deletions(-)

diff --git a/src/router/route.ts b/src/router/route.ts
index 2e55148..a0eed32 100644
--- a/src/router/route.ts
+++ b/src/router/route.ts
@@ -89,35 +89,11 @@
         }
     },
     {
-        path: '/screenPage',
-        name: 'screenPage',
-        component: () => import('/@/views/riskWarningSys/warningBigScreen/indexs/index.vue'),
-        meta: {
-            title: '预警预报'
-        }
-    },
-    {
-        path: '/material',
-        name: 'material',
-        component: () => import('/@/views/specialWorkSystem/foundationSet/material/index.vue'),
-        meta: {
-            title: '物资管理'
-        }
-    },
-    {
         path: '/msgDetail',
         name: 'msgDetail',
         component: () => import('/@/views/riskWarningSys/warningBigScreen/indexs/msgDetail.vue'),
         meta: {
             title: 'spi报告详情'
-        }
-    },
-    {
-        path: '/material',
-        name: 'material',
-        component: () => import('/@/views/specialWorkSystem/foundationSet/material/index.vue'),
-        meta: {
-            title: '作业物资'
         }
     }
 ];

--
Gitblit v1.9.2