diff --git a/.beagle.yml b/.beagle.yml index f80b34c9803ddf1035718784529f5670cdda9a4f..851c5d9e23e045b90237955e29a45a2e7b68184b 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -17,15 +17,15 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行 image: registry.cn-qingdao.aliyuncs.com/wod/devops-git:1.0 network_mode: host - # - name: s3-cache - # image: registry.cn-qingdao.aliyuncs.com/wod/devops-s3-cache:1.0 - # network_mode: host - # settings: - # endpoint: http://cache.wodcloud.com - # access_key: - # from_secret: ACCESS_KEY_MINIO - # secret_key: - # from_secret: SECRET_KEY_MINIO + - name: s3-cache + image: registry.cn-qingdao.aliyuncs.com/wod/devops-s3-cache:1.0 + network_mode: host + settings: + endpoint: http://cache.wodcloud.com + access_key: + from_secret: ACCESS_KEY_MINIO + secret_key: + from_secret: SECRET_KEY_MINIO - name: build # 项目打包 image: registry.cn-qingdao.aliyuncs.com/wod/devops-node:16.16.0-slim @@ -37,19 +37,19 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行 - export NODE_ENV=production - yarn build - # - name: s3-cache-build - # image: registry.cn-qingdao.aliyuncs.com/wod/devops-s3-cache:1.0 - # network_mode: host - # settings: - # rebuild: true - # hash: package.json - # mount: - # - node_modules - # endpoint: http://cache.wodcloud.com - # access_key: - # from_secret: ACCESS_KEY_MINIO - # secret_key: - # from_secret: SECRET_KEY_MINIO + - name: s3-cache-build + image: registry.cn-qingdao.aliyuncs.com/wod/devops-s3-cache:1.0 + network_mode: host + settings: + rebuild: true + hash: package.json + mount: + - node_modules + endpoint: http://cache.wodcloud.com + access_key: + from_secret: ACCESS_KEY_MINIO + secret_key: + from_secret: SECRET_KEY_MINIO - name: docker-amd64 image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 @@ -58,7 +58,7 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行 - name: docker-sock path: /var/run/docker.sock # 将下载依赖的目录挂载出来,防止重复下载 settings: # 当前设置 - base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-amd64 # 基础镜像 + base: registry.cn-qingdao.aliyuncs.com/wod/ui-base:v6.1-amd64 # 基础镜像 dockerfile: .beagle/dockerfile repo: smart-operation/so-manage-ui # 生成镜像的 分组/名称 version: "v3.0.1" # 版本号 @@ -89,7 +89,7 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行 - name: docker-sock path: /var/run/docker.sock settings: - base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-arm64 + base: registry.cn-qingdao.aliyuncs.com/wod/ui-base:v6.1-arm64 dockerfile: .beagle/dockerfile repo: smart-operation/so-manage-ui version: "v3.0.1" @@ -107,7 +107,7 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行 - name: docker-sock path: /var/run/docker.sock settings: - base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-ppc64le + base: registry.cn-qingdao.aliyuncs.com/wod/ui-base:v6.1-ppc64le dockerfile: .beagle/dockerfile repo: smart-operation/so-manage-ui version: "v3.0.1" @@ -125,7 +125,7 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行 - name: docker-sock path: /var/run/docker.sock settings: - base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-mips64le + base: registry.cn-qingdao.aliyuncs.com/wod/ui-base:v6.1-mips64le dockerfile: .beagle/dockerfile repo: smart-operation/so-manage-ui version: "v3.0.1" diff --git a/.beagle/dockerfile b/.beagle/dockerfile index f5d58710dbf654589adcc3ff6337c0d3968141c5..dc6e1a1d86ad9d315f94a4b179443dc7436dcf0e 100644 --- a/.beagle/dockerfile +++ b/.beagle/dockerfile @@ -3,6 +3,8 @@ FROM $BASE ARG AUTHOR ARG VERSION LABEL maintainer=${AUTHOR} version=${VERSION} -ADD ./dist /usr/share/nginx/html -ADD ./.beagle/nginx.conf /etc/nginx/nginx.conf +ARG TARGETOS +ARG TARGETARCH +ENV INDEX /so/manage/ui +ADD ./dist /www \ No newline at end of file diff --git a/src/page/main/auto-maintenance/task-history/list/record/index.vue b/src/page/main/auto-maintenance/task-history/list/record/index.vue index f475e1f3c808f7382636952d37f7dccd71aab0b8..10128a736e3a79548ed0b5a1ffae639531fdd8e8 100644 --- a/src/page/main/auto-maintenance/task-history/list/record/index.vue +++ b/src/page/main/auto-maintenance/task-history/list/record/index.vue @@ -3,12 +3,7 @@
- - 返回 - + 返回 {{ state.taskName }} / {{ state.desc }}
diff --git a/src/page/main/auto-maintenance/task-manage/index.vue b/src/page/main/auto-maintenance/task-manage/index.vue index d9780c5086b5ba6f778b56470a3760fa3d61e756..b6ae70d682d656e163398aa13c3704af0cea0891 100644 --- a/src/page/main/auto-maintenance/task-manage/index.vue +++ b/src/page/main/auto-maintenance/task-manage/index.vue @@ -202,7 +202,7 @@ const confirmUse = () => { .then((res) => { if (res.data.code == 200) { ElMessage.success("执行成功"); - router.push(`/auto-maintenance/task-history/list/record?id=${res.data.data}`); + router.push(`/auto-maintenance/task-manage/record?id=${res.data.data}`); } else { ElMessage.error(res.data.msg); }