Merge remote-tracking branch 'origin/master'

src/api/enterprises/index.ts

@@ -37,12 +37,12 @@ export const EnterprisesApi = {
     return await request.post({ url: `/system/enterprise/create`, data })
   },
   // PC新增企业
-  pccreateEnterprises: async (data: EnterprisesVO) => {
+  pccreateEnterprises: async (data: any) => {
     return await request.post({ url: `/system/enterprise/pccreate`, data })
   },
 
   // 修改企业
-  updateEnterprises: async (data: EnterprisesVO) => {
+  updateEnterprises: async (data: any) => {
     return await request.put({ url: `/system/enterprise/update`, data })
   },
 
@@ -55,4 +55,10 @@ export const EnterprisesApi = {
   exportEnterprises: async (params) => {
     return await request.download({ url: `/system/enterprise/export-excel`, params })
   },
+
+  // 标签查询
+  tagList: async (params) => {
+    return await request.get({ url: `"/system/system/tag-library/list`, params })
+  },
+
 }

src/api/system/policy/index.ts

@@ -0,0 +1,41 @@
+import request from '@/config/axios'
+
+// 政策法规 VO
+export interface PolicyVO {
+  id: number // id
+  name: string // 名称
+  context: string // 内容
+}
+
+// 政策法规 API
+export const PolicyApi = {
+  // 查询政策法规分页
+  getPolicyPage: async (params: any) => {
+    return await request.get({ url: `/system/policy/page`, params })
+  },
+
+  // 查询政策法规详情
+  getPolicy: async (id: number) => {
+    return await request.get({ url: `/system/policy/get?id=` + id })
+  },
+
+  // 新增政策法规
+  createPolicy: async (data: PolicyVO) => {
+    return await request.post({ url: `/system/policy/create`, data })
+  },
+
+  // 修改政策法规
+  updatePolicy: async (data: PolicyVO) => {
+    return await request.put({ url: `/system/policy/update`, data })
+  },
+
+  // 删除政策法规
+  deletePolicy: async (id: number) => {
+    return await request.delete({ url: `/system/policy/delete?id=` + id })
+  },
+
+  // 导出政策法规 Excel
+  exportPolicy: async (params) => {
+    return await request.download({ url: `/system/policy/export-excel`, params })
+  },
+}

src/api/system/user/index.ts

@@ -94,6 +94,11 @@ export const getSimpleUserZGList = (): Promise<UserVO[]> => {
   return request.get({ url: '/system/user/simple-zg-list' })
 } 
 
+// 通过用户类型获取用户列表
+export const getSimpleUserListByUserType = (params:number) => {
+  return request.get({ url: '/system/user/simple-user-by-userType?type='+ params })
+} 
+
 /**
  * 查询审核列表
  */

src/components/Editor/src/Editor.vue

@@ -27,7 +27,8 @@ const props = defineProps({
     default: () => undefined
   },
   readonly: propTypes.bool.def(false),
-  modelValue: propTypes.string.def('')
+  modelValue: propTypes.string.def(''),
+  showToolbar: propTypes.bool.def(true)
 })
 
 const emit = defineEmits(['change', 'update:modelValue'])
@@ -66,6 +67,7 @@ const editorConfig = computed((): IEditorConfig => {
     {
       placeholder: '请输入内容...',
       readOnly: props.readonly,
+
       customAlert: (s: string, t: string) => {
         switch (t) {
           case 'success':
@@ -87,7 +89,9 @@ const editorConfig = computed((): IEditorConfig => {
       },
       autoFocus: false,
       scroll: true,
+    
       MENU_CONF: {
+
         ['uploadImage']: {
           server: getUploadUrl(),
           // 单个文件的最大体积限制，默认为 2M
@@ -133,7 +137,7 @@ const editorConfig = computed((): IEditorConfig => {
           },
           // 自定义插入图片
           customInsert(res: any, insertFn: InsertFnType) {
-            insertFn(res.data, 'image', res.data)
+            insertFn(res.data.url, 'image', res.data.url)
           }
         },
         ['uploadVideo']: {
@@ -181,7 +185,7 @@ const editorConfig = computed((): IEditorConfig => {
           },
           // 自定义插入图片
           customInsert(res: any, insertFn: InsertFnType) {
-            insertFn(res.data, 'mp4', res.data)
+            insertFn(res.data.url, 'mp4', res.data.url)
           }
         }
       },
@@ -210,6 +214,10 @@ onBeforeUnmount(() => {
   editor?.destroy()
 })
 
+const getShowToolbar = computed(() => {
+  return Boolean(props.showToolbar)
+})
+
 const getEditorRef = async (): Promise<IDomEditor> => {
   await nextTick()
   return unref(editorRef.value) as IDomEditor
@@ -221,9 +229,10 @@ defineExpose({
 </script>
 
 <template>
-  <div class="border-1 border-solid border-[var(--tags-view-border-color)] z-10">
+  <div class="border-0 border-solid border-[var(--tags-view-border-color)] z-10">
     <!-- 工具栏 -->
     <Toolbar
+      v-if="getShowToolbar"
       :editor="editorRef"
       :editorId="editorId"
       class="border-0 b-b-1 border-solid border-[var(--tags-view-border-color)]"

src/components/UploadFile/src/UploadImgs.vue

@@ -140,7 +140,6 @@ watch(
       fileList.value = [] // fix：处理掉缓存，表单重置后上传组件的内容并没有重置
       return
     }
-
     fileList.value = [] // 保障数据为空
     fileList.value.push(...val)
   },

src/layout/Layout.vue

@@ -65,6 +65,7 @@ export default defineComponent({
 })
 </script>
 
+
 <style lang="scss" scoped>
 $prefix-cls: #{$namespace}-layout;
 

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>

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>
 

src/permission.ts

@@ -52,7 +52,8 @@ const whiteList = [
   '/auth-redirect',
   '/bind',
   '/register',
-  '/oauthLogin/gitee'
+  '/oauthLogin/gitee',
+  '/policyDetail'
 ]
 
 // 路由加载前

src/router/index.ts

@@ -2,6 +2,7 @@ import type { App } from 'vue'
 import type { RouteRecordRaw } from 'vue-router'
 import { createRouter, createWebHistory } from 'vue-router'
 import remainingRouter from './modules/remaining'
+import { Console } from 'console'
 
 // 创建路由实例
 const router = createRouter({
@@ -12,7 +13,7 @@ const router = createRouter({
 })
 
 export const resetRouter = (): void => {
-  const resetWhiteNameList = ['Redirect', 'Login', 'NoFind', 'Root']
+  const resetWhiteNameList = ['Redirect', 'Login', 'NoFind', 'Root','PolicyDetail']
   router.getRoutes().forEach((route) => {
     const { name } = route
     if (name && !resetWhiteNameList.includes(name as string)) {

src/router/modules/remaining.ts

@@ -183,6 +183,16 @@ const remainingRouter: AppRouteRecordRaw[] = [
       noTagsView: true
     }
   },
+{
+  path: '/policyDetail',
+  component: () => import('@/views/system/policy/policyView.vue'),
+  name: 'PolicyDetail',
+  meta: {
+    noCache: true,
+    hidden: true,
+    title: '策略详情'
+  }
+  },
   {
     path: '/sso',
     component: () => import('@/views/Login/Login.vue'),

src/views/Home/Index.vue

@@ -1,340 +1,320 @@
 <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="8" :lg="8" :md="24" :sm="24" :xs="24" :height="280">
+      <el-card shadow="hover" class="mb-8px">
+        <template #header>
+          任务分布
+        </template>
+        <el-skeleton :loading="loading" animated>
+          <Echart :options="pieOptionsData" :height="280" />
+        </el-skeleton>
+      </el-card>
+    </el-col>
+
+    <el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24">
+      <el-card shadow="hover" class="mb-8px">
+        <template #header>
+          周期任务
+        </template>
+        <el-skeleton :loading="loading" animated>
+          <Echart :options="barOptionsData" :height="280" />
+        </el-skeleton>
+      </el-card>
+    </el-col>
+    <el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24">
+   
+      <el-card shadow="hover" class="mb-8px">
+        <template #header>
+          月任务概况
+        </template>
+        <el-skeleton :loading="loading" animated>
+          <Echart :options="barOptionsData" :height="280" />
+        </el-skeleton>
+      </el-card>
+    </el-col>
+  </el-row>
+  <el-row :gutter="8" justify="space-between">
+    <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>
+
+            </div>
+            <el-divider height="10px" class="m-4 p-0" style="margin:8px 0" />
+          </div>
+        </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>
+          逾期情况
+        </template>
+        <el-skeleton :loading="loading" animated>
+          <div v-for="(item, index) in notice2" :key="`dynamics-${index}`">
+            <template v-if="item.type === '资质逾期'">
+              <div>
+                <div class="text-12px flex justify-between">
+                  <span>{{ item.title }}</span>
+                  <span class="mr-10">{{ item.days }}</span>
+                </div>
+
+              </div>
+              <el-divider height="10px" class="m-4 p-0" style="margin:8px 0" />
+          </template>
+          </div>
+        </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>
+          整改次数
+        </template>
+        <el-skeleton :loading="loading" animated>
+          <div v-for="(item, index) in notice2" :key="`dynamics-${index}`">
+            <template v-if="item.type === '整改次数'">
 
-  <el-row class="mt-8px" :gutter="8" justify="space-between">
-    <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>-->
+            <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" />
+            </template>
+          </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 taskNewCard = ref()
+
+// 使用ResizeObserver监听高度变化
+onMounted(() => {
 })
 
-const getCount = async () => {
-  const data = {
-    project: 40,
-    access: 2340,
-    todo: 10
-  }
-  totalSate = Object.assign(totalSate, data)
-}
 
-// 获取项目数
-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 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
+  }
 
-// 获取通知公告
-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()
-    }
-  ]
-  notice = Object.assign(notice, data)
-}
+])
 
-// 获取快捷入口
-let shortcut = reactive<Shortcut[]>([])
+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 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 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 +333,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 +348,7 @@ const getWeeklyUserActivity = async () => {
   )
   set(barOptionsData, 'series', [
     {
-      name: t('analysis.activeQuantity'),
+      name: '任务数',
       data: data.map((v) => v.value),
       type: 'bar'
     }
@@ -377,10 +357,6 @@ const getWeeklyUserActivity = async () => {
 
 const getAllApi = async () => {
   await Promise.all([
-    getCount(),
-    getProject(),
-    getNotice(),
-    getShortcut(),
     getUserAccessSource(),
     getWeeklyUserActivity()
   ])

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
-        }
-      ]
-    }
-  ]
-}

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

src/views/enterpriseinspections/index.vue

@@ -69,9 +69,7 @@
        :data="list" 
        :stripe="true"
       :show-overflow-tooltip="true"
-      @selection-change="handleSelectionChange"
       >
-      <el-table-column type="selection" width="55" />
 
       <!-- <el-table-column label="检查记录ID，主键" align="center" prop="id" /> -->
       <el-table-column label="企业名称" align="center" prop="enterpriseName" />
@@ -161,8 +159,6 @@ const getList = async () => {
   try {
     const data = await EnterpriseInspectionsApi.getEnterpriseInspectionsPage(queryParams)
 
- 
-
     list.value = data.list
     total.value = data.total
   } finally {
@@ -226,4 +222,4 @@ const handleExport = async () => {
 onMounted(() => {
   getList()
 })
-</script>
+</script>

src/views/enterprises/index.vue

@@ -94,8 +94,6 @@
           />
         </el-select>
       </el-form-item>
-
-
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -191,6 +189,7 @@
     />
   </ContentWrap>
 
+
   <!-- 表单弹窗：添加/修改 -->
 
 </template>

src/views/enterprises/update.vue

@@ -12,7 +12,7 @@
         <el-form-item label="企业名称" prop="enterprisesName">
           <el-input v-model="formData.enterprisesName" placeholder="请输入企业名称" />
         </el-form-item>
-        <el-form-item label="企业类型" prop="type">
+        <el-form-item label="企业类型标签" prop="type">
           <el-select v-model="formData.type" placeholder="请选择企业类型">
             <el-option
               v-for="dict in getStrDictOptions(DICT_TYPE.ENTERPRISES_TYPE)"
@@ -41,7 +41,21 @@
             </section>
           </section>
         </el-form-item>
-
+        <el-form-item label="企业关联微信用户" prop="address">
+          <el-select
+            v-model="formData.enterpriseUserId"
+            filterable
+            placeholder="Select"
+            style="width: 240px"
+          >
+            <el-option
+              v-for="item in enterpriseUserList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="企业地址" prop="address">
           <el-input v-model="formData.address" type="textarea" placeholder="请输入企业地址" />
         </el-form-item>
@@ -60,26 +74,17 @@
         <el-form-item label="企业介绍" prop="introduction">
           <el-input v-model="formData.introduction" type="textarea" placeholder="请输入企业介绍" />
         </el-form-item>
-        <el-form-item label="企业照片" prop="size">
-          <InnerUploadImg
-            :uploadList="uploadList"
-            @handler-success="uploadSuccess"
-            ref="uploadRef"
-            @handler-remove="uploadRemove"
-          />
+        <el-form-item label="企业照片" prop="fileIds">
+          <UploadImgs v-model="formData.fileIds" :limit="3" height="100px" width="100px" />
         </el-form-item>
 
-
-        <el-form-item label="企业资质照片" prop="size">
-          <InnerUploadImg
-            :uploadList="uploadList"
-            @handler-success="uploadSuccess"
-            ref="uploadRef"
-            @handler-remove="uploadRemove"
-          />
+        <el-form-item label="企业资质" prop="fileIds">
+          <UploadImgs v-model="formData.fileIds" :limit="3" height="100px" width="100px" />
         </el-form-item>
 
 
+
+
         <el-form-item label="企业成立时间" prop="establishmentDate">
           <el-date-picker
             v-model="formData.establishmentDate"
@@ -120,7 +125,6 @@
             <el-button type="primary" @click="showMap = false">确定</el-button>
           </template>
         </el-dialog>
-
         <el-form-item label="签到半径" prop="gpsLocation">
           <el-input
             v-model="formData.signRadius"
@@ -135,26 +139,98 @@
     </section>
     <SelectUser ref="selectUserRef" @select-user="echoUser" />
   </ContentWrap>
+
+  <ContentWrap title="资质记录" v-if="formType === 'update'">
+    <el-table v-loading="loading" :data="qualificationlist" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="资质编号" align="center" fixed="left" prop="enterpriseAuth" />
+      <el-table-column label="资质名称" align="center" fixed="left" prop="qualificationName" />
+      <el-table-column label="资质描述" align="center" fixed="left" prop="qualificationDescription" />
+      <el-table-column
+        label="资质到期日期"
+        align="center"
+        prop="expiryDate"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+    </el-table>
+  </ContentWrap>
+
+  <ContentWrap title="执法记录" v-if="formType === 'update'">
+    <div class="demo-collapse">
+      <el-collapse v-model="activeNames" @change="handleChange">
+        <el-collapse-item
+          v-for="item in inspectionslist"
+          :key="item.taskId"
+          :name="item.taskName" @click="getInspectionsLogList(item.id)">
+          <template #title>
+            <div class="custom-title">
+             任务编号： {{item.taskName}}
+            </div>
+            <div class="custom-title">
+              任务名称： {{item.taskName}}
+            </div>
+            <div class="custom-title">
+              计划开始时间： {{formatDate(item.taskStartTime)}}
+            </div>
+            <div class="custom-title">
+              计划结束时间： {{formatDate(item.taskEndTime)}}
+            </div>
+          </template>
+          <el-table v-loading="loading" :data="inspectionsLogList" :stripe="true" :show-overflow-tooltip="true">
+            <el-table-column label="执法人员" align="center"  prop="inspectName" />
+            <el-table-column label="协同执法" align="center"  prop="cooperateWithName" />
+            <el-table-column label="进度状态" align="center" prop="status">
+              <template #default="scope">
+                <dict-tag :type="DICT_TYPE.INSPECTIONS_STATUS" :value="scope.row.status"   />
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="执法时间"
+              align="center"
+              prop="createTime"
+              :formatter="dateFormatter"
+              width="180px"
+            />
+          </el-table>
+        </el-collapse-item>
+      </el-collapse>
+    </div>
+  </ContentWrap>
+
 </template>
 <script setup lang="ts">
 import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
 import { EnterprisesApi, EnterprisesVO } from '@/api/enterprises'
-import { FileInfoApi } from '@/api/enterprises/fileinfo'
+import { EnterpriseQualificationApi, EnterpriseQualificationVO } from '@/api/qualification'
+import { UserVO, getSimpleUserListByUserType } from '@/api/system/user'
+
+import { EnterpriseInspectionsApi, EnterpriseInspectionsVO } from '@/api/enterpriseinspections'
+
+import { UploadImgs } from '@/components/UploadFile'
+import * as FileApi from '@/api/infra/file'
 import { ElMessage } from 'element-plus'
 import SelectUser from './components/SelectUser.vue'
 import * as UserApi from '@/api/system/user'
+import {useTagsViewStore} from "@/store/modules/tagsView";
+import {dateFormatter, formatDate} from "@/utils/formatTime";
+
 /** 企业 表单 */
 defineOptions({ name: 'UpdateEnterprises' })
-
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const selectUserRef = ref()
 const loading = ref(false)
 const selectedUser = ref()
+const router=useRouter()
+const route=useRoute()
+const tagView=useTagsViewStore()
+const fileIds = ref([]);
+const qualificationlist = ref([]);
+const inspectionslist = ref([]);
+const inspectionsLogList = ref([]);
+const enterpriseUserList = ref([])
 
 const formData = ref({
   id: undefined,
@@ -174,8 +250,19 @@ const formData = ref({
   searchQuery: undefined,
   managerDeptId: undefined,
   ides: undefined,
-  startUserSelectAssignees:undefined
+  startUserSelectAssignees:undefined,
+  enterpriseUserId: undefined,
+  fileIds:[]
 })
+
+const getEnterpriseUserList = async () => {
+  const type:number = 2
+  const data = await getSimpleUserListByUserType(type)
+  console.log("datadata===>", data)
+
+}
+
+
 const formRules = reactive({
   type: [{ required: true, message: '企业类型不能为空', trigger: 'change' }],
   enterprisesName: [{ required: true, message: '企业名称不能为空', trigger: 'blur' }],
@@ -188,7 +275,7 @@ const { query } = useRoute()
 function init() {
   if (query.id) {
     // 修改：如果有 id 则设置为 'update'
-    formType.value = 'update'
+     formType.value = 'update'
     EnterprisesApi.getEnterprises(query.id).then((res) => {
       selectedUser.value=res.inviterName;
      // formData.value.startUserSelectAssignees=res.userId;
@@ -222,7 +309,6 @@ const initMap = () => {
     zoom: 14
   })
 
-
   // 添加地图点击事件监听器
   window.qq.maps.event.addListener(map, 'click', (event: any) => {
     const latLng = event.latLng
@@ -279,12 +365,12 @@ const handleSearch = () => {
   }
 }
 
-
-
-
 onMounted(() => {
   init()
-
+  getQualificationList()
+  getInspectionslList()
+  getEnterpriseUserList()
+  //getInspectionsLogList()
   const openMapAndInit = async () => {
     if (showMap.value) {
       await nextTick() // 等待 DOM 更新
@@ -319,20 +405,22 @@ function handlerSelectUser(row) {
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
+  //console.log(formData.value)
   // 校验表单
   await formRef.value.validate()
   formData.value.enterprisesStatus=1;
   // 提交请求
   loading.value = true
   try {
-
-    const data = formData.value as unknown as EnterprisesVO
-    if (formType.value === 'create') {
-
+    const data = formData.value
+    if (formType.value == 'create') {
       await EnterprisesApi.pccreateEnterprises(data)
       message.success(t('common.createSuccess'))
+      tagView.delView(route)
+      router.go(-1)
     } else {
       await EnterprisesApi.updateEnterprises(data)
+      
       message.success(t('common.updateSuccess'))
     }
     dialogVisible.value = false
@@ -376,8 +464,11 @@ const resetForm = () => {
 const uploadList: any = ref([])
 
 async function uploadSuccess(res) {
+  console.log('1111111111111111111');
+  console.log(res.data.file_id)
+  fileIds.value.push(res.data.file_id);
   if (res) {
-    await FileInfoApi.createFileInfo({
+    await FileApi.createFile({
       unitId: formData.value.id || id.value,
       attachmentPath: res.data,
       attachmentName: res.filename,
@@ -395,25 +486,49 @@ async function uploadSuccess(res) {
   }
 }
 
-function getCarImg() {
+
+/** 资质查询列表 BY-ZY */
+const getQualificationList = async () => {
   loading.value = true
-  FileInfoApi.getFileInfoPage({ unitId: formData.value.id, type: 4 }).then((res) => {
-    uploadList.value = res.list.map((item) => {
-      return {
-        ...item,
-        url: item.attachmentPath,
-        name: item.attachmentName
-      }
-    })
+  try {
+    const data = await EnterpriseQualificationApi.getEnterpriseQualificationPage({"enterpriseId":query.id})
+    qualificationlist.value = data.list
+  } finally {
     loading.value = false
-  })
+  }
 }
 
-function uploadRemove(file) {
-  FileInfoApi.deleteFileInfo(file.id).then(() => {
-    ElMessage.success('删除成功')
-  })
+
+
+/** 执法记录查询列表 by zy*/
+const getInspectionslList = async () => {
+  loading.value = true
+  try {
+    const data = await EnterpriseInspectionsApi.getEnterpriseInspectionsPage({"enterpriseId":query.id})
+    inspectionslist.value = data.list
+  } finally {
+    loading.value = false
+  }
 }
+
+/** 执法记录查询列表 by zy*/
+const getInspectionsLogList = async (insprctionsId) => {
+  console.log(insprctionsId)
+  loading.value = true
+  try {
+    const data = await EnterpriseInspectionsApi.inspectionsLogList({"inspectionsId":insprctionsId})
+    inspectionsLogList.value = data
+  } finally {
+    loading.value = false
+  }
+}
+
+
+
+
+
+
+
 </script>
 
 <style lang="scss" scoped>
@@ -467,4 +582,9 @@ function uploadRemove(file) {
   height: 400px;
   margin-top: 20px;
 }
+
+.custom-title {
+  font-size: 14px;
+  margin: 2% auto;
+}
 </style>

src/views/system/policy/PolicyForm.vue

@@ -0,0 +1,96 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="80%" >
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入名称" />
+      </el-form-item>
+      <el-form-item label="内容" prop="context">
+        <Editor v-model="formData.context" height="350px" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { PolicyApi, PolicyVO } from '@/api/system/policy'
+
+/** 政策法规 表单 */
+defineOptions({ name: 'PolicyForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  name: undefined,
+  context: undefined,
+})
+const formRules = reactive({
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await PolicyApi.getPolicy(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as PolicyVO
+    if (formType.value === 'create') {
+      await PolicyApi.createPolicy(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await PolicyApi.updatePolicy(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    context: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>

src/views/system/policy/index.vue

@@ -0,0 +1,200 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-220px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['system:policy:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['system:policy:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <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="名称" align="center" prop="name" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center" min-width="120px">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['system:policy:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['system:policy:delete']"
+          >
+            删除
+          </el-button>
+          <el-button
+            link
+            type="primary"
+            @click="clickOpenDetail(scope.row.id)"
+            
+          >
+            详情
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <PolicyForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { PolicyApi, PolicyVO } from '@/api/system/policy'
+import PolicyForm from './PolicyForm.vue'
+
+/** 政策法规 列表 */
+defineOptions({ name: 'Policy' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<PolicyVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: undefined,
+  createTime: [],
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await PolicyApi.getPolicyPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+const clickOpenDetail = (id: number) => {
+  console.log(id);
+  window.open(`/policyDetail?id=${id}`, '_blank')
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await PolicyApi.deletePolicy(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PolicyApi.exportPolicy(queryParams)
+    download.excel(data, '政策法规.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

src/views/system/policy/policyView.vue

@@ -0,0 +1,52 @@
+<template>
+    <!-- 富文本展示区域 -->
+    <editor
+    v-model="policyContent"
+    readonly
+    height="100vh"
+    :showToolbar="false"
+      class="policy-content"
+    />
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import { useRoute } from 'vue-router'
+import { PolicyApi } from '@/api/system/policy' // 假设有这个 API
+
+const route = useRoute()
+const policyContent = ref('')
+
+// 获取政策内容
+const getPolicyContent = async () => {
+  try {
+    const id = Number(route.query.id as string)
+    if (!id) return
+    const res = await PolicyApi.getPolicy(id)
+    policyContent.value = res.context
+  } catch (error) {
+    console.error('获取政策内容失败:', error)
+  }
+}
+
+onMounted(() => {
+  getPolicyContent()
+})
+</script>
+
+<style scoped>
+.policy-content {
+  padding: 20px;
+  background: #fff;
+  border-radius: 4px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  height: 100vh;
+}
+
+/* 确保富文本内容样式正确显示 */
+:deep(.policy-content img) {
+  max-width: 100%;
+  height: 100vh;
+
+}
+</style>

src/views/system/user/examine.vue

@@ -153,7 +153,7 @@ const queryParams = reactive({
   status: undefined,
   deptId: undefined,
   audit: [1,3],
-  userType: "1,2",
+  userType: "2, 3",
   createTime: []
 
 })

src/views/system/user/examineform.vue

@@ -46,11 +46,14 @@ function open(param) {
 function submit(type) {
   form.value.audit = type;
 
-  UserApi.examineUser(form.value).then((res) => {
-    proxy.$modal.msgSuccess("审批成功");
+  try {
+    UserApi.examineUser(form.value).then((res) => {
     emits("success");
-    show.value = false;
   });
+
+  } finally {
+    show.value = false
+  }
 }
 
 defineExpose({ open });

src/views/system/user/index.vue

@@ -99,13 +99,7 @@
           <el-table-column
             label="用户名称"
             align="center"
-            prop="username"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="用户昵称"
-            align="center"
-            prop="nickname"
+            prop="realName"
             :show-overflow-tooltip="true"
           />
           <el-table-column

src/views/task/create.vue

@@ -16,7 +16,6 @@
             value-format="YYYY-MM-DD"
           />
         </el-form-item>
-
         <el-form-item label="类型" prop="taskType">
           <el-tree-select
             v-model="formData.taskType"
@@ -27,7 +26,6 @@
             placeholder="请选择任务类型"
           />
         </el-form-item>
-
         <el-form-item label="执行周期" prop="execCycle" v-if="formData.taskType == 2">
           <el-select v-model="formData.execCycle" placeholder="请选择执行周期">
             <el-option
@@ -76,7 +74,6 @@
       </el-form>
     </section>
   </ContentWrap>
-
   <ContentWrap title="执行范围">
     <template #header> </template>
     <section class="select-area" v-loading="loading">
@@ -125,8 +122,6 @@
               />
             </el-select>
           </el-form-item>
-
-
 <!--          <el-form-item label="" prop="id">-->
 <!--            <el-select-->
 <!--              v-model="enterprise.queryParams.id"-->
@@ -144,8 +139,6 @@
 <!--              />-->
 <!--            </el-select>-->
 <!--          </el-form-item>-->
-
-
           <el-form-item>
             <el-button @click="handleQuery">
               <Icon icon="ep:search" class="mr-5px" /> 搜索
@@ -158,7 +151,6 @@
             </el-button-group>
           </el-form-item>
         </el-form>
-
         <section class="enterprise-area">
           <section
             v-for="enterprise in enterprise.list"
@@ -194,7 +186,6 @@
             </section>
           </section>
         </section>
-
         <pagination
           v-show="enterprise.total > 0"
           :total="enterprise.total"
@@ -235,12 +226,17 @@
       </section>
     </section>
   </ContentWrap>
-
   <ContentWrap>
     <el-button type="primary" @click="submitForm">提 交</el-button>
+    <el-button 
+      type="primary" @click="submitForm"  v-hasPermi="['system:enterprise-inspections:audit']">审核通过</el-button>
+    <el-button 
+      type="danger"
+      @click="submitForm"
+      v-hasPermi="['system:enterprise-inspections:audit']"
+    >删除</el-button>
   </ContentWrap>
 </template>
-
 <script setup lang="ts">
 import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
 import { TagLibraryApi } from '@/api/system/taglibrary'
@@ -248,9 +244,7 @@ import { EnterprisesApi, EnterprisesVO } from '@/api/enterprises'
 import { TaskInfoApi } from '@/api/system/taskinfo'
 import { useTagsViewStore} from '@/store/modules/tagsView'
 import {defaultProps} from "@/utils/tree";
-
 defineOptions({ name: 'CreateTask' })
-
 const loading = ref(false)
 const formData = ref({
   id: undefined,
@@ -309,14 +303,11 @@ const handleQuery = () => {
   enterprise.value.queryParams.pageNo = 1
   getEnterPriseList()
 }
-
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value.resetFields()
   handleQuery()
 }
-
-
 /**
  * 获取标签列表
  */
@@ -325,14 +316,10 @@ function getTagList() {
     tagList.value = res
   })
 }
-
-
 const defaultProps = {
   label: 'tagName', // 使用 'name' 字段作为选项的标签
   children: 'children', // 如果存在子节点，则使用 'children' 字段
 };
-
-
 /**
  * 获取企业列表
  */
@@ -346,7 +333,6 @@ async function getEnterPriseList() {
     loading.value = false
   }
 }
-
 /**
  * 全选
  */
@@ -360,7 +346,6 @@ async function selectAll() {
   formData.value.enterprises = uniqueFunc(arr, 'id')
   loading.value = false
 }
-
 /**
  * 取消全选
  */
@@ -377,7 +362,6 @@ async function cancelAll() {
   }
   loading.value = false
 }
-
 /**
  * 单选企业
  * @param enterprise
@@ -385,7 +369,6 @@ async function cancelAll() {
 function selectEnterprise(enterprise) {
   formData.value.enterprises.push(enterprise)
 }
-
 /**
  * 单选取消
  * @param enterprise
@@ -393,7 +376,6 @@ function selectEnterprise(enterprise) {
 function checkEnterprise(enterprise) {
   formData.value.enterprises = formData.value.enterprises.filter((e) => e.id != enterprise.id)
 }
-
 /**
  * 数组去重
  * @param arr
@@ -404,16 +386,16 @@ function uniqueFunc(arr, uniId) {
   const res = new Map()
   return arr.filter((item) => !res.has(item[uniId]) && res.set(item[uniId], 1))
 }
-
 /**
  * 提交表单
  */
 async function submitForm() {
-
   const validate = await unref(formRef).validate()
   if (validate) {
     const data = JSON.parse(JSON.stringify(formData.value))
+    //任务状态默认初始值1
     data.status=1;
+    console.log("任务类型：",formData.value.taskType)
     data.enterpriseIds = formData.value.enterprises.map((i) => i.id)
     if(data.enterpriseIds.length==0){
       message.success("温馨提示：请您选择执法对象")
@@ -438,10 +420,8 @@ async function submitForm() {
          message.success('温馨提示：该任务已经执行,无法再进行修改')
        }
     }
-
   }
 }
-
 function init(){
 	if(query.id){
 		TaskInfoApi.getTaskInfo(query.id).then(res=>{
@@ -452,14 +432,12 @@ function init(){
 		})
 	}
 }
-
 getEnterPriseList()
 getTagList()
 onMounted(()=>{
 	init()
 })
 </script>
-
 <style scoped lang="scss">
 ::v-deep(.taskForm .el-form) {
   display: flex;
@@ -543,4 +521,4 @@ onMounted(()=>{
     }
   }
 }
-</style>
+</style>

src/views/task/index.vue

@@ -187,6 +187,17 @@
           >
             删除
           </el-button>
+
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['system:task-info:audit']"
+            v-if="scope.row.status == 0"
+          >
+            审核
+          </el-button>
+
           <!-- <el-button link type="primary" @click="openForm(scope.row.id)"> 详情 </el-button> -->
         </template>
       </el-table-column>