更改新域名路径配置

2024-05-29 14:51:45 +08:00 · 2024-05-29 14:51:45 +08:00 · 7fb09c5166
parent 7b6ae7623b
commit 7fb09c5166
8 changed files with 194 additions and 228 deletions
--- a/sgzb-ui/.env.production
+++ b/sgzb-ui/.env.production
@ -5,7 +5,5 @@ VUE_APP_TITLE = 施工装备管理系统
 ENV = 'production'

 # 若依管理系统/生产环境
-VUE_APP_BASE_API = dev-api
+VUE_APP_BASE_API = '/sgzbgl'

-# 南网需加上/gl
-# VUE_APP_BASE_API = '/gl/dev-api'
--- a/sgzb-ui/src/layout/components/Navbar.vue
+++ b/sgzb-ui/src/layout/components/Navbar.vue
@ -106,7 +106,7 @@ export default {
            // location.href = '/login';
            // location.href = '/gl/login';

-            location.href = process.env.NODE_ENV === 'production' ? '/gl/login' : '/login'
+            location.href = process.env.NODE_ENV === 'production' ? '/sgzbgl/login' : '/login'
          })
        })
        .catch(() => {})
--- a/sgzb-ui/src/permission.js
+++ b/sgzb-ui/src/permission.js
@ -36,7 +36,7 @@ router.beforeEach((to, from, next) => {
            // next({ path: '/login' })
            // next({ path: '/gl/login' })

-            next({ path: process.env.NODE_ENV === 'production' ? '/gl/login' : '/login' })
+            next({ path: process.env.NODE_ENV === 'production' ? '/sgzbgl/login' : '/login' })
          })
        })
      } else {
--- a/sgzb-ui/src/router/index.js
+++ b/sgzb-ui/src/router/index.js
@ -206,7 +206,7 @@ export default new Router({
  mode: 'history', // 去掉url中的#
  scrollBehavior: () => ({ y: 0 }),
  routes: constantRoutes,
-  base: process.env.NODE_ENV === 'production' ? '/gl' : ''
+  base: process.env.NODE_ENV === 'production' ? '/sgzbgl' : ''

 })

--- a/sgzb-ui/src/utils/globalUrl.js
+++ b/sgzb-ui/src/utils/globalUrl.js
@ -5,10 +5,10 @@
 // const qrUrl = 'https://z.csgmall.com.cn/gl/qrCode/qrCodePage?qrCode='; //南网


-const qrUrl = process.env.NODE_ENV === 'production' ? 'https://z.csgmall.com.cn/gl/qrCode/qrCodePage?qrCode=' : 'http://192.168.0.14:18866/qrCode/qrCodePage?qrCode='
+const qrUrl = process.env.NODE_ENV === 'production' ? 'https://test-cc.zhgkxt.com/qrCode/qrCodePage?qrCode=' : 'http://192.168.0.14:18866/qrCode/qrCodePage?qrCode='
 export default {
  qrUrl,
-  }
+}



--- a/sgzb-ui/src/utils/request.js
+++ b/sgzb-ui/src/utils/request.js
@ -90,7 +90,7 @@ service.interceptors.response.use(res => {
          // location.href = '/login';
          // location.href = '/gl/login';

-          location.href = process.env.NODE_ENV === 'production' ? '/gl/login' : '/login'
+          location.href = process.env.NODE_ENV === 'production' ? '/sgzbgl/login' : '/login'
        })
      }).catch(() => {
        isRelogin.show = false;
--- a/sgzb-ui/src/views/resetPassword.vue
+++ b/sgzb-ui/src/views/resetPassword.vue
@ -3,40 +3,19 @@
    <div class="login-bar">
      <div class="form-bar">
        <h3 class="title">请重置登录密码</h3>
-              <el-form
-                  ref="form"
-                  :model="user"
-                  :rules="rules"
-              >
+        <el-form ref="form" :model="user" :rules="rules">
          <el-form-item label="旧密码" prop="oldPassword">
-                      <el-input
-                          v-model="user.oldPassword"
-                          placeholder="请输入旧密码"
-                          type="password"
-                          show-password
-                      />
+            <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password />
          </el-form-item>
          <el-form-item label="新密码" prop="newPassword">
-                      <el-input
-                          v-model="user.newPassword"
-                          placeholder="请输入新密码"
-                          type="password"
-                          show-password
-                      />
+            <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password />
          </el-form-item>
          <el-form-item label="确认密码" prop="confirmPassword">
-                      <el-input
-                          v-model="user.confirmPassword"
-                          placeholder="请确认新密码"
-                          type="password"
-                          show-password
-                      />
+            <el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password />
          </el-form-item>
          <el-form-item>
-                      <el-button type="primary" style="width: 48.5%;" @click="submit"
-                          >确认修改</el-button
-                      >
-                      <el-button style="width: 48.5%;" @click="close">返回登录页</el-button>
+            <el-button type="primary" style="width: 48.5%" @click="submit">确认修改</el-button>
+            <el-button style="width: 48.5%" @click="close">返回登录页</el-button>
          </el-form-item>
        </el-form>
      </div>
@ -45,18 +24,16 @@
 </template>

 <script>
-  import { updateUserPwd } from '@/api/system/user'
-  import { validPassword } from '@/utils/validate'
+import { updateUserPwd } from '@/api/system/user'
+import { validPassword } from '@/utils/validate'

-  export default {
+export default {
  data() {
    const passwordRegex = (rule, value, callback) => {
      if (value.length < 8 || value.length > 20) {
        callback(new Error('密码长度在 8 到 20 个字符'))
      } else if (!validPassword(value)) {
-                  callback(
-                      new Error('密码须包含数字、字母、特殊符号中的两种以上'),
-                  )
+        callback(new Error('密码须包含数字、字母、特殊符号中的两种以上'))
      } else if (this.user.oldPassword === value) {
        callback(new Error('新密码不能与旧密码相同'))
      } else {
@ -114,22 +91,16 @@
  },
  methods: {
    submit() {
-              this.$refs['form'].validate((valid) => {
+      this.$refs['form'].validate(valid => {
        if (valid) {
-                      updateUserPwd(
-                          this.user.oldPassword,
-                          this.user.newPassword,
-                      ).then((response) => {
+          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
            this.$modal.msgSuccess('修改成功')
            // 进入首页
            this.$store.dispatch('LogOut').then(() => {
              // location.href = '/login';
              // location.href = '/gl/login';

-                              location.href =
-                                  process.env.NODE_ENV === 'production-nw'
-                                      ? '/gl/login'
-                                      : '/login'
+              location.href = process.env.NODE_ENV === 'production-nw' ? '/sgzbgl/login' : '/login'
            })
          })
        }
@ -140,18 +111,15 @@
        // location.href = '/login';
        // location.href = '/gl/login';

-                  location.href =
-                      process.env.NODE_ENV === 'production-nw'
-                          ? '/gl/login'
-                          : '/login'
+        location.href = process.env.NODE_ENV === 'production-nw' ? '/sgzbgl/login' : '/login'
      })
    },
  },
-  }
+}
 </script>

 <style rel="stylesheet/scss" lang="scss">
-  .login {
+.login {
  //display: flex;
  //justify-content: center;
  //align-items: center;
@ -160,15 +128,15 @@
  background-image: url('../assets/images/login.png');
  background-size: 100% 100%;
  //background: #1891FF;
-  }
+}

-  .title {
+.title {
  margin: 0px auto 30px auto;
  //text-align: center;
  color: #707070;
-  }
+}

-  .login-bar {
+.login-bar {
  position: absolute;
  height: auto;
  top: 20%;
@ -180,15 +148,15 @@
  background: #fff;
  text-align: center;
  padding-top: 40px;
-  }
+}

-  .form-bar {
+.form-bar {
  //height: 500px;
  width: 360px;
  background: #fff;
-  }
+}

-  .login-form {
+.login-form {
  //border-radius: 6px;
  //height: 100%;
  background: #ffffff;
@ -208,15 +176,15 @@
    width: 14px;
    margin-left: 2px;
  }
-  }
+}

-  .login-tip {
+.login-tip {
  font-size: 13px;
  text-align: center;
  color: #bfbfbf;
-  }
+}

-  .login-code {
+.login-code {
  width: 33%;
  height: 38px;
  float: right;
@ -225,9 +193,9 @@
    cursor: pointer;
    vertical-align: middle;
  }
-  }
+}

-  .el-login-footer {
+.el-login-footer {
  height: 40px;
  line-height: 40px;
  position: fixed;
@ -238,9 +206,9 @@
  font-family: Arial;
  font-size: 12px;
  letter-spacing: 1px;
-  }
+}

-  .login-code-img {
+.login-code-img {
  height: 38px;
-  }
+}
 </style>
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@ -19,7 +19,7 @@ module.exports = {
  // 部署生产环境和开发环境下的URL。
  // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
  // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === 'production' ? '/gl/' : '/', ///gl/
+  publicPath: process.env.NODE_ENV === 'production' ? './' : '/', ///gl/
  // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
  outputDir: 'dist',
  // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）