fix: 国际化优化、任务管理修改

lms/nladmin-ui/src/views/system/user/index.vue

@@ -65,20 +65,20 @@
           :width="computedLabelWidth"
         >
           <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" :label-width="computedFormLabelWidth" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;">
-            <el-form-item :label="$t('User.table.user_name')" prop="username">
+            <el-form-item :label="$t('User.dialog.user_name')" prop="username">
               <el-input v-model="form.username" style="width: 200px;" />
             </el-form-item>
-            <el-form-item :label="$t('User.table.phone')" prop="phone">
+            <el-form-item :label="$t('User.dialog.phone')" prop="phone">
               <el-input v-model.number="form.phone" style="width: 200px;" />
             </el-form-item>
-            <el-form-item :label="$t('User.table.person_name')" prop="preson_name">
+            <el-form-item :label="$t('User.dialog.person_name')" prop="preson_name">
               <el-input v-model="form.person_name" style="width: 200px;" />
             </el-form-item>
-            <el-form-item :label="$t('User.table.email')" prop="email">
+            <el-form-item :label="$t('User.dialog.email')" prop="email">
               <el-input v-model="form.email" style="width: 200px;" />
             </el-form-item>
             <br v-if="!crud.status.edit">
-            <el-form-item v-if="crud.status.add" :label="$t('User.table.depts')" prop="depts" :rules="[{ required: true, message: '请选择部门', trigger: 'change' }]">
+            <el-form-item v-if="crud.status.add" :label="$t('User.dialog.depts')" prop="depts" :rules="[{ required: true, message: $t('User.rules.r1'), trigger: 'change' }]">
               <treeselect
                 v-model="form.depts"
                 :load-options="loadDepts"
@@ -94,13 +94,13 @@
             <el-form-item v-if="crud.status.add" :label="$t('User.dialog.password')" prop="password">
               <el-input v-model="form.password" style="width: 200px;" show-password auto-complete="new-password" />
             </el-form-item>
-            <el-form-item :label="$t('User.table.gender')">
+            <el-form-item :label="$t('User.dialog.gender')">
               <el-radio-group v-model="form.gender" style="width: 178px">
                 <el-radio label="1">{{ $t('User.dialog.sex_male') }}</el-radio>
                 <el-radio label="2">{{ $t('User.dialog.sex_female') }}</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item :label="$t('User.table.enabled')" prop="is_uesd">
+            <el-form-item :label="$t('User.dialog.enabled')" prop="is_uesd">
               <el-switch
                 v-model="form.is_used"
                 active-color="#409EFF"
@@ -149,7 +149,7 @@
             :label="$t('User.table.person_name')"
             :min-width="flexWidth('person_name',crud.data,$t('User.table.person_name'))"
           />
-          <el-table-column prop="gender" :label="$t('User.table.gender')" :min-width="flexWidth('gender',crud.data,$t('User.table.gender'))">
+          <el-table-column prop="gender" :label="$t('User.table.gender')" :min-width="flexWidth('gender1',crud.data,$t('User.table.gender'))">
             <template slot-scope="scope">
               {{ scope.row.gender === '1' ? $t('User.dialog.sex_male') : $t('User.dialog.sex_female') }}
             </template>
@@ -173,7 +173,7 @@
             :label="$t('common.Operate')"
             fixed="right"
             align="center"
-            width="200"
+            width="250"
           >
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-edit" @click="crud.toEdit(scope.row)">{{ $t('common.Update') }}</el-button>
@@ -236,12 +236,12 @@
             @selection-change="crud.selectionChangeHandler"
           >
             <el-table-column type="selection" width="55" />
-            <el-table-column prop="name" label="角色名称" min-width="100" show-overflow-tooltip />
+            <el-table-column prop="name" :label="$t('User.table.role_name')" min-width="100" show-overflow-tooltip />
           </el-table>
         </div>
         <div style="height: 10%">
-          <el-button @click="cancelForm">取 消</el-button>
-          <el-button type="primary" @click="saveChecked">保 存</el-button>
+          <el-button @click="cancelForm">{{ $t('common.Cancel') }}</el-button>
+          <el-button type="primary" @click="saveChecked">{{ $t('common.Confirm') }}</el-button>
         </div>
       </div>
     </el-drawer>
@@ -610,15 +610,15 @@ export default {
     // 改变状态
     changeEnabled(row) {
       const satus = this.enabledTypeOptions.find(item => { return item.key !== row.is_used })
-      this.$confirm('此操作将' + satus.display_name + '账号：' + row.username + ', 是否继续？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(i18n.t('User.msg.m3_1') + satus.display_name + i18n.t('User.msg.m3_2') + row.username + i18n.t('User.msg.m3_3'), i18n.t('common.Tips'), {
+        confirmButtonText: i18n.t('common.Confirm'),
+        cancelButtonText: i18n.t('common.Cancel'),
         type: 'warning'
       }).then(() => {
         row.is_used = satus.key
         crudUser.edit(row).then(res => {
           this.crud.toQuery()
-          this.crud.notify('账号' + row.username + '已' + satus.display_name)
+          this.crud.notify(i18n.t('User.msg.m3_2') + row.username + i18n.t('User.msg.m3_4') + satus.display_name)
         })
       })
     },
@@ -641,15 +641,15 @@ export default {
       return true
     },
     resetPassword(row) {
-      this.$confirm(`确认重置密码？`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(i18n.t('User.msg.m1'), i18n.t('common.Tips'), {
+        confirmButtonText: i18n.t('common.Confirm'),
+        cancelButtonText: i18n.t('common.Cancel'),
         type: 'warning'
       }).then(() => {
         row.password = '123456'
         crudUser.edit(row).then(res => {
           this.crud.toQuery()
-          this.crud.notify('密码重置成功，密码:123456', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.crud.notify(i18n.t('User.msg.m2'), CRUD.NOTIFICATION_TYPE.SUCCESS)
         })
       })
     },
@@ -659,7 +659,7 @@ export default {
         this.deptsDatas = res.content
       })
       this.openDrawer() // 打开抽屉
-      this.drawerTitle = '分配部门权限'
+      this.drawerTitle = i18n.t('User.drawerTitle2')
       this.flag = true
       // 默认选中
       const deptIds = []
@@ -689,7 +689,7 @@ export default {
         })
       })
       this.openDrawer()
-      this.drawerTitle = '分配角色权限'
+      this.drawerTitle = i18n.t('User.drawerTitle1')
       this.flag = false
       this.giveValue(row)
     },
@@ -699,11 +699,9 @@ export default {
       this.multipleSelection = []
       // 获取权限范围
       crudDataPermission.getDataScopeType().then(res => {
-        console.log('权限范围', res)
         this.dataDialog.dataScopeType = res
         // permissions
         crudDataPermission.getDataPermissionOption().then(res => {
-          console.log('数据权限', res)
           this.permissions = res
           this.dataDialog.person_name = row.person_name
           this.dataDialog.username = row.username
@@ -712,7 +710,6 @@ export default {
           this.dataPerm = true
           // 回显数据
           crudDataPermission.getDataShow(row.user_id).then(res => {
-            console.log('要回显的数据', res)
             this.$nextTick(function() {
               for (var index = 0; index < res.length; index++) {
                 for (var i = 0; i < this.dataDialog.dataScopeType.length; i++) {