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 |   73 ++++++++++++++++++++++++------------
 1 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 407d96b..773a5ef 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -4,79 +4,90 @@
 import { useLoadingStore } from '../stores/loadingStore'
 
 const routes = [
-  {
-    //鏁存敼瀹℃牳
-    name: 'changecheck',
-    path: '/changecheck',
-    component: () => import('@/views/check/ChangeCheck.vue')
-  },
+  // {
+  //   //鏁存敼瀹℃牳
+  //   name: 'changecheck',
+  //   path: '/changecheck',
+  //   component: () => import('@/views/check/ChangeCheck.vue')
+  // },
+  /**********************************椋炵窘鐩戠***********************************************/
   {
     //闂鍔ㄦ�佽窡韪�
     name: 'profollow',
     path: '/analysis/profollow',
-    component: () => import('@/views/analysis/ProFollow.vue')
+    component: () => import('@/views/fysp/analysis/ProFollow.vue')
   },
   {
     //闂鏁存敼鍒嗘瀽
     name: 'proanalysis',
     path: '/analysis/proanalysis',
-    component: () => import('@/views/analysis/ProAnalysis.vue')
+    component: () => import('@/views/fysp/analysis/ProAnalysis.vue')
   },
   {
     //瑙勮寖鎬ц瘎浼�
     name: 'standardjudge',
     path: '/analysis/standardjudge',
-    component: () => import('@/views/analysis/StandardJudge.vue')
+    component: () => import('@/views/fysp/analysis/StandardJudge.vue')
   },
   {
     //鏃ユ姤绠＄悊
     name: 'dailyreport',
     path: '/dailyreport',
-    component: () => import('@/views/dailyreport/DailyReport.vue')
+    component: () => import('@/views/fysp/dailyreport/DailyReport.vue')
   },
   {
     //鍦烘櫙鎶ュ憡-宸ュ湴
     name: 'construction',
     path: '/scenereport/construction',
-    component: () => import('@/views/scenereport/ConstructionReport.vue')
+    component: () => import('@/views/fysp/scenereport/ConstructionReport.vue')
   },
   {
     //鍦烘櫙鎶ュ憡-鐮佸ご
     name: 'wharf',
     path: '/scenereport/wharf',
-    component: () => import('@/views/scenereport/WharfReport.vue')
+    component: () => import('@/views/fysp/scenereport/WharfReport.vue')
   },
   {
     //鍦烘櫙鎶ュ憡-鎼呮媽绔�
     name: 'mixing',
     path: '/scenereport/mixing',
-    component: () => import('@/views/scenereport/MixingReport.vue')
+    component: () => import('@/views/fysp/scenereport/MixingReport.vue')
   },
   {
     //鍦烘櫙鎶ュ憡-鍫嗗満
     name: 'storage',
     path: '/scenereport/storage',
-    component: () => import('@/views/scenereport/StorageReport.vue')
+    component: () => import('@/views/fysp/scenereport/StorageReport.vue')
   },
-
-  /**********************************椋炵窘鐩戠***********************************************/
   {
     //闂瀹℃牳
     name: 'procheck',
     path: '/fysp/procheck',
     component: () => import('@/views/fysp/check/ProCheck.vue')
   },
-  {
-    //璐︽埛绠＄悊
-    name: 'fyspUser',
-    path: '/fysp/userInfo',
-    component: () => import('@/views/baseinfo/fysp/user/UserInfo.vue')
-  },
+  // {
+  //   //璐︽埛绠＄悊
+  //   name: 'fyspUser',
+  //   path: '/fysp/userInfo',
+  //   component: () => import('@/views/baseinfo/fysp/user/UserInfo.vue')
+  // },
   {
     //鐩戠闂
     name: 'fyspProblemType',
     path: '/fysp/config/problemType',
     component: () => import('@/views/fysp/config/ProblemType.vue')
+  },
+  {
+    //璁惧鍖归厤
+    name: 'fyspDeviceMatch',
+    path: '/fysp/config/fyspDeviceMatch',
+    component: () => import('@/views/fysp/config/DeviceMatch.vue')
+  },
+  {
+    //璇勪及瑙勫垯绠＄悊
+    name: 'fyspEvalutationRule',
+    path: '/fysp/config/evalutationRule',
+    component: () => import('@/views/fysp/config/EvalutationRule.vue')
   },
   {
     //璇勪及鏁版嵁婧�
@@ -93,18 +104,30 @@
     meta: { keepAlive: true }
   },
   {
+    //璇勪及缁撴灉璇︽儏
+    name: 'fyspEvalutationEdit',
+    path: '/fysp/evaluation/evalutationEdit/:subTaskId',
+    component: () => import('@/views/fysp/evaluation/EvalutationEdit.vue'),
+  },
+  {
     //鍦烘櫙淇℃伅
     name: 'fyspSceneInfo',
     path: '/fysp/sceneInfo',
-    component: () => import('@/views/baseinfo/fysp/scene/SceneInfo.vue'),
+    component: () => import('@/views/fysp/scene/SceneInfo.vue'),
     meta: { keepAlive: true }
   },
   {
     //鍦烘櫙缂栬緫
     name: 'fyspSceneEdit',
     path: '/fysp/sceneEdit/:sid',
-    component: () => import('@/views/baseinfo/fysp/scene/SceneEdit.vue'),
+    component: () => import('@/views/fysp/scene/SceneEdit.vue'),
     meta: { transition: 'slide-left' }
+  },
+  {
+    //瀵瑰鏀寔
+    name: 'fyspSupport',
+    path: '/fysp/support',
+    component: () => import('@/views/fysp/support/JingAnSupport.vue'),
   },
 
   /**********************************椋炵窘鐜***********************************************/
@@ -118,7 +141,7 @@
     //閫氱煡绠＄悊
     name: 'notice',
     path: '/fytz/notice',
-    component: () => import('@/views/notice/NoticeManage.vue')
+    component: () => import('@/views/fytz/notice/NoticeManage.vue')
   },
   {
     //璐︽埛绠＄悊

--
Gitblit v1.9.3