From 9498a5c745a82e865ff08eea32cfead3d5666e29 Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Mon, 14 Aug 2023 18:45:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86eslint=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/.eslintrc.js                             |  2 +-
 jero-web/README.md                                |  2 +-
 jero-web/package.json                             |  2 +-
 jero-web/src/components/tools/UserPassword.vue    |  5 ++---
 jero-web/src/mixins/JeroListMixin.js              | 15 +++++----------
 jero-web/src/views/system/UserList.vue            |  2 --
 .../src/views/system/modules/SysFillRuleModal.vue |  3 ++-
 7 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/jero-web/.eslintrc.js b/jero-web/.eslintrc.js
index 722ef7c8..17e43e77 100644
--- a/jero-web/.eslintrc.js
+++ b/jero-web/.eslintrc.js
@@ -16,6 +16,6 @@ module.exports = {
       'allowTemplateLiterals': true
     }],
     'semi': [2, 'never'],
-    'prefer-promise-reject-errors': 'warn'
+    'prefer-promise-reject-errors': 'off'
   }
 }
diff --git a/jero-web/README.md b/jero-web/README.md
index fde4e574..a972fb12 100644
--- a/jero-web/README.md
+++ b/jero-web/README.md
@@ -1,7 +1,7 @@
 Jero-Web
 ====
 
-当前最新版本： 2.4.6
+当前最新版本： 2.5.0
 
 Overview
 ----
diff --git a/jero-web/package.json b/jero-web/package.json
index 98cd0092..64d5cf32 100644
--- a/jero-web/package.json
+++ b/jero-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jero-web",
-  "version": "2.4.6",
+  "version": "2.5.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
diff --git a/jero-web/src/components/tools/UserPassword.vue b/jero-web/src/components/tools/UserPassword.vue
index 4c5105b5..e53d57a9 100644
--- a/jero-web/src/components/tools/UserPassword.vue
+++ b/jero-web/src/components/tools/UserPassword.vue
@@ -135,7 +135,7 @@ export default {
         this.form.validateFields((err, values) => {
           if (!err) {
             that.confirmLoading = true
-            const params = Object.assign({ username: this.username, rsaPublicKey:this.rsaPublicKey}, values)
+            const params = Object.assign({ username: this.username, rsaPublicKey: this.rsaPublicKey }, values)
             console.log('修改密码提交数据', params)
             const encrypt = new JSEncrypt()
             encrypt.setPublicKey(this.rsaPublicKey)
@@ -149,7 +149,7 @@ export default {
                 console.log(res)
                 that.$message.success(res.message)
                 that.close()
-                that.Logout().then(()=>{
+                that.Logout().then(() => {
                   window.location.replace('/user/login')
                 })
               } else {
@@ -161,7 +161,6 @@ export default {
           }
         })
       })
-
     },
     validateToNextPassword  (rule, value, callback) {
       const form = this.form
diff --git a/jero-web/src/mixins/JeroListMixin.js b/jero-web/src/mixins/JeroListMixin.js
index 1b778597..932822f0 100644
--- a/jero-web/src/mixins/JeroListMixin.js
+++ b/jero-web/src/mixins/JeroListMixin.js
@@ -316,9 +316,8 @@ export const JeroListMixin = {
         modalLoading.destroy()
       })
     },
-    //导入前
-    beforeUpload( file) {
-      // console.log(file,"jjjj")
+    // 导入前
+    beforeUpload (file) {
       if (file.size > 20 * 1024 * 1024) {
         this.uploading = true
         this.$message.warning('最大上传20M')
@@ -338,10 +337,7 @@ export const JeroListMixin = {
             keyboard: false
           })
         }
-
-
         this.loading = true
-        // 把知道了这个按钮去掉
         this.$nextTick(() => {
           document.getElementsByClassName('ant-modal-confirm-btns')[0].style = 'display:none'
         })
@@ -360,9 +356,9 @@ export const JeroListMixin = {
               this.$warning({
                 title: message,
                 content: (<div>
-                    <span>{msg}</span><br />
-                    <span>具体详情请 <a href={href} target="_blank" download={fileName}>点击下载</a> </span>
-                  </div>
+                  <span>{msg}</span><br />
+                  <span>具体详情请 <a href={href} target="_blank" download={fileName}>点击下载</a> </span>
+                </div>
                 )
               })
             } else {
@@ -399,7 +395,6 @@ export const JeroListMixin = {
           }
         }
       }
-
     },
     /* 图片预览 */
     getImgView (text) {
diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue
index bb1b03e1..423bb64c 100644
--- a/jero-web/src/views/system/UserList.vue
+++ b/jero-web/src/views/system/UserList.vue
@@ -21,8 +21,6 @@
               </a-select>
             </a-form-item>
           </a-col>
-
-
             <a-col :md="6" :sm="8">
               <a-form-item label="真实名字">
                 <j-input placeholder="请输入真实名字" v-model="queryParam.realname"></j-input>
diff --git a/jero-web/src/views/system/modules/SysFillRuleModal.vue b/jero-web/src/views/system/modules/SysFillRuleModal.vue
index 390b21a2..456a52af 100644
--- a/jero-web/src/views/system/modules/SysFillRuleModal.vue
+++ b/jero-web/src/views/system/modules/SysFillRuleModal.vue
@@ -67,7 +67,8 @@ export default {
                 info = '请输入JSON字符串'
                 callback(info)
               }
-            } catch {
+            } catch (error) {
+              console.log(error)
               info = '请输入JSON字符串'
               callback(info)
             }