Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/dms/deviceLubeReport/index.vue

src/layout/components/Navbar.vue

@@ -23,7 +23,7 @@
 
         <!-- <header-search id="header-search" class="right-menu-item" /> -->
         <search-menu ref="searchMenuRef" />
-        <el-tooltip content="搜索" effect="dark" placement="bottom">
+        <el-tooltip :content="$t('baseFactoryInfo.search')" effect="dark" placement="bottom">
           <div class="right-menu-item hover-effect" @click="openSearchMenu">
             <svg-icon class-name="search-icon" icon-class="search" />
           </div>

src/router/index.ts

@@ -1,6 +1,9 @@
 import { createWebHistory, createRouter, RouteRecordRaw } from 'vue-router';
 /* Layout */
 import Layout from '@/layout/index.vue';
+import i18n from '@/lang/index';
+
+
 
 /**
  * Note: 路由配置项
@@ -126,7 +129,7 @@ export const constantRoutes: RouteRecordRaw[] = [
         path: '/index',
         component: () => import('@/views/index.vue'),
         name: 'Index',
-        meta: { title: '首页', icon: 'dashboard', affix: true }
+        meta: { title: i18n.global.t('navbar.dashboard'), icon: 'dashboard', affix: true }
       }
     ]
   },

src/views/dms/deviceLubeReport/index.vue

@@ -0,0 +1,7 @@
+<template>
+
+</template>
+
+<script setup lang="ts">
+
+</script>

src/views/ems/report/energyPreview/index.vue

@@ -71,10 +71,10 @@
     <el-row :gutter="20">
       <el-col :span="4" :xs="24">
         <el-card class="box-card" style="height: 350px; position: relative">
-          <img
+<!--          <img-->
-            class="centered-image"
+<!--            class="centered-image"-->
-            src="@/assets/images/electricityIcon.svg"
+<!--            src="@/assets/images/electricityIcon.svg"-->
-          />
+<!--          />-->
           <div class="centered-text total-consumption-label">
             总耗量
           </div>