fix: acs_v1.0.0 修复bug

2024-06-03 15:31:19 +08:00
parent 9f050bd0ed bff324b280
commit c9308d3f0d
24 changed files with 161 additions and 93 deletions
--- a/nladmin-ui/src/views/login.vue
+++ b/nladmin-ui/src/views/login.vue
@@ -62,12 +62,13 @@ import Config from '@/settings'
 import { getCodeImg } from '@/api/login'
 import Cookies from 'js-cookie'
 import Background from '@/assets/images/background.jpg'
+import i18n from '@/i18n'
 export default {
  name: 'Login',
  data() {
    return {
      language: '简体中文',
-      title: '诺力开发平台',
+      title: i18n.t('platform.title'),
      title_param: 'platform',
      Background: Background,
      codeUrl: '',
@@ -80,9 +81,9 @@ export default {
        uuid: ''
      },
      loginRules: {
-        username: [{ required: true, trigger: 'blur', message: '用户名不能为空' }],
-        password: [{ required: true, trigger: 'blur', message: '密码不能为空' }],
-        code: [{ required: true, trigger: 'change', message: '验证码不能为空' }]
+        username: [{ required: true, trigger: 'blur', message: i18n.t('platform.tip1') }],
+        password: [{ required: true, trigger: 'blur', message: i18n.t('platform.tip2') }],
+        code: [{ required: true, trigger: 'change', message: i18n.t('platform.tip3') }]
      },
      loading: false,
      redirect: undefined
@@ -185,8 +186,8 @@ export default {
      console.log(point)
      if (point) {
        this.$notify({
-          title: '提示',
-          message: '当前登录状态已过期，请重新登录！',
+          title: i18n.t('common.Tips'),
+          message: i18n.t('common.Tip20'),
          type: 'warning',
          duration: 5000
        })
--- a/nladmin-ui/src/views/system/user/center/updatePass.vue
+++ b/nladmin-ui/src/views/system/user/center/updatePass.vue
@@ -45,7 +45,7 @@ export default {
        ],
        newPass: [
          { required: true, message: i18n.t('common.Tip11'), trigger: 'blur' },
-          { min: 6, max: 20, message: i18n.t('common.Tip12'), trigger: 'blur' }
+          { min: 6, max: 20, message: i18n.t('common.Tip12', { min: 6, max: 20 }), trigger: 'blur' }
        ],
        confirmPass: [
          { required: true, validator: confirmPass, trigger: 'blur' }
--- a/nladmin-ui/src/views/system/user/index.vue
+++ b/nladmin-ui/src/views/system/user/index.vue
@@ -252,10 +252,10 @@
      width="700px"
    >
      <el-form ref="form" :inline="true" :model="dataDialog" :rules="rules" size="mini" label-width="100px">
-        <el-form-item label="用户名" prop="username">
+        <el-form-item :label="$t('User.table.user_name')" prop="username">
          <el-input v-model="dataDialog.username" disabled style="width: 200px;" />
        </el-form-item>
-        <el-form-item label="姓名" prop="person_name">
+        <el-form-item :label="$t('User.table.person_name')" prop="person_name">
          <el-input v-model="dataDialog.person_name" disabled style="width: 200px;" />
        </el-form-item>
        <el-table
@@ -265,12 +265,12 @@
          @selection-change="getRows"
        >
          <el-table-column :selectable="checkboxT" type="selection" width="55" />
-          <el-table-column prop="label" label="权限范围" />
-          <el-table-column label="数据权限">
+          <el-table-column prop="label" :label="$t('User.table.permission_scope_type')" />
+          <el-table-column :label="$t('User.table.permissionName')">
            <template slot-scope="scope">
              <el-select
                v-model="scope.row.permission_id"
-                placeholder="请选择"
+                :placeholder="$t('common.Please_select')"
                @change="openRelevance(scope.row, scope.$index)"
              >
                <el-option
@@ -283,20 +283,20 @@
            </template>
          </el-table-column>
          <el-table-column
-            label="操作"
+            :label="$t('common.Operate')"
            fixed="right"
            align="center"
            width="100"
          >
            <template slot-scope="scope">
-              <el-button type="text" @click="showDatas(scope.row)">查看明细</el-button>
+              <el-button type="text" @click="showDatas(scope.row)">{{ $t('User.table.see') }}</el-button>
            </template>
          </el-table-column>
        </el-table>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button @click="cancelDataPerm">取消</el-button>
-        <el-button type="primary" @click="savePermise()">确认</el-button>
+        <el-button @click="cancelDataPerm">{{ $t('common.Cancel') }}</el-button>
+        <el-button type="primary" @click="savePermise()">{{ $t('common.Confirm') }}</el-button>
      </div>
    </el-dialog>
    <el-dialog
@@ -382,12 +382,12 @@ export default {
      ],
      rules: {
        username: [
-          { required: true, message: '请输入用户名', trigger: 'blur' },
-          { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
+          { required: true, message: i18n.t('User.rules.r2'), trigger: 'blur' },
+          { min: 2, max: 20, message: i18n.t('common.Tip12', { min: 2, max: 10 }), trigger: 'blur' }
        ],
        person_name: [
-          { required: true, message: '请输入用户姓名', trigger: 'blur' },
-          { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
+          { required: true, message: i18n.t('User.rules.r3'), trigger: 'blur' },
+          { min: 2, max: 20, message: i18n.t('common.Tip12', { min: 2, max: 10 }), trigger: 'blur' }
        ]
      },
      syncDrawer: false,
@@ -409,7 +409,7 @@ export default {
      userIds: [],
      showData: false,
      dataPermissions: [],
-      dataPermissionTitle: '数据权限'
+      dataPermissionTitle: i18n.t('User.table.data_reg')
    }
  },
  computed: {
@@ -435,7 +435,7 @@ export default {
    this.deptTree()
  },
  created() {
-    this.crud.msg.add = '新增成功'
+    this.crud.msg.add = i18n.t('common.add')
  },
  mounted: function() {
    const that = this
@@ -465,9 +465,9 @@ export default {
      return '#F56C6C'
    },
    handdeleted(datas) {
-      this.$confirm(`确认删除选中的1条数据?`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(i18n.t('common.Tip1', { count: 1 }), i18n.t('common.Tips'), {
+        confirmButtonText: i18n.t('common.Confirm'),
+        cancelButtonText: i18n.t('common.Cancel'),
        type: 'warning'
      }).then(() => {
        this.crud.delAllLoading = true
@@ -509,13 +509,13 @@ export default {
    [CRUD.HOOK.afterValidateCU](crud) {
      if (!crud.form.depts) {
        this.$message({
-          message: '部门不能为空',
+          message: i18n.t('User.rules.r4'),
          type: 'warning'
        })
        return false
      } else if (this.roleDatas.length === 0) {
        this.$message({
-          message: '角色不能为空',
+          message: i18n.t('User.rules.r5'),
          type: 'warning'
        })
        return false
@@ -708,7 +708,7 @@ export default {
          this.dataDialog.person_name = row.person_name
          this.dataDialog.username = row.username
          this.dataDialog.user_id = row.user_id
-          this.dataPermissionTitle = '[' + row.person_name + '] 数据权限'
+          this.dataPermissionTitle = '[' + row.person_name + '] ' + i18n.t('User.table.data_reg')
          this.dataPerm = true
          // 回显数据
          crudDataPermission.getDataShow(row.user_id).then(res => {
@@ -798,7 +798,7 @@ export default {
      }
      crudDataPermission.saveDataPermission(param).then(res => {
        this.dataPerm = false
-        this.crud.notify('添加数据权限成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.notify(i18n.t('User.msg.m5'), CRUD.NOTIFICATION_TYPE.SUCCESS)
        this.crud.toQuery()
      })
    },
@@ -814,7 +814,7 @@ export default {
      if (this.flag) this.$refs.deptUser.setCheckedKeys([])
    },
    handleClose(done) {
-      this.$confirm('确认关闭？')
+      this.$confirm(i18n.t('common.close'))
        .then(_ => {
          done()
        })
@@ -835,7 +835,7 @@ export default {
      }
      crudUser.edit(user).then(res => {
        this.cancelForm()
-        this.crud.notify('保存成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.notify(i18n.t('common.save'), CRUD.NOTIFICATION_TYPE.SUCCESS)
        this.crud.toQuery()
      })
    },
--- a/nladmin-ui/src/views/system/user/locale/en.js
+++ b/nladmin-ui/src/views/system/user/locale/en.js
@@ -30,7 +30,8 @@ export default {
      'assign_roles': 'Assign Roles',
      'locked': 'Lock ',
      'activate': 'Activate ',
-      'role_name': 'Role Name'
+      'role_name': 'Role Name',
+      'see': 'View Details'
    },
    'dialog': {
      'role': 'role',
@@ -47,13 +48,18 @@ export default {
    },
    'rules': {
      'NotNull': 'Cannot be empty',
-      'r1': 'Please select a department'
+      'r1': 'Please select a department',
+      'r2': 'Please enter your username',
+      'r3': 'Please enter your username',
+      'r4': 'Department cannot be empty',
+      'r5': 'Role cannot be empty'
    },
    'msg': {
      'm1': 'Confirm reset the password?',
      'm2': 'Password reset succeeded. Password :123456',
      'm3': 'This operation will change {display_name} account: {username}. Do you want to continue?',
-      'm4': 'Account: {username} has been {display_name}'
+      'm4': 'Account: {username} has been {display_name}',
+      'm5': 'Adding the data permission succeeded. Procedure'
    }
  }
 }
--- a/nladmin-ui/src/views/system/user/locale/in.js
+++ b/nladmin-ui/src/views/system/user/locale/in.js
@@ -30,7 +30,8 @@ export default {
      'assign_roles': 'Jadikan Rol',
      'locked': 'Mengunci ',
      'activate': 'Aktivasi ',
-      'role_name': 'Nama Peran'
+      'role_name': 'Nama Peran',
+      'see': 'Melihat Rincian'
    },
    'dialog': {
      'role': 'peran',
@@ -47,13 +48,18 @@ export default {
    },
    'rules': {
      'NotNull': 'Tidak dapat kosong',
-      'r1': 'Silakan pilih departemen'
+      'r1': 'Silakan pilih departemen',
+      'r2': 'Silakan masukkan nama pengguna Anda',
+      'r3': 'Silakan masukkan nama pengguna Anda',
+      'r4': 'Departemen tidak boleh kosong',
+      'r5': 'Peran tidak boleh kosong'
    },
    'msg': {
      'm1': 'Konfirmasikan setel ulang kata sandi?',
      'm2': 'Penyetelan ulang kata sandi berhasil. Kata sandi :123456',
      'm3': 'Operasi ini akan mengubah akun {display_name}: {username}.',
-      'm4': 'Akun: {username} telah menjadi {display_name}'
+      'm4': 'Akun: {username} telah menjadi {display_name}',
+      'm5': 'Menambahkan izin data berhasil. Prosedur'
    }
  }
 }
--- a/nladmin-ui/src/views/system/user/locale/zh.js
+++ b/nladmin-ui/src/views/system/user/locale/zh.js
@@ -30,7 +30,8 @@ export default {
      'assign_roles': '分配角色',
      'locked': '锁定',
      'activate': '激活',
-      'role_name': '角色名称'
+      'role_name': '角色名称',
+      'see': '查看明细'
    },
    'dialog': {
      'role': '角色',
@@ -47,13 +48,18 @@ export default {
    },
    'rules': {
      'NotNull': '不能为空',
-      'r1': '请选择部门'
+      'r1': '请选择部门',
+      'r2': '请输入用户名',
+      'r3': '请输入用户姓名',
+      'r4': '部门不能为空',
+      'r5': '角色不能为空'
    },
    'msg': {
      'm1': '确认重置密码？',
      'm2': '密码重置成功，密码:123456',
      'm3': '此操作将{display_name}账号：{username},是否继续？',
-      'm4': '账号：{username}已{display_name}'
+      'm4': '账号：{username}已{display_name}',
+      'm5': '添加数据权限成功'
    }
  }
 }