Console i18n optimization

pull/1154/head
chen.ma 2 years ago
parent f54d915dec
commit 97c9bb24af

@ -89,7 +89,7 @@ const config = {
navbar: { navbar: {
title: '', title: '',
logo: { logo: {
alt: 'HIPPO-4J 动态可观测线程池框架', alt: 'Hippo4j 动态可观测线程池框架',
src: 'img/hippo4j.png', src: 'img/hippo4j.png',
}, },
items: [ items: [
@ -184,7 +184,7 @@ const config = {
items: [ items: [
{ {
label: 'Gitee', label: 'Gitee',
href: 'https://gitee.com/magestack/hippo4j', href: 'https://gitee.com/opengoofy/hippo4j',
}, },
{ {
label: 'GitHub', label: 'GitHub',
@ -206,7 +206,7 @@ const config = {
], ],
}, },
], ],
copyright: `Copyright © 2021-2022 小马哥版权所有 <a href="https://beian.miit.gov.cn">京ICP备2021038095号-2 copyright: `Copyright © 2021-2022 马丁版权所有 <a href="https://beian.miit.gov.cn">京ICP备2021038095号
</a>`, </a>`,
}, },
prism: { prism: {

@ -24,7 +24,7 @@ export default {
}, },
data() { data() {
return { return {
title: 'hippo4j 1.5.0', title: 'Hippo4j 1.5.0',
logo: '', logo: '',
}; };
}, },

@ -19,9 +19,11 @@ export default {
NoDeletionPermissionTip: 'Contact the administrator to delete it', NoDeletionPermissionTip: 'Contact the administrator to delete it',
emptyWarning: "The '{name}' cannot be empty", emptyWarning: "The '{name}' cannot be empty",
queryFailure: 'The query fails. Please refresh the page', queryFailure: 'The query fails. Please refresh the page',
updateFailure:'Failed to modify thread pool', updateFailure: 'Failed to modify thread-pool',
auditApprovedMessage: 'This operation will accept thread pool change requests. Do you want to continue?', auditApprovedMessage:
auditRejectionMessage: 'This operation will reject the thread pool change request. Do you want to continue?', 'This operation will accept thread-pool change requests. Do you want to continue?',
auditRejectionMessage:
'This operation will reject the thread-pool change request. Do you want to continue?',
inputMessage: 'Please input {target}', inputMessage: 'Please input {target}',
}, },
@ -48,7 +50,7 @@ export default {
stack: 'Stack', stack: 'Stack',
audit: 'audit', audit: 'audit',
yes: 'Yes', yes: 'Yes',
no: 'No' no: 'No',
}, },
// 运行报表 // 运行报表
@ -56,7 +58,10 @@ export default {
poolInstance: 'Pool Instance', poolInstance: 'Pool Instance',
user: 'User', user: 'User',
role: 'Role', role: 'Role',
tenants: 'Tenants' tenants: 'Tenants',
threadPoolId: 'ThreadPool ID',
taskCount: 'Task Count',
inst: 'Instance',
}, },
// 租户管理 // 租户管理
@ -65,7 +70,7 @@ export default {
tenantRequired: 'Tenant(Required)', tenantRequired: 'Tenant(Required)',
tenantName: 'Tenant Name', tenantName: 'Tenant Name',
owner: 'Owner', owner: 'Owner',
tenantIntro: 'Tenant Intro' tenantIntro: 'Tenant Intro',
}, },
// 项目管理 // 项目管理
@ -74,12 +79,12 @@ export default {
itemRequired: 'Item(Required)', itemRequired: 'Item(Required)',
itemName: 'Item Name', itemName: 'Item Name',
owner: 'Owner', owner: 'Owner',
itemIntro: 'Item Intro' itemIntro: 'Item Intro',
}, },
// 线程池管理 // 线程池管理
threadPool: { threadPool: {
threadPool: 'Thread Pool', threadPool: 'ThreadPool',
threadPoolRequired: 'ThreadPool(Required)', threadPoolRequired: 'ThreadPool(Required)',
coreSize: 'Core Size', coreSize: 'Core Size',
maximumSize: 'Maximum Size', maximumSize: 'Maximum Size',
@ -100,7 +105,7 @@ export default {
capacityAlarm: 'Capacity Alarm', capacityAlarm: 'Capacity Alarm',
customRejectedHandler: 'Custom Rejected Handler', customRejectedHandler: 'Custom Rejected Handler',
customRejectedHandlerTip: 'Please enter a custom SPI Deny Policy ID', customRejectedHandlerTip: 'Please enter a custom SPI Deny Policy ID',
threadsNumErrorTip: 'The maximum thread must be greater than or equal to the core thread' threadsNumErrorTip: 'The maximum thread must be greater than or equal to the core thread',
}, },
// 线程池实例 // 线程池实例
@ -132,25 +137,25 @@ export default {
lastUpdateTime: 'Last update time', lastUpdateTime: 'Last update time',
allowCoreThreadTimeOut: 'Allow Core Thread Time Out', allowCoreThreadTimeOut: 'Allow Core Thread Time Out',
changeAll: 'Change All', changeAll: 'Change All',
stackRequestFail: 'The current thread pool has no stack information' stackRequestFail: 'The current thread-pool has no stack information',
}, },
//线程池监控 //线程池监控
threadPoolMonitor: { threadPoolMonitor: {
ipPort: 'IP : Port', ipPort: 'IP : Port',
ipPortRequired: 'IP : Port(Required)', ipPortRequired: 'IP : Port(Required)',
noResultsYet: 'No results yet' noResultsYet: 'No results yet',
}, },
//框架线程池 //框架线程池
frameworkThreadPool : { frameworkThreadPool: {
threadPoolIDRequired: 'ThreadPool ID(Required)', threadPoolIDRequired: 'ThreadPool ID(Required)',
threadPoolID: 'ThreadPool ID', threadPoolID: 'ThreadPool ID',
threadPoolType: 'ThreadPool Type' threadPoolType: 'ThreadPool Type',
}, },
//线程池审核 //线程池审核
threadPoolAudit: { threadPoolAudit: {
changeType: 'Change Type', changeType: 'Change Type',
modifiedBy: 'Modified by', modifiedBy: 'Modified by',
auditStatus: 'Audit Status', auditStatus: 'Audit Status',
@ -181,17 +186,18 @@ export default {
enabling: 'Enabling', enabling: 'Enabling',
disabling: 'Disabling', disabling: 'Disabling',
token: 'Token', token: 'Token',
receiverTip: 'Use English commas for multiple recipients and separate them (be careful not to have spaces)\n' + receiverTip:
'Use English commas for multiple recipients and separate them (be careful not to have spaces)\n' +
'-Ding: Fill in the phone number\n' + '-Ding: Fill in the phone number\n' +
'-WeChat: Fill in \'userid\' and it will be sent to the user as a @ message, otherwise fill in the name, such as: XiaomaGe\n' + "-WeChat: Fill in 'userid' and it will be sent to the user as a @ message, otherwise fill in the name, such as: XiaomaGe\n" +
'-Lark: Fill in with \'ou_\' the unique user ID at the beginning will be sent to the user as a @ message, and filling in the phone number is normal@' "-Lark: Fill in with 'ou_' the unique user ID at the beginning will be sent to the user as a @ message, and filling in the phone number is normal@",
}, },
//用户权限 //用户权限
userAuthority: { userAuthority: {
userName: 'User Name', userName: 'User Name',
role: 'Role', role: 'Role',
password: 'Password' password: 'Password',
}, },
//日志管理 //日志管理
@ -212,9 +218,9 @@ export default {
threadPoolInstance: 'ThreadPool Instance', threadPoolInstance: 'ThreadPool Instance',
threadPoolMonitor: 'ThreadPool Monitor', threadPoolMonitor: 'ThreadPool Monitor',
containerThreadPool: 'Container ThreadPool', containerThreadPool: 'Container ThreadPool',
tomcat: 'Tomcat', tomcat: 'Tomcat',
undertow: 'Undertow', undertow: 'Undertow',
jetty : 'Jetty', jetty: 'Jetty',
frameworkThreadPool: 'Framework ThreadPool', frameworkThreadPool: 'Framework ThreadPool',
dubbo: 'Dubbo', dubbo: 'Dubbo',
hystrix: 'Hystrix', hystrix: 'Hystrix',
@ -228,5 +234,5 @@ export default {
userAuthority: 'User Authority', userAuthority: 'User Authority',
logManage: 'Log Manage', logManage: 'Log Manage',
officialWebsite: 'Official Website', officialWebsite: 'Official Website',
} },
} };

@ -17,9 +17,9 @@ export default {
deleteMessage: '此操作将删除 {name}, 是否继续?', deleteMessage: '此操作将删除 {name}, 是否继续?',
selectMessage: '请选择{target}', selectMessage: '请选择{target}',
NoDeletionPermissionTip: '请联系管理员删除', NoDeletionPermissionTip: '请联系管理员删除',
emptyWarning: "{name}不允许为空", emptyWarning: '{name}不允许为空',
queryFailure: '查询失败,请尝试刷新页面', queryFailure: '查询失败,请尝试刷新页面',
updateFailure:'修改线程池失败', updateFailure: '修改线程池失败',
auditApprovedMessage: '此操作将接受线程池变更申请, 是否继续?', auditApprovedMessage: '此操作将接受线程池变更申请, 是否继续?',
auditRejectionMessage: '此操作将拒绝线程池变更申请, 是否继续?', auditRejectionMessage: '此操作将拒绝线程池变更申请, 是否继续?',
inputMessage: '请输入{target}', inputMessage: '请输入{target}',
@ -48,7 +48,7 @@ export default {
stack: '堆栈', stack: '堆栈',
audit: '审核', audit: '审核',
yes: '是', yes: '是',
no: '否' no: '否',
}, },
// 运行报表 // 运行报表
@ -56,7 +56,10 @@ export default {
poolInstance: '线程池实例', poolInstance: '线程池实例',
user: '登录用户', user: '登录用户',
role: '用户角色', role: '用户角色',
tenants: '所属租户' tenants: '所属租户',
threadPoolId: '线程池',
taskCount: '任务数',
inst: '实例数',
}, },
// 租户管理 // 租户管理
@ -65,7 +68,7 @@ export default {
tenantRequired: '租户(必填)', tenantRequired: '租户(必填)',
tenantName: '租户名称', tenantName: '租户名称',
owner: '负责人', owner: '负责人',
tenantIntro: '租户简介' tenantIntro: '租户简介',
}, },
// 项目管理 // 项目管理
@ -74,7 +77,7 @@ export default {
itemRequired: '项目(必填)', itemRequired: '项目(必填)',
itemName: '项目名称', itemName: '项目名称',
owner: '负责人', owner: '负责人',
itemIntro: '项目简介' itemIntro: '项目简介',
}, },
// 线程池管理 // 线程池管理
@ -100,7 +103,7 @@ export default {
capacityAlarm: '容量报警', capacityAlarm: '容量报警',
customRejectedHandler: '自定义拒绝策略', customRejectedHandler: '自定义拒绝策略',
customRejectedHandlerTip: '请输入自定义 SPI 拒绝策略标识', customRejectedHandlerTip: '请输入自定义 SPI 拒绝策略标识',
threadsNumErrorTip: '最大线程必须大于等于核心线程' threadsNumErrorTip: '最大线程必须大于等于核心线程',
}, },
// 线程池实例 // 线程池实例
@ -132,25 +135,25 @@ export default {
lastUpdateTime: '最后更新时间', lastUpdateTime: '最后更新时间',
allowCoreThreadTimeOut: '线程超时', allowCoreThreadTimeOut: '线程超时',
changeAll: '全部修改', changeAll: '全部修改',
stackRequestFail: '当前线程池暂无堆栈信息' stackRequestFail: '当前线程池暂无堆栈信息',
}, },
//线程池监控 //线程池监控
threadPoolMonitor: { threadPoolMonitor: {
ipPort: 'IP : Port', ipPort: 'IP : Port',
ipPortRequired: 'IP : Port必填', ipPortRequired: 'IP : Port必填',
noResultsYet: '暂无结果' noResultsYet: '暂无结果',
}, },
//框架线程池 //框架线程池
frameworkThreadPool: { frameworkThreadPool: {
threadPoolIDRequired: '线程池标识(必填)', threadPoolIDRequired: '线程池标识(必填)',
threadPoolID: '线程池标识', threadPoolID: '线程池标识',
threadPoolType: '线程池类型' threadPoolType: '线程池类型',
}, },
//线程池审核 //线程池审核
threadPoolAudit: { threadPoolAudit: {
changeType: '变更类型', changeType: '变更类型',
modifiedBy: '修改人', modifiedBy: '修改人',
auditStatus: '审核状态', auditStatus: '审核状态',
@ -181,17 +184,18 @@ export default {
enabling: '启用', enabling: '启用',
disabling: '禁用', disabling: '禁用',
token: 'Token', token: 'Token',
receiverTip: '多个接收者使用英文逗号 , 分割 (注意不要有空格)\n' + receiverTip:
'多个接收者使用英文逗号 , 分割 (注意不要有空格)\n' +
'- 钉钉:填写手机号\n' + '- 钉钉:填写手机号\n' +
'- 企微填写user_id会以@的消息发给用户,否则填写姓名,如:小马哥\n' + '- 企微填写user_id会以@的消息发给用户,否则填写姓名,如:小马哥\n' +
'- 飞书填写ou_开头用户唯一标识会以@的消息发给用户,填写手机号则是普通的@"' '- 飞书填写ou_开头用户唯一标识会以@的消息发给用户,填写手机号则是普通的@',
}, },
//用户权限 //用户权限
userAuthority: { userAuthority: {
userName: '用户名', userName: '用户名',
role: '角色', role: '角色',
password: '密码' password: '密码',
}, },
//日志管理 //日志管理
@ -212,9 +216,9 @@ export default {
threadPoolInstance: '线程池实例', threadPoolInstance: '线程池实例',
threadPoolMonitor: '线程池监控', threadPoolMonitor: '线程池监控',
containerThreadPool: '容器线程池', containerThreadPool: '容器线程池',
tomcat: 'Tomcat', tomcat: 'Tomcat',
undertow: 'Undertow', undertow: 'Undertow',
jetty : 'Jetty', jetty: 'Jetty',
frameworkThreadPool: '框架线程池', frameworkThreadPool: '框架线程池',
dubbo: 'Dubbo', dubbo: 'Dubbo',
hystrix: 'Hystrix', hystrix: 'Hystrix',
@ -228,5 +232,5 @@ export default {
userAuthority: '用户权限', userAuthority: '用户权限',
logManage: '日志管理', logManage: '日志管理',
officialWebsite: '官网外链', officialWebsite: '官网外链',
} },
} };

@ -1,17 +1,17 @@
<template> <template>
<el-table :data="list" style="width: 100%; padding-top: 15px"> <el-table :data="list" style="width: 100%; padding-top: 15px">
<el-table-column label="threadPool ID" min-width="200"> <el-table-column :label="$t('report.threadPoolId')" min-width="200">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.groupKey }} {{ scope.row.groupKey }}
<!--{{ scope.row.groupKey | orderNoFilter }}--> <!--{{ scope.row.groupKey | orderNoFilter }}-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="taskCount" width="195" align="center"> <el-table-column :label="$t('report.taskCount')" width="195" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.maxCompletedTaskCount | toThousandFilter }} {{ scope.row.maxCompletedTaskCount | toThousandFilter }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="inst" width="100" align="center"> <el-table-column :label="$t('report.inst')" width="100" align="center">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-tag :type="row.inst | statusFilter"> <el-tag :type="row.inst | statusFilter">
{{ row.inst }} {{ row.inst }}

@ -25,7 +25,7 @@
:disabled="isEditDisabled" :disabled="isEditDisabled"
@click="handleCreate" @click="handleCreate"
> >
{{ $t('common.insert') }} {{ $t('common.insert') }}
</el-button> </el-button>
</div> </div>
<el-table <el-table
@ -60,7 +60,11 @@
<el-table-column :label="$t('common.updateTime')"> <el-table-column :label="$t('common.updateTime')">
<template slot-scope="scope">{{ scope.row.gmtModified }}</template> <template slot-scope="scope">{{ scope.row.gmtModified }}</template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('common.operation')" width="90" class-name="small-padding fixed-width"> <el-table-column
:label="$t('common.operation')"
width="90"
class-name="small-padding fixed-width"
>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button type="text" :disabled="isEditDisabled" size="small" @click="handleUpdate(row)"> <el-button type="text" :disabled="isEditDisabled" size="small" @click="handleUpdate(row)">
{{ $t('common.edit') }} {{ $t('common.edit') }}
@ -72,7 +76,7 @@
type="text" type="text"
@click="handleDelete(row)" @click="handleDelete(row)"
> >
{{ $t('common.delete') }} {{ $t('common.delete') }}
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -85,22 +89,22 @@
@pagination="fetchData" @pagination="fetchData"
/> />
<el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="800px"> <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
<el-form <el-form
ref="dataForm" ref="dataForm"
style="width: 500px; margin-left: 50px"
:rules="rules" :rules="rules"
:model="temp" :model="temp"
label-position="left" label-width="120px"
label-width="100px"
> >
<el-form-item :label="$t('tenantManage.tenant')" prop="tenantId"> <el-form-item :label="$t('tenantManage.tenant')" prop="tenantId">
<el-select <el-select
v-model="temp.tenantId" v-model="temp.tenantId"
:placeholder="$t('tenantManage.tenant')" :placeholder="$t('tenantManage.tenant')"
filterable filterable
style="display: block"
clearable clearable
class="filter-item" class="filter-item"
style="width: 40%"
:disabled="dialogStatus === 'create' ? false : true" :disabled="dialogStatus === 'create' ? false : true"
> >
<el-option <el-option
@ -116,14 +120,13 @@
v-model="temp.itemId" v-model="temp.itemId"
:disabled="dialogStatus === 'create' ? false : true" :disabled="dialogStatus === 'create' ? false : true"
:placeholder="$t('projectManage.item')" :placeholder="$t('projectManage.item')"
style="width: 40%"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('projectManage.itemName')" prop="itemName"> <el-form-item :label="$t('projectManage.itemName')" prop="itemName">
<el-input v-model="temp.itemName" :placeholder="$t('projectManage.itemName')" style="width: 40%" /> <el-input v-model="temp.itemName" :placeholder="$t('projectManage.itemName')" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('projectManage.owner')" prop="owner"> <el-form-item :label="$t('projectManage.owner')" prop="owner">
<el-input v-model="temp.owner" :placeholder="$t('projectManage.owner')" style="width: 40%" /> <el-input v-model="temp.owner" :placeholder="$t('projectManage.owner')" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('projectManage.itemIntro')" prop="itemDesc"> <el-form-item :label="$t('projectManage.itemIntro')" prop="itemDesc">
<el-input <el-input
@ -131,7 +134,6 @@
:autosize="{ minRows: 3, maxRows: 6 }" :autosize="{ minRows: 3, maxRows: 6 }"
type="textarea" type="textarea"
:placeholder="$t('projectManage.itemIntro')" :placeholder="$t('projectManage.itemIntro')"
style="width: 40%"
/> />
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -148,7 +150,9 @@
<el-table-column prop="pv" label="Pv" /> <el-table-column prop="pv" label="Pv" />
</el-table> </el-table>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="dialogPvVisible = false">{{ $t('common.confirm') }}</el-button> <el-button type="primary" @click="dialogPvVisible = false">{{
$t('common.confirm')
}}</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>

@ -66,7 +66,9 @@
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button type="text" size="small" @click="handleUpdate(row)"> {{ $t('common.detail') }} </el-button> <el-button type="text" size="small" @click="handleUpdate(row)">
{{ $t('common.detail') }}
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -79,13 +81,13 @@
/> />
<el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="800px"> <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="800px">
<el-form ref="dataForm" :model="temp" label-position="left" label-width="100px"> <el-form ref="dataForm" :model="temp" label-width="110px">
<el-form-item :label="$t('logManage.bizType')" prop="category"> <el-form-item :label="$t('logManage.bizType')" prop="category">
<el-input <el-input
v-model="temp.category" v-model="temp.category"
:disabled="true" :disabled="true"
:placeholder="$t('logManage.bizType')" :placeholder="$t('logManage.bizType')"
style="width: 40%" style="width: 50%"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('logManage.bizID')" prop="bizNo"> <el-form-item :label="$t('logManage.bizID')" prop="bizNo">
@ -93,7 +95,7 @@
v-model="temp.bizNo" v-model="temp.bizNo"
:disabled="true" :disabled="true"
:placeholder="$t('logManage.bizID')" :placeholder="$t('logManage.bizID')"
style="width: 40%" style="width: 50%"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('logManage.operator')" prop="operator"> <el-form-item :label="$t('logManage.operator')" prop="operator">
@ -101,7 +103,7 @@
v-model="temp.operator" v-model="temp.operator"
:disabled="true" :disabled="true"
:placeholder="$t('logManage.operator')" :placeholder="$t('logManage.operator')"
style="width: 40%" style="width: 50%"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('common.createTime')" prop="createTime"> <el-form-item :label="$t('common.createTime')" prop="createTime">
@ -109,7 +111,7 @@
v-model="temp.createTime" v-model="temp.createTime"
:disabled="true" :disabled="true"
:placeholder="$t('common.createTime')" :placeholder="$t('common.createTime')"
style="width: 40%" style="width: 50%"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('logManage.logContent')" prop="action"> <el-form-item :label="$t('logManage.logContent')" prop="action">

@ -78,7 +78,7 @@
<el-table-column :label="$t('tenantManage.tenant')" width="150"> <el-table-column :label="$t('tenantManage.tenant')" width="150">
<template slot-scope="scope">{{ scope.row.tenantId }}</template> <template slot-scope="scope">{{ scope.row.tenantId }}</template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('projectManage.item')" width="260"> <el-table-column :label="$t('projectManage.item')" width="260">
<template slot-scope="scope">{{ scope.row.itemId }}</template> <template slot-scope="scope">{{ scope.row.itemId }}</template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('threadPool.threadPool')" width="260"> <el-table-column :label="$t('threadPool.threadPool')" width="260">
@ -129,14 +129,16 @@
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button type="text" size="small" @click="handleUpdate(row)"> {{$t('common.edit')}} </el-button> <el-button type="text" size="small" @click="handleUpdate(row)">
{{ $t('common.edit') }}
</el-button>
<el-button <el-button
v-if="row.status !== 'deleted'" v-if="row.status !== 'deleted'"
size="small" size="small"
type="text" type="text"
@click="handleDelete(row)" @click="handleDelete(row)"
> >
{{$t('common.delete')}} {{ $t('common.delete') }}
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -155,7 +157,7 @@
style="width: 500px; margin-left: 50px" style="width: 500px; margin-left: 50px"
:rules="rules" :rules="rules"
:model="temp" :model="temp"
label-width="80px" label-width="105px"
> >
<el-form-item v-if="isEdit" :label="$t('tenantManage.tenant')" prop="tenantId"> <el-form-item v-if="isEdit" :label="$t('tenantManage.tenant')" prop="tenantId">
<el-select <el-select
@ -251,7 +253,7 @@
<el-form-item :label="$t('notifyAlarm.interval')" prop="interval"> <el-form-item :label="$t('notifyAlarm.interval')" prop="interval">
<el-input-number <el-input-number
v-model="temp.interval" v-model="temp.interval"
:placeholder= "$t('notifyAlarm.interval') + ' / Min'" :placeholder="$t('notifyAlarm.interval') + ' / Min'"
controls-position="right" controls-position="right"
:min="0" :min="0"
:max="999999" :max="999999"
@ -290,7 +292,9 @@
<el-table-column prop="pv" label="Pv" /> <el-table-column prop="pv" label="Pv" />
</el-table> </el-table>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="dialogPvVisible = false">{{ $t('common.confirm') }}</el-button> <el-button type="primary" @click="dialogPvVisible = false">{{
$t('common.confirm')
}}</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
@ -383,7 +387,9 @@ export default {
receives: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }], receives: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }],
secretKey: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }], secretKey: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }],
platform: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }], platform: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }],
configType: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }], configType: [
{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' },
],
enable: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }], enable: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }],
}, },
temp: { temp: {
@ -554,7 +560,9 @@ export default {
this.rules['interval'] = []; this.rules['interval'] = [];
} }
if (configType != null && configType != undefined && alarmType === true) { if (configType != null && configType != undefined && alarmType === true) {
this.rules['interval'] = [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }]; this.rules['interval'] = [
{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' },
];
} }
}, },

@ -110,7 +110,11 @@
<el-table-column label="队列容量" > <el-table-column label="队列容量" >
<template slot-scope="scope">{{ scope.row.queueCapacity }}</template> <template slot-scope="scope">{{ scope.row.queueCapacity }}</template>
</el-table-column>--> </el-table-column>-->
<el-table-column :label="$t('common.operation')" width="180" class-name="small-padding fixed-width"> <el-table-column
:label="$t('common.operation')"
width="180"
class-name="small-padding fixed-width"
>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!--<el-dropdown trigger="click"> <!--<el-dropdown trigger="click">
<span class="el-dropdown-link"> <span class="el-dropdown-link">
@ -121,7 +125,9 @@
<el-dropdown-item @click.native="handleUpdate(row)">编辑</el-dropdown-item> <el-dropdown-item @click.native="handleUpdate(row)">编辑</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown>--> </el-dropdown>-->
<el-button type="text" size="small" @click="handleUpdate(row)"> {{ $t('common.edit') }} </el-button> <el-button type="text" size="small" @click="handleUpdate(row)">
{{ $t('common.edit') }}
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -131,8 +137,8 @@
ref="dataForm" ref="dataForm"
:rules="rules" :rules="rules"
:model="temp" :model="temp"
label-position="left" style="width: 500px; margin-left: 50px"
label-width="110px" label-width="120px"
> >
<el-form-item :label="$t('threadPool.coreSize')" prop="coreSize"> <el-form-item :label="$t('threadPool.coreSize')" prop="coreSize">
<template> <template>
@ -160,7 +166,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false"> {{ $t('common.cancel') }} </el-button> <el-button @click="dialogFormVisible = false"> {{ $t('common.cancel') }} </el-button>
<el-button type="primary" @click="updateData()"> {{$t('common.confirm')}} </el-button> <el-button type="primary" @click="updateData()"> {{ $t('common.confirm') }} </el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogPluginVisible" title="Reading statistics"> <el-dialog :visible.sync="dialogPluginVisible" title="Reading statistics">
@ -283,19 +289,27 @@ export default {
}, },
fetchData() { fetchData() {
if (!this.listQuery.mark) { if (!this.listQuery.mark) {
this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolType') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('frameworkThreadPool.threadPoolType') }),
);
return; return;
} }
if (!this.listQuery.tenantId) { if (!this.listQuery.tenantId) {
this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') }),
);
return; return;
} }
if (!this.listQuery.itemId) { if (!this.listQuery.itemId) {
this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('projectManage.item') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('projectManage.item') }),
);
return; return;
} }
if (!this.listQuery.threadPoolKey) { if (!this.listQuery.threadPoolKey) {
this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolID') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('frameworkThreadPool.threadPoolID') }),
);
return; return;
} }
this.listLoading = true; this.listLoading = true;

@ -110,7 +110,11 @@
<el-table-column label="队列容量" > <el-table-column label="队列容量" >
<template slot-scope="scope">{{ scope.row.queueCapacity }}</template> <template slot-scope="scope">{{ scope.row.queueCapacity }}</template>
</el-table-column>--> </el-table-column>-->
<el-table-column :label="$t('common.operation')" width="180" class-name="small-padding fixed-width"> <el-table-column
:label="$t('common.operation')"
width="180"
class-name="small-padding fixed-width"
>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!--<el-dropdown trigger="click"> <!--<el-dropdown trigger="click">
<span class="el-dropdown-link"> <span class="el-dropdown-link">
@ -121,7 +125,9 @@
<el-dropdown-item @click.native="handleUpdate(row)">编辑</el-dropdown-item> <el-dropdown-item @click.native="handleUpdate(row)">编辑</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown>--> </el-dropdown>-->
<el-button type="text" size="small" @click="handleUpdate(row)"> {{ $t('common.edit') }} </el-button> <el-button type="text" size="small" @click="handleUpdate(row)">
{{ $t('common.edit') }}
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -131,8 +137,8 @@
ref="dataForm" ref="dataForm"
:rules="rules" :rules="rules"
:model="temp" :model="temp"
label-position="left" style="width: 500px; margin-left: 50px"
label-width="110px" label-width="120px"
> >
<el-form-item :label="$t('threadPool.coreSize')" prop="coreSize"> <el-form-item :label="$t('threadPool.coreSize')" prop="coreSize">
<template> <template>
@ -160,7 +166,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false"> {{ $t('common.cancel') }} </el-button> <el-button @click="dialogFormVisible = false"> {{ $t('common.cancel') }} </el-button>
<el-button type="primary" @click="updateData()"> {{$t('common.confirm')}} </el-button> <el-button type="primary" @click="updateData()"> {{ $t('common.confirm') }} </el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogPluginVisible" title="Reading statistics"> <el-dialog :visible.sync="dialogPluginVisible" title="Reading statistics">
@ -283,19 +289,27 @@ export default {
}, },
fetchData() { fetchData() {
if (!this.listQuery.mark) { if (!this.listQuery.mark) {
this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolType') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('frameworkThreadPool.threadPoolType') }),
);
return; return;
} }
if (!this.listQuery.tenantId) { if (!this.listQuery.tenantId) {
this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') }),
);
return; return;
} }
if (!this.listQuery.itemId) { if (!this.listQuery.itemId) {
this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('projectManage.item') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('projectManage.item') }),
);
return; return;
} }
if (!this.listQuery.threadPoolKey) { if (!this.listQuery.threadPoolKey) {
this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolID') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('frameworkThreadPool.threadPoolID') }),
);
return; return;
} }
this.listLoading = true; this.listLoading = true;

@ -110,7 +110,11 @@
<el-table-column label="队列容量" > <el-table-column label="队列容量" >
<template slot-scope="scope">{{ scope.row.queueCapacity }}</template> <template slot-scope="scope">{{ scope.row.queueCapacity }}</template>
</el-table-column>--> </el-table-column>-->
<el-table-column :label="$t('common.operation')" width="180" class-name="small-padding fixed-width"> <el-table-column
:label="$t('common.operation')"
width="180"
class-name="small-padding fixed-width"
>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!--<el-dropdown trigger="click"> <!--<el-dropdown trigger="click">
<span class="el-dropdown-link"> <span class="el-dropdown-link">
@ -121,7 +125,9 @@
<el-dropdown-item @click.native="handleUpdate(row)">编辑</el-dropdown-item> <el-dropdown-item @click.native="handleUpdate(row)">编辑</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown>--> </el-dropdown>-->
<el-button type="text" size="small" @click="handleUpdate(row)"> {{ $t('common.edit') }} </el-button> <el-button type="text" size="small" @click="handleUpdate(row)">
{{ $t('common.edit') }}
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -131,8 +137,8 @@
ref="dataForm" ref="dataForm"
:rules="rules" :rules="rules"
:model="temp" :model="temp"
label-position="left" style="width: 500px; margin-left: 50px"
label-width="110px" label-width="120px"
> >
<el-form-item :label="$t('threadPool.coreSize')" prop="coreSize"> <el-form-item :label="$t('threadPool.coreSize')" prop="coreSize">
<template> <template>
@ -160,7 +166,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false"> {{ $t('common.cancel') }} </el-button> <el-button @click="dialogFormVisible = false"> {{ $t('common.cancel') }} </el-button>
<el-button type="primary" @click="updateData()"> {{$t('common.confirm')}} </el-button> <el-button type="primary" @click="updateData()"> {{ $t('common.confirm') }} </el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogPluginVisible" title="Reading statistics"> <el-dialog :visible.sync="dialogPluginVisible" title="Reading statistics">
@ -283,19 +289,27 @@ export default {
}, },
fetchData() { fetchData() {
if (!this.listQuery.mark) { if (!this.listQuery.mark) {
this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolType') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('frameworkThreadPool.threadPoolType') }),
);
return; return;
} }
if (!this.listQuery.tenantId) { if (!this.listQuery.tenantId) {
this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') }),
);
return; return;
} }
if (!this.listQuery.itemId) { if (!this.listQuery.itemId) {
this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('projectManage.item') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('projectManage.item') }),
);
return; return;
} }
if (!this.listQuery.threadPoolKey) { if (!this.listQuery.threadPoolKey) {
this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolID') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('frameworkThreadPool.threadPoolID') }),
);
return; return;
} }
this.listLoading = true; this.listLoading = true;

@ -110,7 +110,11 @@
<el-table-column label="队列容量" > <el-table-column label="队列容量" >
<template slot-scope="scope">{{ scope.row.queueCapacity }}</template> <template slot-scope="scope">{{ scope.row.queueCapacity }}</template>
</el-table-column>--> </el-table-column>-->
<el-table-column :label="$t('common.operation')" width="180" class-name="small-padding fixed-width"> <el-table-column
:label="$t('common.operation')"
width="180"
class-name="small-padding fixed-width"
>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!--<el-dropdown trigger="click"> <!--<el-dropdown trigger="click">
<span class="el-dropdown-link"> <span class="el-dropdown-link">
@ -121,7 +125,9 @@
<el-dropdown-item @click.native="handleUpdate(row)">编辑</el-dropdown-item> <el-dropdown-item @click.native="handleUpdate(row)">编辑</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown>--> </el-dropdown>-->
<el-button type="text" size="small" @click="handleUpdate(row)"> {{ $t('common.edit') }} </el-button> <el-button type="text" size="small" @click="handleUpdate(row)">
{{ $t('common.edit') }}
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -130,8 +136,8 @@
ref="dataForm" ref="dataForm"
:rules="rules" :rules="rules"
:model="temp" :model="temp"
label-position="left" style="width: 500px; margin-left: 50px"
label-width="110px" label-width="120px"
> >
<el-form-item :label="$t('threadPool.coreSize')" prop="coreSize"> <el-form-item :label="$t('threadPool.coreSize')" prop="coreSize">
<template> <template>
@ -159,7 +165,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false"> {{ $t('common.cancel') }} </el-button> <el-button @click="dialogFormVisible = false"> {{ $t('common.cancel') }} </el-button>
<el-button type="primary" @click="updateData()"> {{$t('common.confirm')}} </el-button> <el-button type="primary" @click="updateData()"> {{ $t('common.confirm') }} </el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogPluginVisible" title="Reading statistics"> <el-dialog :visible.sync="dialogPluginVisible" title="Reading statistics">
@ -282,19 +288,27 @@ export default {
}, },
fetchData() { fetchData() {
if (!this.listQuery.mark) { if (!this.listQuery.mark) {
this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolType') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('frameworkThreadPool.threadPoolType') }),
);
return; return;
} }
if (!this.listQuery.tenantId) { if (!this.listQuery.tenantId) {
this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') }),
);
return; return;
} }
if (!this.listQuery.itemId) { if (!this.listQuery.itemId) {
this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('projectManage.item') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('projectManage.item') }),
);
return; return;
} }
if (!this.listQuery.threadPoolKey) { if (!this.listQuery.threadPoolKey) {
this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolID') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('frameworkThreadPool.threadPoolID') }),
);
return; return;
} }
this.listLoading = true; this.listLoading = true;

@ -110,7 +110,11 @@
<el-table-column label="队列容量" > <el-table-column label="队列容量" >
<template slot-scope="scope">{{ scope.row.queueCapacity }}</template> <template slot-scope="scope">{{ scope.row.queueCapacity }}</template>
</el-table-column>--> </el-table-column>-->
<el-table-column :label="$t('common.operation')" width="180" class-name="small-padding fixed-width"> <el-table-column
:label="$t('common.operation')"
width="180"
class-name="small-padding fixed-width"
>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!--<el-dropdown trigger="click"> <!--<el-dropdown trigger="click">
<span class="el-dropdown-link"> <span class="el-dropdown-link">
@ -121,7 +125,9 @@
<el-dropdown-item @click.native="handleUpdate(row)">编辑</el-dropdown-item> <el-dropdown-item @click.native="handleUpdate(row)">编辑</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown>--> </el-dropdown>-->
<el-button type="text" size="small" @click="handleUpdate(row)"> {{ $t('common.edit') }} </el-button> <el-button type="text" size="small" @click="handleUpdate(row)">
{{ $t('common.edit') }}
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -131,8 +137,8 @@
ref="dataForm" ref="dataForm"
:rules="rules" :rules="rules"
:model="temp" :model="temp"
label-position="left" style="width: 500px; margin-left: 50px"
label-width="110px" label-width="120px"
> >
<el-form-item :label="$t('threadPool.coreSize')" prop="coreSize"> <el-form-item :label="$t('threadPool.coreSize')" prop="coreSize">
<template> <template>
@ -160,7 +166,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false"> {{ $t('common.cancel') }} </el-button> <el-button @click="dialogFormVisible = false"> {{ $t('common.cancel') }} </el-button>
<el-button type="primary" @click="updateData()"> {{$t('common.confirm')}} </el-button> <el-button type="primary" @click="updateData()"> {{ $t('common.confirm') }} </el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogPluginVisible" title="Reading statistics"> <el-dialog :visible.sync="dialogPluginVisible" title="Reading statistics">
@ -283,19 +289,27 @@ export default {
}, },
fetchData() { fetchData() {
if (!this.listQuery.mark) { if (!this.listQuery.mark) {
this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolType') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('frameworkThreadPool.threadPoolType') }),
);
return; return;
} }
if (!this.listQuery.tenantId) { if (!this.listQuery.tenantId) {
this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') }),
);
return; return;
} }
if (!this.listQuery.itemId) { if (!this.listQuery.itemId) {
this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('projectManage.item') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('projectManage.item') }),
);
return; return;
} }
if (!this.listQuery.threadPoolKey) { if (!this.listQuery.threadPoolKey) {
this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolID') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('frameworkThreadPool.threadPoolID') }),
);
return; return;
} }
this.listLoading = true; this.listLoading = true;

@ -110,7 +110,11 @@
<el-table-column label="队列容量" > <el-table-column label="队列容量" >
<template slot-scope="scope">{{ scope.row.queueCapacity }}</template> <template slot-scope="scope">{{ scope.row.queueCapacity }}</template>
</el-table-column>--> </el-table-column>-->
<el-table-column :label="$t('common.operation')" width="180" class-name="small-padding fixed-width"> <el-table-column
:label="$t('common.operation')"
width="180"
class-name="small-padding fixed-width"
>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!--<el-dropdown trigger="click"> <!--<el-dropdown trigger="click">
<span class="el-dropdown-link"> <span class="el-dropdown-link">
@ -121,7 +125,9 @@
<el-dropdown-item @click.native="handleUpdate(row)">编辑</el-dropdown-item> <el-dropdown-item @click.native="handleUpdate(row)">编辑</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown>--> </el-dropdown>-->
<el-button type="text" size="small" @click="handleUpdate(row)"> {{ $t('common.edit') }} </el-button> <el-button type="text" size="small" @click="handleUpdate(row)">
{{ $t('common.edit') }}
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -130,8 +136,8 @@
ref="dataForm" ref="dataForm"
:rules="rules" :rules="rules"
:model="temp" :model="temp"
label-position="left" style="width: 500px; margin-left: 50px"
label-width="110px" label-width="120px"
> >
<el-form-item :label="$t('threadPool.coreSize')" prop="coreSize"> <el-form-item :label="$t('threadPool.coreSize')" prop="coreSize">
<template> <template>
@ -159,7 +165,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false"> {{ $t('common.cancel') }} </el-button> <el-button @click="dialogFormVisible = false"> {{ $t('common.cancel') }} </el-button>
<el-button type="primary" @click="updateData()"> {{$t('common.confirm')}} </el-button> <el-button type="primary" @click="updateData()"> {{ $t('common.confirm') }} </el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogPluginVisible" title="Reading statistics"> <el-dialog :visible.sync="dialogPluginVisible" title="Reading statistics">
@ -282,19 +288,27 @@ export default {
}, },
fetchData() { fetchData() {
if (!this.listQuery.mark) { if (!this.listQuery.mark) {
this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolType') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('frameworkThreadPool.threadPoolType') }),
);
return; return;
} }
if (!this.listQuery.tenantId) { if (!this.listQuery.tenantId) {
this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') }),
);
return; return;
} }
if (!this.listQuery.itemId) { if (!this.listQuery.itemId) {
this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('projectManage.item') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('projectManage.item') }),
);
return; return;
} }
if (!this.listQuery.threadPoolKey) { if (!this.listQuery.threadPoolKey) {
this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolID') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('frameworkThreadPool.threadPoolID') }),
);
return; return;
} }
this.listLoading = true; this.listLoading = true;

@ -110,7 +110,11 @@
<el-table-column label="队列容量" > <el-table-column label="队列容量" >
<template slot-scope="scope">{{ scope.row.queueCapacity }}</template> <template slot-scope="scope">{{ scope.row.queueCapacity }}</template>
</el-table-column>--> </el-table-column>-->
<el-table-column :label="$t('common.operation')" width="180" class-name="small-padding fixed-width"> <el-table-column
:label="$t('common.operation')"
width="180"
class-name="small-padding fixed-width"
>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!--<el-dropdown trigger="click"> <!--<el-dropdown trigger="click">
<span class="el-dropdown-link"> <span class="el-dropdown-link">
@ -121,7 +125,9 @@
<el-dropdown-item @click.native="handleUpdate(row)">编辑</el-dropdown-item> <el-dropdown-item @click.native="handleUpdate(row)">编辑</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown>--> </el-dropdown>-->
<el-button type="text" size="small" @click="handleUpdate(row)"> {{ $t('common.edit') }} </el-button> <el-button type="text" size="small" @click="handleUpdate(row)">
{{ $t('common.edit') }}
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -131,8 +137,8 @@
ref="dataForm" ref="dataForm"
:rules="rules" :rules="rules"
:model="temp" :model="temp"
label-position="left" style="width: 500px; margin-left: 50px"
label-width="110px" label-width="120px"
> >
<el-form-item :label="$t('threadPool.coreSize')" prop="coreSize"> <el-form-item :label="$t('threadPool.coreSize')" prop="coreSize">
<template> <template>
@ -160,7 +166,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false"> {{ $t('common.cancel') }} </el-button> <el-button @click="dialogFormVisible = false"> {{ $t('common.cancel') }} </el-button>
<el-button type="primary" @click="updateData()"> {{$t('common.confirm')}} </el-button> <el-button type="primary" @click="updateData()"> {{ $t('common.confirm') }} </el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogPluginVisible" title="Reading statistics"> <el-dialog :visible.sync="dialogPluginVisible" title="Reading statistics">
@ -283,19 +289,27 @@ export default {
}, },
fetchData() { fetchData() {
if (!this.listQuery.mark) { if (!this.listQuery.mark) {
this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolType') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('frameworkThreadPool.threadPoolType') }),
);
return; return;
} }
if (!this.listQuery.tenantId) { if (!this.listQuery.tenantId) {
this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') }),
);
return; return;
} }
if (!this.listQuery.itemId) { if (!this.listQuery.itemId) {
this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('projectManage.item') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('projectManage.item') }),
);
return; return;
} }
if (!this.listQuery.threadPoolKey) { if (!this.listQuery.threadPoolKey) {
this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolID') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('frameworkThreadPool.threadPoolID') }),
);
return; return;
} }
this.listLoading = true; this.listLoading = true;

@ -95,8 +95,12 @@
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button type="text" size="small" @click="handleInfo(row)"> {{ $t('common.detail') }} </el-button> <el-button type="text" size="small" @click="handleInfo(row)">
<el-button type="text" :disabled="isEditDisabled" size="small" @click="handleUpdate(row)">{{ $t('common.edit') }} </el-button> {{ $t('common.detail') }}
</el-button>
<el-button type="text" :disabled="isEditDisabled" size="small" @click="handleUpdate(row)"
>{{ $t('common.edit') }}
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -106,7 +110,13 @@
width="1000px" width="1000px"
> >
<template> <template>
<el-descriptions class="margin-top" :title="$t('threadPoolInstance.LoadInformation')" :column="3" :size="size" border> <el-descriptions
class="margin-top"
:title="$t('threadPoolInstance.LoadInformation')"
:column="3"
:size="size"
border
>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> {{ $t('threadPoolInstance.CurrentLoad') }} </template> <template slot="label"> {{ $t('threadPoolInstance.CurrentLoad') }} </template>
{{ runTimeTemp.currentLoad }} {{ runTimeTemp.currentLoad }}
@ -126,7 +136,13 @@
</el-descriptions> </el-descriptions>
<br /> <br />
<br /> <br />
<el-descriptions class="margin-top" :title="$t('threadPoolInstance.threadInformation')" :column="3" :size="size" border> <el-descriptions
class="margin-top"
:title="$t('threadPoolInstance.threadInformation')"
:column="3"
:size="size"
border
>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> {{ $t('threadPool.coreSize') }} </template> <template slot="label"> {{ $t('threadPool.coreSize') }} </template>
{{ runTimeTemp.coreSize }} {{ runTimeTemp.coreSize }}
@ -150,7 +166,13 @@
</el-descriptions> </el-descriptions>
<br /> <br />
<br /> <br />
<el-descriptions class="margin-top" :title="$t('threadPoolInstance.queueInformation')" :column="3" :size="size" border> <el-descriptions
class="margin-top"
:title="$t('threadPoolInstance.queueInformation')"
:column="3"
:size="size"
border
>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> {{ $t('threadPool.queueCapacity') }} </template> <template slot="label"> {{ $t('threadPool.queueCapacity') }} </template>
{{ runTimeTemp.queueCapacity }} {{ runTimeTemp.queueCapacity }}
@ -160,7 +182,9 @@
{{ runTimeTemp.queueSize }} {{ runTimeTemp.queueSize }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> {{ $t('threadPoolInstance.queueRemainingCapacity') }} </template> <template slot="label">
{{ $t('threadPoolInstance.queueRemainingCapacity') }}
</template>
{{ runTimeTemp.queueRemainingCapacity }} {{ runTimeTemp.queueRemainingCapacity }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
@ -170,7 +194,13 @@
</el-descriptions> </el-descriptions>
<br /> <br />
<br /> <br />
<el-descriptions class="margin-top" :title="$t('threadPoolInstance.otherInformation')" :column="3" :size="size" border> <el-descriptions
class="margin-top"
:title="$t('threadPoolInstance.otherInformation')"
:column="3"
:size="size"
border
>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> {{ $t('threadPoolInstance.totalTask') }} </template> <template slot="label"> {{ $t('threadPoolInstance.totalTask') }} </template>
{{ runTimeTemp.completedTaskCount }} {{ runTimeTemp.completedTaskCount }}
@ -201,8 +231,8 @@
ref="dataForm" ref="dataForm"
:rules="rules" :rules="rules"
:model="temp" :model="temp"
label-position="left" style="width: 500px; margin-left: 50px"
label-width="110px" label-width="120px"
> >
<el-form-item :label="$t('threadPool.coreSize')" prop="coreSize"> <el-form-item :label="$t('threadPool.coreSize')" prop="coreSize">
<template> <template>
@ -230,7 +260,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false"> {{ $t('common.cancel') }} </el-button> <el-button @click="dialogFormVisible = false"> {{ $t('common.cancel') }} </el-button>
<el-button type="primary" @click="updateData()"> {{$t('common.confirm')}} </el-button> <el-button type="primary" @click="updateData()"> {{ $t('common.confirm') }} </el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogPluginVisible" title="Reading statistics"> <el-dialog :visible.sync="dialogPluginVisible" title="Reading statistics">
@ -350,11 +380,15 @@ export default {
}, },
fetchData() { fetchData() {
if (!this.listQuery.tenantId) { if (!this.listQuery.tenantId) {
this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') }),
);
return; return;
} }
if (!this.listQuery.itemId) { if (!this.listQuery.itemId) {
this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('projectManage.item') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('projectManage.item') }),
);
return; return;
} }
this.listLoading = true; this.listLoading = true;

@ -95,8 +95,12 @@
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button type="text" size="small" @click="handleInfo(row)"> {{ $t('common.detail') }} </el-button> <el-button type="text" size="small" @click="handleInfo(row)">
<el-button type="text" size="small" @click="handleUpdate(row)"> {{ $t('common.edit') }} </el-button> {{ $t('common.detail') }}
</el-button>
<el-button type="text" size="small" @click="handleUpdate(row)">
{{ $t('common.edit') }}
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -106,7 +110,13 @@
width="1000px" width="1000px"
> >
<template> <template>
<el-descriptions class="margin-top" :title="$t('threadPoolInstance.LoadInformation')" :column="3" :size="size" border> <el-descriptions
class="margin-top"
:title="$t('threadPoolInstance.LoadInformation')"
:column="3"
:size="size"
border
>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> {{ $t('threadPoolInstance.CurrentLoad') }} </template> <template slot="label"> {{ $t('threadPoolInstance.CurrentLoad') }} </template>
{{ runTimeTemp.currentLoad }} {{ runTimeTemp.currentLoad }}
@ -126,7 +136,13 @@
</el-descriptions> </el-descriptions>
<br /> <br />
<br /> <br />
<el-descriptions class="margin-top" :title="$t('threadPoolInstance.threadInformation')" :column="3" :size="size" border> <el-descriptions
class="margin-top"
:title="$t('threadPoolInstance.threadInformation')"
:column="3"
:size="size"
border
>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> {{ $t('threadPool.coreSize') }} </template> <template slot="label"> {{ $t('threadPool.coreSize') }} </template>
{{ runTimeTemp.coreSize }} {{ runTimeTemp.coreSize }}
@ -150,7 +166,13 @@
</el-descriptions> </el-descriptions>
<br /> <br />
<br /> <br />
<el-descriptions class="margin-top" :title="$t('threadPoolInstance.queueInformation')" :column="3" :size="size" border> <el-descriptions
class="margin-top"
:title="$t('threadPoolInstance.queueInformation')"
:column="3"
:size="size"
border
>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> {{ $t('threadPool.queueCapacity') }} </template> <template slot="label"> {{ $t('threadPool.queueCapacity') }} </template>
{{ runTimeTemp.queueCapacity }} {{ runTimeTemp.queueCapacity }}
@ -160,7 +182,9 @@
{{ runTimeTemp.queueSize }} {{ runTimeTemp.queueSize }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> {{ $t('threadPoolInstance.queueRemainingCapacity') }} </template> <template slot="label">
{{ $t('threadPoolInstance.queueRemainingCapacity') }}
</template>
{{ runTimeTemp.queueRemainingCapacity }} {{ runTimeTemp.queueRemainingCapacity }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
@ -170,7 +194,13 @@
</el-descriptions> </el-descriptions>
<br /> <br />
<br /> <br />
<el-descriptions class="margin-top" :title="$t('threadPoolInstance.otherInformation')" :column="3" :size="size" border> <el-descriptions
class="margin-top"
:title="$t('threadPoolInstance.otherInformation')"
:column="3"
:size="size"
border
>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> {{ $t('threadPoolInstance.totalTask') }} </template> <template slot="label"> {{ $t('threadPoolInstance.totalTask') }} </template>
{{ runTimeTemp.completedTaskCount }} {{ runTimeTemp.completedTaskCount }}
@ -201,8 +231,8 @@
ref="dataForm" ref="dataForm"
:rules="rules" :rules="rules"
:model="temp" :model="temp"
label-position="left" style="width: 500px; margin-left: 50px"
label-width="110px" label-width="120px"
> >
<el-form-item :label="$t('threadPool.coreSize')" prop="coreSize"> <el-form-item :label="$t('threadPool.coreSize')" prop="coreSize">
<template> <template>
@ -240,7 +270,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false"> {{ $t('common.cancel') }} </el-button> <el-button @click="dialogFormVisible = false"> {{ $t('common.cancel') }} </el-button>
<el-button type="primary" @click="updateData()"> {{$t('common.confirm')}} </el-button> <el-button type="primary" @click="updateData()"> {{ $t('common.confirm') }} </el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogPluginVisible" title="Reading statistics"> <el-dialog :visible.sync="dialogPluginVisible" title="Reading statistics">
@ -272,7 +302,7 @@ export default {
UAT: 'warning', UAT: 'warning',
PROD: 'danger', PROD: 'danger',
}; };
return statusMap[status] return statusMap[status];
}, },
}, },
data() { data() {
@ -360,11 +390,15 @@ export default {
}, },
fetchData() { fetchData() {
if (!this.listQuery.tenantId) { if (!this.listQuery.tenantId) {
this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') }),
);
return; return;
} }
if (!this.listQuery.itemId) { if (!this.listQuery.itemId) {
this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('projectManage.item') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('projectManage.item') }),
);
return; return;
} }
this.listLoading = true; this.listLoading = true;

@ -95,8 +95,12 @@
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button type="text" size="small" @click="handleInfo(row)"> {{ $t('common.detail') }} </el-button> <el-button type="text" size="small" @click="handleInfo(row)">
<el-button type="text" :disabled="isEditDisabled" size="small" @click="handleUpdate(row)"> {{ $t('common.edit') }} </el-button> {{ $t('common.detail') }}
</el-button>
<el-button type="text" :disabled="isEditDisabled" size="small" @click="handleUpdate(row)">
{{ $t('common.edit') }}
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -106,7 +110,13 @@
width="1000px" width="1000px"
> >
<template> <template>
<el-descriptions class="margin-top" :title="$t('threadPoolInstance.LoadInformation')" :column="3" :size="size" border> <el-descriptions
class="margin-top"
:title="$t('threadPoolInstance.LoadInformation')"
:column="3"
:size="size"
border
>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> {{ $t('threadPoolInstance.CurrentLoad') }} </template> <template slot="label"> {{ $t('threadPoolInstance.CurrentLoad') }} </template>
{{ runTimeTemp.currentLoad }} {{ runTimeTemp.currentLoad }}
@ -126,7 +136,13 @@
</el-descriptions> </el-descriptions>
<br /> <br />
<br /> <br />
<el-descriptions class="margin-top" :title="$t('threadPoolInstance.threadInformation')" :column="3" :size="size" border> <el-descriptions
class="margin-top"
:title="$t('threadPoolInstance.threadInformation')"
:column="3"
:size="size"
border
>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> {{ $t('threadPool.coreSize') }} </template> <template slot="label"> {{ $t('threadPool.coreSize') }} </template>
{{ runTimeTemp.coreSize }} {{ runTimeTemp.coreSize }}
@ -150,7 +166,13 @@
</el-descriptions> </el-descriptions>
<br /> <br />
<br /> <br />
<el-descriptions class="margin-top" :title="$t('threadPoolInstance.queueInformation')" :column="3" :size="size" border> <el-descriptions
class="margin-top"
:title="$t('threadPoolInstance.queueInformation')"
:column="3"
:size="size"
border
>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> {{ $t('threadPool.queueCapacity') }} </template> <template slot="label"> {{ $t('threadPool.queueCapacity') }} </template>
{{ runTimeTemp.queueCapacity }} {{ runTimeTemp.queueCapacity }}
@ -160,7 +182,9 @@
{{ runTimeTemp.queueSize }} {{ runTimeTemp.queueSize }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> {{ $t('threadPoolInstance.queueRemainingCapacity') }} </template> <template slot="label">
{{ $t('threadPoolInstance.queueRemainingCapacity') }}
</template>
{{ runTimeTemp.queueRemainingCapacity }} {{ runTimeTemp.queueRemainingCapacity }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
@ -170,7 +194,13 @@
</el-descriptions> </el-descriptions>
<br /> <br />
<br /> <br />
<el-descriptions class="margin-top" :title="$t('threadPoolInstance.otherInformation')" :column="3" :size="size" border> <el-descriptions
class="margin-top"
:title="$t('threadPoolInstance.otherInformation')"
:column="3"
:size="size"
border
>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> {{ $t('threadPoolInstance.totalTask') }} </template> <template slot="label"> {{ $t('threadPoolInstance.totalTask') }} </template>
{{ runTimeTemp.completedTaskCount }} {{ runTimeTemp.completedTaskCount }}
@ -201,8 +231,8 @@
ref="dataForm" ref="dataForm"
:rules="rules" :rules="rules"
:model="temp" :model="temp"
label-position="left" style="width: 500px; margin-left: 50px"
label-width="110px" label-width="120px"
> >
<el-form-item :label="$t('threadPool.coreSize')" prop="coreSize"> <el-form-item :label="$t('threadPool.coreSize')" prop="coreSize">
<template> <template>
@ -240,7 +270,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false"> {{ $t('common.cancel') }} </el-button> <el-button @click="dialogFormVisible = false"> {{ $t('common.cancel') }} </el-button>
<el-button type="primary" @click="updateData()"> {{$t('common.confirm')}} </el-button> <el-button type="primary" @click="updateData()"> {{ $t('common.confirm') }} </el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogPluginVisible" title="Reading statistics"> <el-dialog :visible.sync="dialogPluginVisible" title="Reading statistics">
@ -360,11 +390,15 @@ export default {
}, },
fetchData() { fetchData() {
if (!this.listQuery.tenantId) { if (!this.listQuery.tenantId) {
this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') }),
);
return; return;
} }
if (!this.listQuery.itemId) { if (!this.listQuery.itemId) {
this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('projectManage.item') })); this.$message.warning(
this.$t('message.emptyWarning', { name: this.$t('projectManage.item') }),
);
return; return;
} }
this.listLoading = true; this.listLoading = true;

@ -25,7 +25,7 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleCreate" @click="handleCreate"
> >
{{ $t('common.insert') }} {{ $t('common.insert') }}
</el-button> </el-button>
</div> </div>
<el-table <el-table
@ -56,7 +56,11 @@
<el-table-column :label="$t('common.updateTime')"> <el-table-column :label="$t('common.updateTime')">
<template slot-scope="scope">{{ scope.row.gmtModified }}</template> <template slot-scope="scope">{{ scope.row.gmtModified }}</template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('common.operation')" width="90" class-name="small-padding fixed-width"> <el-table-column
:label="$t('common.operation')"
width="90"
class-name="small-padding fixed-width"
>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button type="text" :disabled="isEditDisabled" size="small" @click="handleUpdate(row)"> <el-button type="text" :disabled="isEditDisabled" size="small" @click="handleUpdate(row)">
{{ $t('common.edit') }} {{ $t('common.edit') }}
@ -75,12 +79,12 @@
@pagination="fetchData" @pagination="fetchData"
/> />
<el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="800px"> <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
<el-form <el-form
ref="dataForm" ref="dataForm"
style="width: 500px; margin-left: 50px"
:rules="rules" :rules="rules"
:model="temp" :model="temp"
label-position="left"
label-width="120px" label-width="120px"
> >
<el-form-item :label="$t('tenantManage.tenant')" prop="tenantId"> <el-form-item :label="$t('tenantManage.tenant')" prop="tenantId">
@ -88,14 +92,13 @@
v-model="temp.tenantId" v-model="temp.tenantId"
:disabled="dialogStatus === 'create' ? false : true" :disabled="dialogStatus === 'create' ? false : true"
:placeholder="$t('tenantManage.tenant')" :placeholder="$t('tenantManage.tenant')"
style="width: 40%"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('tenantManage.tenantName')" prop="tenantName"> <el-form-item :label="$t('tenantManage.tenantName')" prop="tenantName">
<el-input v-model="temp.tenantName" :placeholder="$t('tenantManage.tenantName')" style="width: 40%" /> <el-input v-model="temp.tenantName" :placeholder="$t('tenantManage.tenantName')" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('tenantManage.owner')" prop="owner"> <el-form-item :label="$t('tenantManage.owner')" prop="owner">
<el-input v-model="temp.owner" :placeholder="$t('tenantManage.owner')" style="width: 40%" /> <el-input v-model="temp.owner" :placeholder="$t('tenantManage.owner')" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('tenantManage.tenantIntro')" prop="tenantDesc"> <el-form-item :label="$t('tenantManage.tenantIntro')" prop="tenantDesc">
<el-input <el-input
@ -103,7 +106,6 @@
:autosize="{ minRows: 3, maxRows: 6 }" :autosize="{ minRows: 3, maxRows: 6 }"
type="textarea" type="textarea"
:placeholder="$t('tenantManage.tenantIntro')" :placeholder="$t('tenantManage.tenantIntro')"
style="width: 40%"
/> />
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -120,7 +122,9 @@
<el-table-column prop="pv" label="Pv" /> <el-table-column prop="pv" label="Pv" />
</el-table> </el-table>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="dialogPvVisible = false">{{ $t('common.confirm') }}</el-button> <el-button type="primary" @click="dialogPvVisible = false">{{
$t('common.confirm')
}}</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
@ -170,14 +174,18 @@ export default {
dialogFormVisible: false, dialogFormVisible: false,
dialogStatus: '', dialogStatus: '',
textMap: { textMap: {
update: this.$t('common.edit'), update: 'Edit',
create: this.$t('common.create'), create: 'Create',
}, },
rules: { rules: {
tenantId: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }], tenantId: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }],
tenantName: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }], tenantName: [
{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' },
],
owner: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }], owner: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }],
tenantDesc: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }], tenantDesc: [
{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' },
],
}, },
temp: { temp: {
id: undefined, id: undefined,

@ -91,7 +91,10 @@
<el-link type="success" :underline="false">{{ scope.row.coreSize }}</el-link> <el-link type="success" :underline="false">{{ scope.row.coreSize }}</el-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('threadPool.maximumSize')" :width="$langMatch({ zh: '100', en: '120' })"> <el-table-column
:label="$t('threadPool.maximumSize')"
:width="$langMatch({ zh: '100', en: '120' })"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-link type="danger" :underline="false">{{ scope.row.maxSize }}</el-link> <el-link type="danger" :underline="false">{{ scope.row.maxSize }}</el-link>
</template> </template>
@ -99,13 +102,19 @@
<el-table-column :label="$t('threadPool.queueType')" width="260"> <el-table-column :label="$t('threadPool.queueType')" width="260">
<template slot-scope="scope">{{ scope.row.queueType | queueFilter }}</template> <template slot-scope="scope">{{ scope.row.queueType | queueFilter }}</template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('threadPool.queueCapacity')" :width="$langMatch({ zh: '100', en: '120' })"> <el-table-column
:label="$t('threadPool.queueCapacity')"
:width="$langMatch({ zh: '100', en: '120' })"
>
<template slot-scope="scope">{{ scope.row.capacity }}</template> <template slot-scope="scope">{{ scope.row.capacity }}</template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('threadPool.rejectedHandler')" width="200"> <el-table-column :label="$t('threadPool.rejectedHandler')" width="200">
<template slot-scope="scope">{{ scope.row.rejectedType | rejectedTypeFilter }}</template> <template slot-scope="scope">{{ scope.row.rejectedType | rejectedTypeFilter }}</template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('threadPool.executionTimeout')" :width="$langMatch({ zh: '100', en: '150' })"> <el-table-column
:label="$t('threadPool.executionTimeout')"
:width="$langMatch({ zh: '100', en: '150' })"
>
<template slot-scope="scope">{{ <template slot-scope="scope">{{
scope.row.executeTimeOut | defaultExecuteTimeoutValue scope.row.executeTimeOut | defaultExecuteTimeoutValue
}}</template> }}</template>
@ -198,12 +207,12 @@
<el-input <el-input
v-model="temp.tpId" v-model="temp.tpId"
size="medium" size="medium"
:placeholder="$t('message.selectMessage', { target: $t('threadPool.threadPool') }) " :placeholder="$t('message.selectMessage', { target: $t('threadPool.threadPool') })"
:disabled="dialogStatus === 'create' ? false : true" :disabled="dialogStatus === 'create' ? false : true"
/> />
</el-form-item> </el-form-item>
</template> </template>
<el-form-item :label="$t('threadPool.coreSize')" prop="coreSize"> <el-form-item :label="$t('threadPool.coreSize')" prop="coreSize">
<el-input-number <el-input-number
v-model="temp.coreSize" v-model="temp.coreSize"
@ -325,7 +334,11 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="isRejectShow" :label="$t('threadPool.customRejectedHandler')" prop="customRejectedType"> <el-form-item
v-if="isRejectShow"
:label="$t('threadPool.customRejectedHandler')"
prop="customRejectedType"
>
<el-input <el-input
v-model="temp.customRejectedType" v-model="temp.customRejectedType"
:placeholder="$t('threadPool.customRejectedHandlerTip')" :placeholder="$t('threadPool.customRejectedHandlerTip')"
@ -346,7 +359,9 @@
<el-table-column prop="pv" label="Pv" /> <el-table-column prop="pv" label="Pv" />
</el-table> </el-table>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="dialogPvVisible = false">{{ $t('common.confirm') }}</el-button> <el-button type="primary" @click="dialogPvVisible = false">{{
$t('common.confirm')
}}</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
@ -465,8 +480,8 @@ export default {
size: 500, size: 500,
dialogStatus: '', dialogStatus: '',
textMap: { textMap: {
update: this.$t('common.edit'), update: 'Edit',
create: this.$t('common.create'), create: 'Create',
}, },
rules: { rules: {
tenantId: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }], tenantId: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }],
@ -487,14 +502,26 @@ export default {
// }, // },
], ],
queueType: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }], queueType: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }],
allowCoreThreadTimeOut: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }], allowCoreThreadTimeOut: [
keepAliveTime: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }], { required: true, message: this.$t('message.requiredError'), trigger: 'blur' },
],
keepAliveTime: [
{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' },
],
isAlarm: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }], isAlarm: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }],
capacityAlarm: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }], capacityAlarm: [
livenessAlarm: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }], { required: true, message: this.$t('message.requiredError'), trigger: 'blur' },
rejectedType: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }], ],
livenessAlarm: [
{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' },
],
rejectedType: [
{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' },
],
capacity: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }], capacity: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }],
executeTimeOut: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }], executeTimeOut: [
{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' },
],
}, },
temp: { temp: {
id: undefined, id: undefined,

@ -73,7 +73,7 @@
<el-link type="primary" :underline="false">{{ scope.row.identify || '-' }}</el-link> <el-link type="primary" :underline="false">{{ scope.row.identify || '-' }}</el-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('threadPoolAudit.changeType')" width="100"> <el-table-column :label="$t('threadPoolAudit.changeType')" width="110">
<template slot-scope="scope"> {{ scope.row.type | modifyTypeFilter(that) }} </template> <template slot-scope="scope"> {{ scope.row.type | modifyTypeFilter(that) }} </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('threadPoolInstance.changeAll')" width="100"> <el-table-column :label="$t('threadPoolInstance.changeAll')" width="100">
@ -87,7 +87,9 @@
<template slot-scope="scope"> {{ scope.row.modifyUser }}</template> <template slot-scope="scope"> {{ scope.row.modifyUser }}</template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('threadPoolAudit.auditStatus')" width="110"> <el-table-column :label="$t('threadPoolAudit.auditStatus')" width="110">
<template slot-scope="scope">{{ scope.row.verifyStatus | verifyStatusFilter(that) }}</template> <template slot-scope="scope">{{
scope.row.verifyStatus | verifyStatusFilter(that)
}}</template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('threadPoolAudit.reviewer')" width="120"> <el-table-column :label="$t('threadPoolAudit.reviewer')" width="120">
<template slot-scope="scope">{{ scope.row.verifyUser }}</template> <template slot-scope="scope">{{ scope.row.verifyUser }}</template>
@ -106,7 +108,9 @@
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button type="text" size="small" @click="applicationDetail(row)"> {{$t('common.audit')}} </el-button> <el-button type="text" size="small" @click="applicationDetail(row)">
{{ $t('common.audit') }}
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -122,9 +126,9 @@
<el-dialog :title="textMap[dialogStatus]" :visible.sync="threadPoolManagerDialog"> <el-dialog :title="textMap[dialogStatus]" :visible.sync="threadPoolManagerDialog">
<el-form <el-form
ref="dataForm" ref="dataForm"
style="width: 500px; margin-left: 50px"
:model="temp" :model="temp"
label-width="80px" style="width: 500px; margin-left: 50px"
label-width="140px"
> >
<el-form-item :label="$t('threadPool.coreSize')" prop="corePoolSize"> <el-form-item :label="$t('threadPool.coreSize')" prop="corePoolSize">
{{ detailInfo.corePoolSize }} {{ detailInfo.corePoolSize }}
@ -333,9 +337,9 @@ export default {
}, },
enableFilter(type, that) { enableFilter(type, that) {
if (1 == type) { if (1 == type) {
return that.$t('common.yes'); return that.$t('common.yes');
} else if (0 == type) { } else if (0 == type) {
return that.$t('common.no') return that.$t('common.no');
} }
}, },
alarmFilter(type) { alarmFilter(type) {
@ -380,9 +384,9 @@ export default {
} }
}, },
modifyTypeFilter(type, that) { modifyTypeFilter(type, that) {
console.log(that) console.log(that);
if (1 == type) { if (1 == type) {
return that.$t('threadPoolAudit.manage') return that.$t('threadPoolAudit.manage');
} else if (2 == type) { } else if (2 == type) {
return that.$t('threadPoolAudit.instance'); return that.$t('threadPoolAudit.instance');
} else if (3 == type) { } else if (3 == type) {
@ -393,7 +397,7 @@ export default {
}, },
verifyStatusFilter(type, that) { verifyStatusFilter(type, that) {
if (0 == type) { if (0 == type) {
return that.$t('threadPoolAudit.unaudited') return that.$t('threadPoolAudit.unaudited');
} else if (1 == type) { } else if (1 == type) {
return that.$t('threadPoolAudit.auditApproved'); return that.$t('threadPoolAudit.auditApproved');
} else if (2 == type) { } else if (2 == type) {
@ -482,7 +486,7 @@ export default {
}, },
visible: true, visible: true,
// filters使this$tthatfilters // filters使this$tthatfilters
that: this that: this,
}; };
}, },
created() { created() {

Loading…
Cancel
Save