From 701447950880f09520e802ef72bb81e2356749d8 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 26 十一月 2024 14:11:58 +0800
Subject: [PATCH] Merge branch 'hc-dataproduct-1121' into lsf-dataproduct-1024
---
src/router/index.js | 112 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 87 insertions(+), 25 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 7f1db70..fea22a1 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,11 +116,17 @@
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: true }
+ meta: { keepAlive: false }
},
{
//璇勪及绠＄悊
@@ -122,6 +160,24 @@
name: 'fyspSupport',
path: '/fysp/support',
component: () => import('@/views/fysp/support/JingAnSupport.vue'),
+ },
+ {
+ // 鍩虹浜у搧-鍦烘櫙娓呭崟
+ name: 'ProdScenseInfo',
+ path: '/fysp/data-product/ProdScenseInfo',
+ component: () => import('@/views/fysp/data-product/base-data-product/ProdScenseInfo.vue')
+ },
+ {
+ // 鍩虹浜у搧-鐩戠娓呭崟
+ name: 'ProdMonitorTaskInfo',
+ path: '/fysp/data-product/ProdMonitorTaskInfo',
+ component: () => import('@/views/fysp/data-product/base-data-product/ProdMonitorTaskInfo.vue')
+ },
+ {
+ // 鍩虹浜у搧-闃叉不璁惧娓呭崟
+ name: 'ProdTreatmentDeviceInfo',
+ path: '/fysp/data-product/ProdTreatmentDeviceInfo',
+ component: () => import('@/views/fysp/data-product/base-data-product/ProdTreatmentDeviceInfo.vue')
},
/**********************************椋炵窘鐜***********************************************/
@@ -164,6 +220,12 @@
name: 'userMatch',
path: '/common/userMatch',
component: () => import('@/views/common/UserMatch.vue')
+ },
+ {
+ //鏂囨。鐢熸垚娴嬭瘯
+ name: 'docTest',
+ path: '/common/docTest',
+ component: () => import('@/views/DocTest.vue')
}
]
--
Gitblit v1.9.3