diff --git a/cutejava-front/src/api/devops/pipeline.js b/cutejava-front/src/api/devops/pipelineInstance.js similarity index 70% rename from cutejava-front/src/api/devops/pipeline.js rename to cutejava-front/src/api/devops/pipelineInstance.js index 980c7d61..396c70f6 100644 --- a/cutejava-front/src/api/devops/pipeline.js +++ b/cutejava-front/src/api/devops/pipelineInstance.js @@ -2,21 +2,21 @@ import request from '@/utils/request' export function startPipeline() { return request({ - url: 'api/devops/pipeline/start', + url: 'api/devops/pipelineInstance/start', method: 'post' }) } export function restartPipeline() { return request({ - url: 'api/devops/pipeline/restart', + url: 'api/devops/pipelineInstance/restart', method: 'post' }) } export function queryLastPipelineDetail(instanceId) { return request({ - url: 'api/devops/pipeline/last', + url: 'api/devops/pipelineInstance/last', method: 'post', data: { instanceId diff --git a/cutejava-front/src/api/devops/pipelineTemplate.js b/cutejava-front/src/api/devops/pipelineTemplate.js new file mode 100644 index 00000000..fd372901 --- /dev/null +++ b/cutejava-front/src/api/devops/pipelineTemplate.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +export function getPipelineTemplate(id) { + return request({ + url: 'api/devops/pipelineTemplate/getPipelineTemplate', + method: 'post', + data: { id } + }) +} diff --git a/cutejava-front/src/api/system/user.js b/cutejava-front/src/api/system/user.js index e9ce3e18..71314aa6 100644 --- a/cutejava-front/src/api/system/user.js +++ b/cutejava-front/src/api/system/user.js @@ -1,5 +1,5 @@ import request from '@/utils/request' -import { encrypt } from '@/utils/rsaEncrypt' +import { encrypt } from '@/utils/CsRsaUtil' export function add(data) { return request({ diff --git a/cutejava-front/src/components/Breadcrumb/index.vue b/cutejava-front/src/components/Breadcrumb/index.vue index 204ea59c..219f0942 100644 --- a/cutejava-front/src/components/Breadcrumb/index.vue +++ b/cutejava-front/src/components/Breadcrumb/index.vue @@ -2,7 +2,9 @@ - {{ item.meta.title }} + {{ + item.meta.title + }} {{ item.meta.title }} @@ -73,6 +75,7 @@ export default { font-size: 14px; line-height: 50px; margin-left: 8px; + .no-redirect { color: #97a8be; cursor: text; diff --git a/cutejava-front/src/components/Crud/CRUD.operation.vue b/cutejava-front/src/components/Crud/CRUD.operation.vue index 33d20777..87c4ebec 100644 --- a/cutejava-front/src/components/Crud/CRUD.operation.vue +++ b/cutejava-front/src/components/Crud/CRUD.operation.vue @@ -123,15 +123,21 @@ export default { props: { permission: { type: Object, - default: () => { return {} } + default: () => { + return {} + } }, hiddenColumns: { type: Array, - default: () => { return [] } + default: () => { + return [] + } }, ignoreColumns: { type: Array, - default: () => { return [] } + default: () => { + return [] + } } }, data() { @@ -253,16 +259,18 @@ export default { diff --git a/cutejava-front/src/components/Crud/Pagination.vue b/cutejava-front/src/components/Crud/Pagination.vue index d4482fbd..0cf3873e 100644 --- a/cutejava-front/src/components/Crud/Pagination.vue +++ b/cutejava-front/src/components/Crud/Pagination.vue @@ -12,6 +12,7 @@ diff --git a/cutejava-front/src/components/IconSelect/requireIcons.js b/cutejava-front/src/components/IconSelect/requireIcons.js index 99e5c54c..877e5b73 100644 --- a/cutejava-front/src/components/IconSelect/requireIcons.js +++ b/cutejava-front/src/components/IconSelect/requireIcons.js @@ -1,4 +1,3 @@ - const req = require.context('../../assets/icons/svg', false, /\.svg$/) const requireAll = requireContext => requireContext.keys() diff --git a/cutejava-front/src/components/Pagination/index.vue b/cutejava-front/src/components/Pagination/index.vue index c815e132..0fc96d0e 100644 --- a/cutejava-front/src/components/Pagination/index.vue +++ b/cutejava-front/src/components/Pagination/index.vue @@ -95,6 +95,7 @@ export default { background: #fff; padding: 32px 16px; } + .pagination-container.hidden { display: none; } diff --git a/cutejava-front/src/components/RightPanel/index.vue b/cutejava-front/src/components/RightPanel/index.vue index b65ececc..233db2a1 100644 --- a/cutejava-front/src/components/RightPanel/index.vue +++ b/cutejava-front/src/components/RightPanel/index.vue @@ -10,7 +10,7 @@ diff --git a/cutejava-front/src/components/SizeSelect/index.vue b/cutejava-front/src/components/SizeSelect/index.vue index e490dce9..85d7d195 100644 --- a/cutejava-front/src/components/SizeSelect/index.vue +++ b/cutejava-front/src/components/SizeSelect/index.vue @@ -4,9 +4,15 @@ - + {{ - item.label }} + item.label + }} diff --git a/cutejava-front/src/components/SvgIcon/index.vue b/cutejava-front/src/components/SvgIcon/index.vue index 9a3318e5..7cc90545 100644 --- a/cutejava-front/src/components/SvgIcon/index.vue +++ b/cutejava-front/src/components/SvgIcon/index.vue @@ -7,7 +7,7 @@ diff --git a/cutejava-front/src/views/components/base/SplitPaneDemo.vue b/cutejava-front/src/views/components/base/SplitPaneDemo.vue index 7b80ad8a..c62d9af6 100644 --- a/cutejava-front/src/views/components/base/SplitPaneDemo.vue +++ b/cutejava-front/src/views/components/base/SplitPaneDemo.vue @@ -45,23 +45,26 @@ export default { name: 'SplitPaneDemo', methods: { - resize() {} + resize() { + } } } diff --git a/cutejava-front/src/views/components/base/WebSocketDemo.vue b/cutejava-front/src/views/components/base/WebSocketDemo.vue index bad0a5c4..4ad7901b 100644 --- a/cutejava-front/src/views/components/base/WebSocketDemo.vue +++ b/cutejava-front/src/views/components/base/WebSocketDemo.vue @@ -11,8 +11,7 @@ diff --git a/cutejava-front/src/views/features/404.vue b/cutejava-front/src/views/features/404.vue index 237d81f8..030fe57c 100644 --- a/cutejava-front/src/views/features/404.vue +++ b/cutejava-front/src/views/features/404.vue @@ -30,27 +30,32 @@ export default { diff --git a/cutejava-front/src/views/login.vue b/cutejava-front/src/views/login.vue index 8c6de004..ae346cdc 100644 --- a/cutejava-front/src/views/login.vue +++ b/cutejava-front/src/views/login.vue @@ -1,6 +1,13 @@ diff --git a/cutejava-front/src/views/system/dept/index.vue b/cutejava-front/src/views/system/dept/index.vue index b71321b4..4d75a9ec 100644 --- a/cutejava-front/src/views/system/dept/index.vue +++ b/cutejava-front/src/views/system/dept/index.vue @@ -4,9 +4,25 @@
- + - + @@ -14,7 +30,14 @@
- + @@ -44,7 +67,9 @@ /> - {{ item.label }} + + {{ item.label }} +