diff --git a/.beagle.yml b/.beagle.yml index 3c5f320977eef04733c545996662ef6b83d6e301..5f9b9f7982bcaa704abd3d3fd9e26ce670241030 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -1,8 +1,8 @@ kind: pipeline -name: dev +name: dev0331 trigger: branch: - - dev + - dev0331 clone: disable: true @@ -70,7 +70,6 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行 from_secret: REGISTRY_USER_ALIYUN registry_password: # 密码 from_secret: REGISTRY_PASSWORD_ALIYUN - # - name: deploy-amd64 # image: registry.cn-qingdao.aliyuncs.com/wod/devops-kubernetes:1.0 # settings: diff --git a/src/assets/css/index.css b/src/assets/css/index.css index 49874efab63a5ac44af05891a4baa45e9b3e855f..91758449e3f7cf9ea4a1baf436f577d60d680470 100644 --- a/src/assets/css/index.css +++ b/src/assets/css/index.css @@ -711,6 +711,19 @@ border-radius:8px; background-color: #e1e4fb; border-color: #e1e4fb; } +.apaas_button .el-button--info { + color: #fff; + background-color: #404a62; + border-color: #404a62; +} +.apaas_button .el-button--info:hover{ + background-color: #5c6579; + border-color: #5c6579; +} +.apaas_button .el-button--info:active{ + background-color: #363f53; + border-color: #363f53; +} .apaas_button .el-button--danger { color: #fff; diff --git a/src/bg-ui/bg-table.vue b/src/bg-ui/bg-table.vue index 4198ee8a0110a24f34f67ef24c12284983b03baa..c3b0d99978e690da557a85ac2a92fa141f6c2044 100644 --- a/src/bg-ui/bg-table.vue +++ b/src/bg-ui/bg-table.vue @@ -20,7 +20,7 @@ - + + + + + + + + + + 新增 + + + + + + + + + + {{ row.platform_name }} + + + + {{ ["", "自有平台", "第三方平台"][row.platform_type] }} + + + + 编辑 + + + 删除 + + + + + + + + + + + + + + + {{ item.name }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { + addDialog = false; + dialogType = 0; + } + " + >取消 + + + 测试链接 + + 保存 + + + + + + + + + + + + 删除后,aPaaS平台将不再与该容器平台对接,确认删除吗? + + + 取 消 + 确 定 + + + + + + + + + + diff --git a/vite.config.js b/vite.config.js index fd0bd569dc26ffbe5404cf68006a609241c78057..88bdd87eb5abe2613c3631cbacaa8793c4066d57 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,63 +1,65 @@ -import { defineConfig } from 'vite' -import vue from '@vitejs/plugin-vue' +import { defineConfig } from "vite"; +import vue from "@vitejs/plugin-vue"; -const path = require('path') +const path = require("path"); -function resolve_path (dir) { - return path.join(__dirname, './', dir) +function resolve_path(dir) { + return path.join(__dirname, "./", dir); } - export default { - plugins: [ - vue() - ], + plugins: [vue()], //本地运行基础路径,如:http://localhost:5173/apaas/ui/ base: "/apaas/manage/ui/", - clearScreen:false, - resolve:{ + clearScreen: false, + resolve: { //别名,代码引入时方便引入 - alias:{ - '@':resolve_path('src'), - } + alias: { + "@": resolve_path("src"), + }, }, - css:{ - devSourcemap:true,//代码编排,调试时是否能看到源码 + css: { + devSourcemap: true, //代码编排,调试时是否能看到源码 }, - server:{ - host:'0.0.0.0',//host配置,0.0.0.0会添加本地ip,开启局域网访问路径 - hmr:true,//热更新 + server: { + host: "0.0.0.0", //host配置,0.0.0.0会添加本地ip,开启局域网访问路径 + hmr: true, //热更新 proxy: { // 选项写法 - '/apaas/system':{ - target: 'https://apaas5.wodcloud.com/apaas/system', // 所要代理的目标地址 - rewrite: path => path.replace(/^\/apaas\/system/, ''), // 重写传过来的path路径,比如 `/api/index/1?id=10&name=zs`(注意:path路径最前面有斜杠(/),因此,正则匹配的时候不要忘了是斜杠(/)开头的;选项的 key 也是斜杠(/)开头的) - changeOrigin: true, // true/false, Default: false - changes the origin of the host header to the target URL - secure: false,//解决证书缺失问题 + "/apaas/system": { + target: "https://apaas5.wodcloud.com/apaas/system", // 所要代理的目标地址 + rewrite: (path) => path.replace(/^\/apaas\/system/, ""), // 重写传过来的path路径,比如 `/api/index/1?id=10&name=zs`(注意:path路径最前面有斜杠(/),因此,正则匹配的时候不要忘了是斜杠(/)开头的;选项的 key 也是斜杠(/)开头的) + changeOrigin: true, // true/false, Default: false - changes the origin of the host header to the target URL + secure: false, //解决证书缺失问题 + }, + "/apaas/portal/ui": { + target: "https://apaas5.wodcloud.com/apaas/portal/ui", // 所要代理的目标地址 + rewrite: (path) => path.replace(/^\/apaas\/portal\/ui/, ""), // 重写传过来的path路径,比如 `/api/index/1?id=10&name=zs`(注意:path路径最前面有斜杠(/),因此,正则匹配的时候不要忘了是斜杠(/)开头的;选项的 key 也是斜杠(/)开头的) + changeOrigin: true, // true/false, Default: false - changes the origin of the host header to the target URL + secure: false, //解决证书缺失问题 }, - '/apaas/portal/ui':{ - target: 'https://apaas5.wodcloud.com/apaas/portal/ui', // 所要代理的目标地址 - rewrite: path => path.replace(/^\/apaas\/portal\/ui/, ''), // 重写传过来的path路径,比如 `/api/index/1?id=10&name=zs`(注意:path路径最前面有斜杠(/),因此,正则匹配的时候不要忘了是斜杠(/)开头的;选项的 key 也是斜杠(/)开头的) - changeOrigin: true, // true/false, Default: false - changes the origin of the host header to the target URL - secure: false,//解决证书缺失问题 + "/apaas/service": { + target: "https://apaas5.wodcloud.com/apaas/service", // 所要代理的目标地址 + rewrite: (path) => path.replace(/^\/apaas\/service/, ""), // 重写传过来的path路径,比如 `/api/index/1?id=10&name=zs`(注意:path路径最前面有斜杠(/),因此,正则匹配的时候不要忘了是斜杠(/)开头的;选项的 key 也是斜杠(/)开头的) + changeOrigin: true, // true/false, Default: false - changes the origin of the host header to the target URL + secure: false, //解决证书缺失问题 }, - '/apaas/service':{ - target: 'https://apaas5.wodcloud.com/apaas/service', // 所要代理的目标地址 - rewrite: path => path.replace(/^\/apaas\/service/, ''), // 重写传过来的path路径,比如 `/api/index/1?id=10&name=zs`(注意:path路径最前面有斜杠(/),因此,正则匹配的时候不要忘了是斜杠(/)开头的;选项的 key 也是斜杠(/)开头的) - changeOrigin: true, // true/false, Default: false - changes the origin of the host header to the target URL - secure: false,//解决证书缺失问题 + "/apaas/common": { + target: "https://apaas5.wodcloud.com/apaas/common", // 所要代理的目标地址 + rewrite: (path) => path.replace(/^\/apaas\/common/, ""), // 重写传过来的path路径,比如 `/api/index/1?id=10&name=zs`(注意:path路径最前面有斜杠(/),因此,正则匹配的时候不要忘了是斜杠(/)开头的;选项的 key 也是斜杠(/)开头的) + changeOrigin: true, // true/false, Default: false - changes the origin of the host header to the target URL + secure: false, //解决证书缺失问题 }, - '/apaas/common':{ - target: 'https://apaas5.wodcloud.com/apaas/common', // 所要代理的目标地址 - rewrite: path => path.replace(/^\/apaas\/common/, ''), // 重写传过来的path路径,比如 `/api/index/1?id=10&name=zs`(注意:path路径最前面有斜杠(/),因此,正则匹配的时候不要忘了是斜杠(/)开头的;选项的 key 也是斜杠(/)开头的) - changeOrigin: true, // true/false, Default: false - changes the origin of the host header to the target URL - secure: false,//解决证书缺失问题 + "/apaas/application/v5": { + target: "https://apaas5.wodcloud.com/apaas/application/v5", + rewrite: (path) => path.replace(/^\/apaas\/application\/v5/, ""), + changeOrigin: true, + secure: false, }, - } + }, }, - build:{ - outDir:'dist/apaas/manage/ui',//打包输出文件夹 - assetsDir:'static',//打包输出静态文件 + build: { + outDir: "dist/apaas/manage/ui", //打包输出文件夹 + assetsDir: "static", //打包输出静态文件 }, - -} +};