From f1f3de209cd9eafbede3a88385eecb8c36f63df7 Mon Sep 17 00:00:00 2001 From: donghao Date: Fri, 1 Mar 2024 16:34:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=91=8A=E8=AD=A6=E9=80=9A=E7=9F=A5UI?= =?UTF-8?q?=E5=BE=AE=E8=B0=83=EF=BC=8C=E5=A4=A7=E5=B1=8F=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/dsFooterbar.vue | 13 ++++++++++++- src/layout/dataScreenIndex.vue | 5 +++++ src/pages/dataScreen/App.vue | 8 +++++++- src/pages/dataScreen/router/modules/workbench.ts | 3 ++- src/pages/dataScreen/router/utils.ts | 2 +- src/pages/dataScreen/views/alarm/alarmInfoIndex.vue | 7 ++++--- src/store/modules/dsPermission.ts | 2 +- src/style/dark.scss | 3 +++ 8 files changed, 35 insertions(+), 8 deletions(-) diff --git a/src/layout/components/dsFooterbar.vue b/src/layout/components/dsFooterbar.vue index ae1b67a..6e9630f 100644 --- a/src/layout/components/dsFooterbar.vue +++ b/src/layout/components/dsFooterbar.vue @@ -7,6 +7,8 @@ import { transformI18n } from "@/plugins/i18n"; import { useNav } from "@/layout/hooks/useNav"; import { usePermissionStoreHook } from "@/store/modules/dsPermission"; import { ref, computed, watch } from "vue"; +import { constantRoutes } from "@/pages/dataScreen/router"; +import { filterTree } from "@/pages/dataScreen/router/utils"; const route = useRoute(); const router = useRouter(); @@ -17,7 +19,16 @@ const { } = useNav(); const menuData = computed(() => { - return usePermissionStoreHook().wholeMenus; + // 开启动态路由缓存本地sessionStorage + // const key = "async-routes"; + // const asyncRouteList = storageSession().getItem(key) as any; + + // console.log( + // usePermissionStoreHook().wholeMenus, + // "usePermissionStoreHook", + // filterTree(constantRoutes[0].children) + // ); + return filterTree(constantRoutes[0].children); }); const activeName = ref(route.name || "Workbench"); diff --git a/src/layout/dataScreenIndex.vue b/src/layout/dataScreenIndex.vue index e22c957..cb9d704 100644 --- a/src/layout/dataScreenIndex.vue +++ b/src/layout/dataScreenIndex.vue @@ -13,6 +13,7 @@ import DsNavbar from "./components/dsNavbar.vue"; import DsFooterbar from "./components/dsFooterbar.vue"; import { useRoute } from "vue-router"; import ScaleBox from "vue3-scale-box"; +import { setConfig } from "@/config"; const route = useRoute(); const appWrapperRef = ref(); @@ -104,6 +105,10 @@ onMounted(() => { if (isMobile) { toggle("mobile", false); } + // 初始化大屏模块的全局配置 + setConfig({ + EpThemeColor: "#2DE6FF" // 主题色 + }); }); onBeforeMount(() => { diff --git a/src/pages/dataScreen/App.vue b/src/pages/dataScreen/App.vue index 6dfcbec..ffa822e 100644 --- a/src/pages/dataScreen/App.vue +++ b/src/pages/dataScreen/App.vue @@ -2,7 +2,7 @@ * @Author: donghao donghao@supervision.ltd * @Date: 2024-02-22 14:04:50 * @LastEditors: donghao donghao@supervision.ltd - * @LastEditTime: 2024-02-22 14:21:13 + * @LastEditTime: 2024-03-01 10:38:49 * @FilePath: \General-AI-Platform-Web-Client\src\pages\dataScreen\App.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -30,5 +30,11 @@ export default defineComponent({ return this.$storage.locale?.locale === "zh" ? zhCn : en; } } + // setup() { + // onMounted(() => { + // }) + // return { + // } + // } }); diff --git a/src/pages/dataScreen/router/modules/workbench.ts b/src/pages/dataScreen/router/modules/workbench.ts index 0a1c2f8..17425b6 100644 --- a/src/pages/dataScreen/router/modules/workbench.ts +++ b/src/pages/dataScreen/router/modules/workbench.ts @@ -2,7 +2,7 @@ * @Author: donghao donghao@supervision.ltd * @Date: 2024-01-12 14:35:28 * @LastEditors: donghao donghao@supervision.ltd - * @LastEditTime: 2024-02-26 14:45:54 + * @LastEditTime: 2024-03-01 11:41:28 * @FilePath: \General-AI-Platform-Web-Client\src\router\modules\workbench.ts * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -27,6 +27,7 @@ export default { component: () => import("@/pages/dataScreen/views/home/homeIndex.vue"), meta: { title: "工作台", + icon: "homeIcon", roles: ["admin", "common"] } } diff --git a/src/pages/dataScreen/router/utils.ts b/src/pages/dataScreen/router/utils.ts index 2390b80..5493e66 100644 --- a/src/pages/dataScreen/router/utils.ts +++ b/src/pages/dataScreen/router/utils.ts @@ -21,7 +21,7 @@ import { menuType } from "@/layout/types"; import { buildHierarchyTree } from "@/utils/tree"; import { sessionKey, type DataInfo } from "@/utils/auth"; import { useMultiTagsStoreHook } from "@/store/modules/multiTags"; -import { usePermissionStoreHook } from "@/store/modules/permission"; +import { usePermissionStoreHook } from "@/store/modules/dsPermission"; const IFrame = () => import("@/layout/frameView.vue"); // https://cn.vitejs.dev/guide/features.html#glob-import const modulesRoutes = import.meta.glob("/src/views/**/*.{vue,tsx}"); diff --git a/src/pages/dataScreen/views/alarm/alarmInfoIndex.vue b/src/pages/dataScreen/views/alarm/alarmInfoIndex.vue index 2cec038..aa62620 100644 --- a/src/pages/dataScreen/views/alarm/alarmInfoIndex.vue +++ b/src/pages/dataScreen/views/alarm/alarmInfoIndex.vue @@ -2,7 +2,7 @@ * @Author: donghao donghao@supervision.ltd * @Date: 2024-02-23 09:55:26 * @LastEditors: donghao donghao@supervision.ltd - * @LastEditTime: 2024-02-29 17:57:02 + * @LastEditTime: 2024-03-01 10:44:15 * @FilePath: \General-AI-Platform-Web-Client\src\pages\dataScreen\views\alarm\alarmInfoIndex.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -218,6 +218,7 @@ function handleTableChange(record) { /**操作栏事件 */ function handleDel(row) { console.log(row, "handleDel"); + currentRow.value = row; deleteModel.isShowDelete = true; } @@ -329,14 +330,14 @@ onMounted(() => {

确定删除{{ currentRow.name - }}监测告警吗？删除后将找不到此告警，请谨慎操作。 + }}告警吗？删除后将找不到此告警，请谨慎操作。

({ // 静态路由生成的菜单 constantMenus: dsConstantMenus, diff --git a/src/style/dark.scss b/src/style/dark.scss index 4e99cc9..b6a8d83 100644 --- a/src/style/dark.scss +++ b/src/style/dark.scss @@ -143,6 +143,9 @@ html.dark { /* 深色系样式 */ // 深色表单 .ds_form { + .el-input__wrapper { + border-color: #088bd6; + } } // 深色列表