diff --git a/src/assets/logo/logo-demo.png b/src/assets/logo/logo-demo.png new file mode 100644 index 0000000..a33d226 Binary files /dev/null and b/src/assets/logo/logo-demo.png differ diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png deleted file mode 100644 index e263760..0000000 Binary files a/src/assets/logo/logo.png and /dev/null differ diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index 8027748..261f55c 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -22,7 +22,8 @@
@@ -79,7 +80,8 @@ const device = computed(() => appStore.device) const needTagsView = computed(() => settingsStore.tagsView) const fixedHeader = computed(() => settingsStore.fixedHeader) const systemInfo = JSON.parse(Cookies.get("SystemInfo") || '{"systemName":"智汕能源管理系统","leftLogo":""}') -const title = systemInfo.systemName || import.meta.env.VITE_APP_TITLE +// const title = systemInfo.systemName || import.meta.env.VITE_APP_TITLE +const title = '干巷能耗管理系统' // 报警数量,可以从接口获取 const alarmCount = ref(5) diff --git a/src/views/dataMonitoring/historyDataTrend/index.vue b/src/views/dataMonitoring/historyDataTrend/index.vue index 6208d7f..3a1f06f 100644 --- a/src/views/dataMonitoring/historyDataTrend/index.vue +++ b/src/views/dataMonitoring/historyDataTrend/index.vue @@ -12,7 +12,7 @@ - 小时 + diff --git a/src/views/index.vue b/src/views/index.vue index cb114db..f402380 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -923,7 +923,6 @@ function getListPeakValley() { .card-list-item { width: 0; flex: 1 1 320px; - max-width: 320px; height: 135px; background: rgba(242, 246, 250, 0.1); box-sizing: border-box;