- ![]()
+ ![]()
-
-
@@ -27,39 +30,78 @@
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index 2de95ad..b99ac1e 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -25,7 +25,7 @@
+
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ formatMem(scope.row) }}
-
-
-
-
-
-
-
-
-
-
- {{ formatDisk(scope.row) }}
-
-
-
-
-
-
-
-
-
-
- {{ formatSwap(scope.row) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/system/dict/dictDetail.vue b/src/views/system/dict/dictDetail.vue
index b840832..1025a63 100644
--- a/src/views/system/dict/dictDetail.vue
+++ b/src/views/system/dict/dictDetail.vue
@@ -21,8 +21,8 @@
+
+
+
+
+
+
-
-
+
+
+ 状态
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CPU使用率
+
+
+
+ {{ data.cpu.name }}
+
+
+ {{ data.cpu.package }}
+
+
+ {{ data.cpu.core }}
+
+
+ {{ data.cpu.logic }}
+
+
+
+ 内存使用率
+
+
+
+ 总量：{{ data.memory.total }}
+
+
+ 已使用：{{ data.memory.used }}
+
+
+ 空闲：{{ data.memory.available }}
+
+
+
+ 交换区使用率
+
+
+
+ 总量：{{ data.swap.total }}
+
+
+ 已使用：{{ data.swap.used }}
+
+
+ 空闲：{{ data.swap.available }}
+
+
+
+ 磁盘使用率
+
+
+
+
+
+
+
+
+ 读取：{{ data.disk.reads }}
+
+
+ 写入：{{ data.disk.writes }}
+
+
+ 空闲：{{ data.disk.available }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ CPU使用率监控
+
+
+
+
+ 内存使用率监控
+
+
+
+
@@ -37,7 +37,7 @@
-
@@ -32,7 +32,7 @@
+
-
-
-
- {{ scope.row.sort }}
+ {{ scope.row.jobSort }}
@@ -73,7 +68,7 @@ export default {
return CRUD({
title: '岗位',
url: 'api/job',
- sort: ['sort,asc', 'id,desc'],
+ sort: ['jobSort,asc', 'id,desc'],
crudMethod: { ...crudJob }
})
},
@@ -98,9 +93,9 @@ export default {
type: 'warning'
}).then(() => {
// eslint-disable-next-line no-undef
- crud.crudMethod.edit(data).then(() => {
+ crudJob.edit(data).then(() => {
// eslint-disable-next-line no-undef
- crud.notify(this.dict.label.job_status[val] + '成功', 'success')
+ this.crud.notify(this.dict.label.job_status[val] + '成功', 'success')
}).catch(err => {
data.enabled = !data.enabled
console.log(err.data.message)
diff --git a/src/views/system/job/module/form.vue b/src/views/system/job/module/form.vue
index d109b47..1803e96 100644
--- a/src/views/system/job/module/form.vue
+++ b/src/views/system/job/module/form.vue
@@ -25,10 +25,10 @@
-
-
{{ scope.row.deptSuperiorName ? scope.row.deptSuperiorName + ' / ' : '' }}{{ scope.row.dept.name }}
-
-
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 213e87b..6c16a4f 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -63,7 +63,7 @@
-
-
-
+
-
-
+
-
+
- {{ scope.row.sort }}
+ {{ scope.row.menuSort }}
-
-
-
+
-
+
-
-
-
-
+
-
-
+
+
-
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 是
+ 否
+
- 启用
- 暂停
+
+ 启用
+ 暂停
+
-
-
+
@@ -65,23 +82,24 @@
{{ scope.row.isPause ? '已暂停' : '运行中' }}
-
+
{{ parseTime(scope.row.createTime) }}
-
+
编辑
执行
@@ -117,7 +135,7 @@ import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
-const defaultForm = { id: null, jobName: null, beanName: null, methodName: null, params: null, cronExpression: null, isPause: false, remark: null }
+const defaultForm = { id: null, jobName: null, subTask: null, beanName: null, methodName: null, params: null, cronExpression: null, pauseAfterFailure: true, isPause: false, personInCharge: null, email: null, description: null }
export default {
name: 'Timing',
components: { Log, pagination, crudOperation, rrOperation },
@@ -137,6 +155,9 @@ export default {
jobName: [
{ required: true, message: '请输入任务名称', trigger: 'blur' }
],
+ description: [
+ { required: true, message: '请输入任务描述', trigger: 'blur' }
+ ],
beanName: [
{ required: true, message: '请输入Bean名称', trigger: 'blur' }
],
@@ -145,6 +166,9 @@ export default {
],
cronExpression: [
{ required: true, message: '请输入Cron表达式', trigger: 'blur' }
+ ],
+ personInCharge: [
+ { required: true, message: '请输入负责人名称', trigger: 'blur' }
]
}
}
@@ -160,6 +184,9 @@ export default {
},
// 改变状态
updateStatus(id, status) {
+ if (status === '恢复') {
+ this.updateParams(id)
+ }
crudJob.updateIsPause(id).then(res => {
this.crud.toQuery()
this.crud.notify(status + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
@@ -167,6 +194,9 @@ export default {
console.log(err.response.data.message)
})
},
+ updateParams(id) {
+ console.log(id)
+ },
delMethod(id) {
this.delLoading = true
crudJob.del([id]).then(() => {
diff --git a/src/views/system/user/center.vue b/src/views/system/user/center.vue
index e072aaa..fd28f48 100644
--- a/src/views/system/user/center.vue
+++ b/src/views/system/user/center.vue
@@ -16,15 +16,15 @@
:action="updateAvatarApi"
class="avatar-uploader"
>
- ![]( "点击上传头像")
+ ![]( "点击上传头像")