diff --git a/public/resource/img/institute_logo.png b/public/resource/img/institute_logo.png
new file mode 100644
index 0000000..db287fe
Binary files /dev/null and b/public/resource/img/institute_logo.png differ
diff --git a/src/assets/loginmini/icon/brand_text.png b/src/assets/loginmini/icon/brand_text.png
new file mode 100644
index 0000000..6ba7d16
Binary files /dev/null and b/src/assets/loginmini/icon/brand_text.png differ
diff --git a/src/assets/loginmini/icon/logo_new.png b/src/assets/loginmini/icon/logo_new.png
new file mode 100644
index 0000000..6ba7d16
Binary files /dev/null and b/src/assets/loginmini/icon/logo_new.png differ
diff --git a/src/layouts/default/footer/index.vue b/src/layouts/default/footer/index.vue
index a7e0d93..c4fc6a4 100644
--- a/src/layouts/default/footer/index.vue
+++ b/src/layouts/default/footer/index.vue
@@ -1,13 +1,6 @@
 <template>
-  <Footer :class="prefixCls" v-if="getShowLayoutFooter" ref="footerRef">
-    <div :class="`${prefixCls}__links`">
-      <a @click="openWindow(SITE_URL)">{{ t('layout.footer.onlinePreview') }}</a>
-
-      <GithubFilled @click="openWindow(GITHUB_URL)" :class="`${prefixCls}__github`" />
-
-      <a @click="openWindow(DOC_URL)">{{ t('layout.footer.onlineDocument') }}</a>
-    </div>
-    <div>Copyright &copy;2021 JEECG开源社区 出品</div>
+  <Footer :class="prefixCls" v-if="true" ref="footerRef">
+    <div class="footer-text">中国船舶集团有限公司第七〇四研究所 数智化中心@2026</div>
   </Footer>
 </template>
 
@@ -42,21 +35,21 @@
       const { getDarkMode } = useRootSetting();
       const isDark = computed(() => getDarkMode.value === ThemeEnum.DARK);
 
-      const getShowLayoutFooter = computed(() => {
-        if (unref(getShowFooter)) {
-          const footerEl = unref(footerRef)?.$el;
-          setFooterHeight(footerEl?.offsetHeight || 0);
-        } else {
-          setFooterHeight(0);
-        }
-        return unref(getShowFooter) && !unref(currentRoute).meta?.hiddenFooter;
-      });
+      // const getShowLayoutFooter = computed(() => {
+      //   if (unref(getShowFooter)) {
+      //     const footerEl = unref(footerRef)?.$el;
+      //     setFooterHeight(footerEl?.offsetHeight || 0);
+      //   } else {
+      //     setFooterHeight(0);
+      //   }
+      //   return unref(getShowFooter) && !unref(currentRoute).meta?.hiddenFooter;
+      // });
       //鼠标移入的颜色设置
       const hoverColor = computed(() => {
         return unref(isDark) ? 'rgba(255, 255, 255, 1)' : 'rgba(0, 0, 0, 0.85)';
       });
       return {
-        getShowLayoutFooter,
+        // getShowLayoutFooter,
         prefixCls,
         t,
         DOC_URL,
@@ -77,27 +70,13 @@
   @hover-color: v-bind(hoverColor);
   // update-end-author:liusq date:2023-7-12 for: [issues/608] dark 模式下底部 footer 文字 hover 样式导致文字消失
   .@{prefix-cls} {
-    color: @normal-color;
+    color: rgba(0, 0, 0, 0.65);
     text-align: center;
+    padding: 16px 0;
+    margin-top: auto;
 
-    &__links {
-      margin-bottom: 8px;
-
-      a {
-        color: @normal-color;
-
-        &:hover {
-          color: @hover-color;
-        }
-      }
-    }
-
-    &__github {
-      margin: 0 30px;
-
-      &:hover {
-        color: @hover-color;
-      }
+    .footer-text {
+      font-size: 13px;
     }
   }
 </style>
diff --git a/src/layouts/default/header/MultipleHeader.vue b/src/layouts/default/header/MultipleHeader.vue
index 50e1906..e016426 100644
--- a/src/layouts/default/header/MultipleHeader.vue
+++ b/src/layouts/default/header/MultipleHeader.vue
@@ -2,25 +2,25 @@
   <div :style="getPlaceholderDomStyle" v-if="getIsShowPlaceholderDom"></div>
   <div :style="getWrapStyle" :class="getClass">
     <LayoutHeader v-if="getShowHeader" />
-    <MultipleTabs v-if="getShowTabs" />
+    <!-- <MultipleTabs v-if="getShowTabs" /> -->
   </div>
 </template>
 <script lang="ts">
   import { defineComponent, unref, computed, CSSProperties } from 'vue';
 
   import LayoutHeader from './index.vue';
-  import MultipleTabs from '../tabs/index.vue';
+  // import MultipleTabs from '../tabs/index.vue';
 
   import { useAppStore } from "@/store/modules/app";
   import { useGlobSetting } from "/@/hooks/setting";
   import { useHeaderSetting } from '/@/hooks/setting/useHeaderSetting';
   import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
   import { useFullContent } from '/@/hooks/web/useFullContent';
-  import { useMultipleTabSetting } from '/@/hooks/setting/useMultipleTabSetting';
+  // import { useMultipleTabSetting } from '/@/hooks/setting/useMultipleTabSetting';
   import { useAppInject } from '/@/hooks/web/useAppInject';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useLayoutHeight } from '../content/useContentViewHeight';
-  import { TabsThemeEnum } from '/@/enums/appEnum';
+  // import { TabsThemeEnum } from '/@/enums/appEnum';
   import { MenuTypeEnum } from '/@/enums/menuEnum';
 
   // update-begin--author:liaozhiyang---date:20240407---for：【QQYUN-8774】网站header区域加高
@@ -28,13 +28,13 @@
   // update-begin--author:liaozhiyang---date:20240407---for：【【QQYUN-8774】网站header区域加高
 
   // updateBy:sunjianlei---updateDate:2021-09-03---修改tab切换栏样式：更改高度
-  const TABS_HEIGHT = 32;
-  const TABS_HEIGHT_CARD = 50;
-  const TABS_HEIGHT_SMOOTH = 50;
+  // const TABS_HEIGHT = 32;
+  // const TABS_HEIGHT_CARD = 50;
+  // const TABS_HEIGHT_SMOOTH = 50;
 
   export default defineComponent({
     name: 'LayoutMultipleHeader',
-    components: { LayoutHeader, MultipleTabs },
+    components: { LayoutHeader },
     setup() {
       const { setHeaderHeight } = useLayoutHeight();
       const { prefixCls } = useDesign('layout-multiple-header');
@@ -48,7 +48,7 @@
 
       const { getFullContent } = useFullContent();
 
-      const { getShowMultipleTab, getTabsTheme } = useMultipleTabSetting();
+      // const { getShowMultipleTab, getTabsTheme } = useMultipleTabSetting();
 
       const getShowHeader = computed(() => {
         // 控制是否显示顶部
@@ -59,11 +59,7 @@
       })
 
       const getShowTabs = computed(() => {
-        // 控制是否显示多Tabs切换
-        if (appStore.getLayoutHideMultiTabs) {
-          return false;
-        }
-        return unref(getShowMultipleTab) && !unref(getFullContent);
+        return false;
       });
 
       const getIsShowPlaceholderDom = computed(() => {
@@ -85,17 +81,16 @@
         return unref(getFixed) || unref(getShowFullHeaderRef);
       });
 
-      // updateBy:sunjianlei---updateDate:2021-09-08---根据主题的不同，动态计算tabs高度
-      const getTabsThemeHeight = computed(() => {
-        let tabsTheme = unref(getTabsTheme);
-        if (tabsTheme === TabsThemeEnum.CARD) {
-          return TABS_HEIGHT_CARD;
-        } else if (tabsTheme === TabsThemeEnum.SMOOTH) {
-          return TABS_HEIGHT_SMOOTH;
-        } else {
-          return TABS_HEIGHT;
-        }
-      });
+      // const getTabsThemeHeight = computed(() => {
+      //   let tabsTheme = unref(getTabsTheme);
+      //   if (tabsTheme === TabsThemeEnum.CARD) {
+      //     return TABS_HEIGHT_CARD;
+      //   } else if (tabsTheme === TabsThemeEnum.SMOOTH) {
+      //     return TABS_HEIGHT_SMOOTH;
+      //   } else {
+      //     return TABS_HEIGHT;
+      //   }
+      // });
 
       const getPlaceholderDomStyle = computed((): CSSProperties => {
         let height = 0;
@@ -104,9 +99,9 @@
           height += HEADER_HEIGHT;
         }
         // update-end--author:liaozhiyang---date:20241216---for：【issues/7561】主题切换为顶部混合模式时，页面顶部内容显示不出来，被遮盖
-        if (unref(getShowTabs) && !unref(getFullContent)) {
-          height += unref(getTabsThemeHeight);
-        }
+        // if (unref(getShowTabs) && !unref(getFullContent)) {
+        //   height += unref(getTabsThemeHeight);
+        // }
         setHeaderHeight(height);
         return {
           height: `${height}px`,
diff --git a/src/layouts/default/header/components/user-dropdown/index.vue b/src/layouts/default/header/components/user-dropdown/index.vue
index 7ccadb9..5391345 100644
--- a/src/layouts/default/header/components/user-dropdown/index.vue
+++ b/src/layouts/default/header/components/user-dropdown/index.vue
@@ -55,7 +55,7 @@
   import { refreshCache, queryAllDictItems } from '/@/views/system/dict/dict.api';
   import { DB_DICT_DATA_KEY } from '/src/enums/cacheEnum';
   import { removeAuthCache, setAuthCache } from '/src/utils/auth';
-  import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
+  // import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
   import { getRefPromise } from '/@/utils/index';
 
   type MenuEvent = 'logout' | 'doc' | 'lock' | 'cache' | 'depart';
@@ -89,14 +89,14 @@
         return { realname, avatar: avatar || headerImg, desc };
       });
 
-      const getAvatarUrl = computed(() => {
-        let { avatar } = getUserInfo.value;
-        if (avatar == headerImg) {
-          return avatar;
-        } else {
-          return getFileAccessHttpUrl(avatar);
-        }
-      });
+      // const getAvatarUrl = computed(() => {
+      //   let { avatar } = getUserInfo.value;
+      //   if (avatar == headerImg) {
+      //     return avatar;
+      //   } else {
+      //     return getFileAccessHttpUrl(avatar);
+      //   }
+      // });
 
       const [register, { openModal }] = useModal();
       /**
@@ -179,7 +179,7 @@
         prefixCls,
         t,
         getUserInfo,
-        getAvatarUrl,
+        // getAvatarUrl,
         handleMenuClick,
         getShowDoc,
         register,
diff --git a/src/layouts/default/header/index.vue b/src/layouts/default/header/index.vue
index f1f1841..3c708f3 100644
--- a/src/layouts/default/header/index.vue
+++ b/src/layouts/default/header/index.vue
@@ -9,7 +9,7 @@
         :theme="getHeaderTheme"
         :sider="false"
       />
-      <LayoutBreadcrumb v-if="getShowContent && getShowBread" :theme="getHeaderTheme" />
+      <!-- <LayoutBreadcrumb v-if="getShowContent && getShowBread" :theme="getHeaderTheme" /> -->
       <!-- 欢迎语 -->
       <span v-if="getShowContent && getShowBreadTitle && !getIsMobile" :class="[prefixCls, `${prefixCls}--${getHeaderTheme}`,'headerIntroductionClass']"> {{t('layout.header.welcomeIn')}} {{ title }} </span>
     </div>
@@ -61,14 +61,14 @@
   import { useRootSetting } from '/@/hooks/setting/useRootSetting';
 
   import { MenuModeEnum, MenuSplitTyeEnum } from '/@/enums/menuEnum';
-  import { SettingButtonPositionEnum } from '/@/enums/appEnum';
+  // import { SettingButtonPositionEnum } from '/@/enums/appEnum';
   // import { AppLocalePicker } from '/@/components/Application';
 
-  import { UserDropDown, LayoutBreadcrumb, FullScreen, ErrorAction, LockScreen } from './components';
+  import { UserDropDown, FullScreen, ErrorAction, LockScreen } from './components';
   import { useAppInject } from '/@/hooks/web/useAppInject';
   import { useDesign } from '/@/hooks/web/useDesign';
 
-  import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
+  // import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
   // import { useLocale } from '/@/locales/useLocale';
 
   import LoginSelect from '/@/views/sys/login/LoginSelect.vue';
@@ -83,7 +83,7 @@
       Header: Layout.Header,
       AppLogo,
       LayoutTrigger,
-      LayoutBreadcrumb,
+      // LayoutBreadcrumb,
       LayoutMenu,
       UserDropDown,
       // AppLocalePicker,
diff --git a/src/settings/projectSetting.ts b/src/settings/projectSetting.ts
index 98643d7..903a7e2 100644
--- a/src/settings/projectSetting.ts
+++ b/src/settings/projectSetting.ts
@@ -65,7 +65,7 @@ const setting: ProjectConfig = {
   showLogo: true,
 
   // 是否显示底部信息 copyright
-  showFooter: false,
+  showFooter: true,
 
   // ai图标显示
   aiIconShow: false,
diff --git a/src/views/bg/bqtakepulse/BgTakepulse.api.ts b/src/views/bg/bqtakepulse/BgTakepulse.api.ts
new file mode 100644
index 0000000..c71c5ba
--- /dev/null
+++ b/src/views/bg/bqtakepulse/BgTakepulse.api.ts
@@ -0,0 +1,81 @@
+import {defHttp} from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/bqtakepulse/bgTakepulse/list',
+  save='/bqtakepulse/bgTakepulse/add',
+  edit='/bqtakepulse/bgTakepulse/edit',
+  deleteOne = '/bqtakepulse/bgTakepulse/delete',
+  deleteBatch = '/bqtakepulse/bgTakepulse/deleteBatch',
+  importExcel = '/bqtakepulse/bgTakepulse/importExcel',
+  exportXls = '/bqtakepulse/bgTakepulse/exportXls',
+  queryDataById = '/bqtakepulse/bgTakepulse/queryById',
+  bgTakepulseFeedbackList = '/bqtakepulse/bgTakepulse/queryBgTakepulseFeedbackByMainId',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 查询子表数据
+ * @param params
+ */
+export const queryBgTakepulseFeedbackListByMainId = (id) => defHttp.get({url: Api.bgTakepulseFeedbackList, params:{ id }});
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}
+
+/**
+* 根据id查询数据
+* @param params
+*/
+export const queryDataById = (id) => defHttp.get({url: Api.queryDataById, params:{ id }});
+
diff --git a/src/views/bg/bqtakepulse/BgTakepulse.data.ts b/src/views/bg/bqtakepulse/BgTakepulse.data.ts
new file mode 100644
index 0000000..ab8da79
--- /dev/null
+++ b/src/views/bg/bqtakepulse/BgTakepulse.data.ts
@@ -0,0 +1,287 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
+import { getWeekMonthQuarterYear } from '/@/utils';
+//列表数据
+export const columns: BasicColumn[] = [
+   {
+    title: '密级',
+    align:"center",
+    dataIndex: 'secretLevel_dictText'
+   },
+   {
+    title: '年份',
+    align:"center",
+    dataIndex: 'year_dictText'
+   },
+   {
+    title: '序号',
+    align:"center",
+    dataIndex: 'number'
+   },
+   {
+    title: '会议类型：行政线、技术线',
+    align:"center",
+    dataIndex: 'taskType_dictText'
+   },
+   {
+    title: '类别：党的建设等其他',
+    align:"center",
+    dataIndex: 'type'
+   },
+   {
+    title: '提出人',
+    align:"center",
+    dataIndex: 'proposer_dictText'
+   },
+   {
+    title: '意见主题',
+    align:"center",
+    dataIndex: 'title'
+   },
+   {
+    title: '具体意见',
+    align:"center",
+    dataIndex: 'content'
+   },
+   {
+    title: '责任领导',
+    align:"center",
+    dataIndex: 'suoleader_dictText'
+   },
+   {
+    title: '牵头部门',
+    align:"center",
+    dataIndex: 'responDeptid_dictText'
+   },
+   {
+    title: '协办部门',
+    align:"center",
+    dataIndex: 'assistDeptid_dictText'
+   },
+   {
+    title: '落实部门',
+    align:"center",
+    dataIndex: 'implementDeptid'
+   },
+   {
+    title: '是否采纳',
+    align:"center",
+    dataIndex: 'isAdopt',
+    customRender:({text}) => {
+       return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}])
+     },
+   },
+   {
+    title: '落实措施/解释说明',
+    align:"center",
+    dataIndex: 'measure'
+   },
+   {
+    title: '措施数量',
+    align:"center",
+    dataIndex: 'measureNumber'
+   },
+   {
+    title: '成果形式',
+    align:"center",
+    dataIndex: 'achievement'
+   },
+   {
+    title: '要求完成日期',
+    align:"center",
+    dataIndex: 'deadline',
+    customRender:({text}) =>{
+      text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
+      return text;
+    },
+   },
+   {
+    title: '备注',
+    align:"center",
+    dataIndex: 'remark'
+   },
+   {
+    title: '执行情况',
+    align:"center",
+    dataIndex: 'actualExect'
+   },
+   {
+    title: '实际完成时间',
+    align:"center",
+    dataIndex: 'actualTime'
+   },
+   {
+    title: '提出人确认',
+    align:"center",
+    dataIndex: 'proposerConfirm'
+   },
+   {
+    title: '完成状态',
+    align:"center",
+    dataIndex: 'bpmStatus_dictText'
+   },
+   {
+    title: '调整落实措施及执行情况',
+    align:"center",
+    dataIndex: 'actSt'
+   },
+   {
+    title: '督办次数',
+    align:"center",
+    dataIndex: 'superviseCount'
+   },
+   {
+    title: '紧急程度',
+    align:"center",
+    dataIndex: 'urgencyLevel'
+   },
+   {
+    title: '是否需要所办领导审批',
+    align:"center",
+    dataIndex: 'isNeedAppro',
+    customRender:({text}) => {
+       return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}])
+     },
+   },
+   {
+    title: '所办领导',
+    align:"center",
+    dataIndex: 'supDeptleaderid_dictText'
+   },
+];
+
+//子表表格配置
+export const bgTakepulseFeedbackColumns: JVxeColumn[] = [
+    {
+      title: '责任部门id',
+      key: 'responDeptid',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '责任部门名称',
+      key: 'responDeptname',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '反馈人id',
+      key: 'responPersonid',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '反馈人姓名',
+      key: 'responPersonname',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '实际执行情况',
+      key: 'actualExect',
+      type: JVxeTypes.textarea,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '实际完成时间',
+      key: 'actualTime',
+      type: JVxeTypes.datetime,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '调整落实措施及执行情况',
+      key: 'actSt',
+      type: JVxeTypes.textarea,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '完成状态',
+      key: 'bpmStatus',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '提出人确认',
+      key: 'proposerConfirm',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '流程实例id',
+      key: 'bpmProcessId',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+  ]
+
+// 高级查询数据
+export const superQuerySchema = {
+  secretLevel: {title: '密级',order: 0,view: 'list', type: 'string',dictCode: 'secret_level',},
+  year: {title: '年份',order: 1,view: 'list', type: 'string',dictCode: 'super_year',},
+  number: {title: '序号',order: 2,view: 'text', type: 'string',},
+  taskType: {title: '会议类型：行政线、技术线',order: 3,view: 'list', type: 'string',dictCode: 'super_takepulse_type',},
+  type: {title: '类别：党的建设等其他',order: 4,view: 'text', type: 'string',},
+  proposer: {title: '提出人',order: 5,view: 'sel_user', type: 'string',},
+  title: {title: '意见主题',order: 6,view: 'text', type: 'string',},
+  content: {title: '具体意见',order: 7,view: 'textarea', type: 'string',},
+  suoleader: {title: '责任领导',order: 8,view: 'sel_user', type: 'string',},
+  responDeptid: {title: '牵头部门',order: 9,view: 'sel_depart', type: 'string',},
+  assistDeptid: {title: '协办部门',order: 10,view: 'sel_depart', type: 'string',},
+  implementDeptid: {title: '落实部门',order: 11,view: 'text', type: 'string',},
+  isAdopt: {title: '是否采纳',order: 12,view: 'switch', type: 'string',},
+  measure: {title: '落实措施/解释说明',order: 13,view: 'textarea', type: 'string',},
+  measureNumber: {title: '措施数量',order: 14,view: 'number', type: 'number',},
+  achievement: {title: '成果形式',order: 15,view: 'textarea', type: 'string',},
+  deadline: {title: '要求完成日期',order: 16,view: 'date', type: 'string',},
+  remark: {title: '备注',order: 17,view: 'text', type: 'string',},
+  actualExect: {title: '执行情况',order: 18,view: 'textarea', type: 'string',},
+  actualTime: {title: '实际完成时间',order: 19,view: 'datetime', type: 'string',},
+  proposerConfirm: {title: '提出人确认',order: 20,view: 'text', type: 'string',},
+  bpmStatus: {title: '完成状态',order: 21,view: 'list', type: 'string',dictCode: 'super_status',},
+  actSt: {title: '调整落实措施及执行情况',order: 22,view: 'textarea', type: 'string',},
+  superviseCount: {title: '督办次数',order: 23,view: 'text', type: 'string',},
+  urgencyLevel: {title: '紧急程度',order: 24,view: 'text', type: 'string',},
+  isNeedAppro: {title: '是否需要所办领导审批',order: 25,view: 'switch', type: 'string',},
+  supDeptleaderid: {title: '所办领导',order: 26,view: 'sel_user', type: 'string',},
+  //子表高级查询
+  bgTakepulseFeedback: {
+    title: '执行情况反馈',
+    view: 'table',
+    fields: {
+        responDeptid: {title: '责任部门id',order: 0,view: 'text', type: 'string',},
+        responDeptname: {title: '责任部门名称',order: 1,view: 'text', type: 'string',},
+        responPersonid: {title: '反馈人id',order: 2,view: 'text', type: 'string',},
+        responPersonname: {title: '反馈人姓名',order: 3,view: 'text', type: 'string',},
+        actualExect: {title: '实际执行情况',order: 4,view: 'textarea', type: 'string',},
+        actualTime: {title: '实际完成时间',order: 5,view: 'datetime', type: 'string',},
+        actSt: {title: '调整落实措施及执行情况',order: 6,view: 'textarea', type: 'string',},
+        bpmStatus: {title: '完成状态',order: 7,view: 'text', type: 'string',},
+        proposerConfirm: {title: '提出人确认',order: 8,view: 'text', type: 'string',},
+        bpmProcessId: {title: '流程实例id',order: 9,view: 'text', type: 'string',},
+        mainId: {title: '外键',order: 11,view: 'text', type: 'string',},
+    }
+  },
+};
diff --git a/src/views/bg/bqtakepulse/BgTakepulseList.vue b/src/views/bg/bqtakepulse/BgTakepulseList.vue
new file mode 100644
index 0000000..c9eb2f3
--- /dev/null
+++ b/src/views/bg/bqtakepulse/BgTakepulseList.vue
@@ -0,0 +1,337 @@
+<template>
+  <div class="p-2">
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="6">
+            <a-form-item name="year">
+              <template #label><span title="年份">年份</span></template>
+              <j-select-multiple placeholder="请选择年份" v-model:value="queryParam.year" dictCode="super_year" allow-clear />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="taskType">
+              <template #label><span title="会议类型：行政线、技术线">会议类型</span></template>
+              <j-select-multiple placeholder="请选择会议类型：行政线、技术线" v-model:value="queryParam.taskType" dictCode="super_takepulse_type" allow-clear />
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :lg="6">
+              <a-form-item name="type">
+                <template #label><span title="类别：党的建设等其他">类别：党</span></template>
+                <a-input placeholder="请输入类别：党的建设等其他" v-model:value="queryParam.type" allow-clear ></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6">
+              <a-form-item name="responDeptid">
+                <template #label><span title="牵头部门">牵头部门</span></template>
+                <j-select-dept placeholder="请选择牵头部门" v-model:value="queryParam.responDeptid" checkStrictly allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6">
+              <a-form-item name="assistDeptid">
+                <template #label><span title="协办部门">协办部门</span></template>
+                <j-select-dept placeholder="请选择协办部门" v-model:value="queryParam.assistDeptid" checkStrictly allow-clear />
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="reload">查询</a-button>
+                <a-button preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" v-auth="'bqtakepulse:bg_takepulse:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" v-auth="'bqtakepulse:bg_takepulse:exportXls'"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" v-auth="'bqtakepulse:bg_takepulse:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="selectedRowKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button v-auth="'bqtakepulse:bg_takepulse:deleteBatch'">批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <BgTakepulseModal @register="registerModal" @success="handleSuccess"></BgTakepulseModal>
+      <!-- 审批记录 -->
+      <BpmPictureModal @register="registerBpmModal" />
+  </div>
+</template>
+
+<script lang="ts" name="bqtakepulse-bgTakepulse" setup>
+  import {ref, reactive, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import {useModal} from '/@/components/Modal';
+  import BgTakepulseModal from './components/BgTakepulseModal.vue'
+  import {columns, superQuerySchema} from './BgTakepulse.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './BgTakepulse.api';
+  import {downloadFile} from '/@/utils/common/renderUtils';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue';
+  import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
+  import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
+  import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
+  import { startProcess } from '/@/api/common/api';
+
+  const [registerBpmModal, { openModal: bpmPicModal }] = useModal();
+  import { useUserStore } from '/@/store/modules/user';
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  const userStore = useUserStore();
+  const { createMessage } = useMessage();
+   //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '我为四所把把脉',
+           api: list,
+           columns,
+           canResize:false,
+           useSearchForm: false,
+           actionColumn: {
+               width: 120,
+               fixed:'right'
+           },
+           beforeFetch: async (params) => {
+             return Object.assign(params, queryParam);
+           },
+        },
+        exportConfig: {
+            name:"我为四所把把脉",
+            url: getExportUrl,
+            params: queryParam,
+        },
+        importConfig: {
+            url: getImportUrl,
+            success: handleSuccess
+        },
+    })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, handleSuccess);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: selectedRowKeys.value},handleSuccess);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      (selectedRowKeys.value = []) && reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+           auth: 'bqtakepulse:bg_takepulse:edit'
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+       let dropDownAction = [
+         {
+           label: '详情',
+           onClick: handleDetail.bind(null, record),
+         }, {
+           label: '删除',
+           popConfirm: {
+             title: '是否确认删除',
+             confirm: handleDelete.bind(null, record)
+           },
+           auth: 'bqtakepulse:bg_takepulse:delete'
+         },
+           {
+             label: '审批进度',
+             onClick: handlePreviewPic.bind(null, record),
+             ifShow: !!record.bpmStatus && record.bpmStatus !== '1',
+           }
+       ];
+       if(record.bpmStatus == '1' || !record.bpmStatus){
+         dropDownAction.push({
+           label: '发起流程',
+           popConfirm: {
+             title: '确认提交流程吗？',
+             confirm: handleProcess.bind(null, record),
+             placement: 'topLeft',
+           }
+         })
+       }
+       return dropDownAction;
+   }
+
+  /**
+   * 提交流程
+   */
+  async function handleProcess(record) {
+    let params = {
+      flowCode: 'dev_bg_takepulse_001',
+      id: record.id,
+      formUrl: 'bqtakepulse/components/BgTakepulseForm',
+      formUrlMobile: ''
+    }
+    await startProcess(params);
+    handleSuccess();
+  }
+
+  /**
+   * 审批进度
+   */
+  async function handlePreviewPic(record) {
+    bpmPicModal(true, {
+      flowCode: 'dev_bg_takepulse_001',
+      dataId: record.id,
+    });
+  }
+
+
+
+  /* ----------------------以下为原生查询需要添加的-------------------------- */
+  const toggleSearchStatus = ref<boolean>(false);
+  const labelCol = reactive({
+    xs:24,
+    sm:4,
+    xl:6,
+    xxl:4
+  });
+  const wrapperCol = reactive({
+    xs: 24,
+    sm: 20,
+  });
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+
+  /**
+   * form点击事件(以逗号分割)
+   * @param key
+   * @param value
+   */
+  function handleFormJoinChange(key, value) {
+    if (typeof value != 'string') {
+      queryParam[key] = value.join(',');
+    }
+  }
+</script>
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    padding: 0;
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+    .ant-form-item:not(.ant-form-item-with-help){
+      margin-bottom: 16px;
+      height: 32px;
+    }
+    :deep(.ant-picker),:deep(.ant-input-number){
+      width: 100%;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/bg/bqtakepulse/V20260605_1__menu_insert_BgTakepulse.sql b/src/views/bg/bqtakepulse/V20260605_1__menu_insert_BgTakepulse.sql
new file mode 100644
index 0000000..77665f9
--- /dev/null
+++ b/src/views/bg/bqtakepulse/V20260605_1__menu_insert_BgTakepulse.sql
@@ -0,0 +1,26 @@
+-- 注意：该页面对应的前台目录为views/bqtakepulse文件夹下
+-- 如果你想更改到其他目录，请修改sql中component字段对应的值
+
+
+INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external)
+VALUES ('2026060503311050210', NULL, '我为四所把把脉', '/bg/bqtakepulse/bgTakepulseList', 'bg/bqtakepulse/BgTakepulseList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2026-06-05 15:31:21', NULL, NULL, 0);
+
+-- 权限控制sql
+-- 新增
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2026060503311060211', '2026060503311050210', '添加我为四所把把脉', NULL, NULL, 0, NULL, NULL, 2, 'bqtakepulse:bg_takepulse:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2026-06-05 15:31:21', NULL, NULL, 0, 0, '1', 0);
+-- 编辑
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2026060503311060212', '2026060503311050210', '编辑我为四所把把脉', NULL, NULL, 0, NULL, NULL, 2, 'bqtakepulse:bg_takepulse:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2026-06-05 15:31:21', NULL, NULL, 0, 0, '1', 0);
+-- 删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2026060503311060213', '2026060503311050210', '删除我为四所把把脉', NULL, NULL, 0, NULL, NULL, 2, 'bqtakepulse:bg_takepulse:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2026-06-05 15:31:21', NULL, NULL, 0, 0, '1', 0);
+-- 批量删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2026060503311060214', '2026060503311050210', '批量删除我为四所把把脉', NULL, NULL, 0, NULL, NULL, 2, 'bqtakepulse:bg_takepulse:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2026-06-05 15:31:21', NULL, NULL, 0, 0, '1', 0);
+-- 导出excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2026060503311060215', '2026060503311050210', '导出excel_我为四所把把脉', NULL, NULL, 0, NULL, NULL, 2, 'bqtakepulse:bg_takepulse:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2026-06-05 15:31:21', NULL, NULL, 0, 0, '1', 0);
+-- 导入excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2026060503311060216', '2026060503311050210', '导入excel_我为四所把把脉', NULL, NULL, 0, NULL, NULL, 2, 'bqtakepulse:bg_takepulse:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2026-06-05 15:31:21', NULL, NULL, 0, 0, '1', 0);
diff --git a/src/views/bg/bqtakepulse/components/BgTakepulseForm.vue b/src/views/bg/bqtakepulse/components/BgTakepulseForm.vue
new file mode 100644
index 0000000..ac6e325
--- /dev/null
+++ b/src/views/bg/bqtakepulse/components/BgTakepulseForm.vue
@@ -0,0 +1,399 @@
+<template>
+  <a-spin :spinning="loading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form v-bind="formItemLayout" name="BgTakepulseForm" ref="formRef">
+          <a-row>
+						<a-col :span="12">
+							<a-form-item label="密级" v-bind="validateInfos.secretLevel" id="BgTakepulseForm-secretLevel" name="secretLevel">
+								<j-dict-select-tag v-model:value="formData.secretLevel" dictCode="secret_level" placeholder="请选择密级"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="年份" v-bind="validateInfos.year" id="BgTakepulseForm-year" name="year">
+								<j-dict-select-tag v-model:value="formData.year" dictCode="super_year" placeholder="请选择年份"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="序号" v-bind="validateInfos.number" id="BgTakepulseForm-number" name="number">
+								<a-input v-model:value="formData.number" placeholder="请输入序号"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="会议类型：行政线、技术线" v-bind="validateInfos.taskType" id="BgTakepulseForm-taskType" name="taskType">
+								<j-dict-select-tag v-model:value="formData.taskType" dictCode="super_takepulse_type" placeholder="请选择会议类型：行政线、技术线"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="类别：党的建设等其他" v-bind="validateInfos.type" id="BgTakepulseForm-type" name="type">
+								<a-input v-model:value="formData.type" placeholder="请输入类别：党的建设等其他"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="提出人" v-bind="validateInfos.proposer" id="BgTakepulseForm-proposer" name="proposer">
+						<j-select-user v-model:value="formData.proposer"      allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="意见主题" v-bind="validateInfos.title" id="BgTakepulseForm-title" name="title">
+								<a-input v-model:value="formData.title" placeholder="请输入意见主题"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="具体意见" v-bind="validateInfos.content" id="BgTakepulseForm-content" name="content">
+								<a-textarea v-model:value="formData.content" :rows="4" placeholder="请输入具体意见" />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="责任领导" v-bind="validateInfos.suoleader" id="BgTakepulseForm-suoleader" name="suoleader">
+						<j-select-user v-model:value="formData.suoleader"      allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="牵头部门" v-bind="validateInfos.responDeptid" id="BgTakepulseForm-responDeptid" name="responDeptid">
+								<j-select-dept v-model:value="formData.responDeptid"       :multiple="true" checkStrictly  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="协办部门" v-bind="validateInfos.assistDeptid" id="BgTakepulseForm-assistDeptid" name="assistDeptid">
+								<j-select-dept v-model:value="formData.assistDeptid"       :multiple="true" checkStrictly  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="落实部门" v-bind="validateInfos.implementDeptid" id="BgTakepulseForm-implementDeptid" name="implementDeptid">
+								<a-input v-model:value="formData.implementDeptid" placeholder="请输入落实部门"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="是否采纳" v-bind="validateInfos.isAdopt" id="BgTakepulseForm-isAdopt" name="isAdopt">
+								<j-switch v-model:value="formData.isAdopt"  ></j-switch>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="落实措施/解释说明" v-bind="validateInfos.measure" id="BgTakepulseForm-measure" name="measure">
+								<a-textarea v-model:value="formData.measure" :rows="4" placeholder="请输入落实措施/解释说明" />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="措施数量" v-bind="validateInfos.measureNumber" id="BgTakepulseForm-measureNumber" name="measureNumber">
+								<a-input-number v-model:value="formData.measureNumber" placeholder="请输入措施数量" style="width: 100%" />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="成果形式" v-bind="validateInfos.achievement" id="BgTakepulseForm-achievement" name="achievement">
+								<a-textarea v-model:value="formData.achievement" :rows="4" placeholder="请输入成果形式" />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="要求完成日期" v-bind="validateInfos.deadline" id="BgTakepulseForm-deadline" name="deadline">
+								<a-date-picker placeholder="请选择要求完成日期"  v-model:value="formData.deadline" value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="备注" v-bind="validateInfos.remark" id="BgTakepulseForm-remark" name="remark">
+								<a-input v-model:value="formData.remark" placeholder="请输入备注"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="执行情况" v-bind="validateInfos.actualExect" id="BgTakepulseForm-actualExect" name="actualExect">
+								<a-textarea v-model:value="formData.actualExect" :rows="4" placeholder="请输入执行情况" />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="实际完成时间" v-bind="validateInfos.actualTime" id="BgTakepulseForm-actualTime" name="actualTime">
+								<a-date-picker placeholder="请选择实际完成时间"  v-model:value="formData.actualTime" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="提出人确认" v-bind="validateInfos.proposerConfirm" id="BgTakepulseForm-proposerConfirm" name="proposerConfirm">
+								<a-input v-model:value="formData.proposerConfirm" placeholder="请输入提出人确认"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="完成状态" v-bind="validateInfos.bpmStatus" id="BgTakepulseForm-bpmStatus" name="bpmStatus">
+								<j-dict-select-tag v-model:value="formData.bpmStatus" dictCode="super_status" placeholder="请选择完成状态"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="调整落实措施及执行情况" v-bind="validateInfos.actSt" id="BgTakepulseForm-actSt" name="actSt">
+								<a-textarea v-model:value="formData.actSt" :rows="4" placeholder="请输入调整落实措施及执行情况" />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="督办次数" v-bind="validateInfos.superviseCount" id="BgTakepulseForm-superviseCount" name="superviseCount">
+								<a-input v-model:value="formData.superviseCount" placeholder="请输入督办次数"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="紧急程度" v-bind="validateInfos.urgencyLevel" id="BgTakepulseForm-urgencyLevel" name="urgencyLevel">
+								<a-input v-model:value="formData.urgencyLevel" placeholder="请输入紧急程度"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="是否需要所办领导审批" v-bind="validateInfos.isNeedAppro" id="BgTakepulseForm-isNeedAppro" name="isNeedAppro">
+								<j-switch v-model:value="formData.isNeedAppro"  ></j-switch>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="所办领导" v-bind="validateInfos.supDeptleaderid" id="BgTakepulseForm-supDeptleaderid" name="supDeptleaderid">
+						<j-select-user v-model:value="formData.supDeptleaderid"      allow-clear />
+							</a-form-item>
+						</a-col>
+          </a-row>
+        </a-form>
+      </template>
+    </JFormContainer>
+
+		<!-- 子表单区域 -->
+    <a-tabs v-model:activeKey="activeKey" animated style="overflow:hidden;">
+      <a-tab-pane tab="执行情况反馈" key="bgTakepulseFeedback" :forceRender="true">
+        <j-vxe-table
+          :keep-source="true"
+          resizable
+          ref="bgTakepulseFeedbackTableRef"
+          :loading="bgTakepulseFeedbackTable.loading"
+          :columns="bgTakepulseFeedbackTable.columns"
+          :dataSource="bgTakepulseFeedbackTable.dataSource"
+          :height="340"
+          :disabled="disabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          :toolbar="true"/>
+      </a-tab-pane>
+    </a-tabs>
+    <div v-if="showFlowSubmitButton" :span="24" style="width: 100%;text-align: center;margin-top: 10px">
+      <a-button preIcon="ant-design:check-outlined" style="width: 126px" type="primary" @click="submitForm">提 交</a-button>
+    </div>
+  </a-spin>
+</template>
+
+<script lang="ts">
+  import { defineComponent, ref, reactive, computed, toRaw, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
+  import { queryBgTakepulseFeedbackListByMainId, queryDataById, saveOrUpdate } from '../BgTakepulse.api';
+  import { JVxeTable } from '/@/components/jeecg/JVxeTable';
+  import {bgTakepulseFeedbackColumns} from '../BgTakepulse.data';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue';
+  import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
+  import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
+  import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+  import { Form } from 'ant-design-vue';
+  const useForm = Form.useForm;
+
+  export default defineComponent({
+    name: "BgTakepulseForm",
+    components:{
+      JDictSelectTag,
+      JSwitch,
+      JSelectDept,
+      JSelectUser,
+      JVxeTable,
+			JFormContainer,
+    },
+    props:{
+      formDisabled:{
+        type: Boolean,
+        default: false
+      },
+      formData: { type: Object, default: ()=>{} },
+      formBpm: { type: Boolean, default: true }
+    },
+    emits:['success'],
+    setup(props, {emit}) {
+      const loading = ref(false);
+      const formRef = ref();
+      const bgTakepulseFeedbackTableRef = ref();
+      const bgTakepulseFeedbackTable = reactive<Record<string, any>>({
+        loading: false,
+        columns: bgTakepulseFeedbackColumns,
+        dataSource: []
+      });
+      const activeKey = ref('bgTakepulseFeedback');
+      const formData = reactive<Record<string, any>>({
+        id: '',
+        secretLevel: '',   
+        year: '',   
+        number: '',   
+        taskType: '',   
+        type: '',   
+        proposer: '',   
+        title: '',   
+        content: '',   
+        suoleader: '',   
+        responDeptid: '',   
+        assistDeptid: '',   
+        implementDeptid: '',   
+        isAdopt: '',   
+        measure: '',   
+        measureNumber: undefined,
+        achievement: '',   
+        deadline: '',   
+        remark: '',   
+        actualExect: '',   
+        actualTime: '',   
+        proposerConfirm: '',   
+        bpmStatus: '',   
+        actSt: '',   
+        superviseCount: '',   
+        urgencyLevel: '',   
+        isNeedAppro: '',   
+        supDeptleaderid: '',   
+        delFlag: '',   
+      });
+
+      //表单验证
+      const validatorRules = reactive({
+      });
+      const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: false});
+      const dbData = {};
+      const formItemLayout = {
+        labelCol: {xs: {span: 24}, sm: {span: 5}},
+        wrapperCol: {xs: {span: 24}, sm: {span: 16}},
+      };
+
+      // 表单禁用
+      const disabled = computed(()=>{
+        if(props.formBpm === true){
+          if(props.formData.disabled === false){
+            return false;
+          }else{
+            return true;
+          }
+        }
+        return props.formDisabled;
+      });
+
+      onMounted(()=>{
+        initFormData();
+      });
+      //渲染流程表单数据
+      const queryByIdUrl = '/bqtakepulse/bgTakepulse/queryById';
+      async function initFormData(){
+        if(props.formBpm === true){
+          let params = {id: props.formData.dataId};
+          const row = await defHttp.get({url: queryByIdUrl, params});
+          //设置表单的值
+          Object.keys(row).map(k => {
+            formData[k] = row[k];
+          });
+          //子表数据
+          const bgTakepulseFeedbackDataList = await queryBgTakepulseFeedbackListByMainId(row['id']);
+          bgTakepulseFeedbackTable.dataSource = [...bgTakepulseFeedbackDataList];
+        }
+      }
+      // 是否显示提交按钮
+      const showFlowSubmitButton = computed(()=>{
+        if(props.formBpm === true){
+          if(props.formData.disabled === false){
+            return true
+          }
+        }
+        return false
+      });
+      
+
+      function add() {
+        resetFields();
+        bgTakepulseFeedbackTable.dataSource = [];
+      }
+
+      async function edit(row) {
+        //主表数据
+        await queryMainData(row.id);
+        //子表数据
+        const bgTakepulseFeedbackDataList = await queryBgTakepulseFeedbackListByMainId(row['id']);
+        bgTakepulseFeedbackTable.dataSource = [...bgTakepulseFeedbackDataList];
+      }
+
+      async function queryMainData(id) {
+        const row = await queryDataById(id);
+        resetFields();
+        const tmpData = {};
+        Object.keys(formData).forEach((key) => {
+          if(row.hasOwnProperty(key)){
+            tmpData[key] = row[key]
+          }
+        })
+        //赋值
+        Object.assign(formData,tmpData);
+      }
+
+      const {getSubFormAndTableData, transformData} = useValidateAntFormAndTable(activeKey, {
+        'bgTakepulseFeedback': bgTakepulseFeedbackTableRef,
+      });
+
+      async function getFormData() {
+        try {
+          // 触发表单验证
+          await validate();
+        } catch ({ errorFields }) {
+          if (errorFields) {
+            const firstField = errorFields[0];
+            if (firstField) {
+              formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+            }
+          }
+          return Promise.reject(errorFields);
+        }
+        return transformData(toRaw(formData))
+      }
+
+      async function submitForm() {
+        const mainData = await getFormData();
+        const subData = await getSubFormAndTableData();
+        const values = Object.assign({}, dbData, mainData, subData);
+        console.log('表单提交数据', values)
+        const isUpdate = values.id ? true : false
+        await saveOrUpdate(values, isUpdate);
+        //关闭弹窗
+        emit('success');
+      }
+      
+      function setFieldsValue(values) {
+        if(values){
+          Object.keys(values).map(k=>{
+            formData[k] = values[k];
+          });
+        }
+      }
+
+      /**
+       * 值改变事件触发-树控件回调
+       * @param key
+       * @param value
+       */
+      function handleFormChange(key, value) {
+        formData[key] = value;
+      }
+
+
+      return {
+        bgTakepulseFeedbackTableRef,
+        bgTakepulseFeedbackTable,
+        validatorRules,
+        validateInfos,
+        activeKey,
+        loading,
+        formData,
+        setFieldsValue,
+        handleFormChange,
+        formItemLayout,
+        disabled,
+        showFlowSubmitButton,
+        getFormData,
+        submitForm,
+        add,
+        edit,
+        formRef,
+      }
+    }
+  });
+</script>
+<style lang="less" scoped>
+  .ant-tabs-tabpane.sub-one-form {
+    max-height: 340px;
+    overflow: auto;
+  }
+</style>
diff --git a/src/views/bg/bqtakepulse/components/BgTakepulseModal.vue b/src/views/bg/bqtakepulse/components/BgTakepulseModal.vue
new file mode 100644
index 0000000..7cb9bef
--- /dev/null
+++ b/src/views/bg/bqtakepulse/components/BgTakepulseModal.vue
@@ -0,0 +1,67 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" :width="896" @ok="handleSubmit">
+    <bg-takepulse-form ref="formComponent" :formDisabled="formDisabled" :formBpm="false" @success="submitSuccess"></bg-takepulse-form>
+  </BasicModal>
+</template>
+
+<script lang="ts">
+  import { ref, unref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import BgTakepulseForm from './BgTakepulseForm.vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  const { createMessage } = useMessage();
+  export default {
+    name: "TestCgMainVxeModal",
+    components:{
+      BasicModal,
+      BgTakepulseForm
+    },
+    emits:['register','success'],
+    setup(_p, {emit}){
+      const formComponent = ref()
+      const isUpdate = ref(true);
+      const formDisabled = ref(false);
+      const title = ref('')
+
+      //表单赋值
+      const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        setModalProps({confirmLoading: false,showCancelBtn:data?.showFooter,showOkBtn:data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        formDisabled.value = !data?.showFooter;
+        title.value = data?.isUpdate ? (unref(formDisabled) ? '详情' : '编辑') : '新增';
+        if (unref(isUpdate)) {
+          formComponent.value.edit(data.record)
+        }else{
+          formComponent.value.add()
+        }
+      });
+
+      function handleSubmit() {
+        formComponent.value.submitForm();
+      }
+
+      function submitSuccess(){
+        emit('success');
+        closeModal();
+      }
+      return {
+        registerModal,
+        title,
+        formComponent,
+        formDisabled,
+        handleSubmit,
+        submitSuccess,
+      }
+    }
+  }
+</script>
+<style lang="less" scoped>
+	/** 时间和数字输入框样式 */
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+
+  :deep(.ant-calendar-picker) {
+    width: 100%;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/system/loginmini/MiniLogin.vue b/src/views/system/loginmini/MiniLogin.vue
index 7501945..15ad914 100644
--- a/src/views/system/loginmini/MiniLogin.vue
+++ b/src/views/system/loginmini/MiniLogin.vue
@@ -1,321 +1,95 @@
 <template>
-  <div :class="prefixCls" class="login-background-img">
-    <AppLocalePicker class="absolute top-4 right-4 enter-x xl:text-gray-600" :showText="false"/>
-    <AppDarkModeToggle class="absolute top-3 right-7 enter-x" />
-    <div class="aui-logo" v-if="!getIsMobile">
-      <div>
-        <h3>
-          <img :src="logoImg" alt="jeecg" />
-        </h3>
+  <div class="login-wrapper">
+    <div class="decorations">
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="line line-1"></span>
+      <span class="line line-2"></span>
+      <span class="line line-3"></span>
+    </div>
+    <div class="login-main">
+      <!-- 研究所标识 -->
+      <div class="institute-logo">
+        <img src="/resource/img/institute_logo.png" alt="七〇四研究所" />
+      </div>
+
+      <!-- 系统标题 -->
+      <div class="system-title">
+        <img class="system-logo" src="/resource/img/logo.png" alt="Logo" />
+        <span class="system-name">事项督办系统</span>
+      </div>
+
+      <!-- 登录表单 -->
+      <div class="login-form">
+        <a-input
+          class="form-input"
+          size="large"
+          placeholder="请输入账号"
+          v-model:value="formData.username"
+          @keyup.enter="handleLogin"
+        />
+        <a-input-password
+          class="form-input"
+          size="large"
+          placeholder="请输入密码"
+          v-model:value="formData.password"
+          @keyup.enter="handleLogin"
+        />
+        <button class="login-btn" :disabled="loginLoading" @click="handleLogin">
+          {{ loginLoading ? '登录中...' : '登 录' }}
+        </button>
       </div>
     </div>
-    <div v-else class="aui-phone-logo">
-      <img :src="logoImg" alt="jeecg" />
+
+    <!-- 底部版权 -->
+    <div class="footer-text">
+      中国船舶集团有限公司第七〇四研究所 数智化中心@2026
     </div>
-    <div v-show="type === 'login'">
-      <div class="aui-content">
-        <div class="aui-container">
-          <div class="aui-form">
-            <div class="aui-image">
-              <div class="aui-image-text">
-                <img :src="adTextImg" />
-              </div>
-            </div>
-            <div class="aui-formBox">
-              <div class="aui-formWell">
-                <div class="aui-flex aui-form-nav investment_title">
-                  <div class="aui-flex-box" :class="activeIndex === 'accountLogin' ? 'activeNav on' : ''" @click="loginClick('accountLogin')"
-                    >{{ t('sys.login.signInFormTitle') }}
-                  </div>
-                  <div class="aui-flex-box" :class="activeIndex === 'phoneLogin' ? 'activeNav on' : ''" @click="loginClick('phoneLogin')"
-                    >{{ t('sys.login.mobileSignInFormTitle') }}
-                  </div>
-                </div>
-                <div class="aui-form-box" style="height: 180px">
-                  <a-form ref="loginRef" :model="formData" v-if="activeIndex === 'accountLogin'" @keyup.enter.native="loginHandleClick">
-                    <div class="aui-account">
-                      <div class="aui-inputClear">
-                        <i class="icon icon-code"></i>
-                        <a-form-item>
-                          <a-input class="fix-auto-fill" :placeholder="t('sys.login.userName')" v-model:value="formData.username" />
-                        </a-form-item>
-                      </div>
-                      <div class="aui-inputClear">
-                        <i class="icon icon-password"></i>
-                        <a-form-item>
-                          <a-input class="fix-auto-fill" type="password" :placeholder="t('sys.login.password')" v-model:value="formData.password" />
-                        </a-form-item>
-                      </div>
-                      <div class="aui-inputClear">
-                        <i class="icon icon-code"></i>
-                        <a-form-item>
-                          <a-input class="fix-auto-fill" type="text" :placeholder="t('sys.login.inputCode')" v-model:value="formData.inputCode" />
-                        </a-form-item>
-                        <div class="aui-code">
-                          <img v-if="randCodeData.requestCodeSuccess" :src="randCodeData.randCodeImage" @click="handleChangeCheckCode" />
-                          <img v-else style="margin-top: 2px; max-width: initial" :src="codeImg" @click="handleChangeCheckCode" />
-                        </div>
-                      </div>
-                      <div class="aui-flex">
-                        <div class="aui-flex-box">
-                          <div class="aui-choice">
-                            <a-input class="fix-auto-fill" type="checkbox" v-model:value="rememberMe" />
-                            <span style="margin-left: 5px">{{ t('sys.login.rememberMe') }}</span>
-                          </div>
-                        </div>
-                        <div class="aui-forget">
-                          <a @click="forgetHandelClick"> {{ t('sys.login.forgetPassword') }}</a>
-                        </div>
-                      </div>
-                    </div>
-                  </a-form>
-                  <a-form v-else ref="phoneFormRef" :model="phoneFormData" @keyup.enter.native="loginHandleClick">
-                    <div class="aui-account phone">
-                      <div class="aui-inputClear phoneClear">
-                        <a-input class="fix-auto-fill" :placeholder="t('sys.login.mobile')" v-model:value="phoneFormData.mobile" />
-                      </div>
-                      <div class="aui-inputClear">
-                        <a-input class="fix-auto-fill" :maxlength="6" :placeholder="t('sys.login.smsCode')" v-model:value="phoneFormData.smscode" />
-                        <div v-if="showInterval" class="aui-code" @click="getLoginCode">
-                          <a>{{ t('component.countdown.normalText') }}</a>
-                        </div>
-                        <div v-else class="aui-code">
-                          <span class="aui-get-code code-shape">{{ t('component.countdown.sendText', [unref(timeRuning)]) }}</span>
-                        </div>
-                      </div>
-                    </div>
-                  </a-form>
-                </div>
-                <div class="aui-formButton">
-                  <div class="aui-flex">
-                    <a-button :loading="loginLoading" class="aui-link-login" type="primary" @click="loginHandleClick">
-                      {{ t('sys.login.loginButton') }}</a-button>
-                  </div>
-                  <div class="aui-flex">
-                    <a class="aui-linek-code aui-flex-box" @click="codeHandleClick">{{ t('sys.login.qrSignInFormTitle') }}</a>
-                  </div>
-                  <div class="aui-flex">
-                    <a class="aui-linek-code aui-flex-box" @click="registerHandleClick">{{ t('sys.login.registerButton') }}</a>
-                  </div>
-                </div>
-              </div>
-              <a-form @keyup.enter.native="loginHandleClick">
-                <div class="aui-flex aui-third-text">
-                  <div class="aui-flex-box aui-third-border">
-                    <span>{{ t('sys.login.otherSignIn') }}</span>
-                  </div>
-                </div>
-                <div class="aui-flex" :class="`${prefixCls}-sign-in-way`">
-                  <div class="aui-flex-box">
-                    <div class="aui-third-login">
-                      <a title="github" @click="onThirdLogin('github')"><GithubFilled /></a>
-                    </div>
-                  </div>
-                  <div class="aui-flex-box">
-                    <div class="aui-third-login">
-                      <a title="企业微信" @click="onThirdLogin('wechat_enterprise')"><icon-font class="item-icon" type="icon-qiyeweixin3" /></a>
-                    </div>
-                  </div>
-                  <div class="aui-flex-box">
-                    <div class="aui-third-login">
-                      <a title="钉钉" @click="onThirdLogin('dingtalk')"><DingtalkCircleFilled /></a>
-                    </div>
-                  </div>
-                  <div class="aui-flex-box">
-                    <div class="aui-third-login">
-                      <a title="微信" @click="onThirdLogin('wechat_open')"><WechatFilled /></a>
-                    </div>
-                  </div>
-                </div>
-              </a-form>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div v-show="type === 'forgot'" :class="`${prefixCls}-form`">
-      <MiniForgotpad ref="forgotRef" @go-back="goBack" @success="handleSuccess" />
-    </div>
-    <div v-show="type === 'register'" :class="`${prefixCls}-form`">
-      <MiniRegister ref="registerRef" @go-back="goBack" @success="handleSuccess" />
-    </div>
-    <div v-show="type === 'codeLogin'" :class="`${prefixCls}-form`">
-      <MiniCodelogin ref="codeRef" @go-back="goBack" @success="handleSuccess" />
-    </div>
-    <!-- 第三方登录相关弹框 -->
-    <ThirdModal ref="thirdModalRef"></ThirdModal>
-    
-    <!-- 图片验证码弹窗 -->
-    <CaptchaModal @register="captchaRegisterModal" @ok="getLoginCode" />
   </div>
 </template>
-<script lang="ts" setup name="login-mini">
-  import { getCaptcha, getCodeInfo } from '/@/api/sys/user';
-  import { computed, onMounted, reactive, ref, toRaw, unref } from 'vue';
-  import codeImg from '/@/assets/images/checkcode.png';
-  import { Rule } from '/@/components/Form';
+
+<script lang="ts" setup>
+  import { reactive, ref } from 'vue';
   import { useUserStore } from '/@/store/modules/user';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useI18n } from '/@/hooks/web/useI18n';
-  import { SmsEnum } from '/@/views/sys/login/useLogin';
-  import ThirdModal from '/@/views/sys/login/ThirdModal.vue';
-  import MiniForgotpad from './MiniForgotpad.vue';
-  import MiniRegister from './MiniRegister.vue';
-  import MiniCodelogin from './MiniCodelogin.vue';
-  import logoImg from '/@/assets/loginmini/icon/jeecg_logo.png';
-  import adTextImg from '/@/assets/loginmini/icon/jeecg_ad_text.png';
-  import { AppLocalePicker, AppDarkModeToggle } from '/@/components/Application';
-  import { useLocaleStore } from '/@/store/modules/locale';
-  import { useDesign } from "/@/hooks/web/useDesign";
-  import { useAppInject } from "/@/hooks/web/useAppInject";
-  import { GithubFilled, WechatFilled, DingtalkCircleFilled, createFromIconfontCN } from '@ant-design/icons-vue';
-  import CaptchaModal from '@/components/jeecg/captcha/CaptchaModal.vue';
-  import { useModal } from "@/components/Modal";
-  import { ExceptionEnum } from "@/enums/exceptionEnum";
 
-  const IconFont = createFromIconfontCN({
-    scriptUrl: '//at.alicdn.com/t/font_2316098_umqusozousr.js',
-  });
-  const { prefixCls } = useDesign('mini-login');
   const { notification, createMessage } = useMessage();
   const userStore = useUserStore();
   const { t } = useI18n();
-  const localeStore = useLocaleStore();
-  const showLocale = localeStore.getShowPicker;
-  const randCodeData = reactive<any>({
-    randCodeImage: '',
-    requestCodeSuccess: false,
-    checkKey: null,
-  });
-  const rememberMe = ref<string>('0');
-  //手机号登录还是账号登录
-  const activeIndex = ref<string>('accountLogin');
-  const type = ref<string>('login');
-  //账号登录表单字段
-  const formData = reactive<any>({
-    inputCode: '',
-    username: 'admin',
-    password: '123456',
-  });
-  //手机登录表单字段
-  const phoneFormData = reactive<any>({
-    mobile: '',
-    smscode: '',
-  });
-  const loginRef = ref();
-  //第三方登录弹窗
-  const thirdModalRef = ref();
-  //扫码登录
-  const codeRef = ref();
-  //是否显示获取验证码
-  const showInterval = ref<boolean>(true);
-  //60s
-  const timeRuning = ref<number>(60);
-  //定时器
-  const timer = ref<any>(null);
-  //忘记密码
-  const forgotRef = ref();
-  //注册
-  const registerRef = ref();
-  const loginLoading = ref<boolean>(false);
-  const { getIsMobile } = useAppInject();
-  const [captchaRegisterModal, { openModal: openCaptchaModal }] = useModal();
-  defineProps({
-    sessionTimeout: {
-      type: Boolean,
-    },
+
+  const loginLoading = ref(false);
+
+  const formData = reactive({
+    username: '',
+    password: '',
   });
 
-  /**
-   * 获取验证码
-   */
-  function handleChangeCheckCode() {
-    formData.inputCode = '';
-    //update-begin---author:chenrui ---date:2025/1/7  for：[QQYUN-10775]验证码可以复用 #7674------------
-    randCodeData.checkKey = new Date().getTime() + Math.random().toString(36).slice(-4); // 1629428467008;
-    //update-end---author:chenrui ---date:2025/1/7  for：[QQYUN-10775]验证码可以复用 #7674------------
-    getCodeInfo(randCodeData.checkKey).then((res) => {
-      randCodeData.randCodeImage = res;
-      randCodeData.requestCodeSuccess = true;
-    });
-  }
-
-  /**
-   * 切换登录方式
-   */
-  function loginClick(type) {
-    activeIndex.value = type;
-  }
-
-  /**
-   * 账号或者手机登录
-   */
-  async function loginHandleClick() {
-    if (unref(activeIndex) === 'accountLogin') {
-      accountLogin();
-    } else {
-      //手机号登录
-      phoneLogin();
-    }
-  }
-
-  async function accountLogin() {
+  async function handleLogin() {
     if (!formData.username) {
-      createMessage.warn(t('sys.login.accountPlaceholder'));
+      createMessage.warn('请输入账号');
       return;
     }
     if (!formData.password) {
-      createMessage.warn(t('sys.login.passwordPlaceholder'));
+      createMessage.warn('请输入密码');
       return;
     }
     try {
       loginLoading.value = true;
-      const { userInfo } = await userStore.login(
-        toRaw({
-          password: formData.password,
-          username: formData.username,
-          captcha: formData.inputCode,
-          checkKey: randCodeData.checkKey,
-          mode: 'none', //不要默认的错误提示
-        })
-      );
-      if (userInfo) {
-        notification.success({
-          message: t('sys.login.loginSuccessTitle'),
-          description: `${t('sys.login.loginSuccessDesc')}: ${userInfo.realname}`,
-          duration: 3,
-        });
-      }
-    } catch (error) {
-      notification.error({
-        message: t('sys.api.errorTip'),
-        description: error.message || t('sys.login.networkExceptionMsg'),
-        duration: 3,
-      });
-      handleChangeCheckCode();
-    } finally {
-      loginLoading.value = false;
-    }
-  }
-
-  /**
-   * 手机号登录
-   */
-  async function phoneLogin() {
-    if (!phoneFormData.mobile) {
-      createMessage.warn(t('sys.login.mobilePlaceholder'));
-      return;
-    }
-    if (!phoneFormData.smscode) {
-      createMessage.warn(t('sys.login.smsPlaceholder'));
-      return;
-    }
-    try {
-      loginLoading.value = true;
-      const { userInfo }: any = await userStore.phoneLogin({
-        mobile: phoneFormData.mobile,
-        captcha: phoneFormData.smscode,
-        mode: 'none', //不要默认的错误提示
+      const { userInfo } = await userStore.login({
+        password: formData.password,
+        username: formData.username,
+        mode: 'none',
       });
       if (userInfo) {
         notification.success({
@@ -324,7 +98,7 @@
           duration: 3,
         });
       }
-    } catch (error) {
+    } catch (error: any) {
       notification.error({
         message: t('sys.api.errorTip'),
         description: error.message || t('sys.login.networkExceptionMsg'),
@@ -334,241 +108,280 @@
       loginLoading.value = false;
     }
   }
-
-  /**
-   * 获取手机验证码
-   */
-  async function getLoginCode() {
-    if (!phoneFormData.mobile) {
-      createMessage.warn(t('sys.login.mobilePlaceholder'));
-      return;
-    }
-    //update-begin---author:wangshuai---date:2024-04-18---for:【QQYUN-9005】同一个IP，1分钟超过5次短信，则提示需要验证码---
-    const result = await getCaptcha({ mobile: phoneFormData.mobile, smsmode: SmsEnum.FORGET_PASSWORD }).catch((res) =>{
-      if(res.code === ExceptionEnum.PHONE_SMS_FAIL_CODE){
-        openCaptchaModal(true, {});
-      }
-    });
-    //update-end---author:wangshuai---date:2024-04-18---for:【QQYUN-9005】同一个IP，1分钟超过5次短信，则提示需要验证码---
-    if (result) {
-      const TIME_COUNT = 60;
-      if (!unref(timer)) {
-        timeRuning.value = TIME_COUNT;
-        showInterval.value = false;
-        timer.value = setInterval(() => {
-          if (unref(timeRuning) > 0 && unref(timeRuning) <= TIME_COUNT) {
-            timeRuning.value = timeRuning.value - 1;
-          } else {
-            showInterval.value = true;
-            clearInterval(unref(timer));
-            timer.value = null;
-          }
-        }, 1000);
-      }
-    }
-  }
-
-  /**
-   * 第三方登录
-   * @param type
-   */
-  function onThirdLogin(type) {
-    thirdModalRef.value.onThirdLogin(type);
-  }
-
-  /**
-   * 忘记密码
-   */
-  function forgetHandelClick() {
-    type.value = 'forgot';
-    setTimeout(() => {
-      forgotRef.value.initForm();
-    }, 300);
-  }
-
-  /**
-   * 返回登录页面
-   */
-  function goBack() {
-    activeIndex.value = 'accountLogin';
-    type.value = 'login';
-  }
-
-  /**
-   * 忘记密码/注册账号回调事件
-   * @param value
-   */
-  function handleSuccess(value) {
-    Object.assign(formData, value);
-    Object.assign(phoneFormData, { mobile: "", smscode: "" });
-    type.value = 'login';
-    activeIndex.value = 'accountLogin';
-    handleChangeCheckCode();
-  }
-
-  /**
-   * 注册
-   */
-  function registerHandleClick() {
-    type.value = 'register';
-    setTimeout(() => {
-      registerRef.value.initForm();
-    }, 300);
-  }
-
-  /**
-   * 注册
-   */
-  function codeHandleClick() {
-    type.value = 'codeLogin';
-    setTimeout(() => {
-      codeRef.value.initFrom();
-    }, 300);
-  }
-
-  onMounted(() => {
-    //加载验证码
-    handleChangeCheckCode();
-  });
 </script>
 
 <style lang="less" scoped>
-  @import '/@/assets/loginmini/style/home.less';
-  @import '/@/assets/loginmini/style/base.less';
-
-  :deep(.ant-input:focus) {
-    box-shadow: none;
-  }
-  .aui-get-code {
-    float: right;
+  .login-wrapper {
     position: relative;
-    z-index: 3;
-    background: #ffffff;
-    color: #1573e9;
-    border-radius: 100px;
-    padding: 5px 16px;
-    margin: 7px;
-    border: 1px solid #1573e9;
-    top: 12px;
-  }
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    min-height: 100vh;
+    background: #fff;
+    overflow: hidden;
 
-  .aui-get-code:hover {
-    color: #1573e9;
-  }
-
-  .code-shape {
-    border-color: #dadada !important;
-    color: #aaa !important;
-  }
-
-  :deep(.jeecg-dark-switch){
-    position:absolute;
-    margin-right: 10px;
-  }
-  .aui-link-login{
-    height: 42px;
-    padding: 10px 15px;
-    font-size: 14px;
-    border-radius: 8px;
-    margin-top: 15px;
-    margin-bottom: 8px;
-    flex: 1;
-    color: #fff;
-  }
-  .aui-phone-logo{
-    position: absolute;
-    margin-left: 10px;
-    width: 60px;
-    top:2px;
-    z-index: 4;
-  }
-  .top-3{
-    top: 0.45rem;
-  }
-</style>
-
-<style lang="less">
-@prefix-cls: ~'@{namespace}-mini-login';
-@dark-bg: #293146;
-
-html[data-theme='dark'] {
-  .@{prefix-cls} {
-    background-color: @dark-bg !important;
-    background-image: none;
+    &::before,
+    &::after {
+      content: '';
+      position: absolute;
+      border-radius: 50%;
+      opacity: 0.6;
+      pointer-events: none;
+    }
 
     &::before {
-      background-image: url(/@/assets/svg/login-bg-dark.svg);
-    }
-    .aui-inputClear{
-      background-color: #232a3b !important;
-    }
-    .ant-input,
-    .ant-input-password {
-      background-color: #232a3b !important;
+      width: 600px;
+      height: 600px;
+      bottom: -280px;
+      left: -120px;
+      background: radial-gradient(circle, rgba(59, 130, 246, 0.12), transparent 70%);
     }
 
-    .ant-btn:not(.ant-btn-link):not(.ant-btn-primary) {
-      border: 1px solid #4a5569 !important;
+    &::after {
+      width: 500px;
+      height: 500px;
+      bottom: -200px;
+      right: -100px;
+      background: radial-gradient(circle, rgba(16, 185, 129, 0.10), transparent 70%);
+    }
+  }
+
+  .decorations {
+    position: absolute;
+    inset: 0;
+    pointer-events: none;
+    z-index: 0;
+
+    .dot {
+      position: absolute;
+      border-radius: 50%;
+      opacity: 0.55;
     }
 
-    &-form {
-      background: @dark-bg !important;
+    .dot:nth-child(1) {
+      width: 18px;
+      height: 18px;
+      bottom: 22%;
+      left: 12%;
+      background: #3b82f6;
+      opacity: 0.35;
     }
 
-    .app-iconify {
-      color: #fff !important;
-    }
-    .aui-inputClear input,.aui-input-line input,.aui-choice{
-      color: #c9d1d9 !important;
+    .dot:nth-child(2) {
+      width: 12px;
+      height: 12px;
+      bottom: 32%;
+      right: 15%;
+      background: #f59e0b;
+      opacity: 0.45;
     }
 
-    .aui-formBox{
-      background-color: @dark-bg !important;
-    }
-    .aui-third-text span{
-      background-color: @dark-bg !important;
-    }
-    .aui-form-nav .aui-flex-box{
-      color: #c9d1d9 !important;
+    .dot:nth-child(3) {
+      width: 24px;
+      height: 24px;
+      bottom: 15%;
+      left: 30%;
+      background: #10b981;
+      opacity: 0.3;
     }
 
-    .aui-formButton .aui-linek-code{
-      background:  @dark-bg !important;
-      color: white !important;
+    .dot:nth-child(4) {
+      width: 10px;
+      height: 10px;
+      bottom: 28%;
+      right: 28%;
+      background: #8b5cf6;
+      opacity: 0.5;
     }
-    .aui-code-line{
-      border-left: none !important;
-    }
-    .ant-checkbox-inner,.aui-success h3{
-      border-color: #c9d1d9;
-    }
-    //update-begin---author:wangshuai ---date:20230828  for：【QQYUN-6363】这个样式代码有问题，不在里面，导致表达式有问题------------
-    &-sign-in-way {
-      .anticon {
-        font-size: 22px !important;
-        color: #888 !important;
-        cursor: pointer !important;
 
-        &:hover {
-          color: @primary-color !important;
-        }
+    .dot:nth-child(5) {
+      width: 16px;
+      height: 16px;
+      bottom: 18%;
+      left: 55%;
+      background: #ec4899;
+      opacity: 0.35;
+    }
+
+    .dot:nth-child(6) {
+      width: 20px;
+      height: 20px;
+      bottom: 10%;
+      right: 10%;
+      background: #06b6d4;
+      opacity: 0.4;
+    }
+
+    .dot:nth-child(7) {
+      width: 8px;
+      height: 8px;
+      bottom: 35%;
+      left: 20%;
+      background: #f97316;
+      opacity: 0.5;
+    }
+
+    .dot:nth-child(8) {
+      width: 14px;
+      height: 14px;
+      bottom: 8%;
+      left: 45%;
+      background: #6366f1;
+      opacity: 0.4;
+    }
+
+    .dot:nth-child(9) {
+      width: 20px;
+      height: 20px;
+      top: 8%;
+      left: 10%;
+      background: #3b82f6;
+      opacity: 0.25;
+    }
+
+    .dot:nth-child(10) {
+      width: 10px;
+      height: 10px;
+      top: 14%;
+      right: 18%;
+      background: #ec4899;
+      opacity: 0.35;
+    }
+
+    .dot:nth-child(11) {
+      width: 16px;
+      height: 16px;
+      top: 5%;
+      right: 8%;
+      background: #10b981;
+      opacity: 0.3;
+    }
+
+    .dot:nth-child(12) {
+      width: 8px;
+      height: 8px;
+      top: 18%;
+      left: 25%;
+      background: #f59e0b;
+      opacity: 0.4;
+    }
+
+    .line {
+      position: absolute;
+      pointer-events: none;
+      border-radius: 2px;
+      opacity: 0.15;
+    }
+
+    .line-1 {
+      top: 12%;
+      right: 5%;
+      width: 120px;
+      height: 2px;
+      background: #3b82f6;
+      transform: rotate(-15deg);
+    }
+
+    .line-2 {
+      top: 20%;
+      left: 8%;
+      width: 80px;
+      height: 2px;
+      background: #ec4899;
+      transform: rotate(10deg);
+    }
+
+    .line-3 {
+      top: 6%;
+      right: 15%;
+      width: 60px;
+      height: 2px;
+      background: #10b981;
+      transform: rotate(-8deg);
+    }
+  }
+
+  .login-main {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 40px 24px;
+    z-index: 1;
+  }
+
+  .institute-logo {
+    margin-bottom: 48px;
+
+    img {
+      width: 400px;
+      height: auto;
+      display: block;
+    }
+  }
+
+  .system-title {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    margin-bottom: 48px;
+
+    .system-logo {
+      width: 72px;
+      height: 72px;
+    }
+
+    .system-name {
+      font-size: 28px;
+      font-weight: 600;
+      color: #1a1a1a;
+      letter-spacing: 2px;
+    }
+  }
+
+  .login-form {
+    width: 100%;
+    max-width: 360px;
+    padding: 32px;
+    background: #fafbfc;
+    border-radius: 12px;
+
+    .form-input {
+      margin-bottom: 16px;
+    }
+
+    .login-btn {
+      width: 100%;
+      height: 48px;
+      border: none;
+      border-radius: 8px;
+      background: #1a6dd4;
+      color: #fff;
+      font-size: 16px;
+      font-weight: 500;
+      letter-spacing: 2px;
+      cursor: pointer;
+      margin-top: 8px;
+      transition: background 0.2s;
+
+      &:hover {
+        background: #155ab0;
+      }
+
+      &:disabled {
+        background: #93b8e0;
+        cursor: not-allowed;
       }
     }
-    //update-end---author:wangshuai ---date:20230828  for：【QQYUN-6363】这个样式代码有问题，不在里面，导致表达式有问题------------
   }
 
-  input.fix-auto-fill,
-  .fix-auto-fill input {
-    -webkit-text-fill-color: #c9d1d9 !important;
-    box-shadow: inherit !important;
+  .footer-text {
+    position: relative;
+    z-index: 1;
+    text-align: center;
+    font-size: 13px;
+    color: rgba(0, 0, 0, 0.65);
+    padding: 16px 0;
   }
-  
-  .ant-divider-inner-text {
-    font-size: 12px !important;
-    color: @text-color-secondary !important;
-  }
-  .aui-third-login a{
-    background: transparent;
-  }
-}
 </style>