From 0b1c73e13ed9e1541ff74a42cfa548717b91ed1d Mon Sep 17 00:00:00 2001 From: gaoxq <376340421@qq.com> Date: Mon, 16 Feb 2026 21:59:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=B9=E5=99=A8=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jeesite/modules/app/appStart.java | 50 --------- web-vue/packages/biz/api/biz/myWork.ts | 9 -- .../analysis/components/info/DockerInfo.vue | 92 ---------------- .../workbench/components/myfiles/index.vue | 7 +- .../layouts/views/desktop/workbench/index.vue | 102 ++++++++++++------ 5 files changed, 76 insertions(+), 184 deletions(-) diff --git a/web-api/src/main/java/com/jeesite/modules/app/appStart.java b/web-api/src/main/java/com/jeesite/modules/app/appStart.java index 5c7a55ee..b973d3b7 100644 --- a/web-api/src/main/java/com/jeesite/modules/app/appStart.java +++ b/web-api/src/main/java/com/jeesite/modules/app/appStart.java @@ -1,7 +1,5 @@ package com.jeesite.modules.app; - -import com.jeesite.common.config.Global; import com.jeesite.modules.app.Service.MyService; import com.jeesite.modules.app.dao.MyWorkInfo; import com.jeesite.modules.app.dao.info.DockerInfo; @@ -22,10 +20,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -import static com.jeesite.common.web.BaseController.text; -import static com.jeesite.common.web.http.ServletUtils.renderResult; - - @Controller @RequestMapping(value = "${adminPath}/biz/myWork") public class appStart { @@ -116,48 +110,4 @@ public class appStart { return new ArrayList<>(); } - - @RequestMapping(value = "restart") - @ResponseBody - public String restart(DockerInfo dockerInfo) { - BizMonitorHost monitorHost = new BizMonitorHost(); - monitorHost.setHostId(dockerInfo.getHostId()); - List bizMonitorHostList = bizMonitorHostService.findList(monitorHost); - BizMonitorHost bizMonitorHost = bizMonitorHostList.get(0); - if (bizMonitorHost.getIsAuth().equals("1")) { - DockerUtils dockerUtils = new DockerUtils(bizMonitorHost.getIpAddress(), bizMonitorHost.getCheckTargetPort()); - dockerUtils.stopContainer(dockerInfo.getId()); - dockerUtils.startContainer(dockerInfo.getId()); - } - return renderResult(Global.TRUE, text("重启容器成功！")); - } - - @RequestMapping(value = "start") - @ResponseBody - public String start(DockerInfo dockerInfo) { - BizMonitorHost monitorHost = new BizMonitorHost(); - monitorHost.setHostId(dockerInfo.getHostId()); - List bizMonitorHostList = bizMonitorHostService.findList(monitorHost); - BizMonitorHost bizMonitorHost = bizMonitorHostList.get(0); - if (bizMonitorHost.getIsAuth().equals("1")) { - DockerUtils dockerUtils = new DockerUtils(bizMonitorHost.getIpAddress(), bizMonitorHost.getCheckTargetPort()); - dockerUtils.startContainer(dockerInfo.getId()); - } - return renderResult(Global.TRUE, text("启动容器成功！")); - } - - @RequestMapping(value = "stop") - @ResponseBody - public String stop(DockerInfo dockerInfo) { - BizMonitorHost monitorHost = new BizMonitorHost(); - monitorHost.setHostId(dockerInfo.getHostId()); - List bizMonitorHostList = bizMonitorHostService.findList(monitorHost); - BizMonitorHost bizMonitorHost = bizMonitorHostList.get(0); - if (bizMonitorHost.getIsAuth().equals("1")) { - DockerUtils dockerUtils = new DockerUtils(bizMonitorHost.getIpAddress(), bizMonitorHost.getCheckTargetPort()); - dockerUtils.stopContainer(dockerInfo.getId()); - } - return renderResult(Global.TRUE, text("停止容器成功！")); - } - } diff --git a/web-vue/packages/biz/api/biz/myWork.ts b/web-vue/packages/biz/api/biz/myWork.ts index 5070be20..e9b9b6e3 100644 --- a/web-vue/packages/biz/api/biz/myWork.ts +++ b/web-vue/packages/biz/api/biz/myWork.ts @@ -38,12 +38,3 @@ export const bizMyWorkInfoList = () => export const bizDockerInfoList = (params?: DockerInfo | any) => defHttp.get({ url: adminPath + '/biz/myWork/dockerList' , params }); - -export const bizDockerRestart = (params?: DockerInfo | any) => - defHttp.get({ url: adminPath + '/biz/myWork/restart', params }); - -export const bizDockerStart = (params?: DockerInfo | any) => - defHttp.get({ url: adminPath + '/biz/myWork/start', params }); - -export const bizDockerStop = (params?: DockerInfo | any) => - defHttp.get({ url: adminPath + '/biz/myWork/stop', params }); \ No newline at end of file diff --git a/web-vue/packages/core/layouts/views/desktop/analysis/components/info/DockerInfo.vue b/web-vue/packages/core/layouts/views/desktop/analysis/components/info/DockerInfo.vue index 5b8a4bac..bdde04f1 100644 --- a/web-vue/packages/core/layouts/views/desktop/analysis/components/info/DockerInfo.vue +++ b/web-vue/packages/core/layouts/views/desktop/analysis/components/info/DockerInfo.vue @@ -77,14 +77,6 @@ -
-
- - 重启 - 停止 - 启动 - -
@@ -154,87 +146,6 @@ export default defineComponent({ loading.value = false; } }; - - const handleRestart = async (item: DockerInfo) => { - Modal.confirm({ - title: '温馨提示', - content: '您确定要重启当前容器吗?', - okText: '确认', - cancelText: '取消', - okType: 'danger', - width: 420, - onOk: async () => { - try { - loading.value = true; - const res = await bizDockerRestart(item); - createMessage.success(res.message || '重启成功'); - await getDockerList(); - filterContainerList(); - } catch (error: any) { - console.error('重启容器失败:', error); - } finally { - loading.value = false; - } - }, - onCancel: () => { - createMessage.info('已取消重启操作'); - } - }); - }; - - const handleStop = async (item: DockerInfo) => { - Modal.confirm({ - title: '温馨提示', - content: '您确定要停止当前容器吗?', - okText: '确认', - cancelText: '取消', - okType: 'danger', - width: 420, - onOk: async () => { - try { - loading.value = true; - const res = await bizDockerStop(item); - createMessage.success(res.message || '停止成功'); - await getDockerList(); - filterContainerList(); - } catch (error: any) { - console.error('停止容器失败:', error); - } finally { - loading.value = false; - } - }, - onCancel: () => { - createMessage.info('已取消停止操作'); - } - }); - }; - - const handleStart = async (item: DockerInfo) => { - Modal.confirm({ - title: '温馨提示', - content: '您确定要启动当前容器吗?', - okText: '确认', - cancelText: '取消', - okType: 'danger', - width: 420, - onOk: async () => { - try { - loading.value = true; - const res = await bizDockerStart(item); - createMessage.success(res.message || '启动成功'); - await getDockerList(); - filterContainerList(); - } catch (error: any) { - console.error('启动容器失败:', error); - } finally { - loading.value = false; - } - }, - onCancel: () => { - createMessage.info('已取消启动操作'); - } - }); - }; const [register, { closeModal }] = useModalInner(async (data: any) => { if (!data?.hostId) { @@ -255,9 +166,6 @@ export default defineComponent({ searchKey, containerList, filteredContainerList, - handleRestart, - handleStop, - handleStart, }; }, }); diff --git a/web-vue/packages/core/layouts/views/desktop/workbench/components/myfiles/index.vue b/web-vue/packages/core/layouts/views/desktop/workbench/components/myfiles/index.vue index dd996a39..f2e25302 100644 --- a/web-vue/packages/core/layouts/views/desktop/workbench/components/myfiles/index.vue +++ b/web-vue/packages/core/layouts/views/desktop/workbench/components/myfiles/index.vue @@ -1091,7 +1091,7 @@ onMounted(() => { .file-manager-container { display: flex; width: 100%; - height: calc(100vh - 425px); + height: calc(100vh - 445px); background: linear-gradient(135deg, #f0f8ff 0%, #e8f4f8 100%); overflow: hidden; box-sizing: border-box; @@ -1140,6 +1140,7 @@ onMounted(() => { font-size: 13px; } +/* 核心修改：统一目录树背景色和搜索框一致 */ .tree-scroll-container { flex: 1; overflow-y: auto; @@ -1148,6 +1149,8 @@ onMounted(() => { scrollbar-color: #b3d9f2 #f8fcff; scroll-behavior: smooth; contain: layout paint; + /* 关键修改：设置和搜索框一致的背景色 */ + background: rgba(255, 255, 255, 0.9); } .tree-scroll-container::-webkit-scrollbar { @@ -1167,9 +1170,11 @@ onMounted(() => { background-color: #91c8ee; } +/* 补充修改：确保tree-container背景透明，继承父元素的背景色 */ .tree-container { width: 100%; padding: 0 8px; + background: transparent; } .tree-node-wrapper { diff --git a/web-vue/packages/core/layouts/views/desktop/workbench/index.vue b/web-vue/packages/core/layouts/views/desktop/workbench/index.vue index eb30ca6a..cc6c6872 100644 --- a/web-vue/packages/core/layouts/views/desktop/workbench/index.vue +++ b/web-vue/packages/core/layouts/views/desktop/workbench/index.vue @@ -1,39 +1,77 @@ - - + +.sidebar-item { + padding: 12px 24px; + cursor: pointer; + transition: all 0.2s ease; + font-size: 14px; + color: rgba(0, 0, 0, 0.85); +} + +.sidebar-item:hover { + background-color: #f5f5f5; +} + +.sidebar-item.active { + background-color: #e6f7ff; + color: #1890ff; + font-weight: 320; + border-right: 3px solid #1890ff; +} + +/* 主内容区域样式 */ +.config-content { + padding: 2px; + height: 100%; + box-sizing: border-box; + background-color: #fff; +} + +.config-panel { + width: 100%; + height: 100%; +} + \ No newline at end of file