From ae2e7ea9ef73ed15816f55fe7ff10065363a88e8 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 16 Jun 2021 15:28:06 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=B7=BB=E5=8A=A0=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E7=9A=84=E4=B8=AD=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/pagination.vue         |  2 +-
 src/components/rightBox/settings/UserBox.vue |  1 +
 src/components/table/settings/UserTable.vue  |  6 ++++-
 src/i18n/cn.js                               | 24 ++++++++++++++++++++
 src/i18n/en.js                               | 22 ++++++++++++++++++
 src/views/settings/User.vue                  | 15 +-----------
 6 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/src/components/common/pagination.vue b/src/components/common/pagination.vue
index d7e3ad43..71c96f10 100644
--- a/src/components/common/pagination.vue
+++ b/src/components/common/pagination.vue
@@ -234,7 +234,7 @@ export default {
       immediate: true,
       deep: true,
       handler (n, o) {
-          console.log(n)
+          // console.log(n)
       }
     }
   }
diff --git a/src/components/rightBox/settings/UserBox.vue b/src/components/rightBox/settings/UserBox.vue
index af8b5c3e..ff927337 100644
--- a/src/components/rightBox/settings/UserBox.vue
+++ b/src/components/rightBox/settings/UserBox.vue
@@ -59,6 +59,7 @@
             <el-switch
                id="account-input-status"
                v-model="editObject.status"
+               :active-color="theme.themeColor"
                :disabled="(editObject.username === loginName) || (editObject.username==='admin' && editObject.id==1)"
                :active-value="1"
                :inactive-value="0">
diff --git a/src/components/table/settings/UserTable.vue b/src/components/table/settings/UserTable.vue
index 2a6b37c2..a891499c 100644
--- a/src/components/table/settings/UserTable.vue
+++ b/src/components/table/settings/UserTable.vue
@@ -144,10 +144,14 @@ export default {
   },
   methods: {
     statusChange (user) {
+      console.log(user)
       if (user.roles) {
         user.roleIds = user.roles.map(t => t.id)
       }
-      put(this.url, user).then(response => {
+      // if (!user.id){
+      //   return
+      // }
+      put('sys/user', user).then(response => {
         if (response.code === 200) {
           this.rightBox.show = false
           this.$message({ duration: 1000, type: 'success', message: this.$t('tip.saveSuccess') })
diff --git a/src/i18n/cn.js b/src/i18n/cn.js
index 44407b71..5f8fecb5 100644
--- a/src/i18n/cn.js
+++ b/src/i18n/cn.js
@@ -165,6 +165,30 @@ const cn = {
     copySuccess: '复制成功',
     lnglatError: '经纬度格式错误'
   },
+  validate: {
+    required: '必填项',
+    number: '必须是数字',
+    email: '不合法的E-mail地址',
+    tel: '不合法的电话号码',
+    telephone: '电话号码不能为空',
+    host: '不合法的IP',
+    fileSize: '文件过大',
+    port: '不合法的端口',
+    special: '不能包含特殊字符',
+    config: {
+      account: {}
+    },
+    integer: '必须是整数',
+    positiveInteger: '必须是正整数',
+    domain: '不合法的域名',
+    usize: '必须是(1 - 49)的数字',
+    url: '不合法的URL',
+    uSize: '必须是(1 - 47)的数字',
+    requiredIdc: '机房为必选项',
+    tooLong: '文本太长',
+    key: '不合法的值',
+    onlyWord: '只可以输入a-z、A-Z、0-9、"_" 字符'
+  },
   config: {
     config: '设置',
     user: {
diff --git a/src/i18n/en.js b/src/i18n/en.js
index ead3b57f..fcf6b901 100644
--- a/src/i18n/en.js
+++ b/src/i18n/en.js
@@ -164,6 +164,28 @@ const en = {
     copySuccess: 'Copy success',
     lnglatError: 'Wrong format of latitude and longitude'
   },
+  validate: { // 校验规则
+    required: 'Required', // '必填项'
+    number: 'Numberic', // '必须是数字'
+    integer: 'Integer',
+    positiveInteger: 'Positive integer',
+    email: 'Invalid email', // '不合法的E-mail地址'
+    tel: 'Invalid phone number', // '不合法的电话号码'
+    telephone: 'Phone number cannot be empty',
+    host: 'Invalid Host', // '不合法的Host'
+    domain: 'Invalid domain',
+    usize: 'Must be number(1 - 47)',
+    fileSize: 'File exceed max size', // File exceed max size.
+    port: 'Invalid port',
+    url: 'Invalid URL',
+    uSize: 'Must be number(1 - 47)',
+    requiredIdc: 'dc is required',
+    key: 'Invalid key',
+    repeat: 'Repeat',
+    tooLong: 'Too long content',
+    onlyWord: 'only input a-z、A-Z、0-9、"_" ',
+    mobile: 'Invalid mobile'
+  },
   config: {
     config: 'Setting', // "设置"
     user: {
diff --git a/src/views/settings/User.vue b/src/views/settings/User.vue
index afb0c5b0..29483275 100644
--- a/src/views/settings/User.vue
+++ b/src/views/settings/User.vue
@@ -80,20 +80,7 @@ export default {
     }
   },
   methods: {
-    statusChange (user) {
-      if (user.roles) {
-        user.roleIds = user.roles.map(t => t.id)
-      }
-      put(this.url, user).then(response => {
-        if (response.code === 200) {
-          this.rightBox.show = false
-          this.$message({ duration: 1000, type: 'success', message: this.$t('tip.saveSuccess') })
-        } else {
-          this.$message.error(response.msg)
-        }
-        this.getTableData()
-      })
-    }
+
   }
 }
 </script>