lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改国际化配置

Browse Source
This commit is contained in:
lsymicc
2025-06-11 17:35:16 +08:00
parent 163abf604d
commit bf073f3ae6
8 changed files with 301 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
ruoyi-ui/src/lang/en.js
View File

@@ -1762,6 +1762,7 @@ export default {
btnExport: 'Export', btnExport: 'Export',
btnSubmit: 'Submit', btnSubmit: 'Submit',
btnCancel: 'Cancel', btnCancel: 'Cancel',
btnClose: 'Close',
btnExpandOrCollapse: 'Expand/Collapse', btnExpandOrCollapse: 'Expand/Collapse',
btnRefreshCache: 'Refresh Cache', btnRefreshCache: 'Refresh Cache',
@@ -1780,6 +1781,38 @@ export default {
checkDictNameIsNull: 'DictName cannot be Null', checkDictNameIsNull: 'DictName cannot be Null',
checkDictTypeIsNull: 'DictType cannot be Null', checkDictTypeIsNull: 'DictType cannot be Null',
//--------------------------------------------------------------
// 子页面data
dictCode:'DictCode',
dictLabel:'DictLabel',
dictValue:'DictValue',
dictSort:'DictSort',
placeholderDictLabel:'Enter DictLabel',
placeholderDictValue:'Enter DictValue',
placeholderCssClass:'Enter Css Class',
cssClass:'CssClass',
listClass:'ListClass',
optionDefault:'Default',
optionPrimary:'Primary',
optionSuccess:'Success',
optionInfo:'Info',
optionWarning:'Warning',
optionDanger:'Danger',
heckDictLabelIsNull: 'DictLabel cannot be Null',
heckDictValueIsNull: 'DictValue cannot be Null',
heckDictSortIsNull: 'DictSort cannot be Null',
addDictItem: 'Add Dictionary Data',
editDictItem: 'Edit Dictionary Data',
//---handleDelete---
textDeleteDictCodeConfirm1: 'Are you sure you want to delete the data item with dictCode "',
textDeleteDictCodeConfirm2: '"?',
}, },
// ***************系统管理：参数设置************* // ***************系统管理：参数设置*************
@@ -2114,6 +2147,9 @@ export default {
btnCancel: 'Cancel', btnCancel: 'Cancel',
btnMore: 'More', btnMore: 'More',
btnLog: 'Log', btnLog: 'Log',
btnDetails: 'Details',
btnClose: 'Close',
btnClear: 'Clear',
btnGenerateExpression: 'GenerateExpression', btnGenerateExpression: 'GenerateExpression',
//---------------更多-------------- //---------------更多--------------
@@ -2180,6 +2216,30 @@ export default {
//--------------其他-------------- //--------------其他--------------
lblWidthSearch: '68px', lblWidthSearch: '68px',
lblWidthDialog: '100px', lblWidthDialog: '100px',
//-------------------------------------------------------------
//---子页面---
execTime: 'ExecTime',
jobLogId: 'JobLogId',
jobMessage: 'JobMessage',
exceptionInfo: 'ExceptionInfo',
placeholderDateStart: 'DateStart',
placeholderDateEnd: 'DateEnd',
placeholderStatus: 'Select Status',
jobLogTitle: 'Job Log',
optionNormal: 'Normal',
optionFail: 'Fail',
//---函数：handleDelete---
textDeleteJobLogConfirm1: 'Are you sure you want to delete the data item with jobLog number "',
textDeleteJobLogConfirm2: '"?',
//---函数：handleClean---
textClearJobLogConfirm: 'Are you sure you want to clear all jobLogs?',
}, },
// ***************系统监控：服务监控*************** // ***************系统监控：服务监控***************

60
ruoyi-ui/src/lang/zh.js
View File

@@ -1757,6 +1757,7 @@ export default {
btnExport: '导出', btnExport: '导出',
btnSubmit: '确定', btnSubmit: '确定',
btnCancel: '取消', btnCancel: '取消',
btnClose: '关闭',
btnExpandOrCollapse: '展开/折叠', btnExpandOrCollapse: '展开/折叠',
btnRefreshCache: '刷新缓存', btnRefreshCache: '刷新缓存',
@@ -1775,6 +1776,38 @@ export default {
checkDictNameIsNull: '字典名称不能为空', checkDictNameIsNull: '字典名称不能为空',
checkDictTypeIsNull: '字典类型不能为空', checkDictTypeIsNull: '字典类型不能为空',
//--------------------------------------------------------------
// 子页面data
dictCode:'字典编码',
dictLabel:'字典标签',
dictValue:'字典键值',
dictSort:'字典排序',
placeholderDictLabel:'请输入字典标签',
placeholderDictValue:'请输入数据键值',
placeholderCssClass:'请输入样式属性',
cssClass:'样式属性',
listClass:'回显样式',
optionDefault:'默认',
optionPrimary:'主要',
optionSuccess:'成功',
optionInfo:'信息',
optionWarning:'警告',
optionDanger:'危险',
heckDictLabelIsNull: '数据标签不能为空',
heckDictValueIsNull: '数据键值不能为空',
heckDictSortIsNull: '数据顺序不能为空',
addDictItem: '新增字典数据',
editDictItem: '修改字典数据',
//---handleDelete---
textDeleteDictCodeConfirm1: '是否确认删除字典编码为"',
textDeleteDictCodeConfirm2: '"的数据项？',
}, },
// ***************系统管理：参数设置************* // ***************系统管理：参数设置*************
@@ -2107,6 +2140,9 @@ export default {
btnCancel: '取消', btnCancel: '取消',
btnMore: '更多', btnMore: '更多',
btnLog: '日志', btnLog: '日志',
btnDetails: '详情',
btnClose: '关闭',
btnClear: '清空',
btnGenerateExpression: '生成表达式', btnGenerateExpression: '生成表达式',
btnExceOnce: '执行一次', btnExceOnce: '执行一次',
@@ -2172,6 +2208,30 @@ export default {
//--------------其他-------------- //--------------其他--------------
lblWidthSearch: '68px', lblWidthSearch: '68px',
lblWidthDialog: '100px', lblWidthDialog: '100px',
//-------------------------------------------------------------
//---子页面---
execTime: '执行时间',
jobLogId: '日志编号',
jobMessage: '日志信息',
exceptionInfo: '异常信息：',
placeholderDateStart: '开始时间',
placeholderDateEnd: '结束时间',
placeholderStatus: '请选择状态',
jobLogTitle: '调度日志',
optionNormal: '正常',
optionFail: '失败',
//---函数：handleDelete---
textDeleteJobLogConfirm1: '是否确认删除定时日志编号为"',
textDeleteJobLogConfirm2: '"的数据项？',
//---函数：handleClean---
textClearJobLogConfirm: '是否确认清空所有调度日志数据项？',
}, },
// ***************系统监控：服务监控*************** // ***************系统监控：服务监控***************

114
ruoyi-ui/src/views/monitor/job/log.vue
View File

@@ -1,19 +1,21 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="任务名称" prop="jobName"> <!-- 任务名称 -->
<el-form-item :label="$t('Monitor_ScheduledTask.jobName')" prop="jobName">
<el-input <el-input
v-model="queryParams.jobName" v-model="queryParams.jobName"
placeholder="请输入任务名称" :placeholder="$t('Monitor_ScheduledTask.placeholderJobName')"
clearable clearable
style="width: 240px" style="width: 240px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="任务组名" prop="jobGroup"> <!-- 任务组名 -->
<el-form-item :label="$t('Monitor_ScheduledTask.jobGroup')" prop="jobGroup">
<el-select <el-select
v-model="queryParams.jobGroup" v-model="queryParams.jobGroup"
placeholder="请选择任务组名" :placeholder="$t('Monitor_ScheduledTask.placeholderJobGroup')"
clearable clearable
style="width: 240px" style="width: 240px"
> >
@@ -25,10 +27,11 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="执行状态" prop="status"> <!-- 状态 -->
<el-form-item :label="$t('Monitor_ScheduledTask.status')" prop="status">
<el-select <el-select
v-model="queryParams.status" v-model="queryParams.status"
placeholder="请选择执行状态" :placeholder="$t('Monitor_ScheduledTask.placeholderStatus')"
clearable clearable
style="width: 240px" style="width: 240px"
> >
@@ -40,25 +43,29 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="执行时间"> <!-- 创建时间 -->
<el-form-item :label="$t('Monitor_ScheduledTask.execTime')">
<el-date-picker <el-date-picker
v-model="dateRange" v-model="dateRange"
style="width: 240px" style="width: 240px"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="daterange" type="daterange"
range-separator="-" range-separator="-"
start-placeholder="开始日期" :start-placeholder="$t('Monitor_ScheduledTask.placeholderDateStart')"
end-placeholder="结束日期" :end-placeholder="$t('Monitor_ScheduledTask.placeholderDateEnd')"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <!-- 【查询】按钮 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('Monitor_ScheduledTask.btnSearch') }}</el-button>
<!-- 【重置】按钮 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('Monitor_ScheduledTask.btnReset') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<!-- 【删除】按钮 -->
<el-button <el-button
type="danger" type="danger"
plain plain
@@ -67,9 +74,10 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['monitor:job:remove']" v-hasPermi="['monitor:job:remove']"
>删除</el-button> >{{ $t('Monitor_ScheduledTask.btnDelete') }}</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<!-- 【清空】按钮 -->
<el-button <el-button
type="danger" type="danger"
plain plain
@@ -77,9 +85,10 @@
size="mini" size="mini"
@click="handleClean" @click="handleClean"
v-hasPermi="['monitor:job:remove']" v-hasPermi="['monitor:job:remove']"
>清空</el-button> >{{ $t('Monitor_ScheduledTask.btnClear') }}</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<!-- 【导出】按钮 -->
<el-button <el-button
type="warning" type="warning"
plain plain
@@ -87,50 +96,60 @@
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['monitor:job:export']" v-hasPermi="['monitor:job:export']"
>导出</el-button> >{{ $t('Monitor_ScheduledTask.btnExport') }}</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<!-- 【关闭】按钮 -->
<el-button <el-button
type="warning" type="warning"
plain plain
icon="el-icon-close" icon="el-icon-close"
size="mini" size="mini"
@click="handleClose" @click="handleClose"
>关闭</el-button> >{{ $t('Monitor_ScheduledTask.btnClose') }}</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="日志编号" width="80" align="center" prop="jobLogId" /> <!-- 日志编号 -->
<el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" /> <el-table-column :label=" $t('Monitor_ScheduledTask.jobLogId')" width="80" align="center" prop="jobLogId" />
<el-table-column label="任务组名" align="center" prop="jobGroup" :show-overflow-tooltip="true"> <!-- 任务名称 -->
<el-table-column :label=" $t('Monitor_ScheduledTask.jobName')" align="center" prop="jobName" :show-overflow-tooltip="true" />
<!-- 任务组名 -->
<el-table-column :label=" $t('Monitor_ScheduledTask.jobGroup')" align="center" prop="jobGroup" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.sys_job_group" :value="scope.row.jobGroup"/> <dict-tag :options="dict.type.sys_job_group" :value="scope.row.jobGroup"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" /> <!-- 调用目标字符串 -->
<el-table-column label="日志信息" align="center" prop="jobMessage" :show-overflow-tooltip="true" /> <el-table-column :label="$t('Monitor_ScheduledTask.invokeTarget')" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
<el-table-column label="执行状态" align="center" prop="status"> <!-- 日志信息 -->
<el-table-column :label="$t('Monitor_ScheduledTask.jobMessage')" align="center" prop="jobMessage" :show-overflow-tooltip="true" />
<!-- 执行状态 -->
<el-table-column :label="$t('Monitor_ScheduledTask.status')" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/> <dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="执行时间" align="center" prop="createTime" width="180"> <!-- 执行时间 -->
<el-table-column :label="$t('Monitor_ScheduledTask.execTime')" align="center" prop="createTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<el-table-column :label="$t('Monitor_ScheduledTask.operation')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- 【详细】按钮 -->
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-view" icon="el-icon-view"
@click="handleView(scope.row)" @click="handleView(scope.row)"
v-hasPermi="['monitor:job:query']" v-hasPermi="['monitor:job:query']"
>详细</el-button> >{{ $t('Monitor_ScheduledTask.btnDetails') }}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -144,36 +163,47 @@
/> />
<!-- 调度日志详细 --> <!-- 调度日志详细 -->
<el-dialog title="调度日志详细" :visible.sync="open" width="700px" append-to-body> <el-dialog :title="$t('Monitor_ScheduledTask.jobLogTitle')" :visible.sync="open" width="700px" append-to-body>
<el-form ref="form" :model="form" label-width="100px" size="mini"> <el-form ref="form" :model="form" label-width="100px" size="mini">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="日志序号：">{{ form.jobLogId }}</el-form-item> <!-- 日志序号 -->
<el-form-item label="任务名称：">{{ form.jobName }}</el-form-item> <el-form-item :label="$t('Monitor_ScheduledTask.jobLogId')">{{ form.jobLogId }}</el-form-item>
<!-- 任务名称 -->
<el-form-item :label="$t('Monitor_ScheduledTask.jobName')">{{ form.jobName }}</el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="任务分组：">{{ form.jobGroup }}</el-form-item> <!-- 任务分组 -->
<el-form-item label="执行时间：">{{ form.createTime }}</el-form-item> <el-form-item :label="$t('Monitor_ScheduledTask.jobGroup')">{{ form.jobGroup }}</el-form-item>
<!-- 执行时间 -->
<el-form-item :label="$t('Monitor_ScheduledTask.createTime')">{{ form.createTime }}</el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="调用方法：">{{ form.invokeTarget }}</el-form-item> <!-- 调用方法 -->
<el-form-item :label="$t('Monitor_ScheduledTask.invokeTarget')">{{ form.invokeTarget }}</el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="日志信息：">{{ form.jobMessage }}</el-form-item> <!-- 日志信息 -->
<el-form-item :label="$t('Monitor_ScheduledTask.jobMessage')">{{ form.jobMessage }}</el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="执行状态："> <!-- 执行状态 -->
<div v-if="form.status == 0">正常</div> <el-form-item :label="$t('Monitor_ScheduledTask.status')">
<div v-else-if="form.status == 1">失败</div> <!-- 0-正常 -->
<div v-if="form.status == 0">{{ $t('Monitor_ScheduledTask.optionNormal') }}</div>
<!-- 1-失败 -->
<div v-else-if="form.status == 1">{{ $t('Monitor_ScheduledTask.optionFail') }}</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="异常信息：" v-if="form.status == 1">{{ form.exceptionInfo }}</el-form-item> <!-- 异常信息 -->
<el-form-item :label="$t('Monitor_ScheduledTask.exceptionInfo')" v-if="form.status == 1">{{ form.exceptionInfo }}</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="open = false">关 闭</el-button> <!-- 【关闭】按钮 -->
<el-button @click="open = false">{{ $t('Monitor_ScheduledTask.btnClose') }}</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
@@ -268,20 +298,24 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const jobLogIds = this.ids const jobLogIds = this.ids
this.$modal.confirm('是否确认删除调度日志编号为"' + jobLogIds + '"的数据项？').then(function() { // 提示：是否确认删除调度日志编号为" + row.jobLogId + "的数据项？
this.$modal.confirm(this.$t('Monitor_ScheduledTask.textDeleteJobLogConfirm1') + '"' + jobLogIds + '"' + this.$t('Monitor_ScheduledTask.textDeleteJobLogConfirm2')).then(function() {
return delJobLog(jobLogIds) return delJobLog(jobLogIds)
}).then(() => { }).then(() => {
this.getList() this.getList()
this.$modal.msgSuccess("删除成功") // 提示：删除成功
this.$modal.msgSuccess(this.$t('Monitor_ScheduledTask.deleteSuccessInfo'))
}).catch(() => {}) }).catch(() => {})
}, },
/** 清空按钮操作 */ /** 清空按钮操作 */
handleClean() { handleClean() {
this.$modal.confirm('是否确认清空所有调度日志数据项？').then(function() { // 提示：是否确认清空所有调度日志数据项？
this.$modal.confirm(this.$t('Monitor_ScheduledTask.textClearJobLogConfirm')).then(function() {
return cleanJobLog() return cleanJobLog()
}).then(() => { }).then(() => {
this.getList() this.getList()
this.$modal.msgSuccess("清空成功") // 提示：清空成功
this.$modal.msgSuccess(this.$t('Monitor_ScheduledTask.clearSuccessInfo'))
}).catch(() => {}) }).catch(() => {})
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */

149
ruoyi-ui/src/views/system/dict/data.vue
View File

@@ -1,7 +1,8 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="字典名称" prop="dictType"> <!-- 字典名称 -->
<el-form-item :label="$t('systemManagement_DictManagement.dictType')" prop="dictType">
<el-select v-model="queryParams.dictType"> <el-select v-model="queryParams.dictType">
<el-option <el-option
v-for="item in typeOptions" v-for="item in typeOptions"
@@ -11,16 +12,18 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="字典标签" prop="dictLabel"> <!-- 字典标签 -->
<el-form-item :label="$t('systemManagement_DictManagement.dictLabel')" prop="dictLabel">
<el-input <el-input
v-model="queryParams.dictLabel" v-model="queryParams.dictLabel"
placeholder="请输入字典标签" :placeholder="$t('systemManagement_DictManagement.placeholderDictLabel')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <!-- 数据状态 -->
<el-select v-model="queryParams.status" placeholder="数据状态" clearable> <el-form-item :label="$t('systemManagement_DictManagement.status')" prop="status">
<el-select v-model="queryParams.status" :placeholder="$t('systemManagement_DictManagement.placeholderStatus')" clearable>
<el-option <el-option
v-for="dict in dict.type.sys_normal_disable" v-for="dict in dict.type.sys_normal_disable"
:key="dict.value" :key="dict.value"
@@ -30,13 +33,16 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <!-- 【搜索】按钮 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('systemManagement_DictManagement.btnSearch') }}</el-button>
<!-- 【重置】按钮 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('systemManagement_DictManagement.btnReset') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<!-- 【新增】按钮 -->
<el-button <el-button
type="primary" type="primary"
plain plain
@@ -44,9 +50,10 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:dict:add']" v-hasPermi="['system:dict:add']"
>新增</el-button> >{{ $t('systemManagement_DictManagement.btnAdd') }}</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<!-- 【修改】按钮 -->
<el-button <el-button
type="success" type="success"
plain plain
@@ -55,9 +62,10 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:dict:edit']" v-hasPermi="['system:dict:edit']"
>修改</el-button> >{{ $t('systemManagement_DictManagement.btnEdit') }}</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<!-- 【删除】按钮 -->
<el-button <el-button
type="danger" type="danger"
plain plain
@@ -66,9 +74,10 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:dict:remove']" v-hasPermi="['system:dict:remove']"
>删除</el-button> >{{ $t('systemManagement_DictManagement.btnDelete') }}</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<!-- 【导出】按钮 -->
<el-button <el-button
type="warning" type="warning"
plain plain
@@ -76,58 +85,69 @@
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:dict:export']" v-hasPermi="['system:dict:export']"
>导出</el-button> >{{ $t('systemManagement_DictManagement.btnExport') }}</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<!-- 【关闭】按钮 -->
<el-button <el-button
type="warning" type="warning"
plain plain
icon="el-icon-close" icon="el-icon-close"
size="mini" size="mini"
@click="handleClose" @click="handleClose"
>关闭</el-button> >{{ $t('systemManagement_DictManagement.btnClose') }}</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="字典编码" align="center" prop="dictCode" /> <!-- 字典编码 -->
<el-table-column label="字典标签" align="center" prop="dictLabel"> <el-table-column :label="$t('systemManagement_DictManagement.dictCode')" align="center" prop="dictCode" />
<!-- 字典标签 -->
<el-table-column :label="$t('systemManagement_DictManagement.dictLabel')" align="center" prop="dictLabel">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="(scope.row.listClass == '' || scope.row.listClass == 'default') && (scope.row.cssClass == '' || scope.row.cssClass == null)">{{ scope.row.dictLabel }}</span> <span v-if="(scope.row.listClass == '' || scope.row.listClass == 'default') && (scope.row.cssClass == '' || scope.row.cssClass == null)">{{ scope.row.dictLabel }}</span>
<el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass" :class="scope.row.cssClass">{{ scope.row.dictLabel }}</el-tag> <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass" :class="scope.row.cssClass">{{ scope.row.dictLabel }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="字典键值" align="center" prop="dictValue" /> <!-- 字典键值 -->
<el-table-column label="字典排序" align="center" prop="dictSort" /> <el-table-column :label="$t('systemManagement_DictManagement.dictValue')" align="center" prop="dictValue" />
<el-table-column label="状态" align="center" prop="status"> <!-- 字典排序 -->
<el-table-column :label="$t('systemManagement_DictManagement.dictSort')" align="center" prop="dictSort" />
<!-- 状态 -->
<el-table-column :label="$t('systemManagement_DictManagement.status')" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/> <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" /> <!-- 备注 -->
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> <el-table-column :label="$t('systemManagement_DictManagement.remark')" align="center" prop="remark" :show-overflow-tooltip="true" />
<!-- 创建时间 -->
<el-table-column :label="$t('systemManagement_DictManagement.createTime')" align="center" prop="createTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<el-table-column :label="$t('systemManagement_DictManagement.operation')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- 【修改】按钮 -->
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:dict:edit']" v-hasPermi="['system:dict:edit']"
>修改</el-button> >{{ $t('systemManagement_DictManagement.dictType') }}</el-button>
<!-- 【删除】按钮 -->
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:dict:remove']" v-hasPermi="['system:dict:remove']"
>删除</el-button> >{{ }}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -142,23 +162,29 @@
<!-- 添加或修改参数配置对话框 --> <!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="86px">
<el-form-item label="字典类型"> <!-- 字典类型 -->
<el-form-item :label="$t('systemManagement_DictManagement.dictType')">
<el-input v-model="form.dictType" :disabled="true" /> <el-input v-model="form.dictType" :disabled="true" />
</el-form-item> </el-form-item>
<el-form-item label="数据标签" prop="dictLabel"> <!-- 数据标签 -->
<el-input v-model="form.dictLabel" placeholder="请输入数据标签" /> <el-form-item :label="$t('systemManagement_DictManagement.dictLabel')" prop="dictLabel">
<el-input v-model="form.dictLabel" :placeholder="$t('systemManagement_DictManagement.dictType')" />
<!-- 数据键值 -->
</el-form-item> </el-form-item>
<el-form-item label="数据键值" prop="dictValue"> <el-form-item :label="$t('systemManagement_DictManagement.dictValue')" prop="dictValue">
<el-input v-model="form.dictValue" placeholder="请输入数据键值" /> <el-input v-model="form.dictValue" :placeholder="$t('systemManagement_DictManagement.dictType')" />
</el-form-item> </el-form-item>
<el-form-item label="样式属性" prop="cssClass"> <!-- 样式属性 -->
<el-input v-model="form.cssClass" placeholder="请输入样式属性" /> <el-form-item :label="$t('systemManagement_DictManagement.cssClass')" prop="cssClass">
<el-input v-model="form.cssClass" :placeholder="$t('systemManagement_DictManagement.dictType')" />
</el-form-item> </el-form-item>
<el-form-item label="显示排序" prop="dictSort"> <!-- 显示排序 -->
<el-form-item :label="$t('systemManagement_DictManagement.dictSort')" prop="dictSort">
<el-input-number v-model="form.dictSort" controls-position="right" :min="0" /> <el-input-number v-model="form.dictSort" controls-position="right" :min="0" />
</el-form-item> </el-form-item>
<el-form-item label="回显样式" prop="listClass"> <!-- 回显样式 -->
<el-form-item :label="$t('systemManagement_DictManagement.listClass')" prop="listClass">
<el-select v-model="form.listClass"> <el-select v-model="form.listClass">
<el-option <el-option
v-for="item in listClassOptions" v-for="item in listClassOptions"
@@ -168,7 +194,8 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <!-- 状态 -->
<el-form-item :label="$t('systemManagement_DictManagement.status')" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio <el-radio
v-for="dict in dict.type.sys_normal_disable" v-for="dict in dict.type.sys_normal_disable"
@@ -177,13 +204,16 @@
>{{dict.label}}</el-radio> >{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <!-- 备注 -->
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input> <el-form-item :label="$t('systemManagement_DictManagement.remark')" prop="remark">
<el-input v-model="form.remark" type="textarea" :placeholder="$t('systemManagement_DictManagement.placeholderRemark')"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <!-- 【确定】按钮 -->
<el-button @click="cancel">取 消</el-button> <el-button type="primary" @click="submitForm">{{ $t('systemManagement_DictManagement.btnSubmit') }}</el-button>
<!-- 【取消】按钮 -->
<el-button @click="cancel">{{ $t('systemManagement_DictManagement.btnCancel') }}</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
@@ -222,27 +252,33 @@ export default {
listClassOptions: [ listClassOptions: [
{ {
value: "default", value: "default",
label: "默认" // 默认
label: this.$t('systemManagement_DictManagement.optionDefault')
}, },
{ {
value: "primary", value: "primary",
label: "主要" // 主要
label: this.$t('systemManagement_DictManagement.optionPrimary')
}, },
{ {
value: "success", value: "success",
label: "成功" // 成功
label: this.$t('systemManagement_DictManagement.optionSuccess')
}, },
{ {
value: "info", value: "info",
label: "信息" // 信息
label: this.$t('systemManagement_DictManagement.optionInfo')
}, },
{ {
value: "warning", value: "warning",
label: "警告" // 警告
label: this.$t('systemManagement_DictManagement.optionWarning')
}, },
{ {
value: "danger", value: "danger",
label: "危险" // 危险
label: this.$t('systemManagement_DictManagement.optionDanger')
} }
], ],
// 类型数据字典 // 类型数据字典
@@ -260,13 +296,16 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
dictLabel: [ dictLabel: [
{ required: true, message: "数据标签不能为空", trigger: "blur" } // 数据标签不能为空
{ required: true, message: this.$t('systemManagement_DictManagement.heckDictLabelIsNull'), trigger: "blur" }
], ],
dictValue: [ dictValue: [
{ required: true, message: "数据键值不能为空", trigger: "blur" } // 数据键值不能为空
{ required: true, message: this.$t('systemManagement_DictManagement.heckDictValueIsNull'), trigger: "blur" }
], ],
dictSort: [ dictSort: [
{ required: true, message: "数据顺序不能为空", trigger: "blur" } // 数据顺序不能为空
{ required: true, message: this.$t('systemManagement_DictManagement.heckDictSortIsNull'), trigger: "blur" }
] ]
} }
} }
@@ -339,7 +378,8 @@ export default {
handleAdd() { handleAdd() {
this.reset() this.reset()
this.open = true this.open = true
this.title = "添加字典数据" // 添加字典数据
this.title = this.$t('systemManagement_DictManagement.addDictItem')
this.form.dictType = this.queryParams.dictType this.form.dictType = this.queryParams.dictType
}, },
// 多选框选中数据 // 多选框选中数据
@@ -355,7 +395,8 @@ export default {
getData(dictCode).then(response => { getData(dictCode).then(response => {
this.form = response.data this.form = response.data
this.open = true this.open = true
this.title = "修改字典数据" // 修改字典数据
this.title = this.$t('systemManagement_DictManagement.editDictItem')
}) })
}, },
/** 提交按钮 */ /** 提交按钮 */
@@ -365,14 +406,16 @@ export default {
if (this.form.dictCode != undefined) { if (this.form.dictCode != undefined) {
updateData(this.form).then(response => { updateData(this.form).then(response => {
this.$store.dispatch('dict/removeDict', this.queryParams.dictType) this.$store.dispatch('dict/removeDict', this.queryParams.dictType)
this.$modal.msgSuccess("修改成功") // 提示信息：修改成功
this.$modal.msgSuccess(this.$t('systemManagement_DictManagement.editSuccessInfo'))
this.open = false this.open = false
this.getList() this.getList()
}) })
} else { } else {
addData(this.form).then(response => { addData(this.form).then(response => {
this.$store.dispatch('dict/removeDict', this.queryParams.dictType) this.$store.dispatch('dict/removeDict', this.queryParams.dictType)
this.$modal.msgSuccess("新增成功") // 提示信息：新增成功
this.$modal.msgSuccess(this.$t('systemManagement_DictManagement.addSuccessInfo'))
this.open = false this.open = false
this.getList() this.getList()
}) })
@@ -383,11 +426,13 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const dictCodes = row.dictCode || this.ids const dictCodes = row.dictCode || this.ids
this.$modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？').then(function() { // 提示:是否确认删除字典编码为" + dictCodes + "的数据项？
this.$modal.confirm(this.$t('systemManagement_DictManagement.textDeleteDictCodeConfirm1') + "\"" + dictCodes + "\"" + this.$t('systemManagement_DictManagement.textDeleteDictCodeConfirm2')).then(function() {
return delData(dictCodes) return delData(dictCodes)
}).then(() => { }).then(() => {
this.getList() this.getList()
this.$modal.msgSuccess("删除成功") // 提示:删除成功
this.$modal.msgSuccess(this.$t('systemManagement_DictManagement.deleteSuccessInfo'))
this.$store.dispatch('dict/removeDict', this.queryParams.dictType) this.$store.dispatch('dict/removeDict', this.queryParams.dictType)
}).catch(() => {}) }).catch(() => {})
}, },

1
ruoyi-ui/src/views/system/notice/index.vue
View File

@@ -69,6 +69,7 @@
>{{ $t('systemManagement_Notice.btnEdit') }}</el-button> >{{ $t('systemManagement_Notice.btnEdit') }}</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<!-- 【删除】按钮 -->
<el-button <el-button
type="danger" type="danger"
plain plain

3
ruoyi-ui/src/views/system/user/authRole.vue
View File

@@ -1,14 +1,17 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 基本信息 -->
<h4 class="form-header h4">{{ $t('systemManagement_UserManagement.basInfo') }}</h4> <h4 class="form-header h4">{{ $t('systemManagement_UserManagement.basInfo') }}</h4>
<el-form ref="form" :model="form" label-width="80px"> <el-form ref="form" :model="form" label-width="80px">
<el-row> <el-row>
<el-col :span="8" :offset="2"> <el-col :span="8" :offset="2">
<!-- 昵称 -->
<el-form-item :label="$t('systemManagement_UserManagement.nickName')" prop="nickName"> <el-form-item :label="$t('systemManagement_UserManagement.nickName')" prop="nickName">
<el-input v-model="form.nickName" disabled /> <el-input v-model="form.nickName" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" :offset="2"> <el-col :span="8" :offset="2">
<!-- 用户名 -->
<el-form-item :label="$t('systemManagement_UserManagement.userName')" prop="userName"> <el-form-item :label="$t('systemManagement_UserManagement.userName')" prop="userName">
<el-input v-model="form.userName" disabled /> <el-input v-model="form.userName" disabled />
</el-form-item> </el-form-item>

2
ruoyi-ui/src/views/system/user/index.vue
View File

@@ -7,7 +7,7 @@
<el-col> <el-col>
<!-- 输入框---请输入部门名称 --> <!-- 输入框---请输入部门名称 -->
<div class="head-container"> <div class="head-container">
<el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search" style="margin-bottom: 20px" /> <el-input v-model="deptName" :placeholder="$t('systemManagement_UserManagement.placeholderDeptName')" clearable size="small" prefix-icon="el-icon-search" style="margin-bottom: 20px" />
</div> </div>
<div class="head-container"> <div class="head-container">
<el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current @node-click="handleNodeClick" /> <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current @node-click="handleNodeClick" />

1
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
View File

@@ -1,5 +1,6 @@
<template> <template>
<div> <div>
<!-- 标题 -->
<div class="user-info-head" @click="editCropper()"><img v-bind:src="options.img" :title="$t('systemManagement_UserManagement.avatarTitle')" class="img-circle img-lg" /></div> <div class="user-info-head" @click="editCropper()"><img v-bind:src="options.img" :title="$t('systemManagement_UserManagement.avatarTitle')" class="img-circle img-lg" /></div>
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened" @close="closeDialog"> <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened" @close="closeDialog">
<el-row> <el-row>