From 73c9d59125d8b22b6533886e5d17265848bfaf13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=9F=B9=E5=8F=8B?= <17852335869@163.com> Date: Wed, 22 Feb 2023 17:16:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/const/workflow/crontab.js | 108 +++++++ src/views/journal/index.vue | 28 +- src/views/maintenance/database1.vue | 14 +- src/views/maintenance/system.vue | 14 +- src/views/maintenance/task.vue | 14 +- .../workflow/process/components/form.vue | 1 + src/views/plugin/workflow/process/crontab.vue | 288 ++++++++++++++++++ src/views/plugin/workflow/process/todo.vue | 14 +- .../plugin/workflow/process/workorder.vue | 14 +- 9 files changed, 446 insertions(+), 49 deletions(-) create mode 100644 src/const/workflow/crontab.js create mode 100644 src/views/plugin/workflow/process/crontab.vue diff --git a/src/const/workflow/crontab.js b/src/const/workflow/crontab.js new file mode 100644 index 0000000..13ae166 --- /dev/null +++ b/src/const/workflow/crontab.js @@ -0,0 +1,108 @@ +export const tableOption = { + index: true, + indexLabel: "序号", + indexWidth:120, + selection: false, + border: false, + gutter: 60, //设置input的大小 + headerAlign: "left", + align: "left", + menuAlign:'left', + menuHeaderAlign:'left', + menuBtn: true, + editBtn: false, + delBtn: false, + addBtn: false, + tip: false, + searchMenuSpan: 3, //控制搜索按钮 + columnBtn: false, + refreshBtn: false, + // dialogCustomClass: "custom", + header: false, + menuWidth:200, + column: [ + { + type: "input", + label: "任务父类", + prop: "taskParent", + align: "left", + overHidden: true, + }, + { + type: "input", + label: "任务种类", + prop: "taskType", + align: "left", + overHidden: true, + }, + { + type: "input", + label: "操作模块", + prop: "operationModule", + align: "left", + overHidden: true, + }, + // 改 + { + type: "input", + label: "操作对象", + prop: "operationModule", + align: "left", + overHidden: true, + }, + { + type: "input", + label: "当前责任人", + prop: "currentResponsiblePerson", + align: "left", + overHidden: true, + }, + { + type: "input", + label: "管理部门", + prop: "dept", + align: "left", + overHidden: true, + }, + { + type: "input", + label: "运维公司", + prop: "currentResponsiblePerson", + align: "left", + overHidden: true, + }, + { + type: "input", + label: "发起人", + prop: "sponsor", + align: "left", + overHidden: true, + }, + + { + label: "创建时间", + type: "datetime", + overHidden: true, + prop: "createTime", + format: "yyyy-MM-dd HH:mm", + valueFormat: "yyyy-MM-dd HH:mm:ss", + }, + // 改 + { + type: "input", + label: "重复模式", + prop: "approvalStatus", + align: "left", + overHidden: true, + }, + // 改 + { + label: "终止日期", + type: "datetime", + overHidden: true, + prop: "expectedCompletionTime", + format: "yyyy-MM-dd HH:mm", + valueFormat: "yyyy-MM-dd HH:mm:ss", + }, + ], +} diff --git a/src/views/journal/index.vue b/src/views/journal/index.vue index d76710a..c14b877 100644 --- a/src/views/journal/index.vue +++ b/src/views/journal/index.vue @@ -53,12 +53,12 @@ start-placeholder="开始日期" end-placeholder="结束日期" > - 查询 -
- -
+ 查询 +
+ +
@@ -94,9 +94,9 @@ export default { }, option: tableOption, page: { - current: 1, + pageSize: 10, + currentPage: 1, total: 0, - size: 10, }, // 表格数据 tableData: [], @@ -125,7 +125,7 @@ export default { // 列表 onLoad() { this.loading = true; - const { current, size } = this.page; + const { currentPage, pageSize } = this.page; if ( this.searchForm.timeArr !== null && this.searchForm.timeArr !== undefined @@ -141,7 +141,7 @@ export default { startTime, endTime, }; - getList({ current, size, ...params }).then((res) => { + getList({ current:currentPage, size:pageSize, ...params }).then((res) => { const { total, records } = res.data.data; this.page.total = total; this.tableData = records; @@ -150,16 +150,16 @@ export default { }, // 分页 currentChange(currentPage) { - this.page.current = currentPage; + this.page.currentPage = currentPage; this.onLoad(); }, sizeChange(pageSize) { - this.page.size = pageSize; + this.page.pageSize = pageSize; this.onLoad(); }, // 查询重置 searchHandle(index) { - this.page.current = 1; + this.page.currentPage = 1; if (index === 2) { this.searchForm = { timeArr: null, @@ -191,7 +191,7 @@ export default { margin-right: 20px; } .search-reset { - display:inline-block; + display: inline-block; width: 46px; height: 44px !important; background: #ff9130; diff --git a/src/views/maintenance/database1.vue b/src/views/maintenance/database1.vue index 3161224..8b426d9 100644 --- a/src/views/maintenance/database1.vue +++ b/src/views/maintenance/database1.vue @@ -115,9 +115,9 @@ export default { searchForm: {}, option: tableOption, page: { - current: 1, + currentPage: 1, total: 0, - size: 10, + pageSize: 10, }, // 表格数据 tableData: [], @@ -166,8 +166,8 @@ export default { // 列表 onLoad() { this.loading = true; - const { current, size } = this.page; - getList({ current, size, ...this.searchForm }).then((res) => { + const { currentPage, pageSize } = this.page; + getList({ current:currentPage, size:pageSize, ...this.searchForm }).then((res) => { const { total, records } = res.data.data; this.page.total = total; this.tableData = records; @@ -176,16 +176,16 @@ export default { }, // 分页 currentChange(currentPage) { - this.page.current = currentPage; + this.page.currentPage = currentPage; this.onLoad(); }, sizeChange(pageSize) { - this.page.size = pageSize; + this.page.pageSize = pageSize; this.onLoad(); }, // 查询重置 searchHandle(index) { - this.page.current = 1; + this.page.currentPage = 1; if (index === 2) { this.searchForm = {}; } diff --git a/src/views/maintenance/system.vue b/src/views/maintenance/system.vue index 7353591..6cb5bd7 100644 --- a/src/views/maintenance/system.vue +++ b/src/views/maintenance/system.vue @@ -117,9 +117,9 @@ export default { searchForm: {}, option: tableOption, page: { - current: 1, + currentPage: 1, total: 0, - size: 10, + pageSize: 10, }, // 表格数据 tableData: [], @@ -165,8 +165,8 @@ export default { // 列表 onLoad() { this.loading = true; - const { current, size } = this.page; - getList({ current, size, ...this.searchForm }).then((res) => { + const { currentPage, pageSize } = this.page; + getList({ current:currentPage, size:pageSize, ...this.searchForm }).then((res) => { const { total, records } = res.data.data; this.page.total = total; this.tableData = records; @@ -175,16 +175,16 @@ export default { }, // 分页 currentChange(currentPage) { - this.page.current = currentPage; + this.page.currentPage = currentPage; this.onLoad(); }, sizeChange(pageSize) { - this.page.size = pageSize; + this.page.pageSize = pageSize; this.onLoad(); }, // 查询重置 searchHandle(index) { - this.page.current = 1; + this.page.currentPage = 1; if (index === 2) { this.searchForm = {}; } diff --git a/src/views/maintenance/task.vue b/src/views/maintenance/task.vue index ba0c913..3a006ce 100644 --- a/src/views/maintenance/task.vue +++ b/src/views/maintenance/task.vue @@ -117,9 +117,9 @@ export default { conpanyList: [{ label: "运维公司", value: 1 }], option: tableOption, page: { - current: 1, + currentPage: 1, total: 0, - size: 10, + pageSize: 10, }, // 表格数据 tableData: [], @@ -152,7 +152,7 @@ export default { // 列表 onLoad() { this.loading = true; - const { current, size } = this.page; + const { currentPage, pageSize } = this.page; if ( this.searchForm.timeArr !== null && this.searchForm.timeArr !== undefined @@ -176,7 +176,7 @@ export default { startTime, endTime, }; - getList({ current, size, ...params }).then((res) => { + getList({ current:currentPage, size:pageSize, ...params }).then((res) => { const { total, records } = res.data.data; this.page.total = total; this.tableData = records; @@ -185,16 +185,16 @@ export default { }, // 分页 currentChange(currentPage) { - this.page.current = currentPage; + this.page.currentPage = currentPage; this.onLoad(); }, sizeChange(pageSize) { - this.page.size = pageSize; + this.page.pageSize = pageSize; this.onLoad(); }, // 查询重置 searchHandle(index) { - this.page.current = 1; + this.page.currentPage = 1; if (index === 2) { this.searchForm = { timeArr: null, diff --git a/src/views/plugin/workflow/process/components/form.vue b/src/views/plugin/workflow/process/components/form.vue index 2b5b556..38c1312 100644 --- a/src/views/plugin/workflow/process/components/form.vue +++ b/src/views/plugin/workflow/process/components/form.vue @@ -297,6 +297,7 @@ export default { "xitongmokuaishujubiao" ); xitongmokuaishujubiao.dicData = res.data.data; + this.form.type = obj.type }); }, // 下载 diff --git a/src/views/plugin/workflow/process/crontab.vue b/src/views/plugin/workflow/process/crontab.vue new file mode 100644 index 0000000..243806a --- /dev/null +++ b/src/views/plugin/workflow/process/crontab.vue @@ -0,0 +1,288 @@ + + + diff --git a/src/views/plugin/workflow/process/todo.vue b/src/views/plugin/workflow/process/todo.vue index e6147e1..b32ac88 100644 --- a/src/views/plugin/workflow/process/todo.vue +++ b/src/views/plugin/workflow/process/todo.vue @@ -159,9 +159,9 @@ export default { conpanyList: [{ label: "运维公司", value: 1 }], option: tableOption, page: { - current: 1, + currentPage: 1, total: 0, - size: 10, + pageSize: 10, }, // 表格数据 tableData: [], @@ -207,7 +207,7 @@ export default { // 列表 onLoad() { this.loading = true; - const { current, size } = this.page; + const { currentPage, pageSize } = this.page; if ( this.searchForm.timeArr !== null && this.searchForm.timeArr !== undefined @@ -215,7 +215,7 @@ export default { this.searchForm.startTime = this.searchForm.timeArr[0]; this.searchForm.endTime = this.searchForm.timeArr[1]; } - getList({ current, size,...this.searchForm }).then((res) => { + getList({ current:currentPage, size:pageSize,...this.searchForm }).then((res) => { const { total, records } = res.data.data; this.page.total = total; this.tableData = records; @@ -224,16 +224,16 @@ export default { }, // 分页 currentChange(currentPage) { - this.page.current = currentPage; + this.page.currentPage = currentPage; this.onLoad(); }, sizeChange(pageSize) { - this.page.size = pageSize; + this.page.pageSize = pageSize; this.onLoad(); }, // 查询重置 searchHandle(index) { - this.page.current = 1; + this.page.currentPage = 1; if (index === 2) { this.searchForm = { timeArr: null, diff --git a/src/views/plugin/workflow/process/workorder.vue b/src/views/plugin/workflow/process/workorder.vue index d6086f4..84b1025 100644 --- a/src/views/plugin/workflow/process/workorder.vue +++ b/src/views/plugin/workflow/process/workorder.vue @@ -187,9 +187,9 @@ export default { conpanyList: [{ label: "运维公司", value: 1 }], option: tableOption, page: { - current: 1, + currentPage: 1, total: 0, - size: 10, + pageSize: 10, }, // 表格数据 tableData: [], @@ -233,7 +233,7 @@ export default { // 列表 onLoad() { this.loading = true; - const { current, size } = this.page; + const { currentPage, pageSize } = this.page; if ( this.searchForm.timeArr !== null && this.searchForm.timeArr !== undefined @@ -248,7 +248,7 @@ export default { this.searchForm.startTime2 = this.searchForm.timeArr2[0]; this.searchForm.endTime2 = this.searchForm.timeArr2[1]; } - getList({ current, size,...this.searchForm }).then((res) => { + getList({ current:currentPage, size:pageSize ,...this.searchForm }).then((res) => { const { total, records } = res.data.data; this.page.total = total; @@ -258,16 +258,16 @@ export default { }, // 分页 currentChange(currentPage) { - this.page.current = currentPage; + this.page.currentPage = currentPage; this.onLoad(); }, sizeChange(pageSize) { - this.page.size = pageSize; + this.page.pageSize = pageSize; this.onLoad(); }, // 查询重置 searchHandle(index) { - this.page.current = 1; + this.page.currentPage = 1; if (index === 2) { this.searchForm = { timeArr: null,