root/lanzhouhailiang_two
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt: 日志、国际化

Browse Source
This commit is contained in:
liyongde
2024-04-19 13:10:20 +08:00
parent 14a122f3d5
commit daf7efad70
26 changed files with 500 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lms/nladmin-ui/src/views/lucene/api/lucene.js
View File

@@ -8,6 +8,19 @@ export function getLogData(param) {
})
}
export function getTagName() {
return request({
url: 'api/lucene/getTagName',
method: 'post'
})
}
export function deleteAllLog() {
return request({
url: 'api/lucene/deleteAllLog',
method: 'post'
})
}
export function labelsValues() {
return request({
url: 'api/loki/labels/values',
@@ -15,4 +28,4 @@ export function labelsValues() {
})
}
export default { getLogData, labelsValues }
export default { getLogData, labelsValues, getTagName, deleteAllLog }

22
lms/nladmin-ui/src/views/lucene/index.vue
View File

@@ -7,6 +7,21 @@
label-width="=100px"
label-suffix=":"
>
<el-form-item :label="$t('Log.label')">
<el-select
v-model="query.label"
clearable
size="mini"
:placeholder="$t('Log.label')"
style="width: 240px;"
>
<el-option
v-for="item in tagList"
:label="item"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('Log.level')">
<el-select
v-model="query.level"
@@ -103,6 +118,7 @@ export default {
}],
rules: {},
logs: [],
tagList: [],
query: {
tlogTraceId: '',
message: '',
@@ -115,6 +131,7 @@ export default {
},
created() {
this.queryData()
this.getTagList()
},
methods: {
handleSizeChange(val) {
@@ -125,6 +142,11 @@ export default {
this.query.page = val
this.queryData()
},
getTagList() {
luceneOperation.getTagName().then(res => {
this.tagList = res
})
},
queryData() {
if (this.query.createTime) {
this.query.startTime = this.query.createTime[0]

67
lms/nladmin-ui/src/views/tools/codeGen/codeDetail.vue
View File

@@ -1,7 +1,7 @@
<template>
<div>
<div v-if="query.dictName === ''">
<div class="my-code">点击编码查看详情</div>
<div class="my-code">{{ $t('Code_detail.msg.m2') }}</div>
</div>
<div v-else>
<!--工具栏-->
@@ -12,7 +12,7 @@
v-model="query.label"
clearable
size="mini"
placeholder="输入编码标签查询"
:placeholder="$t('Code_detail.msg.m3')"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="toQuery"
@@ -29,9 +29,9 @@
:title="crud.status.title"
width="500px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="编码类型" prop="type">
<el-select v-model="form.type" placeholder="请选择" @change="changeType">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="90px">
<el-form-item :label="$t('Code_detail.dialog.type')" prop="type">
<el-select v-model="form.type" :placeholder="$t('common.Please_select')" @change="changeType">
<el-option
v-for="item in options"
:key="item.value"
@@ -41,30 +41,30 @@
</el-select>
</el-form-item>
<div v-if="form.type === '01' || form.type === '03'">
<el-form-item label="初始值" prop="init_value">
<el-form-item :label="$t('Code_detail.dialog.init_value')" prop="init_value">
<el-input v-model="form.init_value" style="width: 370px;" />
</el-form-item>
</div>
<div v-if="form.type === '02'">
<el-form-item label="格式" prop="format">
<el-input v-model="form.format" style="width: 370px;" placeholder="输入日期格式例：yyyyMMdd" />
<el-form-item :label="$t('Code_detail.dialog.format')" prop="format">
<el-input v-model="form.format" style="width: 370px;" :placeholder="$t('Code_detail.msg.m1')" />
</el-form-item>
</div>
<div v-if="form.type === '03'">
<el-form-item label="步长" prop="step">
<el-form-item :label="$t('Code_detail.dialog.step')" prop="step">
<el-input v-model="form.step" style="width: 370px;" />
</el-form-item>
<el-form-item label="填充值" prop="fillchar">
<el-form-item :label="$t('Code_detail.dialog.fillchar')" prop="fillchar">
<el-input v-model="form.fillchar" style="width: 370px;" />
</el-form-item>
<el-form-item label="长度" prop="length">
<el-form-item :label="$t('Code_detail.dialog.length')" prop="length">
<el-input v-model="form.length" style="width: 370px;" />
</el-form-item>
<el-form-item label="最大值" prop="max_value">
<el-form-item :label="$t('Code_detail.dialog.max_value')" prop="max_value">
<el-input v-model="form.max_value" style="width: 370px;" />
</el-form-item>
</div>
<el-form-item label="排序" prop="sort_num">
<el-form-item :label="$t('Code_detail.dialog.sort_num')" prop="sort_num">
<el-input-number
v-model.number="form.sort_num"
:min="0"
@@ -75,8 +75,8 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
<el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
<el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
</div>
</el-dialog>
<!--表格渲染-->
@@ -88,16 +88,16 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column label="所属编码">
<el-table-column :label="$t('Code_detail.table.dictName')">
{{ query.dictName }}
</el-table-column>
<el-table-column prop="type" label="类型" :formatter="typeFormate" />
<el-table-column prop="init_value" label="初始值" />
<el-table-column prop="current_value" label="当前值" />
<el-table-column prop="type" :label="$t('Code_detail.table.type')" :formatter="typeFormate" />
<el-table-column prop="init_value" :label="$t('Code_detail.table.init_value')" />
<el-table-column prop="current_value" :label="$t('Code_detail.table.current_value')" />
<el-table-column
v-permission="['admin','dict:edit','dict:del']"
label="操作"
width="130px"
:label="$t('common.Operate')"
width="160px"
align="center"
fixed="right"
>
@@ -121,6 +121,7 @@ import CRUD, { presenter, header, form } from '@crud/crud'
import pagination from '@crud/Pagination'
import rrOperation from '@crud/RR.operation'
import udOperation from '@crud/UD.operation'
import i18n from "@/i18n";
const defaultForm = {
id: null,
@@ -138,7 +139,7 @@ export default {
cruds() {
return [
CRUD({
title: '编码详情', url: 'api/codeDetail', query: { dictName: '' }, sort: ['sort_num,asc'],
title: i18n.t('Code_detail.title'), url: 'api/codeDetail', query: { dictName: '' }, sort: ['sort_num,asc'],
crudMethod: { ...crudCodeDetail },
optShow: {
add: true,
@@ -160,31 +161,31 @@ export default {
return {
options: [{
value: '01',
label: '固定'
label: i18n.t('Code_detail.options.o1')
}, {
value: '02',
label: '日期'
label: i18n.t('Code_detail.options.o2')
}, {
value: '03',
label: '顺序'
label: i18n.t('Code_detail.options.o3')
}],
value: '',
dictId: null,
rules: {
type: [
{ required: true, message: '请输入编码标签', trigger: 'blur' }
{ required: true, message: i18n.t('Code_detail.rules.r1'), trigger: 'blur' }
],
init_value: [
{ required: true, message: '请输入初始值', trigger: 'blur' }
{ required: true, message: i18n.t('Code_detail.rules.r2'), trigger: 'blur' }
],
sort_num: [
{ required: true, message: '请输入序号', trigger: 'blur', type: 'number' }
{ required: true, message: i18n.t('Code_detail.rules.r3'), trigger: 'blur', type: 'number' }
],
format: [
{ required: true, message: '请输入日期格式', trigger: 'blur' }
{ required: true, message: i18n.t('Code_detail.rules.r4'), trigger: 'blur' }
],
max_value: [
{ required: true, message: '请输入最大值', trigger: 'blur' }
{ required: true, message: i18n.t('Code_detail.rules.r5'), trigger: 'blur' }
]
},
permission: {
@@ -194,11 +195,11 @@ export default {
},
typeFormate(row, index) {
if (row.type === '01') {
return '固定'
return i18n.t('Code_detail.options.o1')
} else if (row.type === '02') {
return '时间'
return i18n.t('Code_detail.options.o2')
} else if (row.type === '03') {
return '顺序'
return i18n.t('Code_detail.options.o3')
}
}
}

46
lms/nladmin-ui/src/views/tools/codeGen/index.vue
View File

@@ -3,16 +3,16 @@
<!--表单组件-->
<el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="编码" prop="name">
<el-form-item :label="$t('GenCode.dialog.code')" prop="name">
<el-input v-model="form.code" style="width: 370px;" />
</el-form-item>
<el-form-item label="名称">
<el-form-item :label="$t('GenCode.dialog.name')">
<el-input v-model="form.name" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
<el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
<el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
</div>
</el-dialog>
<!-- 字典列表 -->
@@ -23,7 +23,7 @@
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<el-input v-model="query.blurry" clearable size="mini" placeholder="输入编码或者名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
<el-input v-model="query.blurry" clearable size="mini" :placeholder="$t('GenCode.msg.m1')" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
<rrOperation />
</div>
<crudOperation :permission="permission" />
@@ -31,11 +31,30 @@
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row style="width: 100%;" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
<el-table-column type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="code" width="80" label="编码" />
<el-table-column show-overflow-tooltip prop="name" width="100" label="名称" />
<el-table-column show-overflow-tooltip prop="demo" width="150" label="测试值" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
<el-table-column v-permission="['admin','dict:edit','dict:del']" label="操作" width="130px" align="center" fixed="right">
<el-table-column
show-overflow-tooltip
prop="code"
width="80"
:label="$t('GenCode.table.code')"
/>
<el-table-column
show-overflow-tooltip
prop="name"
width="100"
:label="$t('GenCode.table.name')"
/>
<el-table-column
show-overflow-tooltip
prop="demo"
width="150"
:label="$t('GenCode.table.demo')"
/>
<el-table-column
show-overflow-tooltip
prop="remark"
:label="$t('GenCode.table.remark')"
/>
<el-table-column v-permission="['admin','dict:edit','dict:del']" :label="$t('common.Operate')" width="160px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
@@ -52,7 +71,7 @@
<el-col :xs="24" :sm="24" :md="14" :lg="13" :xl="13">
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>编码详情</span>
<span>{{ $t('Code_detail.title') }}</span>
<el-button
v-if="checkPermission(['admin','genCode:add']) && this.$refs.codeGenDetail && this.$refs.codeGenDetail.query.dictName"
class="filter-item"
@@ -61,7 +80,7 @@
type="primary"
icon="el-icon-plus"
@click="$refs.codeGenDetail && $refs.codeGenDetail.crud.toAdd()"
>新增</el-button>
>{{ $t('common.Create') }}</el-button>
</div>
<codeGenDetail ref="codeGenDetail" :permission="permission" />
</el-card>
@@ -80,6 +99,7 @@ import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
import rrOperation from '@crud/RR.operation'
import udOperation from '@crud/UD.operation'
import i18n from "@/i18n";
const defaultForm = { id: null, name: null, description: null, codeGenDetails: [], code: null }
@@ -88,7 +108,7 @@ export default {
components: { crudOperation, pagination, rrOperation, udOperation, codeGenDetail },
cruds() {
return [
CRUD({ title: '编码', url: 'api/genCode', crudMethod: { ...crudDict }, sort: ['create_time,desc'],
CRUD({ title: i18n.t('GenCode.title'), url: 'api/genCode', crudMethod: { ...crudDict }, sort: ['create_time,desc'],
optShow: {
add: true,
edit: true,

43
lms/nladmin-ui/src/views/tools/storage/index.vue
View File

@@ -4,7 +4,7 @@
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<el-input v-model="query.blurry" clearable size="small" placeholder="输入内容模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
<el-input v-model="query.blurry" clearable size="small" :placeholder="$t('Storage.dialog.p')" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
<date-range-picker v-model="query.createTime" class="date-item" />
<rrOperation />
</div>
@@ -18,18 +18,18 @@
type="primary"
icon="el-icon-upload"
@click="crud.toAdd"
>上传
>{{ $t('Storage.dialog.button_upload2') }}
</el-button>
</crudOperation>
</div>
<!--表单组件-->
<el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.add ? '文件上传' : '编辑文件'" width="500px">
<el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.add ? $t('Storage.dialog.button_a') : $t('Storage.dialog.button_e')" width="500px">
<el-form ref="form" :model="form" size="small" label-width="80px">
<el-form-item label="文件名">
<el-form-item :label="$t('Storage.dialog.name')">
<el-input v-model="form.name" style="width: 370px;" />
</el-form-item>
<!-- 上传文件 -->
<el-form-item v-if="crud.status.add" label="上传">
<el-form-item v-if="crud.status.add" :label="$t('Storage.dialog.button_upload')">
<el-upload
ref="upload"
:limit="1"
@@ -40,26 +40,26 @@
:on-error="handleError"
:action="fileUploadApi + '?name=' + form.name"
>
<div class="eladmin-upload"><i class="el-icon-upload" /> 添加文件</div>
<div slot="tip" class="el-upload__tip">可上传任意格式文件，且不超过100M</div>
<div class="eladmin-upload"><i class="el-icon-upload" /> {{ $t('Storage.dialog.button_add') }}</div>
<div slot="tip" class="el-upload__tip">{{ $t('Storage.dialog.tip') }}</div>
</el-upload>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button v-if="crud.status.add" :loading="loading" type="primary" @click="upload">确认</el-button>
<el-button v-else :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
<el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
<el-button v-if="crud.status.add" :loading="loading" type="primary" @click="upload">{{ $t('common.Confirm') }}</el-button>
<el-button v-else :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="name" label="文件名">
<el-table-column prop="name" :label="$t('Storage.table.name')">
<template slot-scope="scope">
<el-popover
:content="'file/' + scope.row.type + '/' + scope.row.realName"
placement="top-start"
title="路径"
:title="$t('Storage.table.path')"
width="200"
trigger="hover"
>
@@ -75,7 +75,7 @@
</el-popover>
</template>
</el-table-column>
<el-table-column prop="path" label="预览图">
<el-table-column prop="path" :label="$t('Storage.table.show')">
<template slot-scope="{row}">
<el-image
:src=" baseApi + '/file/' + row.type + '/' + row.realName"
@@ -90,11 +90,11 @@
</el-image>
</template>
</el-table-column>
<el-table-column prop="suffix" label="文件类型" />
<el-table-column prop="type" label="类别" />
<el-table-column prop="size" label="大小" />
<el-table-column prop="createName" label="操作人" />
<el-table-column prop="createTime" label="创建日期">
<el-table-column prop="suffix" :label="$t('Storage.table.suffix')" />
<el-table-column prop="type" :label="$t('Storage.table.type')" />
<el-table-column prop="size" :label="$t('Storage.table.size')" />
<el-table-column prop="createName" :label="$t('Storage.table.createName')" />
<el-table-column prop="createTime" :label="$t('Storage.table.createTime')">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
@@ -114,12 +114,13 @@ import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
import DateRangePicker from '@/components/DateRangePicker'
import i18n from "@/i18n";
const defaultForm = { storageId: null, name: '' }
export default {
components: { pagination, crudOperation, rrOperation, DateRangePicker },
cruds() {
return CRUD({ title: '文件', idField: 'storageId', url: 'api/localStorage', crudMethod: { ...crudFile }})
return CRUD({ title: i18n.t('Storage.title'), idField: 'storageId', url: 'api/localStorage', crudMethod: { ...crudFile }})
},
mixins: [presenter(), header(), form(defaultForm), crud()],
data() {
@@ -152,13 +153,13 @@ export default {
isLt2M = file.size / 1024 / 1024 < 100
if (!isLt2M) {
this.loading = false
this.$message.error('上传文件大小不能超过 100MB!')
this.$message.error(i18n.t('Storage.rules.r1'))
}
this.form.name = file.name
return isLt2M
},
handleSuccess(response, file, fileList) {
this.crud.notify('上传成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.notify(i18n.t('common.Upload_success'), CRUD.NOTIFICATION_TYPE.SUCCESS)
this.$refs.upload.clearFiles()
this.crud.status.add = CRUD.STATUS.NORMAL
this.crud.resetForm()