From c4c5880d64a6c6fcbd8947c320bf8547eec9ef97 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Thu, 05 Sep 2024 21:11:53 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/router/router.js | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/gz-customerSystem/src/router/router.js b/gz-customerSystem/src/router/router.js
index c855afd..c6d277a 100644
--- a/gz-customerSystem/src/router/router.js
+++ b/gz-customerSystem/src/router/router.js
@@ -2,7 +2,7 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-03-28 11:22:41
- * @LastEditTime: 2023-12-25 16:24:22
+ * @LastEditTime: 2024-09-03 14:58:33
* @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description: 路由
@@ -134,6 +134,17 @@
// 数据分析
import DataSearch from "../views/statistic/dataSearch";
+//来访登记
+import Visit from "../views/register/visit";
+//事件流转
+import EventFlow from "../views/register/eventFlow";
+//办理反馈
+import HandleFeedback from "../views/register/handleFeedback";
+//档案信息
+import FileMessage from "../views/register/matterDetail/fileMessage";
+//结案审核
+import ClosingReview from "../views/register/closingReview";
+
import Test from "../views/test";
const Routers = () => {
@@ -204,6 +215,15 @@
<Route path="judicialDivision/judicialDivisionDetail" element={<JudicialDivisionDetail />} />
<Route path="myConfirmation" element={<MyConfirmation />} />
<Route path="judicialOverview" element={<JudicialOverview />} />
+ {/* 来访登记*/}
+ <Route path="visit/:id?" element={<Visit />} />
+ <Route path="visit/eventFlow" element={<EventFlow />} />
+ <Route path="visit/handleFeedback" element={<HandleFeedback />} />
+ <Route path="visit/fileMessage" element={<FileMessage />} />
+ <Route path="visit/closingReview" element={<ClosingReview />}/>
+
+
+
{/* 工作流模块 */}
<Route path="workflowTemplate" element={<WorkflowTemplate />} />
<Route path="workflowTemplate/workflowTemplateEdit" element={<WorkflowTemplateEdit />} />
@@ -216,6 +236,7 @@
<Route path="myAdjust/mediationWindowSuccess" element={<MediationWindowSuccess />} />
</Route>
+
<Route path="/operation" element={<Navigate to="/operation/personnel" />} />
{/* 基础信息管理 */}
<Route path="/operation" element={<Layout headerUserChange={headerUserChange} />}>
--
Gitblit v1.8.0