feat:merge dev

src/components/ContainerStatus/src/ContainerStatus.vue

@@ -1,37 +1,8 @@
 <script setup lang="ts">
-<<<<<<< HEAD
-import emptyImage from './image/no_data.png'
-=======
->>>>>>> dev
 import { formatTimezone } from '@/utils/tools'
 import { useThemeStore } from '@/stores/modules/theme'
 import lightPng from './image/no_data.png'
 import darkPng from './image/no_data_dark.png'
-<<<<<<< HEAD
-
-const emptyImg = ref(lightPng)
-
-const themeStore = useThemeStore()
-// 判断当前系统主题模式
-onMounted(() => {
-  watch(
-    () => themeStore.theme,
-    (newVal) => {
-      console.log(newVal, 'value')
-      if (newVal === 'dark') {
-        emptyImg.value = darkPng
-      } else {
-        emptyImg.value = lightPng
-      }
-    },
-    {
-      immediate: true,
-      deep: true
-    }
-  )
-})
-=======
->>>>>>> dev
 
 const themeStore = useThemeStore()
 
@@ -94,16 +65,7 @@ watch(
       </el-collapse-item>
     </el-collapse>
     <div v-else class="empty-content" style="">
-<<<<<<< HEAD
-      <img
-        :src="emptyImg"
-        :class="{ 'is-dark': themeStore.theme === 'dark' }"
-        fit="contain"
-        alt="empty"
-      />
-=======
       <img :src="emptyImg" :class="{ 'is-dark': themeStore.theme === 'dark' }" alt="empty" />
->>>>>>> dev
       <div class="empty-text" style="">No data</div>
     </div>
     <div class="footer">
@@ -128,24 +90,9 @@ watch(
     display: flex;
     flex-direction: column;
     align-items: center;
-<<<<<<< HEAD
-    height: 394px;
-    padding-top: 125px;
-
-=======
     height: 358px;
-<<<<<<< HEAD
-    .el-image {
-      width: 200px;
-      height: 200px;
-      margin-top: 20px;
-      object-fit: cover;
-    }
->>>>>>> dev
-=======
     padding-top: 140px;
 
->>>>>>> dev
     .empty-text {
       margin-top: 8px;
       color: #b5b9bf;