From 3aa8dfc2a85598c70a577832a57a50d2dd7c6c16 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 20 Dec 2021 17:06:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/zh-CN.js                            |  6 ++--
 src/router/index.js                          | 30 +++++++-------------
 src/views/pages/{indexWork.vue => index.vue} |  0
 3 files changed, 14 insertions(+), 22 deletions(-)
 rename src/views/pages/{indexWork.vue => index.vue} (100%)

diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js
index 58105013..789f50f8 100644
--- a/src/i18n/zh-CN.js
+++ b/src/i18n/zh-CN.js
@@ -3,9 +3,9 @@ const t = {}
 t.loading = '加载中...'
 
 t.brand = {}
-t.brand.lg = '党群e事通运营平台'
-t.brand.mini = '党群'
-t.brand.work = '党群e事通工作端'
+t.brand.lg = '数字社区工作平台'
+t.brand.mini = '数字'
+t.brand.work = '数字社区工作平台'
 t.brand.workMini = '工作端'
 
 t.add = '新增'
diff --git a/src/router/index.js b/src/router/index.js
index 314a89b5..55d484a1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -35,19 +35,13 @@ export const pageRoutes = [
   {
     path: "/",
     name: "index",
-    redirect: {
-      name: "indexWork",
-    },
-    meta: {
-      title: "首页",
-    },
+    component: () => import("@/views/pages/index"),
   },
   {
     path: "/indexWork",
-    component: () => import("@/views/pages/indexWork"),
     name: "indexWork",
-    meta: {
-      title: "工作端首页",
+    redirect: {
+      name: "index",
     },
   },
 ];
@@ -58,7 +52,7 @@ export const moduleRoutes = {
   component: () => import("@/views/main"),
   name: "main",
   redirect: {
-    name: "home",
+    path: "/main/base-resi",
   },
   meta: {
     title: "主入口布局",
@@ -239,11 +233,11 @@ router.beforeEach((to, from, next) => {
               name: "基础信息",
               id: "5feawfwaefwa5",
             },
-            {
-              url: "/visual/basicinfo/basicInfoMain",
-              name: "人员类别分析",
-              id: "5fwaefwaefawef5",
-            },
+            // {
+            //   url: "/visual/basicinfo/basicInfoMain",
+            //   name: "人员类别分析",
+            //   id: "5fwaefwaefawef5",
+            // },
           ],
         },
         {
@@ -278,7 +272,6 @@ router.beforeEach((to, from, next) => {
               id: "distributionAnalyze",
             },
           ],
-         
         },
         {
           icon: "icon-setting",
@@ -296,7 +289,7 @@ router.beforeEach((to, from, next) => {
               name: "区域化党建",
               id: "5fwaefwaefawef588",
             },
-          ], 
+          ],
         },
         {
           icon: "icon-setting",
@@ -321,8 +314,7 @@ router.beforeEach((to, from, next) => {
           id: "2221321fefefaewfa123",
           name: "初心互助",
           url: "visual/heart/index",
-          children: [
-          ],
+          children: [],
         },
       ];
       fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]);
diff --git a/src/views/pages/indexWork.vue b/src/views/pages/index.vue
similarity index 100%
rename from src/views/pages/indexWork.vue
rename to src/views/pages/index.vue

From df5878ab1d4f1be04115d0a8711681b834951de3 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 20 Dec 2021 17:07:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 55d484a1..edcfb020 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -227,18 +227,18 @@ router.beforeEach((to, from, next) => {
           id: "22213213",
           name: "基础信息",
           url: "visual/basicinfo/basicInfoMain",
-          children: [
-            {
-              url: "/visual/basicinfo/basicInfoMain",
-              name: "基础信息",
-              id: "5feawfwaefwa5",
-            },
-            // {
-            //   url: "/visual/basicinfo/basicInfoMain",
-            //   name: "人员类别分析",
-            //   id: "5fwaefwaefawef5",
-            // },
-          ],
+          // children: [
+          //   // {
+          //   //   url: "/visual/basicinfo/basicInfoMain",
+          //   //   name: "基础信息",
+          //   //   id: "5feawfwaefwa5",
+          //   // },
+          //   // {
+          //   //   url: "/visual/basicinfo/basicInfoMain",
+          //   //   name: "人员类别分析",
+          //   //   id: "5fwaefwaefawef5",
+          //   // },
+          // ],
         },
         {
           icon: "icon-setting",