From 7fb09c51669d9c8c9cd7e539b26ddee3dc422dfb Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 29 May 2024 14:51:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=96=B0=E5=9F=9F=E5=90=8D?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/.env.production                  |   4 +-
 sgzb-ui/src/layout/components/Navbar.vue |   2 +-
 sgzb-ui/src/permission.js                |   2 +-
 sgzb-ui/src/router/index.js              |   2 +-
 sgzb-ui/src/utils/globalUrl.js           |   4 +-
 sgzb-ui/src/utils/request.js             |   2 +-
 sgzb-ui/src/views/resetPassword.vue      | 404 +++++++++++------------
 sgzb-ui/vue.config.js                    |   2 +-
 8 files changed, 194 insertions(+), 228 deletions(-)

diff --git a/sgzb-ui/.env.production b/sgzb-ui/.env.production
index f716c1ca..9fb316f1 100644
--- 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'
diff --git a/sgzb-ui/src/layout/components/Navbar.vue b/sgzb-ui/src/layout/components/Navbar.vue
index ea7b91b5..e08efb92 100644
--- 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(() => {})
diff --git a/sgzb-ui/src/permission.js b/sgzb-ui/src/permission.js
index bfed4529..6c9e3aa1 100644
--- 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 {
diff --git a/sgzb-ui/src/router/index.js b/sgzb-ui/src/router/index.js
index 47141dc9..dde3f762 100644
--- 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' : ''
 
 })
 
diff --git a/sgzb-ui/src/utils/globalUrl.js b/sgzb-ui/src/utils/globalUrl.js
index 8edd57b9..ca554888 100644
--- 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,
-  }
+}
 
 
 
diff --git a/sgzb-ui/src/utils/request.js b/sgzb-ui/src/utils/request.js
index 03d54316..42613dba 100644
--- 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;
diff --git a/sgzb-ui/src/views/resetPassword.vue b/sgzb-ui/src/views/resetPassword.vue
index b6f01594..d82a384d 100644
--- a/sgzb-ui/src/views/resetPassword.vue
+++ b/sgzb-ui/src/views/resetPassword.vue
@@ -1,246 +1,214 @@
 <template>
   <div class="login">
-      <div class="login-bar">
-          <div class="form-bar">
-              <h3 class="title">请重置登录密码</h3>
-              <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-form-item>
-                  <el-form-item label="新密码" prop="newPassword">
-                      <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-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-form-item>
-              </el-form>
-          </div>
+    <div class="login-bar">
+      <div class="form-bar">
+        <h3 class="title">请重置登录密码</h3>
+        <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-form-item>
+          <el-form-item label="新密码" prop="newPassword">
+            <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-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-form-item>
+        </el-form>
       </div>
+    </div>
   </div>
 </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 {
-      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('密码须包含数字、字母、特殊符号中的两种以上'),
-                  )
-              } else if (this.user.oldPassword === value) {
-                  callback(new Error('新密码不能与旧密码相同'))
-              } else {
-                  callback()
-              }
-          }
-          const equalToPassword = (rule, value, callback) => {
-              if (this.user.newPassword !== value) {
-                  callback(new Error('两次输入的密码不一致'))
-              } else {
-                  callback()
-              }
-          }
-          return {
-              user: {
-                  oldPassword: undefined,
-                  newPassword: undefined,
-                  confirmPassword: undefined,
-              },
-              // 表单校验
-              rules: {
-                  oldPassword: [
-                      {
-                          required: true,
-                          message: '旧密码不能为空',
-                          trigger: 'blur',
-                      },
-                  ],
-                  newPassword: [
-                      {
-                          required: true,
-                          message: '新密码不能为空',
-                          trigger: 'blur',
-                      },
-                      {
-                          required: true,
-                          validator: passwordRegex,
-                          trigger: 'blur',
-                      },
-                  ],
-                  confirmPassword: [
-                      {
-                          required: true,
-                          message: '确认密码不能为空',
-                          trigger: 'blur',
-                      },
-                      {
-                          required: true,
-                          validator: equalToPassword,
-                          trigger: 'blur',
-                      },
-                  ],
-              },
-          }
+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('密码须包含数字、字母、特殊符号中的两种以上'))
+      } else if (this.user.oldPassword === value) {
+        callback(new Error('新密码不能与旧密码相同'))
+      } else {
+        callback()
+      }
+    }
+    const equalToPassword = (rule, value, callback) => {
+      if (this.user.newPassword !== value) {
+        callback(new Error('两次输入的密码不一致'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      user: {
+        oldPassword: undefined,
+        newPassword: undefined,
+        confirmPassword: undefined,
       },
-      methods: {
-          submit() {
-              this.$refs['form'].validate((valid) => {
-                  if (valid) {
-                      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'
-                          })
-                      })
-                  }
-              })
+      // 表单校验
+      rules: {
+        oldPassword: [
+          {
+            required: true,
+            message: '旧密码不能为空',
+            trigger: 'blur',
           },
-          close() {
-              this.$store.dispatch('LogOut').then(() => {
-                  // location.href = '/login';
-                  // location.href = '/gl/login';
-
-                  location.href =
-                      process.env.NODE_ENV === 'production-nw'
-                          ? '/gl/login'
-                          : '/login'
-              })
+        ],
+        newPassword: [
+          {
+            required: true,
+            message: '新密码不能为空',
+            trigger: 'blur',
           },
+          {
+            required: true,
+            validator: passwordRegex,
+            trigger: 'blur',
+          },
+        ],
+        confirmPassword: [
+          {
+            required: true,
+            message: '确认密码不能为空',
+            trigger: 'blur',
+          },
+          {
+            required: true,
+            validator: equalToPassword,
+            trigger: 'blur',
+          },
+        ],
       },
-  }
+    }
+  },
+  methods: {
+    submit() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          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' ? '/sgzbgl/login' : '/login'
+            })
+          })
+        }
+      })
+    },
+    close() {
+      this.$store.dispatch('LogOut').then(() => {
+        // location.href = '/login';
+        // location.href = '/gl/login';
+
+        location.href = process.env.NODE_ENV === 'production-nw' ? '/sgzbgl/login' : '/login'
+      })
+    },
+  },
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
-  .login {
-      //display: flex;
-      //justify-content: center;
-      //align-items: center;
-      position: relative;
-      height: 100%;
-      background-image: url('../assets/images/login.png');
-      background-size: 100% 100%;
-      //background: #1891FF;
-  }
+.login {
+  //display: flex;
+  //justify-content: center;
+  //align-items: center;
+  position: relative;
+  height: 100%;
+  background-image: url('../assets/images/login.png');
+  background-size: 100% 100%;
+  //background: #1891FF;
+}
 
-  .title {
-      margin: 0px auto 30px auto;
-      //text-align: center;
-      color: #707070;
-  }
+.title {
+  margin: 0px auto 30px auto;
+  //text-align: center;
+  color: #707070;
+}
 
-  .login-bar {
-      position: absolute;
-      height: auto;
-      top: 20%;
-      left: 14%;
-      width: auto;
-      height: 500px;
-      border-radius: 6px;
-      display: flex;
-      background: #fff;
-      text-align: center;
-      padding-top: 40px;
-  }
+.login-bar {
+  position: absolute;
+  height: auto;
+  top: 20%;
+  left: 14%;
+  width: auto;
+  height: 500px;
+  border-radius: 6px;
+  display: flex;
+  background: #fff;
+  text-align: center;
+  padding-top: 40px;
+}
 
-  .form-bar {
-      //height: 500px;
-      width: 360px;
-      background: #fff;
-  }
+.form-bar {
+  //height: 500px;
+  width: 360px;
+  background: #fff;
+}
 
-  .login-form {
-      //border-radius: 6px;
-      //height: 100%;
-      background: #ffffff;
-      width: 400px;
-      padding: 25px 25px 5px 25px;
+.login-form {
+  //border-radius: 6px;
+  //height: 100%;
+  background: #ffffff;
+  width: 400px;
+  padding: 25px 25px 5px 25px;
 
-      .el-input {
-          height: 45px;
+  .el-input {
+    height: 45px;
 
-          input {
-              height: 38px;
-          }
-      }
-
-      .input-icon {
-          height: 39px;
-          width: 14px;
-          margin-left: 2px;
-      }
-  }
-
-  .login-tip {
-      font-size: 13px;
-      text-align: center;
-      color: #bfbfbf;
-  }
-
-  .login-code {
-      width: 33%;
+    input {
       height: 38px;
-      float: right;
-
-      img {
-          cursor: pointer;
-          vertical-align: middle;
-      }
+    }
   }
 
-  .el-login-footer {
-      height: 40px;
-      line-height: 40px;
-      position: fixed;
-      bottom: 0;
-      width: 100%;
-      text-align: center;
-      color: #fff;
-      font-family: Arial;
-      font-size: 12px;
-      letter-spacing: 1px;
+  .input-icon {
+    height: 39px;
+    width: 14px;
+    margin-left: 2px;
   }
+}
 
-  .login-code-img {
-      height: 38px;
+.login-tip {
+  font-size: 13px;
+  text-align: center;
+  color: #bfbfbf;
+}
+
+.login-code {
+  width: 33%;
+  height: 38px;
+  float: right;
+
+  img {
+    cursor: pointer;
+    vertical-align: middle;
   }
+}
+
+.el-login-footer {
+  height: 40px;
+  line-height: 40px;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  text-align: center;
+  color: #fff;
+  font-family: Arial;
+  font-size: 12px;
+  letter-spacing: 1px;
+}
+
+.login-code-img {
+  height: 38px;
+}
 </style>
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index 90e594cf..741a308d 100644
--- 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) 的；（项目打包之后，静态资源会放在这个文件夹下）