From 953f1c0d88a28826522f8b1d94225fe4ba4ba674 Mon Sep 17 00:00:00 2001
From: xuhongjie <1943105267@qq.com>
Date: Mon, 24 Mar 2025 13:43:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E7=BD=B2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue              |  7 ++++---
 src/layout/components/breadword.vue           |  3 ++-
 src/router/index.js                           |  2 +-
 src/utils/request.js                          |  5 ++++-
 src/views/components/ProjectDetails/Basic.vue | 10 +++++-----
 src/views/manage-info/index.vue               |  4 ++--
 vue.config.js                                 |  2 +-
 7 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index c0c3de8..b98bf62 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -103,7 +103,8 @@ export default {
         type: 'warning'
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          location.href = '/index';
+          // location.href = '/index';
+          this.$router.replace('/login')
         })
       }).catch(() => { });
     },
@@ -142,7 +143,7 @@ export default {
     text-align: left;
     font-style: normal;
     text-transform: none;
-    
+
   }
   .navbarleft{
     display: flex;
@@ -241,4 +242,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/layout/components/breadword.vue b/src/layout/components/breadword.vue
index d2f27b4..5aca33d 100644
--- a/src/layout/components/breadword.vue
+++ b/src/layout/components/breadword.vue
@@ -64,7 +64,8 @@ export default {
         type: 'warning'
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          location.href = '/index';
+          // location.href = '/index';
+          this.$router.replace('/login')
         })
       }).catch(() => { });
     }
diff --git a/src/router/index.js b/src/router/index.js
index cb56065..f6fabdd 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -182,7 +182,7 @@ Router.prototype.replace = function push(location) {
 };
 
 export default new Router({
-  mode: "history", // 去掉url中的#
+  // mode: "history", // 去掉url中的#
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRoutes,
 });
diff --git a/src/utils/request.js b/src/utils/request.js
index ffb0d21..a5a1aea 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -7,6 +7,8 @@ import { tansParams, blobValidate } from "@/utils/ruoyi";
 import cache from '@/plugins/cache'
 import { saveAs } from 'file-saver'
 
+import router from '@/router'
+
 let downloadLoadingInstance;
 // 是否显示重新登录
 export let isRelogin = { show: false };
@@ -87,7 +89,8 @@ service.interceptors.response.use(res => {
         MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
           isRelogin.show = false;
           store.dispatch('LogOut').then(() => {
-            location.href = '/index';
+            // location.href = '/index';
+            router.replace('/login')
           })
       }).catch(() => {
         isRelogin.show = false;
diff --git a/src/views/components/ProjectDetails/Basic.vue b/src/views/components/ProjectDetails/Basic.vue
index 1f231bc..c1becd8 100644
--- a/src/views/components/ProjectDetails/Basic.vue
+++ b/src/views/components/ProjectDetails/Basic.vue
@@ -207,7 +207,7 @@
 <script>
 import { getBasicInformationById, updateBasicInformation, exportBasicInformation } from '@/api/ManageApi/index';
 import ImageUpload from '@/components/ImageUpload2/index.vue';
-import luotu from '@//views/components/ProjectDetails/luotu.vue'
+import luotu from '@/views/components/ProjectDetails/luotu.vue'
 
 export default {
     components: {
@@ -232,8 +232,8 @@ export default {
             dialogImageUrl: '',
             dialogVisibletwo: false,
             dialogVisible: false,
-            mapDialogVisible: false, 
-            mapDialogTitle: '地图', 
+            mapDialogVisible: false,
+            mapDialogTitle: '地图',
             title: '编辑基本信息',
             form: {
                 name: '',
@@ -347,7 +347,7 @@ export default {
                     this.descriptions = this.formatDescriptions(data);
                     this.form = {
                         ...data,
-                        begainTime: [new Date(data.begainTime), new Date(data.endTime)], 
+                        begainTime: [new Date(data.begainTime), new Date(data.endTime)],
                     };
                 })
                 .catch(error => {
@@ -611,4 +611,4 @@ export default {
     height: auto;
     padding: 2rem;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/manage-info/index.vue b/src/views/manage-info/index.vue
index 98f4bb6..a6b08ce 100644
--- a/src/views/manage-info/index.vue
+++ b/src/views/manage-info/index.vue
@@ -84,7 +84,7 @@
 import Title from '../components/ProjectDetails/Title.vue';
 import Basic from '../components/ProjectDetails/Basic.vue';
 import Buildings from '../components/ProjectDetails/Buildings.vue';
-import Companyenter from '../components/ProjectDetails/companyenter.vue';
+import Companyenter from '../components/ProjectDetails/Companyenter.vue';
 import Liver from '../components/ProjectDetails/Liver.vue';
 import Memo from '../components/ProjectDetails/Memo.vue';
 import Models from '../components/ProjectDetails/Models.vue';
@@ -283,4 +283,4 @@ export default {
     padding: 0 0 2rem 0;
     justify-content: center;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/vue.config.js b/vue.config.js
index 5389993..dfe5f7f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -18,7 +18,7 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
+  publicPath: process.env.NODE_ENV === "production" ? "/demo/Gyyq-Upstairs" : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: 'dist',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）