feat: 告警通知UI微调,大屏登录菜单调整

dev-deviceSetting
donghao 1 year ago
parent 894e6820b2
commit f1f3de209c

@ -7,6 +7,8 @@ import { transformI18n } from "@/plugins/i18n";
import { useNav } from "@/layout/hooks/useNav"; import { useNav } from "@/layout/hooks/useNav";
import { usePermissionStoreHook } from "@/store/modules/dsPermission"; import { usePermissionStoreHook } from "@/store/modules/dsPermission";
import { ref, computed, watch } from "vue"; import { ref, computed, watch } from "vue";
import { constantRoutes } from "@/pages/dataScreen/router";
import { filterTree } from "@/pages/dataScreen/router/utils";
const route = useRoute(); const route = useRoute();
const router = useRouter(); const router = useRouter();
@ -17,7 +19,16 @@ const {
} = useNav(); } = useNav();
const menuData = computed(() => { 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"); const activeName = ref(route.name || "Workbench");

@ -13,6 +13,7 @@ import DsNavbar from "./components/dsNavbar.vue";
import DsFooterbar from "./components/dsFooterbar.vue"; import DsFooterbar from "./components/dsFooterbar.vue";
import { useRoute } from "vue-router"; import { useRoute } from "vue-router";
import ScaleBox from "vue3-scale-box"; import ScaleBox from "vue3-scale-box";
import { setConfig } from "@/config";
const route = useRoute(); const route = useRoute();
const appWrapperRef = ref(); const appWrapperRef = ref();
@ -104,6 +105,10 @@ onMounted(() => {
if (isMobile) { if (isMobile) {
toggle("mobile", false); toggle("mobile", false);
} }
//
setConfig({
EpThemeColor: "#2DE6FF" //
});
}); });
onBeforeMount(() => { onBeforeMount(() => {

@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd * @Author: donghao donghao@supervision.ltd
* @Date: 2024-02-22 14:04:50 * @Date: 2024-02-22 14:04:50
* @LastEditors: donghao donghao@supervision.ltd * @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 * @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 * @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; return this.$storage.locale?.locale === "zh" ? zhCn : en;
} }
} }
// setup() {
// onMounted(() => {
// })
// return {
// }
// }
}); });
</script> </script>

@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd * @Author: donghao donghao@supervision.ltd
* @Date: 2024-01-12 14:35:28 * @Date: 2024-01-12 14:35:28
* @LastEditors: donghao donghao@supervision.ltd * @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 * @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 * @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"), component: () => import("@/pages/dataScreen/views/home/homeIndex.vue"),
meta: { meta: {
title: "工作台", title: "工作台",
icon: "homeIcon",
roles: ["admin", "common"] roles: ["admin", "common"]
} }
} }

@ -21,7 +21,7 @@ import { menuType } from "@/layout/types";
import { buildHierarchyTree } from "@/utils/tree"; import { buildHierarchyTree } from "@/utils/tree";
import { sessionKey, type DataInfo } from "@/utils/auth"; import { sessionKey, type DataInfo } from "@/utils/auth";
import { useMultiTagsStoreHook } from "@/store/modules/multiTags"; import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
import { usePermissionStoreHook } from "@/store/modules/permission"; import { usePermissionStoreHook } from "@/store/modules/dsPermission";
const IFrame = () => import("@/layout/frameView.vue"); const IFrame = () => import("@/layout/frameView.vue");
// https://cn.vitejs.dev/guide/features.html#glob-import // https://cn.vitejs.dev/guide/features.html#glob-import
const modulesRoutes = import.meta.glob("/src/views/**/*.{vue,tsx}"); const modulesRoutes = import.meta.glob("/src/views/**/*.{vue,tsx}");

@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd * @Author: donghao donghao@supervision.ltd
* @Date: 2024-02-23 09:55:26 * @Date: 2024-02-23 09:55:26
* @LastEditors: donghao donghao@supervision.ltd * @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 * @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 * @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) { function handleDel(row) {
console.log(row, "handleDel"); console.log(row, "handleDel");
currentRow.value = row;
deleteModel.isShowDelete = true; deleteModel.isShowDelete = true;
} }
@ -329,14 +330,14 @@ onMounted(() => {
<template #header> <template #header>
<div class="flex items-center dialog_header"> <div class="flex items-center dialog_header">
<div class="tip_icon" /> <div class="tip_icon" />
<p class="pl-[8px]">确定删除{{ currentRow.name }}监测告警吗</p> <p class="pl-[8px]">确定删除{{ currentRow.name }}告警吗</p>
</div> </div>
</template> </template>
<div class="main_info"> <div class="main_info">
<p> <p>
确定删除{{ 确定删除{{
currentRow.name currentRow.name
}}监测告警吗删除后将找不到此告警请谨慎操作 }}告警吗删除后将找不到此告警请谨慎操作
</p> </p>
<div class="flex justify-end dialog_footer"> <div class="flex justify-end dialog_footer">
<el-button @click="deleteModel.isShowDelete = false" <el-button @click="deleteModel.isShowDelete = false"

@ -20,7 +20,7 @@ import {
} from "@/pages/dataScreen/router/utils"; } from "@/pages/dataScreen/router/utils";
export const usePermissionStore = defineStore({ export const usePermissionStore = defineStore({
id: "pure-permission", id: "ds-pure-permission",
state: () => ({ state: () => ({
// 静态路由生成的菜单 // 静态路由生成的菜单
constantMenus: dsConstantMenus, constantMenus: dsConstantMenus,

@ -143,6 +143,9 @@ html.dark {
/* 深色系样式 */ /* 深色系样式 */
// //
.ds_form { .ds_form {
.el-input__wrapper {
border-color: #088bd6;
}
} }
// //

Loading…
Cancel
Save