From a0885d3128b2dcf394026739343a685c3122aef9 Mon Sep 17 00:00:00 2001
From: liuzhipeng <1747191978@qq.com>
Date: Sat, 15 Feb 2025 18:06:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E9=97=AE=E8=B7=AF=E5=BE=84=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 acupuncture-ui/.env.development               |   7 +-
 acupuncture-ui/.env.production                |   9 +-
 .../src/layout/components/Navbar.vue          | 109 ++++++++++--------
 acupuncture-ui/src/router/index.js            |   1 +
 acupuncture-ui/src/utils/request.js           |   2 +-
 acupuncture-ui/src/views/followFile/index.vue |   8 +-
 .../src/views/patientFile/index.vue           |   1 -
 acupuncture-ui/vue.config.js                  |   2 +-
 8 files changed, 80 insertions(+), 59 deletions(-)

diff --git a/acupuncture-ui/.env.development b/acupuncture-ui/.env.development
index 365dcc24..31490cb7 100644
--- a/acupuncture-ui/.env.development
+++ b/acupuncture-ui/.env.development
@@ -4,8 +4,11 @@ VUE_APP_TITLE = 针灸管理系统
 # 开发环境配置
 ENV = 'development'
 
-# 针灸管理系统/开发环境
+# 大唐会议管理系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
-
+VUE_APP_IMG_URL = 'https://test.tall.wiki/acupuncture'
+VUE_APP_API_QZURL = 'https://test.tall.wiki/'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
+# 访问路径
+VUE_APP_PUBLIC_PATH = '/'
diff --git a/acupuncture-ui/.env.production b/acupuncture-ui/.env.production
index a2858f2f..f05651bc 100644
--- a/acupuncture-ui/.env.production
+++ b/acupuncture-ui/.env.production
@@ -2,7 +2,10 @@
 VUE_APP_TITLE = 针灸管理系统
 
 # 生产环境配置
-ENV = 'production'
+NODE_ENV = 'production'
+# 因孚生产
+VUE_APP_BASE_API = 'https://test.tall.wiki/acupuncture'
+VUE_APP_API_QZURL = 'https://test.tall.wiki/'
 
-# 针灸管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+# 访问路径
+VUE_APP_PUBLIC_PATH = '/acupuncture/client/'
\ No newline at end of file
diff --git a/acupuncture-ui/src/layout/components/Navbar.vue b/acupuncture-ui/src/layout/components/Navbar.vue
index 466cd981..4a2f9cd4 100644
--- a/acupuncture-ui/src/layout/components/Navbar.vue
+++ b/acupuncture-ui/src/layout/components/Navbar.vue
@@ -1,12 +1,21 @@
 <template>
   <div class="navbar">
-    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
-
-    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
-    <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
+    <hamburger
+      id="hamburger-container"
+      :is-active="sidebar.opened"
+      class="hamburger-container"
+      @toggleClick="toggleSideBar"
+    />
+
+    <breadcrumb
+      id="breadcrumb-container"
+      class="breadcrumb-container"
+      v-if="!topNav"
+    />
+    <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" />
 
     <div class="right-menu">
-      <template v-if="device!=='mobile'">
+      <template v-if="device !== 'mobile'">
         <search id="header-search" class="right-menu-item" />
 
         <el-tooltip content="源码地址" effect="dark" placement="bottom">
@@ -22,12 +31,14 @@
         <el-tooltip content="布局大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip>
-
       </template>
 
-      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
+      <el-dropdown
+        class="avatar-container right-menu-item hover-effect"
+        trigger="click"
+      >
         <div class="avatar-wrapper">
-          <img :src="avatar" class="user-avatar">
+          <img :src="avatar" class="user-avatar" />
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
@@ -47,15 +58,15 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import TopNav from '@/components/TopNav'
-import Hamburger from '@/components/Hamburger'
-import Screenfull from '@/components/Screenfull'
-import SizeSelect from '@/components/SizeSelect'
-import Search from '@/components/HeaderSearch'
-import RuoYiGit from '@/components/RuoYi/Git'
-import RuoYiDoc from '@/components/RuoYi/Doc'
+import { mapGetters } from "vuex";
+import Breadcrumb from "@/components/Breadcrumb";
+import TopNav from "@/components/TopNav";
+import Hamburger from "@/components/Hamburger";
+import Screenfull from "@/components/Screenfull";
+import SizeSelect from "@/components/SizeSelect";
+import Search from "@/components/HeaderSearch";
+import RuoYiGit from "@/components/RuoYi/Git";
+import RuoYiDoc from "@/components/RuoYi/Doc";
 
 export default {
   components: {
@@ -66,48 +77,46 @@ export default {
     SizeSelect,
     Search,
     RuoYiGit,
-    RuoYiDoc
+    RuoYiDoc,
   },
   computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar',
-      'device'
-    ]),
+    ...mapGetters(["sidebar", "avatar", "device"]),
     setting: {
       get() {
-        return this.$store.state.settings.showSettings
+        return this.$store.state.settings.showSettings;
       },
       set(val) {
-        this.$store.dispatch('settings/changeSetting', {
-          key: 'showSettings',
-          value: val
-        })
-      }
+        this.$store.dispatch("settings/changeSetting", {
+          key: "showSettings",
+          value: val,
+        });
+      },
     },
     topNav: {
       get() {
-        return this.$store.state.settings.topNav
-      }
-    }
+        return this.$store.state.settings.topNav;
+      },
+    },
   },
   methods: {
     toggleSideBar() {
-      this.$store.dispatch('app/toggleSideBar')
+      this.$store.dispatch("app/toggleSideBar");
     },
     async logout() {
-      this.$confirm('确定注销并退出系统吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.$store.dispatch('LogOut').then(() => {
-          location.href = '/index';
+      this.$confirm("确定注销并退出系统吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$store.dispatch("LogOut").then(() => {
+            location.href = process.env.VUE_APP_PUBLIC_PATH;
+          });
         })
-      }).catch(() => {});
-    }
-  }
-}
+        .catch(() => {});
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -116,18 +125,18 @@ export default {
   overflow: hidden;
   position: relative;
   background: #fff;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+  box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
 
   .hamburger-container {
     line-height: 46px;
     height: 100%;
     float: left;
     cursor: pointer;
-    transition: background .3s;
-    -webkit-tap-highlight-color:transparent;
+    transition: background 0.3s;
+    -webkit-tap-highlight-color: transparent;
 
     &:hover {
-      background: rgba(0, 0, 0, .025)
+      background: rgba(0, 0, 0, 0.025);
     }
   }
 
@@ -164,10 +173,10 @@ export default {
 
       &.hover-effect {
         cursor: pointer;
-        transition: background .3s;
+        transition: background 0.3s;
 
         &:hover {
-          background: rgba(0, 0, 0, .025)
+          background: rgba(0, 0, 0, 0.025);
         }
       }
     }
diff --git a/acupuncture-ui/src/router/index.js b/acupuncture-ui/src/router/index.js
index b56bf93f..1a862cab 100644
--- a/acupuncture-ui/src/router/index.js
+++ b/acupuncture-ui/src/router/index.js
@@ -230,6 +230,7 @@ Router.prototype.replace = function push(location) {
 
 export default new Router({
   mode: "history", // 去掉url中的#
+  base: process.env.VUE_APP_PUBLIC_PATH,
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRoutes,
 });
diff --git a/acupuncture-ui/src/utils/request.js b/acupuncture-ui/src/utils/request.js
index ffb0d219..faa87275 100644
--- a/acupuncture-ui/src/utils/request.js
+++ b/acupuncture-ui/src/utils/request.js
@@ -87,7 +87,7 @@ service.interceptors.response.use(res => {
         MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
           isRelogin.show = false;
           store.dispatch('LogOut').then(() => {
-            location.href = '/index';
+            location.href = process.env.VUE_APP_PUBLIC_PATH;
           })
       }).catch(() => {
         isRelogin.show = false;
diff --git a/acupuncture-ui/src/views/followFile/index.vue b/acupuncture-ui/src/views/followFile/index.vue
index e1095760..bfa25ad9 100644
--- a/acupuncture-ui/src/views/followFile/index.vue
+++ b/acupuncture-ui/src/views/followFile/index.vue
@@ -357,7 +357,13 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        param: {
+          name: "",
+        },
+      };
       this.handleQuery();
     },
     // 多选框选中数据
diff --git a/acupuncture-ui/src/views/patientFile/index.vue b/acupuncture-ui/src/views/patientFile/index.vue
index 134045cf..171e59ef 100644
--- a/acupuncture-ui/src/views/patientFile/index.vue
+++ b/acupuncture-ui/src/views/patientFile/index.vue
@@ -596,7 +596,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据
diff --git a/acupuncture-ui/vue.config.js b/acupuncture-ui/vue.config.js
index f1aa0f3f..36f07eba 100644
--- a/acupuncture-ui/vue.config.js
+++ b/acupuncture-ui/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" ? "/acupuncture/client/" : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: "dist",
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）