diff --git a/src/api/table/list.ts b/src/api/table/list.ts
index ae5d27d..5d81956 100644
--- a/src/api/table/list.ts
+++ b/src/api/table/list.ts
@@ -87,3 +87,16 @@ export function sendCtrl(data: any) {
data: data
});
}
+
+/**
+ * 获取报表统计
+ *
+ * @param queryParams
+ */
+export function dcBusiDayReport(queryParams: any) {
+ return request({
+ url: '/dc/dcBusiDayReport/list',
+ method: 'get',
+ params: queryParams
+ });
+}
diff --git a/src/api/table/types.ts b/src/api/table/types.ts
index 34e76b4..da58aab 100644
--- a/src/api/table/types.ts
+++ b/src/api/table/types.ts
@@ -76,3 +76,18 @@ export interface extVo {
export interface RoleQuery {
time: string;
}
+
+/**
+ * 统计报表
+ */
+export interface StatVo {
+ adate: null;
+ aday: string;
+ amonth: string;
+ aparamcode: string;
+ auuid: string;
+ aval: number;
+ ayear: string;
+ devicName: string;
+ paramName: string;
+}
diff --git a/src/lang/en.ts b/src/lang/en.ts
index 00f7714..c98267c 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -2,9 +2,9 @@ export default {
// 路由国际化
route: {
dashboard: 'Dashboard',
- system:'System Management',
- user:'User',
- role:'Role',
+ system: 'System Management',
+ user: 'User',
+ role: 'Role'
},
// 登录页面国际化
login: {
@@ -13,12 +13,14 @@ export default {
password: 'Password',
login: 'Login',
verifyCode: 'Verify Code',
- copyright: 'All Rights Reserved.',
+ group: 'Luenmei Smart Energy Technology (Shenyang) Co., Ltd',
+ abbreviation: 'Luenmei Smart',
+ copyright: 'All Rights Reserved.'
},
// 导航栏国际化
navbar: {
dashboard: 'Dashboard',
logout: 'Logout',
- document: 'Document',
+ document: 'Document'
}
};
diff --git a/src/lang/zh-cn.ts b/src/lang/zh-cn.ts
index 7b93420..bc98a83 100644
--- a/src/lang/zh-cn.ts
+++ b/src/lang/zh-cn.ts
@@ -2,9 +2,9 @@ export default {
// 路由国际化
route: {
dashboard: '首页',
- system:'系统管理',
- user:'用户管理',
- roel:'角色管理',
+ system: '系统管理',
+ user: '用户管理',
+ roel: '角色管理'
},
// 登录页面国际化
login: {
@@ -13,12 +13,14 @@ export default {
password: '密码',
login: '登 录',
verifyCode: '验证码',
- copyright: '版权所有',
+ group: '联美智慧能源科技(沈阳)有限公司',
+ abbreviation: '联美智慧',
+ copyright: '版权所有'
},
// 导航栏国际化
navbar: {
dashboard: '首页',
logout: '注销',
- document: '项目文档',
+ document: '项目文档'
}
};
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index d94a68a..eece381 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -7,6 +7,7 @@
+
Copyright © 2023 {{ $t('login.abbreviation') }} {{ $t('login.copyright') }}
@@ -25,9 +26,19 @@ const tagsViewStore = useTagsViewStore();
padding: 15px;
overflow: hidden;
background-color: var(--el-bg-color-page);
+ .copyright {
+ width: 100%;
+ height: 50px;
+ line-height: 50px;
+ text-align: center;
+ color: #9ca3af;
+ font-family: Arial;
+ font-size: 12px;
+ letter-spacing: 1px;
+ }
}
- .fixed-header+.appContainer {
+ .fixed-header + .appContainer {
padding-top: 84px;
min-height: 100vh;
}
diff --git a/src/mock/routes.json b/src/mock/routes.json
index 1d67098..140247f 100644
--- a/src/mock/routes.json
+++ b/src/mock/routes.json
@@ -35,6 +35,18 @@
"roles": ["biadmin"],
"keepAlive": true
}
+ },
+ {
+ "path": "/statistical",
+ "component": "statistical/index",
+ "name": "statistical",
+ "meta": {
+ "title": "报表统计",
+ "icon": "chart",
+ "hidden": false,
+ "roles": ["biadmin"],
+ "keepAlive": true
+ }
}
]
}
diff --git a/src/types/auto-imports.d.ts b/src/types/auto-imports.d.ts
index e5c7bdb..5742656 100644
--- a/src/types/auto-imports.d.ts
+++ b/src/types/auto-imports.d.ts
@@ -5,6 +5,8 @@ declare global {
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']
@@ -274,6 +276,8 @@ declare module 'vue' {
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/dashboard/index.scss b/src/views/dashboard/index.scss
index b2cbecd..760913a 100644
--- a/src/views/dashboard/index.scss
+++ b/src/views/dashboard/index.scss
@@ -33,27 +33,27 @@
}
.dataCard {
margin-bottom: 15px;
- .item {
- height: 100px;
- padding: 16px;
- border-radius: 8px;
- color: #fff;
- h3{
- font-size: 18px;
- margin: 0;
+ .item {
+ height: 100px;
+ padding: 16px;
+ border-radius: 8px;
+ color: #fff;
+ h3 {
+ font-size: 18px;
+ margin: 0;
+ }
+ .data {
+ display: flex;
+ justify-content: space-between;
+ margin-top: 10px;
+ .iconfont {
+ font-size: 22px;
}
- .data{
- display: flex;
- justify-content: space-between;
- margin-top: 10px;
- .iconfont{
- font-size: 22px;
- }
- span{
- font-size: 28px;
- }
+ span {
+ font-size: 28px;
}
}
+ }
// .el-col:nth-child(1) {
// .item {
// background-image: linear-gradient(to right bottom, #ec4786, #b955a4);
diff --git a/src/views/details/index.scss b/src/views/details/index.scss
index 55edbc6..a9fc82b 100644
--- a/src/views/details/index.scss
+++ b/src/views/details/index.scss
@@ -1,5 +1,5 @@
.details {
- padding: 1.5rem;
+ padding: 1.5rem 1.5rem 0 1.5rem;
.header {
margin-bottom: 1.5rem;
}
@@ -32,7 +32,7 @@
.comparisonInfo {
.stackedLine {
width: 100%;
- height: 68vh;
+ height: 66vh;
font-size: 1.4rem;
text-align: center;
color: #606266;
@@ -40,4 +40,13 @@
}
}
}
+ .copyright {
+ height: 30px;
+ line-height: 30px;
+ text-align: center;
+ color: #9ca3af;
+ font-family: Arial;
+ font-size: 12px;
+ letter-spacing: 1px;
+ }
}
diff --git a/src/views/details/index.vue b/src/views/details/index.vue
index 6012fd5..b3a8e56 100644
--- a/src/views/details/index.vue
+++ b/src/views/details/index.vue
@@ -102,6 +102,7 @@
暂无数据
+ Copyright © 2023 {{ $t('login.abbreviation') }} {{ $t('login.copyright') }}
\ No newline at end of file
+
diff --git a/src/views/monitoring/devicemanage/index.scss b/src/views/monitoring/devicemanage/index.scss
index 0584cae..ffce2f0 100644
--- a/src/views/monitoring/devicemanage/index.scss
+++ b/src/views/monitoring/devicemanage/index.scss
@@ -709,6 +709,15 @@
background-color: transparent;
}
}
+ .copyright {
+ height: 25px;
+ line-height: 25px;
+ text-align: center;
+ color: #9ca3af;
+ font-family: Arial;
+ font-size: 12px;
+ letter-spacing: 1px;
+ }
}
.dark {
diff --git a/src/views/monitoring/devicemanage/index.vue b/src/views/monitoring/devicemanage/index.vue
index 907e7fb..0517a71 100644
--- a/src/views/monitoring/devicemanage/index.vue
+++ b/src/views/monitoring/devicemanage/index.vue
@@ -11,6 +11,7 @@
+ Copyright © 2023 {{ $t('login.abbreviation') }} {{ $t('login.copyright') }}
+
+
diff --git a/vite.config.ts b/vite.config.ts
index 6ba7ebf..30ab1aa 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -45,7 +45,7 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
hmr: true, //配置HMR
proxy: {
'/dev-api': {
- // target: 'http://172.1.2.6:9010/', //本地接口地址
+ // target: 'http://172.1.2.132:9010/', //本地接口地址
// target: 'http://172.1.2.158:9010/', //本地接口地址
target: 'http://10.10.10.56:9010/', //线上测试接口地址
changeOrigin: true,