diff --git a/jenkinsfilenew_api b/jenkinsfilenew_api index e60983c..5283be4 100644 --- a/jenkinsfilenew_api +++ b/jenkinsfilenew_api @@ -10,7 +10,6 @@ podTemplate { container('image-builder') { sh''' - find . -depth -name '.svn' -type d -exec rm -rf {} + /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./api/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup ''' } diff --git a/web/client/src/sections/service/nav-item.jsx b/web/client/src/sections/service/nav-item.jsx index e4037e0..92ad32d 100644 --- a/web/client/src/sections/service/nav-item.jsx +++ b/web/client/src/sections/service/nav-item.jsx @@ -55,7 +55,7 @@ export function getNavItem (user, dispatch) { itemKey: 'serviceRecord', text: '硬件维修', icon: , - to: '/service/serviceRecord/serviceRecord1', + to: '/service/serviceRecord/MaintenanceRecords', items: [{ itemKey:'MaintenanceRecords',to:'/service/serviceRecord/MaintenanceRecords',text:'维修记录'}] } ]