Merge branch 'dev' of https://gitee.com/wangbosheng/yudao-ui-admin-vue3 into dev

src/views/infra/redis/index.vue

@@ -218,6 +218,7 @@ const getSummary = () => {
   usedMemoryInstance()
 }
 
+<<<<<<< HEAD
 /** 命令使用情况 */
 const initcommandStatsChart = async () => {
   usedmemoryEchartChika.series[0].data = []
@@ -264,6 +265,10 @@ const usedMemoryInstance = async () => {
 
 /** 初始化 **/
 onMounted(() => {
+=======
+onBeforeMount(() => {
+  // TODO @hiiwbs 微信，优化使用 Echart 组件
+>>>>>>> e92361ed401771998c6abd6d9ba53801a6e0cfa6
   readRedisInfo()
   // 加载数据
   getSummary()