diff --git a/src/lang/en.ts b/src/lang/en.ts
index 7a40081..c19df83 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -14,14 +14,18 @@ export default {
login: 'Login',
verifyCode: 'Verify Code',
remember: 'Remember Password',
- group: 'Luen Mei Intelligence Energy Technology (Shenyang) Co., Ltd',
- abbreviation: 'Luen Mei Intelligence',
- copyright: 'All Rights Reserved.'
},
// 导航栏国际化
navbar: {
dashboard: 'Dashboard',
logout: 'Logout',
document: 'Document'
+ },
+ //版权信息
+ copyright: {
+ year: '2024',
+ company: 'Luen Mei Intelligence Energy Technology (Shenyang) Co., Ltd',
+ abbr:'Luen Mei Intelligence',
+ document: 'All Rights Reserved.'
}
};
diff --git a/src/lang/zh-cn.ts b/src/lang/zh-cn.ts
index 534acc6..31e56e5 100644
--- a/src/lang/zh-cn.ts
+++ b/src/lang/zh-cn.ts
@@ -14,14 +14,18 @@ export default {
login: '登 录',
verifyCode: '验证码',
remember: '记住密码',
- group: '联美智慧能源科技(沈阳)有限公司',
- abbreviation: '联美智慧',
- copyright: '版权所有'
},
// 导航栏国际化
navbar: {
dashboard: '首页',
logout: '注销',
document: '项目文档'
+ },
+ //版权信息
+ copyright: {
+ year: '2024',
+ company: '联美智慧能源科技(沈阳)有限公司',
+ abbr:'联美智慧',
+ document: '版权所有'
}
};
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index eece381..d172c06 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -7,7 +7,7 @@
-
Copyright © 2023 {{ $t('login.abbreviation') }} {{ $t('login.copyright') }}
+ Copyright © {{ $t('copyright.year') }} {{ $t('copyright.abbr') }} {{ $t('copyright.document') }}
diff --git a/src/types/auto-imports.d.ts b/src/types/auto-imports.d.ts
index 9ea2d5d..5742656 100644
--- a/src/types/auto-imports.d.ts
+++ b/src/types/auto-imports.d.ts
@@ -2,8 +2,11 @@
export {}
declare global {
const EffectScope: typeof import('vue')['EffectScope']
+ const ElForm: typeof import('element-plus/es')['ElForm']
const ElMessage: typeof import('element-plus/es')['ElMessage']
const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
+ const ElNotification: typeof import('element-plus/es')['ElNotification']
+ const NEllipsis: typeof import('naive-ui')['NEllipsis']
const asyncComputed: typeof import('@vueuse/core')['asyncComputed']
const autoResetRef: typeof import('@vueuse/core')['autoResetRef']
const computed: typeof import('vue')['computed']
@@ -270,8 +273,11 @@ import { UnwrapRef } from 'vue'
declare module 'vue' {
interface ComponentCustomProperties {
readonly EffectScope: UnwrapRef
+ readonly ElForm: UnwrapRef
readonly ElMessage: UnwrapRef
readonly ElMessageBox: UnwrapRef
+ readonly ElNotification: UnwrapRef
+ readonly NEllipsis: UnwrapRef
readonly asyncComputed: UnwrapRef
readonly autoResetRef: UnwrapRef
readonly computed: UnwrapRef
diff --git a/src/views/details/index.scss b/src/views/details/index.scss
index 2c0eaa7..666c3d4 100644
--- a/src/views/details/index.scss
+++ b/src/views/details/index.scss
@@ -1,16 +1,15 @@
@import url('@/assets/fonts/font.css');
.details {
- padding: 1.5rem 1.5rem 0 1.5rem;
- .header {
- margin-bottom: 1.5rem;
- }
+ padding: 15px 15px 0 15px;
.search {
- margin-bottom: 1.5rem;
+ position: relative;
+ margin-bottom: 15px;
+ overflow: visible;
:deep(.el-card__header) {
padding: 10px;
}
:deep(.el-card__body) {
- padding: 20px 20px 0 20px;
+ padding: 0 20px;
}
.cardHeader {
display: flex;
@@ -35,23 +34,92 @@
}
.searchForm {
.item {
- margin-bottom: 20px;
+ margin: 20px 0;
.searchCheckbox {
margin-right: 30px;
}
}
.formBtn {
- padding: 0 20px;
+ margin: 20px;
}
}
+ .searchTips {
+ position: absolute;
+ bottom: 0;
+ right: 30px;
+ cursor: pointer;
+ }
+ .searchTips.isShow {
+ bottom: -15px;
+ }
+
+ .searchTips.isHide::after {
+ content: '隐藏';
+ position: absolute;
+ top: -130%;
+ left: 50%;
+ transform: translateX(-50%);
+ width: 40px;
+ height: fit-content;
+ background-color: var(--el-menu-active-color);
+ padding: 4px 8px;
+ border-radius: 5px;
+ transition: 0.2s linear;
+ transition-delay: 0.2s;
+ color: white;
+ // text-transform: uppercase;
+ font-size: 12px;
+ opacity: 0;
+ // visibility: hidden;
+ }
+
+ .searchTips.isShow::after {
+ content: '显示';
+ position: absolute;
+ top: -130%;
+ left: 50%;
+ transform: translateX(-50%);
+ width: 40px;
+ height: fit-content;
+ background-color: var(--el-menu-active-color);
+ padding: 4px 8px;
+ border-radius: 5px;
+ transition: 0.2s linear;
+ transition-delay: 0.2s;
+ color: white;
+ // text-transform: uppercase;
+ font-size: 12px;
+ opacity: 0;
+ // visibility: hidden;
+ }
+
+ .icon {
+ transform: scale(1.2);
+ transition: 0.2s linear;
+ }
+
+ .searchTips:hover > .icon {
+ transform: scale(1.5);
+ }
+
+ .searchTips:hover > .icon path {
+ fill: var(--el-menu-active-color);
+ }
+
+ .searchTips:hover::after {
+ visibility: visible;
+ opacity: 1;
+ top: -160%;
+ }
}
.echart {
:deep(.el-card__body) {
display: flex;
- padding: 1.5rem;
+ padding: 15px;
.sidebar {
width: 200px;
border: 1px solid #e8eaec;
+ height: calc(100vh - 150px - 30px - 40px - 2px);
h3 {
height: 25px;
@@ -63,7 +131,7 @@
text-align: center;
}
.deviceMenu {
- height: calc(100vh - 205px - 7.5rem);
+ height: calc(100vh - 150px - 30px - 40px - 55px - 4px);
border-right: none;
overflow: auto;
.el-menu-item {
@@ -92,7 +160,7 @@
}
.paramList {
- height: calc(100vh - 150px - 7.5rem);
+ // height: calc(100vh - 150px - 7.5rem);
padding: 20px 10px;
overflow: auto;
.item {
@@ -156,18 +224,35 @@
}
.comparisonInfo {
flex: 1;
- margin: 0 1.5rem;
+ margin: 0 15px;
.stackedLine {
width: 100%;
- height: calc(100vh - 150px - 7.5rem);
+ height: calc(100vh - 150px - 30px - 40px - 2px);
+ line-height: calc(100vh - 150px - 30px - 40px - 2px);
font-size: 1.4rem;
text-align: center;
color: #606266;
- line-height: calc(100vh - 150px - 7.5rem);
}
}
}
}
+ .echart.echartHide {
+ :deep(.el-card__body) {
+ .sidebar {
+ height: calc(100vh - 78px - 30px - 40px - 2px);
+ .deviceMenu {
+ height: calc(100vh - 78px - 30px - 40px - 55px - 4px);
+ }
+ }
+ .comparisonInfo {
+ .stackedLine {
+ height: calc(100vh - 78px - 30px - 40px - 2px);
+ line-height: calc(100vh - 78px - 30px - 40px - 2px);
+ }
+ }
+ }
+ }
+
.copyright {
height: 40px;
line-height: 40px;
@@ -180,20 +265,34 @@
}
/** pc **/
@media only screen and (min-width: 768px) and (max-width: 1680px) {
- .details {
- color: red;
- .echart {
- :deep(.el-card__body) {
- .sidebar {
- .deviceMenu {
- height: calc(100vh - 266px - 7.5rem) !important;
- }
+ .echart {
+ :deep(.el-card__body) {
+ .sidebar {
+ height: calc(100vh - 222px - 30px - 40px - 2px) !important;
+ .deviceMenu {
+ height: calc(100vh - 222px - 30px - 40px - 55px - 4px) !important;
}
- .comparisonInfo {
- .stackedLine {
- height: calc(100vh - 211px - 7.5rem);
- line-height: calc(100vh - 211px - 7.5rem) !important;
- }
+ }
+ .comparisonInfo {
+ .stackedLine {
+ height: calc(100vh - 222px - 30px - 40px - 2px) !important;
+ line-height: calc(100vh - 222px - 30px - 40px - 2px) !important;
+ }
+ }
+ }
+ }
+ .echart.echartHide {
+ :deep(.el-card__body) {
+ .sidebar {
+ height: calc(100vh - 78px - 30px - 40px - 2px) !important;
+ .deviceMenu {
+ height: calc(100vh - 78px - 30px - 40px - 55px - 4px) !important;
+ }
+ }
+ .comparisonInfo {
+ .stackedLine {
+ height: calc(100vh - 78px - 30px - 40px - 2px) !important;
+ line-height: calc(100vh - 78px - 30px - 40px - 2px) !important;
}
}
}
diff --git a/src/views/details/index.vue b/src/views/details/index.vue
index 6639224..6a91536 100644
--- a/src/views/details/index.vue
+++ b/src/views/details/index.vue
@@ -18,7 +18,15 @@
-
+
-
+
+
+ 确认
+
+
+
-
+
- Copyright © 2023 {{ $t('login.abbreviation') }} {{ $t('login.copyright') }}
+ Copyright © {{ $t('copyright.year') }} {{ $t('copyright.abbr') }} {{ $t('copyright.document') }}