提交

ruoyi-ui/package.json

@@ -49,8 +49,8 @@
     "js-beautify": "1.13.0",
     "js-cookie": "2.2.1",
     "jsencrypt": "3.0.0-rc.1",
-    "less": "^4.1.1",
-    "less-loader": "^4.1.0",
+    "less": "^3.9.0",
+    "less-loader": "^5.0.0",
     "nprogress": "0.2.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
@@ -72,8 +72,8 @@
     "connect": "3.6.6",
     "eslint": "7.15.0",
     "eslint-plugin-vue": "7.2.0",
-    "less": "^4.1.1",
-    "less-loader": "^4.1.0",
+    "less": "^3.9.0",
+    "less-loader": "^5.0.0",
     "lint-staged": "10.5.3",
     "runjs": "4.4.2",
     "sass": "1.32.0",

ruoyi-ui/src/settings.js

@@ -1,8 +1,8 @@
 module.exports = {
   title: 'OA管理系统',
-  // urls: `http://118.178.139.79:5000`,
-  urls: `http://192.168.101.49:8090`,
-   // urls: `http://192.168.101.110:8090`,
+  urls: `http://118.178.139.79:5000`,
+  // urls: `http://192.168.101.49:8090`,
+   // urls: `http://192.168.101.11:8090`,
 
 
 

ruoyi-ui/src/utils/request.js

@@ -12,7 +12,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 360000
 })
 
 // request拦截器

ruoyi-ui/src/views/login.vue

@@ -19,7 +19,7 @@
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
-      <el-form-item prop="password">
+      <el-form-item prop="password" v-if='!xgmemberMe'>
         <el-input
           v-model="loginForm.password"
           type="password"
@@ -30,7 +30,7 @@
           <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
-      <el-form-item prop="code">
+      <el-form-item prop="code" v-if='!xgmemberMe'>
         <el-input
           v-model="loginForm.code"
           auto-complete="off"
@@ -44,7 +44,29 @@
           <img :src="codeUrl" @click="getCode" class="login-code-img"/>
         </div>
       </el-form-item>
+      <el-form-item  prop="oldPassword" v-if='xgmemberMe'>
+        <el-input v-model="loginForm.oldPassword"  type="password"
+          auto-complete="off"
+          placeholder="旧密码"
+          @keyup.enter.native="handleLogin" >
+            <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+       </el-input>
+      </el-form-item>
+
+      <el-form-item  prop="newPassword" v-if='xgmemberMe'>
+        <el-input v-model="loginForm.newPassword"  placeholder="新(数字、大小写字母、特殊符号且大于8位)" type="password" >
+          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+        </el-input>
+      </el-form-item>
+
+      <el-form-item  prop="confirmPassword" v-if='xgmemberMe'>
+        <el-input v-model="loginForm.confirmPassword"  placeholder="确认新密码" type="password" @blur="cpass">
+          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+        </el-input>
+      </el-form-item>
+
       <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
+      <el-checkbox v-model="xgmemberMe"  @change=" xgmes " style="margin:0px 0px 25px 25px;">修改密码</el-checkbox>
       <el-form-item style="width:100%; margin-bottom: 42px;">
          <div class="medTitle">
            快捷登录
@@ -72,7 +94,7 @@
            </div>
          </div>
       </el-form-item>
-      <el-form-item style="width:100%;margin-bottom: 0;">
+      <el-form-item style="width:100%;margin-bottom: 0;" v-if='!xgmemberMe'>
         <el-button
           :loading="loading"
           size="medium"
@@ -87,6 +109,21 @@
           * 使用快捷登录，请先绑定第三方账号
         </p>
       </el-form-item>
+      <el-form-item style="width:100%;margin-bottom: 0;" v-if='xgmemberMe'>
+        <el-button
+          :loading="loading"
+          size="medium"
+          type="primary"
+          style="width: 100%;background-color: #2865E1;height: 45px;"
+          @click.native.prevent="handleLogins"
+        >
+          <span v-if="!loading">确认修改</span>
+          <span v-else>修 改 中...</span>
+        </el-button>
+        <p class="div_p">
+          * 使用快捷登录，请先绑定第三方账号
+        </p>
+      </el-form-item>
       </div>
     </el-form>
     <!--  底部  -->
@@ -100,6 +137,7 @@
 import { getCodeImg } from "@/api/login";
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from '@/utils/jsencrypt'
+import { updateUserPwds } from "@/api/system/user";
 
 export default {
   name: "Login",
@@ -113,7 +151,10 @@ export default {
         password: "",
         rememberMe: false,
         code: "",
-        uuid: ""
+        uuid: "",
+        confirmPassword:undefined,
+        newPassword:undefined,
+        oldPassword:undefined
       },
       loginRules: {
         username: [
@@ -125,7 +166,8 @@ export default {
         code: [{ required: true, trigger: "change", message: "验证码不能为空" }]
       },
       loading: false,
-      redirect: undefined
+      redirect: undefined,
+      xgmemberMe:false
     };
   },
   watch: {
@@ -181,7 +223,71 @@ export default {
           });
         }
       });
-    }
+    },
+    // 修改密码
+    handleLogins(){
+
+     if(this.loginForm.username == ""){
+       this.$message.error('请输入账号');
+       return
+     }
+     if(this.loginForm.oldPassword == undefined){
+       this.$message.error('请输入旧密码');
+       return
+     }
+     if(this.loginForm.newPassword == undefined){
+       this.$message.error('请输入新密码');
+       return
+     }
+
+     if(this.loginForm.confirmPassword == undefined){
+       this.$message.error('请输入确认密码');
+       return
+     }
+     this.loading = true;
+     updateUserPwds(this.loginForm.oldPassword, this.loginForm.newPassword,this.loginForm.username).then(
+       response => {
+         if(response.msg == '操作成功'){
+            this.msgSuccess(response.msg);
+            this.xgmemberMe = false
+            this.getCode();
+            this.$set(this.loginForm,'password','')
+            this.$set(this.loginForm,'uuid','')
+            this.$set(this.loginForm,'rememberMe',false)
+            this.$set(this.loginForm,'code','')
+            this.$set(this.loginForm,'confirmPassword',undefined)
+            this.$set(this.loginForm,'oldPassword',undefined)
+            this.$set(this.loginForm,'newPassword',undefined)
+            // this.$set(this.loginForm,'username','')
+         }else{
+           this.$message.error(response.msg);
+         }
+         
+         this.loading = false;
+       }
+     );
+    },
+    // 确认密码失去焦点
+    cpass(){
+     if(this.loginForm.confirmPassword !== this.loginForm.newPassword){
+       this.$message.error('两次密码不一致');
+     }
+    },
+    // 复选框选择修改密码
+    xgmes(){
+     if(this.xgmemberMe == false){
+       this.$set(this.loginForm,'confirmPassword',undefined)
+       this.$set(this.loginForm,'oldPassword',undefined)
+       this.$set(this.loginForm,'newPassword',undefined)
+       this.$set(this.loginForm,'username','')
+     }else{
+       this.$set(this.loginForm,'username','')
+       this.$set(this.loginForm,'password','')
+       this.$set(this.loginForm,'uuid','')
+       this.$set(this.loginForm,'rememberMe',false)
+       this.$set(this.loginForm,'code','')
+     }
+    },
   }
 };
 </script>

ruoyi-ui/src/views/system/issue/index.vue

@@ -123,7 +123,6 @@
      <el-table @cell-click= 'cellClick' v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
        <el-table-column label="字号" align="center" prop="message_code" />
      </el-table>
-
      <pagination
        v-show="total>0"
        :total="total"
@@ -743,7 +742,6 @@ export default {
             addbjectSave(this.faerform).then(response => {
               // this.msgSuccess("操作成功");
               this.frowtse.businessCodes = response.data[0].data
-
               this.sbreulw()
               // this.$router.go(-1);
               // this.open = false;

ruoyi-ui/src/views/system/pdf/index.vue

@@ -89,10 +89,12 @@ export default {
         let pdflis = [];
         if (res.data !== undefined) {
           if (res.data.message_upload !== null && res.data.message_upload !== '') {
-            pdflis = JSON.parse(res.data.message_upload);
-            this.src = pdflis[0].url;
-            this.name = res.data.message_title;
-            this.juegh.absolutePath = pdflis[0].absolutePath;
+            if(res.data.message_upload != undefined ){
+              pdflis = JSON.parse(res.data.message_upload);
+              this.src = pdflis[0].url;
+              this.name = res.data.message_title;
+              this.juegh.absolutePath = pdflis[0].absolutePath;
+            }
           }
 
           if (res.data.message_enclosure !== null && res.data.message_enclosure !== undefined) {