From c7bd6db3190ff5c4b55d004db0b9fa944604925f Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 18 十月 2024 11:09:15 +0800
Subject: [PATCH] Merge branch 'lsf-topTask'

---
 src/router/index.js |   86 +++++++++++++++++++++++++++++++------------
 1 files changed, 62 insertions(+), 24 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index b33e0fd..41e3ccd 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -14,50 +14,82 @@
   {
     //闂鍔ㄦ�佽窡韪�
     name: 'profollow',
-    path: '/analysis/profollow',
-    component: () => import('@/views/fysp/analysis/ProFollow.vue')
+    path: '/fysp/data-product/profollow',
+    component: () => import('@/views/fysp/data-product/ProdProFollow.vue')
   },
   {
     //闂鏁存敼鍒嗘瀽
     name: 'proanalysis',
-    path: '/analysis/proanalysis',
-    component: () => import('@/views/fysp/analysis/ProAnalysis.vue')
+    path: '/fysp/data-product/proanalysis',
+    component: () => import('@/views/fysp/data-product/ProdProAnalysis.vue')
   },
   {
     //瑙勮寖鎬ц瘎浼�
     name: 'standardjudge',
-    path: '/analysis/standardjudge',
-    component: () => import('@/views/fysp/analysis/StandardJudge.vue')
+    path: '/fysp/data-product/standardjudge',
+    component: () => import('@/views/fysp/data-product/ProdStandardJudge.vue')
   },
   {
     //鏃ユ姤绠$悊
     name: 'dailyreport',
-    path: '/dailyreport',
-    component: () => import('@/views/fysp/dailyreport/DailyReport.vue')
+    path: '/fysp/data-product/dailyreport',
+    component: () => import('@/views/fysp/data-product/ProdDailyReport.vue')
   },
   {
-    //鍦烘櫙鎶ュ憡-宸ュ湴
-    name: 'construction',
-    path: '/scenereport/construction',
-    component: () => import('@/views/fysp/scenereport/ConstructionReport.vue')
+    //鍦烘櫙鎶ュ憡
+    name: 'scenereport',
+    path: '/fysp/data-product/scenereport',
+    component: () => import('@/views/fysp/data-product/ProdSceneReport.vue')
+  },
+  // {
+  //   //鍦烘櫙鎶ュ憡-宸ュ湴
+  //   name: 'construction',
+  //   path: '/scenereport/construction',
+  //   component: () => import('@/views/fysp/scenereport/ConstructionReport.vue')
+  // },
+  // {
+  //   //鍦烘櫙鎶ュ憡-鐮佸ご
+  //   name: 'wharf',
+  //   path: '/scenereport/wharf',
+  //   component: () => import('@/views/fysp/scenereport/WharfReport.vue')
+  // },
+  // {
+  //   //鍦烘櫙鎶ュ憡-鎼呮媽绔�
+  //   name: 'mixing',
+  //   path: '/scenereport/mixing',
+  //   component: () => import('@/views/fysp/scenereport/MixingReport.vue')
+  // },
+  // {
+  //   //鍦烘櫙鎶ュ憡-鍫嗗満
+  //   name: 'storage',
+  //   path: '/scenereport/storage',
+  //   component: () => import('@/views/fysp/scenereport/StorageReport.vue')
+  // },
+
+  {
+    //鐩戠浠诲姟
+    name: 'taskmanage',
+    path: '/fysp/task/manage',
+    component: () => import('@/views/fysp/task/TaskManage.vue'),
+    meta: { keepAlive: true }
   },
   {
-    //鍦烘櫙鎶ュ憡-鐮佸ご
-    name: 'wharf',
-    path: '/scenereport/wharf',
-    component: () => import('@/views/fysp/scenereport/WharfReport.vue')
+    //鐩戠浠诲姟鍦烘櫙缂栬緫
+    name: 'monitorObjEdit',
+    path: '/fysp/task/edit',
+    component: () => import('@/views/fysp/task/MonitorObjEdit.vue')
   },
   {
-    //鍦烘櫙鎶ュ憡-鎼呮媽绔�
-    name: 'mixing',
-    path: '/scenereport/mixing',
-    component: () => import('@/views/fysp/scenereport/MixingReport.vue')
+    //鐩戠浠诲姟璁″垝缂栬緫
+    name: 'monitorPlanEdit',
+    path: '/fysp/task/plan/edit',
+    component: () => import('@/views/fysp/task/MonitorPlanEdit.vue')
   },
   {
-    //鍦烘櫙鎶ュ憡-鍫嗗満
-    name: 'storage',
-    path: '/scenereport/storage',
-    component: () => import('@/views/fysp/scenereport/StorageReport.vue')
+    //鐩戠浠诲姟璁″垝缂栬緫
+    name: 'monitorTaskCreate',
+    path: '/fysp/task/create',
+    component: () => import('@/views/fysp/task/MonitorTaskCreate.vue')
   },
   {
     //闂瀹℃牳
@@ -84,6 +116,12 @@
     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',

--
Gitblit v1.9.3