diff --git a/src/components/CustomTable/src/baseTable.tsx b/src/components/CustomTable/src/baseTable.tsx index 0737e76..5f01f7b 100644 --- a/src/components/CustomTable/src/baseTable.tsx +++ b/src/components/CustomTable/src/baseTable.tsx @@ -133,6 +133,14 @@ export default defineComponent({ visibleColumn: { type: Boolean, default: undefined + }, + + /** + * 固定分页器 + */ + isFixedPagination: { + type: Boolean, + default: true } // handleDel: { @@ -383,7 +391,14 @@ export default defineComponent({ }; return ( -
+
); diff --git a/src/components/DsBox/index.ts b/src/components/DsBox/index.ts index 5ce1b1b..43ae2e7 100644 --- a/src/components/DsBox/index.ts +++ b/src/components/DsBox/index.ts @@ -2,12 +2,14 @@ * @Author: donghao donghao@supervision.ltd * @Date: 2024-02-23 11:38:23 * @LastEditors: donghao donghao@supervision.ltd - * @LastEditTime: 2024-02-26 10:36:35 + * @LastEditTime: 2024-02-26 17:27:17 * @FilePath: \General-AI-Platform-Web-Client\src\components\DsBox\index.ts * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ import dsBox1 from "./src/dsBox1"; +import dsBox2 from "./src/dsBox2"; import dsTag1 from "./src/dsTag1"; export const DsBox1 = dsBox1; +export const DsBox2 = dsBox2; export const DsTag1 = dsTag1; diff --git a/src/components/DsBox/src/dsBox1.tsx b/src/components/DsBox/src/dsBox1.tsx index 252cbab..1b6a6ef 100644 --- a/src/components/DsBox/src/dsBox1.tsx +++ b/src/components/DsBox/src/dsBox1.tsx @@ -27,14 +27,6 @@ export default defineComponent({ }, setup(props, { slots }) { - // const count = ref(1); - // const treeData = reactive({ - // list: testDeviceTreeData - // }); - /** - * 渲染内层内容 - */ - return () => { let options = { width: "430px", diff --git a/src/components/DsBox/src/dsBox2.scss b/src/components/DsBox/src/dsBox2.scss new file mode 100644 index 0000000..4e7fab0 --- /dev/null +++ b/src/components/DsBox/src/dsBox2.scss @@ -0,0 +1,3 @@ +.dsBox2_wrap { + // 暂无内容 +} diff --git a/src/components/DsBox/src/dsBox2.tsx b/src/components/DsBox/src/dsBox2.tsx new file mode 100644 index 0000000..e0c8851 --- /dev/null +++ b/src/components/DsBox/src/dsBox2.tsx @@ -0,0 +1,75 @@ +/* + * @Author: donghao donghao@supervision.ltd + * @Date: 2024-02-26 17:24:07 + * @LastEditors: donghao donghao@supervision.ltd + * @LastEditTime: 2024-02-26 17:42:29 + * @FilePath: \General-AI-Platform-Web-Client\src\components\DsBox\src\dsBox2.tsx + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ +/** + * @背景框尺寸说明 + * + * 1、整体框 + * w1 1856px + * h1 763px + * 默认标题 + * + * + */ + +import { defineComponent } from "vue"; +import "./dsBox2.scss"; + +export default defineComponent({ + name: "DsBox2", + props: { + type: { + type: String, + default: "default" + }, + title: { + type: String, + default: "" + } + }, + + setup(props, { slots }) { + return () => { + let options = { + width: "1856px", + height: "763px" + }; + switch (props.type) { + case "w1h1": + options = { + width: "430px", + height: "288px" + }; + break; + default: + options = { + width: "100%", + height: "100%" + }; + break; + } + return ( +
+ +
+
+ {/* 主体内容 */} + {slots.default()} +
+
+ +
+ ); + }; + } +}); diff --git a/src/layout/components/navbar.vue b/src/layout/components/navbar.vue index 1253d28..7948270 100644 --- a/src/layout/components/navbar.vue +++ b/src/layout/components/navbar.vue @@ -8,14 +8,14 @@ import { useNav } from "@/layout/hooks/useNav"; import { useTranslationLang } from "../hooks/useTranslationLang"; // import globalization from "@/assets/svg/globalization.svg?component"; import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line"; -// import Setting from "@iconify-icons/ri/settings-3-line"; +import Setting from "@iconify-icons/ri/settings-3-line"; // import Check from "@iconify-icons/ep/check"; const { layout, // device, logout, - // onPanel, + onPanel, // pureApp, username, userAvatar, @@ -99,13 +99,13 @@ const { - +
diff --git a/src/layout/dataScreenIndex.vue b/src/layout/dataScreenIndex.vue index 8f7d0e3..e5a749d 100644 --- a/src/layout/dataScreenIndex.vue +++ b/src/layout/dataScreenIndex.vue @@ -106,7 +106,7 @@ onMounted(() => { }); onBeforeMount(() => { - useDataThemeChange().dataThemeChange(); + useDataThemeChange().setThemeByType("dark"); // 设置夜间主题 }); diff --git a/src/layout/hooks/useDataThemeChange.ts b/src/layout/hooks/useDataThemeChange.ts index 6a08b6d..84149c6 100644 --- a/src/layout/hooks/useDataThemeChange.ts +++ b/src/layout/hooks/useDataThemeChange.ts @@ -94,6 +94,11 @@ export function useDataThemeChange() { } } + /**设置日间、夜间主题 */ + function setThemeByType(themeType: string) { + document.documentElement.classList.add(themeType); + } + return { body, dataTheme, @@ -101,6 +106,7 @@ export function useDataThemeChange() { themeColors, dataThemeChange, setEpThemeColor, - setLayoutThemeColor + setLayoutThemeColor, + setThemeByType }; } diff --git a/src/pages/dataScreen/app.scss b/src/pages/dataScreen/app.scss new file mode 100644 index 0000000..e482214 --- /dev/null +++ b/src/pages/dataScreen/app.scss @@ -0,0 +1,17 @@ +// 标题 +// 标题样式1 +.ds_title_1 { + font-family: "DouyinSansBold"; + font-weight: bold; + font-size: 28px; + line-height: 33px; + text-align: left; + font-style: normal; + text-transform: none; + background: linear-gradient(to bottom, #ffffff 15%, #3397f4 99%); + background-clip: text; + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; +} + +$--el-text-color-regular: red; diff --git a/src/pages/dataScreen/main.ts b/src/pages/dataScreen/main.ts index e0b3add..cde2725 100644 --- a/src/pages/dataScreen/main.ts +++ b/src/pages/dataScreen/main.ts @@ -2,7 +2,7 @@ * @Author: donghao donghao@supervision.ltd * @Date: 2024-02-22 14:04:38 * @LastEditors: donghao donghao@supervision.ltd - * @LastEditTime: 2024-02-22 17:48:10 + * @LastEditTime: 2024-02-27 10:04:19 * @FilePath: \General-AI-Platform-Web-Client\src\pages\dataScreen\main.ts * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -31,6 +31,7 @@ import "element-plus/dist/index.css"; // 导入字体图标 import "@/assets/iconfont/iconfont.js"; import "@/assets/iconfont/iconfont.css"; +import "./app.scss"; const app = createApp(App); diff --git a/src/pages/dataScreen/router/modules/alarm.ts b/src/pages/dataScreen/router/modules/alarm.ts index e5c77b8..4697e42 100644 --- a/src/pages/dataScreen/router/modules/alarm.ts +++ b/src/pages/dataScreen/router/modules/alarm.ts @@ -2,7 +2,7 @@ * @Author: donghao donghao@supervision.ltd * @Date: 2024-02-23 11:00:08 * @LastEditors: donghao donghao@supervision.ltd - * @LastEditTime: 2024-02-26 14:18:27 + * @LastEditTime: 2024-02-26 17:23:22 * @FilePath: \General-AI-Platform-Web-Client\src\pages\dataScreen\router\modules\device.ts * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -16,6 +16,6 @@ export default { rank: 5, roles: ["admin", "common"] }, - component: () => import("@/pages/dataScreen/views/device/deviceList.vue"), + component: () => import("@/pages/dataScreen/views/alarm/alarmInfoIndex.vue"), name: "alarmInfo" } as RouteConfigsTable; diff --git a/src/pages/dataScreen/views/alarm/alarmInfoIndex.scss b/src/pages/dataScreen/views/alarm/alarmInfoIndex.scss new file mode 100644 index 0000000..3ba0e08 --- /dev/null +++ b/src/pages/dataScreen/views/alarm/alarmInfoIndex.scss @@ -0,0 +1,6 @@ +.alarmInfoIndex_wrap { + padding: 32px; + .alarm_main_info { + height: 763px; + } +} diff --git a/src/pages/dataScreen/views/alarm/alarmInfoIndex.vue b/src/pages/dataScreen/views/alarm/alarmInfoIndex.vue new file mode 100644 index 0000000..6d65162 --- /dev/null +++ b/src/pages/dataScreen/views/alarm/alarmInfoIndex.vue @@ -0,0 +1,310 @@ + + + + + + diff --git a/src/pages/dataScreen/views/alarmInfo/alarmInfoIndex.vue b/src/pages/dataScreen/views/alarmInfo/alarmInfoIndex.vue deleted file mode 100644 index 2c41af7..0000000 --- a/src/pages/dataScreen/views/alarmInfo/alarmInfoIndex.vue +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/src/style/dark.scss b/src/style/dark.scss index 5954983..4c970a6 100644 --- a/src/style/dark.scss +++ b/src/style/dark.scss @@ -139,3 +139,10 @@ html.dark { } } } + +/* 深色系样式 */ +// 深色表单 +.ds_form { +} + +// 深色列表 diff --git a/src/style/element-plus.scss b/src/style/element-plus.scss index c83cd20..d0ee51d 100644 --- a/src/style/element-plus.scss +++ b/src/style/element-plus.scss @@ -172,6 +172,8 @@ /* 分页栏 */ .pagination_wrap { +} +.fixed_pagination { width: calc(100% - 136px); background-color: white; z-index: 9; @@ -183,6 +185,12 @@ bottom: 0; padding: 20px 40px 40px; } +.noneFixed_pagination { + display: flex; + align-items: center; + justify-content: flex-end; + padding: 20px 0; +} /* table */