diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index db7dc0e..abe2eb1 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -65,6 +65,7 @@ export default defineComponent({
 })
 </script>
 
+
 <style lang="scss" scoped>
 $prefix-cls: #{$namespace}-layout;
 
diff --git a/src/layout/components/Setting/src/Setting copy.vue b/src/layout/components/Setting/src/Setting copy.vue
new file mode 100644
index 0000000..2973674
--- /dev/null
+++ b/src/layout/components/Setting/src/Setting copy.vue	
@@ -0,0 +1,302 @@
+<script lang="ts" setup>
+import { ElMessage } from 'element-plus'
+import { useClipboard, useCssVar } from '@vueuse/core'
+
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { useDesign } from '@/hooks/web/useDesign'
+
+import { setCssVar, trim } from '@/utils'
+import { colorIsDark, hexToRGB, lighten } from '@/utils/color'
+import { useAppStore } from '@/store/modules/app'
+import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
+import ColorRadioPicker from './components/ColorRadioPicker.vue'
+import InterfaceDisplay from './components/InterfaceDisplay.vue'
+import LayoutRadioPicker from './components/LayoutRadioPicker.vue'
+
+defineOptions({ name: 'Setting' })
+
+const { t } = useI18n()
+const appStore = useAppStore()
+
+const { getPrefixCls } = useDesign()
+const prefixCls = getPrefixCls('setting')
+const layout = computed(() => appStore.getLayout)
+const drawer = ref(false)
+
+// 主题色相关
+const systemTheme = ref(appStore.getTheme.elColorPrimary)
+
+const setSystemTheme = (color: string) => {
+  setCssVar('--el-color-primary', color)
+  appStore.setTheme({ elColorPrimary: color })
+  const leftMenuBgColor = useCssVar('--left-menu-bg-color', document.documentElement)
+  setMenuTheme(trim(unref(leftMenuBgColor)))
+}
+
+// 头部主题相关
+const headerTheme = ref(appStore.getTheme.topHeaderBgColor || '')
+
+const setHeaderTheme = (color: string) => {
+  const isDarkColor = colorIsDark(color)
+  const textColor = isDarkColor ? '#fff' : 'inherit'
+  const textHoverColor = isDarkColor ? lighten(color!, 6) : '#f6f6f6'
+  const topToolBorderColor = isDarkColor ? color : '#eee'
+  setCssVar('--top-header-bg-color', color)
+  setCssVar('--top-header-text-color', textColor)
+  setCssVar('--top-header-hover-color', textHoverColor)
+  appStore.setTheme({
+    topHeaderBgColor: color,
+    topHeaderTextColor: textColor,
+    topHeaderHoverColor: textHoverColor,
+    topToolBorderColor
+  })
+  if (unref(layout) === 'top') {
+    setMenuTheme(color)
+  }
+}
+
+// 菜单主题相关
+const menuTheme = ref(appStore.getTheme.leftMenuBgColor || '')
+
+const setMenuTheme = (color: string) => {
+  const primaryColor = useCssVar('--el-color-primary', document.documentElement)
+  const isDarkColor = colorIsDark(color)
+  const theme: Recordable = {
+    // 左侧菜单边框颜色
+    leftMenuBorderColor: isDarkColor ? 'inherit' : '#eee',
+    // 左侧菜单背景颜色
+    leftMenuBgColor: color,
+    // 左侧菜单浅色背景颜色
+    leftMenuBgLightColor: isDarkColor ? lighten(color!, 6) : color,
+    // 左侧菜单选中背景颜色
+    leftMenuBgActiveColor: isDarkColor
+      ? 'var(--el-color-primary)'
+      : hexToRGB(unref(primaryColor), 0.1),
+    // 左侧菜单收起选中背景颜色
+    leftMenuCollapseBgActiveColor: isDarkColor
+      ? 'var(--el-color-primary)'
+      : hexToRGB(unref(primaryColor), 0.1),
+    // 左侧菜单字体颜色
+    leftMenuTextColor: isDarkColor ? '#bfcbd9' : '#333',
+    // 左侧菜单选中字体颜色
+    leftMenuTextActiveColor: isDarkColor ? '#fff' : 'var(--el-color-primary)',
+    // logo字体颜色
+    logoTitleTextColor: isDarkColor ? '#fff' : 'inherit',
+    // logo边框颜色
+    logoBorderColor: isDarkColor ? color : '#eee'
+  }
+  appStore.setTheme(theme)
+  appStore.setCssVarTheme()
+}
+if (layout.value === 'top' && !appStore.getIsDark) {
+  headerTheme.value = '#fff'
+  setHeaderTheme('#fff')
+}
+
+// 监听layout变化，重置一些主题色
+watch(
+  () => layout.value,
+  (n) => {
+    if (n === 'top' && !appStore.getIsDark) {
+      headerTheme.value = '#fff'
+      setHeaderTheme('#fff')
+    } else {
+      setMenuTheme(unref(menuTheme))
+    }
+  }
+)
+
+// 拷贝
+const copyConfig = async () => {
+  const { copy, copied, isSupported } = useClipboard({
+    source: `
+      // 面包屑
+      breadcrumb: ${appStore.getBreadcrumb},
+      // 面包屑图标
+      breadcrumbIcon: ${appStore.getBreadcrumbIcon},
+      // 折叠图标
+      hamburger: ${appStore.getHamburger},
+      // 全屏图标
+      screenfull: ${appStore.getScreenfull},
+      // 尺寸图标
+      size: ${appStore.getSize},
+      // 多语言图标
+      locale: ${appStore.getLocale},
+      // 消息图标
+      message: ${appStore.getMessage},
+      // 标签页
+      tagsView: ${appStore.getTagsView},
+      // 标签页
+      tagsViewImmerse: ${appStore.getTagsViewImmerse},
+      // 标签页图标
+      tagsViewIcon: ${appStore.getTagsViewIcon},
+      // logo
+      logo: ${appStore.getLogo},
+      // 菜单手风琴
+      uniqueOpened: ${appStore.getUniqueOpened},
+      // 固定header
+      fixedHeader: ${appStore.getFixedHeader},
+      // 页脚
+      footer: ${appStore.getFooter},
+      // 灰色模式
+      greyMode: ${appStore.getGreyMode},
+      // layout布局
+      layout: '${appStore.getLayout}',
+      // 暗黑模式
+      isDark: ${appStore.getIsDark},
+      // 组件尺寸
+      currentSize: '${appStore.getCurrentSize}',
+      // 主题相关
+      theme: {
+        // 主题色
+        elColorPrimary: '${appStore.getTheme.elColorPrimary}',
+        // 左侧菜单边框颜色
+        leftMenuBorderColor: '${appStore.getTheme.leftMenuBorderColor}',
+        // 左侧菜单背景颜色
+        leftMenuBgColor: '${appStore.getTheme.leftMenuBgColor}',
+        // 左侧菜单浅色背景颜色
+        leftMenuBgLightColor: '${appStore.getTheme.leftMenuBgLightColor}',
+        // 左侧菜单选中背景颜色
+        leftMenuBgActiveColor: '${appStore.getTheme.leftMenuBgActiveColor}',
+        // 左侧菜单收起选中背景颜色
+        leftMenuCollapseBgActiveColor: '${appStore.getTheme.leftMenuCollapseBgActiveColor}',
+        // 左侧菜单字体颜色
+        leftMenuTextColor: '${appStore.getTheme.leftMenuTextColor}',
+        // 左侧菜单选中字体颜色
+        leftMenuTextActiveColor: '${appStore.getTheme.leftMenuTextActiveColor}',
+        // logo字体颜色
+        logoTitleTextColor: '${appStore.getTheme.logoTitleTextColor}',
+        // logo边框颜色
+        logoBorderColor: '${appStore.getTheme.logoBorderColor}',
+        // 头部背景颜色
+        topHeaderBgColor: '${appStore.getTheme.topHeaderBgColor}',
+        // 头部字体颜色
+        topHeaderTextColor: '${appStore.getTheme.topHeaderTextColor}',
+        // 头部悬停颜色
+        topHeaderHoverColor: '${appStore.getTheme.topHeaderHoverColor}',
+        // 头部边框颜色
+        topToolBorderColor: '${appStore.getTheme.topToolBorderColor}'
+      }
+    `
+  })
+  if (!isSupported) {
+    ElMessage.error(t('setting.copyFailed'))
+  } else {
+    await copy()
+    if (unref(copied)) {
+      ElMessage.success(t('setting.copySuccess'))
+    }
+  }
+}
+
+// 清空缓存
+const clear = () => {
+  const { wsCache } = useCache()
+  wsCache.delete(CACHE_KEY.LAYOUT)
+  wsCache.delete(CACHE_KEY.THEME)
+  wsCache.delete(CACHE_KEY.IS_DARK)
+  window.location.reload()
+}
+</script>
+
+<template>
+  <div
+    :class="prefixCls"
+    class="fixed right-0 top-[45%] h-40px w-40px cursor-pointer bg-[var(--el-color-primary)] text-center leading-40px"
+    @click="drawer = true"
+  >
+    <Icon color="#fff" icon="ep:setting" />
+  </div>
+
+  <ElDrawer v-model="drawer" :z-index="4000" direction="rtl" size="350px">
+    <template #header>
+      <span class="text-16px font-700">{{ t('setting.projectSetting') }}</span>
+    </template>
+
+    <div class="text-center">
+      <!-- 主题 -->
+      <ElDivider>{{ t('setting.theme') }}</ElDivider>
+      <ThemeSwitch />
+
+      <!-- 布局 -->
+      <ElDivider>{{ t('setting.layout') }}</ElDivider>
+      <LayoutRadioPicker />
+
+      <!-- 系统主题 -->
+      <ElDivider>{{ t('setting.systemTheme') }}</ElDivider>
+      <ColorRadioPicker
+        v-model="systemTheme"
+        :schema="[
+          '#409eff',
+          '#009688',
+          '#536dfe',
+          '#ff5c93',
+          '#ee4f12',
+          '#0096c7',
+          '#9c27b0',
+          '#ff9800'
+        ]"
+        @change="setSystemTheme"
+      />
+
+      <!-- 头部主题 -->
+      <ElDivider>{{ t('setting.headerTheme') }}</ElDivider>
+      <ColorRadioPicker
+        v-model="headerTheme"
+        :schema="[
+          '#fff',
+          '#151515',
+          '#5172dc',
+          '#e74c3c',
+          '#24292e',
+          '#394664',
+          '#009688',
+          '#383f45'
+        ]"
+        @change="setHeaderTheme"
+      />
+
+      <!-- 菜单主题 -->
+      <template v-if="layout !== 'top'">
+        <ElDivider>{{ t('setting.menuTheme') }}</ElDivider>
+        <ColorRadioPicker
+          v-model="menuTheme"
+          :schema="[
+            '#fff',
+            '#001529',
+            '#212121',
+            '#273352',
+            '#191b24',
+            '#383f45',
+            '#001628',
+            '#344058'
+          ]"
+          @change="setMenuTheme"
+        />
+      </template>
+    </div>
+
+    <!-- 界面显示 -->
+    <ElDivider>{{ t('setting.interfaceDisplay') }}</ElDivider>
+    <InterfaceDisplay />
+
+    <ElDivider />
+    <div>
+      <ElButton class="w-full" type="primary" @click="copyConfig">{{ t('setting.copy') }}</ElButton>
+    </div>
+    <div class="mt-5px">
+      <ElButton class="w-full" type="danger" @click="clear">
+        {{ t('setting.clearAndReset') }}
+      </ElButton>
+    </div>
+  </ElDrawer>
+</template>
+
+<style lang="scss" scoped>
+$prefix-cls: #{$namespace}-setting;
+
+.#{$prefix-cls} {
+  border-radius: 6px 0 0 6px;
+  z-index: 1200;/*修正没有z-index会被表格层覆盖,值不要超过4000*/
+}
+</style>
diff --git a/src/layout/components/Setting/src/Setting.vue b/src/layout/components/Setting/src/Setting.vue
index 2973674..253a085 100644
--- a/src/layout/components/Setting/src/Setting.vue
+++ b/src/layout/components/Setting/src/Setting.vue
@@ -202,93 +202,20 @@ const clear = () => {
 <template>
   <div
     :class="prefixCls"
-    class="fixed right-0 top-[45%] h-40px w-40px cursor-pointer bg-[var(--el-color-primary)] text-center leading-40px"
+    class="fixed right-0 top-[90%] h-40px w-40px cursor-pointer bg-[var(--el-color-primary)] text-center leading-40px"
     @click="drawer = true"
   >
     <Icon color="#fff" icon="ep:setting" />
   </div>
 
-  <ElDrawer v-model="drawer" :z-index="4000" direction="rtl" size="350px">
-    <template #header>
-      <span class="text-16px font-700">{{ t('setting.projectSetting') }}</span>
-    </template>
+  <ElDrawer v-model="drawer" :z-index="4000" direction="rtl" size="550px">
+    <iframe
+      src="https://mb.jzce.com/chat/313cf9e35628923a"
+      style="width: 100%; height: 100%;"
+      frameborder="0"
+      allow="microphone">
+  </iframe>
 
-    <div class="text-center">
-      <!-- 主题 -->
-      <ElDivider>{{ t('setting.theme') }}</ElDivider>
-      <ThemeSwitch />
-
-      <!-- 布局 -->
-      <ElDivider>{{ t('setting.layout') }}</ElDivider>
-      <LayoutRadioPicker />
-
-      <!-- 系统主题 -->
-      <ElDivider>{{ t('setting.systemTheme') }}</ElDivider>
-      <ColorRadioPicker
-        v-model="systemTheme"
-        :schema="[
-          '#409eff',
-          '#009688',
-          '#536dfe',
-          '#ff5c93',
-          '#ee4f12',
-          '#0096c7',
-          '#9c27b0',
-          '#ff9800'
-        ]"
-        @change="setSystemTheme"
-      />
-
-      <!-- 头部主题 -->
-      <ElDivider>{{ t('setting.headerTheme') }}</ElDivider>
-      <ColorRadioPicker
-        v-model="headerTheme"
-        :schema="[
-          '#fff',
-          '#151515',
-          '#5172dc',
-          '#e74c3c',
-          '#24292e',
-          '#394664',
-          '#009688',
-          '#383f45'
-        ]"
-        @change="setHeaderTheme"
-      />
-
-      <!-- 菜单主题 -->
-      <template v-if="layout !== 'top'">
-        <ElDivider>{{ t('setting.menuTheme') }}</ElDivider>
-        <ColorRadioPicker
-          v-model="menuTheme"
-          :schema="[
-            '#fff',
-            '#001529',
-            '#212121',
-            '#273352',
-            '#191b24',
-            '#383f45',
-            '#001628',
-            '#344058'
-          ]"
-          @change="setMenuTheme"
-        />
-      </template>
-    </div>
-
-    <!-- 界面显示 -->
-    <ElDivider>{{ t('setting.interfaceDisplay') }}</ElDivider>
-    <InterfaceDisplay />
-
-    <ElDivider />
-    <div>
-      <ElButton class="w-full" type="primary" @click="copyConfig">{{ t('setting.copy') }}</ElButton>
-    </div>
-    <div class="mt-5px">
-      <ElButton class="w-full" type="danger" @click="clear">
-        {{ t('setting.clearAndReset') }}
-      </ElButton>
-    </div>
   </ElDrawer>
 </template>
 
diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue
index 4ca80e1..1268fb2 100644
--- a/src/views/Home/Index.vue
+++ b/src/views/Home/Index.vue
@@ -1,340 +1,349 @@
 <template>
-  <div>
-<!--    <el-card shadow="never">-->
-<!--      <el-skeleton :loading="loading" animated>-->
-<!--        <el-row :gutter="16" justify="space-between">-->
-<!--          <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">-->
-<!--            <div class="flex items-center">-->
-<!--              <el-avatar :src="avatar" :size="70" class="mr-16px">-->
-<!--                <img src="@/assets/imgs/avatar.gif" alt="" />-->
-<!--              </el-avatar>-->
-<!--              <div>-->
-<!--                <div class="text-20px">-->
-<!--                  {{ t('workplace.welcome') }} {{ username }} {{ t('workplace.happyDay') }}-->
-<!--                </div>-->
-<!--                <div class="mt-10px text-14px text-gray-500">-->
-<!--                  {{ t('workplace.toady') }}，20℃ - 32℃！-->
-<!--                </div>-->
-<!--              </div>-->
-<!--            </div>-->
-<!--          </el-col>-->
-<!--          <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">-->
-<!--            <div class="h-70px flex items-center justify-end lt-sm:mt-10px">-->
-<!--              <div class="px-8px text-right">-->
-<!--                <div class="mb-16px text-14px text-gray-400">{{ t('workplace.project') }}</div>-->
-<!--                <CountTo-->
-<!--                  class="text-20px"-->
-<!--                  :start-val="0"-->
-<!--                  :end-val="totalSate.project"-->
-<!--                  :duration="2600"-->
-<!--                />-->
-<!--              </div>-->
-<!--              <el-divider direction="vertical" />-->
-<!--              <div class="px-8px text-right">-->
-<!--                <div class="mb-16px text-14px text-gray-400">{{ t('workplace.toDo') }}</div>-->
-<!--                <CountTo-->
-<!--                  class="text-20px"-->
-<!--                  :start-val="0"-->
-<!--                  :end-val="totalSate.todo"-->
-<!--                  :duration="2600"-->
-<!--                />-->
-<!--              </div>-->
-<!--              <el-divider direction="vertical" border-style="dashed" />-->
-<!--              <div class="px-8px text-right">-->
-<!--                <div class="mb-16px text-14px text-gray-400">{{ t('workplace.access') }}</div>-->
-<!--                <CountTo-->
-<!--                  class="text-20px"-->
-<!--                  :start-val="0"-->
-<!--                  :end-val="totalSate.access"-->
-<!--                  :duration="2600"-->
-<!--                />-->
-<!--              </div>-->
-<!--            </div>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
-<!--      </el-skeleton>-->
-<!--    </el-card>-->
-  </div>
+  <el-row :gutter="8" justify="space-between">
+    <el-col  :xl="16" :lg="16" :md="24" :sm="24" :xs="24" class="mb-8px">
+      <el-card ref="taskInfoCard" shadow="never">
+        <template #header>任务信息</template>
+        <el-skeleton :loading="loading" animated>
+          <el-row :gutter="20" justify="space-between">
+            <el-col :xl="10" :lg="10" :md="24" :sm="24" :xs="24">
+              <el-card shadow="hover" class="mb-8px">
+                <el-skeleton :loading="loading" animated>
+                  <Echart :options="pieOptionsData" :height="280" />
+                </el-skeleton>
+              </el-card>
+            </el-col>
+            <el-col :xl="14" :lg="14" :md="24" :sm="24" :xs="24">
+              <el-card shadow="hover" class="mb-8px">
+                <el-skeleton :loading="loading" animated>
+                  <Echart :options="barOptionsData" :height="280" />
+                </el-skeleton>
+              </el-card>
+            </el-col>
+          </el-row>
+        </el-skeleton>
+      </el-card>
+    </el-col>
+    <el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24" class="mb-8px">
+      <el-card ref="taskNewCard" shadow="never" >
+        <template #header>
+            最新任务
+        </template>
+        <el-skeleton :loading="loading" animated>
+          <div v-for="(item, index) in tasks" :key="`dynamics-${index}`">
+            <div>
+              <div class="text-12px flex justify-between">
+                <span>{{ item.title }}</span>
+                <span class="mr-10">{{ item.user }}</span>
+                <span class="mr-10">{{ item.date }}</span>
+              </div>
 
-  <el-row class="mt-8px" :gutter="8" justify="space-between">
+            </div>
+            <el-divider height="10px" class="m-4 p-0" style="margin:8px 0" />
+          </div>
+        </el-skeleton>
+      </el-card>
+    </el-col>
+  </el-row>
+  <el-row :gutter="8">
     <el-col :xl="16" :lg="16" :md="24" :sm="24" :xs="24" class="mb-8px">
-<!--      <el-card shadow="never">-->
-<!--        <template #header>-->
-<!--          <div class="h-3 flex justify-between">-->
-<!--            <span>{{ t('workplace.project') }}</span>-->
-<!--            <el-link-->
-<!--              type="primary"-->
-<!--              :underline="false"-->
-<!--              href="https://github.com/yudaocode"-->
-<!--              target="_blank"-->
-<!--            >-->
-<!--              {{ t('action.more') }}-->
-<!--            </el-link>-->
-<!--          </div>-->
-<!--        </template>-->
-<!--        <el-skeleton :loading="loading" animated>-->
-<!--          <el-row>-->
-<!--            <el-col-->
-<!--              v-for="(item, index) in projects"-->
-<!--              :key="`card-${index}`"-->
-<!--              :xl="8"-->
-<!--              :lg="8"-->
-<!--              :md="8"-->
-<!--              :sm="24"-->
-<!--              :xs="24"-->
-<!--            >-->
-<!--              <el-card shadow="hover" class="mr-5px mt-5px">-->
-<!--                <div class="flex items-center">-->
-<!--                  <Icon :icon="item.icon" :size="25" class="mr-8px" />-->
-<!--                  <span class="text-16px">{{ item.name }}</span>-->
-<!--                </div>-->
-<!--                <div class="mt-12px text-9px text-gray-400">{{ t(item.message) }}</div>-->
-<!--                <div class="mt-12px flex justify-between text-12px text-gray-400">-->
-<!--                  <span>{{ item.personal }}</span>-->
-<!--                  <span>{{ formatTime(item.time, 'yyyy-MM-dd') }}</span>-->
-<!--                </div>-->
-<!--              </el-card>-->
-<!--            </el-col>-->
-<!--          </el-row>-->
-<!--        </el-skeleton>-->
-<!--      </el-card>-->
+      <el-card  shadow="never">
+        <template #header>企业信息</template>
+
+        <el-skeleton :loading="loading" animated>
+          <el-row :gutter="20" justify="space-between">
+            <el-col :xl="10" :lg="10" :md="24" :sm="24" :xs="24">
+              <el-card shadow="hover" class="mb-8px">
+                <el-skeleton :loading="loading" animated>
+                  <Echart :options="pieOptionsData" :height="280" />
+                </el-skeleton>
+              </el-card>
+            </el-col>
+            <el-col :xl="14" :lg="14" :md="24" :sm="24" :xs="24">
+              <el-card shadow="hover" class="mb-8px">
+                <el-skeleton :loading="loading" animated>
+                  <Echart :options="barOptionsData" :height="280" />
+                </el-skeleton>
+              </el-card>
+            </el-col>
+          </el-row>
+        </el-skeleton>
+      </el-card>
+    </el-col>
+    <el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24" class="mb-8px">
+
+      <el-card shadow="never">
+        <template #header>
+          <div class="h-3 flex justify-between">
+            <el-radio-group v-model="radio2" @change="rdiType">
+              <el-radio-button label="资质逾期" value="资质逾期" />
+              <el-radio-button label="整改次数" value="整改次数" />
+            </el-radio-group>
+          </div>
+        </template>
+        <el-skeleton :loading="loading" animated>
+          <div v-for="(item, index) in notice" :key="`dynamics-${index}`">
+            <div>
+              <div class="text-12px flex justify-between">
+                <span>{{ item.title }}</span>
+                <span class="mr-10">{{ item.days }}</span>
+              </div>
 
-<!--      <el-card shadow="never" class="mt-8px">-->
-<!--        <el-skeleton :loading="loading" animated>-->
-<!--          <el-row :gutter="20" justify="space-between">-->
-<!--            <el-col :xl="10" :lg="10" :md="24" :sm="24" :xs="24">-->
-<!--              <el-card shadow="hover" class="mb-8px">-->
-<!--                <el-skeleton :loading="loading" animated>-->
-<!--                  <Echart :options="pieOptionsData" :height="280" />-->
-<!--                </el-skeleton>-->
-<!--              </el-card>-->
-<!--            </el-col>-->
-<!--            <el-col :xl="14" :lg="14" :md="24" :sm="24" :xs="24">-->
-<!--              <el-card shadow="hover" class="mb-8px">-->
-<!--                <el-skeleton :loading="loading" animated>-->
-<!--                  <Echart :options="barOptionsData" :height="280" />-->
-<!--                </el-skeleton>-->
-<!--              </el-card>-->
-<!--            </el-col>-->
-<!--          </el-row>-->
-<!--        </el-skeleton>-->
-<!--      </el-card>-->
-<!--    </el-col>-->
-<!--    <el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24" class="mb-8px">-->
-<!--      <el-card shadow="never">-->
-<!--        <template #header>-->
-<!--          <div class="h-3 flex justify-between">-->
-<!--            <span>{{ t('workplace.shortcutOperation') }}</span>-->
-<!--          </div>-->
-<!--        </template>-->
-<!--        <el-skeleton :loading="loading" animated>-->
-<!--          <el-row>-->
-<!--            <el-col v-for="item in shortcut" :key="`team-${item.name}`" :span="8" class="mb-8px">-->
-<!--              <div class="flex items-center">-->
-<!--                <Icon :icon="item.icon" class="mr-8px" />-->
-<!--                <el-link type="default" :underline="false" @click="setWatermark(item.name)">-->
-<!--                  {{ item.name }}-->
-<!--                </el-link>-->
-<!--              </div>-->
-<!--            </el-col>-->
-<!--          </el-row>-->
-<!--        </el-skeleton>-->
-<!--      </el-card>-->
-<!--      <el-card shadow="never" class="mt-8px">-->
-<!--        <template #header>-->
-<!--          <div class="h-3 flex justify-between">-->
-<!--            <span>{{ t('workplace.notice') }}</span>-->
-<!--            <el-link type="primary" :underline="false">{{ t('action.more') }}</el-link>-->
-<!--          </div>-->
-<!--        </template>-->
-<!--        <el-skeleton :loading="loading" animated>-->
-<!--          <div v-for="(item, index) in notice" :key="`dynamics-${index}`">-->
-<!--            <div class="flex items-center">-->
-<!--              <el-avatar :src="avatar" :size="35" class="mr-16px">-->
-<!--                <img src="@/assets/imgs/avatar.gif" alt="" />-->
-<!--              </el-avatar>-->
-<!--              <div>-->
-<!--                <div class="text-14px">-->
-<!--                  <Highlight :keys="item.keys.map((v) => t(v))">-->
-<!--                    {{ item.type }} : {{ item.title }}-->
-<!--                  </Highlight>-->
-<!--                </div>-->
-<!--                <div class="mt-16px text-12px text-gray-400">-->
-<!--                  {{ formatTime(item.date, 'yyyy-MM-dd') }}-->
-<!--                </div>-->
-<!--              </div>-->
-<!--            </div>-->
-<!--            <el-divider />-->
-<!--          </div>-->
-<!--        </el-skeleton>-->
-<!--      </el-card>-->
+            </div>
+            <el-divider height="10px" class="m-4 p-0" style="margin:8px 0" />
+
+          </div>
+        </el-skeleton>
+      </el-card>
     </el-col>
   </el-row>
 </template>
 <script lang="ts" setup>
 import { set } from 'lodash-es'
 import { EChartsOption } from 'echarts'
-import { formatTime } from '@/utils'
-
 import { useUserStore } from '@/store/modules/user'
-import { useWatermark } from '@/hooks/web/useWatermark'
-import type { WorkplaceTotal, Project, Notice, Shortcut } from './types'
 import { pieOptions, barOptions } from './echarts-data'
 
 defineOptions({ name: 'Home' })
 
 const { t } = useI18n()
 const userStore = useUserStore()
-const { setWatermark } = useWatermark()
 const loading = ref(true)
-const avatar = userStore.getUser.avatar
-const username = userStore.getUser.nickname
 const pieOptionsData = reactive<EChartsOption>(pieOptions) as EChartsOption
-// 获取统计数
-let totalSate = reactive<WorkplaceTotal>({
-  project: 0,
-  access: 0,
-  todo: 0
-})
 
-const getCount = async () => {
-  const data = {
-    project: 40,
-    access: 2340,
-    todo: 10
-  }
-  totalSate = Object.assign(totalSate, data)
-}
+const radio2 = ref('资质逾期')
 
-// 获取项目数
-let projects = reactive<Project[]>([])
-const getProject = async () => {
-  const data = [
-    {
-      name: 'ruoyi-vue-pro',
-      icon: 'akar-icons:github-fill',
-      message: 'https://github.com/YunaiV/ruoyi-vue-pro',
-      personal: 'Spring Boot 单体架构',
-      time: new Date()
-    },
-    {
-      name: 'yudao-ui-admin-vue3',
-      icon: 'logos:vue',
-      message: 'https://github.com/yudaocode/yudao-ui-admin-vue3',
-      personal: 'Vue3 + element-plus',
-      time: new Date()
-    },
-    {
-      name: 'yudao-ui-admin-vben',
-      icon: 'logos:vue',
-      message: 'https://github.com/yudaocode/yudao-ui-admin-vben',
-      personal: 'Vue3 + vben(antd)',
-      time: new Date()
-    },
-    {
-      name: 'yudao-cloud',
-      icon: 'akar-icons:github',
-      message: 'https://github.com/YunaiV/yudao-cloud',
-      personal: 'Spring Cloud 微服务架构',
-      time: new Date()
-    },
-    {
-      name: 'yudao-ui-mall-uniapp',
-      icon: 'logos:vue',
-      message: 'https://github.com/yudaocode/yudao-ui-admin-uniapp',
-      personal: 'Vue3 + uniapp',
-      time: new Date()
-    },
-    {
-      name: 'yudao-ui-admin-vue2',
-      icon: 'logos:vue',
-      message: 'https://github.com/yudaocode/yudao-ui-admin-vue2',
-      personal: 'Vue2 + element-ui',
-      time: new Date()
-    }
-  ]
-  projects = Object.assign(projects, data)
-}
+// 监听两个卡片高度变化并保持同步
+const taskInfoCard = ref()
+const taskNewCard = ref()
 
-// 获取通知公告
-let notice = reactive<Notice[]>([])
-const getNotice = async () => {
-  const data = [
-    {
-      title: '系统支持 JDK 8/17/21，Vue 2/3',
-      type: '通知',
-      keys: ['通知', '8', '17', '21', '2', '3'],
-      date: new Date()
-    },
-    {
-      title: '后端提供 Spring Boot 2.7/3.2 + Cloud 双架构',
-      type: '公告',
-      keys: ['公告', 'Boot', 'Cloud'],
-      date: new Date()
-    },
-    {
-      title: '全部开源，个人与企业可 100% 直接使用，无需授权',
-      type: '通知',
-      keys: ['通知', '无需授权'],
-      date: new Date()
-    },
-    {
-      title: '国内使用最广泛的快速开发平台，超 300+ 人贡献',
-      type: '公告',
-      keys: ['公告', '最广泛'],
-      date: new Date()
+// 使用ResizeObserver监听高度变化
+onMounted(() => {
+  const resizeObserver = new ResizeObserver((entries) => {
+    for (const entry of entries) {
+      const height = entry.contentRect.height
+      // 如果是taskInfoCard变化，则更新taskNewCard高度
+      if (entry.target === taskInfoCard.value.$el) {
+        taskNewCard.value.$el.style.height = height + 'px'
+      }   
     }
-  ]
-  notice = Object.assign(notice, data)
-}
+  })
 
-// 获取快捷入口
-let shortcut = reactive<Shortcut[]>([])
+  // 观察两个卡片元素
+  resizeObserver.observe(taskInfoCard.value.$el)
+  resizeObserver.observe(taskNewCard.value.$el)
+  rdiType(radio2.value)
+  // 组件卸载时停止观察
+  onUnmounted(() => {
+    resizeObserver.disconnect()
+  })
+})
 
-const getShortcut = async () => {
-  const data = [
-    {
-      name: 'Github',
-      icon: 'akar-icons:github-fill',
-      url: 'github.io'
-    },
-    {
-      name: 'Vue',
-      icon: 'logos:vue',
-      url: 'vuejs.org'
-    },
-    {
-      name: 'Vite',
-      icon: 'vscode-icons:file-type-vite',
-      url: 'https://vitejs.dev/'
-    },
-    {
-      name: 'Angular',
-      icon: 'logos:angular-icon',
-      url: 'github.io'
-    },
-    {
-      name: 'React',
-      icon: 'logos:react',
-      url: 'github.io'
-    },
-    {
-      name: 'Webpack',
-      icon: 'logos:webpack',
-      url: 'github.io'
-    }
-  ]
-  shortcut = Object.assign(shortcut, data)
+
+const tasks = reactive<any>([
+  {
+    title: '义县一公司环保信息',
+    date: '2023-01-01',
+    user: '张三',
+    status: 1
+  },
+  {
+    title: '锦州二公司安全检查',
+    date: '2023-01-02',
+    user: '李四',
+    status: 2
+  },
+  {
+    title: '北镇三公司环评整改',
+    date: '2023-01-03',
+    user: '王五',
+    status: 1
+  },
+  {
+    title: '凌海四公司排污监测',
+    date: '2023-01-04',
+    user: '赵六',
+    status: 3
+  },
+  {
+    title: '黑山五公司设备巡检',
+    date: '2023-01-05',
+    user: '孙七',
+    status: 2
+  },
+  {
+    title: '义县六公司安全培训',
+    date: '2023-01-06',
+    user: '周八',
+    status: 1
+  },
+  {
+    title: '大石桥七公司隐患排查',
+    date: '2023-01-07',
+    user: '吴九',
+    status: 3
+  },
+  {
+    title: '盘锦八公司应急演练',
+    date: '2023-01-08',
+    user: '郑十',
+    status: 2
+  },
+  {
+    title: '营口九公司废水处理',
+    date: '2023-01-09',
+    user: '钱十一',
+    status: 1
+  },
+  {
+    title: '阜新十公司空气监测',
+    date: '2023-01-10',
+    user: '刘十二',
+    status: 2
+  }
+
+])
+
+const notice2 = reactive<any>([
+  {
+    type: '资质逾期',
+    title: '义县一公司环保信息',
+    date: '2023-01-01 12:00:00',
+    days: '逾期1天'
+  },
+  {
+    type: '整改次数',
+    title: '义县一公司环保信息',
+    date: '2023-01-01 12:00:00',
+    days: '整改1次'
+  },
+  {
+    type: '资质逾期',
+    title: '义县一公司环保信息',
+    date: '2023-01-01 12:00:00',
+    days: '逾期1天'
+  },
+  {
+    type: '整改次数',
+    title: '义县一公司环保信息',
+    date: '2023-01-01 12:00:00',
+    days: '整改1次'
+  },
+  {
+    type: '资质逾期',
+    title: '义县一公司环保信息',
+    date: '2023-01-01 12:00:00',
+    days: '逾期1天'
+  },
+  {
+    type: '整改次数',
+    title: '义县一公司环保信息',
+    date: '2023-01-01 12:00:00',
+    days: '整改1次'
+  },
+  {
+    type: '资质逾期',
+    title: '锦州二公司安全检查',
+    date: '2023-01-02 12:00:00',
+    days: '逾期2天'
+  },
+  {
+    type: '整改次数',
+    title: '锦州二公司安全检查',
+    date: '2023-01-02 12:00:00',
+    days: '整改2次'
+  },
+  {
+    type: '资质逾期',
+    title: '北镇三公司环评整改',
+    date: '2023-01-03 12:00:00',
+    days: '逾期3天'
+  },
+  {
+    type: '整改次数',
+    title: '北镇三公司环评整改',
+    date: '2023-01-03 12:00:00',
+    days: '整改3次'
+  },
+  {
+    type: '资质逾期',
+    title: '凌海四公司排污监测',
+    date: '2023-01-04 12:00:00',
+    days: '逾期4天'
+  },
+  {
+    type: '整改次数',
+    title: '凌海四公司排污监测',
+    date: '2023-01-04 12:00:00',
+    days: '整改4次'
+  },
+  {
+    type: '资质逾期',
+    title: '黑山五公司设备巡检',
+    date: '2023-01-05 12:00:00',
+    days: '逾期5天'
+  },
+  {
+    type: '整改次数',
+    title: '黑山五公司设备巡检',
+    date: '2023-01-05 12:00:00',
+    days: '整改5次'
+  },
+  {
+    type: '资质逾期',
+    title: '义县六公司安全培训',
+    date: '2023-01-06 12:00:00',
+    days: '逾期6天'
+  },
+  {
+    type: '整改次数',
+    title: '义县六公司安全培训',
+    date: '2023-01-06 12:00:00',
+    days: '整改6次'
+  },
+  {
+    type: '资质逾期',
+    title: '大石桥七公司隐患排查',
+    date: '2023-01-07 12:00:00',
+    days: '逾期7天'
+  },
+  {
+    type: '整改次数',
+    title: '大石桥七公司隐患排查',
+    date: '2023-01-07 12:00:00',
+    days: '整改7次'
+  },
+  {
+    type: '资质逾期',
+    title: '盘锦八公司应急演练',
+    date: '2023-01-08 12:00:00',
+    days: '逾期8天'
+  },
+  {
+    type: '整改次数',
+    title: '盘锦八公司应急演练',
+    date: '2023-01-08 12:00:00',
+    days: '整改8次'
+  }
+])
+const notice = ref([])
+
+const rdiType = (val: any) => {
+  //根据notice2的type和radio2的值进行过滤
+  if (val === '资质逾期') {
+    notice.value = notice2.filter((v: any) => v.type === '资质逾期')
+  } else {
+    notice.value = notice2.filter((v: any) => v.type === '整改次数')
+  }
 }
 
 // 用户来源
 const getUserAccessSource = async () => {
   const data = [
-    { value: 335, name: 'analysis.directAccess' },
-    { value: 310, name: 'analysis.mailMarketing' },
-    { value: 234, name: 'analysis.allianceAdvertising' },
-    { value: 135, name: 'analysis.videoAdvertising' },
-    { value: 1548, name: 'analysis.searchEngines' }
+    { value: 335, name: '执法一队' },
+    { value: 310, name: '执法二队' },
+    { value: 234, name: '执法三队' },
+    { value: 135, name: '执法四队' },
+    { value: 1548, name: '执法五队' }
   ]
   set(
     pieOptionsData,
@@ -353,13 +362,13 @@ const barOptionsData = reactive<EChartsOption>(barOptions) as EChartsOption
 // 周活跃量
 const getWeeklyUserActivity = async () => {
   const data = [
-    { value: 13253, name: 'analysis.monday' },
-    { value: 34235, name: 'analysis.tuesday' },
-    { value: 26321, name: 'analysis.wednesday' },
-    { value: 12340, name: 'analysis.thursday' },
-    { value: 24643, name: 'analysis.friday' },
-    { value: 1322, name: 'analysis.saturday' },
-    { value: 1324, name: 'analysis.sunday' }
+    { value: 325, name: '一月' },
+    { value: 423, name: '二月' },
+    { value: 632, name: '三月' },
+    { value: 234, name: '四月' },
+    { value: 464, name: '五月' },
+    { value: 322, name: '六月' },
+    { value: 324, name: '七月' }
   ]
   set(
     barOptionsData,
@@ -368,7 +377,7 @@ const getWeeklyUserActivity = async () => {
   )
   set(barOptionsData, 'series', [
     {
-      name: t('analysis.activeQuantity'),
+      name: '任务数',
       data: data.map((v) => v.value),
       type: 'bar'
     }
@@ -377,10 +386,6 @@ const getWeeklyUserActivity = async () => {
 
 const getAllApi = async () => {
   await Promise.all([
-    getCount(),
-    getProject(),
-    getNotice(),
-    getShortcut(),
     getUserAccessSource(),
     getWeeklyUserActivity()
   ])
diff --git a/src/views/Home/echarts-data.ts b/src/views/Home/echarts-data.ts
index 56093f4..b0db931 100644
--- a/src/views/Home/echarts-data.ts
+++ b/src/views/Home/echarts-data.ts
@@ -2,107 +2,51 @@ import { EChartsOption } from 'echarts'
 
 const { t } = useI18n()
 
-export const lineOptions: EChartsOption = {
-  title: {
-    text: t('analysis.monthlySales'),
-    left: 'center'
-  },
-  xAxis: {
-    data: [
-      t('analysis.january'),
-      t('analysis.february'),
-      t('analysis.march'),
-      t('analysis.april'),
-      t('analysis.may'),
-      t('analysis.june'),
-      t('analysis.july'),
-      t('analysis.august'),
-      t('analysis.september'),
-      t('analysis.october'),
-      t('analysis.november'),
-      t('analysis.december')
-    ],
-    boundaryGap: false,
-    axisTick: {
-      show: false
-    }
-  },
-  grid: {
-    left: 20,
-    right: 20,
-    bottom: 20,
-    top: 80,
-    containLabel: true
-  },
-  tooltip: {
-    trigger: 'axis',
-    axisPointer: {
-      type: 'cross'
-    },
-    padding: [5, 10]
-  },
-  yAxis: {
-    axisTick: {
-      show: false
-    }
-  },
-  legend: {
-    data: [t('analysis.estimate'), t('analysis.actual')],
-    top: 50
-  },
-  series: [
-    {
-      name: t('analysis.estimate'),
-      smooth: true,
-      type: 'line',
-      data: [100, 120, 161, 134, 105, 160, 165, 114, 163, 185, 118, 123],
-      animationDuration: 2800,
-      animationEasing: 'cubicInOut'
-    },
-    {
-      name: t('analysis.actual'),
-      smooth: true,
-      type: 'line',
-      itemStyle: {},
-      data: [120, 82, 91, 154, 162, 140, 145, 250, 134, 56, 99, 123],
-      animationDuration: 2800,
-      animationEasing: 'quadraticOut'
-    }
-  ]
-}
 
 export const pieOptions: EChartsOption = {
   title: {
-    text: t('analysis.userAccessSource'),
-    left: 'center'
+    text: '完成率90%',
+    left: 'center',
+    top: '35%',
+    textStyle: {
+      fontSize: 16,
+      fontWeight: 'bold'
+    }
   },
   tooltip: {
     trigger: 'item',
     formatter: '{a} <br/>{b} : {c} ({d}%)'
   },
   legend: {
-    orient: 'vertical',
-    left: 'left',
+    orient: 'horizontal',
+    bottom: 10,
+    left: 'center',
+
     data: [
-      t('analysis.directAccess'),
-      t('analysis.mailMarketing'),
-      t('analysis.allianceAdvertising'),
-      t('analysis.videoAdvertising'),
-      t('analysis.searchEngines')
+      '执法一队',
+      '执法二队',
+      '执法三队',
+      '执法四队',
+      '执法五队',
     ]
   },
   series: [
     {
       name: t('analysis.userAccessSource'),
       type: 'pie',
-      radius: '55%',
-      center: ['50%', '60%'],
+      radius: ['40%', '70%'],
+      center: ['50%', '40%'],
+      itemStyle: {
+        borderRadius: 10,
+        borderColor: '#fff',
+        borderWidth: 2
+      },
       data: [
-        { value: 335, name: t('analysis.directAccess') },
-        { value: 310, name: t('analysis.mailMarketing') },
-        { value: 234, name: t('analysis.allianceAdvertising') },
-        { value: 135, name: t('analysis.videoAdvertising') },
-        { value: 1548, name: t('analysis.searchEngines') }
+        { value: 335, name: '执法一队' },
+        { value: 310, name: '执法二队' },
+        { value: 234, name:'执法三队' },
+        { value: 135, name: '执法四队' },
+        { value: 1548, name: '执法五队' }
       ]
     }
   ]
@@ -110,7 +54,7 @@ export const pieOptions: EChartsOption = {
 
 export const barOptions: EChartsOption = {
   title: {
-    text: t('analysis.weeklyUserActivity'),
+    text: '月均执法任务数',
     left: 'center'
   },
   tooltip: {
@@ -127,13 +71,13 @@ export const barOptions: EChartsOption = {
   xAxis: {
     type: 'category',
     data: [
-      t('analysis.monday'),
-      t('analysis.tuesday'),
-      t('analysis.wednesday'),
-      t('analysis.thursday'),
-      t('analysis.friday'),
-      t('analysis.saturday'),
-      t('analysis.sunday')
+      '一月',
+      '二月',
+      '三月',
+      '四月',
+      '五月',
+      '六月',
+
     ],
     axisTick: {
       alignWithLabel: true
@@ -151,158 +95,4 @@ export const barOptions: EChartsOption = {
   ]
 }
 
-export const radarOption: EChartsOption = {
-  legend: {
-    data: [t('workplace.personal'), t('workplace.team')]
-  },
-  radar: {
-    // shape: 'circle',
-    indicator: [
-      { name: t('workplace.quote'), max: 65 },
-      { name: t('workplace.contribution'), max: 160 },
-      { name: t('workplace.hot'), max: 300 },
-      { name: t('workplace.yield'), max: 130 },
-      { name: t('workplace.follow'), max: 100 }
-    ]
-  },
-  series: [
-    {
-      name: `xxx${t('workplace.index')}`,
-      type: 'radar',
-      data: [
-        {
-          value: [42, 30, 20, 35, 80],
-          name: t('workplace.personal')
-        },
-        {
-          value: [50, 140, 290, 100, 90],
-          name: t('workplace.team')
-        }
-      ]
-    }
-  ]
-}
 
-export const wordOptions = {
-  series: [
-    {
-      type: 'wordCloud',
-      gridSize: 2,
-      sizeRange: [12, 50],
-      rotationRange: [-90, 90],
-      shape: 'pentagon',
-      width: 600,
-      height: 400,
-      drawOutOfBound: true,
-      textStyle: {
-        color: function () {
-          return (
-            'rgb(' +
-            [
-              Math.round(Math.random() * 160),
-              Math.round(Math.random() * 160),
-              Math.round(Math.random() * 160)
-            ].join(',') +
-            ')'
-          )
-        }
-      },
-      emphasis: {
-        textStyle: {
-          shadowBlur: 10,
-          shadowColor: '#333'
-        }
-      },
-      data: [
-        {
-          name: 'Sam S Club',
-          value: 10000,
-          textStyle: {
-            color: 'black'
-          },
-          emphasis: {
-            textStyle: {
-              color: 'red'
-            }
-          }
-        },
-        {
-          name: 'Macys',
-          value: 6181
-        },
-        {
-          name: 'Amy Schumer',
-          value: 4386
-        },
-        {
-          name: 'Jurassic World',
-          value: 4055
-        },
-        {
-          name: 'Charter Communications',
-          value: 2467
-        },
-        {
-          name: 'Chick Fil A',
-          value: 2244
-        },
-        {
-          name: 'Planet Fitness',
-          value: 1898
-        },
-        {
-          name: 'Pitch Perfect',
-          value: 1484
-        },
-        {
-          name: 'Express',
-          value: 1112
-        },
-        {
-          name: 'Home',
-          value: 965
-        },
-        {
-          name: 'Johnny Depp',
-          value: 847
-        },
-        {
-          name: 'Lena Dunham',
-          value: 582
-        },
-        {
-          name: 'Lewis Hamilton',
-          value: 555
-        },
-        {
-          name: 'KXAN',
-          value: 550
-        },
-        {
-          name: 'Mary Ellen Mark',
-          value: 462
-        },
-        {
-          name: 'Farrah Abraham',
-          value: 366
-        },
-        {
-          name: 'Rita Ora',
-          value: 360
-        },
-        {
-          name: 'Serena Williams',
-          value: 282
-        },
-        {
-          name: 'NCAA baseball tournament',
-          value: 273
-        },
-        {
-          name: 'Point Break',
-          value: 265
-        }
-      ]
-    }
-  ]
-}
diff --git a/src/views/Home/types.ts b/src/views/Home/types.ts
index e6313d3..6ab1622 100644
--- a/src/views/Home/types.ts
+++ b/src/views/Home/types.ts
@@ -12,12 +12,7 @@ export type Project = {
   time: Date | number | string
 }
 
-export type Notice = {
-  title: string
-  type: string
-  keys: string[]
-  date: Date | number | string
-}
+
 
 export type Shortcut = {
   name: string
diff --git a/src/views/system/policy/index.vue b/src/views/system/policy/index.vue
index 174faa1..ea839d4 100644
--- a/src/views/system/policy/index.vue
+++ b/src/views/system/policy/index.vue
@@ -55,7 +55,7 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="id" align="center" prop="id" />
+      <!-- <el-table-column label="id" align="center" prop="id" /> -->
       <el-table-column label="名称" align="center" prop="name" />
       <el-table-column
         label="创建时间"