Merge branch 'lang_dev_jw' into lang_dev

src/App.vue

@@ -105,6 +105,8 @@ iframe {
   color: #0052D9;
   cursor: pointer;
   margin-right: 5px;
+  display: inline-block;
+  flex-shrink: 0;
 }
 .deletesty {
   font-size: 14px;

src/lang/commonLang.js

@@ -20,6 +20,10 @@ export default {
       en: "Return",
       zh: "返回",
     },
+    set_btn:{
+      en:"Set",
+      zh:'设置'
+    },
   },
   Table: {
     add_btn: {
@@ -158,6 +162,14 @@ export default {
       en: "The current protocol is not currently supported, only the HTTPS protocol is supported",
       zh: "当前协议暂不支持，仅支持https协议",
     },
+    http_not_support:{
+      en:'The current protocol is not currently supported, only the HTTPS protocol is supported',
+      zh:'当前协议暂不支持，仅支持https协议'
+    },
+    move_sort_success:{
+      en:'Rearranged successfully',
+      zh:'移动排序成功'
+    }
   },
   Common: {
     category: {

src/lang/modules/systemManage/DepartManage.js

@@ -0,0 +1,169 @@
+/**
+ * 系统设置-部门管理
+ */
+
+/* 英文 */
+export const DepartManageEn = {
+    depart_info_title:"Department Information",
+    depart_create:'Create Department',
+    depart_edit:'Edit Department',
+    depart_name_placeholder:'Please enter the department name',
+    depart:'Department',
+    depart_del_success:'Department Deletion Successful',
+    delete_confirm:'Are you sure you want to delete',
+    group_add:'Add Group',
+    group:'Group',
+    group_name:'Group Name',
+    group_edit:'Edit Group',
+    group_name_placeholder:'Please Enter Group Name',
+    group_del_success:'Group Deletion Successful',
+    group_select:'Select Group',
+    group_select_placeholer:'Please Select Group',
+
+    user_add_btn:'Add User',
+    user_edit_btn:'Edit User',
+    user_login_accout:'Login Account',
+    user_login_pwd:'Login Password',
+    user_depart:'Department',
+    user_email:'Email',
+    user_role:'Assign Role',
+    user_add_placeholder01:'It is recommended to use the email prefix or phone number',
+    user_add_placeholder02:'6-12 characters combining numbers and letters',
+    user_add_placeholder03:'Please enter the user name',
+    user_add_placeholder04:'Please enter the phone number',
+    user_add_placeholder05:'Please select the department/group',
+    user_add_placeholder06:'Please enter the email',
+    user_add_placeholder07:'Please enter the employee ID',
+    user_add_placeholder08:'Please select the research direction',
+    user_add_placeholder09:'Please enter the position',
+
+    use_add_valid_msg01:'It is recommended to use the email prefix or phone number',
+    use_add_valid_msg02:'Please enter a new password',
+    use_add_valid_msg03:'Password must be 8 characters or more, including three of the following: numbers, uppercase letters, lowercase letters, special characters',
+    use_add_valid_msg04:'Name cannot be empty',
+    use_add_valid_msg05:'Either phone number or email must be filled',
+    use_add_valid_msg06:'Please enter the correct phone number format',
+    use_add_valid_msg07:'Please enter the correct email format',
+    use_add_valid_msg08:'Department/group cannot be empty',
+    use_add_valid_msg09:'Please enter four digits',
+    use_add_valid_msg10:'Role cannot be empty',
+
+    user_search_placeholder:'Name/Account/Phone Number Search',
+    user_table_name:'Name',
+    user_table_account:'Account',
+    user_table_mobile:'Phone Number',
+    user_table_role:'Role',
+    user_table_depart:'Department/Group',
+    user_table_status:'Status',
+    user_table_reset_pwd:'Reset Password',
+    user_table_move_group:'Move to Group',
+    user_table_status_ban:'Disable',
+    user_table_status_open:'Enable',
+    user_table_employee_id:'Employee ID',
+    user_table_position:'Position',
+    user_table_direct:'Research Direction',
+    user_table_address:'Work Location',
+    user_table_manage_auth:'Manage Permissions',
+    user_table_login_text:'Login account/Password',
+    use_tag01:'Super Admin',
+    use_tag02:'Admin',
+    use_tag03:'department manager',
+    use_tag04:'Team Leader',
+    use_tag05:'Supervisor',
+
+    look_auth:'View permissions',
+    no_auth:'No permission',
+    auth_text:'permission',
+
+    new_pwd:'New Password',
+    confirm_pwd:'Confirm Password',
+
+    del_msg:'Are you sure you want to delete user',
+};
+  
+/* 中文 */
+export const DepartManageZh = {
+    depart_info_title:"部门信息 ",
+    depart_create:'新建部门',
+    depart_edit:'编辑部门',
+    depart_name_placeholder:'请填写部门名称',
+    depart:'部门',
+    depart_del_success:'删除部门成功',
+    delete_confirm:'确定删除吗',
+    group_add:'添加分组',
+    group:'分组',
+    group_name:'分组名',
+    group_edit:'编辑分组',
+    group_name_placeholder:'请填写分组名称',
+    group_del_success:'删除分组成功',
+    group_select:'选择分组',
+    group_select_placeholer:'请选择部门分组',
+
+    user_add_btn:'添加用户',
+    user_edit_btn:'编辑用户',
+    user_login_accout:'登录账号',
+    user_login_pwd:'登录密码',
+    user_depart:'所属部门',
+    user_email:'邮箱',
+    user_role:'分配角色',
+    user_add_placeholder01:'建议使用邮箱前缀或者手机号码',
+    user_add_placeholder02:'6-12位数字与字母的组合',
+    user_add_placeholder03:'请输入用户名称',
+    user_add_placeholder04:'请输入手机号码',
+    user_add_placeholder05:'请选择部门分组',
+    user_add_placeholder06:'请输入邮箱',
+    user_add_placeholder07:'请输入工号',
+    user_add_placeholder08:'请选择研究方向',
+    user_add_placeholder09:'请输入职务',
+
+    use_add_valid_msg01:'登录账号不能为空',
+    use_add_valid_msg02:'请输入新密码',
+    use_add_valid_msg03:'密码要求8位及以上，包含数字、大写字母、小写字母、特殊字符中的三个类型',
+    use_add_valid_msg04:'姓名不能为空',
+    use_add_valid_msg05:'手机号码和邮箱至少填一个',
+    use_add_valid_msg06:'请输入正确的手机号格式',
+    use_add_valid_msg07:'请输入正确的邮箱格式',
+    use_add_valid_msg08:'部门分组不能为空',
+    use_add_valid_msg09:'请输入四位数字',
+    use_add_valid_msg10:'角色不能为空',
+
+
+
+    user_search_placeholder:'姓名/账号/手机号搜索',
+    user_table_name:'姓名',
+    user_table_account:'账号',
+    user_table_mobile:'手机号',
+    user_table_role:'角色',
+    user_table_depart:'部门/分组',
+    user_table_status:'状态',
+    user_table_reset_pwd:'重置密码',
+    user_table_move_group:'移动分组',
+    user_table_status_ban:'禁用',
+    user_table_status_open:'启用',
+    user_table_employee_id:'工号',
+    user_table_position:'职务',
+    user_table_direct:'研究方向',
+    user_table_address:'工作地点',
+    user_table_manage_auth:'管理权限',
+    user_table_login_text:'登录账号/密码',
+
+    use_tag01:'超管',
+    use_tag02:'管理员',
+    use_tag03:'部门经理',
+    use_tag04:'组长',
+    use_tag05:'主管',
+
+    look_auth:'查看权限',
+    no_auth:'暂无权限',
+    auth_text:'权限',
+
+    new_pwd:'新密码',
+    confirm_pwd:'确认新密码',
+
+    del_msg:'是否确认删除用户',
+
+};
+  
+/**
+* $t('SystemManage.DepartManage.XXX')
+*/

src/lang/modules/systemManage/OperateAuth.js

@@ -0,0 +1,79 @@
+/**
+ * 系统设置-数据操作权限
+ */
+
+/* 英文 */
+export const OperateAuthEn = {
+    tab01:'Manual Data Indicators',
+    tab02:'My Steel Chemical Database',
+    tab03:'ETA Indicator Library',
+    tab04:'ETA Predictive Indicators',
+    tab05:'Image Library',
+
+    placeholder01:'请输入图表名称',
+    placeholder02:'Enter Indicator ID/Indicator Name',
+    placeholder03:'Select Category',
+    placeholder04:'Select User',
+
+    btn_text01:'Batch Edit',
+    btn_text02:'Permission Settings',
+
+    table_col_name01:'图表名称',
+    table_col_name02:'图分类',
+    table_col_name03:'Creator',
+    table_col_name04:'Indicator ID',
+    table_col_name05:'Indicator Name',
+
+    edit_title01:'Edit Permissions',
+    edit_title02:'Batch Edit Permissions',
+    original_creator:'Original Creator',
+    new_creator:'New Creator',
+
+    msg01:'Please select at least one',
+
+    permission_title01:'Permission Settings',
+    permission_title02:'批量权限设置',
+    invisible_users:'Invisible Users',
+    permission_confirm_msg:"Are you sure you want to delete the user's invisible permission?",
+    set_success:'Setting Successful'
+};
+  
+/* 中文 */
+export const OperateAuthZh = {
+    tab01:'手工数据指标',
+    tab02:'钢联化工数据库',
+    tab03:'ETA指标库',
+    tab04:'ETA预测指标',
+    tab05:'图库',
+
+    placeholder01:'请输入图表名称',
+    placeholder02:'请输入指标Id/指标名称',
+    placeholder03:'请选择分类',
+    placeholder04:'请选择用户',
+
+    btn_text01:'批量编辑',
+    btn_text02:'权限设置',
+
+    table_col_name01:'图表名称',
+    table_col_name02:'图分类',
+    table_col_name03:'创建人',
+    table_col_name04:'指标ID',
+    table_col_name05:'指标名称',
+
+    edit_title01:'编辑权限',
+    edit_title02:'批量编辑权限',
+    original_creator:'原创建人',
+    new_creator:'新创建人',
+
+    msg01:'请至少勾选一个',
+
+    permission_title01:'权限设置',
+    permission_title02:'批量权限设置',
+    invisible_users:'不可见用户',
+    permission_confirm_msg:'是否确认删除该用户的不可见权限?',
+    set_success:'配置成功'
+};
+  
+/**
+* $t('SystemManage.OperateAuth.XXX')
+*/

src/lang/modules/systemManage/RoleManage.js

@@ -15,6 +15,9 @@ export const RoleManageEn = {
     input_role_placeholder:'Please Input Role Name',
     select_role_placeholder:'Please Select Role Type',
     delete_role_msg:'Are you sure you want to delete this role?',
+    permission_set:'Permission Settings',
+    set_permission_msg01:'Please select at least one permission',
+    set_permission_success:'Permission Settings Successful'
 };
   
 /* 中文 */
@@ -30,6 +33,9 @@ export const RoleManageZh = {
     input_role_placeholder:'请填写角色名称',
     select_role_placeholder:'选择角色类型',
     delete_role_msg:'是否确认删除该角色?',
+    permission_set:'权限设置',
+    set_permission_msg01:'请至少选择一个权限 ',
+    set_permission_success:'权限设置成功'
 };
   
 /**

src/lang/modules/systemManage/indexEn.js

@@ -0,0 +1,13 @@
+import { DepartManageEn } from "./DepartManage";
+import { RoleManageEn } from "./RoleManage";
+import { OperateAuthEn } from "./OperateAuth";
+
+export default {
+  // 系统设置
+  SystemManage: {
+    DepartManage: DepartManageEn,
+    RoleManage: RoleManageEn,
+    OperateAuth:OperateAuthEn
+  },
+};
+

src/lang/modules/systemManage/indexZh.js

@@ -0,0 +1,12 @@
+import { DepartManageZh } from "./DepartManage";
+import { RoleManageZh } from "./RoleManage";
+import { OperateAuthZh } from "./OperateAuth";
+
+export default {
+  // 系统设置
+  SystemManage: {
+    DepartManage: DepartManageZh,
+    RoleManage: RoleManageZh,
+    OperateAuth:OperateAuthZh
+  },
+};

src/views/system_manage/components/addUserDialog.vue

@@ -1,75 +1,75 @@
 <template>
     <el-dialog :visible.sync="isAddUserDialogShow" :close-on-click-modal="false" :modal-append-to-body='false' class="add-user-dialog-wrap"
-        @close="$emit('close')" center width="886px" v-dialogDrag>
+        @close="$emit('close')" center width="986px" v-dialogDrag>
         <div slot="title" style="display:flex;alignItems:center;">
-            <img :src="userForm.title=='添加用户'?$icons.add:$icons.edit"
+            <img :src="userForm.title==$t('SystemManage.DepartManage.user_add_btn')?$icons.add:$icons.edit"
                 style="color:#fff;width:16px;height:16px;marginRight:5px;">
             <span style="fontSize:16px;">{{userForm.title}}</span>
         </div>
-        <el-form @submit.native.prevent :model="userForm" :rules="userRule" ref="userForm" label-width="100px"
+        <el-form @submit.native.prevent :model="userForm" :rules="userRule" ref="userForm" label-width="160px"
             class="demo-ruleForm" style="marginTop:15px;">
-            <el-form-item label="登录账号" prop="account">
-                <el-input v-model="userForm.account" placeholder="建议使用邮箱前缀或者手机号码" :disabled="userForm.disabledForm" clearable>
+            <el-form-item :label="$t('SystemManage.DepartManage.user_login_accout')" prop="account">
+                <el-input v-model="userForm.account" :placeholder="$t('SystemManage.DepartManage.user_add_placeholder01')" :disabled="userForm.disabledForm" clearable>
                 </el-input>
             </el-form-item>
-            <el-form-item label="登录密码" prop="pwd" v-if="userForm.title == '添加用户'">
-                <el-input v-model.trim="userForm.pwd" placeholder="6-12位数字与字母的组合" 
-                    :type="userForm.title == '添加用户' ? 'text' : 'password' " clearable></el-input>
+            <el-form-item :label="$t('SystemManage.DepartManage.user_login_pwd')" prop="pwd" v-if="userForm.title == $t('SystemManage.DepartManage.user_add_btn')">
+                <el-input v-model.trim="userForm.pwd" :placeholder="$t('SystemManage.DepartManage.user_add_placeholder02')" 
+                    :type="userForm.title == $t('SystemManage.DepartManage.user_add_btn') ? 'text' : 'password' " clearable></el-input>
             </el-form-item>
-            <el-form-item label="姓名" prop="name">
-                <el-input v-model="userForm.name" placeholder="请输入用户名称"  clearable>
+            <el-form-item :label="$t('SystemManage.DepartManage.user_table_name')" prop="name">
+                <el-input v-model="userForm.name" :placeholder="$t('SystemManage.DepartManage.user_add_placeholder03')"  clearable>
                 </el-input>
             </el-form-item>
-            <el-form-item label="手机号码" prop="mobile" class="mobile-input-item">
-                <el-input v-model.trim="userForm.mobile" placeholder="请输入手机号码" clearable class="mobile-input">
+            <el-form-item :label="$t('SystemManage.DepartManage.user_table_mobile')" prop="mobile" class="mobile-input-item">
+                <el-input v-model.trim="userForm.mobile" :placeholder="$t('SystemManage.DepartManage.user_add_placeholder04')" clearable class="mobile-input">
                 </el-input>
                 <el-select v-model="userForm.areacode" class="mobile-select" placeholder="请选择">
                     <el-option v-for="item in areaCode" :key="item.Value"
                         :label="item.Name" :value="item.Value" />
                 </el-select>
             </el-form-item>
-            <el-form-item label="所属部门" prop="depart" v-if="userForm.title == '添加用户'">
+            <el-form-item :label="$t('SystemManage.DepartManage.user_depart')" prop="depart" v-if="userForm.title == $t('SystemManage.DepartManage.user_add_btn')">
                 <el-cascader :options="departArr" v-model="userForm.depart" :props="form_departProp"
-                    placeholder="请选择部门分组" :disabled="userForm.disabledForm" clearable>
+                    :placeholder="$t('SystemManage.DepartManage.user_add_placeholder05')" :disabled="userForm.disabledForm" clearable>
                 </el-cascader>
             </el-form-item>
-            <el-form-item label="邮箱" prop="email">
-                <el-input v-model="userForm.email" placeholder="请输入邮箱"></el-input>
+            <el-form-item :label="$t('SystemManage.DepartManage.user_email')" prop="email">
+                <el-input v-model="userForm.email" :placeholder="$t('SystemManage.DepartManage.user_add_placeholder06')"></el-input>
             </el-form-item>
-            <el-form-item label="工号" prop="employeeNumber">
-                <el-input :disabled="hasEmployeeNo" v-model="userForm.employeeNumber" placeholder="请输入工号"></el-input>
+            <el-form-item :label="$t('SystemManage.DepartManage.user_table_employee_id')" prop="employeeNumber">
+                <el-input :disabled="hasEmployeeNo" v-model="userForm.employeeNumber" :placeholder="$t('SystemManage.DepartManage.user_add_placeholder07')"></el-input>
             </el-form-item>
-            <el-form-item label="分配角色" prop="role">
-                <el-select v-model="userForm.role" placeholder="分配角色" :disabled="userForm.disabledForm" @change="roleChange">
+            <el-form-item :label="$t('SystemManage.DepartManage.user_role')" prop="role">
+                <el-select v-model="userForm.role" :placeholder="$t('SystemManage.DepartManage.user_role')" :disabled="userForm.disabledForm" @change="roleChange">
                     <el-option v-for="item in roleArr" :key="item.RoleId" :label="item.RoleName" :value="item.RoleId">
                     </el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="研究方向" prop="direct" v-permission="permissionBtn.sysDepartPermission.sysDepart_saveUser_researchGroup">
+            <el-form-item :label="$t('SystemManage.DepartManage.user_table_direct')" prop="direct" v-permission="permissionBtn.sysDepartPermission.sysDepart_saveUser_researchGroup">
                 <el-cascader collapse-tags :show-all-levels="false" :options="researchGroup" v-model="userForm.direct"
-                    :props="form_directProp" placeholder="请选择研究方向" clearable></el-cascader>
+                    :props="form_directProp" :placeholder="$t('SystemManage.DepartManage.user_add_placeholder08')" clearable></el-cascader>
             </el-form-item>
-            <el-form-item label="职务" prop="post">
-                <el-input v-model="userForm.post" placeholder="请输入职务" clearable>
+            <el-form-item :label="$t('SystemManage.DepartManage.user_table_position')" prop="post">
+                <el-input v-model="userForm.post" :placeholder="$t('SystemManage.DepartManage.user_add_placeholder09')" clearable>
                 </el-input>
             </el-form-item>
-            <el-form-item label="工作地点" prop="city"
+            <el-form-item :label="$t('SystemManage.DepartManage.user_table_address')" prop="city"
                 :rules="[2,6,18].includes(userForm.role)?{ required: true, message: '工作地点不能为空', trigger: 'change' }:{}">
                     <search-dist-picker 
                         :provinceInfo="userForm.province"
                         :cityInfo="userForm.city"
                         @selected="selectRegion"/>
             </el-form-item>
-            <el-form-item label="状态" prop="status">
+            <el-form-item :label="$t('SystemManage.DepartManage.user_table_status')" prop="status">
                 <el-radio-group v-model="userForm.status" :disabled="userForm.disabledStatus">
-                    <el-radio :label="1">启用</el-radio>
-                    <el-radio :label="0">禁用</el-radio>
+                    <el-radio :label="1">{{$t('SystemManage.DepartManage.user_table_status_open')}}</el-radio>
+                    <el-radio :label="0">{{$t('SystemManage.DepartManage.user_table_status_ban')}}</el-radio>
                 </el-radio-group>
             </el-form-item>
         </el-form>
         <div style="display:flex;justify-content:center;margin:0 0 26px;">
-            <el-button type="primary" style="width:80px;marginRight:24px;" @click="$emit('save')">保存</el-button>
-            <el-button style="width:80px;" @click="$emit('close')">取消</el-button>
+            <el-button type="primary" style="width:80px;marginRight:24px;" @click="$emit('save')">{{$t('Dialog.confirm_save_btn')}}</el-button>
+            <el-button style="width:80px;" @click="$emit('close')">{{$t('Dialog.cancel_btn')}}</el-button>
         </div>
     </el-dialog>
 </template>
@@ -111,42 +111,46 @@ import {patternEmail,isMobileNo,checkPassWord} from '@/utils/commonOptions';
             }
         },
         components:{searchDistPicker},
-        data() {
-            return {
-                userRule: {
-                    account:[{required: true, message: '登录账号不能为空', trigger: 'blur'}],
-                    pwd:[{validator:(rule,value,callback)=>{
-                        if(value===''){
-                            callback(new Error('请输入新密码'))
-                        }
-                        if(!checkPassWord(value)){
-                            callback(new Error('密码要求8位及以上，包含数字、大写字母、小写字母、特殊字符中的三个类型'))
-                        }else{
-                            callback()
+        computed:{
+            userRule() {
+                return {
+                account:[{required: true, message: this.$t('SystemManage.DepartManage.use_add_valid_msg01'), trigger: 'blur'}],
+                pwd:[
+                    {
+                        validator:(rule,value,callback)=>{
+                            if(value===''){
+                                callback(new Error(this.$t('SystemManage.DepartManage.use_add_valid_msg02')))
+                            }
+                            if(!checkPassWord(value)){
+                                callback(new Error(this.$t('SystemManage.DepartManage.use_add_valid_msg03')))
+                            }else{
+                                callback()
+                            }
                         }
-                    }}],
-                    name:[{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+                    }
+                ],
+                name:[{ required: true, message: this.$t('SystemManage.DepartManage.use_add_valid_msg04'), trigger: 'blur' }],
                     mobile:[{ validator: (rule, value, callback) => {
                         if (value === ''&&!this.userForm.email) {
-                            callback(new Error('手机号码和邮箱至少填一个'));
+                            callback(new Error(this.$t('SystemManage.DepartManage.use_add_valid_msg05')));
                         }else if(value&&this.userForm.areacode==='86'&&!isMobileNo(value)) {
-                            callback(new Error('请输入正确的手机号格式'));
+                            callback(new Error(this.$t('SystemManage.DepartManage.use_add_valid_msg06')));
                         } else if(this.userForm.areacode!=='86'&&isNaN(value.trim())){
-                            callback(new Error('请输入正确的手机号格式'));
+                            callback(new Error(this.$t('SystemManage.DepartManage.use_add_valid_msg06')));
                         }else {
                             callback();
                         }
                     }, trigger: 'blur'}],
                     email:[{ validator: (rule, value, callback) => {
                         if (value === ''&&!this.userForm.mobile) {
-                            callback(new Error('手机号码和邮箱至少填一个'));
+                            callback(new Error(this.$t('SystemManage.DepartManage.use_add_valid_msg05')));
                         }else if(value&&!patternEmail.test(value)) {
-                            callback(new Error('请输入正确的邮箱格式'));
+                            callback(new Error(this.$t('SystemManage.DepartManage.use_add_valid_msg07')));
                         } else {
                             callback();
                         }
                     }, trigger: 'blur'}],
-                    depart:[{ required: true, message: '部门分组不能为空', trigger: 'change' }],
+                    depart:[{ required: true, message: this.$t('SystemManage.DepartManage.use_add_valid_msg08'), trigger: 'change' }],
                     employeeNumber:[{validator:(rule,value,callback)=>{
                         if(!value){
                             callback()
@@ -155,13 +159,66 @@ import {patternEmail,isMobileNo,checkPassWord} from '@/utils/commonOptions';
                         // 取消空格
                         let tempValue = parseInt(value.replaceAll(' ',''))
                         if(!tempValue || value.replaceAll(' ','').length!=4){
-                            callback(new Error('请输入四位数字'))
+                            callback(new Error(this.$t('SystemManage.DepartManage.use_add_valid_msg09')))
                         }else{
                             callback()
                         }
                     },trigger:'blur'}],
-                    role:[{ required: true, message: '角色不能为空', trigger: 'change' }],
+                    role:[{ required: true, message: this.$t('SystemManage.DepartManage.use_add_valid_msg10'), trigger: 'change' }],
+                }
                 },
+        },
+        data() {
+            return {
+                // userRule: {
+                //     account:[{required: true, message: '登录账号不能为空', trigger: 'blur'}],
+                //     pwd:[{validator:(rule,value,callback)=>{
+                //         if(value===''){
+                //             callback(new Error('请输入新密码'))
+                //         }
+                //         if(!checkPassWord(value)){
+                //             callback(new Error('密码要求8位及以上，包含数字、大写字母、小写字母、特殊字符中的三个类型'))
+                //         }else{
+                //             callback()
+                //         }
+                //     }}],
+                //     name:[{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+                //     mobile:[{ validator: (rule, value, callback) => {
+                //         if (value === ''&&!this.userForm.email) {
+                //             callback(new Error('手机号码和邮箱至少填一个'));
+                //         }else if(value&&this.userForm.areacode==='86'&&!isMobileNo(value)) {
+                //             callback(new Error('请输入正确的手机号格式'));
+                //         } else if(this.userForm.areacode!=='86'&&isNaN(value.trim())){
+                //             callback(new Error('请输入正确的手机号格式'));
+                //         }else {
+                //             callback();
+                //         }
+                //     }, trigger: 'blur'}],
+                //     email:[{ validator: (rule, value, callback) => {
+                //         if (value === ''&&!this.userForm.mobile) {
+                //             callback(new Error('手机号码和邮箱至少填一个'));
+                //         }else if(value&&!patternEmail.test(value)) {
+                //             callback(new Error('请输入正确的邮箱格式'));
+                //         } else {
+                //             callback();
+                //         }
+                //     }, trigger: 'blur'}],
+                //     depart:[{ required: true, message: '部门分组不能为空', trigger: 'change' }],
+                //     employeeNumber:[{validator:(rule,value,callback)=>{
+                //         if(!value){
+                //             callback()
+                //             return 
+                //         }
+                //         // 取消空格
+                //         let tempValue = parseInt(value.replaceAll(' ',''))
+                //         if(!tempValue || value.replaceAll(' ','').length!=4){
+                //             callback(new Error('请输入四位数字'))
+                //         }else{
+                //             callback()
+                //         }
+                //     },trigger:'blur'}],
+                //     role:[{ required: true, message: '角色不能为空', trigger: 'change' }],
+                // },
                 form_departProp:{
                     value:'DepartmentId',
                     label:'DepartmentName',

src/views/system_manage/components/authSetDialog.vue

@@ -13,7 +13,7 @@
 	>
     <div class="cont">
       <div class="header">
-        <span>不可见用户</span>
+        <span>{{$t('SystemManage.OperateAuth.invisible_users')}}</span>
         <el-cascader
           v-model="filterUsers"
           :options="userList"
@@ -29,12 +29,12 @@
           :show-all-levels="false"
           clearable
           filterable
-          placeholder="请选择用户" 
+          :placeholder="$t('SystemManage.OperateAuth.placeholder04')" 
           style="margin: 0 20px"
         />
-        <el-button type="primary" @click="setAuthHandle">设置</el-button>
+        <el-button type="primary" @click="setAuthHandle">{{$t('Dialog.set_btn')}}</el-button>
       </div>
-      <template v-if="edbForm.title==='权限设置'">
+      <template v-if="edbForm.title===$t('SystemManage.OperateAuth.permission_title01')">
         <el-table
           :data="filterTable"
           border
@@ -45,13 +45,13 @@
               <span>{{ row[item.key] }}</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="操作">
+          <el-table-column align="center" :label="$t('Table.column_operations')">
             <template slot-scope="{row}" >
               <el-popconfirm
-                title="是否确认删除该用户的不可见权限?"
+                :title="$t('SystemManage.OperateAuth.permission_confirm_msg')"
                 @onConfirm="removeUser(row)"
               >
-                <span slot="reference" class="deletesty">删除</span>
+                <span slot="reference" class="deletesty">{{$t('Table.delete_btn')}}</span>
               </el-popconfirm>
             </template>
           </el-table-column>
@@ -92,7 +92,16 @@ export default {
       let uers_arr = _.cloneDeep(this.users);
       this.disableCreaterHandle(uers_arr);
       this.userList = uers_arr;
-      this.edbForm.title==='权限设置' && this.getTableList()
+      this.edbForm.title===this.$t('SystemManage.OperateAuth.permission_title01') && this.getTableList()
+    }
+  },
+  computed:{
+    tableColums(){
+      return [
+        { label:this.$t('SystemManage.DepartManage.user_table_name'),key: 'RealName' },
+        { label:this.$t('SystemManage.DepartManage.user_table_role'),key: 'RoleName' },
+        { label:this.$t('SystemManage.DepartManage.user_table_depart'),key: 'DepartmentGroup' },
+      ]
     }
   },
   data() {
@@ -102,11 +111,11 @@ export default {
 
       tableData: [],
       filterTable: [],
-      tableColums:[
-        { label:'姓名',key: 'RealName' },
-        { label:'角色',key: 'RoleName' },
-        { label:'部门/分组',key: 'DepartmentGroup' },
-      ],
+      // tableColums:[
+      //   { label:'姓名',key: 'RealName' },
+      //   { label:'角色',key: 'RoleName' },
+      //   { label:'部门/分组',key: 'DepartmentGroup' },
+      // ],
       pageNo:1,
       pageSize: 10,
       total: 0,
@@ -158,14 +167,14 @@ export default {
             AdminId
           }).then(res => {
             if(res.Ret !== 200) return 
-            this.$message.success('删除成功');
+            this.$message.success(this.$t('MsgPrompt.delete_msg'));
             this.getTableList();
           })
     },
 
     /* 设置权限 */
     async setAuthHandle() {
-      if(!this.filterUsers.length) return this.$message.warning('请选择用户')
+      if(!this.filterUsers.length) return this.$message.warning(this.$t('SystemManage.OperateAuth.placeholder04'))
       // let res = this.edbForm.title === '权限设置' 
       //   ? await operateAuthInterface.edbNoAuthSet({
       //       EdbInfoId: Number(this.edbForm.ids[0]),
@@ -178,8 +187,8 @@ export default {
         })
 
       if(res.Ret !== 200) return 
-      this.$message.success('配置成功')
-      if(this.edbForm.title === '权限设置') {
+      this.$message.success(this.$t('SystemManage.OperateAuth.set_success'))
+      if(this.edbForm.title === this.$t('SystemManage.OperateAuth.permission_title01')) {
         this.filterUsers=[]
         this.getTableList()
       }else {

src/views/system_manage/departManage.vue

@@ -3,7 +3,7 @@
 		<div class="left_cont">
 			<div class="company_top" @click="initDepart">
 				<img src="~@/assets/img/set_m/home_ico.png" alt="" style="width:30px;height:30px;">
-				<span :class="!defaultGroup&&!defaultDepart?'act':''">部门信息</span>
+				<span :class="!defaultGroup&&!defaultDepart?'act':''">{{$t('SystemManage.DepartManage.depart_info_title')}}</span>
 			</div>
 			<el-tree
 				ref="departTree"
@@ -30,12 +30,12 @@
 						v-if="((!isTrail) || (data.canEdit||data.IsGroup))&&permissionBtn.isShowBtn('sysDepartPermission','sysDepart_classifyOpt_edit')">
 						<el-popconfirm
 						@onConfirm="removeNode(node,data)"
-						confirmButtonText='删除'
-						cancelButtonText='取消'
+						:confirmButtonText="$t('Table.delete_btn')"
+						:cancelButtonText="$t('Dialog.cancel_btn')"
 						confirmButtonType="text"
 						icon="el-icon-info"
 						iconColor="red"
-						title="确定删除吗"
+						:title="$t('SystemManage.DepartManage.delete_confirm')"
 						v-if="data.DepartmentId!=shareCustomDepartmentId && (!isTrail || (isTrail && (data.canEdit || data.IsGroup)))&&permissionBtn.isShowBtn('sysDepartPermission','sysDepart_classifyOpt_delete')"
 						>
 						<!-- 共享客户组不允许删除 -->
@@ -46,18 +46,18 @@
 			</el-tree>
 			<div class="noDepart" @click="addDepart" v-if="permissionBtn.isShowBtn('sysDepartPermission','sysDepart_classifyOpt_edit')">
 				<img src="~@/assets/img/set_m/add_ico.png" alt="" style="width:16px;height:16px;marginRight:10px;">
-				<span>新建部门</span>
+				<span>{{$t('SystemManage.DepartManage.depart_create')}}</span>
 			</div>
 		</div>
 		<div class="right_cont">
 			<div class="right_cont_top">
 				<div>
 					<el-button v-permission="permissionBtn.sysDepartPermission.sysDepart_saveUser"
-						type="primary" @click="addUser">添加用户</el-button>
+						type="primary" @click="addUser">{{$t('SystemManage.DepartManage.user_add_btn')}}</el-button>
 					<!-- <el-button type="primary" @click="synchronizationMEIKE" style="margin-left: 26px;">同步每刻</el-button> -->
 				</div>
 				<el-input
-					placeholder="姓名/账号/手机号搜索"
+					:placeholder="$t('SystemManage.DepartManage.user_search_placeholder')"
 					v-model="search_txt"
 					@input="searchHandle"
 					style="maxWidth:359px">
@@ -76,64 +76,64 @@
 				border>
 					<el-table-column
 					prop="RealName"
-					label="姓名"
+					:label="$t('SystemManage.DepartManage.user_table_name')"
 					width="200"
 					align="center">
 						<template slot-scope="scope">
 							<el-tag size="small" 
 								v-if="scope.row.LabelVal&&permissionBtn.checkPermissionBtn(permissionBtn.sysDepartPermission.sysDepart_saveUser_LabelVal)" 
-								:style="scope.row.LabelVal==1||scope.row.LabelVal==2?'color:#fff;background:#409EFF':'color:#409EFF;background:#ECF5FF'" style="position:absolute;left:10px">{{scope.row.LabelVal==1?'超管':scope.row.LabelVal==2?'管理员':scope.row.LabelVal==3?'部门经理':scope.row.LabelVal==4?'组长':'主管'}}</el-tag>
+								:style="scope.row.LabelVal==1||scope.row.LabelVal==2?'color:#fff;background:#409EFF':'color:#409EFF;background:#ECF5FF'" style="position:absolute;left:10px">{{scope.row.LabelVal==1?$t('SystemManage.DepartManage.use_tag01'):scope.row.LabelVal==2?$t('SystemManage.DepartManage.use_tag02'):scope.row.LabelVal==3?$t('SystemManage.DepartManage.use_tag03'):scope.row.LabelVal==4?$t('SystemManage.DepartManage.use_tag04'):$t('SystemManage.DepartManage.use_tag05')}}</el-tag>
 							<span style="position: relative;">{{scope.row.RealName}}</span>
 						</template>
 					</el-table-column>
 					<el-table-column 
 						prop="AdminName"
-						label="账号"
+						:label="$t('SystemManage.DepartManage.user_table_account')"
 						align="center"
 					/>
 					<el-table-column
 					prop="Mobile"
-					label="手机号"
+					:label="$t('SystemManage.DepartManage.user_table_mobile')"
 					align="center">
 						<template slot-scope="scope"> <span>{{scope.row.Mobile||''}}</span> </template>
 					</el-table-column>
 					<el-table-column
 					prop="RoleName"
-					label="角色"
+					:label="$t('SystemManage.DepartManage.user_table_role')"
 					align="center">
 						<template slot-scope="scope"> <span>{{scope.row.RoleName||''}}</span> </template>
 					</el-table-column>
 					<el-table-column
 					prop="DepartmentGroup"
-					label="部门/分组"
+					:label="$t('SystemManage.DepartManage.user_table_depart')"
 					align="center">
 						<template slot-scope="scope"> <span>{{scope.row.DepartmentGroup||''}}</span> </template>
 					</el-table-column>
-					<el-table-column label="状态" align="center">
+					<el-table-column :label="$t('SystemManage.DepartManage.user_table_status')" align="center">
 						<template slot-scope="scope">
-							<span :style="{color:scope.row.Enabled===0?'#FF0000':null}">{{scope.row.Enabled===0?'禁用':'启用'}}</span>
+							<span :style="{color:scope.row.Enabled===0?'#FF0000':null}">{{scope.row.Enabled===0?$t('SystemManage.DepartManage.user_table_status_ban'):$t('SystemManage.DepartManage.user_table_status_open')}}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="操作" align="center" width="300" fixed="right">
+					<el-table-column :label="$t('Table.column_operations')" align="center" width="300" fixed="right">
 						<template slot-scope="scope">
-							<div style="color:#4099ef; font-size:24px;display: flex;gap:0 10px;">
+							<div style="color:#4099ef; font-size:24px;display: flex;gap:0 10px;flex-wrap: wrap">
 								<span  v-permission="permissionBtn.sysDepartPermission.sysDepart_saveUser"
-									class="editsty" @click.stop="editUser(scope.row)">编辑</span>
+									class="editsty" @click.stop="editUser(scope.row)">{{$t('Table.edit_btn')}}</span>
 								<span v-permission="permissionBtn.sysDepartPermission.sysDepart_resetPass"
-									class="editsty" @click.stop="resetPassWord(scope.row)">重置密码</span>
+									class="editsty" @click.stop="resetPassWord(scope.row)">{{$t('SystemManage.DepartManage.user_table_reset_pwd')}}</span>
 								<span v-permission="permissionBtn.sysDepartPermission.sysDepart_moveGroup"
-									class="editsty" @click.stop="moveDepart(scope.row)">移动分组</span>
+									class="editsty" @click.stop="moveDepart(scope.row)">{{$t('SystemManage.DepartManage.user_table_move_group')}}</span>
 								<span v-permission="permissionBtn.sysDepartPermission.sysDepart_enable"
 									class="editsty" 
 									@click.stop="handleChangeStatus(scope.row)"
-								>{{scope.row.Enabled===0?'启用':'禁用'}}</span>
+								>{{scope.row.Enabled===0?$t('SystemManage.DepartManage.user_table_status_open'):$t('SystemManage.DepartManage.user_table_status_ban')}}</span>
 								<span v-permission="permissionBtn.sysDepartPermission.sysDepart_del"
-									class="deletesty" @click.stop="delUser(scope.row)">删除</span>
+									class="deletesty" @click.stop="delUser(scope.row)">{{$t('Table.delete_btn')}}</span>
 							</div>
 						</template>
 					</el-table-column>
 					<div slot="empty" style="lineHeight:25px;margin:20px 0;color:#95A9C5;">
-						<tableNoData text="暂无数据" size="mini"/>
+						<tableNoData :text="$t('Table.prompt_slogan')" size="mini"/>
 					</div>
 				</el-table>
 				<el-col :span="24" class="toolbar">
@@ -157,46 +157,46 @@
 						</div>
 						<ul class="shadow_info">
 							<li class="info_item">
-								<h4 class="item_tit">手机号：</h4>
+								<h4 class="item_tit">{{$t('SystemManage.DepartManage.user_table_mobile')}}：</h4>
 								<span>{{userObj.tel}}</span>
 							</li>
 							<li class="info_item">
-								<h4 class="item_tit">部门/分组：</h4>
+								<h4 class="item_tit">{{$t('SystemManage.DepartManage.user_table_depart')}}：</h4>
 								<span>{{userObj.depart}}</span>
 							</li>
 							<li class="info_item">
-								<h4 class="item_tit">工号：</h4>
+								<h4 class="item_tit">{{$t('SystemManage.DepartManage.user_table_employee_id')}}：</h4>
 								<span>{{userObj.employeeNumber}}</span>
 							</li>
 							<li class="info_item">
-								<h4 class="item_tit">职务：</h4>
+								<h4 class="item_tit">{{$t('SystemManage.DepartManage.user_table_position')}}：</h4>
 								<span>{{userObj.post}}</span>
 							</li>
 							<li class="info_item">
-								<h4 class="item_tit">角色：</h4>
+								<h4 class="item_tit">{{$t('SystemManage.DepartManage.user_table_role')}}：</h4>
 								<span>{{userObj.role}}</span>
 							</li>
 							<li v-permission="permissionBtn.sysDepartPermission.sysDepart_saveUser_researchGroup"
 								class="info_item" v-if="userObj.depart.includes('FICC研究部')">
-								<h4 class="item_tit">研究方向：</h4>
+								<h4 class="item_tit">{{$t('SystemManage.DepartManage.user_table_direct')}}：</h4>
 								<span>{{userObj.direct.map(i=>i.join('/')).join('、')||'暂无'}}</span>
 							</li>
 							<li class="info_item">
-								<h4 class="item_tit">工作地点：</h4>
+								<h4 class="item_tit">{{$t('SystemManage.DepartManage.user_table_address')}}：</h4>
 								<span>{{userObj.city?userObj.province+' '+userObj.city:'暂无'}}</span>
 							</li>
 							<li class="info_item">
-								<h4 class="item_tit">管理权限：</h4>
+								<h4 class="item_tit">{{$t('SystemManage.DepartManage.user_table_manage_auth')}}：</h4>
 								<span>{{userObj.auth||'暂无'}}</span>
 							</li>
 							<li class="info_item">
-								<h4 class="item_tit">登录账号/密码：</h4>
+								<h4 class="item_tit">{{$t('SystemManage.DepartManage.user_table_login_text')}}：</h4>
 								<span>{{userObj.account+'/***'}}</span>
 							</li>
 						</ul>
 						<el-popover
 							placement="left"
-							:title="userObj.name+'权限'"
+							:title="userObj.name+$t('SystemManage.DepartManage.auth_text')"
 							width="560"
 							trigger="hover">
 							<div class="auth_cont" style="padding:30px 0;max-height: 70vh; overflow-y: auto;">
@@ -210,9 +210,9 @@
 										</div>
 									</div>
 								</template>
-								<span v-else style="fontSize:16px;color:#999;marginLeft:20px;">暂无权限</span>
+								<span v-else style="fontSize:16px;color:#999;marginLeft:20px;">{{$t('SystemManage.DepartManage.no_auth')}}</span>
 							</div>
-							<span slot="reference" style="fontSize:16px;color:#409EFF;cursior:pointer;">查看权限</span>
+							<span slot="reference" style="fontSize:16px;color:#409EFF;cursior:pointer;">{{$t('SystemManage.DepartManage.look_auth')}}</span>
 						</el-popover>
 						<img src="~@/assets/img/ppt_m/close.png" alt="" class="close_btn" @click="closeShadow">
 					</div>
@@ -230,17 +230,17 @@
 		width="30%"
 		v-dialogDrag>
 			<div slot="title" style="display:flex;alignItems:center;">
-				<img :src="departForm.title=='新建部门'?$icons.add:$icons.edit" style="color:#fff;width:16px;height:16px;marginRight:5px;">
+				<img :src="!departForm.depart_id?$icons.add:$icons.edit" style="color:#fff;width:16px;height:16px;marginRight:5px;">
 				<span style="fontSize:16px;">{{departForm.title}}</span>
 			</div>
-			<el-form :model="departForm" :rules="departRule" ref="departForm" label-width="100px" class="demo-ruleForm" style="marginTop:15px;">
-				<el-form-item label="部门" prop="name">
-					<el-input v-model="departForm.name" placeholder="请填写部门名称" style="width: 90%"></el-input>
+			<el-form :model="departForm" :rules="departRule" ref="departForm" label-width="120px" class="demo-ruleForm" style="marginTop:15px;">
+				<el-form-item :label="$t('SystemManage.DepartManage.depart')" prop="name">
+					<el-input v-model="departForm.name" :placeholder="$t('SystemManage.DepartManage.depart_name_placeholder')" style="width: 90%"></el-input>
 				</el-form-item>
 			</el-form>	
 			<div style="display:flex;justify-content:center;margin:75px 0 26px;">
-				<el-button type="primary" style="width:80px;marginRight:24px;" @click="saveDepart">保存</el-button>
-				<el-button  style="width:80px;" @click="cancelHandle(1)">取消</el-button>
+				<el-button type="primary" style="width:80px;marginRight:24px;" @click="saveDepart">{{$t('Dialog.confirm_save_btn')}}</el-button>
+				<el-button  style="width:80px;" @click="cancelHandle(1)">{{$t('Dialog.cancel_btn')}}</el-button>
 			</div>
 		</el-dialog>
 		<!-- 添加分组弹窗 -->
@@ -254,14 +254,14 @@
 		width="30%"
 		v-dialogDrag>
 			<div slot="title" style="display:flex;alignItems:center;">
-				<img :src="groupForm.title=='添加分组'?$icons.add:$icons.edit" style="color:#fff;width:16px;height:16px;marginRight:5px;">
+				<img :src="groupForm.title==$t('SystemManage.DepartManage.group_add')?$icons.add:$icons.edit" style="color:#fff;width:16px;height:16px;marginRight:5px;">
 				<span style="fontSize:16px;">{{groupForm.title}}</span>
 			</div>
-			<el-form @submit.native.prevent :model="groupForm" :rules="groupRule" ref="groupForm" label-width="100px" class="demo-ruleForm" style="marginTop:15px;">
-				<el-form-item label="部门" prop="depart">
+			<el-form @submit.native.prevent :model="groupForm" :rules="groupRule" ref="groupForm" label-width="110px" class="demo-ruleForm" style="marginTop:15px;">
+				<el-form-item :label="$t('SystemManage.DepartManage.depart')" prop="depart">
 					<span style="fontSize:16px;">{{groupForm.depart}}</span>
 				</el-form-item>
-				<el-form-item label="分组" prop="group">
+				<el-form-item :label="$t('SystemManage.DepartManage.group')" prop="group">
 					<el-tag
 					:key="tag"
 					v-for="tag in groupForm.group"
@@ -274,7 +274,7 @@
 					class="input-new-tag"
 					v-if="inputVisible"
 					v-model="inputValue"
-					placeholder="分组名"
+					:placeholder="$t('SystemManage.DepartManage.group_name')"
 					ref="saveTagInput"
 					size="small"
 					style="width:120px"
@@ -282,17 +282,17 @@
 					@blur="handleInputConfirm"
 					>
 					</el-input>
-					<el-button v-else class="button-new-tag" size="small" @click="showInput">+添加分组</el-button>
+					<el-button v-else class="button-new-tag" size="small" @click="showInput">+{{$t('SystemManage.DepartManage.group_add')}}</el-button>
 				</el-form-item>
 			</el-form>	
 			<div style="display:flex;justify-content:center;margin:75px 0 26px;">
-				<el-button type="primary" style="width:80px;marginRight:24px;" @click="saveGroup">保存</el-button>
-				<el-button  style="width:80px;" @click="cancelHandle(2)">取消</el-button>
+				<el-button type="primary" style="width:80px;marginRight:24px;" @click="saveGroup">{{$t('Dialog.confirm_save_btn')}}</el-button>
+				<el-button  style="width:80px;" @click="cancelHandle(2)">{{$t('Dialog.cancel_btn')}}</el-button>
 			</div>
 		</el-dialog>
 		<!-- 编辑分组 -->
 		<el-dialog
-		title="编辑分组"
+		:title="$t('SystemManage.DepartManage.group_edit')"
 		:visible.sync="isEditGroup"
 		:close-on-click-modal="false"
 		:modal-append-to-body='false'
@@ -301,7 +301,7 @@
 		width="30%">
 			<div slot="title" style="display:flex;alignItems:center;">
 				<img :src="$icons.edit" style="color:#fff;width:16px;height:16px;marginRight:5px;">
-				<span style="fontSize:16px;">编辑分组</span>
+				<span style="fontSize:16px;">{{$t('SystemManage.DepartManage.group_edit')}}</span>
 			</div>
 			<el-form :model="editGroupForm"  ref="editGroupForm" label-width="100px" class="demo-ruleForm" style="marginTop:15px;">
 				<!-- <el-form-item label="部门" prop="depart">
@@ -314,13 +314,13 @@
 						</el-option>
 					</el-select>
 				</el-form-item> -->
-				<el-form-item label="分组" prop="group">
-					<el-input v-model="editGroupForm.group" placeholder="请填写分组名称" style="width: 90%"></el-input>
+				<el-form-item :label="$t('SystemManage.DepartManage.group')" prop="group">
+					<el-input v-model="editGroupForm.group" :placeholder="$t('SystemManage.DepartManage.group_name_placeholder')" style="width: 90%"></el-input>
 				</el-form-item>
 			</el-form>	
 			<div style="display:flex;justify-content:center;margin:75px 0 26px;">
-				<el-button type="primary" style="width:80px;marginRight:24px;" @click="editGroupOver">保存</el-button>
-				<el-button  style="width:80px;" @click="cancelHandle(4)">取消</el-button>
+				<el-button type="primary" style="width:80px;marginRight:24px;" @click="editGroupOver">{{$t('Dialog.confirm_save_btn')}}</el-button>
+				<el-button  style="width:80px;" @click="cancelHandle(4)">{{$t('Dialog.cancel_btn')}}</el-button>
 			</div>
 		</el-dialog>
 		<!-- 添加用户弹窗 -->
@@ -340,33 +340,33 @@
 		<!-- 重置密码 -->
 		<el-dialog
 			class="custom-dialog"
-			title="重置密码"
+			:title="$t('SystemManage.DepartManage.user_table_reset_pwd')"
 			:visible.sync="isResetPasswordShow"
 			:close-on-click-modal="false" 
 			:modal-append-to-body="false"
-			@close="isResetPasswordShow=false" center width="460px" v-dialogDrag
+			@close="isResetPasswordShow=false" center width="560px" v-dialogDrag
 		>
 			<div class="dialog-container">
-				<el-form ref="resetForm" :model="resetForm" :rules="resetRules" label-width="100px">
-					<el-form-item label="账号">
+				<el-form ref="resetForm" :model="resetForm" :rules="resetRules" label-width="155px">
+					<el-form-item :label="$t('SystemManage.DepartManage.user_table_account')">
 						<span>{{modifyAdminName}}</span>
 					</el-form-item>
-					<el-form-item label="新密码" prop="password">
+					<el-form-item :label="$t('SystemManage.DepartManage.new_pwd')" prop="password">
 						<el-input v-model="resetForm.password" style="width:100%" :show-password="true"></el-input>
 					</el-form-item>
-					<el-form-item label="确认新密码" prop="check" style="margin-bottom: 40px;">
+					<el-form-item :label="$t('SystemManage.DepartManage.confirm_pwd')" prop="check" style="margin-bottom: 40px;">
 						<el-input v-model="resetForm.check" style="width:100%" :show-password="true"></el-input>
 					</el-form-item>
 				</el-form>
 				<div style="display:flex;justify-content:center;margin:26px 0">
-					<el-button type="primary" style="width:80px;margin-right:24px;" @click="resetPassWord(_,'execute')">保存</el-button>
-					<el-button style="width:80px;" @click="isResetPasswordShow=false">取消</el-button>
+					<el-button type="primary" style="width:80px;margin-right:24px;" @click="resetPassWord(_,'execute')">{{$t('Dialog.confirm_save_btn')}}</el-button>
+					<el-button style="width:80px;" @click="isResetPasswordShow=false">{{$t('Dialog.cancel_btn')}}</el-button>
 				</div>
 			</div>
 		</el-dialog>
 		<!-- 移动分组 -->
 		<el-dialog
-			title="移动分组"
+			:title="$t('SystemManage.DepartManage.user_table_move_group')"
 			:visible.sync="isMoveDepartShow"
 			:close-on-click-modal="false" 
 			:modal-append-to-body="false"
@@ -374,18 +374,18 @@
 		>
 			<div class="dialog-cotainer">
 				<div class="form-item" style="display: flex;align-items: center;margin-bottom:20px">
-					<p style="width:90px">账号</p>
+					<p style="width:120px">{{$t('SystemManage.DepartManage.user_table_account')}}</p>
 					<span>{{modifyAdminName}}</span>
 				</div>
 				<div class="form-item" style="display: flex;align-items: center;">
-					<p style="width:90px">选择分组</p>
+					<p style="width:120px">{{$t('SystemManage.DepartManage.group_select')}}</p>
 					<el-cascader :options="departArr" v-model="resetDepart" :props="form_departProp" style="width:100%"
-						placeholder="请选择部门分组">
+						:placeholder="$t('SystemManage.DepartManage.group_select_placeholer')">
 					</el-cascader>
 				</div>
 				<div style="display:flex;justify-content:center;margin:26px 0">
-					<el-button type="primary" style="width:80px;margin-right:24px;" @click="moveDepart(_,'execute')">保存</el-button>
-					<el-button style="width:80px;" @click="isMoveDepartShow=false">取消</el-button>
+					<el-button type="primary" style="width:80px;margin-right:24px;" @click="moveDepart(_,'execute')">{{$t('Dialog.confirm_save_btn')}}</el-button>
+					<el-button style="width:80px;" @click="isMoveDepartShow=false">{{$t('Dialog.cancel_btn')}}</el-button>
 				</div>
 			</div>
 		</el-dialog>
@@ -770,7 +770,7 @@ export default {
 					DepartmentId:data.DepartmentId
 				}).then(res =>{
 					if(res.Ret === 200) {
-						this.$message.success('删除部门成功')
+						this.$message.success(this.$t('SystemManage.DepartManage.depart_del_success'))
 						this.getDepartArr();
 					}
 				})
@@ -780,7 +780,7 @@ export default {
 					GroupId:data.DepartmentId
 				}).then(res =>{
 					if(res.Ret === 200) {
-						this.$message.success('删除分组成功')
+						this.$message.success(this.$t('SystemManage.DepartManage.group_del_success'))
 						this.getDepartArr();
 					}
 				})
@@ -789,7 +789,7 @@ export default {
 					TeamId:data.DepartmentId
 				}).then(res =>{
 					if(res.Ret === 200) {
-						this.$message.success('删除成功')
+						this.$message.success(this.$t('MsgPrompt.delete_msg'))
 						this.getDepartArr();
 					}
 				})
@@ -800,7 +800,7 @@ export default {
 			if(data.IsDepartment) {
 				this.isAddDepart = true;
 				this.departForm = {
-					title:"编辑部门",
+					title:this.$t('SystemManage.DepartManage.depart_edit'),
 					name:data.DepartmentName,
 					depart_id:data.DepartmentId
 				}
@@ -830,7 +830,7 @@ export default {
 				GroupName:this.editGroupForm.group,
 			})
 			if(res.Ret === 200) {
-					this.$message.success('编辑成功')
+					this.$message.success(this.$t('MsgPrompt.edit_msg'))
 					this.isEditGroup = false;
 					this.editGroupForm = {
 						group_id:'',
@@ -844,7 +844,7 @@ export default {
 			if(data.IsDepartment) {
 				this.isAddGroup = true;
 				this.groupForm = {
-					title:"添加分组",
+					title:this.$t('SystemManage.DepartManage.group_add'),
 					depart:data.DepartmentName,
 					depart_id:data.DepartmentId,
 					group:data.Child||[]
@@ -853,7 +853,7 @@ export default {
 				console.log(data);
 				this.isAddGroup = true;
 				this.groupForm = {
-					title:"添加分组",
+					title:this.$t('SystemManage.DepartManage.group_add'),
 					depart:data.DepartmentName,
 					depart_id:data.TopId,
 					group_id:data.DepartmentId,
@@ -902,10 +902,10 @@ export default {
 						GroupName:groupArr.join(',')
 					})
 						if(res.Ret === 200) {
-							this.$message.success('添加成功')
+							this.$message.success(this.$t('MsgPrompt.add_msg'))
 							this.isAddGroup = false;
 							this.groupForm = {
-								title:"添加分组",
+								title:this.$t('SystemManage.DepartManage.group_add'),
 								depart:'',
 								group:[],
 								depart_id:'',
@@ -919,7 +919,7 @@ export default {
 		addDepart() {
 			this.isAddDepart = true;
 			this.departForm = {
-				title:'新建部门',
+				title:this.$t('SystemManage.DepartManage.depart_create'),
 				name:''
 			}
 		},
@@ -928,15 +928,15 @@ export default {
 			this.$refs.departForm.validate((valid) => {
 				if (valid) {
 					// alert('submit!');
-					if(this.departForm.title == '新建部门') {
+					if(!this.departForm.depart_id) {
 						departInterence.addDepart({
 							DepartmentName:this.departForm.name
 						}).then(res => {
 							if(res.Ret === 200) {
-								this.$message.success('新建成功')
+								this.$message.success(this.$t('MsgPrompt.add_msg'))
 								this.isAddDepart = false;
 								this.departForm = {
-									title:'新建部门',
+									title:this.$t('SystemManage.DepartManage.depart_create'),
 									name:''
 								}
 								this.getDepartArr();
@@ -948,10 +948,10 @@ export default {
 							DepartmentName:this.departForm.name
 						}).then(res => {
 							if(res.Ret === 200) {
-								this.$message.success('编辑成功')
+								this.$message.success(this.$t('MsgPrompt.edit_msg'))
 								this.isAddDepart = false;
 								this.departForm = {
-									title:'新建部门',
+									title:this.$t('SystemManage.DepartManage.depart_create'),
 									name:''
 								}
 								this.getDepartArr();
@@ -971,7 +971,7 @@ export default {
 			this.isAddUser = true;
 			this.hasEmployeeNo=false
 			this.userForm = {
-				title:'添加用户',
+				title:this.$t('SystemManage.DepartManage.user_add_btn'),
 				account:'',
 				pwd:'',
 				employeeNumber:'',
@@ -1023,7 +1023,7 @@ export default {
 			this.$refs.addUserDialog.$refs.userForm.validate((valid) => {
 				if (valid) {
 					/* 新增 */
-					if(this.userForm.title == '添加用户') {				
+					if(this.userForm.title == this.$t('SystemManage.DepartManage.user_add_btn')) {				
 						let params = {
 							AdminName: this.userForm.account,
 							Password: new http.Base64().encode(this.userForm.pwd),
@@ -1049,7 +1049,7 @@ export default {
 								this.$message.success(res.Msg);
 								this.isAddUser = false;
 								this.userForm = {
-									title:'添加用户',
+									title:this.$t('SystemManage.DepartManage.user_add_btn'),
 									account:'',
 									pwd:'',
 									employeeNumber:'',
@@ -1098,10 +1098,10 @@ export default {
 						//console.log('testEdit',params)
 						departInterence.editUser(params).then(res => {
 							if(res.Ret === 200) {
-								this.$message.success('编辑成功');
+								this.$message.success(this.$t('MsgPrompt.edit_msg'));
 								this.isAddUser = false;
 								this.userForm = {
-									title:'添加用户',
+									title:this.$t('SystemManage.DepartManage.user_add_btn'),
 									account:'',
 									pwd:'',
 									employeeNumber:'',
@@ -1133,7 +1133,7 @@ export default {
 				this.isAddDepart = false;
 			}else if(type === 2) {
 				this.groupForm = {
-					title:"添加分组",
+					title:this.$t('SystemManage.DepartManage.group_add'),
 					depart:'',
 					depart_id:'',
 					group:[],
@@ -1142,7 +1142,7 @@ export default {
 				this.isAddGroup = false;
 			}else if(type === 3) {
 				this.userForm = {
-					title:'添加用户',
+					title:this.$t('SystemManage.DepartManage.user_add_btn'),
 					account:'',
 					pwd:'',
 					employeeNumber:'',
@@ -1235,7 +1235,7 @@ export default {
 				this.isExtraUserFormItemShow = false
 			} */
 			this.userForm = {
-				title:'编辑用户',
+				title:this.$t('SystemManage.DepartManage.user_edit_btn'),
 				admin_id:item.AdminId,
 				account:item.AdminName,
 				pwd:item.Password,
@@ -1262,14 +1262,14 @@ export default {
 		},
 		/* 删除用户 */
 		delUser(item) {
-			this.$confirm(`是否确认删除用户【${item.AdminName}】`,'提示',{
+			this.$confirm(`${this.$t('SystemManage.DepartManage.del_msg')}【${item.AdminName}】`,this.$t('Confirm.prompt'),{
 				type:'warning'
 			}).then(() => {
 				departInterence.delUser({
 					AdminId:item.AdminId
 				}).then(res => {
 					if(res.Ret === 200) {
-						this.$message.success('删除成功')
+						this.$message.success(this.$t('MsgPrompt.delete_msg'))
 						this.getTableUser();
 					}
 				})

src/views/system_manage/mixin/departManageMixin.js

@@ -173,7 +173,7 @@ export default {
             }
             departInterence.sortDepart(params).then(res=>{
                 if(res.Ret!==200) return 
-                this.$message.success('移动排序成功')
+                this.$message.success(this.$t('MsgPrompt.move_sort_success'))
                 this.getDepartArr()
             })
         },

src/views/system_manage/newAuthManage.vue

@@ -2,21 +2,21 @@
     <div class="authManage_container">
         <div class="auth_cont_top">
             <div>
-                <span>角色：</span>
+                <span>{{$t('SystemManage.RoleManage.role_name')}}：</span>
                 <span>{{Role.RoleName}}</span>
                 <!-- <el-select v-model="role" placeholder="请选择角色" style="width:360px;marginLeft:30px;">
                     <el-option v-for="item in roleList" :key="item.RoleId" :label="item.RoleName" :value="item.RoleId">
                     </el-option>
                 </el-select> -->
             </div>
-            <el-button style="margin-left:auto;marginRight:50px;width:140px;" @click="$router.back()" v-if="!isLook">取消
+            <el-button style="margin-left:auto;marginRight:50px;width:140px;" @click="$router.back()" v-if="!isLook">{{$t('Dialog.cancel_btn')}}
             </el-button>
-            <el-button type="primary" style="marginRight:50px;width:140px;" @click="saveAuth" v-if="!isLook">保存
+            <el-button type="primary" style="marginRight:50px;width:140px;" @click="saveAuth" v-if="!isLook">{{$t('Dialog.confirm_save_btn')}}
             </el-button>
         </div>
         <div class="auth_bot">
             <div class="menu_auth_cont">
-                <h3 style="color:#333;fontSize:14px;">权限设置</h3>
+                <h3 style="color:#333;fontSize:14px;">{{$t('SystemManage.RoleManage.permission_set')}}</h3>
                 <div class="auth-wrap">
                     <el-tree ref="checkboxTree" :data="authList" :props="{label:'Name',children:'Children',disabled:'Disabled'}"
                         :default-expand-all="false" show-checkbox node-key="MenuId"
@@ -103,7 +103,7 @@ export default {
             const keys = this.$refs.checkboxTree.getCheckedKeys()
             const halfKeys = this.$refs.checkboxTree.getHalfCheckedKeys()
             if(!keys.length&&!halfKeys.length){
-                this.$message.warning('请至少选择一个权限')
+                this.$message.warning(this.$t('SystemManage.RoleManage.set_permission_msg01'))
                 return
             }
             const ChoiceList = Array.from(new Set([...keys,...halfKeys]))
@@ -113,7 +113,7 @@ export default {
                 HalfMenuIds:halfKeys
             }).then(res=>{
                 if(res.Ret!==200) return 
-                this.$message.success('权限设置成功')
+                this.$message.success(this.$t('SystemManage.RoleManage.set_permission_success'))
                 this.$router.back()
             })
         },

src/views/system_manage/operateAuthManage.vue

@@ -10,7 +10,7 @@
         <div v-if="authTabs.length">
             <el-input 
             v-model="searchForm.key_word" 
-            :placeholder="default_tab === 5 ? '请输入图表名称' : '请输入指标Id/指标名称'" 
+            :placeholder="default_tab === 5 ? this.$t('SystemManage.OperateAuth.placeholder01') : this.$t('SystemManage.OperateAuth.placeholder02')" 
             style="width: 300px;margin-right:20px;"
             @change="changeUser"
             clearable
@@ -35,7 +35,7 @@
             clearable
             filterable
             @change="changeUser"
-            placeholder="请选择分类" 
+            :placeholder="this.$t('SystemManage.OperateAuth.placeholder03')" 
             style="width: 250px;"
           />
           <el-cascader
@@ -52,15 +52,15 @@
             clearable
             @change="changeUser"
             filterable
-            placeholder="请选择用户" 
+            :placeholder="this.$t('SystemManage.OperateAuth.placeholder04')" 
             style="margin: 0 20px"
           />
         </div>
         <div>
           <el-button type="primary" @click="editAuthHandle({},'multiple')" 
-          v-if="[3,4].includes(default_tab)?authBtn('edit'):authTabs.length">批量编辑</el-button>
+          v-if="[3,4].includes(default_tab)?authBtn('edit'):authTabs.length">{{$t('SystemManage.OperateAuth.btn_text01')}}</el-button>
           <el-button type="primary" @click="edbAuthSetHandle({},'multiple')" v-if="[3,4].includes(default_tab
-        )&&authBtn('auth')">权限设置</el-button>
+        )&&authBtn('auth')">{{$t('SystemManage.OperateAuth.btn_text02')}}</el-button>
         </div>
     </div>
      <el-table
@@ -97,7 +97,7 @@
         </el-table-column>
         
         <div slot="empty" style="padding: 100px 0">
-          <tableNoData text="暂无数据" size="mini"/>
+          <tableNoData :text="$t('Table.prompt_slogan')" size="mini"/>
 				</div>
     </el-table>
     <el-col :span="24" style="height:35px;text-align: right;float: none;">
@@ -126,10 +126,10 @@
           :rules="dialogFormRules"
           @close="cancelDialogHandle"
         >
-          <el-form-item label="原创建人">
+          <el-form-item :label="$t('SystemManage.OperateAuth.original_creator')">
             <span>{{ dialogForm.old_user_name }}</span>
           </el-form-item>
-          <el-form-item label="新创建人" prop="new_user">
+          <el-form-item :label="$t('SystemManage.OperateAuth.new_creator')" prop="new_user">
             <el-cascader
               v-model="dialogForm.new_user"
               :options="userList"
@@ -143,7 +143,7 @@
               :show-all-levels="false"
               clearable
               filterable
-              placeholder="请选择用户" 
+              :placeholder="$t('SystemManage.OperateAuth.placeholder04')" 
               style="width: 250px"
             />
           </el-form-item>
@@ -154,10 +154,10 @@
           type="primary"
           style="margin-right: 60px"
           @click="saveHandle"
-          >保存</el-button
+          >{{$t('Dialog.confirm_save_btn')}}</el-button
         >
         <el-button type="primary" plain @click="cancelDialogHandle"
-          >取消</el-button
+          >{{$t('Dialog.cancel_btn')}}</el-button
         >
       </div>
     </m-dialog>
@@ -184,15 +184,15 @@ export default {
   computed: {
     tableColums() {
       return this.default_tab === 5 ? [
-        { label: '图表名称',key: 'Name' },
-        { label: '图分类',key: 'ClassifyName' },
-        { label: '创建人',key: 'CreateUserName' },
-        { label: '操作',key: 'handle' },
+        { label: this.$t('SystemManage.OperateAuth.table_col_name01'),key: 'Name' },
+        { label: this.$t('SystemManage.OperateAuth.table_col_name02'),key: 'ClassifyName' },
+        { label: this.$t('SystemManage.OperateAuth.table_col_name03'),key: 'CreateUserName' },
+        { label: this.$t('Table.column_operations'),key: 'handle' },
       ] : [
-        { label: '指标ID',key: 'Code' },
-        { label: '指标名称',key: 'Name' },
-        { label: '创建人',key: 'CreateUserName' },
-        { label: '操作',key: 'handle' },
+        { label: this.$t('SystemManage.OperateAuth.table_col_name04'),key: 'Code' },
+        { label: this.$t('SystemManage.OperateAuth.table_col_name05'),key: 'Name' },
+        { label: this.$t('SystemManage.OperateAuth.table_col_name03'),key: 'CreateUserName' },
+        { label: this.$t('Table.column_operations'),key: 'handle' },
       ]
     },
     //权限配置化后的tabs
@@ -214,17 +214,26 @@ export default {
         }
         return temp
     },
+    tabs(){
+      return [
+        { label: this.$t('SystemManage.OperateAuth.tab01'), key: 1 },
+        { label: this.$t('SystemManage.OperateAuth.tab02'), key: 2 },
+        { label: this.$t('SystemManage.OperateAuth.tab03'), key: 3 },
+        { label: this.$t('SystemManage.OperateAuth.tab04'), key: 4 },
+        { label: this.$t('SystemManage.OperateAuth.tab05'), key: 5 }
+      ]
+    }
   },
   data() {
     return {
       default_tab: 1,
-      tabs:[
-        { label: '手工数据指标', key: 1 },
-        { label: '钢联化工数据库', key: 2 },
-        { label: 'ETA指标库', key: 3 },
-        { label: 'ETA预测指标', key: 4 },
-        { label: '图库', key: 5 }
-      ],
+      // tabs:[
+      //   { label: '手工数据指标', key: 1 },
+      //   { label: '钢联化工数据库', key: 2 },
+      //   { label: 'ETA指标库', key: 3 },
+      //   { label: 'ETA预测指标', key: 4 },
+      //   { label: '图库', key: 5 }
+      // ],
       selectedArr: [],//多选数组
       tableLoading: false,
       tableData:[],
@@ -341,10 +350,10 @@ export default {
 
     /* 编辑 */
     editAuthHandle({DataId,CreateUserName,},type='single') {
-      if(type === 'multiple' && !this.selectedArr.length) return this.$message.warning('请至少勾选一个')
+      if(type === 'multiple' && !this.selectedArr.length) return this.$message.warning(this.$t('SystemManage.OperateAuth.msg01'))
 
       this.dialogForm = {
-        title: type === 'multiple' ? '批量编辑权限' : '编辑权限',
+        title: type === 'multiple' ? this.$t('SystemManage.OperateAuth.edit_title02') : this.$t('SystemManage.OperateAuth.edit_title01'),
         old_user_name: type === 'multiple' ? this.selectedArr[0].CreateUserName : CreateUserName,
         ids: type === 'multiple' ? this.selectedArr.map(_ => _.DataId) : [DataId],
         new_user: ''
@@ -369,11 +378,11 @@ export default {
 
     /* 指标权限配置 */
     edbAuthSetHandle({DataId,CreateUserId},type='') {
-      if(type === 'multiple' && !this.selectedArr.length) return this.$message.warning('请至少勾选一个')
+      if(type === 'multiple' && !this.selectedArr.length) return this.$message.warning(this.$t('SystemManage.OperateAuth.msg01'))
       if(type === 'multiple' && this.selectedArr.some(_ => this.selectedArr[0].CreateUserId!==_.CreateUserId)) return this.$message.warning('所选指标创建人不是同一用户，请重新选择！')
 
       this.edbForm = {
-        title: type === 'multiple' ? '批量权限设置' : '权限设置',
+        title: type === 'multiple' ? this.$t('SystemManage.OperateAuth.permission_title02') : this.$t('SystemManage.OperateAuth.permission_title01'),
         createId: type === 'multiple' ? this.selectedArr[0].CreateUserId : CreateUserId,
         ids: type === 'multiple' ? this.selectedArr.map(_ => _.DataId) : [DataId],
       }