diff --git a/public/favicon.ico b/public/favicon.ico index 91b563e..bf1fd0d 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/assets/images/backgroundImg.png b/src/assets/images/backgroundImg.png new file mode 100644 index 0000000..0d380fc Binary files /dev/null and b/src/assets/images/backgroundImg.png differ diff --git a/src/assets/images/handle_control_bg.png b/src/assets/images/handle_control_bg.png index 63c4fa0..cd4392f 100644 Binary files a/src/assets/images/handle_control_bg.png and b/src/assets/images/handle_control_bg.png differ diff --git a/src/assets/images/menu/backgroundImg.png b/src/assets/images/menu/backgroundImg.png deleted file mode 100644 index 07f28bd..0000000 Binary files a/src/assets/images/menu/backgroundImg.png and /dev/null differ diff --git a/src/components.d.ts b/src/components.d.ts index 776c8a1..bb69ae9 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -7,45 +7,17 @@ export {} /* prettier-ignore */ declare module 'vue' { export interface GlobalComponents { - ElAside: typeof import('element-plus/es')['ElAside'] - ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] - ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] ElButton: typeof import('element-plus/es')['ElButton'] ElCard: typeof import('element-plus/es')['ElCard'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] - ElContainer: typeof import('element-plus/es')['ElContainer'] ElDialog: typeof import('element-plus/es')['ElDialog'] - ElDropdown: typeof import('element-plus/es')['ElDropdown'] - ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem'] - ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu'] - ElForm: typeof import('element-plus/es')['ElForm'] - ElFormItem: typeof import('element-plus/es')['ElFormItem'] - ElHeader: typeof import('element-plus/es')['ElHeader'] ElIcon: typeof import('element-plus/es')['ElIcon'] ElInput: typeof import('element-plus/es')['ElInput'] - ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] - ElMain: typeof import('element-plus/es')['ElMain'] - ElMenu: typeof import('element-plus/es')['ElMenu'] - ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] - ElOption: typeof import('element-plus/es')['ElOption'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] - ElSelect: typeof import('element-plus/es')['ElSelect'] ElSlider: typeof import('element-plus/es')['ElSlider'] - ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] - ElTable: typeof import('element-plus/es')['ElTable'] - ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] - IEpHelpFilled: typeof import('~icons/ep/help-filled')['default'] - IEpHomeFilled: typeof import('~icons/ep/home-filled')['default'] - IEpMenu: typeof import('~icons/ep/menu')['default'] - IEpMessageBox: typeof import('~icons/ep/message-box')['default'] - IEpPlus: typeof import('~icons/ep/plus')['default'] - IEpScaleToOriginal: typeof import('~icons/ep/scale-to-original')['default'] Pagination: typeof import('./components/Pagination/index.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] } - export interface ComponentCustomProperties { - vLoading: typeof import('element-plus/es')['ElLoadingDirective'] - } } diff --git a/src/views/HandleControl/index.vue b/src/views/HandleControl/index.vue index 9daee70..8e8a5e4 100644 --- a/src/views/HandleControl/index.vue +++ b/src/views/HandleControl/index.vue @@ -5,13 +5,13 @@
- {{ currentTime }} 星期五 + {{ currentTime }} {{ week }}

手动控制

- 系统已运行:{{ systemRuntime }} +
@@ -71,11 +71,11 @@
-
-
- {{ circuit.name }}:{{ circuit.status }} +
+
+ 回路{{ index + 1 }}:{{ circuit.is_open ? '打开' : '关闭' }}
-
+
@@ -85,11 +85,11 @@
-
-
- {{ circuit.name }}:{{ circuit.status }} +
+
+ 回路{{ index + 6 }}:{{ circuit.is_open ? '打开' : '关闭' }}
-
+
@@ -102,20 +102,20 @@
-
-
{{ channel.name }}
-
- {{ channel.brightness }}% +
+
调光通道{{ index + 1 }}
+
+ {{ channel.pwm }}%
-
-
{{ channel.name }}
-
- {{ channel.brightness }}% +
+
调光通道{{ index + 6 }}
+
+ {{ channel.pwm }}%
@@ -171,6 +171,9 @@ 日落时间:{{ sunsetTime }}
+
+ 设备号:{{ commit_uid }} +
@@ -206,46 +209,73 @@