From 611f23760e5821268d234c21122babf5bd162cd1 Mon Sep 17 00:00:00 2001
From: zhangjun1 <zhangjun@bd-apaas.com>
Date: Tue, 15 Aug 2023 15:08:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=BA=A4=E4=BA=92=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .beagle.yml                                   | 52 +++++++++----------
 .beagle/dockerfile                            |  6 ++-
 .../task-history/list/record/index.vue        |  7 +--
 .../auto-maintenance/task-manage/index.vue    |  2 +-
 4 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/.beagle.yml b/.beagle.yml
index f80b34c..851c5d9 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 f5d5871..dc6e1a1 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 f475e1f..10128a7 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 @@
     <bg-breadcrumb></bg-breadcrumb>
     <div class="main_container">
       <div class="top-container">
-        <el-button
-          class="back"
-          type="default"
-          @click="router.replace(`/auto-maintenance/task-history/list?id=${route.query.task_id}`)">
-          返回
-        </el-button>
+        <el-button class="back" type="default" @click="router.go(-1)"> 返回 </el-button>
         {{ state.taskName }} / {{ state.desc }}
       </div>
       <div class="middle-container">
diff --git a/src/page/main/auto-maintenance/task-manage/index.vue b/src/page/main/auto-maintenance/task-manage/index.vue
index d9780c5..b6ae70d 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);
       }
-- 
2.26.0