From 9d65dc862dcf0d126b2f1f9101c651b0fff12a78 Mon Sep 17 00:00:00 2001 From: donghao Date: Wed, 7 Feb 2024 15:50:58 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E5=88=97=E8=A1=A8=E5=AE=8C=E5=96=84,UI=E8=B5=B0?= =?UTF-8?q?=E6=9F=A5=E5=86=85=E5=AE=B9=E4=BF=AE=E5=A4=8D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/logo.svg | 93 +++++++++---------- src/components/CustomTable/src/baseTable.scss | 19 +--- src/components/CustomTable/src/baseTable.tsx | 5 +- .../CustomTree/src/collapseTreeItem.tsx | 10 +- .../CustomTree/src/collapseTreeStyle.scss | 1 + src/components/TableActionCard/isDelete.tsx | 0 src/layout/components/navbar.vue | 8 +- src/layout/components/sidebar/logo.vue | 10 +- src/layout/components/sidebar/vertical.vue | 18 ++-- src/style/element-plus.scss | 9 ++ src/style/vars.scss | 2 +- src/views/alarm/index.vue | 24 +++++ src/views/device/components/DeviceCard.vue | 5 +- .../serverModule/components/ServerCard.scss | 13 +-- .../serverModule/components/ServerCard.vue | 1 + 15 files changed, 124 insertions(+), 94 deletions(-) create mode 100644 src/components/TableActionCard/isDelete.tsx diff --git a/public/logo.svg b/public/logo.svg index 8bc4a71..52bfa8f 100644 --- a/public/logo.svg +++ b/public/logo.svg @@ -1,49 +1,44 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/CustomTable/src/baseTable.scss b/src/components/CustomTable/src/baseTable.scss index 49cda28..48887b5 100644 --- a/src/components/CustomTable/src/baseTable.scss +++ b/src/components/CustomTable/src/baseTable.scss @@ -13,36 +13,23 @@ tr { & > td:nth-child(1) { border-left: 1px solid #dcdcdc; - border-radius: 4px; + border-radius: 4px 0 0 4px; } & > td:last-child { border-right: 1px solid #dcdcdc !important; - border-radius: 4px; + border-radius: 0 4px 4px 0; } } } - tr { - & > th:nth-child(1) { - border-left: 1px solid #dcdcdc; - border-radius: 4px 0 0 4px; - } - - & > th:last-child { - border-right: 1px solid #dcdcdc !important; - border-radius: 0 4px 4px 0; - } - } - .el-table__header > thead { th { background-color: rgba(21, 77, 221, 0.1) !important; } } - &.el-table td.el-table__cell, - &.el-table th.el-table__cell.is-leaf { + &.el-table td.el-table__cell { border-top: 1px solid #dcdcdc; border-bottom: 1px solid #dcdcdc; } diff --git a/src/components/CustomTable/src/baseTable.tsx b/src/components/CustomTable/src/baseTable.tsx index f64ac75..21a16a1 100644 --- a/src/components/CustomTable/src/baseTable.tsx +++ b/src/components/CustomTable/src/baseTable.tsx @@ -276,7 +276,8 @@ export default defineComponent({ default: ({ row }: { row: Record }) => { return (
-
    + {slots.actionBar &&
    {slots.actionBar({ row })}
    } + {/*
      • -
    +
*/}
); } diff --git a/src/components/CustomTree/src/collapseTreeItem.tsx b/src/components/CustomTree/src/collapseTreeItem.tsx index 550d348..b48190a 100644 --- a/src/components/CustomTree/src/collapseTreeItem.tsx +++ b/src/components/CustomTree/src/collapseTreeItem.tsx @@ -1,3 +1,11 @@ +/* + * @Author: donghao donghao@supervision.ltd + * @Date: 2024-01-16 14:13:25 + * @LastEditors: donghao donghao@supervision.ltd + * @LastEditTime: 2024-02-06 15:12:19 + * @FilePath: \General-AI-Platform-Web-Client\src\components\CustomTree\src\collapseTreeItem.tsx + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ import { computed, defineComponent, nextTick, onBeforeUnmount, ref } from "vue"; import "./collapseTreeStyle.scss"; import { emitter } from "@/utils/mitt"; @@ -53,7 +61,7 @@ export default defineComponent({ }} > -
+
{nodeLatestInfo.value.name}
diff --git a/src/components/CustomTree/src/collapseTreeStyle.scss b/src/components/CustomTree/src/collapseTreeStyle.scss index 5d558d5..ae83401 100644 --- a/src/components/CustomTree/src/collapseTreeStyle.scss +++ b/src/components/CustomTree/src/collapseTreeStyle.scss @@ -15,6 +15,7 @@ .selected_active { color: $--theme-color; background: rgb(21 77 221 / 10%); + font-weight: bold; } .root_tree_icon { diff --git a/src/components/TableActionCard/isDelete.tsx b/src/components/TableActionCard/isDelete.tsx new file mode 100644 index 0000000..e69de29 diff --git a/src/layout/components/navbar.vue b/src/layout/components/navbar.vue index d8f2277..1253d28 100644 --- a/src/layout/components/navbar.vue +++ b/src/layout/components/navbar.vue @@ -3,7 +3,7 @@ // import Notice from "./notice/index.vue"; import mixNav from "./sidebar/mixNav.vue"; import { useNav } from "@/layout/hooks/useNav"; -import Breadcrumb from "./sidebar/breadCrumb.vue"; +// import Breadcrumb from "./sidebar/breadCrumb.vue"; // import topCollapse from "./sidebar/topCollapse.vue"; import { useTranslationLang } from "../hooks/useTranslationLang"; // import globalization from "@/assets/svg/globalization.svg?component"; @@ -32,9 +32,7 @@ const {