From 9a11f818f304bc13bbd920313792e9560734922f Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期五, 27 九月 2024 15:31:25 +0800
Subject: [PATCH] 合并冲突
---
src/router/index.js | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index b33e0fd..773a5ef 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -80,15 +80,21 @@
{
//璁惧鍖归厤
name: 'fyspDeviceMatch',
- path: '/fysp/config/deviceMatch',
+ path: '/fysp/config/fyspDeviceMatch',
component: () => import('@/views/fysp/config/DeviceMatch.vue')
+ },
+ {
+ //璇勪及瑙勫垯绠＄悊
+ name: 'fyspEvalutationRule',
+ path: '/fysp/config/evalutationRule',
+ component: () => import('@/views/fysp/config/EvalutationRule.vue')
},
{
//璇勪及鏁版嵁婧�
name: 'fyspEvalutationTask',
path: '/fysp/evaluation/evalutationTask',
component: () => import('@/views/fysp/evaluation/EvalutationTask.vue'),
- meta: { keepAlive: false }
+ meta: { keepAlive: true }
},
{
//璇勪及绠＄悊
--
Gitblit v1.9.3