From 908dab5634ab95a080a5ed7027d83fca5da95a6d Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 28 Feb 2024 11:51:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=8D=E5=90=8C=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=9A=84=E6=89=93=E5=8C=85=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                             |  3 ++-
 src/config/route.js                         |  3 ++-
 src/views/login/components/passwordForm.vue | 22 ++++++++++----------
 src/views/login/components/phoneForm.vue    | 23 ++++++++++-----------
 4 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/.env.production b/.env.production
index 044b8b92..15faa29a 100644
--- a/.env.production
+++ b/.env.production
@@ -5,7 +5,8 @@ NODE_ENV = production
 # VUE_APP_TITLE = '曲阳金隅安全智能管控平台'
 # VUE_APP_TITLE = '托克逊能源管理平台'
 # VUE_APP_TITLE = '中建材光子科技有限公司'
-VUE_APP_TITLE = '超低排放系统'
+# VUE_APP_TITLE = '超低排放系统'
+VUE_APP_TITLE = ''
 
 
 # 接口地址
diff --git a/src/config/route.js b/src/config/route.js
index a4c198fd..62a0feb4 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -26,7 +26,7 @@ const routes = [
         "children": [
           {
             "name": "dashboard",
-            "path": "/",
+            "path": "/dashboard",
             "meta": {
               "title": "控制台",
               "icon": "el-icon-monitor",
@@ -1267,6 +1267,7 @@ const routes = [
               "title": "订单详情",
               "icon": "el-icon-cellphone",
               "hidden": true,
+              "perms": ["order"]
             },
             "component": "sam/orderitem"
           },
diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue
index 82fd5f2a..31c2a4fd 100644
--- a/src/views/login/components/passwordForm.vue
+++ b/src/views/login/components/passwordForm.vue
@@ -133,23 +133,23 @@ export default {
             base_dashboard = '/dashboard'
           }
           if (this.$TOOL.data.get('BASE_INFO').base.base_name_short.indexOf('曲阳') != -1) {
+            if (res1.type === 'employee') {
+              this.$router.replace({
+                path: base_dashboard,
+              });
+            } else {
+              this.$router.replace({
+                path: "/rpm/rpj",
+              });
+            }
+            that.$message.success("Login Success 登录成功");
+            that.islogin = false;
             that.$API.am.area.list.req({ page_size: 999 }).then(res => {
               if (res.err_msg) {
               } else {
                 debugger;
                 let areaList = res.results;
                 that.$TOOL.data.set("qyjyAreaList", areaList);
-                if (res1.type === 'employee') {
-                  this.$router.replace({
-                    path: "/",
-                  });
-                } else {
-                  this.$router.replace({
-                    path: "/rpm/rpj",
-                  });
-                }
-                that.$message.success("Login Success 登录成功");
-                that.islogin = false;
               }
             })
           } else {
diff --git a/src/views/login/components/phoneForm.vue b/src/views/login/components/phoneForm.vue
index 95a25f39..bce68f41 100644
--- a/src/views/login/components/phoneForm.vue
+++ b/src/views/login/components/phoneForm.vue
@@ -101,23 +101,22 @@ export default {
 								base_dashboard = '/dashboard'
 							}
 							if (this.$TOOL.data.get('BASE_INFO').base.base_name_short.indexOf('曲阳') != -1) {
+								if (res1.type === 'employee') {
+									this.$router.replace({
+										path: base_dashboard,
+									});
+								} else {
+									this.$router.replace({
+										path: "/rpm/rpj",
+									});
+								}
+								that.$message.success("Login Success 登录成功");
+								that.islogin = false;
 								that.$API.am.area.list.req({ page_size: 999 }).then(res => {
 									if (res.err_msg) {
 									} else {
-										debugger;
 										let areaList = res.results;
 										that.$TOOL.data.set("qyjyAreaList", areaList);
-										if (res1.type === 'employee') {
-											this.$router.replace({
-												path: "/",
-											});
-										} else {
-											this.$router.replace({
-												path: "/rpm/rpj",
-											});
-										}
-										that.$message.success("Login Success 登录成功");
-										that.islogin = false;
 									}
 								})
 							} else {