Pārlūkot izejas kodu

Merge branch 'lang_dev' into lang_db

bding 1 gadu atpakaļ
vecāks
revīzija
e875332a83
37 mainītis faili ar 1468 papildinājumiem un 450 dzēšanām
  1. 2 0
      src/App.vue
  2. 37 0
      src/lang/commonLang.js
  3. 3 0
      src/lang/en.js
  4. 17 0
      src/lang/modules/EtaBase/En.js
  5. 17 0
      src/lang/modules/EtaBase/Zh.js
  6. 150 0
      src/lang/modules/EtaBase/commonLang.js
  7. 6 0
      src/lang/modules/EtaChart/En.js
  8. 6 0
      src/lang/modules/EtaChart/Zh.js
  9. 42 0
      src/lang/modules/EtaChart/commonLang.js
  10. 122 0
      src/lang/modules/systemManage/BaseConfig.js
  11. 35 0
      src/lang/modules/systemManage/DataAuth.js
  12. 49 0
      src/lang/modules/systemManage/DataSourceAccount.js
  13. 169 0
      src/lang/modules/systemManage/DepartManage.js
  14. 31 0
      src/lang/modules/systemManage/EnAuthSet.js
  15. 79 0
      src/lang/modules/systemManage/OperateAuth.js
  16. 31 0
      src/lang/modules/systemManage/OutLinkConfig.js
  17. 6 0
      src/lang/modules/systemManage/RoleManage.js
  18. 23 0
      src/lang/modules/systemManage/indexEn.js
  19. 22 0
      src/lang/modules/systemManage/indexZh.js
  20. 3 0
      src/lang/zh.js
  21. 1 1
      src/views/dataEntry_manage/databaseComponents/edbDetailData.vue
  22. 35 35
      src/views/dataEntry_manage/databaseList.vue
  23. 64 21
      src/views/dataSource_manage/accountList.vue
  24. 12 12
      src/views/dataSource_manage/components/EditAccount.vue
  25. 109 52
      src/views/system_manage/components/addUserDialog.vue
  26. 11 11
      src/views/system_manage/components/authDialog.vue
  27. 26 17
      src/views/system_manage/components/authSetDialog.vue
  28. 28 28
      src/views/system_manage/components/smartReportImgSet.vue
  29. 9 9
      src/views/system_manage/components/targetClasifyDialog.vue
  30. 7 7
      src/views/system_manage/dataAuthManage.vue
  31. 94 94
      src/views/system_manage/departManage.vue
  32. 97 53
      src/views/system_manage/enAuthManage.vue
  33. 60 54
      src/views/system_manage/etaBaseConfig.vue
  34. 1 1
      src/views/system_manage/mixin/departManageMixin.js
  35. 6 6
      src/views/system_manage/newAuthManage.vue
  36. 39 30
      src/views/system_manage/operateAuthManage.vue
  37. 19 19
      src/views/system_manage/outlinkListConfig.vue

+ 2 - 0
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;

+ 37 - 0
src/lang/commonLang.js

@@ -1,3 +1,6 @@
+import Edb from './modules/EtaBase/commonLang';
+import Chart from './modules/EtaChart/commonLang';
+
 // 通用文字翻译
 export default {
   Dialog: {
@@ -17,6 +20,10 @@ export default {
       en: "Return",
       zh: "返回",
     },
+    set_btn:{
+      en:"Set",
+      zh:'设置'
+    },
   },
   Table: {
     add_btn: {
@@ -159,11 +166,41 @@ 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:'移动排序成功'
+    },
+    confirm_del_msg:{
+      en:'Are you sure you want to delete?',
+      zh:'确定要删除吗?'
+    },
+    set_success_msg:{
+      en:'Setting Successful',
+      zh:'设置成功'
+    }
   },
   Common: {
     category: {
       en: "categories",
       zh: "分类",
     },
+    all_select:{
+      en:'Select All',
+      zh:'全选'
+    },
+    enable:{
+      en:'Enable',
+      zh:'启用'
+    },
+    disable:{
+      en:'Disable',
+      zh:'禁用'
+    }
   },
+  Edb,
+  Chart
 };

+ 3 - 0
src/lang/en.js

@@ -19,4 +19,7 @@ export default {
   Confirm: transformLanguageData(commonLang.Confirm, "en"),
   Table: transformLanguageData(commonLang.Table, "en"),
   MsgPrompt: transformLanguageData(commonLang.MsgPrompt, "en"),
+  Common:transformLanguageData(commonLang.Common,'en'),
+  Edb: transformLanguageData(commonLang.Edb, "en"),
+  Chart: transformLanguageData(commonLang.Chart, "en"),
 };

+ 17 - 0
src/lang/modules/EtaBase/En.js

@@ -0,0 +1,17 @@
+/* 指标库模块 */
+
+export default {
+  /* 指标库页面 */
+  EtaBasePage: {
+    add_edb_btn: 'Add Indicator',
+    calculation_edb_btn: 'Calculation',
+    replace_edb_btn: 'Indicator Replacement',
+    algorithm_btn: 'Code Algorithm',
+    adjustment_btn: 'Data Adjustment',
+    search_placeholder: 'Indicator ID/Indicator Name',
+    add_first_menu_btn: 'Add first-level catalogue',
+    total_prefix:'Total',
+    total_suffix: 'indicators',
+    time_show: 'Creat Time',
+  }
+}

+ 17 - 0
src/lang/modules/EtaBase/Zh.js

@@ -0,0 +1,17 @@
+/* 指标库模块 */
+
+export default {
+  /* 指标库页面 */
+  EtaBasePage: {
+    add_edb_btn: '添加指标',
+    calculation_edb_btn: '计算指标',
+    replace_edb_btn: '替换指标',
+    algorithm_btn: '代码运算',
+    adjustment_btn: '数据调整',
+    search_placeholder: '指标ID/指标名称',
+    add_first_menu_btn: '添加一级目录',
+    total_prefix:'共',
+    total_suffix: '个指标',
+    time_show: '创建时间',
+  }
+}

+ 150 - 0
src/lang/modules/EtaBase/commonLang.js

@@ -0,0 +1,150 @@
+/* 指标相关的通用文字 
+  在最外层commonLang中用
+*/
+
+export default {
+  trend_chart_tab: {
+    zh:'走势图',
+    en: 'Trend Chart'
+  },
+  data_detail_tab: {
+    zh:'数据详情',
+    en: 'Data Detail'
+  },
+  detail_refresh_btn:{
+    zh:'刷新',
+    en:'Update'
+  },
+  detail_edit_btn:{
+    zh:'编辑',
+    en:'Edit'
+  },
+  detail_save_btn:{
+    zh:'保存',
+    en:'Save'
+  },
+  detail_trace_btn:{
+    zh:'指标溯源',
+    en:'Indicator Traceability'
+  },
+  detail_more_btn:{
+    zh:'更多操作',
+    en: 'More Operation'
+  },
+  detail_en_btn:{
+    zh:'设置英文名称',
+    en:'Set English name'
+  },
+  detail_recalculate_btn:{
+    zh:'重新计算',
+    en:'Recalculate'
+  },
+  detail_copydata_btn:{
+    zh:'复制数据',
+    en:'Copy data'
+  },
+  detail_del_btn:{
+    zh:'删除',
+    en:'Delete'
+  },
+  detail_add_latest:{
+    zh:'添加最新值',
+    en:'Add latest value'
+  },
+  detail_edit_latest:{
+    zh:'编辑最新值',
+    en:'Edit latest value'
+  },
+  detail_refresh_all:{
+    zh:'全部刷新',
+    en:'Update all'
+  },
+  creater: {
+    zh:'添加人',
+    en:'Creator'
+  },
+  e_date: {
+    zh:'日期',
+    en:'Date'
+  },
+  e_value: {
+    zh:'值',
+    en:'Value'
+  },
+  source: {
+    zh:'数据来源',
+    en:'Data Source'
+  },
+  e_id: {
+    zh:'指标ID',
+    en:'Indicator ID'
+  },
+  e_name: {
+    zh:'指标名称',
+    en:'Indicator Name'
+  },
+  e_fre: {
+    zh:'频度',
+    en:'Frequency'
+  },
+  e_unit: {
+    zh:'单位',
+    en:'Unit'
+  },
+  e_menu: {
+    zh:'指标目录',
+    en:'Data Catalogue'
+  },
+  e_start_time: {
+    zh:'起始时间',
+    en:'Start Time'
+  },
+  e_update_time: {
+    zh:'更新时间',
+    en:'Update Time'
+  },
+  e_status: {
+    zh:'刷新状态',
+    en:'Update Status'
+  },
+  time_interval: {
+    zh:'时间段',
+    en: 'Time Period'
+  },
+  time_all: {
+    zh:'全部',
+    en: 'All'
+  },
+  since_onefive: {
+    zh:'15年至今',
+    en: 'Since 2015'
+  },
+  since_twozero: {
+    zh:'20年至今',
+    en: 'Since 2020'
+  },
+  since_twoone: {
+    zh:'21年至今',
+    en: 'Since 2021'
+  },
+  since_twotwo: {
+    zh:'22年至今',
+    en:'Since 2022'
+  },
+  choose_time: {
+    zh:'请选择时间段',
+    en:'Please select time period'
+  },
+  show_yearonyear: {
+    zh:'展示同比图',
+    en:'Show year-on-year chart'
+  },
+  switch_season: {
+    zh:'切换季节性图',
+    en:'Switch to seasonal chart'
+  },
+  switch_curve: {
+    zh:'切换曲线图',
+    en:'Switch to curve chart'
+  },
+}

+ 6 - 0
src/lang/modules/EtaChart/En.js

@@ -0,0 +1,6 @@
+/* eta图库模块 */
+export default {
+  EtaChartPage: {
+    
+  }
+}

+ 6 - 0
src/lang/modules/EtaChart/Zh.js

@@ -0,0 +1,6 @@
+/* eta图库模块 */
+export default {
+  EtaChartPage: {
+    
+  }
+}

+ 42 - 0
src/lang/modules/EtaChart/commonLang.js

@@ -0,0 +1,42 @@
+/* 图表相关的通用文字 
+  在最外层commonLang中用
+*/
+
+export default {
+  chart_share_btn:{
+    zh:'分享',
+    en:'Share'
+  },
+  chart_addmy_btn:{
+    zh:'加入我的图库',
+    en:'Add to my gallery'
+  },
+  chart_save_btn:{
+    zh:'保存',
+    en:'Save'
+  },
+  chart_copy_btn:{
+    zh:'另存为',
+    en:'Save as'
+  },
+  chart_edit_btn:{
+    zh:'编辑',
+    en:'Edit'
+  },
+  chart_en_btn:{
+    zh:'设置英文名称',
+    en:'Set English name'
+  },
+  chart_copyoffice: {
+    zh:'复制至office',
+    en:'Copy to office'
+  },
+  chart_copywx: {
+    zh:'复制至微信',
+    en:'Copy to WeChat'
+  },
+  chart_del_btn: {
+    zh:'删除',
+    en:'Delete'
+  },
+}

+ 122 - 0
src/lang/modules/systemManage/BaseConfig.js

@@ -0,0 +1,122 @@
+/**
+ * 系统设置-基本配置
+ */
+
+/* 英文 */
+export const BaseConfigEn = {
+    tab01:'General Setting',
+    tab02:'Resource Library',
+    sub_tab01:'Login Setting',
+    sub_tab02:'Research Report Setting',
+    sub_tab03:'PPT Configuration',
+    email_tem:'Email Template',
+    email_tips:'Login System or Retrieve Password or Identity Verification',
+    email_placeholder:'Please enter email title',
+    view_example_text:'View schematic diagram',
+    company_name:'Company Name',
+    company_name_placeholder:'Please Enter Company Name',
+    compay_mark:'Company Watermark',
+    report_chart:'Research Report Charts',
+    report_share:'Research Report Analysis',
+    report_share_tips:"report detail sharing page, the watermark content should be the sharer's username + mobile number (or email address if no phone number is available)",
+    upload_format:'Upload Format: png, jpg',
+    disclaimer:'Disclaimer',
+    disclaimer_placeholder:'Please enter a disclaimer',
+    iFLYTEK_service:'iFLYTEK Service',
+    please_enter:'Please enter',
+    report_approval:'Report Approval',
+    internal_approval:'ETA Internal Approval',
+    third_approval:'Third-party Approval',
+    third_approval_tips:"Chinese Research Report(Intelligent Research Report/Research Report List) connected to third-party approval systems via API interface",
+    report_share_title_zh:'Title of Chinese research report sharing',
+    report_share_title_zh_placeholder:'Please Enter Title of English research report sharing',
+    report_share_title_en:'Title of English research report sharing',
+    report_share_title_en_placeholder:'Please Enter Title of English research report sharing',
+    connect_wx:'Associated Public Account',
+    wx_original_id:'Please Enter Original ID',
+    wx_original_tips:'Note: When filling in associated public account, AppID, AppSecret and original ID must all be provided. ',
+
+    ppt_zh:'Chinese PPT',
+    ppt_en:'English PPT',
+    ppt_type01:'PPT Cover Image',
+    ppt_type02:'PPT Background Image',
+    ppt_type03:'PPT Back Cover Image',
+    ppt_tip01:'Upload Format: png, jpg. Maximum of three images can be uploaded, recommended image ratio: 10:7',
+    ppt_tip02:'Upload Format: png, jpg. Recommended image ratio: 10:7',
+    ppt_tip03:'Upload Format: png, jpg. Recommended image ratio: 10:7',
+
+    resource_placeholder01:'Please enter the image name',
+    resource_placeholder02:'Please select the image type',
+    resource_type01:'Header',
+    resource_type02:'Footer',
+    resource_btn01:'Upload Image',
+    resource_btn02:'Rename',
+    resource_btn03:'Deselect/Deselect All',
+    resource_des01:'has been selected',
+    resource_label01:'Image Name',
+    resource_label02:'Image Type',
+    upload_suggest:'Supports formats like jpg, jpeg, png, etc. It is recommended to upload headers of 800*200 and footers of 800*80',
+    resource_del_msg:'Are you sure to delete the selected image?',
+
+};
+  
+/* 中文 */
+export const BaseConfigZh = {
+    tab01:'通用设置',
+    tab02:'资源库',
+    sub_tab01:'登录设置',
+    sub_tab02:'研报设置',
+    sub_tab03:'PPT配置',
+    email_tem:'邮件模板',
+    email_tips:'登陆系统或找回密码或验证身份',
+    email_placeholder:'请输入邮件标题',
+    view_example_text:'查看示意图',
+    company_name:'公司名称',
+    company_name_placeholder:'请输入公司名称',
+    compay_mark:'公司水印',
+    report_chart:'研报图表',
+    report_share:'研报分享',
+    report_share_tips:'研报详情分享页水印,水印内容为分享人用户名称+手机号(无手机号时为邮箱地址)',
+    upload_format:'上传格式:png、jpg',
+    disclaimer:'免责声明',
+    disclaimer_placeholder:'请输入免责声明',
+    iFLYTEK_service:'科大讯飞服务',
+    please_enter:'请输入',
+    report_approval:'研报审批',
+    internal_approval:'ETA内部审批',
+    third_approval:'第三方审批',
+    third_approval_tips:'中文研报(智能研报/研报列表)通过API接口对接第三方审批系统',
+    report_share_title_zh:'中文研报分享抬头',
+    report_share_title_zh_placeholder:'请输入中文研报分享抬头',
+    report_share_title_en:'英文研报分享抬头',
+    report_share_title_en_placeholder:'请输入英文研报分享抬头',
+    connect_wx:'关联公众号',
+    wx_original_id:'请输入原始Id',
+    wx_original_tips:'注:关联公众号填写时,AppID、AppSecret原始ID均需填写。',
+
+    ppt_zh:'中文PPT',
+    ppt_en:'英文PPT',
+    ppt_type01:'PPT封面图',
+    ppt_type02:'PPT背景图',
+    ppt_type03:'PPT封底图',
+    ppt_tip01:'上传格式:png、jpg,最多上传三张,建议图片比例:10:7',
+    ppt_tip02:'上传格式:png、jpg,建议图片比例:10:7',
+    ppt_tip03:'上传格式:png、jpg,建议图片比例:10:7',
+
+    resource_placeholder01:'请输入图片名称',
+    resource_placeholder02:'请选择图片类型',
+    resource_type01:'版头',
+    resource_type02:'版尾',
+    resource_btn01:'上传图片',
+    resource_btn02:'重命名',
+    resource_btn03:'取消选择',
+    resource_des01:'已选择',
+    resource_label01:'图片名称',
+    resource_label02:'图片类型',
+    upload_suggest:'支持jpg、jpeg、png等格式,建议上传版头800*200,版尾800*80',
+    resource_del_msg:'是否确认删除选中图片?',
+};
+  
+/**
+* $t('SystemManage.BaseConfig.XXX')
+*/

+ 35 - 0
src/lang/modules/systemManage/DataAuth.js

@@ -0,0 +1,35 @@
+/**
+ * 系统设置-手工数据权限
+ */
+
+/* 英文 */
+export const DataAuthEn = {
+    placehloder_msg01:'User Name',
+    placehloder_msg02:'Please select a parent category',
+    msg01:'Please select a user',
+    msg02:'The category that contains subcategories cannot be deleted',
+    msg03:'Deletion is irreversible. Are you sure you want to proceed?',
+    title:'Manual Indicator Categories',
+    add_category:'Add Category',
+    edit_category:'Edit Category',
+    parent_classify:'Parent Category',
+    classify_name:'Category Name'
+};
+  
+/* 中文 */
+export const DataAuthZh = {
+    placehloder_msg01:'用户名称',
+    placehloder_msg02:'请选择上级分类',
+    msg01:'请选择用户',
+    msg02:'该分类下包含子分类不可删除',
+    msg03:'删除后不可恢复,是否确认删除?',
+    title:'手工指标分类',
+    add_category:'添加分类',
+    edit_category:'编辑分类',
+    parent_classify:'上级分类',
+    classify_name:'分类名称'
+};
+  
+/**
+* $t('SystemManage.DataAuth.XXX')
+*/

+ 49 - 0
src/lang/modules/systemManage/DataSourceAccount.js

@@ -0,0 +1,49 @@
+/**
+ * 系统设置-数据源终端管理
+ */
+
+/* 英文 */
+export const DataSourceAccountEn = {
+    add_btn:'Add terminal account',
+    edit_btn:'Edit terminal account',
+    table_col01:'Terminal Code',
+    table_col02:'Terminal Name',
+    table_col03:'Folder Path',
+    table_col04:'Terminal Address',
+    table_col05:'Terminal Token',
+    table_col06:'Data Source Type',
+    table_col07:'Status',
+    table_col08:'Indicator Data Volume',
+    table_col09:'Update Time',
+    placeholder01:'请输入终端名称',
+    placeholder02:'请输入文件夹路径',
+    placeholder03:'请输入终端地址',
+    placeholder04:'请输入终端token',
+    placeholder05:'Please select data source type',
+    placeholder06:'请输入指标数据量',
+};
+  
+/* 中文 */
+export const DataSourceAccountZh = {
+    add_btn:'新增终端账号',
+    edit_btn:'编辑终端账号',
+    table_col01:'终端编码',
+    table_col02:'终端名称',
+    table_col03:'文件夹路径',
+    table_col04:'终端地址',
+    table_col05:'终端token',
+    table_col06:'数据源类型',
+    table_col07:'状态',
+    table_col08:'指标数据量',
+    table_col09:'更新时间',
+    placeholder01:'请输入终端名称',
+    placeholder02:'请输入文件夹路径',
+    placeholder03:'请输入终端地址',
+    placeholder04:'请输入终端token',
+    placeholder05:'请选择数据源类型',
+    placeholder06:'请输入指标数据量',
+};
+  
+/**
+* $t('SystemManage.DataSourceAccount.XXX')
+*/

+ 169 - 0
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')
+*/

+ 31 - 0
src/lang/modules/systemManage/EnAuthSet.js

@@ -0,0 +1,31 @@
+/**
+ * 系统设置-英文权限配置
+ */
+
+/* 英文 */
+export const EnAuthSetEn = {
+    title:'English Permission List',
+    tips:'Deleting only removes English permissions for this user',
+    enable:'Disabled',
+    opened:'Enabled',
+    opt_text01:'English Customer List Administrator',
+    opt_text02:'English Research Report Administrator',
+    opt_text03:'English PPT Administrator',
+    opt_text04:'Daily News Administrator',
+};
+  
+/* 中文 */
+export const EnAuthSetZh = {
+    title:'英文权限列表',
+    tips:'删除操作仅删除该用户的英文权限',
+    enable:'已禁用',
+    opened:'已启用',
+    opt_text01:'英文客户列表管理员',
+    opt_text02:'英文研报管理员',
+    opt_text03:'英文PPT管理员',
+    opt_text04:'每日资讯管理员',
+};
+  
+/**
+* $t('SystemManage.EnAuthSet.XXX')
+*/

+ 79 - 0
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')
+*/

+ 31 - 0
src/lang/modules/systemManage/OutLinkConfig.js

@@ -0,0 +1,31 @@
+/**
+ * 系统设置-外部链接配置
+ */
+
+/* 英文 */
+export const OutLinkConfigEn = {
+    menu_add_btn:'Add menu',
+    menu_edit_btn:'Edit menu',
+    tale_col01:'Menu Name',
+    tale_col02:'Page Link',
+    tale_col03:'Creation Time',
+    placeholder01:'请输入菜单名称',
+    placeholder02:'请输入URL',
+    del_success_msg:'Delete menu successfully'
+};
+  
+/* 中文 */
+export const OutLinkConfigZh = {
+    menu_add_btn:'添加菜单',
+    menu_edit_btn:'编辑菜单',
+    tale_col01:'菜单名称',
+    tale_col02:'页面链接',
+    tale_col03:'创建时间',
+    placeholder01:'Please enter menu name',
+    placeholder02:'Please enter URL',
+    del_success_msg:'删除菜单成功'
+};
+  
+/**
+* $t('SystemManage.OutLinkConfig.XXX')
+*/

+ 6 - 0
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:'权限设置成功'
 };
   
 /**

+ 23 - 0
src/lang/modules/systemManage/indexEn.js

@@ -0,0 +1,23 @@
+import { DepartManageEn } from "./DepartManage";
+import { RoleManageEn } from "./RoleManage";
+import { OperateAuthEn } from "./OperateAuth";
+import {DataAuthEn} from './DataAuth'
+import {EnAuthSetEn} from './EnAuthSet'
+import {BaseConfigEn} from './BaseConfig'
+import {OutLinkConfigEn} from './OutLinkConfig'
+import {DataSourceAccountEn} from './DataSourceAccount'
+
+export default {
+  // 系统设置
+  SystemManage: {
+    DepartManage: DepartManageEn,
+    RoleManage: RoleManageEn,
+    OperateAuth:OperateAuthEn,
+    DataAuth:DataAuthEn,
+    EnAuthSet:EnAuthSetEn,
+    BaseConfig:BaseConfigEn,
+    OutLinkConfig:OutLinkConfigEn,
+    DataSourceAccount:DataSourceAccountEn
+  },
+};
+

+ 22 - 0
src/lang/modules/systemManage/indexZh.js

@@ -0,0 +1,22 @@
+import { DepartManageZh } from "./DepartManage";
+import { RoleManageZh } from "./RoleManage";
+import { OperateAuthZh } from "./OperateAuth";
+import {DataAuthZh} from './DataAuth'
+import {EnAuthSetZh} from './EnAuthSet'
+import {BaseConfigZh} from './BaseConfig'
+import { OutLinkConfigZh } from "./OutLinkConfig";
+import{DataSourceAccountZh} from './DataSourceAccount'
+
+export default {
+  // 系统设置
+  SystemManage: {
+    DepartManage: DepartManageZh,
+    RoleManage: RoleManageZh,
+    OperateAuth:OperateAuthZh,
+    DataAuth:DataAuthZh,
+    EnAuthSet:EnAuthSetZh,
+    BaseConfig:BaseConfigZh,
+    OutLinkConfig:OutLinkConfigZh,
+    DataSourceAccount:DataSourceAccountZh
+  },
+};

+ 3 - 0
src/lang/zh.js

@@ -20,4 +20,7 @@ export default {
   Confirm: transformLanguageData(commonLang.Confirm, "zh"),
   Table: transformLanguageData(commonLang.Table, "zh"),
   MsgPrompt: transformLanguageData(commonLang.MsgPrompt, "zh"),
+  Common:transformLanguageData(commonLang.Common,'zh'),
+  Edb: transformLanguageData(commonLang.Edb, "zh"),
+  Chart: transformLanguageData(commonLang.Chart, "zh"),
 };

+ 1 - 1
src/views/dataEntry_manage/databaseComponents/edbDetailData.vue

@@ -62,7 +62,7 @@
 					<span :class="['value-style',{'predict-act': tableData[0].DataInsertConfig.Date===item.DataTime}]">{{item.Value}}</span>
 				</span>
 			</li>
-			<li class="nodata value-item" v-if="!dataList.length">暂无数据</li>
+			<li class="nodata value-item" v-if="!dataList.length">{{$t('Table.prompt_slogan')}}</li>
 		</ul>
 	</div>
 </template>

+ 35 - 35
src/views/dataEntry_manage/databaseList.vue

@@ -3,22 +3,22 @@
 		<div class="database_top">
 			<div class="top-left">
 				<el-button v-permission="permissionBtn.edbDataPermission.edbData_addEdb"
-					type="primary" @click="addHandler">添加指标</el-button>
+					type="primary" @click="addHandler">{{$t('EtaBasePage.add_edb_btn')}}</el-button>
 				<el-button v-permission="permissionBtn.edbDataPermission.edbData_calcuEdb"
-					type="primary" @click="addComputedHandler">计算指标</el-button>
+					type="primary" @click="addComputedHandler">{{$t('EtaBasePage.calculation_edb_btn')}}</el-button>
 				<el-button v-permission="permissionBtn.edbDataPermission.edbData_replaceEdb"
-					type="primary" @click="replaceEdbHandler">替换指标</el-button>
+					type="primary" @click="replaceEdbHandler">{{$t('EtaBasePage.replace_edb_btn')}}</el-button>
 				<el-button v-permission="permissionBtn.edbDataPermission.edbData_codeRun"
-					type="primary" @click="$router.push({path: '/codecount'})">代码运算</el-button>
+					type="primary" @click="$router.push({path: '/codecount'})">{{$t('EtaBasePage.algorithm_btn')}}</el-button>
 				<el-button v-permission="permissionBtn.edbDataPermission.edbData_dataAdjust"
-					type="primary" @click="$router.push({path: '/adjustdata'})">数据调整</el-button>
+					type="primary" @click="$router.push({path: '/adjustdata'})">{{$t('EtaBasePage.adjustment_btn')}}</el-button>
 				<!-- <el-button v-permission="permissionBtn.edbDataPermission.edbData_batchUpdate"
 					type="primary" plain @click="updateHandler">一键刷新</el-button> -->
 			</div>
 			<div class="top-right">
 
-				<change-lang v-permission="permissionBtn.edbDataPermission.edbData_switchEn"
-					:lang="currentLang" style="height: 32px;" @changeLang="changeLanguage"/>
+				<!-- <change-lang v-permission="permissionBtn.edbDataPermission.edbData_switchEn"
+					:lang="currentLang" style="height: 32px;" @changeLang="changeLanguage"/> -->
 
 				<el-select
 					v-model="search_txt"
@@ -27,7 +27,7 @@
 					:filterable="!search_txt"
 					remote
 					clearable
-					placeholder="指标ID/指标名称"
+					:placeholder="$t('EtaBasePage.search_placeholder')"
 					style="width: 260px;"
 					:remote-method="searchHandle"
 					@click.native="inputFocusHandle"
@@ -176,7 +176,7 @@
 							alt=""
 							style="width: 16px; height: 16px; margin-right: 10px"
 						/>
-						<span>添加一级目录</span>
+						<span>{{$t('EtaBasePage.add_first_menu_btn')}}</span>
 					</div>
 				</div>
 				<span class="move-btn resize" v-drag id="resize" @mousemove="dynamicNode&&resetNodeStyle(dynamicNode)">
@@ -226,22 +226,22 @@
 				<div class="detail">
 					<div class="header">
 						<el-tabs v-model="activeTab" @tab-click="rePainChart">
-							<el-tab-pane label="走势图" name="Chart">
+							<el-tab-pane :label="$t('Edb.trend_chart_tab')" name="Chart">
 							</el-tab-pane>
-							<el-tab-pane label="数据详情" name="Data">
+							<el-tab-pane :label="$t('Edb.data_detail_tab')" name="Data">
 							</el-tab-pane>
 						</el-tabs>
 						<div class="edb-tool-icon edb-tool" style="align-items: center;">
 							<el-button v-if="isEdbBtnShow('update')"
-								type="text" @click="refreshTargetHandle" >刷新</el-button>
+								type="text" @click="refreshTargetHandle" >{{$t('Edb.detail_refresh_btn')}}</el-button>
 							<el-button v-if="isEdbBtnShow('edit')"
 								type="text" :disabled="!(EdbData.Button.OpButton)"
-								@click="editNode({},EdbData)">编辑</el-button>
+								@click="editNode({},EdbData)">{{$t('Edb.detail_edit_btn')}}</el-button>
 							<!-- 指保存指标的上下限,在走势图才显示 -->
 							<el-button v-if="activeTab==='Chart'&&isEdbBtnShow('saveEdb')"
-								type="text" @click.stop="saveEdbLimit">保存</el-button>
+								type="text" @click.stop="saveEdbLimit">{{$t('Edb.detail_save_btn')}}</el-button>
 							<el-button v-if="EdbData.EdbType===2&&isEdbBtnShow('toSource')"
-								type="text" @click="toHistoryPage(selected_edbid,$route.matched);lookEdbId=selected_edbid">指标溯源</el-button>
+								type="text" @click="toHistoryPage(selected_edbid,$route.matched);lookEdbId=selected_edbid">{{$t('Edb.detail_trace_btn')}}</el-button>
 							<el-popover v-if="showPopver"
 								placement="bottom-end" 
 								trigger="hover"
@@ -249,20 +249,20 @@
 								width="300" style="display: inline-block;">
 								<div class="edb-tool-wrap">
 									<el-button v-if="isEdbBtnShow('setEn')"
-										type="text" @click="openEnNameDia">设置英文名称</el-button>
+										type="text" @click="openEnNameDia">{{$t('Edb.detail_en_btn')}}</el-button>
 									<el-button v-if="EdbData.Button.InsertNewDataButton&&isEdbBtnShow('newValue')"
-										type="text" @click.stop="updateNewestDataHandle" >{{(EdbData.DataInsertConfig.Date)?'编辑最新值':'添加最新值'}}</el-button>
+										type="text" @click.stop="updateNewestDataHandle" >{{(EdbData.DataInsertConfig.Date)?$t('Edb.detail_edit_latest'):$t('Edb.detail_add_latest')}}</el-button>
 									<el-button v-if="EdbData.EdbType===2&&isEdbBtnShow('calculateAgain')"
-										type="text" @click.stop="reCalculateHandler" :loading="calculateLoading">重新计算</el-button>
+										type="text" @click.stop="reCalculateHandler" :loading="calculateLoading">{{$t('Edb.detail_recalculate_btn')}}</el-button>
 									<el-button v-if="EdbData.EdbType===1&&isEdbBtnShow('refreshAll')"
-										type="text" @click.stop="refreshBaseHandler" :loading="refreshLoading">全部刷新</el-button>
+										type="text" @click.stop="refreshBaseHandler" :loading="refreshLoading">{{$t('Edb.detail_refresh_all')}}</el-button>
 									<el-button v-if="isEdbBtnShow('copyData')"
-										type="text" @click="copyCode">复制数据</el-button>
+										type="text" @click="copyCode">{{$t('Edb.detail_copydata_btn')}}</el-button>
 									<el-button v-if="EdbData.Button.DeleteButton&&isEdbBtnShow('deleteEdb')"
-										type="text" @click="removeNode(_,EdbData)" style="color:#C54322;">删除</el-button>
+										type="text" @click="removeNode(_,EdbData)" style="color:#C54322;">{{$t('Edb.detail_del_btn')}}</el-button>
 								</div>
 								<div class="edb-btn" slot="reference">
-									<el-button type="text">更多操作</el-button>
+									<el-button type="text">{{$t('Edb.detail_more_btn')}}</el-button>
 									<i class="el-icon-more" style="font-size: 14px;transform: rotate(90deg);cursor: pointer;color: #3375e1;"/>
 								</div>
 							</el-popover>
@@ -279,14 +279,14 @@
 								ref="createChart"
 								@editEnName="openEnNameDia"/>
 							<div class="info">
-								<span>数据来源:{{EdbData.SourceName}}</span>
-								<span>添加人:{{EdbData.SysUserRealName}}</span>
+								<span>{{$t('Edb.source')}}:{{EdbData.SourceName}}</span>
+								<span>{{$t('Edb.Creator')}}:{{EdbData.SysUserRealName}}</span>
 							</div>
 							<ul class="value-ul"
 								v-show="showTable&&dataList.length">
 								<li class="value-item" style="background-color: #EBEFF6;">
-									<span style="width:240px">日期(频度:{{EdbData.Frequency}})</span>
-									<span style="flex:1;"></span>
+									<span style="width:240px">{{$t('Edb.e_date')}}({{$t('Edb.e_fre')}}:{{EdbData.Frequency}})</span>
+									<span style="flex:1;">{{$t('Edb.e_value')}}</span>
 								</li>
 								<li class="value-item"
 									v-for="item in dataList.slice(0,3)"
@@ -597,25 +597,25 @@ export default {
 			/*表格列 */
 			tableColumsOne: [
 				{
-					label: '指标ID',
+					label: this.$t('Edb.e_id'),
 					key: 'EdbCode',
 					minwidthsty: '150px'
 				},
 				{
-					label: '指标名称',
+					label: this.$t('Edb.e_name'),
 					key: 'EdbName',
 					enKey:'EdbNameEn',
 					inputTip:'点击输入英文指标名称',
 					minwidthsty: '200px'
 				},
 				{
-					label: '频度',
+					label: this.$t('Edb.e_fre'),
 					key: 'Frequency',
 					enKey:'FrequencyEn',
 					widthsty: '100px'
 				},
 				{
-					label: '单位',
+					label: this.$t('Edb.e_unit'),
 					key: 'Unit',
 					enKey:'UnitEn',
 					inputTip:'英文单位',
@@ -623,29 +623,29 @@ export default {
 					widthsty: '100px'
 				},
 				{
-					label: '数据来源',
+					label: this.$t('Edb.source'),
 					key: 'SourceName',
 					widthsty: '160px'
 				},
 			],
 			tableColumsTwo: [
 				{
-					label: '指标目录',
+					label: this.$t('Edb.e_menu'),
 					key: 'Menu',
 					minwidthsty: '150px',
 				},
 				{
-					label: '起始时间',
+					label: this.$t('Edb.e_start_time'),
 					key: 'StartDate',
 					minwidthsty: '115px',
 				},
 				{
-					label: '更新时间',
+					label: this.$t('Edb.e_update_time'),
 					key: 'ModifyTime',
 					minwidthsty: '120px',
 				},
 				{
-					label: '添加人',
+					label: this.$t('Edb.creater'),
 					key: 'SysUserRealName',
 					widthsty: '160px',
 				}

+ 64 - 21
src/views/dataSource_manage/accountList.vue

@@ -5,7 +5,7 @@
             type="primary" 
             @click="showEditAccount=true;activeTermId=0;initData={}"
             v-permission="permissionBtn.dataSourcePermission.dataSource_account_add"
-        >新增终端账号</el-button>
+        >{{$t('SystemManage.DataSourceAccount.add_btn')}}</el-button>
         <el-table
             style="margin-top:30px"
             :data="tableData"
@@ -23,33 +23,33 @@
                     <span 
                         v-if="col.key==='Status'"
                         :style="{color:scope.row.Status===1?'':'#FF0000'}"
-                    >{{scope.row.Status===1?'启用':'禁用'}}</span>
+                    >{{scope.row.Status===1?$t('Common.enable'):$t('Common.disable')}}</span>
                     <span v-else>{{scope.row[col.key]}}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="100">
+            <el-table-column :label="$t('Table.column_operations')" align="center" width="100">
                 <template slot-scope="scope">
                     <span 
                         style="color:#409EFF;cursor: pointer;" 
                         @click="handleEditAccount(scope.row)"
                         v-permission="permissionBtn.dataSourcePermission.dataSource_account_edit"
-                    >编辑</span>
+                    >{{$t('Table.edit_btn')}}</span>
                     <span 
                         style="color:#409EFF;cursor: pointer;" 
                         @click="handleSetAccountStatus(scope.row,2)" 
                         v-if="scope.row.Status===1"
                         v-permission="permissionBtn.dataSourcePermission.dataSource_account_enable"
-                    >禁用</span>
+                    >{{$t('Common.disable')}}</span>
                     <span 
                         style="color:#409EFF;cursor: pointer;" 
                         @click="handleSetAccountStatus(scope.row,1)" 
                         v-if="scope.row.Status===2"
                         v-permission="permissionBtn.dataSourcePermission.dataSource_account_enable"
-                    >启用</span>
+                    >{{$t('Common.enable')}}</span>
                 </template>
             </el-table-column>
             <div slot="empty">
-                <tableNoData text="暂无数据"/>
+                <tableNoData :text="$t('Table.prompt_slogan')"/>
             </div>
         </el-table>
 
@@ -68,48 +68,91 @@ import EditAccount from './components/EditAccount.vue'
 import {apiDataSource} from '@/api/modules/dataSource.js'
 export default {
     components:{EditAccount},
-    data() {
-        return {
-            tableData:[],
-            tableColOpts:[
+    computed:{
+        tableColOpts(){
+            return [
                 {
-                    name:'终端编码',
+                    name:this.$t('SystemManage.DataSourceAccount.table_col01'),
                     key:'TerminalCode',
                 },
                 {
-                    name:'终端名称',
+                    name:this.$t('SystemManage.DataSourceAccount.table_col02'),
                     key:'Name',
                 },
                 {
-                    name:'文件夹路径',
+                    name:this.$t('SystemManage.DataSourceAccount.table_col03'),
                     key:'DirPath',
                 },
                 {
-                    name:'终端地址',
+                    name:this.$t('SystemManage.DataSourceAccount.table_col04'),
                     key:'ServerUrl',
                 },
                 {
-                    name:'终端token',
+                    name:this.$t('SystemManage.DataSourceAccount.table_col05'),
                     key:'Value',
                 },
                 {
-                    name:'数据源类型',
+                    name:this.$t('SystemManage.DataSourceAccount.table_col06'),
                     key:'Source',
                 },
                 {
-                    name:'状态',
+                    name:this.$t('SystemManage.DataSourceAccount.table_col07'),
                     key:'Status',
                 },
                 {
-                    name:'指标数据量',
+                    name:this.$t('SystemManage.DataSourceAccount.table_col08'),
                     key:'Num',
                 },
                 {
-                    name:'更新时间',
+                    name:this.$t('SystemManage.DataSourceAccount.table_col09'),
                     key:'ModifyTime',
                     sortable:true
                 },
-            ],
+            ]
+        }
+    },
+    data() {
+        return {
+            tableData:[],
+            // tableColOpts:[
+            //     {
+            //         name:'终端编码',
+            //         key:'TerminalCode',
+            //     },
+            //     {
+            //         name:'终端名称',
+            //         key:'Name',
+            //     },
+            //     {
+            //         name:'文件夹路径',
+            //         key:'DirPath',
+            //     },
+            //     {
+            //         name:'终端地址',
+            //         key:'ServerUrl',
+            //     },
+            //     {
+            //         name:'终端token',
+            //         key:'Value',
+            //     },
+            //     {
+            //         name:'数据源类型',
+            //         key:'Source',
+            //     },
+            //     {
+            //         name:'状态',
+            //         key:'Status',
+            //     },
+            //     {
+            //         name:'指标数据量',
+            //         key:'Num',
+            //     },
+            //     {
+            //         name:'更新时间',
+            //         key:'ModifyTime',
+            //         sortable:true
+            //     },
+            // ],
 
             showEditAccount:false,
             activeTermId:0,

+ 12 - 12
src/views/dataSource_manage/components/EditAccount.vue

@@ -1,6 +1,6 @@
 <template>
     <el-dialog
-      :title="TerminalId?'编辑终端账号':'新增终端账号'"
+      :title="TerminalId?$t('SystemManage.DataSourceAccount.edit_btn'):$t('SystemManage.DataSourceAccount.add_btn')"
       :visible.sync="show"
       :modal-append-to-body="false"
       :close-on-click-modal="false"
@@ -14,25 +14,25 @@
             :model="formState" 
             :rules="rules" 
             ref="formIns" 
-            label-width="120px" 
+            label-width="130px" 
             class="demo-ruleForm"
         >
-            <el-form-item label="终端名称" prop="name">
+            <el-form-item :label="$t('SystemManage.DataSourceAccount.table_col02')" prop="name">
                 <el-input placeholder="请输入终端名称" v-model="formState.name" style="width:300px"></el-input>
             </el-form-item>
-            <el-form-item label="文件夹路径" prop="dirUrl">
+            <el-form-item :label="$t('SystemManage.DataSourceAccount.table_col03')" prop="dirUrl">
                 <el-input placeholder="请输入文件夹路径" v-model="formState.dirUrl"  style="width:300px" :disabled="TerminalId"></el-input>
             </el-form-item>
-            <el-form-item label="终端地址" prop="url">
+            <el-form-item :label="$t('SystemManage.DataSourceAccount.table_col04')" prop="url">
                 <el-input placeholder="请输入终端地址" v-model="formState.url"  style="width:300px"></el-input>
             </el-form-item>
-            <el-form-item label="终端token" prop="token">
+            <el-form-item :label="$t('SystemManage.DataSourceAccount.table_col05')" prop="token">
                 <el-input placeholder="请输入终端token" v-model="formState.token"  style="width:300px"></el-input>
             </el-form-item>
-            <el-form-item label="数据源类型" prop="type">
+            <el-form-item :label="$t('SystemManage.DataSourceAccount.table_col06')" prop="type">
                 <el-select 
                     v-model="formState.type" 
-                    placeholder="请选择数据源类型"
+                    :placeholder="$t('SystemManage.DataSourceAccount.placeholder05')"
                     style="width:300px"
                     :disabled="TerminalId"
                 >
@@ -44,13 +44,13 @@
                     />
                 </el-select>
             </el-form-item>
-            <el-form-item label="指标数据量" prop="num">
+            <el-form-item :label="$t('SystemManage.DataSourceAccount.table_col08')" prop="num">
                 <el-input placeholder="请输入指标数据量" type="number" min="0" v-model.number="formState.num"  style="width:300px"></el-input>
             </el-form-item>
         </el-form>
         <div style="text-align:center;margin:30px 0">
-            <el-button type="primary" plain @click="handleClose">取消</el-button>
-            <el-button type="primary" @click="handleSave">确定</el-button>
+            <el-button type="primary" plain @click="handleClose">{{$t('Dialog.cancel_btn')}}</el-button>
+            <el-button type="primary" @click="handleSave">{{$t('Dialog.confirm_btn')}}</el-button>
         </div>
     </el-dialog>
 </template>
@@ -133,7 +133,7 @@ export default {
             console.log(params);
             const res=await apiDataSource.accountSave(params)
             if(res.Ret===200){
-                this.$message.success('保存成功')
+                this.$message.success(this.$t('MsgPrompt.saved_msg'))
                 this.$emit('change')
                 this.handleClose()
             }

+ 109 - 52
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',

+ 11 - 11
src/views/system_manage/components/authDialog.vue

@@ -15,15 +15,15 @@
 				ref="diaForm"
 				label-position="left"
 				hide-required-asterisk
-				label-width="80px"
+				label-width="120px"
 				:model="formData"
 				:rules="formRules">
-						<el-form-item label="上级分类" prop="classify">
+						<el-form-item :label="$t('SystemManage.DataAuth.parent_classify')" prop="classify">
 							<el-select 
 							v-model="formData.classify" 
-							placeholder="请选择上级分类" 
+							:placeholder="$t('SystemManage.DataAuth.placehloder_msg02')" 
 							style="width:80%"
-							:disabled="title==='编辑分类'&&!form.parentId">
+							:disabled="title===$t('SystemManage.DataAuth.edit_category')&&!form.parentId">
 								<el-option
 									v-for="item in classifyArr"
 									:key="item.ClassifyId"
@@ -32,17 +32,17 @@
 								</el-option>
 							</el-select>
 						</el-form-item>
-						<el-form-item label="分类名称" prop="nodeName">
+						<el-form-item :label="$t('SystemManage.DataAuth.classify_name')" prop="nodeName">
 							<el-input
 							v-model="formData.nodeName"
 							style="width: 80%"
-							placeholder="分类名称"></el-input>
+							:placeholder="$t('SystemManage.DataAuth.classify_name')"></el-input>
 						</el-form-item>
 				</el-form>
 			</div>
 			<div class="dia-bot">
-				<el-button type="primary" style="margin-right:20px" @click="saveHandle">保存</el-button>
-				<el-button type="primary" plain @click="cancelHandle">取消</el-button>
+				<el-button type="primary" style="margin-right:20px" @click="saveHandle">{{$t('Dialog.confirm_save_btn')}}</el-button>
+				<el-button type="primary" plain @click="cancelHandle">{{$t('Dialog.cancel_btn')}}</el-button>
 			</div>
 		</el-dialog>
 	</div>
@@ -98,7 +98,7 @@ export default {
 			const res = await dataAuthInterface.classifyOne();
 			if(res.Ret !== 200) return
 			this.classifyArr = res.Data || [];
-			if(this.title === '添加分类' || !this.form.parentId) {
+			if(this.title === this.$t('SystemManage.DataAuth.add_category') || !this.form.parentId) {
 				this.classifyArr.unshift({
 					ClassifyId: 0,
 					ClassifyName: '无'
@@ -109,7 +109,7 @@ export default {
 		async saveHandle() {
 			await this.$refs.diaForm.validate();
 
-			const res = this.title === '添加分类' 
+			const res = this.title === this.$t('SystemManage.DataAuth.add_category') 
 				? await	dataAuthInterface.classifyAdd({
 						ParentId: this.formData.classify,
 						ClassifyName: this.formData.nodeName
@@ -121,7 +121,7 @@ export default {
 					})
 
 			if(res.Ret !== 200) return
-			this.$message.success('保存成功');
+			this.$message.success(this.$t('MsgPrompt.saved_msg'));
 			this.callbackHandle();
 		},
 		/* 成功回调 */

+ 26 - 17
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 {

+ 28 - 28
src/views/system_manage/components/smartReportImgSet.vue

@@ -1,12 +1,12 @@
 <template>
     <div class="smart-report-img-set-page">
         <div class="top-wrap">
-            <el-input v-model="keyword" placeholder="请输入图片名称" clearable style="width:200px;margin-right:20px" @input="handleSearch"></el-input>
-            <el-select placeholder="请选择图片类型" v-model="type" clearable style="width:200px" @change="handleSearch">
-                <el-option label="版头" :value="1"></el-option>
-                <el-option label="版尾" :value="2"></el-option>
+            <el-input v-model="keyword" :placeholder="$t('SystemManage.BaseConfig.resource_placeholder01')" clearable style="width:200px;margin-right:20px" @input="handleSearch"></el-input>
+            <el-select :placeholder="$t('SystemManage.BaseConfig.resource_placeholder02')" v-model="type" clearable style="width:200px" @change="handleSearch">
+                <el-option :label="$t('SystemManage.BaseConfig.resource_type01')" :value="1"></el-option>
+                <el-option :label="$t('SystemManage.BaseConfig.resource_type02')" :value="2"></el-option>
             </el-select>
-            <el-button type="primary" style="float:right" @click="handleShowUploadPop" v-permission="permissionBtn.baseConfigPermission.etaBaseConfig_source_upload">上传图片</el-button>
+            <el-button type="primary" style="float:right" @click="handleShowUploadPop" v-permission="permissionBtn.baseConfigPermission.etaBaseConfig_source_upload">{{$t('SystemManage.BaseConfig.resource_btn01')}}</el-button>
         </div>
 
         <div class="select-status-box" v-if="selectIds.length>0">
@@ -16,8 +16,8 @@
                 @change="handleCheckAllChange"
             >全选</el-checkbox>
             <span>已选择{{selectIds.length}}项</span>
-            <span @click="selectIds=[]" style="color:#1146DB;margin-left:20px;cursor: pointer;">取消选择</span>
-            <span @click="handleBatchDel" style="color:#1146DB;margin-left:20px;cursor: pointer;">删除</span>
+            <span @click="selectIds=[]" style="color:#1146DB;margin-left:20px;cursor: pointer;">{{$t('SystemManage.BaseConfig.resource_btn03')}}</span>
+            <span @click="handleBatchDel" style="color:#1146DB;margin-left:20px;cursor: pointer;">{{$t('Table.delete_btn')}}</span>
         </div>
 
 
@@ -33,8 +33,8 @@
                         <img src="~@/assets/img/icons/more.png" alt="">
                     </div>
                     <el-dropdown-menu slot="dropdown">
-                        <el-dropdown-item :command="{type:'rename',data:item}">重命名</el-dropdown-item>
-                        <el-dropdown-item :command="{type:'del',data:item}">删除</el-dropdown-item>
+                        <el-dropdown-item :command="{type:'rename',data:item}">{{$t('SystemManage.BaseConfig.resource_btn02')}}</el-dropdown-item>
+                        <el-dropdown-item :command="{type:'del',data:item}">{{$t('Table.delete_btn')}}</el-dropdown-item>
                     </el-dropdown-menu>
                     </el-dropdown>
                 </div>
@@ -42,7 +42,7 @@
                 <p class="name">{{item.ImgName}}</p>
             </li>
         </ul>
-        <tableNoData text="暂无数据" v-if="list.length===0"/>
+        <tableNoData :text="$t('Table.prompt_slogan')" v-if="list.length===0"/>
         <!-- <el-col :span="24" class="toolbar">
             <el-pagination
                 layout="total,prev,pager,next"
@@ -57,13 +57,13 @@
         <!-- 上传图片弹窗 -->
         <el-dialog
             :visible.sync="uploadImgPop"
-            :title="formData.id?'重命名':'上传图片'"
+            :title="formData.id?$t('SystemManage.BaseConfig.resource_btn02'):$t('SystemManage.BaseConfig.resource_btn01')"
             :close-on-click-modal="false"
             :append-to-body="true"
             @close="cancelHandle"
             custom-class="classify-dialog"
             center
-            width="650px"
+            width="670px"
             v-dialogDrag
         >
             
@@ -71,20 +71,20 @@
                 :model="formData" 
                 :rules="formRules" 
                 ref="ruleForm" 
-                label-width="100px" 
+                label-width="120px" 
                 class="upload-img-form"
             >
-                <el-form-item label="图片名称" prop="name">
-                    <el-input v-model="formData.name" placeholder="请输入图片名称"></el-input>
+                <el-form-item :label="$t('SystemManage.BaseConfig.resource_label01')" prop="name">
+                    <el-input v-model="formData.name" :placeholder="$t('SystemManage.BaseConfig.resource_placeholder01')"></el-input>
                 </el-form-item>
-                <el-form-item label="图片类型" prop="type">
+                <el-form-item :label="$t('SystemManage.BaseConfig.resource_label02')" prop="type">
                     <el-radio-group v-model="formData.type" :disabled="formData.id">
-                        <el-radio :label="1">版头</el-radio>
-                        <el-radio :label="2">版尾</el-radio>
+                        <el-radio :label="1">{{$t('SystemManage.BaseConfig.resource_type01')}}</el-radio>
+                        <el-radio :label="2">{{$t('SystemManage.BaseConfig.resource_type02')}}</el-radio>
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item 
-                    label="上传图片" 
+                    :label="$t('SystemManage.BaseConfig.resource_btn01')" 
                     prop="imgUrl"
                 >
                     <el-upload 
@@ -103,11 +103,11 @@
                             </template>
                         </div>
                     </el-upload>
-                    <p>支持jpg、jpeg、png等格式,建议上传版头800*200,版尾800*80</p>
+                    <p>{{$t('SystemManage.BaseConfig.upload_suggest')}}</p>
                 </el-form-item>
                 <div style="text-align: center;padding: 30px 0;">
-                    <el-button type="primary" plain style="width:120px;" @click="handleCloseImgUpload">取消</el-button>
-                    <el-button type="primary" style="margin-left:20px;width:120px;" @click="handleSave">确定</el-button>
+                    <el-button type="primary" plain style="width:120px;" @click="handleCloseImgUpload">{{$t('Dialog.cancel_btn')}}</el-button>
+                    <el-button type="primary" style="margin-left:20px;width:120px;" @click="handleSave">{{$t('Dialog.confirm_btn')}}</el-button>
                 </div>
             </el-form>
             
@@ -242,7 +242,7 @@ export default {
                             ImgName:this.formData.name
                         }).then(res=>{
                             if(res.Ret===200){
-                                this.$message.success('修改成功')
+                                this.$message.success(this.$t('MsgPrompt.edit_msg'))
                                 this.page=1
                                 this.getImgList()
                                 this.handleCloseImgUpload()
@@ -252,7 +252,7 @@ export default {
                     }
                     apiSmartReport.imgReourceAdd(params).then(res=>{
                         if(res.Ret===200){
-                            this.$message.success('新增成功')
+                            this.$message.success(this.$t('MsgPrompt.add_msg'))
                             this.page=1
                             this.getImgList()
                             this.handleCloseImgUpload()
@@ -302,14 +302,14 @@ export default {
         },
 
         handleImgDel(){
-            this.$confirm('是否确认删除选中图片?','提示',{
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
+            this.$confirm(this.$t('SystemManage.BaseConfig.resource_del_msg'),this.$t('Confirm.prompt'),{
+                // confirmButtonText: '确定',
+                // cancelButtonText: '取消',
                 type: 'warning'
             }).then(()=>{
                 apiSmartReport.imgReourceDel({ResourceIds:this.delIds.join(',')}).then(res=>{
                     if(res.Ret===200){
-                        this.$message.success('删除成功')
+                        this.$message.success(this.$t('MsgPrompt.delete_msg'))
                         this.page=1
                         this.getImgList()
                     }

+ 9 - 9
src/views/system_manage/components/targetClasifyDialog.vue

@@ -3,7 +3,7 @@
 		<!-- :modal-append-to-body='false' -->
 		<el-dialog
 		:visible.sync="isOpenDialog"
-		:title="title"
+		:title="$t('SystemManage.DataAuth.title')"
 		:close-on-click-modal="false"
 		:append-to-body="true"
 		@close="cancelHandle"
@@ -12,7 +12,7 @@
 		width="650px"
 		v-dialogDrag>
 			<div class="add-cont">
-				<el-button type="text" @click="() => {cancelHandle();$parent.editClassify()}">添加分类</el-button>
+				<el-button type="text" @click="() => {cancelHandle();$parent.editClassify()}">{{$t('SystemManage.DataAuth.add_category')}}</el-button>
 			</div>
 			<el-tree
 				:data="classifyArr"
@@ -27,14 +27,14 @@
 				<div class="custom-tree-node" slot-scope="{ data }">
 					<span>{{ data.ClassifyName }}</span>
 					<div>
-						<span class="editsty" style="margin-right: 10px;" @click.stop="editNode(data)">编辑</span>
-						<span class="deletesty" @click.stop="delNode(data)">删除</span>
+						<span class="editsty" style="margin-right: 10px;" @click.stop="editNode(data)">{{$t('Table.edit_btn')}}</span>
+						<span class="deletesty" @click.stop="delNode(data)">{{$t('Table.delete_btn')}}</span>
 					</div>
 				</div>
 			</el-tree>
 			<div class="dia-bot">
-				<el-button type="primary" style="margin-right:20px" @click="cancelHandle">确定</el-button>
-				<el-button type="primary" plain @click="cancelHandle">取消</el-button>
+				<el-button type="primary" style="margin-right:20px" @click="cancelHandle">{{$t('Dialog.confirm_btn')}}</el-button>
+				<el-button type="primary" plain @click="cancelHandle">{{$t('Dialog.cancel_btn')}}</el-button>
 			</div>
 		</el-dialog>
 	</div>
@@ -85,9 +85,9 @@ export default {
 
 		/* 删除 */
 		async delNode(data) {
-			let message = !data.Child ? '删除后不可恢复,是否确认删除?' : '该分类下包含子分类不可删除'
+			let message = !data.Child ? this.$t('SystemManage.DataAuth.msg03') : this.$t('SystemManage.DataAuth.msg02')
 
-			await this.$confirm(message,'提示',{
+			await this.$confirm(message,this.$t('Confirm.prompt'),{
 				type: 'warning'
 			})
 
@@ -96,7 +96,7 @@ export default {
 			const {Ret} = await dataAuthInterface.classifyDel({ ClassifyId:data.ClassifyId })
 
 			if(Ret !== 200) return
-			this.$message.success('删除成功');
+			this.$message.success(this.$t('MsgPrompt.delete_msg'));
 			this.cancelHandle();
 			this.$emit('success');
 		},

+ 7 - 7
src/views/system_manage/dataAuthManage.vue

@@ -6,7 +6,7 @@
 		:props="classifyProp"
 		:show-all-levels="false"
 		style="width: 500px"
-		placeholder="用户名称"
+		:placeholder="$t('SystemManage.DataAuth.placehloder_msg01')"
 		filterable
 		clearable
 		@change="chooseUser"
@@ -61,18 +61,18 @@
 						class="el-icon-circle-plus-outline"
 						style="color: #5882ef; font-size: 16px"
 					/>
-					<span>手工指标分类</span>
+					<span>{{$t('SystemManage.DataAuth.title')}}</span>
 				</span>
 			</div>
 			<div class="btn-cont" v-if="userList.length">
-				<el-button type="primary" class="btn" @click="saveAuthHandle">保存</el-button>
-				<el-button type="primary" plain class="btn" @click="getAuth">取消</el-button>
+				<el-button type="primary" class="btn" @click="saveAuthHandle">{{$t('Dialog.confirm_save_btn')}}</el-button>
+				<el-button type="primary" plain class="btn" @click="getAuth">{{$t('Dialog.cancel_btn')}}</el-button>
 			</div>
 		</div>
 
 		<!-- 修改分类弹窗 -->
 		<authDialog
-			:title="formData.classifyId?'编辑分类':'添加分类'"
+			:title="formData.classifyId?$t('SystemManage.DataAuth.edit_category'):$t('SystemManage.DataAuth.add_category')"
 			:isOpenDialog.sync="isOpenDialog"
 			:form="formData"
 			@closeDia="isOpenDialog=false"
@@ -229,7 +229,7 @@ export default {
 		/* 保存权限 */
 		saveAuthHandle() {
 			if(!this.default_user) {
-				this.$message.warning("请选择用户");
+				this.$message.warning(this.$t('SystemManage.DataAuth.msg01'));
 			}else {
 				let arr = [];
 				this.authList.map(item => {
@@ -246,7 +246,7 @@ export default {
 				}
 				dataAuthInterface.saveAuth(params).then(res => {
 					if(res.Ret === 200) {
-						this.$message.success('保存成功');
+						this.$message.success(this.$t('MsgPrompt.saved_msg'));
 					}
 				})
 			}

+ 94 - 94
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();
 					}
 				})

+ 97 - 53
src/views/system_manage/enAuthManage.vue

@@ -4,7 +4,7 @@
       <div class="select">
         <el-cascader
           v-model="users"
-          placeholder="请选择用户"
+          :placeholder="$t('SystemManage.DataAuth.msg01')"
           :options="options"
           :props="props"
           collapse-tags
@@ -18,7 +18,7 @@
           type="primary"
           style="margin-left: 20px"
           @click="addAdmins"
-          >确 定</el-button
+          >{{$t('Dialog.confirm_btn')}}</el-button
         >
       </div>
       <div class="result-list">
@@ -30,7 +30,7 @@
     </div>
     <div class="operations-table">
       <div class="table-title">
-        <span>英文权限列表</span>
+        <span>{{$t('SystemManage.EnAuthSet.title')}}</span>
       </div>
       <el-table :data="tableData" border v-loading="isShowloadding">
         <el-table-column
@@ -43,7 +43,7 @@
         >
           <template slot-scope="{ row }">
             <span v-if="item.key === 'Enabled'">
-              {{ row[item.key] === 0 ? "已禁用" : "已启用" }}
+              {{ row[item.key] === 0 ? $t('SystemManage.EnAuthSet.enable') : $t('SystemManage.EnAuthSet.opened')  }}
             </span>
             <div v-else-if="item.key === 'RealName'">
               <el-tag
@@ -57,14 +57,14 @@
                 style="position: absolute; left: 10px"
                 >{{
                   row.LabelVal == 1
-                    ? "超管"
+                    ? $t('SystemManage.DepartManage.use_tag01')
                     : row.LabelVal == 2
-                    ? "管理员"
+                    ? $t('SystemManage.DepartManage.use_tag02')
                     : row.LabelVal == 3
-                    ? "部门经理"
+                    ? $t('SystemManage.DepartManage.use_tag03')
                     : row.LabelVal == 4
-                    ? "组长"
-                    : "主管"
+                    ? $t('SystemManage.DepartManage.use_tag04')
+                    : $t('SystemManage.DepartManage.use_tag05')
                 }}</el-tag
               >
               <span style="position: relative">{{ row.RealName }}</span>
@@ -72,13 +72,13 @@
             <span v-else>{{ row[item.key] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center">
+        <el-table-column :label="$t('Table.column_operations')" align="center">
           <template slot="header" slot-scope="{}">
-            <span>操作</span>
+            <span>{{$t('Table.column_operations')}}</span>
             <el-tooltip
               effect="dark"
               placement="top-start"
-              content="删除操作仅删除该用户的英文权限"
+              :content="$t('SystemManage.EnAuthSet.tips')"
             >
               <i class="el-icon-question" />
             </el-tooltip>
@@ -87,16 +87,16 @@
             <span v-permission="permissionBtn.sysDepartPermission.enAuthManage_settingAuth"
               @click="setAuth(row)"
               style="cursor: pointer; color:#409eff;margin-right: 5px;"
-            >设置权限</span>
+            >{{$t('SystemManage.RoleManage.set_permission')}}</span>
             <span v-permission="permissionBtn.sysDepartPermission.enAuthManage_del"
               @click="handleDeleteAuth(row)"
               style="cursor: pointer; color: #d1433a"
-              >删除</span
+              >{{$t('Table.delete_btn')}}</span
             >
           </template>
         </el-table-column>
         <div slot="empty" style="lineheight: 44px; margin: 60px 0; color: #999">
-          <tableNoData text="暂无数据" size="mini"/>
+          <tableNoData :text="$t('Table.prompt_slogan')" size="mini"/>
         </div>
       </el-table>
       <el-pagination
@@ -117,24 +117,24 @@
       :modal-append-to-body	="false"
       :visible.sync="setAuthData.show" 
       width="689px" 
-      title="设置权限"
+      :title="$t('SystemManage.RoleManage.set_permission')"
     >
       <div class="dialog-content-wrap">
         <div class="user-info">
-          <span>姓名:{{setAuthData.RealName}}</span>
-          <span>角色:{{setAuthData.RoleName}}</span>
-          <span>部门/组织:{{setAuthData.DepartmentGroup}}</span>
+          <span>{{$t('SystemManage.DepartManage.user_table_name')}}:{{setAuthData.RealName}}</span>
+          <span>{{$t('SystemManage.DepartManage.user_table_role')}}:{{setAuthData.RoleName}}</span>
+          <span>{{$t('SystemManage.DepartManage.user_table_depart')}}:{{setAuthData.DepartmentGroup}}</span>
         </div>
         <div class="select-list">
-          <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
+          <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">{{$t('Common.all_select')}}</el-checkbox>
             <el-checkbox-group v-model="setAuthData.selectList" @change="handleCheckedChange">
               <el-checkbox v-for="auth in authOptions" :label="auth.code" :key="auth.code" >{{auth.label}}</el-checkbox>
             </el-checkbox-group>
         </div>
       </div>
       <div slot="footer" class="foot-container">
-        <el-button type="primary" @click="saveChange">确 定</el-button>
-        <el-button @click="setAuthData.show=false">取 消</el-button>
+        <el-button type="primary" @click="saveChange">{{$t('Dialog.confirm_btn')}}</el-button>
+        <el-button @click="setAuthData.show=false">{{$t('Dialog.cancel_btn')}}</el-button>
       </div>
     </el-dialog>
   </div>
@@ -143,33 +143,77 @@
 <script>
 import { departInterence,enAuthInterence } from "@/api/api.js";
 export default {
-  data() {
-    return {
-      users: "",
-      selectList: [],
-      tableColumns: [
+  computed:{
+    tableColumns(){
+      return [
         {
-          label: "姓名",
+          label: this.$t('SystemManage.DepartManage.user_table_name'),
           key: "RealName",
           width:"200"
         },
         {
-          label: "手机号",
+          label: this.$t('SystemManage.DepartManage.user_table_mobile'),
           key: "Mobile",
         },
         {
-          label: "角色",
+          label: this.$t('SystemManage.DepartManage.user_table_role'),
           key: "RoleName",
         },
         {
-          label: "部门/分组",
+          label: this.$t('SystemManage.DepartManage.user_table_depart'),
           key: "DepartmentGroup",
         },
         {
-          label: "状态",
+          label: this.$t('SystemManage.DepartManage.user_table_status'),
           key: "Enabled",
         },
-      ],
+      ]
+    },
+    authOptions(){
+      return [
+        {
+          code:'english_company_admin',
+          label:this.$t('SystemManage.EnAuthSet.opt_text01')
+        },{
+          code:'english_report_admin',
+          label:this.$t('SystemManage.EnAuthSet.opt_text02')
+        },{
+          code:'english_ppt_admin',
+          label:this.$t('SystemManage.EnAuthSet.opt_text03')
+        },{
+          code:'english_day_new_admin',
+          label: this.$t('SystemManage.EnAuthSet.opt_text04')
+        }
+      ]
+    }
+  },
+  data() {
+    return {
+      users: "",
+      selectList: [],
+      // tableColumns: [
+      //   {
+      //     label: "姓名",
+      //     key: "RealName",
+      //     width:"200"
+      //   },
+      //   {
+      //     label: "手机号",
+      //     key: "Mobile",
+      //   },
+      //   {
+      //     label: "角色",
+      //     key: "RoleName",
+      //   },
+      //   {
+      //     label: "部门/分组",
+      //     key: "DepartmentGroup",
+      //   },
+      //   {
+      //     label: "状态",
+      //     key: "Enabled",
+      //   },
+      // ],
       options: [],
       props: {
         value: "AdminId",
@@ -192,20 +236,20 @@ export default {
         RoleName:'',
         selectList:[]
       },
-      authOptions:[
-        {
-          code:'english_company_admin',
-          label:'英文客户列表管理员'
-        },{
-          code:'english_report_admin',
-          label:'英文研报管理员'
-        },{
-          code:'english_ppt_admin',
-          label:'英文PPT管理员'
-        },{
-          code:'english_day_new_admin',
-          label: '每日资讯管理员'
-        }],//权限设置页面选项
+      // authOptions:[
+      //   {
+      //     code:'english_company_admin',
+      //     label:'英文客户列表管理员'
+      //   },{
+      //     code:'english_report_admin',
+      //     label:'英文研报管理员'
+      //   },{
+      //     code:'english_ppt_admin',
+      //     label:'英文PPT管理员'
+      //   },{
+      //     code:'english_day_new_admin',
+      //     label: '每日资讯管理员'
+      //   }],//权限设置页面选项
       isIndeterminate:false,//权限设置 全选样式
       checkAll:true,//权限设置 全选值
     };
@@ -254,11 +298,11 @@ export default {
     },
     handleDeleteAuth(item) {
       this.$confirm(
-          '确定要删除吗',
-          '提示',
+          this.$t('MsgPrompt.confirm_del_msg'),
+          this.$t('Confirm.prompt'),
           {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
+              confirmButtonText: this.$t('Dialog.confirm_btn'),
+              cancelButtonText: this.$t('Dialog.cancel_btn'),
               type: 'warning',
           }
         ).then(()=>{
@@ -270,7 +314,7 @@ export default {
         AdminId: AdminId,
       });
       if (res.Ret === 200) {
-        this.$message.success("删除成功");
+        this.$message.success(this.$t('MsgPrompt.delete_msg'));
         this.page_no = 1
         this.getTableData();
       }
@@ -358,7 +402,7 @@ export default {
         RoleTypeCodes:selectList.join(',')
       })
       if(res.Ret!==200) return
-      this.$message.success('设置成功')
+      this.$message.success(this.$t('MsgPrompt.set_success_msg'))
       this.setAuthData.show = false
     }
   },

+ 60 - 54
src/views/system_manage/etaBaseConfig.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="eta-base-config">
         <div class="nav-type-box">
-            <span :class="[sectionType===1?'active':'']" @click="sectionType=1">通用设置</span>
-            <span :class="[sectionType===2?'active':'']" @click="sectionType=2" v-if="isShowSource">资源库</span>
+            <span :class="[sectionType===1?'active':'']" @click="sectionType=1">{{$t('SystemManage.BaseConfig.tab01')}}</span>
+            <span :class="[sectionType===2?'active':'']" @click="sectionType=2" v-if="isShowSource">{{$t('SystemManage.BaseConfig.tab02')}}</span>
         </div>
         <!-- 通用设置 -->
         <template v-if="sectionType==1">
@@ -15,12 +15,12 @@
             ref="baseConfigForm"
         >
             <div class="part-type-box" style="margin-bottom:40px">
-                <el-button v-if="isShowLoginConfig" type="primary" :plain="partType===1?false:true" @click="partType=1" :style="{width:'120px',border:'none',color:partType==1?'#fff':'#333'}">登录设置</el-button>
-                <el-button type="primary" :plain="partType===2?false:true" @click="partType=2" :style="{width:'120px',border:'none',color:partType==2?'#fff':'#333'}">研报设置</el-button>
-                <el-button type="primary" :plain="partType===3?false:true" v-if="isShowPPT||isShowEnPPT" @click="partType=3" :style="{width:'120px',border:'none',color:partType==3?'#fff':'#333'}">PPT配置</el-button>
+                <el-button v-if="isShowLoginConfig" type="primary" :plain="partType===1?false:true" @click="partType=1" :style="{border:'none',color:partType==1?'#fff':'#333'}">{{$t('SystemManage.BaseConfig.sub_tab01')}}</el-button>
+                <el-button type="primary" :plain="partType===2?false:true" @click="partType=2" :style="{border:'none',color:partType==2?'#fff':'#333'}">{{$t('SystemManage.BaseConfig.sub_tab02')}}</el-button>
+                <el-button type="primary" :plain="partType===3?false:true" v-if="isShowPPT||isShowEnPPT" @click="partType=3" :style="{border:'none',color:partType==3?'#fff':'#333'}">{{$t('SystemManage.BaseConfig.sub_tab03')}}</el-button>
                 <div class="btn-wrap" style="text-align: center;float:right">
-                    <el-button type="primary" plain style="width:120px;" @click="cancel">取消</el-button>
-                    <el-button type="primary"  style="margin-left:20px;width:120px;" @click="saveBaseConfig">保存</el-button>
+                    <el-button type="primary" plain style="width:120px;" @click="cancel">{{$t('Dialog.cancel_btn')}}</el-button>
+                    <el-button type="primary"  style="margin-left:20px;width:120px;" @click="saveBaseConfig">{{$t('Dialog.confirm_save_btn')}}</el-button>
                 </div>
             </div>
             <!-- 登录设置模块 -->
@@ -54,11 +54,11 @@
                             <el-input type="text" v-model.trim="formData.SmsJhgjAppKey" placeholder="请输入国外短信模板appkey" style="width: calc(50% - 10px);" />
                         </div>
                     </el-form-item> -->
-                    <el-form-item label="邮件模板" prop="LoginEmailTemplateSubject" >
+                    <el-form-item :label="$t('SystemManage.BaseConfig.email_tem')" prop="LoginEmailTemplateSubject" >
                         <div class="form-item-type-two">
-                            <el-input type="text" v-model="formData.LoginEmailTemplateSubject" placeholder="请输入邮件标题" >
+                            <el-input type="text" v-model="formData.LoginEmailTemplateSubject" :placeholder="$t('SystemManage.BaseConfig.email_placeholder')" >
                                 <template slot="suffix">
-                                        <el-tooltip content="登陆系统或找回密码或验证身份" placement="top">
+                                        <el-tooltip :content="$t('SystemManage.BaseConfig.email_tips')" placement="top">
                                     <div class="input-suffix">
                                         <img src="~@/assets/img/icons/warn-circle-gray.png" />
                                     </div>
@@ -73,18 +73,18 @@
                             tag="textarea" 
                             :config="{...disclaimerConfig,...emailEditorConfig}" v-model="formData.LoginEmailTemplateContent">
                         </froala>
-                        <ConfigAnnotation picName="emailContentTemplate" @showImage="previewImage" picHintText=""/>
+                        <ConfigAnnotation picName="emailContentTemplate" @showImage="previewImage" picHintText="" :buttonText="$t('SystemManage.BaseConfig.view_example_text')"/>
                     </el-form-item>
                 </div>
             </div>
             <!-- 研报设置 -->
             <div class="part" v-show="partType===2">
                 <div class="side">
-                    <el-form-item label="公司名称" prop="CompanyName">
-                        <el-input type="text" v-model="formData.CompanyName" placeholder="请输入公司名称" />
-                        <ConfigAnnotation picHintText="" picName="CompanyName" @showImage="previewImage"/>
+                    <el-form-item :label="$t('SystemManage.BaseConfig.company_name')" prop="CompanyName">
+                        <el-input type="text" v-model="formData.CompanyName" :placeholder="$t('SystemManage.BaseConfig.company_name_placeholder')" />
+                        <ConfigAnnotation picHintText="" :buttonText="$t('SystemManage.BaseConfig.view_example_text')" picName="CompanyName" @showImage="previewImage"/>
                     </el-form-item>
-                    <el-form-item label="公司水印" prop="CompanyWatermark" class="watermark">
+                    <el-form-item :label="$t('SystemManage.BaseConfig.compay_mark')" prop="CompanyWatermark" class="watermark">
                         <ImgUpload 
                             :imgUrl="formData.CompanyWatermark"
                             @showImage="showImage"
@@ -92,16 +92,16 @@
                             @remove="deleteFormImg('CompanyWatermark')"
                             />
                         <!-- 后面可能会有新的选项 -->
-                        <div style="position: absolute;top: -40px;left: 100px;display:flex;gap:0 20px">
+                        <div style="position: absolute;top: -40px;left: 140px;display:flex;gap:0 20px">
                             <el-checkbox-group v-if="isShowYBChart"
                                 v-model="checkList" >
-                                <el-checkbox label="研报图表"></el-checkbox>
+                                <el-checkbox label="研报图表">{{$t('SystemManage.BaseConfig.report_chart')}}</el-checkbox>
                             </el-checkbox-group>
                             <div v-if="isShowYBShare">
-                                <el-checkbox label="研报分享" v-model="formData.WatermarkReport"></el-checkbox>
+                                <el-checkbox label="研报分享" v-model="formData.WatermarkReport">{{$t('SystemManage.BaseConfig.report_share')}}</el-checkbox>
                                 <el-tooltip 
                                     effect="dark" 
-                                    content="研报详情分享页水印,水印内容为分享人用户名称+手机号(无手机号时为邮箱地址)" 
+                                    :content="$t('SystemManage.BaseConfig.report_share_tips')" 
                                     placement="top"
                                 >
                                     <i class="el-icon-warning"></i>
@@ -109,9 +109,9 @@
                             </div>
                             
                         </div>
-                        <ConfigAnnotation picName="CompanyWatermark" @showImage="previewImage"/>
+                        <ConfigAnnotation :picHintText="$t('SystemManage.BaseConfig.upload_format')" :buttonText="$t('SystemManage.BaseConfig.view_example_text')" picName="CompanyWatermark" @showImage="previewImage"/>
                     </el-form-item>
-                    <el-form-item label="免责声明" prop="Disclaimer" class="disclaimer">
+                    <el-form-item :label="$t('SystemManage.BaseConfig.disclaimer')" prop="Disclaimer" class="disclaimer">
                         <div class="rich-editor-wrap">
                             <froala :id="`disclaimer-editor`"
                                 :ref="`disclaimerEditor`" 
@@ -119,42 +119,42 @@
                                 :config="disclaimerConfig" v-model="formData.Disclaimer">
                             </froala>
                         </div>
-                        <ConfigAnnotation picHintText="" picName="Disclaimer" @showImage="previewImage"/>
+                        <ConfigAnnotation picHintText="" :buttonText="$t('SystemManage.BaseConfig.view_example_text')" picName="Disclaimer" @showImage="previewImage"/>
                     </el-form-item>
                     <div v-if="isShowXunFei">
                         <!-- 科大讯飞 -->
                         <div style="width:100%;">
-                            <span style="color:#606266;">科大讯飞服务</span> 
+                            <span style="color:#606266;">{{$t('SystemManage.BaseConfig.iFLYTEK_service')}}</span> 
                             <el-switch v-model="Iflytek"></el-switch>
                         </div>
                         <template v-if="Iflytek">
                             <el-form-item label="APPID" prop="XfAppid">
-                                <el-input type="text" v-model="formData.XfAppid" placeholder="请输入APPID" />
+                                <el-input type="text" v-model="formData.XfAppid" :placeholder="$t('SystemManage.BaseConfig.please_enter')+'APPID'" />
                             </el-form-item>
                             <el-form-item label="APIKey" prop="XfApiKey">
-                                <el-input type="text" v-model="formData.XfApiKey" placeholder="请输入APIKey" />
+                                <el-input type="text" v-model="formData.XfApiKey" :placeholder="$t('SystemManage.BaseConfig.please_enter')+'APIKey'" />
                             </el-form-item>
                             <el-form-item label="APISecret" prop="XfApiSecret">
-                                <el-input type="text" v-model="formData.XfApiSecret" placeholder="请输入APISecret" />
+                                <el-input type="text" v-model="formData.XfApiSecret" :placeholder="$t('SystemManage.BaseConfig.please_enter')+'APISecret'" />
                             </el-form-item>
                             <el-form-item label="vcn(voice_name)" prop="XfVcn">
-                                <el-input type="text" v-model="formData.XfVcn" placeholder="请输入voice_name" />
+                                <el-input type="text" v-model="formData.XfVcn" :placeholder="$t('SystemManage.BaseConfig.please_enter')+'voice_name'" />
                             </el-form-item>
                         </template>
                     </div>
                     <!-- 研报审批 -->
                     <div v-if="isShowApprove">
                         <div style="width:100%;margin-bottom: 20px;">
-                            <span style="color:#606266;">研报审批</span> 
+                            <span style="color:#606266;">{{$t('SystemManage.BaseConfig.report_approval')}}</span> 
                             <el-switch v-model="approve"></el-switch>
                         </div>
                         <div class="side" v-if="approve">
                             <el-form-item label="" prop="ReportApproveType">
                                 <el-radio-group v-model="formData.ReportApproveType">
-                                    <el-radio label="eta">ETA内部审批</el-radio>
+                                    <el-radio label="eta">{{$t('SystemManage.BaseConfig.internal_approval')}}</el-radio>
                                     <el-radio label="other">
-                                        <span>第三方审批</span>
-                                        <el-tooltip effect="dark" placement="top" content="中文研报(智能研报/研报列表)通过API接口对接第三方审批系统" >
+                                        <span>{{$t('SystemManage.BaseConfig.third_approval')}}</span>
+                                        <el-tooltip effect="dark" placement="top" :content="$t('SystemManage.BaseConfig.third_approval_tips')" >
                                             <span class="hint-text">
                                                 <i class="el-icon-warning-outline"></i>
                                             </span>
@@ -166,22 +166,22 @@
                     </div>
                 </div>
                 <div class="side">
-                    <el-form-item label="中文研报分享抬头" prop="H5ShareName">
-                        <el-input type="text" v-model="formData.H5ShareName" placeholder="请输入中文研报分享抬头" />
+                    <el-form-item :label="$t('SystemManage.BaseConfig.report_share_title_zh')" prop="H5ShareName">
+                        <el-input type="text" v-model="formData.H5ShareName" :placeholder="$t('SystemManage.BaseConfig.report_share_title_zh_placeholder')" />
                     </el-form-item>
-                    <el-form-item label="英文研报分享抬头" prop="H5ShareEnName">
-                        <el-input type="text" v-model="formData.H5ShareEnName" placeholder="请输入英文研报分享抬头" />
+                    <el-form-item :label="$t('SystemManage.BaseConfig.report_share_title_en')" prop="H5ShareEnName">
+                        <el-input type="text" v-model="formData.H5ShareEnName" :placeholder="$t('SystemManage.BaseConfig.report_share_title_en_placeholder')" />
                     </el-form-item>
-                    <el-form-item label="关联公众号" prop="WxAppId">
-                        <el-input type="text" v-model.trim="formData.WxAppId" placeholder="请输入AppID" />
+                    <el-form-item :label="$t('SystemManage.BaseConfig.connect_wx')" prop="WxAppId">
+                        <el-input type="text" v-model.trim="formData.WxAppId" :placeholder="$t('SystemManage.BaseConfig.please_enter')+'AppID'" />
                     </el-form-item>
                     <el-form-item prop="WxAppSecret">
-                        <el-input type="text" v-model.trim="formData.WxAppSecret" placeholder="请输入AppSecret" />
+                        <el-input type="text" v-model.trim="formData.WxAppSecret" :placeholder="$t('SystemManage.BaseConfig.please_enter')+'AppSecret'" />
                     </el-form-item>
                     <el-form-item prop="WxId">
-                        <el-input type="text" v-model.trim="formData.WxId" placeholder="请输入原始Id" />
+                        <el-input type="text" v-model.trim="formData.WxId" :placeholder="$t('SystemManage.BaseConfig.wx_original_id')" />
                     </el-form-item>
-                    <div class="input-hint">注:关联公众号填写时,AppID、AppSecret原始ID均需填写。</div>
+                    <div class="input-hint">{{$t('SystemManage.BaseConfig.wx_original_tips')}}</div>
                     <el-form-item  prop="H5ReportShareImg">
                         <ImgUpload 
                             :imgUrl="formData.H5ReportShareImg"
@@ -197,8 +197,8 @@
             <!-- PPT配置 -->
             <div class="part" v-if="isShowPPT||isShowEnPPT" v-show="partType===3">
                 <el-radio-group v-model="pptLang" style="margin-bottom: 22px;">
-                    <el-radio-button label="cn">中文PPT</el-radio-button>
-                    <el-radio-button label="en">英文PPT</el-radio-button>
+                    <el-radio-button label="cn">{{$t('SystemManage.BaseConfig.ppt_zh')}}</el-radio-button>
+                    <el-radio-button label="en">{{$t('SystemManage.BaseConfig.ppt_en')}}</el-radio-button>
                 </el-radio-group>
                 <div v-if="isShowPPT" v-show="pptLang === 'cn'" class="ppt-form-item-wrap">
                     <!-- <div class="inner-input-wrap">
@@ -213,7 +213,7 @@
                         </el-form-item>
                     </div> -->
                     
-                    <el-form-item label="PPT封面图" prop="CnPptCoverImgs" style="min-width:400px;">
+                    <el-form-item :label="$t('SystemManage.BaseConfig.ppt_type01')" prop="CnPptCoverImgs" style="min-width:400px;">
                         <div class="input-line" style="display:flex;">
                             <ImgUpload 
                                 :imgUrl="formData.CnPptCoverImgs.length===3?formData.CnPptCoverImgs[2]:''"
@@ -227,9 +227,10 @@
                                 @deleteImg="(index)=>{deleteFormImg('CnPptCoverImgs',index)}"/>
                         </div>
                         <ConfigAnnotation picName="pptCoverList" @showImage="previewImage"
-                            picHintText="上传格式:png、jpg,最多上传三张,建议图片比例:10:7"/>
+                            :picHintText="$t('SystemManage.BaseConfig.ppt_tip01')"
+                            :buttonText="$t('SystemManage.BaseConfig.view_example_text')"/>
                     </el-form-item>
-                    <el-form-item label="PPT背景图" prop="CnPptBackgroundImg">
+                    <el-form-item :label="$t('SystemManage.BaseConfig.ppt_type02')" prop="CnPptBackgroundImg">
                         <ImgUpload 
                             :imgUrl="formData.CnPptBackgroundImg"
                             @showImage="showImage"
@@ -237,9 +238,10 @@
                             @remove="deleteFormImg('CnPptBackgroundImg')"
                             />
                         <ConfigAnnotation picName="pptBgPic" @showImage="previewImage"
-                            picHintText="上传格式:png、jpg,建议图片比例:10:7"/>
+                            :picHintText="$t('SystemManage.BaseConfig.ppt_tip02')"
+                            :buttonText="$t('SystemManage.BaseConfig.view_example_text')"/>
                     </el-form-item>
-                    <el-form-item label="PPT封底图" prop="CnPptBottomImg">
+                    <el-form-item :label="$t('SystemManage.BaseConfig.ppt_type03')" prop="CnPptBottomImg">
                         <ImgUpload 
                             :imgUrl="formData.CnPptBottomImg"
                             @showImage="showImage"
@@ -247,7 +249,8 @@
                             @remove="deleteFormImg('CnPptBottomImg')"
                             />
                         <ConfigAnnotation picName="pptBackPic" @showImage="previewImage"
-                            picHintText="上传格式:png、jpg,建议图片比例:10:7"/>
+                            :picHintText="$t('SystemManage.BaseConfig.ppt_tip03')"
+                            :buttonText="$t('SystemManage.BaseConfig.view_example_text')"/>
                     </el-form-item>
                 </div>
                 <div v-if="isShowEnPPT" v-show="pptLang === 'en'" class="ppt-form-item-wrap">
@@ -262,7 +265,7 @@
                             <el-input type="color" style="width:64px;" v-model="formData.PptFontColorEn"></el-input>
                         </el-form-item>
                     </div> -->
-                    <el-form-item label="PPT封面图" prop="EnPptCoverImgs" style="min-width:400px;">
+                    <el-form-item :label="$t('SystemManage.BaseConfig.ppt_type01')" prop="EnPptCoverImgs" style="min-width:400px;">
                         <div class="input-line" style="display:flex;">
                             <ImgUpload 
                                 :imgUrl="formData.EnPptCoverImgs.length===3?formData.EnPptCoverImgs[2]:''"
@@ -276,9 +279,10 @@
                                 @deleteImg="(index)=>{deleteFormImg('EnPptCoverImgs',index)}"/>
                         </div>
                         <ConfigAnnotation picName="pptCoverList" @showImage="previewImage"
-                            picHintText="上传格式:png、jpg,最多上传三张,建议图片比例:10:7"/>
+                            :picHintText="$t('SystemManage.BaseConfig.ppt_tip01')"
+                            :buttonText="$t('SystemManage.BaseConfig.view_example_text')"/>
                     </el-form-item>
-                    <el-form-item label="PPT背景图" prop="EnPptBackgroundImg">
+                    <el-form-item :label="$t('SystemManage.BaseConfig.ppt_type02')" prop="EnPptBackgroundImg">
                         <ImgUpload 
                             :imgUrl="formData.EnPptBackgroundImg"
                             @showImage="showImage"
@@ -286,9 +290,10 @@
                             @remove="deleteFormImg('EnPptBackgroundImg')"
                             />
                         <ConfigAnnotation picName="pptBgPic" @showImage="previewImage"
-                            picHintText="上传格式:png、jpg,建议图片比例:10:7"/>
+                            :picHintText="$t('SystemManage.BaseConfig.ppt_tip02')"
+                            :buttonText="$t('SystemManage.BaseConfig.view_example_text')"/>
                     </el-form-item>
-                    <el-form-item label="PPT封底图" prop="EnPptBottomImg">
+                    <el-form-item :label="$t('SystemManage.BaseConfig.ppt_type03')" prop="EnPptBottomImg">
                         <ImgUpload 
                             :imgUrl="formData.EnPptBottomImg"
                             @showImage="showImage"
@@ -296,7 +301,8 @@
                             @remove="deleteFormImg('EnPptBottomImg')"
                             />
                         <ConfigAnnotation picName="pptBackPic" @showImage="previewImage"
-                            picHintText="上传格式:png、jpg,建议图片比例:10:7"/>
+                            :picHintText="$t('SystemManage.BaseConfig.ppt_tip03')"
+                            :buttonText="$t('SystemManage.BaseConfig.view_example_text')"/>
                     </el-form-item>
                 </div>
             </div>

+ 1 - 1
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()
             })
         },

+ 6 - 6
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()
             })
         },

+ 39 - 30
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],
       }

+ 19 - 19
src/views/system_manage/outlinkListConfig.vue

@@ -2,34 +2,34 @@
   <div id="outlink-list-config" class="outlink-list-config">
     <div class="outlink-top-button-zone">
       <el-button type="primary" @click="addOutlink" 
-      v-permission="permissionBtn.outlinkConfigPermission.outlinkListConfig_add">添加菜单</el-button>
+      v-permission="permissionBtn.outlinkConfigPermission.outlinkListConfig_add">{{$t('SystemManage.OutLinkConfig.menu_add_btn')}}</el-button>
     </div>
     <el-table :data="outlinkData" border @sort-change="sortChange">
-      <el-table-column label="菜单名称" prop="Title" align="center">
+      <el-table-column :label="$t('SystemManage.OutLinkConfig.tale_col01')" prop="Title" align="center">
         <template slot-scope="{ row }">
           {{ row.Title }}
         </template>
       </el-table-column>
-      <el-table-column label="页面链接" prop="Url" align="center">
+      <el-table-column :label="$t('SystemManage.OutLinkConfig.tale_col02')" prop="Url" align="center">
         <template slot-scope="{ row }">
           {{ row.Url }}
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" prop="CreateTime" align="center" sortable >
+      <el-table-column :label="$t('SystemManage.OutLinkConfig.tale_col03')" prop="CreateTime" align="center" sortable >
         <template slot-scope="{ row }">
           {{ row.CreateTime }}
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center">
+      <el-table-column :label="$t('Table.column_operations')" align="center">
         <template slot-scope="{ row }">
           <span class="table-button" @click="editOutlink(row)" 
-          v-permission="permissionBtn.outlinkConfigPermission.outlinkListConfig_edit">编辑</span>
+          v-permission="permissionBtn.outlinkConfigPermission.outlinkListConfig_edit">{{$t('Table.edit_btn')}}</span>
           <span class="table-button" style="color: #C54322;" @click="deleteOutlink(row)"
-          v-permission="permissionBtn.outlinkConfigPermission.outlinkListConfig_del">删除</span>
+          v-permission="permissionBtn.outlinkConfigPermission.outlinkListConfig_del">{{$t('Table.delete_btn')}}</span>
         </template>
       </el-table-column>
       <div slot="empty" style="line-height: 44px; margin: 60px 0; color: #999">
-        <tableNoData text="暂无数据" size="mini"/>
+        <tableNoData :text="$t('Table.prompt_slogan')" size="mini"/>
       </div>
     </el-table>
     <m-page
@@ -50,16 +50,16 @@
         <el-form
         :model="outlinkForm"
         ref="outlinkFormRef"
-        label-width="90px">
-          <el-form-item prop="Title" label="菜单名称" :rules="{required:true,message:'菜单名称不能为空',trigger:'blur'}">
-              <el-input v-model="outlinkForm.Title" placeholder="请输入菜单名称" style="width: 295px;"></el-input>
+        label-width="100px">
+          <el-form-item prop="Title" :label="$t('SystemManage.OutLinkConfig.tale_col01')" :rules="{required:true,message:'菜单名称不能为空',trigger:'blur'}">
+              <el-input v-model="outlinkForm.Title" :placeholder="$t('SystemManage.OutLinkConfig.placeholder01')" style="width: 295px;"></el-input>
           </el-form-item>
-          <el-form-item prop="Url" label="页面链接" :rules="{required:true,message:'URL不能为空',trigger:'blur'}">
-              <el-input v-model="outlinkForm.Url" placeholder="请输入URL" style="width: 295px;"></el-input>
+          <el-form-item prop="Url" :label="$t('SystemManage.OutLinkConfig.tale_col02')" :rules="{required:true,message:'URL不能为空',trigger:'blur'}">
+              <el-input v-model="outlinkForm.Url" :placeholder="$t('SystemManage.OutLinkConfig.placeholder02')" style="width: 295px;"></el-input>
           </el-form-item>
           <div class="form-box-buttons-zone">
-            <el-button style="width: 120px;height: 40px;" @click="addOutlinkShow=false">取消</el-button>
-            <el-button type="primary" @click="addOutlinkSave" style="margin-left:30px;width: 120px;height: 40px;">确定</el-button>
+            <el-button style="width: 120px;height: 40px;" @click="addOutlinkShow=false">{{$t('Dialog.cancel_btn')}}</el-button>
+            <el-button type="primary" @click="addOutlinkSave" style="margin-left:30px;width: 120px;height: 40px;">{{$t('Dialog.confirm_btn')}}</el-button>
           </div>
         </el-form>
       </div>
@@ -115,12 +115,12 @@ import mPage from '@/components/mPage.vue';
         this.getOutlinkData()
       },
       addOutlink(){
-        this.dialogTitle="添加菜单"
+        this.dialogTitle=this.$t('SystemManage.OutLinkConfig.menu_add_btn')
         this.addOutlinkShow=true
       },
       editOutlink(item){
         this.outlinkForm=item
-        this.dialogTitle="编辑菜单"
+        this.dialogTitle=this.$t('SystemManage.OutLinkConfig.menu_edit_btn')
         this.addOutlinkShow=true
       },
       resetForm(){
@@ -144,12 +144,12 @@ import mPage from '@/components/mPage.vue';
         })
       },
       deleteOutlink(item){
-        this.$confirm("删除后不可恢复,确认删除吗?", "提示", {
+        this.$confirm(this.$t('MsgPrompt.delete_info_msg'), this.$t('Confirm.prompt'), {
           type: "warning"
         }).then(() => {
           outlinkConfigInterence.outlinkDelete({Id:item.Id}).then(res=>{
             if(res.Ret == 200){
-              this.$message.success("删除菜单成功")
+              this.$message.success(this.$t('SystemManage.OutLinkConfig.del_success_msg'))
               this.getOutlinkData()
             }
           })