diff --git a/cutejava-front/src/api/devops/pipelineInstance.js b/cutejava-front/src/api/devops/pipelineInstance.js index c0e2e87b..81ad3942 100644 --- a/cutejava-front/src/api/devops/pipelineInstance.js +++ b/cutejava-front/src/api/devops/pipelineInstance.js @@ -8,6 +8,14 @@ export function startPipeline(data) { }) } +export function retryPipeline(data) { + return request({ + url: 'api/devops/pipelineInstance/retry', + method: 'post', + data + }) +} + export function restartPipeline(data) { return request({ url: 'api/devops/pipelineInstance/restart', diff --git a/cutejava-front/src/store/getters.js b/cutejava-front/src/store/getters.js index aadeb3cd..189deddd 100644 --- a/cutejava-front/src/store/getters.js +++ b/cutejava-front/src/store/getters.js @@ -1,3 +1,7 @@ +/** + * 在modules中定义后,需要到这注册 + * @type {any} + */ const getters = { deployUploadApi: state => state.api.deployUploadApi, databaseUploadApi: state => state.api.databaseUploadApi, @@ -19,6 +23,7 @@ const getters = { druidSqlApi: state => state.api.druidSqlApi, swaggerApi: state => state.api.swaggerApi, websocketApi: state => state.api.websocketApi, - sidebarRouters: state => state.permission.sidebarRouters + sidebarRouters: state => state.permission.sidebarRouters, + statusConst: state => state.pipeline.statusConst } export default getters diff --git a/cutejava-front/src/store/modules/pipeline.js b/cutejava-front/src/store/modules/pipeline.js new file mode 100644 index 00000000..0c6b325e --- /dev/null +++ b/cutejava-front/src/store/modules/pipeline.js @@ -0,0 +1,15 @@ +const pipeline = { + /** + * 全局常量 + */ + state: { + statusConst: { + pending: { code: 'pending', label: '未开始', color: '#C0C4CC', icon: 'el-icon-time' }, + running: { code: 'running', label: '运行中', color: '#409EFF', icon: 'el-icon-loading' }, + success: { code: 'success', label: '执行成功', color: '#67C23A', icon: 'el-icon-success' }, + fail: { code: 'fail', label: '执行失败', color: '#F56C6C', icon: 'el-icon-error' } + } + } +} + +export default pipeline diff --git a/cutejava-front/src/temp b/cutejava-front/src/temp new file mode 100644 index 00000000..e69de29b diff --git a/cutejava-front/src/utils/request.js b/cutejava-front/src/utils/request.js index 56b51e44..921b3a7b 100644 --- a/cutejava-front/src/utils/request.js +++ b/cutejava-front/src/utils/request.js @@ -30,7 +30,9 @@ service.interceptors.request.use( // response 拦截器 service.interceptors.response.use( response => { - return response.data + const data = response.data + // console.error('data', data) + return data }, error => { // 兼容blob下载出错json提示 @@ -57,7 +59,7 @@ service.interceptors.response.use( return Promise.reject(error) } } - console.log(code) + // console.log(code) if (code) { if (code === 401) { store.dispatch('LogOut').then(() => { diff --git a/cutejava-front/src/views/components/dev/CutePipelineNode.vue b/cutejava-front/src/views/components/dev/CutePipelineNode.vue index af2fe34b..ef0040a4 100644 --- a/cutejava-front/src/views/components/dev/CutePipelineNode.vue +++ b/cutejava-front/src/views/components/dev/CutePipelineNode.vue @@ -1,118 +1,60 @@ @@ -142,7 +101,9 @@