优化

.env.production

@@ -5,4 +5,4 @@ VUE_APP_TITLE = 水运工程设计施工AR应用平台
 ENV = 'production'
 
 # 水运工程设计施工AR应用平台/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = '/water-design/prod-api'

src/layout/components/Navbar.vue

@@ -1,12 +1,17 @@
 <template>
     <div class="navbar">
-    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+        <hamburger
+            id="hamburger-container"
+            :is-active="sidebar.opened"
+            class="hamburger-container"
+            @toggleClick="toggleSideBar"
+        />
 
         <breadcrumb v-if="!topNav" id="breadcrumb-container" class="breadcrumb-container" />
         <top-nav v-if="topNav" id="topmenu-container" class="topmenu-container" />
 
         <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 +27,11 @@
                 <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="hover">
                 <div class="avatar-wrapper">
-          <img :src="avatar" class="user-avatar">
+                    <img :src="avatar" class="user-avatar" />
                     <span class="user-nickname"> {{ nickName }} </span>
                 </div>
                 <el-dropdown-menu slot="dropdown">
@@ -68,25 +72,20 @@ export default {
         SizeSelect,
         Search,
         RuoYiGit,
-    RuoYiDoc
+        RuoYiDoc,
     },
     computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar',
-      'device',
-      'nickName'
-    ]),
+        ...mapGetters(['sidebar', 'avatar', 'device', 'nickName']),
         setting: {
             get() {
                 return this.$store.state.settings.showSettings
-      }
+            },
         },
         topNav: {
             get() {
                 return this.$store.state.settings.topNav
-      }
-    }
+            },
+        },
     },
     methods: {
         toggleSideBar() {
@@ -99,14 +98,16 @@ export default {
             this.$confirm('确定注销并退出系统吗？', '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.$store.dispatch('LogOut').then(() => {
-          location.href = '/index'
+                type: 'warning',
             })
-      }).catch(() => {})
-    }
-  }
+                .then(() => {
+                    this.$store.dispatch('LogOut').then(() => {
+                        location.href = '/water-design/index'
+                    })
+                })
+                .catch(() => {})
+        },
+    },
 }
 </script>
 
@@ -116,18 +117,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 +165,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);
                 }
             }
         }
@@ -187,7 +188,7 @@ export default {
                     border-radius: 50%;
                 }
 
-        .user-nickname{
+                .user-nickname {
                     position: relative;
                     bottom: 10px;
                     font-size: 14px;

src/router/index.js

@@ -180,4 +180,5 @@ export default new Router({
     mode: 'history', // 去掉url中的#
     scrollBehavior: () => ({ y: 0 }),
     routes: constantRoutes,
+    base: '/water-design',
 })

src/utils/request.js

@@ -3,7 +3,7 @@ import { Notification, MessageBox, Message, Loading } from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
-import { tansParams, blobValidate } from "@/utils/ruoyi"
+import { tansParams, blobValidate } from '@/utils/ruoyi'
 import cache from '@/plugins/cache'
 import { saveAs } from 'file-saver'
 
@@ -17,11 +17,12 @@ const service = axios.create({
     // axios中请求配置有baseURL选项，表示请求URL公共部分
     baseURL: process.env.VUE_APP_BASE_API,
     // 超时
-  timeout: 10000
+    timeout: 10000,
 })
 
 // request拦截器
-service.interceptors.request.use(config => {
+service.interceptors.request.use(
+    (config) => {
         // 是否需要设置 token
         const isToken = (config.headers || {}).isToken === false
         // 是否需要防止数据重复提交
@@ -40,7 +41,7 @@ service.interceptors.request.use(config => {
             const requestObj = {
                 url: config.url,
                 data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
-      time: new Date().getTime()
+                time: new Date().getTime(),
             }
             const requestSize = Object.keys(JSON.stringify(requestObj)).length // 请求数据大小
             const limitSize = 5 * 1024 * 1024 // 限制存放数据5M
@@ -66,13 +67,16 @@ service.interceptors.request.use(config => {
             }
         }
         return config
-}, error => {
+    },
+    (error) => {
         console.log(error)
         Promise.reject(error)
-})
+    },
+)
 
 // 响应拦截器
-service.interceptors.response.use(res => {
+service.interceptors.response.use(
+    (res) => {
         // 未设置状态码则默认成功状态
         const code = res.data.code || 200
         // 获取错误信息
@@ -84,12 +88,18 @@ service.interceptors.response.use(res => {
         if (code === 401) {
             if (!isRelogin.show) {
                 isRelogin.show = true
-        MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
+                MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
+                    confirmButtonText: '重新登录',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                })
+                    .then(() => {
                         isRelogin.show = false
                         store.dispatch('LogOut').then(() => {
-            location.href = '/index'
+                            location.href = '/water-design/index'
                         })
-      }).catch(() => {
+                    })
+                    .catch(() => {
                         isRelogin.show = false
                     })
             }
@@ -107,30 +117,40 @@ service.interceptors.response.use(res => {
             return res.data
         }
     },
-  error => {
+    (error) => {
         console.log('err' + error)
         let { message } = error
-    if (message == "Network Error") {
-      message = "后端接口连接异常"
-    } else if (message.includes("timeout")) {
-      message = "系统接口请求超时"
-    } else if (message.includes("Request failed with status code")) {
-      message = "系统接口" + message.substr(message.length - 3) + "异常"
+        if (message == 'Network Error') {
+            message = '后端接口连接异常'
+        } else if (message.includes('timeout')) {
+            message = '系统接口请求超时'
+        } else if (message.includes('Request failed with status code')) {
+            message = '系统接口' + message.substr(message.length - 3) + '异常'
         }
         Message({ message: message, type: 'error', duration: 5 * 1000 })
         return Promise.reject(error)
-  }
+    },
 )
 
 // 通用下载方法
 export function download(url, params, filename, config) {
-  downloadLoadingInstance = Loading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
-  return service.post(url, params, {
-    transformRequest: [(params) => { return tansParams(params) }],
+    downloadLoadingInstance = Loading.service({
+        text: '正在下载数据，请稍候',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)',
+    })
+    return service
+        .post(url, params, {
+            transformRequest: [
+                (params) => {
+                    return tansParams(params)
+                },
+            ],
             headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
             responseType: 'blob',
-    ...config
-  }).then(async (data) => {
+            ...config,
+        })
+        .then(async (data) => {
             const isBlob = blobValidate(data)
             if (isBlob) {
                 const blob = new Blob([data])
@@ -142,7 +162,8 @@ export function download(url, params, filename, config) {
                 Message.error(errMsg)
             }
             downloadLoadingInstance.close()
-  }).catch((r) => {
+        })
+        .catch((r) => {
             console.error(r)
             Message.error('下载文件出现错误，请联系管理员！')
             downloadLoadingInstance.close()