From bab5bd056253d96cb5d4c23cf394e44392a660da Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Fri, 12 Jan 2024 17:38:40 +0800
Subject: [PATCH] 任务调度页面更新
---
package-lock.json | 23 +++++++++++
package.json | 1
sh.exe.stackdump | 11 +++++
src/views/resource/distapch.vue | 41 ++++++++++++++++++--
4 files changed, 72 insertions(+), 4 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 08a6123..3618b62 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,6 +25,7 @@
"script-loader": "^0.7.2",
"vue": "^2.6.10",
"vue-axios": "^2.1.2",
+ "vue-cron": "^1.0.9",
"vue-i18n": "^8.7.0",
"vue-router": "^3.0.1",
"vuex": "^3.1.1"
@@ -15587,6 +15588,17 @@
"vue": ">= 1.0.0"
}
},
+ "node_modules/vue-cron": {
+ "version": "1.0.9",
+ "resolved": "https://registry.npmjs.org/vue-cron/-/vue-cron-1.0.9.tgz",
+ "integrity": "sha512-r8JnAjqpDsDj3a545156m7bca1xkrnIktks+N94KQA80OuKAiqhoz3Cq1JCyO+0ONXAOnLwvkjHiVCfL38XNbA==",
+ "dependencies": {
+ "babel-polyfill": "^6.26.0",
+ "babel-runtime": "^6.26.0",
+ "element-ui": "^2.0.7",
+ "vue": "^2.5.9"
+ }
+ },
"node_modules/vue-eslint-parser": {
"version": "2.0.3",
"resolved": "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz",
@@ -29741,6 +29753,17 @@
"integrity": "sha512-th5xVbInVoyIoe+qY+9GCflEVezxAvztD4xpFF39SRQYqpoKD2qkmX8yv08jJG9a2SgNOCjirjJGSwg/wTrbmA==",
"requires": {}
},
+ "vue-cron": {
+ "version": "1.0.9",
+ "resolved": "https://registry.npmjs.org/vue-cron/-/vue-cron-1.0.9.tgz",
+ "integrity": "sha512-r8JnAjqpDsDj3a545156m7bca1xkrnIktks+N94KQA80OuKAiqhoz3Cq1JCyO+0ONXAOnLwvkjHiVCfL38XNbA==",
+ "requires": {
+ "babel-polyfill": "^6.26.0",
+ "babel-runtime": "^6.26.0",
+ "element-ui": "^2.0.7",
+ "vue": "^2.5.9"
+ }
+ },
"vue-eslint-parser": {
"version": "2.0.3",
"resolved": "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz",
diff --git a/package.json b/package.json
index f8d54b8..48d95f7 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
"script-loader": "^0.7.2",
"vue": "^2.6.10",
"vue-axios": "^2.1.2",
+ "vue-cron": "^1.0.9",
"vue-i18n": "^8.7.0",
"vue-router": "^3.0.1",
"vuex": "^3.1.1"
diff --git a/sh.exe.stackdump b/sh.exe.stackdump
new file mode 100644
index 0000000..e99030a
--- /dev/null
+++ b/sh.exe.stackdump
@@ -0,0 +1,11 @@
+Stack trace:
+Frame Function Args
+000FFFFB540 00180064365 (00180275F10, 00180266FD1, 000FFFFCA60, 000FFFFBA20)
+000FFFFBA70 001800499D2 (00100002000, 0018034EB10, 00000000001, 00000000138)
+000FFFFCA80 00180049A11 (00000000001, 0018034EE20, 000FFFFCA60, 00000000008)
+000FFFFCB10 0018005CFCD (00000000000, 000FFFFCC40, 001800DC3EF, 00000000000)
+000FFFFCBF0 0018005D12B (000FFFFCDF0, 00000000000, FFFFFFFFFFFFFFD7, 00000000000)
+000FFFFCCE0 0018004A1A8 (00000000000, 00000000000, 00000000000, 00000000000)
+000FFFFCDA0 00180048A2A (00000000000, 00000000000, 00000000000, 00000000000)
+000FFFFCE50 00180048AEC (00000000000, 00000000000, 00000000000, 00000000000)
+End of stack trace
diff --git a/src/views/resource/distapch.vue b/src/views/resource/distapch.vue
index 42fcbaf..24f290c 100644
--- a/src/views/resource/distapch.vue
+++ b/src/views/resource/distapch.vue
@@ -26,11 +26,34 @@
<template slot-scope="{row, size}" slot="category">
<el-tag :size="size">{{ row.categoryName }}</el-tag>
</template>
+ <template slot-scope="{row, size}" slot="category">
+ <el-tag :size="size">{{ row.categoryName }}</el-tag>
+ </template>
+
+ <template slot-scope="{type,disabled}" slot="cronForm">
+ <el-input placeholder="请选择cron">
+ <el-button slot="append" icon="el-icon-s-tools" @click="cronPopover = true"></el-button>
+ </el-input>
+ </template>
+
+
</avue-crud>
<el-dialog title="对象存储上传调试" append-to-body :visible.sync="box" width="550px">
<avue-form ref="form" :option="debugOption" v-model="debugForm" @submit="handleSubmit" />
</el-dialog>
+
+
+ <el-popover v-model="cronPopover">
+ <vueCron @change="changeCron" @close="cronPopover=false" i18n="cn"/>
+ <!-- <el-input
+ slot="reference"
+ v-model="ruleForm.execTime"
+ placeholder="定时策略"
+ @click="cronPopover=true"
+ /> -->
+ </el-popover>
+
</basic-container>
</template>
@@ -38,14 +61,18 @@
import { getList, getDetail, add, update, remove, enable } from "@/api/resource/oss"
import { mapGetters } from "vuex"
import func from "@/util/func"
-
+import vueCron from 'vue-cron'
export default {
+ components:{
+ vueCron
+ },
data () {
return {
form: {},
query: {},
loading: true,
box: false,
+ cronPopover:false,
page: {
pageSize: 10,
currentPage: 1,
@@ -227,7 +254,8 @@
},
{
label: 'Cron',
- prop: ''
+ prop: 'cron',
+ formslot:true,
}
]
},
@@ -236,12 +264,12 @@
prop: 'jbxx',
column: [
{
- label: '调度类型',
+ label: '运行模式',
prop: '',
type: 'select',
},
{
- label: 'Cron',
+ label: 'JobHandler',
prop: ''
},
{
@@ -353,6 +381,11 @@
}
},
methods: {
+
+ changeCron(val){
+ console.log("===>",val);
+ },
+
rowSave (row, done, loading) {
add(row).then(() => {
this.onLoad(this.page)
--
Gitblit v1.9.3