From 7c64b1528f2345ea4627365fc1438847c7f686a3 Mon Sep 17 00:00:00 2001
From: linxd <544554903@qq.com>
Date: Mon, 16 Jun 2025 21:05:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=20,=E5=AE=8C=E5=96=84=E6=B3=A8=E5=86=8C=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/config.ts                              |    1 -
 config/router.config.ts                       |    6 -
 src/components/ApprovalModal/index.tsx        |   32 -
 src/components/Authorized/Authorized.tsx      |   35 -
 src/components/Authorized/AuthorizedRoute.tsx |   33 -
 .../Authorized/CheckPermissions.tsx           |   79 -
 src/components/Authorized/PromiseRender.tsx   |   93 -
 src/components/Authorized/Secured.tsx         |   66 -
 src/components/Authorized/index.tsx           |   11 -
 src/components/Authorized/renderAuthorize.ts  |   30 -
 .../BiddingRoom/components/InstantMessage.js  |  548 ---
 src/components/BiddingRoom/index.js           |  407 --
 src/components/BiddingRoom/index.less         |  131 -
 src/components/BiddingRoom/service.ts         |   95 -
 src/components/Date/Datetime.js               |   38 -
 .../ElecBidEvaluation/BidEvalAppointment.tsx  |  359 --
 .../ElecBidEvaluation/ExpertPhotoUpload.tsx   |  158 -
 .../ElecBidEvaluation/MeetingReservation.tsx  |  276 --
 .../ElecBidEvaluation/ScreenVideoPlay.tsx     |  263 --
 .../ElecBidEvaluation/ScreenWarnBack.tsx      |  215 -
 src/components/ElecBidEvaluation/service.ts   |   99 -
 .../EquityRelation/RelationCharts.tsx         |  109 -
 src/components/EquityRelation/index.tsx       |  289 --
 .../GlobalHeader/AvatarDropdown.tsx           |   90 -
 .../GlobalHeader/NoticeIconView.tsx           |  171 -
 src/components/GlobalHeader/RightContent.tsx  |  116 -
 src/components/GlobalHeader/index.less        |   47 -
 src/components/GlobalHeader/services.ts       |   24 -
 src/components/HeaderDropdown/index.less      |   16 -
 src/components/HeaderDropdown/index.tsx       |   19 -
 src/components/HeaderSearch/index.less        |   30 -
 src/components/HeaderSearch/index.tsx         |  105 -
 src/components/LayLeftMenu/index.less         |   39 -
 src/components/LayLeftMenu/index.tsx          |  627 ---
 src/components/LayLeftMenu/service.ts         |   75 -
 src/components/NoticeIcon/NoticeList.less     |  103 -
 src/components/NoticeIcon/NoticeList.tsx      |  114 -
 src/components/NoticeIcon/index.less          |   35 -
 src/components/NoticeIcon/index.tsx           |  135 -
 src/components/PageLoading/index.tsx          |    5 -
 src/components/Promenu/index.less             |  101 -
 src/components/Promenu/index.tsx              |  329 --
 src/components/Promenu/service/service.ts     |   40 -
 src/components/RiskModal/index.tsx            |   53 -
 src/components/Upload/react-resumable.js      |  533 ---
 src/components/Upload/resumable.js            | 1226 ------
 src/components/Upload/service.ts              |   14 -
 src/components/Upload/spark-md5.js            |  751 ----
 src/components/Upload/style.css               |   36 -
 src/components/richText/braft/index.tsx       |   60 -
 src/components/richText/wang/fullScreen.tsx   |   39 -
 src/components/richText/wang/index.tsx        |  265 --
 src/models/bidev.js                           |  204 -
 src/models/connect.d.ts                       |   30 -
 src/models/dashboard.js                       |  381 --
 src/models/global.ts                          |  138 -
 src/models/setting.ts                         |   37 -
 src/models/user.ts                            |   85 -
 src/models/xsyModel.ts                        |   22 -
 src/pages/401.tsx                             |   67 -
 src/pages/register/DomesticForm.tsx           |  949 -----
 src/pages/register/supplier.tsx               |  103 +-
 .../CommonFormSections.tsx}                   |  347 +-
 src/pages/register/supplier/DomesticForm.tsx  |  315 ++
 src/pages/register/supplier/ForeignForm.tsx   |  318 ++
 src/services/bidev.js                         |   92 -
 src/services/common.ts                        |   29 -
 src/services/dashboard.js                     |   99 -
 src/services/downLoad.ts                      |   13 -
 src/services/download_.ts                     |   56 -
 src/services/login.ts                         |  135 -
 src/services/untilService.ts                  |   45 -
 src/services/user.ts                          |   13 -
 src/utils/AboutAnnouncementHelp.ts            |  105 -
 src/utils/Authorized.ts                       |   19 -
 src/utils/CommonUtils.ts                      |  338 --
 src/utils/CustomerService.ts                  |   69 -
 src/utils/DateUtils.ts                        |  181 -
 src/utils/Download.js                         |  164 -
 src/utils/DownloadNew.tsx                     |  100 -
 src/utils/DownloadUtils.ts                    |  226 --
 src/utils/ExtendUpload/index.tsx              |  173 -
 src/utils/FlowUtils.ts                        |  283 --
 src/utils/IParticipateIn.tsx                  |  369 --
 src/utils/InquiryBox.tsx                      |   32 -
 src/utils/InvitationLetter.tsx                |   84 -
 src/utils/IpassVerification.ts                |  148 -
 src/utils/MessageUtils.ts                     |   59 -
 src/utils/NumberUtils.ts                      |   96 -
 src/utils/PageUtils.ts                        |   87 -
 src/utils/PdfModal/PdfModal.tsx               |  114 -
 src/utils/ReviewReportUpload/index.tsx        |   56 -
 src/utils/RiskPrevention/index.tsx            |   96 -
 src/utils/RiskPrevention/riskStyle.less       |   19 -
 src/utils/RiskPreventionSoft/index.tsx        |  118 -
 src/utils/RiskPreventionSoft/riskStyle.less   |   19 -
 src/utils/SeleApprovalProcess/index.tsx       |   91 -
 src/utils/SeleApprovalProcess/service.ts      |   23 -
 src/utils/SupplierList/index.tsx              |   86 -
 src/utils/SupplierList/index4user.tsx         |   90 -
 src/utils/SupplierList/service.ts             |   47 -
 src/utils/authority.ts                        |   55 -
 src/utils/checkEmpty.ts                       |    7 -
 src/utils/comFormItem.tsx                     |   37 -
 src/utils/isType.js                           |   31 -
 src/utils/lq.style.less                       |  167 -
 src/utils/session.ts                          |  390 --
 src/utils/utils.less                          |   23 -
 src/utils/utils.test.ts                       |   37 -
 src/utils/utils.ts                            |   24 -
 src/utils/zwPlugin.js                         | 3491 -----------------
 111 files changed, 771 insertions(+), 18832 deletions(-)
 delete mode 100644 src/components/ApprovalModal/index.tsx
 delete mode 100644 src/components/Authorized/Authorized.tsx
 delete mode 100644 src/components/Authorized/AuthorizedRoute.tsx
 delete mode 100644 src/components/Authorized/CheckPermissions.tsx
 delete mode 100644 src/components/Authorized/PromiseRender.tsx
 delete mode 100644 src/components/Authorized/Secured.tsx
 delete mode 100644 src/components/Authorized/index.tsx
 delete mode 100644 src/components/Authorized/renderAuthorize.ts
 delete mode 100644 src/components/BiddingRoom/components/InstantMessage.js
 delete mode 100644 src/components/BiddingRoom/index.js
 delete mode 100644 src/components/BiddingRoom/index.less
 delete mode 100644 src/components/BiddingRoom/service.ts
 delete mode 100644 src/components/Date/Datetime.js
 delete mode 100644 src/components/ElecBidEvaluation/BidEvalAppointment.tsx
 delete mode 100644 src/components/ElecBidEvaluation/ExpertPhotoUpload.tsx
 delete mode 100644 src/components/ElecBidEvaluation/MeetingReservation.tsx
 delete mode 100644 src/components/ElecBidEvaluation/ScreenVideoPlay.tsx
 delete mode 100644 src/components/ElecBidEvaluation/ScreenWarnBack.tsx
 delete mode 100644 src/components/ElecBidEvaluation/service.ts
 delete mode 100644 src/components/EquityRelation/RelationCharts.tsx
 delete mode 100644 src/components/EquityRelation/index.tsx
 delete mode 100644 src/components/GlobalHeader/AvatarDropdown.tsx
 delete mode 100644 src/components/GlobalHeader/NoticeIconView.tsx
 delete mode 100644 src/components/GlobalHeader/RightContent.tsx
 delete mode 100644 src/components/GlobalHeader/index.less
 delete mode 100644 src/components/GlobalHeader/services.ts
 delete mode 100644 src/components/HeaderDropdown/index.less
 delete mode 100644 src/components/HeaderDropdown/index.tsx
 delete mode 100644 src/components/HeaderSearch/index.less
 delete mode 100644 src/components/HeaderSearch/index.tsx
 delete mode 100644 src/components/LayLeftMenu/index.less
 delete mode 100644 src/components/LayLeftMenu/index.tsx
 delete mode 100644 src/components/LayLeftMenu/service.ts
 delete mode 100644 src/components/NoticeIcon/NoticeList.less
 delete mode 100644 src/components/NoticeIcon/NoticeList.tsx
 delete mode 100644 src/components/NoticeIcon/index.less
 delete mode 100644 src/components/NoticeIcon/index.tsx
 delete mode 100644 src/components/PageLoading/index.tsx
 delete mode 100644 src/components/Promenu/index.less
 delete mode 100644 src/components/Promenu/index.tsx
 delete mode 100644 src/components/Promenu/service/service.ts
 delete mode 100644 src/components/RiskModal/index.tsx
 delete mode 100644 src/components/Upload/react-resumable.js
 delete mode 100644 src/components/Upload/resumable.js
 delete mode 100644 src/components/Upload/service.ts
 delete mode 100644 src/components/Upload/spark-md5.js
 delete mode 100644 src/components/Upload/style.css
 delete mode 100644 src/components/richText/braft/index.tsx
 delete mode 100644 src/components/richText/wang/fullScreen.tsx
 delete mode 100644 src/components/richText/wang/index.tsx
 delete mode 100644 src/models/bidev.js
 delete mode 100644 src/models/connect.d.ts
 delete mode 100644 src/models/dashboard.js
 delete mode 100644 src/models/global.ts
 delete mode 100644 src/models/setting.ts
 delete mode 100644 src/models/user.ts
 delete mode 100644 src/models/xsyModel.ts
 delete mode 100644 src/pages/401.tsx
 delete mode 100644 src/pages/register/DomesticForm.tsx
 rename src/pages/register/{ForeignForm.tsx => supplier/CommonFormSections.tsx} (66%)
 create mode 100644 src/pages/register/supplier/DomesticForm.tsx
 create mode 100644 src/pages/register/supplier/ForeignForm.tsx
 delete mode 100644 src/services/bidev.js
 delete mode 100644 src/services/common.ts
 delete mode 100644 src/services/dashboard.js
 delete mode 100644 src/services/downLoad.ts
 delete mode 100644 src/services/download_.ts
 delete mode 100644 src/services/login.ts
 delete mode 100644 src/services/untilService.ts
 delete mode 100644 src/services/user.ts
 delete mode 100644 src/utils/AboutAnnouncementHelp.ts
 delete mode 100644 src/utils/Authorized.ts
 delete mode 100644 src/utils/CommonUtils.ts
 delete mode 100644 src/utils/CustomerService.ts
 delete mode 100644 src/utils/DateUtils.ts
 delete mode 100644 src/utils/Download.js
 delete mode 100644 src/utils/DownloadNew.tsx
 delete mode 100644 src/utils/DownloadUtils.ts
 delete mode 100644 src/utils/ExtendUpload/index.tsx
 delete mode 100644 src/utils/FlowUtils.ts
 delete mode 100644 src/utils/IParticipateIn.tsx
 delete mode 100644 src/utils/InquiryBox.tsx
 delete mode 100644 src/utils/InvitationLetter.tsx
 delete mode 100644 src/utils/IpassVerification.ts
 delete mode 100644 src/utils/MessageUtils.ts
 delete mode 100644 src/utils/NumberUtils.ts
 delete mode 100644 src/utils/PageUtils.ts
 delete mode 100644 src/utils/PdfModal/PdfModal.tsx
 delete mode 100644 src/utils/ReviewReportUpload/index.tsx
 delete mode 100644 src/utils/RiskPrevention/index.tsx
 delete mode 100644 src/utils/RiskPrevention/riskStyle.less
 delete mode 100644 src/utils/RiskPreventionSoft/index.tsx
 delete mode 100644 src/utils/RiskPreventionSoft/riskStyle.less
 delete mode 100644 src/utils/SeleApprovalProcess/index.tsx
 delete mode 100644 src/utils/SeleApprovalProcess/service.ts
 delete mode 100644 src/utils/SupplierList/index.tsx
 delete mode 100644 src/utils/SupplierList/index4user.tsx
 delete mode 100644 src/utils/SupplierList/service.ts
 delete mode 100644 src/utils/authority.ts
 delete mode 100644 src/utils/checkEmpty.ts
 delete mode 100644 src/utils/comFormItem.tsx
 delete mode 100644 src/utils/isType.js
 delete mode 100644 src/utils/lq.style.less
 delete mode 100644 src/utils/session.ts
 delete mode 100644 src/utils/utils.less
 delete mode 100644 src/utils/utils.test.ts
 delete mode 100644 src/utils/utils.ts
 delete mode 100644 src/utils/zwPlugin.js

diff --git a/config/config.ts b/config/config.ts
index aa833e0..22ab690 100644
--- a/config/config.ts
+++ b/config/config.ts
@@ -6,7 +6,6 @@ const { REACT_APP_ENV } = process.env;
 export default defineConfig({
   hash: true,
   antd: {
-
   },
   dva: {
     hmr: true,
diff --git a/config/router.config.ts b/config/router.config.ts
index 16fbfb9..143a7ac 100644
--- a/config/router.config.ts
+++ b/config/router.config.ts
@@ -68,12 +68,6 @@ export default [
     ]
   },
 
-  //401错误页
-  {
-    exact: true,
-    path: '/401',
-    component: './401',
-  },
   {
     exact: true,
     path: '/404',
diff --git a/src/components/ApprovalModal/index.tsx b/src/components/ApprovalModal/index.tsx
deleted file mode 100644
index 9aaf56a..0000000
--- a/src/components/ApprovalModal/index.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React, { useMemo } from 'react';
-import { Modal } from 'antd';
-
-interface ApprovalModalProps {
-    modalVisible: boolean;
-    onCancel: () => void;
-    url: string;
-}
-/**
- * 审批流程弹窗
- */
-const ApprovalModal: React.FC<ApprovalModalProps> = (props) => {
-    const { modalVisible, onCancel, url } = props;
-    const iframeContent = useMemo(() => {
-        return url != "" && <iframe width={"100%"} height={500} src={url} />
-    }, [url]);
-    return (
-        <Modal
-            destroyOnClose
-            title="审批流程"
-            visible={modalVisible}
-            width={"80%"}
-            centered
-            onCancel={() => onCancel()}
-            footer={null}
-        >
-            {iframeContent}
-        </Modal>
-    );
-};
-
-export default ApprovalModal;
\ No newline at end of file
diff --git a/src/components/Authorized/Authorized.tsx b/src/components/Authorized/Authorized.tsx
deleted file mode 100644
index d91b7b5..0000000
--- a/src/components/Authorized/Authorized.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import React from 'react';
-import { Result } from 'antd';
-import check, { IAuthorityType } from './CheckPermissions';
-
-import AuthorizedRoute from './AuthorizedRoute';
-import Secured from './Secured';
-
-interface AuthorizedProps {
-  authority: IAuthorityType;
-  noMatch?: React.ReactNode;
-}
-
-type IAuthorizedType = React.FunctionComponent<AuthorizedProps> & {
-  Secured: typeof Secured;
-  check: typeof check;
-  AuthorizedRoute: typeof AuthorizedRoute;
-};
-
-const Authorized: React.FunctionComponent<AuthorizedProps> = ({
-  children,
-  authority,
-  noMatch = (
-    <Result
-      status="403"
-      title="403"
-      subTitle="Sorry, you are not authorized to access this page."
-    />
-  ),
-}) => {
-  const childrenRender: React.ReactNode = typeof children === 'undefined' ? null : children;
-  const dom = check(authority, childrenRender, noMatch);
-  return <>{dom}</>;
-};
-
-export default Authorized as IAuthorizedType;
diff --git a/src/components/Authorized/AuthorizedRoute.tsx b/src/components/Authorized/AuthorizedRoute.tsx
deleted file mode 100644
index c2eb08e..0000000
--- a/src/components/Authorized/AuthorizedRoute.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Redirect, Route } from 'umi';
-
-import React from 'react';
-import Authorized from './Authorized';
-import { IAuthorityType } from './CheckPermissions';
-
-interface AuthorizedRouteProps {
-  currentAuthority: string;
-  component: React.ComponentClass<any, any>;
-  render: (props: any) => React.ReactNode;
-  redirectPath: string;
-  authority: IAuthorityType;
-}
-
-const AuthorizedRoute: React.SFC<AuthorizedRouteProps> = ({
-  component: Component,
-  render,
-  authority,
-  redirectPath,
-  ...rest
-}) => (
-  <Authorized
-    authority={authority}
-    noMatch={<Route {...rest} render={() => <Redirect to={{ pathname: redirectPath }} />} />}
-  >
-    <Route
-      {...rest}
-      render={(props: any) => (Component ? <Component {...props} /> : render(props))}
-    />
-  </Authorized>
-);
-
-export default AuthorizedRoute;
diff --git a/src/components/Authorized/CheckPermissions.tsx b/src/components/Authorized/CheckPermissions.tsx
deleted file mode 100644
index 887bcc1..0000000
--- a/src/components/Authorized/CheckPermissions.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import React from 'react';
-import { CURRENT } from './renderAuthorize';
-// eslint-disable-next-line import/no-cycle
-import PromiseRender from './PromiseRender';
-
-export type IAuthorityType =
-  | undefined
-  | string
-  | string[]
-  | Promise<boolean>
-  | ((currentAuthority: string | string[]) => IAuthorityType);
-
-/**
- * 通用权限检查方法
- * Common check permissions method
- * @param { 权限判定 | Permission judgment } authority
- * @param { 你的权限 | Your permission description } currentAuthority
- * @param { 通过的组件 | Passing components } target
- * @param { 未通过的组件 | no pass components } Exception
- */
-const checkPermissions = <T, K>(
-  authority: IAuthorityType,
-  currentAuthority: string | string[],
-  target: T,
-  Exception: K,
-): T | K | React.ReactNode => {
-  // 没有判定权限.默认查看所有
-  // Retirement authority, return target;
-  if (!authority) {
-    return target;
-  }
-  // 数组处理
-  if (Array.isArray(authority)) {
-    if (Array.isArray(currentAuthority)) {
-      if (currentAuthority.some((item) => authority.includes(item))) {
-        return target;
-      }
-    } else if (authority.includes(currentAuthority)) {
-      return target;
-    }
-    return Exception;
-  }
-  // string 处理
-  if (typeof authority === 'string') {
-    if (Array.isArray(currentAuthority)) {
-      if (currentAuthority.some((item) => authority === item)) {
-        return target;
-      }
-    } else if (authority === currentAuthority) {
-      return target;
-    }
-    return Exception;
-  }
-  // Promise 处理
-  if (authority instanceof Promise) {
-    return <PromiseRender<T, K> ok={target} error={Exception} promise={authority} />;
-  }
-  // Function 处理
-  if (typeof authority === 'function') {
-    const bool = authority(currentAuthority);
-    // 函数执行后返回值是 Promise
-    if (bool instanceof Promise) {
-      return <PromiseRender<T, K> ok={target} error={Exception} promise={bool} />;
-    }
-    if (bool) {
-      return target;
-    }
-    return Exception;
-  }
-  throw new Error('unsupported parameters');
-};
-
-export { checkPermissions };
-
-function check<T, K>(authority: IAuthorityType, target: T, Exception: K): T | K | React.ReactNode {
-  return checkPermissions<T, K>(authority, CURRENT, target, Exception);
-}
-
-export default check;
diff --git a/src/components/Authorized/PromiseRender.tsx b/src/components/Authorized/PromiseRender.tsx
deleted file mode 100644
index 25f2597..0000000
--- a/src/components/Authorized/PromiseRender.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import React from 'react';
-import { Spin } from 'antd';
-import isEqual from 'lodash/isEqual';
-import { isComponentClass } from './Secured';
-// eslint-disable-next-line import/no-cycle
-
-interface PromiseRenderProps<T, K> {
-  ok: T;
-  error: K;
-  promise: Promise<boolean>;
-}
-
-interface PromiseRenderState {
-  component: React.ComponentClass | React.FunctionComponent;
-}
-
-export default class PromiseRender<T, K> extends React.Component<
-  PromiseRenderProps<T, K>,
-  PromiseRenderState
-> {
-  state: PromiseRenderState = {
-    component: () => null,
-  };
-
-  componentDidMount() {
-    this.setRenderComponent(this.props);
-  }
-
-  shouldComponentUpdate = (nextProps: PromiseRenderProps<T, K>, nextState: PromiseRenderState) => {
-    const { component } = this.state;
-    if (!isEqual(nextProps, this.props)) {
-      this.setRenderComponent(nextProps);
-    }
-    if (nextState.component !== component) return true;
-    return false;
-  };
-
-  // set render Component : ok or error
-  setRenderComponent(props: PromiseRenderProps<T, K>) {
-    const ok = this.checkIsInstantiation(props.ok);
-    const error = this.checkIsInstantiation(props.error);
-    props.promise
-      .then(() => {
-        this.setState({
-          component: ok,
-        });
-        return true;
-      })
-      .catch(() => {
-        this.setState({
-          component: error,
-        });
-      });
-  }
-
-  // Determine whether the incoming component has been instantiated
-  // AuthorizedRoute is already instantiated
-  // Authorized  render is already instantiated, children is no instantiated
-  // Secured is not instantiated
-  checkIsInstantiation = (
-    target: React.ReactNode | React.ComponentClass,
-  ): React.FunctionComponent => {
-    if (isComponentClass(target)) {
-      const Target = target as React.ComponentClass;
-      return (props: any) => <Target {...props} />;
-    }
-    if (React.isValidElement(target)) {
-      return (props: any) => React.cloneElement(target, props);
-    }
-    return () => target as React.ReactNode & null;
-  };
-
-  render() {
-    const { component: Component } = this.state;
-    const { ok, error, promise, ...rest } = this.props;
-
-    return Component ? (
-      <Component {...rest} />
-    ) : (
-      <div
-        style={{
-          width: '100%',
-          height: '100%',
-          margin: 'auto',
-          paddingTop: 50,
-          textAlign: 'center',
-        }}
-      >
-        <Spin size="large" />
-      </div>
-    );
-  }
-}
diff --git a/src/components/Authorized/Secured.tsx b/src/components/Authorized/Secured.tsx
deleted file mode 100644
index 0bdbbe4..0000000
--- a/src/components/Authorized/Secured.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import React from 'react';
-import CheckPermissions from './CheckPermissions';
-
-/**
- * 默认不能访问任何页面
- * default is "NULL"
- */
-const Exception403 = () => 403;
-
-export const isComponentClass = (component: React.ComponentClass | React.ReactNode): boolean => {
-  if (!component) return false;
-  const proto = Object.getPrototypeOf(component);
-  if (proto === React.Component || proto === Function.prototype) return true;
-  return isComponentClass(proto);
-};
-
-// Determine whether the incoming component has been instantiated
-// AuthorizedRoute is already instantiated
-// Authorized  render is already instantiated, children is no instantiated
-// Secured is not instantiated
-const checkIsInstantiation = (target: React.ComponentClass | React.ReactNode) => {
-  if (isComponentClass(target)) {
-    const Target = target as React.ComponentClass;
-    return (props: any) => <Target {...props} />;
-  }
-  if (React.isValidElement(target)) {
-    return (props: any) => React.cloneElement(target, props);
-  }
-  return () => target;
-};
-
-/**
- * 用于判断是否拥有权限访问此 view 权限
- * authority 支持传入 string, () => boolean | Promise
- * e.g. 'user' 只有 user 用户能访问
- * e.g. 'user,admin' user 和 admin 都能访问
- * e.g. ()=>boolean 返回true能访问,返回false不能访问
- * e.g. Promise  then 能访问   catch不能访问
- * e.g. authority support incoming string, () => boolean | Promise
- * e.g. 'user' only user user can access
- * e.g. 'user, admin' user and admin can access
- * e.g. () => boolean true to be able to visit, return false can not be accessed
- * e.g. Promise then can not access the visit to catch
- * @param {string | function | Promise} authority
- * @param {ReactNode} error 非必需参数
- */
-const authorize = (authority: string, error?: React.ReactNode) => {
-  /**
-   * conversion into a class
-   * 防止传入字符串时找不到staticContext造成报错
-   * String parameters can cause staticContext not found error
-   */
-  let classError: boolean | React.FunctionComponent = false;
-  if (error) {
-    classError = (() => error) as React.FunctionComponent;
-  }
-  if (!authority) {
-    throw new Error('authority is required');
-  }
-  return function decideAuthority(target: React.ComponentClass | React.ReactNode) {
-    const component = CheckPermissions(authority, target, classError || Exception403);
-    return checkIsInstantiation(component);
-  };
-};
-
-export default authorize;
diff --git a/src/components/Authorized/index.tsx b/src/components/Authorized/index.tsx
deleted file mode 100644
index 6703a46..0000000
--- a/src/components/Authorized/index.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import Authorized from './Authorized';
-import Secured from './Secured';
-import check from './CheckPermissions';
-import renderAuthorize from './renderAuthorize';
-
-Authorized.Secured = Secured;
-Authorized.check = check;
-
-const RenderAuthorize = renderAuthorize(Authorized);
-
-export default RenderAuthorize;
diff --git a/src/components/Authorized/renderAuthorize.ts b/src/components/Authorized/renderAuthorize.ts
deleted file mode 100644
index df00875..0000000
--- a/src/components/Authorized/renderAuthorize.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/* eslint-disable eslint-comments/disable-enable-pair */
-/* eslint-disable import/no-mutable-exports */
-let CURRENT: string | string[] = 'NULL';
-
-type CurrentAuthorityType = string | string[] | (() => typeof CURRENT);
-/**
- * use  authority or getAuthority
- * @param {string|()=>String} currentAuthority
- */
-const renderAuthorize = <T>(Authorized: T): ((currentAuthority: CurrentAuthorityType) => T) => (
-  currentAuthority: CurrentAuthorityType,
-): T => {
-  if (currentAuthority) {
-    if (typeof currentAuthority === 'function') {
-      CURRENT = currentAuthority();
-    }
-    if (
-      Object.prototype.toString.call(currentAuthority) === '[object String]' ||
-      Array.isArray(currentAuthority)
-    ) {
-      CURRENT = currentAuthority as string[];
-    }
-  } else {
-    CURRENT = 'NULL';
-  }
-  return Authorized;
-};
-
-export { CURRENT };
-export default <T>(Authorized: T) => renderAuthorize<T>(Authorized);
diff --git a/src/components/BiddingRoom/components/InstantMessage.js b/src/components/BiddingRoom/components/InstantMessage.js
deleted file mode 100644
index 5accd59..0000000
--- a/src/components/BiddingRoom/components/InstantMessage.js
+++ /dev/null
@@ -1,548 +0,0 @@
-import React, { useEffect, useRef, useState } from 'react';
-import ReactDOM from 'react-dom';
-import { Modal, Input, Button, Tabs, message, Form, Upload, Image, Card, Tooltip } from 'antd';
-import { useIntl } from 'umi';
-import { getGroupList, getChartList, getChartList01, upDataChartCont, upLoad } from '../service';
-import '../index.less';
-import { isRegExp } from 'lodash';
-import { CommentOutlined, ConsoleSqlOutlined, FolderAddOutlined, FileOutlined } from '@ant-design/icons';
-import { getUserToken, getGroupId, getSessionRoleData, getSessionUserData, getExpertGroupId, getRoomStatus, getProMethod } from '@/utils/session';
-import { isEmpty } from '@/utils/CommonUtils';
-import { uploadAttachmentPath, downloadPath, downloadFile } from '@/utils/DownloadUtils';
-
-const { TabPane } = Tabs;
-const { TextArea } = Input;
-
-const InstantMessage = (props) => {
-  //存储群组id
-  const groupId = isEmpty(getGroupId()) || getGroupId() === "null" ? null : getGroupId();
-  const exgroupId = isEmpty(getExpertGroupId()) || getExpertGroupId() === "null" ? null : getExpertGroupId();
-  const readStatus = getRoomStatus();
-  //自动刷新时间初始化 -- 单位：毫秒
-  const refreshTime = 3000;
-  //获取token
-  const token = getUserToken();
-  //获取用户code
-  const roleCode = getSessionRoleData().roleCode
-  //获取用户账号名
-  const userId = getSessionUserData().userId
-  const [form] = Form.useForm();
-  const [visible, setVisible] = useState(false);
-  const [groupList01, setGroupList01] = useState([]);
-  const [chartList, setchartList] = useState([]);
-  const [chartContent, setChartContent] = useState();
-  const [groupList, setGroupList] = useState([]);
-  const [chartList01, setchartList01] = useState([]);
-  const [count, countSet] = useState(0); //触发useEffect
-  const messageStartRef = useRef();
-  const messagesEndRef = useRef();
-  //获取采购方式
-  const proMethod = getProMethod();
-  /**
-     * 聊天室1 
-     * 【采购方式】公开招标、邀请招标、公开招募
-     * 【角色】项目经理、采购经理、专家
-     */
-  const chatRoomType_1 = (proMethod == 'procurement_mode_1' || proMethod == 'procurement_mode_2' || proMethod == 'procurement_mode_4') && roleCode != 'ebtp-supplier'
-  /**
-     * 聊天室2 
-     * 【采购方式】公开比选、竞争性谈判、单一来源、公开询价
-     * 【角色】项目经理、采购经理、专家
-     */
-  const chatRoomType_2 = proMethod != 'procurement_mode_1' && proMethod != 'procurement_mode_2' && proMethod != 'procurement_mode_4' && roleCode != 'ebtp-supplier'
-  //专家TabPane
-  const expertTabPane = (list) => {
-    return (
-      <TabPane tab="专家" key="1">
-        <ul className="us-ls01" style={{ padding: '10px 16px' }}>
-          {list != undefined
-            ? list.map((item) =>
-              item.userLabel == 'ebtp-expert' ? (
-                <li
-                  style={{
-                    lineHeight: '34px',
-                    padding: '4px 2px',
-                    overflow: 'hidden'
-                  }}
-                >
-                  <span style={{ display: 'inline-block', float: 'left', background: '#1e76bd', color: '#fff', width: '30px', height: '30px', borderRadius: '30px', lineHeight: '30px', fontWeight: '500', fontSize: '30px' }}>{item.userName}</span>
-                  <span style={{ fontWeight: '500', fontSize: '18px', float: 'left', color: '#666', display: 'inline-block', marginLeft: '10px' }}>{item.userName}</span>
-                </li>
-              ) : null,
-            )
-            : null}
-        </ul>
-      </TabPane>
-    )
-  }
-  //项目经理TabPane
-  const projectManageTabPane = (list) => {
-    return (
-      <TabPane tab="项目经理" key="2">
-        <ul className="us-ls02" style={{ padding: '10px 16px' }}>
-          {list != undefined
-            ? list.map((item) =>
-              item.userLabel == 'ebtp-agency-project-manager' ? (
-                <li
-                  style={{
-                    lineHeight: '34px',
-                    padding: '4px 2px',
-                    overflow: 'hidden'
-                  }}
-                >
-                  <span style={{ display: 'inline-block', float: 'left', background: '#cb480f', color: '#fff', width: '30px', height: '30px', borderRadius: '30px', lineHeight: '30px', fontWeight: '500', fontSize: '30px' }}>{item.userName}</span>
-                  <span style={{ fontWeight: '500', fontSize: '18px', float: 'left', color: '#666', display: 'inline-block', marginLeft: '10px' }}>{item.userName}</span>
-                </li>
-              ) : null,
-            )
-            : null}
-        </ul>
-      </TabPane>
-    )
-  }
-  //供应商TabPane
-  const supplierTabPane = (list) => {
-    return (
-      <TabPane tab="供应商" key="3">
-        <ul className="us-ls02" style={{ padding: '10px 16px' }}>
-          {list != undefined
-            ? list.map((item) =>
-              item.userLabel == 'ebtp-supplier' ? (
-                <li
-                  style={{
-                    lineHeight: '34px',
-                    padding: '4px 2px',
-                    overflow: 'hidden'
-                  }}
-                >
-                  <span style={{ display: 'inline-block', float: 'left', background: '#cb480f', color: '#fff', width: '30px', height: '30px', borderRadius: '30px', lineHeight: '30px', fontWeight: '500', fontSize: '30px', marginRight: '10px' }}>{item.userName}</span>
-                  <span style={{ fontWeight: '500', fontSize: '18px', float: 'left', color: '#666', display: 'contents' }}>{item.userName}</span>
-                </li>
-              ) : null,
-            )
-            : null}
-        </ul>
-      </TabPane>
-    )
-  }
-  //右侧聊天框及发送区
-  const commonRight = (group, list, id, code) => {
-    return (
-      <div className="pop-chart">
-        <div className="dlog" ref={messageStartRef}>
-          <ul style={{ padding: '10px 15px' }}>
-            {list?.map((item) => (
-              <li style={{ width: '527px', overflow: 'hidden' }}>
-                {item.promoter == userId ? (
-                  <div style={{ textAlign: 'right' }}>
-                    <span
-                      style={{
-                        fontSize: '14px',
-                        color: '#143c98',
-                        paddingRight: '10px',
-                        fontWeight: '600',
-                        lineHeight: '30px',
-                      }}
-                    >
-                      {item.userName}
-                    </span>
-                    <span style={{ color: '#999', fontSize: '12px', lineHeight: '30px' }}>
-                      {item.createDate}
-                    </span>
-                  </div>
-                ) : (
-                  <div>
-                    <span
-                      style={{
-                        fontSize: '14px',
-                        color: '#143c98',
-                        paddingRight: '10px',
-                        fontWeight: '600',
-                        lineHeight: '30px',
-                      }}
-                    >
-                      {item.userName}
-                    </span>
-                    <span style={{ color: '#999', fontSize: '12px', lineHeight: '30px' }}>
-                      {item.createDate}
-                    </span>
-                  </div>
-                )}
-
-                {item.type == 'string' ? (
-                  item.promoter == userId ? (
-                    <Card bodyStyle={{ padding: 8 }} style={{ maxWidth: '60%', width: 'max-content', borderRadius: 5, float: 'right' }}>
-                      <span style={{ lineHeight: '24px' }}>{item.content}</span>
-                    </Card>
-                  ) : (
-                    <Card bodyStyle={{ padding: 8 }} style={{ maxWidth: '60%', width: 'max-content', borderRadius: 5 }}>
-                      <span style={{ lineHeight: '24px' }}>{item.content}</span>
-                    </Card>
-                  )
-
-                ) : (
-                  item.promoter == userId ? (
-                    <div style={{ textAlign: 'right' }}>
-                      {item.type == 'image/png' || item.type == 'image/jpeg' ? (
-                        <Image
-                          width={'50%'}
-                          src={
-                            downloadPath + '?fileId=' + item.fileId
-                          }
-                        />
-
-                      ) : (
-                        <Card bodyStyle={{ padding: 8 }} style={{ maxWidth: '50%', width: 'max-content', borderRadius: 5, float: 'right' }}>
-                          <a style={{ color: "#1890ff" }}
-                            onClick={() => downloadFile({ uid: item.fileId })}
-                          >
-                            <Tooltip title="点击下载">
-                              <FileOutlined style={{ fontSize: 15, marginRight: 4 }} />
-                              {item.content}
-                            </Tooltip>
-                          </a>
-                        </Card>
-                      )}
-                    </div>) : (
-                    <div>
-                      {item.type == 'image/png' || item.type == 'image/jpeg' ? (
-                        <Image
-                          width={'50%'}
-                          src={
-                            downloadPath + '?fileId=' + item.fileId
-                          }
-                        />
-
-                      ) : (
-                        <Card bodyStyle={{ padding: 8 }} style={{ maxWidth: '50%', width: 'max-content', borderRadius: 5 }}>
-                          <a style={{ color: "#1890ff" }}
-                            onClick={() => downloadFile({ uid: item.fileId })}
-                          >
-                            <Tooltip title="点击下载">
-                              <FileOutlined style={{ fontSize: 15, marginRight: 4 }} />
-                              {item.content}
-                            </Tooltip>
-                          </a>
-                        </Card>
-                      )}
-                    </div>
-                  )
-                )}
-              </li>
-            ))}
-          </ul>
-          <div ref={messagesEndRef}></div>
-        </div>
-        <div className="text-box">
-          {readStatus > 2 || (group.findIndex(item => item.userId == userId) == -1) ? <div style={{ width: '584px', height: '100px', backgroundColor: 'rgba(0,0,0,.2)', position: 'absolute', zIndex: '9999999', textAlign: 'center', color: 'rgba(0,0,0,.3)', lineHeight: '100px' }}>
-            当前聊天功能仅能够查看
-          </div> : null}
-          <Form
-            name="nest-message"
-            form={form}
-          >
-            <Form.Item name="content">
-              <Input.TextArea
-                row={4}
-                bordered={false}
-                onChange={onChange}
-                style={{
-                  width: '490px',
-                  height: '68px',
-                  position: 'absolute',
-                  top: '24px',
-                  borderRadius: '0',
-                  resize: 'none'
-                }}
-              />
-            </Form.Item>
-            <Form.Item
-              name="businessFileId"
-              style={{ position: 'absolute', bottom: '66px', left: '218px' }}
-            >
-              <Upload {...upprops(id)} maxCount={1}>
-                <Tooltip title="发送文件(文件最大为30MB)">
-                  <FolderAddOutlined
-                    style={{ fontSize: '18px', color: 'rbg(193,193,193)', cursor: 'pointer' }}
-                  />
-                </Tooltip>
-              </Upload>
-            </Form.Item>
-            <Form.Item style={code == '1' ? { position: 'absolute', left: '700px', bottom: '0' } : { position: 'absolute', left: '700px', top: '461px' }}>
-              <Button
-                type="primary"
-                htmlType="submit"
-                onClick={() => handlAdd(id)}
-                style={{ width: '92px', height: '98px', float: 'left', borderRadius: '0' }}
-              >
-                发送
-              </Button>
-            </Form.Item>
-          </Form>
-        </div>
-      </div>
-    )
-  }
-  const onChange = (e) => {
-    setChartContent(e.target.value);
-  };
-  //发送按钮
-  const handlAdd = (id) => {
-    let emptyFlag = isEmpty(chartContent);
-    emptyFlag = emptyFlag ? true : (typeof chartContent === "string") ? chartContent.trim() === "" : true;
-    if (emptyFlag) {
-      message.info("不能发送空白信息！");
-      return;
-    }
-    const formCon = {
-      content: chartContent,
-      createBy: '',
-      createDate: '',
-      deleteFlag: '',
-      fileId: '',
-      groupId: id,
-      id: '',
-      lastUpdateTime: '',
-      promoter: '',
-      recipients: ['all'],
-      tenantId: '',
-      tenantName: '',
-      type: 'string',
-      updateBy: '',
-      updateDate: '',
-    };
-    upDataChartCont(formCon).then((res) => {
-      if (res?.code == 200) {
-        if (res?.success == true) {
-          setChartContent("");
-          form.resetFields();
-          messagesEndRef.current?.scrollIntoView();
-        }
-      }
-    }).finally(() => {
-      countSet(count + 1);
-    });
-  };
-  //上传props通用
-  const upprops = (id) => {
-    return {
-      name: 'multipartFiles',
-      action: uploadAttachmentPath,
-      data: {
-        appCode: 'ebtp-cloud-frontend',
-        objectId: id,
-      },
-      headers: {
-        Authorization: token,
-      },
-      beforeUpload: (file) => {
-        let fileSize = file.size / 1024 / 1024;
-        if (fileSize > 30) {
-          message.error("您上传的文件大小超过30MB，请重新上传")
-          return false
-        } else {
-          message.loading({ content: "文件发送中，请稍等", key: "uploadKey", duration: 0 })
-          return true
-        }
-      },
-      onChange(info) {
-        if (info.file.status === 'done') {
-          message.success({ content: `${info.file.name}发送成功`, key: "uploadKey", duration: 2 });
-          const formOn = {
-            content: info.file.name,
-            createBy: '',
-            createDate: '',
-            deleteFlag: '',
-            fileId: info.file.response.data[0].sysStorageVO.fileId,
-            groupId: id,
-            id: '',
-            lastUpdateTime: '',
-            promoter: '',
-            recipients: ['all'],
-            tenantId: '',
-            tenantName: '',
-            type: isEmpty(info.file.type) ? 'file' : info.file.type,
-            updateBy: '',
-            updateDate: '',
-          };
-          upDataChartCont(formOn).then((res) => {
-            if (res?.code == 200) {
-              if (res?.success == true) {
-                messagesEndRef.current?.scrollIntoView();
-              }
-            }
-          });
-        } else if (info.file.status === 'error') {
-          message.error({ content: `${info.file.name} 发送失败`, key: "uploadKey", duration: 2 });
-        }
-      },
-    };
-  }
-  useEffect(() => {
-    let expertList = []
-    let expertList1 = []
-    if (visible) {
-      //获取群组成员数据
-      if (exgroupId != null) {
-        getGroupList(exgroupId).then((res) => { // 专家和项目经理数据接口
-          if (res?.code == 200) {
-            if (res?.data == null || res?.data == undefined) { } else {
-              res?.data.userList.map((item) => {
-                if (item.deleteFlag == 'normal') {
-                  expertList1.push(item)
-                }
-              })
-              setGroupList01(expertList1);
-            }
-          }
-        });
-        if (groupId != null) {
-          getGroupList(groupId).then((res) => { // 专家、项目经理和供应商数据接口
-            if (res?.code == 200) {
-              if (res?.data == null || res?.data == undefined) { } else {
-                res?.data.userList.map((item) => {
-                  if (item.deleteFlag == 'normal') {
-                    expertList.push(item)
-                  }
-                })
-                setGroupList(expertList);
-              }
-            }
-          });
-        }
-      }
-    }
-  }, [visible]);
-
-  useEffect(() => {
-    if (visible) {
-      let e = 0
-      const clientHeight = messageStartRef?.current?.clientHeight //可视区域高度
-      const scrollHeight = messageStartRef?.current?.scrollHeight //内容总高度
-      const scrollTop = messageStartRef?.current?.scrollTop //滚动距离
-      if (scrollTop + clientHeight + 10 > scrollHeight) {
-        e = 1
-      }
-      if (exgroupId != null) {
-        getChartList01({ groupId: exgroupId }).then((res) => {  // 专家和项目经理数据接口
-          if (res?.code == 200) {
-            if (res?.data == null || res?.data == undefined) { } else {
-              setchartList01(res?.data);
-              if (e == 1) {
-                messagesEndRef.current?.scrollIntoView();
-              }
-            }
-          }
-        });
-        if (groupId != null) {
-          getChartList({ groupId: groupId }).then((res) => { // 专家、项目经理和供应商数据接口
-            if (res?.code == 200) {
-              if (res?.data == null || res?.data == undefined) { } else {
-                setchartList(res?.data);
-                if (e == 1) {
-                  messagesEndRef.current?.scrollIntoView();
-                }
-              }
-            }
-          });
-        }
-      }
-      if (readStatus < 3) {
-        setTimeout(() => {
-          countSet(count + 1);
-        }, refreshTime);
-      }
-    }
-  }, [count, visible]);
-
-  return (
-    <div className="sed-tall">
-      <a
-        onClick={() => {
-          setVisible(true);
-          messagesEndRef.current?.scrollIntoView();
-        }}
-        style={{
-          position: 'fixed',
-          top: '50%',
-          right: '0',
-          width: '24px',
-          backgroundColor: '#b30000',
-          color: '#fff',
-          textAlign: 'center',
-          padding: '10px 0',
-          borderRadius: '6px 0 0 6px',
-          marginTop: '-100px',
-          zIndex: 99,
-        }}
-      >
-        <CommentOutlined />即时通讯
-      </a>
-      <Modal
-        title="即时聊天室"
-        centered
-        mask={false}
-        visible={visible}
-        onCancel={() => {
-          setVisible(false);
-        }}
-        width={800}
-        footer={null}
-        style={{ background: '#fcfcfc' }}
-        className="sun-chart"
-      >
-        {chatRoomType_1 ?
-          <div className="chart">
-            <div className="pop-ls">
-              <Tabs defaultActiveKey="1">
-                {expertTabPane(groupList01)}
-                {projectManageTabPane(groupList01)}
-              </Tabs>
-            </div>
-            {commonRight(groupList01, chartList01, exgroupId, '0')}
-          </div>
-          : chatRoomType_2 ?
-            <div>
-              <Tabs defaultActiveKey="1">
-                <TabPane tab="项目经理、专家和供应商" key="1">
-                  <div className="chart">
-                    <div className="pop-ls">
-                      <Tabs defaultActiveKey="1">
-                        {expertTabPane(groupList)}
-                        {projectManageTabPane(groupList)}
-                        {groupList != undefined && groupList.findIndex((value) => value.userLabel == 'ebtp-supplier') != -1 ? supplierTabPane(groupList) : null}
-                      </Tabs>
-                    </div>
-                    {commonRight(groupList, chartList, groupId, '1')}
-                  </div>
-                </TabPane>
-                <TabPane tab="项目经理和专家" key="2">
-                  <div className="chart">
-                    <div className="pop-ls">
-                      <Tabs defaultActiveKey="1">
-                        {expertTabPane(groupList01)}
-                        {projectManageTabPane(groupList01)}
-                      </Tabs>
-                    </div>
-                    {commonRight(groupList01, chartList01, exgroupId, '1')}
-                  </div>
-                </TabPane>
-              </Tabs>
-            </div>
-            : //供应商聊天室
-            <div className="chart">
-              <div className="pop-ls">
-                <Tabs defaultActiveKey="1">
-                  {expertTabPane(groupList)}
-                  {projectManageTabPane(groupList)}
-                  {groupList != '' && groupList != undefined && groupList.findIndex((value) => value.userLabel == 'ebtp-supplier') != -1 ? supplierTabPane(groupList) : null}
-                </Tabs>
-              </div>
-              {commonRight(groupList, chartList, groupId, '0')}
-            </div>
-        }
-      </Modal>
-    </div>
-  );
-};
-export default InstantMessage;
diff --git a/src/components/BiddingRoom/index.js b/src/components/BiddingRoom/index.js
deleted file mode 100644
index dc412ce..0000000
--- a/src/components/BiddingRoom/index.js
+++ /dev/null
@@ -1,407 +0,0 @@
-import { Divider, Button, Form, Card, Tabs, Table, Tooltip, Input, Select, Row, Col, message, Modal, Avatar, Tag, } from 'antd';
-import { Link, history } from 'umi';
-import './index.less';
-import styles from './index.less';
-import { connect } from "dva";
-import { routerRedux } from 'dva/router';
-import React, { useState, useEffect, useReducer } from 'react';
-import { getSessionUserData, getRoomId, getProMethod, getSessionRoleData, getIPassDecode, getDefId, getProId } from '@/utils/session';
-import { getURLInformation } from '@/utils/CommonUtils';
-import { getLeader, isShowResult, isShowCount, getErrorStatus, getRiskStatus, isShowRiskModal, saveConfirm, isLeaderConfirm } from './service';
-import logo from '@/images/opening/logo.svg'
-import InstantMessage from './components/InstantMessage'
-import { DownOutlined, UserOutlined, UserSwitchOutlined, CarryOutOutlined, HomeOutlined } from '@ant-design/icons';
-import moment from 'moment'
-import {
-  CheckCircleOutlined,
-  ExclamationCircleOutlined
-} from '@ant-design/icons';
-import { getRoomDataById } from '@/services/common';
-import RiskModal from '../RiskModal';
-
-const BiddingRoom = (props) => {
-  //获取采购方式
-  const MethodDict = getProMethod();
-  //获取业务id
-  const defId = getDefId();
-  //获取项目id
-  const tpId = getProId();
-  //获取角色
-  const role = getSessionRoleData().roleCode;
-  //是否使用ipass解密
-  const IPassDecode = getIPassDecode();
-  //获取用户数据
-  let data = getSessionUserData();
-  //获取比选一阶段二次项目，自定义流程，当前供应商
-  const isBxOneSecondCustom = sessionStorage.getItem("isBxOneSecondCustom");
-  //获取评审室id
-  const roomId = getRoomId();
-  const [list, setList] = useState();
-  //风险提示文字弹窗控制
-  const [riskVisible, setRiskVisible] = useState(false);
-  //评审结果提示文字还是进入评审室提示文字
-  const [isResult, setIsResult] = useState(false);
-  const [selectedPath, setSelectedPath] = useState(window.location.pathname.replace('ReviewResults/Jury', 'ReviewResults').replace('ReviewResults/GroupLeader', 'ReviewResults'));
-  // const [risky, riskySet] = useState();
-  //字段类型（两种） 评标，评审
-  let sectionTypeTwo = MethodDict == "procurement_mode_1" || MethodDict == "procurement_mode_2" ? "评标" : "评审"
-  //字段类型（三种） 评标，评审，谈判
-  let sectionTypeThree = MethodDict == "procurement_mode_1" || MethodDict == "procurement_mode_2" ? "评标" : MethodDict == "procurement_mode_5" || MethodDict == "procurement_mode_6" ? "谈判" : "评审"
-  //应答字段类型 评标，应答
-  let responseType = MethodDict == "procurement_mode_1" || MethodDict == "procurement_mode_2" ? "投标" : "应答"
-  //项目经理-澄清说明不显示的流程
-  const NoClarification = ['bid_prequalification', 'bid_qualification', 'bid_centralized_prequalification', 'bid_centralized_prequalification_bid', 'bid_invitation', 'comparison_one_prequalification', 'comparison_one', 'recruit', 'recruit_multi']
-  //项目经理-招标类流程 公开招标资格预审 公开招标资格后审 邀请招标 公开比选一阶段资格预审 公开比选一阶段资格后审
-  const isBidProcess = defId == 'bid_prequalification' || defId == 'bid_qualification' || defId == 'bid_invitation' || defId == 'comparison_one_prequalification' || defId == 'comparison_one'
-  let className = styles.right;
-  //项目经理角色
-  let managerList = [
-    {
-      id: 1,
-      path: "/EvaRoom",
-      text: "基本信息"
-    },
-    {
-      id: 2,
-      path: "/EvaRoom/Eva/",
-      text: `${sectionTypeThree}进展`
-    },
-    {
-      id: 3,
-      path: "/EvaRoom/Evaluation/BidControl/BidControlManager",
-      text: "风险点展示"
-    },
-    {
-      id: 4,
-      path: "/EvaRoom/BiddingDocumentsDecrypt",
-      text: `${responseType}文件查看`
-    },
-    {
-      id: 5,
-      path: "/EvaRoom/BidAbnormal",
-      text: `${sectionTypeThree}异常`
-    },
-    {
-      id: 6,
-      path: "/EvaRoom/Clarify/Evaluation/projectManager/ClarificationOfTheBid",
-      text: "澄清说明"
-    },
-    {
-      id: 7,
-      path: "/EvaRoom/ReportPrint",
-      text: "报表打印"
-    },
-    {
-      id: 8,
-      path: "/EvaRoom/Evaluation/projectManager/ReviewResults/Manager",
-      text: "评审结果"
-    }]
-  let JuryList = [
-    {
-      id: 1,
-      path: "/EvaRoom",
-      text: "基本信息"
-    },
-    {
-      id: 2,
-      path: "/EvaRoom/Eva/",
-      text: sectionTypeTwo
-    },
-    {
-      id: 3,
-      path: "/EvaRoom/BiddingDocumentsDecrypt",
-      text: `${responseType}文件查看`
-    },
-    {
-      id: 4,
-      path: "/EvaRoom/Evaluation/BidControl/Jury",
-      text: "风险点展示"
-    },
-    // {
-    //   id: 5,
-    //   path: "",
-    //   text: `辅助${sectionTypeTwo}`
-    // },
-    {
-      id: 6,
-      path: "/EvaRoom/Clarify/Evaluation/expert/ClarificationOfTheBid",
-      text: "澄清说明"
-    },
-    {
-      id: 7,
-      path: "/EvaRoom/Evaluation/BidEnd/BidEndAdjust",
-      text: "算数错误调整"
-    },
-    {
-      id: 8,
-      path: '/EvaRoom/Evaluation/expert/ReviewResults',
-      text: "评审结果",
-    }]
-  let supplierList = [{
-    id: 1,
-    path: "/EvaRoom",
-    text: "基本信息"
-  },
-  {
-    id: 2,
-    path: "/EvaRoom/Eva/",
-    text: "项目评审"
-  },
-  {
-    id: 3,
-    path: "/EvaRoom/FileDecode",
-    text: `${responseType}文件解密`
-  },
-  {
-    id: 4,
-    path: "/EvaRoom/Clarify/Evaluation/supplier/ChallengeListInTheIndex",
-    text: "澄清说明"
-  }]
-
-  useEffect(() => {
-    listRender();
-  }, [])
-
-  //风险点展示获取是否有风险
-  // async function isRisky() {
-  //   await getRiskStatus({ assessRoomId: roomId, tpId: tpId }).then((res) => {
-  //     if (res.code == 200) {
-  //       if (res?.data) {
-  //         riskySet(
-  //           <Tooltip title="当前存在风险项">
-  //             <ExclamationCircleOutlined style={{ color: 'rgb(250,173,20)', position: 'absolute', fontSize: 26, top: 12 }} />
-  //           </Tooltip>
-  //         )
-  //       }
-  //     }
-  //   })
-  // }
-
-  //评审结果页签点击事件
-  const onclick = async (path, id) => {
-    if ((role == 'ebtp-agency-project-manager' || role == 'ebtp-purchase') && id == 8) { //代理&采购经理进入评审结果
-      const success = await isClickResult();
-      if (success) {
-        history.push({ pathname: path });
-        setSelectedPath(path);
-      } else {
-        message.info("未到评审结果环节，无法进入评审结果")
-      }
-    } else if (role == 'ebtp-expert' && id == 8) {//专家进入评审结果
-      const success = await isClickResult();
-      if (success) {
-        const resultPath = await expertClickResult();
-        if (resultPath) {
-          history.push({ pathname: resultPath });
-          setSelectedPath(path);
-        }
-      } else {
-        message.info("未到评审结果环节，无法进入评审结果")
-      }
-    } else if ((role == 'ebtp-agency-project-manager' || role == 'ebtp-purchase' || role == 'ebtp-expert') && id == 2) {//代理&采购经理进入评审进展 专家进入评审
-      const success = await isClickProgress();
-      if (success) {
-        history.push({ pathname: path });
-        setSelectedPath(path);
-      } else {
-        if (role == 'ebtp-expert') {
-          message.info(`未开始${sectionTypeTwo}`)
-        } else {
-          message.info(`请开始${sectionTypeTwo}`)
-        }
-      }
-    } else if (role == 'ebtp-expert' && id == 7) {//专家进入算术错误调整
-      const process = await isClickProgress();
-      if (process) {
-        const success = await isClickCount();
-        if (success) {
-          history.push({ pathname: path });
-          setSelectedPath(path);
-        } else {
-          message.info("无操作权限")
-        }
-      } else {
-        message.info(`未开始${sectionTypeTwo}`)
-      }
-    } else {
-      history.push({ pathname: path });
-      setSelectedPath(path);
-    }
-  }
-
-  //调用接口判断评审结果是否可以点击
-  const isClickResult = async () => {
-    return await isShowResult(roomId).then(res => {
-      if (res?.code == 200) {
-        const data = res?.data
-        return data?.flowFinish
-      }
-    })
-  }
-
-  //专家角色评审结果路由确定
-  const expertClickResult = async () => {
-    return await getLeader(roomId).then(async res => {
-      if (res?.code == 200) {
-        if (res?.data == "Review") {
-          return "/EvaRoom/Evaluation/expert/ReviewResults/Jury"
-        } else {
-          const result = await isLeaderConfirm({ assessRoomId: roomId });//供应商股权关系-专家组长是否确认风险
-          if (result?.success && result?.data) {
-            return "/EvaRoom/Evaluation/expert/ReviewResults/GroupLeader"
-          } else {
-            setIsResult(true)
-            setRiskVisible(true)
-            return false;
-          }
-        }
-      } else {
-        return false
-      }
-    })
-  }
-
-  //调用接口判断评审进展（代理&采购经理）是否可以进入 
-  //true-可以进入 false-不可以
-  const isClickProgress = async () => {
-    return await getRoomDataById(roomId).then(res => {
-      if (res?.code == 200) {
-        const data = res?.data
-        return data?.juryConfigStatus == 1
-      }
-    })
-  }
-
-  //调用接口判断算术错误调整（专家&专家组长）是否可以进入 
-  //true-可以进入 false-不可以
-  const isClickCount = async () => {
-    return await isShowCount(roomId).then(res => {
-      if (res?.code == 200) {
-        const data = res?.data
-        return res?.data
-      }
-    })
-  }
-
-  //判断是否显示算数错误调整
-  const isShowCountFC = async () => {
-    //公开招标资格预审 公开招标资格后审 邀请招标 公开比选一阶段资格预审 公开比选一阶段资格后审
-    if (isBidProcess) {
-      //根据评审配置的是否显示算数错误调整判定
-      return await getErrorStatus(roomId).then(res => {
-        if (res?.code == 200 && res?.success == true) {
-          return res?.data == 1 || res?.data == 2
-        }
-      })
-    }
-    return true //默认显示算术错误调整
-  }
-
-  //判断当前登录人是否弹出供应商关联风险信息
-  const showRiskModal = async (resultClick) => {
-    if (role == "ebtp-agency-project-manager" || role == "ebtp-purchase" || role == "ebtp-expert") {
-      return await isShowRiskModal({ assessRoomId: roomId }).then(res => {
-        if (res?.code == 200 && res?.success) {
-          if (!res?.data) {
-            setIsResult(resultClick)
-            setRiskVisible(true)
-          }
-          return res?.data;
-        }
-        return true;
-      })
-    }
-    return true;
-  }
-  //确认风险
-  const confirmRisk = async () => {
-    return await saveConfirm({ assessRoomId: roomId }).then(res => {
-      if (res?.code == 200) {
-        return res?.data;
-      } else {
-        return false;
-      }
-    })
-  }
-
-  //初始化数据
-  const listRender = async () => {
-    // await isRisky();
-    //供应商是否用ipass解密判断
-    IPassDecode == 0 ? null : supplierList.splice(2, 1)
-    //供应商是否显示评审进展判断（招标类不显示）
-    isBidProcess && (isBxOneSecondCustom != "1") ? supplierList.splice(1, 1) : null
-    //项目经理澄清说明判断
-    NoClarification.findIndex(item => item == defId) == -1 ? null : managerList.splice(5, 1)
-    //专家算数错误调整判断
-    let roomType = '2'
-    getURLInformation('roomType') == undefined ? roomType = '2' : roomType = getURLInformation('roomType')
-    sessionStorage.setItem("roomType", roomType)//roomType存入session
-    if (MethodDict == "procurement_mode_7" || MethodDict == "procurement_mode_4") {//询价，招募不显示算术错误调整
-      JuryList.splice(5, 1)
-    } else {
-      const success = await isShowCountFC()
-      if (success) { } else {
-        JuryList.splice(5, 1)
-      }
-    }
-    //代理&项目经理
-    if (role == "ebtp-agency-project-manager" || role == "ebtp-purchase") {//代理和采购经理
-      setList(managerList);
-    } else if (role == "ebtp-expert") {//专家
-      setList(JuryList)
-    } else if (role == "ebtp-supplier") {//供应商
-      setList(supplierList);
-    } else { //其他未分配的角色
-      setList(managerList);
-    }
-    return await showRiskModal(false) //弹出供应商关联风险信息
-  }
-
-  return (
-    <div>
-      <div className={styles.header}>
-        <div className={styles.headerAlign} style={{ position: "absolute", left: "0", fontSize: "16px", fontWeight: "600" }}>
-          <img src={logo} style={{ height: "30px", marginRight: "10px", position: 'relative', top: '-2px' }} />招标采购中心 | 电子{sectionTypeThree}室
-        </div>
-        <ul className={styles.rightBtns}>
-          <li><CarryOutOutlined />{moment().format("YYYY-MM-DD")}</li>
-          {data?.organizationName == null ? null : (<li><UserSwitchOutlined />{data.organizationName}</li>)}
-          <li>
-            <Avatar size="small" src="https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png" style={{ width: '30px' }} />
-            <a className="antd-dropdown-link" style={{ color: "#fff", marginRight: "36px" }}>
-              {data.fullName}
-            </a>
-          </li>
-        </ul>
-      </div>
-      <div className="myselfBar">
-        <div className="tablist">
-          {list?.map(item => {
-            return (
-              <div
-                className="tab"
-                key={item.id}
-                style={{
-                  width: '100000px',
-                  color: selectedPath == item.path || (item.path === '/EvaRoom/Eva/' && selectedPath.includes('/EvaRoom/Eva/')) ? "#FFFFFF" : "#b30000",
-                  background: selectedPath == item.path || (item.path === '/EvaRoom/Eva/' && selectedPath.includes('/EvaRoom/Eva/')) ? "#b30000" : "#FFFFFF"
-                }}
-                onClick={() => { onclick(item.path, item.id) }}
-              >
-                {item.text}
-                {/* {
-                  (item.path === '/EvaRoom/Evaluation/BidControl/Jury' || item.path === '/EvaRoom/Evaluation/BidControl/BidControlManager') && risky &&
-                  <>&nbsp;&nbsp;{risky}</>
-                } */}
-              </div>
-            )
-          })}
-        </div>
-      </div>
-      {riskVisible && <RiskModal modalVisible={riskVisible} onCancel={() => { setRiskVisible(false); setSelectedPath(window.location.pathname) }} onSubmit={confirmRisk} isResult={isResult} role={role} />}
-      {(MethodDict != "procurement_mode_5" && MethodDict != "procurement_mode_6") && role == "ebtp-supplier" ? null : <InstantMessage />}
-    </div>
-  );
-}
-export default BiddingRoom;
diff --git a/src/components/BiddingRoom/index.less b/src/components/BiddingRoom/index.less
deleted file mode 100644
index 8fc9318..0000000
--- a/src/components/BiddingRoom/index.less
+++ /dev/null
@@ -1,131 +0,0 @@
-.myselfBar {
-    overflow: hidden;
-    margin-top: 0px;
-    .sel{
-        margin-bottom: 10px;
-        width:13%;
-    }
-    .tablist{
-        display: flex;
-        flex-direction:row;
-        flex-wrap: nowrap;
-        justify-content:flex-start;
-        align-items:center;
-        // width:100%;
-        height:50px;
-        background: #fafafa;
-        color:#b30000;
-        //border-radius: 3px;
-        box-sizing: border-box;
-        .tab{
-            // width:220px;
-            box-sizing: border-box;
-            cursor: pointer;
-            background: #ffffff;
-            color:#b30000;
-            height:50px;
-            // float:left;
-            width: max-content;
-            display: block;
-            position: relative;
-            text-align: center;
-            line-height: 50px;
-            font-size: 15px;
-            border:1px solid #f0f0f0;
-            //border-radius: 3px;
-            margin-left: -1px;
-            &:hover{
-                transition:background 0.3s;
-                background: #b30000 !important;
-                color:#FFFFFF !important;
-            }
-        }
-        .tab:nth-child(1) {
-            margin-left: 0;
-        }
-    }
-}
-
-.header {
-    background-color:  #b30000;
-    color: white;
-    font-size: 20px;
-    height: 56px;
-    display: flex;
-    .headerAlign {
-      align-self: center;
-      margin-left: 20px;
-      font-weight: 400;
-    }
-    .rightBtns {
-        position: absolute;
-        right: 0;
-        li {
-          float: left;
-          line-height: 56px;
-          font-size: 14px;
-          color: #fff;
-          padding: 0 14px;
-          font-weight: 400 !important;
-          list-style: none;
-          span {
-            padding-right: 6px;
-            font-size: 16px;
-          }
-          a {
-            color: #fff;
-          }
-        }
-      }
-  }
-
-  .sun-chart {
-    background: rgba(0,0,0,0);
-    .ant-modal-body {
-        padding: 8px;
-    }
-    .ant-modal-header {
-        border-bottom: 2px solid #b30000;
-        padding: 14px 8px;
-    }
-    .ant-modal-title {
-        color: rgb(179,0,0);
-        font-weight: 700
-    }
-    .chart {
-        display: flex;
-        width: 100%;
-        .pop-ls {
-            flex: 0 0 200px;
-            max-width: 200px;
-            background: #ffffff;
-            height: 500px;
-            overflow: auto;
-            .ant-tabs-tab {
-                margin: 0px 25px 0 0 !important;
-            }
-            .ant-tabs-nav-wrap{
-                display: inline-block;
-            }
-        }
-        .pop-chart {
-            flex: 1;
-            height: 500px;
-            background: #f7f7f7;
-            .dlog {
-                height: 400px;
-                background: #f7f7f7;
-                padding: 10px 5px;
-                overflow-y: auto;
-            }
-            .text-box {
-                height: 100px;
-                background: #fff;
-                border: 1px solid #e2e2e2;
-            }
-        }
-        .ant-upload-list {
-            display: none;
-        }
-    }
-}
diff --git a/src/components/BiddingRoom/service.ts b/src/components/BiddingRoom/service.ts
deleted file mode 100644
index 2da7421..0000000
--- a/src/components/BiddingRoom/service.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import request from '@/utils/request';
-
-export async function getLeader(params: any) {
-  return request(`/api/biz-service-ebtp-rsms/v1/jury/member/queryRole?roomId=${params}`, {
-    method: 'GET',
-  });
-}
-
-// 根据Id查询群组信息
-export async function getGroupList(params: any) {
-  return request(`/api/core-service-ebtp-im/v1/userGroup/findOne/${params}`, {
-    method: 'GET',
-    // params: data
-  });
-}
-
-// 根据Id查询供应商信息
-export async function getChartList(params: any) {
-  return request(`/api/core-service-ebtp-im/v1/chatMessage/findByUser`, {
-    method: 'GET',
-    params: params,
-  });
-}
-
-// 根据Id查询供应商信息
-export async function getChartList01(params: any) {
-  return request(`/api/core-service-ebtp-im/v1/chatMessage/findByUser`, {
-    method: 'GET',
-    params: params,
-  });
-}
-
-// 根据Id查询聊天信息
-export async function upDataChartCont(params?: any) {
-  return request('/api/core-service-ebtp-im/v1/chatMessage/save', {
-    method: 'POST',
-    data: params,
-  });
-}
-
-// 根据业务Id上传文件和图片
-export async function upLoad(params?: any) {
-  return request('/v1/attachment/upload', {
-    method: 'POST',
-    data: params,
-  });
-}
-
-// 查询评审结果是否可以显示
-export async function isShowResult(params?: any) {
-  return request(`/api/biz-service-ebtp-process/v1/flow/query/button/${params}`, {
-    method: 'GET',
-  });
-}
-
-// 判断当前评报价的人显示算数错误调整(根据评审分工)
-export async function isShowCount(params?: any) {
-  return request(`/api/biz-service-ebtp-rsms/v1/jury/divide/priceUser/status/${params}`, {
-    method: 'GET',
-  });
-}
-
-// 获取算数错误调整状态 1-是 0-否 2-流程结束(公开招标，邀请招标，比选一阶段)
-export async function getErrorStatus(params: any) {
-  return request(`/api/biz-service-ebtp-rsms/v1/review/config/findArithmeticError/${params}`);
-}
-
-// 获取风险状态
-export async function getRiskStatus(params: any) {
-  return request(`/api/biz-service-ebtp-resps/v1/tfilewarning/getRiskStatus`, {
-    method: 'POST',
-    data: params
-  });
-}
-// 供应商股权关系，专家及项目经理是否确认-智企查
-export async function isShowRiskModal(params: any) {
-  return request(`/api/biz-service-ebtp-resps/v1/risktendererwarning/haveWarningsOrConfirmed`, {
-    method: 'POST',
-    data: params
-  });
-}
-// 供应商股权关系，专家及项目经理进入评审室确认风险-智企查
-export async function saveConfirm(params: any) {
-  return request(`/api/biz-service-ebtp-resps/v1/risktendererwarningConfirm/saveConfirm`, {
-    method: 'POST',
-    data: params
-  });
-}
-// 供应商股权关系，专家组长是否确认风险-智企查
-export async function isLeaderConfirm(params: any) {
-  return request(`/api/biz-service-ebtp-resps/v1/risktendererwarning/haveWarningsHeadConfirmed`, {
-    method: 'POST',
-    data: params
-  });
-}
diff --git a/src/components/Date/Datetime.js b/src/components/Date/Datetime.js
deleted file mode 100644
index 777a090..0000000
--- a/src/components/Date/Datetime.js
+++ /dev/null
@@ -1,38 +0,0 @@
-function FormattedDate(props) {
-  return <div style={{color:"#FFFFFF"}}><div>当前：{props.date.toLocaleDateString()}</div>
-  <div>{props.date.toLocaleTimeString()}</div>
-  </div>;
-}
-
-export default class Datetime extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = { date: new Date() };
-  }
-
-  // 组件挂载完成之后启动定时器
-  componentDidMount() {
-    this.timeID = setInterval(() => this.tick(), 1000);
-  }
-  // 组件卸载之前清除定时器
-  //（注：这是我们用这个钩子函数经常做的一件事）
-  componentWillUnmount() {
-    clearInterval(this.timeID);
-  }
-
-  // 定义一个tick方法，专门用于调用setState方法修改date
-  tick() {
-    this.setState({
-      date: new Date(),
-    });
-  }
-
-  render() {
-    const { className }=this.props;
-    return (
-      <div className={className}>
-        <FormattedDate date={this.state.date} />
-      </div>
-    );
-  }
-}
\ No newline at end of file
diff --git a/src/components/ElecBidEvaluation/BidEvalAppointment.tsx b/src/components/ElecBidEvaluation/BidEvalAppointment.tsx
deleted file mode 100644
index 1e68dd8..0000000
--- a/src/components/ElecBidEvaluation/BidEvalAppointment.tsx
+++ /dev/null
@@ -1,359 +0,0 @@
-import React, { useEffect, useRef, useState } from 'react';
-import { Col, DatePicker, Descriptions, Form, Input, message, Modal, Row, Spin } from 'antd';
-import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
-import { getBidEvalRoom, getTimeByAreaId, handleTakeEffectReserve, saveAppointmentEdit } from './service';
-import { dateFormat, disabledDate, otherDisabledDateTime, validateMessages } from './MeetingReservation';
-import moment from 'moment';
-import { dateTimeFormatter } from '@/utils/DateUtils';
-import { getProId } from '@/utils/session';
-import { isEmpty } from '@/utils/CommonUtils';
-
-interface BidEvalAppointmentProps {
-    modalVisible: boolean;
-    onCancel: () => void;
-    onSubmit: (value: any) => void;
-    reload: () => void;
-    values: any;
-    initValue: any;//预约时间初始值
-    type: string; //0-选择评标室 1-修改预约 2-重评预约评标室
-}
-
-export const proviceEnum = {
-    "0011": "北京",
-    "0012": "天津",
-    "0013": "河北",
-    "0014": "山西",
-    "0015": "内蒙古",
-    "0021": "辽宁",
-    "0022": "吉林",
-    "0023": "黑龙江",
-    "0031": "上海",
-    "0032": "江苏",
-    "0033": "浙江",
-    "0034": "安徽",
-    "0035": "福建",
-    "0036": "江西",
-    "0037": "山东",
-    "0041": "河南",
-    "0042": "湖北",
-    "0043": "湖南",
-    "0044": "广东",
-    "0045": "广西",
-    "0046": "海南",
-    "0050": "重庆",
-    "0051": "四川",
-    "0052": "贵州",
-    "0053": "云南",
-    "0054": "西藏",
-    "0061": "陕西",
-    "0062": "甘肃",
-    "0063": "青海",
-    "0064": "宁夏",
-    "0065": "新疆",
-    "001000": "集团"
-}
-
-const modalHeight = window.innerHeight * 96 / 100;
-
-const BidEvalAppointment: React.FC<BidEvalAppointmentProps> = (props) => {
-    const { modalVisible, onCancel, onSubmit, reload, values, initValue, type } = props;
-    const actionRef = useRef<ActionType>();
-    const [form] = Form.useForm();
-    //项目id
-    const proId = getProId();
-    //当前选择行areaId
-    const [selectedRowKeys, setSelectedRowKeys] = useState<React.Key[]>([]);
-    //当前选择行数据
-    const [selectedRecord, setSelectedRecord] = useState<any>();
-    //loading
-    const [loading, setLoading] = useState<boolean>(false);
-    //不可选择日期
-    const [disabledMap, setDisabledMap] = useState<any>({});
-    const columns: ProColumns<any>[] = [
-        {
-            valueType: 'index',
-            width: 48,
-        },
-        {
-            title: '评标室名称',
-            dataIndex: 'areaName',
-            ellipsis: true,
-        },
-        {
-            title: '服务省分',
-            dataIndex: 'provinceDictId',
-            ellipsis: true,
-            valueEnum: proviceEnum,
-            hideInSearch: true,
-        },
-        {
-            title: '详细地址',
-            dataIndex: 'areaAddress',
-            ellipsis: true,
-            hideInSearch: true,
-        },
-        {
-            title: '可容纳人数',
-            dataIndex: 'areaNumber',
-            ellipsis: true,
-            hideInSearch: true,
-        },
-        {
-            title: '联系人',
-            dataIndex: 'contactName',
-            ellipsis: true,
-            hideInSearch: true,
-        }, {
-            title: '联系电话',
-            dataIndex: 'contactTel',
-            ellipsis: true,
-            hideInSearch: true,
-        },
-    ];
-
-    const onOk = () => {
-        if (selectedRowKeys.length == 0) {
-            message.info("请选择评标室");
-            return;
-        }
-        form.validateFields().then(value => {
-            if (moment(value.reserveStartDate).format(dateTimeFormatter) < moment().format(dateTimeFormatter)) {
-                message.info("开始时间需晚于当前时间");
-                return;
-            }
-            if (moment(value.reserveEndDate).format(dateTimeFormatter) <= moment(value.reserveStartDate).format(dateTimeFormatter)) {
-                message.info("结束时间需晚于开始时间");
-                return;
-            }
-            if (type == "0") {//选择评标室
-                value["areaId"] = selectedRecord.id;
-                value["placeId"] = selectedRecord.placeId;
-                value["areaAddress"] = selectedRecord.areaAddress;
-                value["areaName"] = selectedRecord.areaName;
-                value["contactName"] = selectedRecord.contactName;
-                value["contactTel"] = selectedRecord.contactTel;
-                value["areaNumber"] = selectedRecord.areaNumber;
-                onSubmit(value);
-            } else if (type == "1") {//修改预约
-                const params = {
-                    ...values,
-                    areaId: selectedRecord.id,
-                    placeId: selectedRecord.placeId,
-                    reserveStartDate: moment(value.reserveStartDate).format(dateTimeFormatter),
-                    reserveEndDate: moment(value.reserveEndDate).format(dateTimeFormatter),
-                    reserveBy: value.reserveBy,
-                    reserveContactNumber: value.reserveContactNumber,
-                }
-                setLoading(true);
-                saveAppointmentEdit(params).then(res => {
-                    if (res?.code == 200) {
-                        message.success("预约成功");
-                        onCancel();
-                        reload();
-                    }
-                }).finally(() => {
-                    setLoading(false);
-                })
-            } else {//重评保存预约
-                const params = {
-                    areaId: selectedRecord.id,
-                    placeId: selectedRecord.placeId,
-                    reserveStartDate: moment(value.reserveStartDate).format(dateTimeFormatter),
-                    reserveEndDate: moment(value.reserveEndDate).format(dateTimeFormatter),
-                    reserveBy: value.reserveBy,
-                    reserveContactNumber: value.reserveContactNumber,
-                }
-                setLoading(true);
-                handleTakeEffectReserve(values?.id, params).then(res => {
-                    if (res?.code == 200) {
-                        message.success("操作成功");
-                        onCancel();
-                        reload();
-                    }
-                }).finally(() => {
-                    setLoading(false);
-                })
-            }
-        })
-    }
-    //获取不可选择时间
-    const getDisabledTime = (rowKeys: any[]) => {
-        getTimeByAreaId(rowKeys[0]).then(res => {
-            if (res?.code == 200) {
-                const data = res?.data;
-                setDisabledMap(data);
-            }
-        })
-    }
-
-    useEffect(() => {
-        if (values?.areaId) {
-            setSelectedRowKeys([values.areaId]);
-            setSelectedRecord({ areaNumber: values?.numberInMeeting, ...values, id: values.areaId });
-            form.setFieldsValue({ ...values, reserveStartDate: moment(values.reserveStartDate), reserveEndDate: moment(values.reserveEndDate) });
-        } else {
-            setSelectedRowKeys([]);
-            setSelectedRecord(null);
-            setDisabledMap({});
-        }
-    }, [values])
-
-    useEffect(() => {
-        if (initValue && isEmpty(values)) {
-            form.setFieldsValue({ ...initValue, reserveStartDate: initValue.startTime, reserveEndDate: initValue.endTime });
-        }
-    }, [initValue, values, modalVisible])
-
-    useEffect(() => {
-        selectedRowKeys.length > 0 && getDisabledTime(selectedRowKeys);
-    }, [selectedRowKeys])
-
-    return (
-        <Modal
-            destroyOnClose
-            title={type == "0" ? "选择评标室" : "修改预约"}
-            visible={modalVisible}
-            maskClosable={false}
-            onCancel={() => onCancel()}
-            onOk={() => onOk()}
-            okText={type == "0" ? "确认" : "保存"}
-            okButtonProps={{ loading: loading }}
-            width={"70%"}
-            style={{ maxHeight: modalHeight }}
-            bodyStyle={{ maxHeight: modalHeight - 107, overflowY: 'auto', }}
-            className="confirm table-no-alert"
-            centered
-        >
-            <Spin spinning={loading}>
-                {values?.areaId && (
-                    <>
-                        <h3 className='first-title'>{type == "0" ? "已选择评标室" : "已预约评标室"}</h3>
-                        <Descriptions size="middle">
-                            <Descriptions.Item label="评标室名称">{values?.areaName}</Descriptions.Item>
-                            {values?.contactName && <Descriptions.Item label="联系人">{values?.contactName}</Descriptions.Item>}
-                            {values?.contactTel && <Descriptions.Item label="联系电话">{values?.contactTel}</Descriptions.Item>}
-                            <Descriptions.Item label="可容纳人数">{values?.areaNumber ? values?.areaNumber : values?.numberInMeeting}</Descriptions.Item>
-                            <Descriptions.Item label="预计评标开始时间">{moment(values?.reserveStartDate).format(dateTimeFormatter)}</Descriptions.Item>
-                            <Descriptions.Item label="预计评标结束时间">{moment(values?.reserveEndDate).format(dateTimeFormatter)}</Descriptions.Item>
-                        </Descriptions>
-                        <h3 className='first-title'>选择评标室</h3>
-                    </>
-                )}
-                <ProTable<any>
-                    columns={columns}
-                    actionRef={actionRef}
-                    bordered={false}
-                    loading={false}
-                    params={{ areaType: "eval_room", chooseAreaId: values?.areaId }}
-                    request={async (params) => {
-                        setLoading(true);
-                        return await getBidEvalRoom(params).then(res => {
-                            if (res?.code == 200) {
-                                return {
-                                    data: res?.data.records,
-                                    success: res?.success,
-                                    total: res?.data.total,
-                                }
-                            } else {
-                                return {
-                                    data: [],
-                                    success: false,
-                                    total: 0,
-                                }
-                            }
-                        }).finally(() => {
-                            setLoading(false);
-                        })
-                    }}
-                    rowKey="id"
-                    search={{
-                        labelWidth: 'auto',
-                    }}
-                    options={false}
-                    pagination={{
-                        size: "small",
-                        defaultPageSize: 10,
-                        showSizeChanger: true,
-                    }}
-                    rowSelection={{
-                        type: "radio",
-                        selectedRowKeys,
-                        onChange: (selectedRowKeys, selectedRows) => {
-                            setSelectedRowKeys(selectedRowKeys);
-                            setSelectedRecord(selectedRows[0]);
-                        },
-                    }}
-                    dateFormatter="string"
-                    toolBarRender={false}
-                />
-                <Form
-                    name="basic"
-                    form={form}
-                    labelCol={{ span: 8 }}
-                    wrapperCol={{ span: 16 }}
-                    validateMessages={validateMessages}
-                >
-                    <Form.Item
-                        label="是否预约评标室"
-                        name="reserveStatus"
-                        initialValue={"1"}
-                        hidden
-                    >
-                        <Input />
-                    </Form.Item>
-                    <Form.Item
-                        label="项目id"
-                        name="projectId"
-                        initialValue={proId}
-                        hidden
-                    >
-                        <Input />
-                    </Form.Item>
-                    {selectedRowKeys.length > 0 && (
-                        <Row>
-                            <Col span={12}>
-                                <Form.Item
-                                    label="预计评标开始时间"
-                                    name="reserveStartDate"
-                                    rules={[{ required: true, message: '请选择' }]}
-                                    extra={<span style={{ color: "#b30000" }}>预约时间范围 7:00 ~ 18:00</span>}
-                                >
-                                    <DatePicker showTime showNow={false} disabledDate={disabledDate} disabledTime={(current) => otherDisabledDateTime(current, disabledMap, "startTime")} showMinute={false} showSecond={false} format={dateFormat} style={{ width: '100%' }} renderExtraFooter={() => <span style={{ color: '#b30000' }}>注：若时间被占用，则置灰不可选</span>} />
-                                </Form.Item>
-                            </Col>
-                            <Col span={12}>
-                                <Form.Item
-                                    label="预计评标结束时间"
-                                    name="reserveEndDate"
-                                    rules={[{ required: true, message: '请选择' }]}
-                                >
-                                    <DatePicker showTime showNow={false} disabledDate={disabledDate} disabledTime={(current) => otherDisabledDateTime(current, disabledMap, "endTime")} showMinute={false} showSecond={false} format={dateFormat} style={{ width: '100%' }} renderExtraFooter={() => <span style={{ color: '#b30000' }}>注：若时间被占用，则置灰不可选</span>} />
-                                </Form.Item>
-                            </Col>
-                            <Col span={12}>
-                                <Form.Item
-                                    label="预约人"
-                                    name="reserveBy"
-                                    rules={[{ required: true }]}
-                                >
-                                    <Input maxLength={20} placeholder="预约人姓名" />
-                                </Form.Item>
-                            </Col>
-                            <Col span={12}>
-                                <Form.Item
-                                    label="预约人联系方式"
-                                    name="reserveContactNumber"
-                                    rules={[{ required: true }]}
-                                >
-                                    <Input type="number" maxLength={20} placeholder="预约人手机号" />
-                                </Form.Item>
-                            </Col>
-                        </Row>
-                    )}
-                </Form>
-            </Spin>
-        </Modal>
-    );
-};
-
-export default BidEvalAppointment;
diff --git a/src/components/ElecBidEvaluation/ExpertPhotoUpload.tsx b/src/components/ElecBidEvaluation/ExpertPhotoUpload.tsx
deleted file mode 100644
index 3040d00..0000000
--- a/src/components/ElecBidEvaluation/ExpertPhotoUpload.tsx
+++ /dev/null
@@ -1,158 +0,0 @@
-import { createNewFileBid, removeFileByOid } from '@/services/download_';
-import { downloadPath, uploadAttachmentPath } from '@/utils/DownloadUtils';
-import { getSessionRoleData, getUserToken } from '@/utils/session';
-import { PlusOutlined } from '@ant-design/icons';
-import { message, Modal, Spin, Upload } from 'antd';
-import type { RcFile, UploadProps } from 'antd/es/upload';
-import type { UploadFile } from 'antd/es/upload/interface';
-import React, { useEffect, useState } from 'react';
-
-const getBase64 = (file: RcFile): Promise<string> =>
-    new Promise((resolve, reject) => {
-        const reader = new FileReader();
-        reader.readAsDataURL(file);
-        reader.onload = () => resolve(reader.result as string);
-        reader.onerror = error => reject(error);
-    });
-
-interface ExpertPhotoUpload {
-    maxSize?: number | undefined; //文件大小KB 默认1024KB
-    value?: string | null; //文档中心fileId
-    onChange?: (fileId: string | null) => void; //回调
-    uploadProps?: UploadProps;
-}
-/**
- * 图片上传 仅用fileId objectId随机生成
- * @param props 
- * @returns 
- */
-const ExpertPhotoUpload: React.FC<ExpertPhotoUpload> = (props) => {
-    const { maxSize, value, onChange, uploadProps } = { maxSize: 1024, ...props, }
-    //预览弹窗
-    const [previewVisible, setPreviewVisible] = useState(false);
-    //预览图片的base64
-    const [previewImage, setPreviewImage] = useState('');
-    //objectId
-    const [uploadObjectId, setUploadObjectId] = useState<string>();
-    //文件列表
-    const [fileList, setFileList] = useState<any[]>([]);
-
-    const handleCancel = () => setPreviewVisible(false);
-
-    const handlePreview = async (file: UploadFile) => {
-        if (!file.url && !file.preview) {
-            file.preview = await getBase64(file.originFileObj as RcFile);
-        }
-
-        setPreviewImage(file.url || (file.preview as string));
-        setPreviewVisible(true);
-    };
-
-    const handleChange: UploadProps['onChange'] = ({ file, fileList: newFileList }) => {
-        if (file.status === 'uploading') {
-            setFileList(newFileList);
-        } else if (file.status === 'removed') {
-            // //删除文件
-            // removeFileByOid(file.uid).then(res => {
-            //     if (res.success) {
-            //         onChange && onChange(null);
-            //         message.success("删除成功");
-            //     }
-            // })
-            onChange && onChange(null);
-            message.success("删除成功");
-        } else if (file.status === 'done') {
-            if (file?.response?.success) {
-                onChange && onChange(file?.response.data[0].sysStorageVO.fileId);
-                message.success("上传成功");
-            } else {
-                message.warn(file.response.message);
-            }
-        } else if (file.status === 'error') {
-            message.error("上传服务错误，请稍后再试");
-        }
-    };
-    //上传前校验
-    const beforeUpload = (file: RcFile) => {
-        const fileType = file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/jpeg';
-        const fileSize = file.size / 1024;//精确到KB
-        const fileListLength = fileList.length;
-        if (!fileType) {
-            message.error(`上传失败，${file.name}类型不正确，请选择png、jpg、jpeg类型的图片`);
-            return Upload.LIST_IGNORE;
-        }
-        if (fileSize >= maxSize) {
-            message.error(`上传失败，${file.name}大小为${fileSize.toFixed(2)}KB，超过允许的大小${maxSize}KB`);
-            return Upload.LIST_IGNORE;
-        }
-        if (fileListLength >= 1) {
-            message.error(`上传失败，${file.name}数量为${fileListLength}个，超过允许的数量 1 个`);
-            return Upload.LIST_IGNORE;
-        }
-        return true;
-    }
-
-    const uploadButton = (
-        <div>
-            <PlusOutlined />
-            <div style={{ marginTop: 8 }}>上传</div>
-        </div>
-    );
-    //获取雪花id，上传用
-    const getObjectId = () => {
-        createNewFileBid().then(res => {
-            setUploadObjectId(res.id);
-        })
-    }
-    //回显文件列表
-    const getFileList = (fileId: string | null | undefined) => {
-        if (fileId) {
-            return [{
-                uid: fileId,
-                name: 'image.png',
-                status: 'done',
-                url: downloadPath + "?fileId=" + fileId,
-            }]
-        }
-        return [];
-    }
-
-    useEffect(() => {
-        !uploadProps?.disabled && getObjectId();
-    }, [])
-
-    useEffect(() => {
-        setFileList(() => getFileList(value));
-    }, [value])
-
-    return (
-        <>
-            <Upload
-                action={uploadAttachmentPath}
-                data={{
-                    appCode: 'ebtp-cloud-frontend',
-                    objectId: uploadObjectId,
-                }}
-                headers={{
-                    Authorization: getUserToken(),
-                    currentRoleCode: getSessionRoleData()?.roleCode,
-                }}
-                name="multipartFiles"
-                listType="picture-card"
-                fileList={fileList}
-                onPreview={handlePreview}
-                onChange={handleChange}
-                beforeUpload={beforeUpload}
-                accept=".jpg,.png,.jpeg"
-                {...uploadProps}
-            >
-                {uploadProps?.disabled || fileList.length >= 1 ? null : uploadButton}
-            </Upload>
-            <Modal visible={previewVisible} title="查看" width={'461px'} footer={null} onCancel={handleCancel} centered>
-                <img alt="example" style={{ width: '100%' }} src={previewImage} />
-            </Modal>
-        </>
-    );
-};
-
-export default ExpertPhotoUpload;
\ No newline at end of file
diff --git a/src/components/ElecBidEvaluation/MeetingReservation.tsx b/src/components/ElecBidEvaluation/MeetingReservation.tsx
deleted file mode 100644
index f432ca9..0000000
--- a/src/components/ElecBidEvaluation/MeetingReservation.tsx
+++ /dev/null
@@ -1,276 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Button, DatePicker, DatePickerProps, Form, Input, message, Modal, Select, Skeleton, Spin } from 'antd';
-import moment from 'moment'
-import { cancelMeeting, getMeetingData, saveAppointmentEdit, saveMeeting } from './service';
-import { isNotEmpty } from '@/utils/CommonUtils';
-import { ExclamationCircleOutlined } from '@ant-design/icons';
-import { dateTimeFormatter, echoDateTimeFormatter } from '@/utils/DateUtils';
-import { getSessionRoleData, getSessionUserData } from '@/utils/session';
-
-interface MeetingReservationProps {
-    modalVisible: boolean;
-    onCancel: () => void;
-    onSubmit?: () => void;
-    roomList?: any[];//评标室列表 带问号的参数可不传
-    status: string;//状态 0-新建 1-编辑 2-查看
-    // meetId?: string;//预约id
-    meetData: any;//预约数据
-}
-const layout = {
-    labelCol: { span: 7 },
-    wrapperCol: { span: 14 },
-};
-export const validateMessages = {
-    required: '请填写此项',
-};
-export const range = (start: number, end: number) => {
-    const result = [];
-    for (let i = start; i < end; i++) {
-        result.push(i);
-    }
-    return result;
-};
-//不可选天
-export function disabledDate(current: any) {
-    return current && current < moment().startOf('day');
-}
-//不可选小时
-export const disabledDateTime = () => ({
-    disabledHours: () => [...range(0, 7), ...range(19, 24)],
-});
-//不可选小时（额外不可选）
-export const otherDisabledDateTime = (current: any, disabledMap: any, type: string) => {
-    let otherHour: any[] = range(0, 24);
-    if (current) {
-        otherHour = [];
-        if (Object.keys(disabledMap).length != 0) {
-            const time = moment(current).format("yyyy-MM-DD");
-            disabledMap[time] && (otherHour = [...disabledMap[time][type]]);
-        }
-    }
-    return ({
-        disabledHours: () => [...range(0, 7), ...range(19, 24), ...otherHour],
-    })
-};
-//时间选择框日期格式化
-export const dateFormat: DatePickerProps['format'] = value => value?.startOf('hour').format('YYYY-MM-DD HH:mm:ss');
-//获取登录账号
-const userId = getSessionUserData()?.userId;
-//获取角色
-const roleCode = getSessionRoleData()?.roleCode;
-/**
- * 评标室预约管理-会议室预约弹窗
- * @param props 
- * @returns 
- */
-const MeetingReservation: React.FC<MeetingReservationProps> = (props) => {
-    const { modalVisible, onCancel, onSubmit, roomList, status, meetData } = props;
-    const { id = null, reserveBy = "" } = { ...meetData };
-    const [form] = Form.useForm();
-    const { Option } = Select;
-    const { confirm } = Modal;
-    const { TextArea } = Input;
-    //loading
-    const [loading, setLoading] = useState<boolean>(false);
-    //初始化
-    const [skeleing, setSkeleing] = useState<boolean>(false);
-    //窗口状态 0-新建 1-编辑 2-查看
-    const [modalStatus, setModalStatus] = useState<string | undefined>(status);
-    //评标室类型 meeting-会议室 eval-评标室
-    const [meetType, setMeetType] = useState<string>("meeting");
-    //会议室预约是否可修改 true-不可修改 false-可修改
-    const [isEditMeet, setIsEditMeet] = useState<boolean>(false);
-    //存一份预约数据
-    const [meetingData, setMeetingData] = useState<any>();
-    //判断预约人员是否本人 true-是预约人员不是本人（不可编辑） false-其余情况（可以编辑）
-    const isMeetSelf: boolean = (roleCode == "ebtp-appointment") && (reserveBy != userId);
-
-    const onFinish = (values: any) => {
-        if (values.reserveStartDate < moment().format(dateTimeFormatter)) {
-            message.info("开始时间不可早于当前时间");
-            return;
-        }
-        const params = JSON.parse(JSON.stringify(values));//深拷贝
-        params.reserveStartDate = moment(params.reserveStartDate).format(dateTimeFormatter);
-        params.reserveEndDate = moment(params.reserveEndDate).format(dateTimeFormatter);
-        setLoading(true);
-        if (meetType == "meeting") {//会议室保存
-            saveMeeting(params).then(res => {
-                if (res?.code == 200) {
-                    message.success("保存成功");
-                    onSubmit && onSubmit();
-                }
-            }).finally(() => {
-                setLoading(false);
-            })
-        } else {
-            saveAppointmentEdit({ ...meetingData, ...params }).then(res => {//评标室保存
-                if (res?.code == 200) {
-                    message.success("保存成功");
-                    onSubmit && onSubmit();
-                }
-            }).finally(() => {
-                setLoading(false);
-            })
-        }
-    };
-
-    //获取预约信息
-    const getMeetData = () => {
-        setSkeleing(true);
-        getMeetingData(id).then(res => {
-            if (res?.code == 200) {
-                setSkeleing(false);
-                const data = res?.data;
-                const isEdit: boolean = data.reserveType == "meeting" ? data.reserveStartDate <= moment().format(dateTimeFormatter) : data.status != 0;
-                setIsEditMeet(isEdit);
-                setMeetingData(data);
-                setMeetType(data.reserveType);//变更窗口类型
-                if (data.reserveType == "meeting") {
-                    data.reserveStartDate = echoDateTimeFormatter(data.reserveStartDate);
-                    data.reserveEndDate = echoDateTimeFormatter(data.reserveEndDate);
-                }
-                form.setFieldsValue(data);
-            }
-        })
-    }
-    //取消预约
-    const cancelMeet = () => {
-        confirm({
-            title: "请与评标场所使用人员确认后再进行取消，以免影响评标/会议的正常开展！",
-            icon: <ExclamationCircleOutlined />,
-            centered: true,
-            okText: '确认',
-            content: '',
-            async onOk() {
-                await cancelMeeting(id).then(res => {
-                    if (res?.code == 200) {
-                        message.success("取消预约成功");
-                        onSubmit && onSubmit();
-                    }
-                })
-            },
-            onCancel() { },
-        });
-    }
-
-    const editMeeting = () => {
-        if (meetType == "eval") {//评标室预约修改
-            const data = JSON.parse(JSON.stringify(meetingData));//深拷贝
-            data.reserveStartDate = echoDateTimeFormatter(data.reserveStartDate);
-            data.reserveEndDate = echoDateTimeFormatter(data.reserveEndDate);
-            form.setFieldsValue(data);
-        }
-        setModalStatus("1");
-    }
-    useEffect(() => {
-        if (isNotEmpty(id)) {
-            getMeetData();
-        }
-    }, [id])
-
-    return (
-        <Modal
-            destroyOnClose
-            title={skeleing ? null : meetType == "meeting" ? "会议室预约" : "详情"}
-            visible={modalVisible}
-            onCancel={() => onCancel()}
-            centered
-            width={600}
-            footer={skeleing ? [<Skeleton.Button active />] : [
-                <Button key="close" onClick={onCancel}>
-                    返回
-                </Button>,
-                <Button key="save" type="primary" onClick={() => form.submit()} hidden={meetType == undefined || modalStatus == "2"}>
-                    保存
-                </Button>,
-                <Button key="edit" onClick={() => editMeeting()} hidden={meetType == undefined || modalStatus == "1" || modalStatus == "0" || isEditMeet || isMeetSelf}>
-                    修改预约
-                </Button>,
-                <Button type="primary" key="cancel" hidden={modalStatus == "0" || isEditMeet || isMeetSelf} onClick={() => cancelMeet()}>
-                    取消预约
-                </Button>,
-            ]}
-        >
-            <Spin spinning={loading}>
-                <Skeleton loading={skeleing} active>
-                    <Form {...layout} form={form} name="control-hooks" onFinish={onFinish} validateMessages={validateMessages}>
-                        {meetType == "meeting" ? (
-                            <>
-                                <Form.Item name="id" label="会议id" hidden>
-                                    <Input />
-                                </Form.Item>
-                                <Form.Item name="areaId" label="评标室" rules={[{ required: !(modalStatus == "2") }]}>
-                                    <Select
-                                        placeholder="选择评标室"
-                                        allowClear
-                                        disabled={modalStatus == "2"}
-                                    >
-                                        {roomList?.map(item => (<Option value={item.id} key={item.id}>{item.areaName}</Option>))}
-                                    </Select>
-                                </Form.Item>
-                                <Form.Item name="meetingName" label="会议名称" rules={[{ required: !(modalStatus == "2") }]}>
-                                    <TextArea placeholder="会议名称" disabled={modalStatus == "2"} autoSize maxLength={50} />
-                                </Form.Item>
-                                <Form.Item name="numberInMeeting" label="会议人数" rules={[{ required: !(modalStatus == "2") }]}>
-                                    <Input type="number" placeholder="会议人数" suffix="人" disabled={modalStatus == "2"} maxLength={5} />
-                                </Form.Item>
-                                <Form.Item name="reserveStartDate" label="会议开始时间" rules={[{ required: !(modalStatus == "2") }]}>
-                                    <DatePicker showTime={{ defaultValue: moment().hour(7) }} showNow={false} disabledDate={disabledDate} disabledTime={disabledDateTime} showMinute={false} showSecond={false} format={dateFormat} style={{ width: '100%' }} disabled={modalStatus == "2"} />
-                                </Form.Item>
-                                <Form.Item name="reserveEndDate" label="会议结束时间" rules={[{ required: !(modalStatus == "2") }]}>
-                                    <DatePicker showTime={{ defaultValue: moment().hour(7) }} showNow={false} disabledDate={disabledDate} disabledTime={disabledDateTime} showMinute={false} showSecond={false} format={dateFormat} style={{ width: '100%' }} disabled={modalStatus == "2"} />
-                                </Form.Item>
-                                <Form.Item name="reserveBy" label="预约人" rules={[{ required: !(modalStatus == "2") }]}>
-                                    <Input placeholder="预约人" disabled={modalStatus == "2"} maxLength={50} />
-                                </Form.Item>
-                                <Form.Item name="reserveContactNumber" label="预约人联系方式" rules={[{ required: !(modalStatus == "2") }]}>
-                                    <Input placeholder="预约人联系方式" disabled={modalStatus == "2"} maxLength={50} />
-                                </Form.Item>
-                            </>
-                        ) : (
-                            <>
-                                <Form.Item name="projectName" label="项目名称">
-                                    <TextArea readOnly bordered={false} autoSize />
-                                </Form.Item>
-                                <Form.Item name="projectNum" label="项目编号">
-                                    <Input readOnly bordered={false} />
-                                </Form.Item>
-                                <Form.Item name="sectionNames" label="标段名称">
-                                    <TextArea readOnly bordered={false} autoSize />
-                                </Form.Item>
-                                {modalStatus == "2" ? (
-                                    <>
-                                        <Form.Item name="reserveStartDate" label="预计开始时间">
-                                            <Input readOnly bordered={false} />
-                                        </Form.Item>
-                                        <Form.Item name="reserveEndDate" label="预计结束时间">
-                                            <Input readOnly bordered={false} />
-                                        </Form.Item>
-                                    </>
-                                ) : (
-                                    <>
-                                        <Form.Item name="reserveStartDate" label="预计开始时间" rules={[{ required: true }]}>
-                                            <DatePicker showTime={{ defaultValue: moment().hour(7) }} showNow={false} disabledDate={disabledDate} disabledTime={disabledDateTime} showMinute={false} showSecond={false} format={dateFormat} style={{ width: '100%' }} />
-                                        </Form.Item>
-                                        <Form.Item name="reserveEndDate" label="预计结束时间" rules={[{ required: true }]}>
-                                            <DatePicker showTime={{ defaultValue: moment().hour(7) }} showNow={false} disabledDate={disabledDate} disabledTime={disabledDateTime} showMinute={false} showSecond={false} format={dateFormat} style={{ width: '100%' }} />
-                                        </Form.Item>
-                                    </>
-                                )}
-                                <Form.Item name="reserveBy" label="预约人">
-                                    <Input readOnly bordered={false} />
-                                </Form.Item>
-                                <Form.Item name="reserveContactNumber" label="预约人联系方式">
-                                    <Input readOnly bordered={false} />
-                                </Form.Item>
-                            </>
-                        )}
-                    </Form>
-                </Skeleton>
-            </Spin>
-        </Modal>
-    );
-};
-
-export default MeetingReservation;
diff --git a/src/components/ElecBidEvaluation/ScreenVideoPlay.tsx b/src/components/ElecBidEvaluation/ScreenVideoPlay.tsx
deleted file mode 100644
index 3105720..0000000
--- a/src/components/ElecBidEvaluation/ScreenVideoPlay.tsx
+++ /dev/null
@@ -1,263 +0,0 @@
-import React, { useEffect, useImperativeHandle, useRef } from 'react';
-import { debounce } from 'lodash';
-
-interface ScreenVideoPlayProps {
-    videoRef: React.MutableRefObject<any | undefined>,
-    cameraParams: any,
-    status: number,//0-预览 1-回放
-}
-/**
- * 视频监控组件（海康插件）
- * @param props 
- * @returns 
- */
-const ScreenVideoPlay: React.FC<ScreenVideoPlayProps> = (props) => {
-    const { videoRef, cameraParams, status } = props;
-    const playWnd = useRef<any>(null);
-    let oWebControl: any = null;
-    let scale = window.innerHeight / 1080;
-    let initCount = 0;
-    let pubKey = '';
-
-    useEffect(() => {
-        if (oWebControl != null) {
-            oWebControl.JS_RequestInterface({
-                funcName: "stopAllPreview"
-            });
-        }
-        initPlugin();
-    }, [cameraParams?.appSecret])
-
-    // 创建播放实例
-    function initPlugin() {
-        oWebControl = new WebControl({
-            szPluginContainer: "playWnd",                       // 指定容器id
-            iServicePortStart: 15900,                           // 指定起止端口号，建议使用该值
-            iServicePortEnd: 15909,
-            szClassId: "23BF3B0A-2C56-4D97-9C03-0CB103AA8F11",   // 用于IE10使用ActiveX的clsid
-            cbConnectSuccess: function () {                     // 创建WebControl实例成功											
-                oWebControl.JS_StartService("window", {         // WebControl实例创建成功后需要启动服务
-                    dllPath: "./VideoPluginConnect.dll"         // 值"./VideoPluginConnect.dll"写死 
-                }).then(function () {                           // 启动插件服务成功
-                    // oWebControl.JS_SetWindowControlCallback({   // 设置消息回调
-                    //     cbIntegrationCallBack: cbIntegrationCallBack
-                    // });
-
-                    oWebControl.JS_CreateWnd("playWnd", playWnd.current.clientWidth * scale, playWnd.current.clientHeight * scale).then(function () { //JS_CreateWnd创建视频播放窗口，宽高可设定
-                        init();  // 创建播放实例成功后初始化
-                    });
-                }, function () { // 启动插件服务失败
-                });
-            },
-            cbConnectError: function () { // 创建WebControl实例失败
-                oWebControl = null;
-                // $("#playWnd").html("插件未启动，正在尝试启动，请稍候...");
-                WebControl.JS_WakeUp("VideoWebPlugin://"); // 程序未启动时执行error函数，采用wakeup来启动程序
-                initCount++;
-                if (initCount < 3) {
-                    setTimeout(function () {
-                        initPlugin();
-                    }, 3000)
-                } else {
-                    // $("#playWnd").html("插件启动失败，请检查插件是否安装！");
-                }
-            },
-            cbConnectClose: function (bNormalClose: any) {
-                // 异常断开：bNormalClose = false
-                // JS_Disconnect正常断开：bNormalClose = true
-                oWebControl = null;
-            }
-        });
-        return oWebControl;
-    }
-
-    //初始化
-    function init() {
-        getPubKey(function () {
-            ////////////////////////////////// 请自行修改以下变量值	////////////////////////////////////		
-            var appkey = cameraParams.appKey;                           //综合安防管理平台提供的appkey，必填
-            var secret = setEncrypt(cameraParams.appSecret);   //综合安防管理平台提供的secret，必填
-            var ip = cameraParams.platformManagementIp;        //综合安防管理平台IP地址，必填
-            var playMode = status;                                  //初始播放模式：0-预览，1-回放
-            var port = Number(cameraParams.platformManagementPort);   //综合安防管理平台端口，若启用HTTPS协议，默认443
-            var snapDir = "D:\\SnapDir";                       //抓图存储路径
-            var videoDir = "D:\\VideoDir";                     //紧急录像或录像剪辑存储路径
-            var layout = "1x1";                                //playMode指定模式的布局
-            var enableHTTPS = 1;                               //是否启用HTTPS协议与综合安防管理平台交互，这里总是填1
-            var encryptedFields = 'secret';					   //加密字段，默认加密领域为secret
-            var showToolbar = 0;                               //是否显示工具栏，0-不显示，非0-显示
-            var showSmart = 1;                                 //是否显示智能信息（如配置移动侦测后画面上的线框），0-不显示，非0-显示
-            // var buttonIDs = "0,16,256,257,258,259,260,512,513,514,515,516,517,768,769";  //自定义工具条按钮
-            var buttonIDs = "";  //自定义工具条按钮
-            ////////////////////////////////// 请自行修改以上变量值	////////////////////////////////////
-
-            oWebControl.JS_RequestInterface({
-                funcName: "init",
-                argument: JSON.stringify({
-                    appkey: appkey,                            //API网关提供的appkey
-                    secret: secret,                            //API网关提供的secret
-                    ip: ip,                                    //API网关IP地址
-                    playMode: playMode,                        //播放模式（决定显示预览还是回放界面）
-                    port: port,                                //端口
-                    // snapDir: snapDir,                          //抓图存储路径
-                    // videoDir: videoDir,                        //紧急录像或录像剪辑存储路径
-                    layout: layout,                            //布局
-                    enableHTTPS: enableHTTPS,                  //是否启用HTTPS协议
-                    encryptedFields: encryptedFields,          //加密字段
-                    showToolbar: showToolbar,                  //是否显示工具栏
-                    showSmart: showSmart,                      //是否显示智能信息
-                    buttonIDs: buttonIDs                       //自定义工具条按钮
-                })
-            }).then(function (oData: any) {
-                oWebControl.JS_Resize(playWnd.current.clientWidth * scale, playWnd.current.clientHeight * scale);  // 初始化后resize一次，规避firefox下首次显示窗口后插件窗口未与DIV窗口重合问题
-            });
-        });
-    }
-
-
-    //获取公钥
-    function getPubKey(callback: any) {
-        oWebControl.JS_RequestInterface({
-            funcName: "getRSAPubKey",
-            argument: JSON.stringify({
-                keyLength: 1024
-            })
-        }).then(function (oData: any) {
-            if (oData.responseMsg.data) {
-                pubKey = oData.responseMsg.data;
-                callback()
-            }
-        })
-    }
-
-    //RSA加密
-    function setEncrypt(value: any) {
-        var encrypt = new JSEncrypt();
-        encrypt.setPublicKey(pubKey);
-        return encrypt.encrypt(value);
-    }
-
-    // 设置窗口裁剪，当因滚动条滚动导致窗口需要被遮住的情况下需要JS_CuttingPartWindow部分窗口
-    function setWndCover() {
-        var iWidth = window.innerWidth;
-        var iHeight = window.innerHeight;
-        let scale = window.innerHeight / 1080;
-        var oDivRect = playWnd.current.getBoundingClientRect();
-
-        var iCoverLeft = (oDivRect.left < 0) ? Math.abs(oDivRect.left) : 0;
-        var iCoverTop = (oDivRect.top < 0) ? Math.abs(oDivRect.top) : 0;
-        var iCoverRight = (oDivRect.right - iWidth > 0) ? Math.round(oDivRect.right - iWidth) : 0;
-        var iCoverBottom = (oDivRect.bottom - iHeight > 0) ? Math.round(oDivRect.bottom - iHeight) : 0;
-
-        iCoverLeft = (iCoverLeft > playWnd.current.clientWidth * scale) ? playWnd.current.clientWidth * scale : iCoverLeft;
-        iCoverTop = (iCoverTop > playWnd.current.clientHeight * scale) ? playWnd.current.clientHeight * scale : iCoverTop;
-        iCoverRight = (iCoverRight > playWnd.current.clientWidth * scale) ? playWnd.current.clientWidth * scale : iCoverRight;
-        iCoverBottom = (iCoverBottom > playWnd.current.clientHeight * scale) ? playWnd.current.clientHeight * scale : iCoverBottom;
-
-        oWebControl.JS_RepairPartWindow(0, 0, playWnd.current.clientWidth * scale + 1, playWnd.current.clientHeight * scale);    // 多1个像素点防止还原后边界缺失一个像素条
-        if (iCoverLeft != 0) {
-            oWebControl.JS_CuttingPartWindow(0, 0, iCoverLeft, playWnd.current.clientHeight * scale);
-        }
-        if (iCoverTop != 0) {
-            oWebControl.JS_CuttingPartWindow(0, 0, playWnd.current.clientWidth * scale + 1, iCoverTop);    // 多剪掉一个像素条，防止出现剪掉一部分窗口后出现一个像素条
-        }
-        if (iCoverRight != 0) {
-            oWebControl.JS_CuttingPartWindow(playWnd.current.clientWidth * scale - iCoverRight, 0, iCoverRight, playWnd.current.clientHeight * scale);
-        }
-        if (iCoverBottom != 0) {
-            oWebControl.JS_CuttingPartWindow(0, playWnd.current.clientHeight * scale - iCoverBottom, playWnd.current.clientWidth * scale, iCoverBottom);
-        }
-    }
-
-    //视频预览功能
-    function startPreview(caremaCode: any) {
-        var cameraIndexCode = caremaCode;     //获取输入的监控点编号值，必填
-        var streamMode = 0;                                     //主子码流标识：0-主码流，1-子码流
-        var transMode = 1;                                      //传输协议：0-UDP，1-TCP
-        var gpuMode = 0;                                        //是否启用GPU硬解，0-不启用，1-启用
-        var wndId = -1;                                         //播放窗口序号（在2x2以上布局下可指定播放窗口）
-
-        cameraIndexCode = cameraIndexCode?.replace(/(^\s*)/g, "");
-        cameraIndexCode = cameraIndexCode?.replace(/(\s*$)/g, "");
-        if (oWebControl != null) {
-            oWebControl?.JS_RequestInterface({
-                funcName: "startPreview",
-                argument: JSON.stringify({
-                    cameraIndexCode: cameraIndexCode,                //监控点编号
-                    streamMode: streamMode,                         //主子码流标识
-                    transMode: transMode,                           //传输协议
-                    gpuMode: gpuMode,                               //是否开启GPU硬解
-                    wndId: wndId                                     //可指定播放窗口
-                })
-            })
-        }
-    };
-
-
-    //视频回放
-    function videoPlayback(caremaCode: any, startTime: any, endTime: any) {
-        var cameraIndexCode = caremaCode;         //获取输入的监控点编号值，必填
-        var startTimeStamp = new Date(startTime?.replace('-', '/').replace('-', '/')).getTime();    //回放开始时间戳，必填
-        var endTimeStamp = new Date(endTime?.replace('-', '/').replace('-', '/')).getTime();        //回放结束时间戳，必填
-        var recordLocation = 1;                                     //录像存储位置：0-中心存储，1-设备存储
-        var transMode = 1;                                          //传输协议：0-UDP，1-TCP
-        var gpuMode = 0;                                            //是否启用GPU硬解，0-不启用，1-启用
-        var wndId = -1;                                             //播放窗口序号（在2x2以上布局下可指定播放窗口）
-
-        oWebControl.JS_RequestInterface({
-            funcName: "startPlayback",
-            argument: JSON.stringify({
-                cameraIndexCode: cameraIndexCode,                   //监控点编号
-                startTimeStamp: Math.floor(startTimeStamp / 1000).toString(),  //录像查询开始时间戳，单位：秒
-                endTimeStamp: Math.floor(endTimeStamp / 1000).toString(),      //录像结束开始时间戳，单位：秒
-                recordLocation: recordLocation,                     //录像存储类型：0-中心存储，1-设备存储
-                transMode: transMode,                               //传输协议：0-UDP，1-TCP
-                gpuMode: gpuMode,                                   //是否启用GPU硬解，0-不启用，1-启用
-                wndId: wndId                                         //可指定播放窗口
-            })
-        })
-    };
-
-    useEffect(() => {
-        // 监听resize事件，使插件窗口尺寸跟随DIV窗口变化
-        // 监听滚动条scroll事件，使插件窗口跟随浏览器滚动而移动
-        const resize = () => {
-            if (oWebControl != null) {
-                let scale = window.innerHeight / 1080;
-                oWebControl.JS_Resize(playWnd.current.clientWidth * scale, playWnd.current.clientHeight * scale);
-                setWndCover();
-            }
-        };
-        window.addEventListener("resize", debounce(() => resize(), 1000));
-        window.addEventListener("scroll", debounce(() => resize(), 1000));
-        return () => {
-            window.removeEventListener("resize", debounce(() => resize(), 1000));
-            window.removeEventListener("scroll", debounce(() => resize(), 1000));
-            if (oWebControl != null) {
-                oWebControl.JS_HideWnd();   // 先让窗口隐藏，规避可能的插件窗口滞后于浏览器消失问题 
-                oWebControl.JS_Disconnect().then(function () {  // 断开与插件服务连接成功
-                },
-                    function () {  // 断开与插件服务连接失败
-                    });
-            }
-        }
-    }, [])
-
-    //选择暴露给父组件的参数或方法
-    useImperativeHandle(
-        videoRef,
-        () => ({
-            play(caremaCode: any) {
-                startPreview(caremaCode);
-            },
-            back(caremaCode: any, startTime: any, endTime: any) {
-                videoPlayback(caremaCode, startTime, endTime);
-            }
-        }),
-        [],
-    );
-
-    return <div id="playWnd" ref={playWnd} style={{ height: "100%", width: "100%" }}></div>;
-};
-
-export default ScreenVideoPlay;
diff --git a/src/components/ElecBidEvaluation/ScreenWarnBack.tsx b/src/components/ElecBidEvaluation/ScreenWarnBack.tsx
deleted file mode 100644
index ce99227..0000000
--- a/src/components/ElecBidEvaluation/ScreenWarnBack.tsx
+++ /dev/null
@@ -1,215 +0,0 @@
-import React, { useEffect, useRef, useState } from 'react';
-import { Card, List, Modal, Typography, Image, Radio, Table, Drawer } from 'antd';
-import ProCard from '@ant-design/pro-card';
-import { getCameraList, getWarnDetailData } from './service';
-import ScreenVideoPlay from './ScreenVideoPlay';
-import { pictureDisplayPath } from '@/utils/DownloadUtils';
-import moment from 'moment';
-
-interface ScreenWarnBackProps {
-    modalVisible: boolean;
-    onCancel: () => void;
-    warnId: string;//告警id
-}
-const modalHeight = window.innerHeight * 96 / 100;
-
-/**
- * 异常告警详情回放
- * @param props 
- * @returns 
- */
-const ScreenWarnBack: React.FC<ScreenWarnBackProps> = (props) => {
-    const { modalVisible, onCancel, warnId } = props;
-    const { Title } = Typography;
-    //详情信息
-    const [detailData, setDetailData] = useState<any>();
-    //设备列表
-    const [caremaList, setCaremaList] = useState<any[]>([]);
-    //当前选择的设备
-    const [cameraSelect, setCameraSelect] = useState<string>("1");
-    //当前播放的设备参数
-    const [cameraParams, setCameraParams] = useState<any>();
-    //图片查看抽屉显隐
-    const [drawerVisible, setDrawerVisible] = useState<boolean>(false);
-    //图片查看URL
-    const [drawerUrl, setDrawerUrl] = useState<string>('');
-    //监控视频Ref
-    const videoRef = useRef<any>();
-    //图片展示ref
-    const zoomImg = useRef<any>(null);
-    const peopleNumColumns: any[] = [
-        {
-            title: '时间',
-            dataIndex: 'eventTime',
-            key: 'eventTime',
-            align: 'center',
-            width: "40%",
-        },
-        {
-            title: '阈值',
-            dataIndex: 'thresholdOfPeople',
-            key: 'thresholdOfPeople',
-            align: 'center',
-            ellipsis: true,
-            render: (_: any, record: any) => `${_}人`,
-        },
-        {
-            title: '实际人数',
-            dataIndex: 'realOfPeople',
-            key: 'realOfPeople',
-            align: 'center',
-            render: (_: any, record: any) => `${_}人`,
-        },
-    ];
-    //回放
-    const videoBack = (deviceCode: any, data: any) => {
-        let backTime = 20;
-        if (data.type == "2") {//人数预警
-            backTime = 10;
-        }
-        videoRef.current?.back(deviceCode, moment(data?.createDate).subtract(backTime, 'm').format('yyyy-MM-DD HH:mm:ss'), data?.createDate);
-    }
-
-    //获取告警详情数据
-    const getWarnDetail = () => {
-        getWarnDetailData({ id: warnId }).then(res => {
-            if (res?.code == 200) {
-                const data = res?.data;
-                setDetailData(data);
-                getCaremaData(data);
-            }
-        })
-    }
-
-    //获取设备
-    const getCaremaData = (baseData: any) => {
-        getCameraList({ areaId: baseData.placeId }).then(res => {
-            if (res?.code == 200) {
-                const data = res?.data;
-                setCaremaList(data);
-                if (data?.length > 0) {
-                    //获取回看时间
-                    setCameraSelect(data[0].deviceCode);
-                    setCameraParams(data[0].platform);
-                    setTimeout(() => {
-                        videoBack(data[0].deviceCode, baseData);
-                    }, 4000);
-                }
-            }
-        })
-    }
-    //切换设备
-    const onCaremaChange = (e: any) => {
-        const caremaCode = e.target.value;
-        for (const ite of caremaList) {
-            if (ite.deviceCode == caremaCode) {
-                setCameraSelect(caremaCode);
-                setCameraParams(ite.platform);
-                videoBack(caremaCode, detailData);
-            }
-        }
-    }
-
-    //图片放大抽屉显示
-    const drawerClick = (filePath: string) => {
-        setDrawerUrl(filePath);
-        setDrawerVisible(true);
-    }
-    //图片放大抽屉关闭
-    const drawerClose = () => {
-        setDrawerVisible(false);
-        setDrawerUrl("");
-    }
-    const handleImgZoom = (e: { nativeEvent: { deltaY: number; }; }) => {
-        const { clientWidth, clientHeight, style, height, width } = zoomImg.current
-        const value = height / width
-        const num = 50
-        const bool = height > width ? clientWidth < 2000 : clientHeight < 1500
-        if (e.nativeEvent.deltaY <= 0 && bool) {
-            style.maxWidth = "none"
-            style.maxHeight = "none"
-            style.width = width + num + "px"
-            style.height = height + (num * value) + "px"
-            style.left = style.left - 1 % +"px"
-            style.top = style.top - 1 % +"px"
-        } else if (e.nativeEvent.deltaY > 0) {
-            if (width > 200 && height > 100) {
-                style.width = width - num + "px"
-                style.height = height - (num * value) + "px"
-                style.left = style.left + 1 % + "px"
-                style.top = style.top + 1 % + "px"
-            }
-        }
-    }
-
-    useEffect(() => {
-        warnId && getWarnDetail();
-    }, [warnId])
-
-    return (
-        <Modal
-            destroyOnClose
-            title="告警详情"
-            visible={modalVisible}
-            onCancel={() => onCancel()}
-            okButtonProps={{ hidden: true }}
-            width={"80%"}
-            maskClosable={false}
-            style={{ maxHeight: modalHeight }}
-            bodyStyle={{ height: modalHeight - 107, overflowY: 'auto', padding: 0 }}
-            centered
-        >
-            <ProCard split="vertical" bodyStyle={{ height: "calc(100vh - 136px)" }}>
-                <ProCard colSpan={7} key="0" bodyStyle={{ padding: "16px", overflowY: 'auto', height: "calc(100vh - 136px)" }} className="screen-warn-p">
-                    <Title level={5} style={{ marginBottom: '8px', color: "#b30000" }}>告警信息：{detailData?.type == "3" ? "陌生人进入" : "人数异常"}</Title>
-                    {detailData?.type == "3" ? (
-                        <List
-                            grid={{ column: 1 }}
-                            dataSource={detailData?.details}
-                            renderItem={(item: any) => (
-                                <List.Item>
-                                    <Card bodyStyle={{ padding: "8px" }}>
-                                        <div style={{ display: 'flex', justifyContent: 'space-between' }}>
-                                            <Typography>时间：{item.eventTime}</Typography>
-                                            <Image src={pictureDisplayPath + "?filePath=" + item.filePath} preview={{ getContainer: "null" }} height="70px" onClick={() => drawerClick(item.filePath)} />
-                                        </div>
-                                    </Card>
-                                </List.Item>
-                            )}
-                        />
-                    ) : (
-                        <Table
-                            pagination={false}
-                            rowKey="id"
-                            size="small"
-                            dataSource={detailData?.details}
-                            columns={peopleNumColumns}
-                        />
-                    )}
-                    {drawerVisible && <Drawer
-                        placement="left"
-                        onClose={drawerClose}
-                        visible={drawerVisible}
-                        width={'29.17%'}
-                        getContainer={false}
-                        style={{ position: 'absolute' }}
-                    >
-                        <div onClick={drawerClose}>
-                            <img src={pictureDisplayPath + "?filePath=" + drawerUrl} onWheel={handleImgZoom} ref={zoomImg} />
-                        </div>
-                    </Drawer>}
-                </ProCard>
-                <ProCard colSpan={17} key="1" bodyStyle={{ padding: "16px" }}>
-                    <Radio.Group value={cameraSelect} buttonStyle="solid" style={{ marginBottom: "8px" }} onChange={onCaremaChange}>
-                        {caremaList.map(item => (<Radio.Button value={item.deviceCode} key={item.deviceCode}>{item.deviceName}</Radio.Button>))}
-                    </Radio.Group>
-                    <div style={{ height: "94%", border: '1px solid red' }}>
-                        {cameraParams && <ScreenVideoPlay videoRef={videoRef} cameraParams={cameraParams} status={1} />}
-                    </div>
-                </ProCard>
-            </ProCard>
-        </Modal>
-    );
-};
-
-export default ScreenWarnBack;
diff --git a/src/components/ElecBidEvaluation/service.ts b/src/components/ElecBidEvaluation/service.ts
deleted file mode 100644
index fa5d166..0000000
--- a/src/components/ElecBidEvaluation/service.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import request from '@/utils/request';
-
-/**
- * 根据预约id获取预约信息
- */
-export async function getMeetingData(id: any) {
-    return request('/api/biz-service-ebtp-evaluation/v1/eval/room/reserve/infoById/' + id, {
-        method: 'GET',
-    });
-}
-
-/**
- * 保存预约
- */
-export async function saveMeeting(data: any) {
-    return request('/api/biz-service-ebtp-evaluation/v1/eval/room/reserve/meeting/save', {
-        method: 'POST',
-        data: { ...data }
-    });
-}
-
-/**
- * 取消预约
- */
-export async function cancelMeeting(id: any) {
-    return request('/api/biz-service-ebtp-evaluation/v1/eval/room/reserve/cancel/' + id, {
-        method: 'GET',
-    });
-}
-
-/**
- * 评标室预约-查询评标室
- * @params data
- */
-export async function getBidEvalRoom(data: any) {
-    return request('/api/biz-service-ebtp-evaluation/v1/elec/eval/area/page/all', {
-        method: 'POST',
-        data: {
-            ...data,
-            pageNo: data.current,
-        },
-    });
-}
-
-/**
- * 评标室预约-预约修改保存
- * @params data
- */
-export async function saveAppointmentEdit(data: any) {
-    return request('/api/biz-service-ebtp-evaluation/v1/eval/room/reserve/updateSubmit', {
-        method: 'POST',
-        data: { ...data, },
-    });
-}
-
-/**
- * 根据告警id查询告警详情
- * @param params
- */
-export async function getWarnDetailData(params: any) {
-    return request('/api/biz-service-ebtp-evaluation/v1/eval/room/alarm/get', {
-        method: 'POST',
-        params: params,
-    });
-}
-
-/**
- * 设备列表
- * @param params 
- * @returns 
- */
-export async function getCameraList(params: any) {
-    return request('/api/biz-service-ebtp-evaluation/v1/screen/queryAreaCamera', {
-        method: 'GET',
-        params: params,
-    });
-}
-
-/**
- * 重新评标生效（预约评标室）
- * @method POST
- */
-export async function handleTakeEffectReserve(params: any, data: any) {
-    return request("/api/biz-service-ebtp-project/v1/projectReEvaluation/achieve/" + params, {
-        method: "POST",
-        data: data,
-    })
-}
-
-/**
- * 获取区域的预约记录（用于时间组件禁用）
- * @param areaId 
- * @returns 
- */
-export async function getTimeByAreaId(areaId: any) {
-    return request(`/api/biz-service-ebtp-evaluation/v1/eval/room/reserve/occupiedTime/${areaId}`, {
-        method: 'GET',
-    });
-}
\ No newline at end of file
diff --git a/src/components/EquityRelation/RelationCharts.tsx b/src/components/EquityRelation/RelationCharts.tsx
deleted file mode 100644
index 4c5021a..0000000
--- a/src/components/EquityRelation/RelationCharts.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import ReactEcharts from 'echarts-for-react';
-import PropTypes from 'prop-types';
-import React, { useMemo } from 'react';
-/**
- * 供应商股权关系-Echarts关系图
- * @param props 
- * @returns 
- */
-export default function RelationCharts(props: { linkData?: any[] | undefined; suppListTrans?: any[] | undefined; }) {
-    const { linkData = [], suppListTrans = [] } = props;
-    const option = {
-        title: {
-            text: ''
-        },
-        color: '#EA8786',
-        tooltip: {
-            show: false,
-        },
-        animationDurationUpdate: 1500,
-        animationEasingUpdate: 'quinticInOut',
-        series: [
-            {
-                type: 'graph',
-                layout: 'force',
-                edgeSymbol: ['', 'arrow'],
-                label: {
-                    normal: {
-                        show: true,
-                        position: 'top',//设置label显示的位置
-                        textStyle: {
-                            fontSize: '12px'
-                        },
-                    }
-                },
-                symbolSize: (value: any, params: { data: { category: any; }; }) => {
-                    switch (params.data.category) {
-                        case 0: return 50;
-                        case 1: return 30;
-                        case 2: return 20;
-                        case 3: return 30;
-                        default: return 10;
-                    }
-                },
-                draggable: true,
-                data: suppListTrans,
-                force: {
-                    edgeLength: 200,
-                    repulsion: 3000,
-                    gravity: 0.2,
-                },
-                Symbol: 'circle',
-                // symbol:function(x,y) {
-                //     switch (y.data.category) {
-                //         case 1: return 'circle';
-                //         // case 1: return 'roundRect';
-                //         case 2: return 'circle';
-                //         default: 'circle';
-                //     }
-                // },
-                links: linkData,
-                roam: true,
-                zoom: 0.8,
-                itemStyle: {
-                    normal: {
-                        color: function (params: { data: { category: any; }; }) {
-                            // console.log('--params:', params)
-                            // if
-                            switch (params.data.category) {
-                                case 1: return '#EA8786';
-                                case 2: return '#128bed';
-                                case 3: return '#f39800';
-                                default: return '#EA8786';
-                            }
-                        },
-                    }
-                },
-                lineStyle: {
-                    color: '#EA8786',
-                    // color: 'source',
-                    // curveness: 0.2
-                },
-                edgeLabel: {
-                    width: '80',
-                    overflow: 'break',
-                },
-            }
-        ]
-    }
-    let onclick = {
-        'click': (e: { data: { isProvider: number; code: any; }; }) => {
-            if (e.data.isProvider == 1) {
-                // windowOpen(`/supplier-info/supplier-detail/${e.data.code}`, "_blank")
-                // alert(e.data.code);
-            }
-        }
-    }
-    return (
-        <>
-            {
-                suppListTrans.length > 0 && useMemo(() => (<ReactEcharts option={option} onEvents={onclick} style={{ width: "100%", height: "100%" }} />), [suppListTrans])
-            }
-        </>
-    )
-
-}
-RelationCharts.propTypes = {
-    linkData: PropTypes.array,
-    suppListTrans: PropTypes.array,
-};
\ No newline at end of file
diff --git a/src/components/EquityRelation/index.tsx b/src/components/EquityRelation/index.tsx
deleted file mode 100644
index b396454..0000000
--- a/src/components/EquityRelation/index.tsx
+++ /dev/null
@@ -1,289 +0,0 @@
-import { Checkbox, Spin } from 'antd';
-import { CheckboxChangeEvent } from 'antd/lib/checkbox';
-import { CheckboxValueType } from 'antd/lib/checkbox/Group';
-import { multiply } from 'lodash';
-import React, { useEffect, useRef, useState } from 'react';
-import RelationCharts from './RelationCharts';
-import empty_data from '@/assets/supplierRisk/empty_data.png';
-/**
- * 供应商股权关系-关系图
- * @returns
- */
-const EquityRelation: React.FC<{ result: any }> = (props) => {
-    const { result } = props;
-    const plainOptions = [
-        { label: '法人', value: '6' },
-        { label: '分支机构', value: '5' },
-        { label: '投资', value: '1' },
-        { label: '任职', value: '2' },
-        { label: '疑似地址', value: '4' },
-        { label: '疑似电话', value: '3' },
-        { label: '疑似邮箱', value: '7' },
-    ];
-    const [linkData, setLinkData] = useState();
-    const [suppListTrans, setSuppListTrans] = useState<any[]>([]);
-    const [checkedAll, setCheckedAll] = useState<boolean>(true);
-    const [checked, setChecked] = useState<any[]>([]);
-    const resDataRef = useRef<any>();
-    function onCheckedAllChange(e: CheckboxChangeEvent) {
-        if (e.target.checked) {
-            setCheckedAll(e.target.checked);
-            setChecked([]);
-            filterData([]);
-        }
-    };
-    function onCheckedChange(checkedValues: CheckboxValueType[]) {
-        setChecked(checkedValues);
-        setCheckedAll(checkedValues.length == 0);
-        filterData(checkedValues);
-    };
-    function doType(str: string) {
-        let newArr = str.split(",");
-        let typeCn = "";
-        for (let i = 0; i < newArr.length; i++) {
-            if (newArr[i] == '1') {
-                typeCn += '投资'
-            } else if (newArr[i] == '3') {
-                typeCn += '企业疑似电话'
-            } else if (newArr[i] == '4') {
-                typeCn += '企业疑似地址'
-            } else if (newArr[i] == '5') {
-                typeCn += '分支机构'
-            } else if (newArr[i] == '6') {
-                typeCn += '法人'
-            } else if (newArr[i] == '7') {
-                typeCn += '企业疑似邮箱'
-            } else {
-                typeCn += `${newArr[i]}`
-            }
-        }
-        return typeCn;
-    }
-    //选择后数据筛选
-    function filterData(selected: any[]) {
-        if (resDataRef.current) {
-            if (selected.length > 0) {
-                const filterLinks = resDataRef.current.links.filter((item: any) => selected.includes(item.type));
-                const i_links: string[] = [];
-                for (let i = 0, length = filterLinks.length; i < length; i++) {
-                    i_links.push(filterLinks[i].from);
-                    i_links.push(filterLinks[i].to);
-                }
-                const r_links = [...new Set(i_links)];//数组去重
-                const filterNodes = resDataRef.current.nodes.filter((item: any) => r_links.includes(item.id));
-                dataHandle(filterNodes, filterLinks);//处理数据并刷新
-            } else {
-                dataHandle(resDataRef.current.nodes, resDataRef.current.links);
-            }
-        }
-    }
-    //数据处理
-    function dataHandle(nodes: any[] | undefined, links: any[] | undefined) {
-        // //处理右侧数据
-        // const valueList = nodes ? nodes : []
-        // valueList.map((item) => {
-        //     Object.assign(item, {
-        //         name: item.name ? item.name : item.properties?.samevalue ? item.properties?.samevalue : '暂无信息',
-        //         // category: item.isProvider == 1 ? 1 : 2,
-        //         category: suppCodeList.findIndex(ite => ite.companyName == item.name) !== -1 ? 3 : (item.type == 1 ? 1 : 2),//从珊珊拿全部供应商
-        //         id: item.id,
-        //     })
-        //     return item
-        // })
-        // setSuppListTrans([...valueList])
-        // let mapList = links ? links : []
-        // let copeLink1 = JSON.parse(JSON.stringify(mapList))
-        // if (copeLink1.length > 0) {
-        //     for (let i = 0; i < copeLink1.length; i++) {
-        //         if (copeLink1[i].type == 2) {
-        //             copeLink1[i].type = copeLink1[i].properties.position_desc
-        //         } else {
-        //             if (copeLink1[i].type == 1) {
-        //                 copeLink1[i].type = '投资' + multiply(copeLink1[i].properties.conprop, 100) + '%'
-        //             } else {
-        //                 copeLink1[i].type = doType(copeLink1[i].type)
-        //             }
-        //         }
-        //         //手动去重
-        //         for (let j = i + 1; j < copeLink1.length; j++) {
-        //             if (copeLink1[i].from == copeLink1[j].from && copeLink1[i].to == copeLink1[j].to && copeLink1[j].type) {
-        //                 //type=2 需提前处理
-        //                 if (copeLink1[j].type == 1) {
-        //                     copeLink1[j].type = '投资' + multiply(copeLink1[j].properties.conprop, 100) + '%'
-        //                 } else if (copeLink1[j].type == 2) {
-        //                     copeLink1[i].type = copeLink1[i].type + ',' + copeLink1[j].properties.position_desc
-        //                     copeLink1[j].type = ''
-        //                 } else {
-        //                     if (copeLink1[j].type != 2) {
-        //                         copeLink1[j].type = doType(copeLink1[j].type)
-        //                     }
-        //                 }
-        //                 //拼接相同类型的type
-        //                 if (copeLink1[i].type.substring(copeLink1[i].type.length - 1, copeLink1[i].type.length) == ',') {
-        //                     copeLink1[i].type = copeLink1[i].type + copeLink1[j].type
-        //                 } else {
-        //                     copeLink1[i].type = copeLink1[i].type + ',' + copeLink1[j].type
-        //                 }
-        //                 copeLink1[j].type = ''
-        //             } else {
-        //                 //type=1 需提前处理
-        //                 if (copeLink1[j].type == 1) {
-        //                     copeLink1[j].type = '投资' + multiply(copeLink1[j].properties.conprop, 100) + '%,'
-        //                 } else if (copeLink1[j].type == 2) {
-        //                     copeLink1[j].type = copeLink1[j].properties.position_desc
-        //                 } else {
-        //                     if (copeLink1[j].type != 2) {
-        //                         copeLink1[j].type = doType(copeLink1[j].type)
-        //                     }
-        //                 }
-        //                 continue;
-        //             }
-        //         }
-        //     }
-        // }
-        // copeLink1.map((item: any) => {
-        //     Object.assign(item, {
-        //         source: item.from,
-        //         target: item.to,
-        //         label: {
-        //             show: true,
-        //             fontSize: 12,
-        //             verticalAlign: 'bottom',
-        //             formatter: () => {
-        //                 return item.type
-        //             },
-        //         },
-        //         id: item.id,
-        //         flag: false
-        //     })
-        //     return item
-        // })
-        // setLinkData(copeLink1)
-        //处理右侧数据
-        const valueList = nodes ? nodes : []
-        valueList.map((item) => {
-            Object.assign(item, {
-                name: item.name ? item.name : item.properties.samevalue ? item.properties.samevalue : '暂无信息',
-                // category: item.isProvider == 1 ? 1 : 2,
-                category: item.innode ? 3 : (item.type == 1 ? 1 : 2),
-                id: item.id,
-            })
-            return item
-        })
-        setSuppListTrans([...valueList])
-        let mapList = links ? links : []
-        let copeLink1 = JSON.parse(JSON.stringify(mapList))
-        if (copeLink1.length > 0) {
-            for (let i = 0; i < copeLink1.length; i++) {
-                if (copeLink1[i].type == 2) {
-                    copeLink1[i].type = copeLink1[i].properties.position_desc
-                } else {
-                    if (copeLink1[i].type == 1) {
-                        if (copeLink1[i].properties.conprop) {
-                            copeLink1[i].type = '投资' + multiply(copeLink1[i].properties.conprop, 100) + '%'
-                        } else if (copeLink1[i].properties.holderrto) {
-                            copeLink1[i].type = '投资' + copeLink1[i].properties.holderrto + '%'
-                        }
-                    } else {
-                        copeLink1[i].type = doType(copeLink1[i].type)
-                    }
-                }
-
-                //手动拼接
-                /* eslint-disable */
-                for (let j = i + 1; j < copeLink1.length; j++) {
-                    if (copeLink1[i].from == copeLink1[j].from && copeLink1[i].to == copeLink1[j].to && copeLink1[j].type) {
-                        //type=2 需提前处理
-                        if (copeLink1[j].type == 1) {
-                            if (copeLink1[j].properties.conprop) {
-                                copeLink1[j].type = '投资' + multiply(copeLink1[j].properties.conprop, 100) + '%'
-                            } else if (copeLink1[j].properties.holderrto) {
-                                copeLink1[j].type = '投资' + copeLink1[j].properties.holderrto + '%'
-                            }
-                        } else if (copeLink1[j].type == 2) {
-                            copeLink1[j].type = copeLink1[j].properties.position_desc
-                            //  copeLink1[i].type=copeLink1[i].type+','+copeLink1[j].properties.position_desc
-                            //  copeLink1[j].type=''
-                        } else {
-                            //  if(copeLink1[j].type !=2){
-                            copeLink1[j].type = doType(copeLink1[j].type)
-                            //  }
-                        }
-                        //拼接相同类型的type
-                        if (copeLink1[i].type.substring(copeLink1[i].type.length - 1, copeLink1[i].type.length) == ',') {
-                            copeLink1[i].type = copeLink1[i].type + copeLink1[j].type
-                        } else {
-                            copeLink1[i].type = copeLink1[i].type + ',' + copeLink1[j].type
-                        }
-                        copeLink1[j].type = ''
-                    }
-
-                    //  else{
-                    // //     //type=1 需提前处理
-                    //     // if(copeLink1[j].type==1){
-                    //     //   if(copeLink1[j].properties.conprop){
-                    //     //     copeLink1[j].type='投资'+ multiply(copeLink1[j].properties.conprop,100) +'%'
-                    //     //   }else if(copeLink1[j].properties.holderrto){
-                    //     //     copeLink1[j].type='投资'+ copeLink1[j].properties.holderrto +'%'
-                    //     //   }
-                    //     // }else if(copeLink1[j].type==2){
-                    //     //   copeLink1[j].type=copeLink1[j].properties.position_desc
-                    //     // }else{
-                    //     //     if(copeLink1[j].type !=2){
-                    //     //         copeLink1[j].type=doType(copeLink1[j].type)
-                    //     //     }
-                    //     // }
-
-                    //     //  continue;
-                    //   }
-                }
-            }
-
-        }
-        copeLink1.map((item: any) => {
-            Object.assign(item, {
-                source: item.from,
-                target: item.to,
-                label: {
-                    show: true,
-                    fontSize: 12,
-                    verticalAlign: 'bottom',
-                    formatter: () => {
-                        return item.type
-                    },
-                },
-                id: item.id,
-                flag: false
-            })
-            return item
-        })
-        setLinkData(copeLink1)
-    }
-    useEffect(() => {
-        if (result && result?.nodes && result.nodes.length > 0) {
-            resDataRef.current = result;
-            dataHandle(result.nodes, result.links);
-        }
-    }, [result])
-    return (
-        <>
-            <div style={{ margin: "0 0 20px" }}>
-                <Checkbox onChange={onCheckedAllChange} checked={checkedAll} style={{ marginRight: 8 }}>全部</Checkbox>
-                <Checkbox.Group options={plainOptions} onChange={onCheckedChange} value={checked} />
-            </div>
-            {
-                suppListTrans.length > 0 ? (
-                    <div style={{ width: "50vw", height: "40vw", border: "1px solid #999" }}>
-                        <RelationCharts linkData={linkData} suppListTrans={suppListTrans} />
-                    </div>
-                ) : (
-                    <div style={{ width: "50vw", height: "40vw", display: "flex", alignItems: "center", justifyContent: "center" }}>
-                        <img src={empty_data} alt="" />
-                    </div>
-                )
-            }
-        </>
-    );
-};
-
-export default EquityRelation;
diff --git a/src/components/GlobalHeader/AvatarDropdown.tsx b/src/components/GlobalHeader/AvatarDropdown.tsx
deleted file mode 100644
index dd88b53..0000000
--- a/src/components/GlobalHeader/AvatarDropdown.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import { LogoutOutlined, SettingOutlined, UserOutlined } from '@ant-design/icons';
-import { Avatar, Menu, Spin } from 'antd';
-import React from 'react';
-import { history, ConnectProps, connect } from 'umi';
-import { ConnectState } from '@/models/connect';
-import { CurrentUser } from '@/models/user';
-import HeaderDropdown from '../HeaderDropdown';
-import styles from './index.less';
-
-export interface GlobalHeaderRightProps extends Partial<ConnectProps> {
-  currentUser?: CurrentUser;
-  menu?: boolean;
-}
-
-class AvatarDropdown extends React.Component<GlobalHeaderRightProps> {
-  onMenuClick = (event: {
-    key: React.Key;
-    keyPath: React.Key[];
-    item: React.ReactInstance;
-    domEvent: React.MouseEvent<HTMLElement>;
-  }) => {
-    const { key } = event;
-
-    if (key === 'logout') {
-      const { dispatch } = this.props;
-
-      if (dispatch) {
-        dispatch({
-          type: 'login/logout',
-        });
-      }
-
-      return;
-    }
-
-    history.push(`/account/${key}`);
-  };
-
-  render(): React.ReactNode {
-    const {
-      currentUser = {
-        avatar: '',
-        name: '',
-      },
-      menu,
-    } = this.props;
-    const menuHeaderDropdown = (
-      <Menu className={styles.menu} selectedKeys={[]} onClick={this.onMenuClick}>
-   
-          <Menu.Item key="center">
-            <UserOutlined />
-            个人中心
-          </Menu.Item>
- 
-          <Menu.Item key="settings">
-            <SettingOutlined />
-            个人设置
-          </Menu.Item>
-   
-
-        <Menu.Item key="logout">
-          <LogoutOutlined />
-          退出登录
-        </Menu.Item>
-      </Menu>
-    );
-    return currentUser && currentUser.name ? (
-      <HeaderDropdown overlay={menuHeaderDropdown}>
-        <span className={`${styles.action} ${styles.account}`}>
-          <Avatar size="small" className={styles.avatar} src={currentUser.avatar} alt="avatar" />
-          <span className={`${styles.name} anticon`}>{currentUser.name}</span>
-        </span>
-      </HeaderDropdown>
-    ) : (
-      <span className={`${styles.action} ${styles.account}`}>
-        <Spin
-          size="small"
-          style={{
-            marginLeft: 8,
-            marginRight: 8,
-          }}
-        />
-      </span>
-    );
-  }
-}
-
-export default connect(({ user }: ConnectState) => ({
-  currentUser: user.currentUser,
-}))(AvatarDropdown);
diff --git a/src/components/GlobalHeader/NoticeIconView.tsx b/src/components/GlobalHeader/NoticeIconView.tsx
deleted file mode 100644
index 825d308..0000000
--- a/src/components/GlobalHeader/NoticeIconView.tsx
+++ /dev/null
@@ -1,171 +0,0 @@
-import React, { Component } from 'react';
-import { connect, ConnectProps } from 'umi';
-import { Tag, message } from 'antd';
-import groupBy from 'lodash/groupBy';
-import moment from 'moment';
-import { NoticeItem } from '@/models/global';
-import { CurrentUser } from '@/models/user';
-import { ConnectState } from '@/models/connect';
-import NoticeIcon from '../NoticeIcon';
-import styles from './index.less';
-
-export interface GlobalHeaderRightProps extends Partial<ConnectProps> {
-  notices?: NoticeItem[];
-  currentUser?: CurrentUser;
-  fetchingNotices?: boolean;
-  onNoticeVisibleChange?: (visible: boolean) => void;
-  onNoticeClear?: (tabName?: string) => void;
-}
-
-class GlobalHeaderRight extends Component<GlobalHeaderRightProps> {
-  componentDidMount() {
-    const { dispatch } = this.props;
-
-    if (dispatch) {
-      dispatch({
-        type: 'global/fetchNotices',
-      });
-    }
-  }
-
-  changeReadState = (clickedItem: NoticeItem): void => {
-    const { id } = clickedItem;
-    const { dispatch } = this.props;
-
-    if (dispatch) {
-      dispatch({
-        type: 'global/changeNoticeReadState',
-        payload: id,
-      });
-    }
-  };
-
-  handleNoticeClear = (title: string, key: string) => {
-    const { dispatch } = this.props;
-    message.success(`${'清空了'} ${title}`);
-
-    if (dispatch) {
-      dispatch({
-        type: 'global/clearNotices',
-        payload: key,
-      });
-    }
-  };
-
-  getNoticeData = (): {
-    [key: string]: NoticeItem[];
-  } => {
-    const { notices = [] } = this.props;
-
-    if (!notices || notices.length === 0 || !Array.isArray(notices)) {
-      return {};
-    }
-
-    const newNotices = notices.map((notice) => {
-      const newNotice = { ...notice };
-
-      if (newNotice.datetime) {
-        newNotice.datetime = moment(notice.datetime as string).fromNow();
-      }
-
-      if (newNotice.id) {
-        newNotice.key = newNotice.id;
-      }
-
-      if (newNotice.extra && newNotice.status) {
-        const color = {
-          todo: '',
-          processing: 'blue',
-          urgent: 'red',
-          doing: 'gold',
-        }[newNotice.status];
-        newNotice.extra = (
-          <Tag
-            color={color}
-            style={{
-              marginRight: 0,
-            }}
-          >
-            {newNotice.extra}
-          </Tag>
-        );
-      }
-
-      return newNotice;
-    });
-    return groupBy(newNotices, 'type');
-  };
-
-  getUnreadData = (noticeData: { [key: string]: NoticeItem[] }) => {
-    const unreadMsg: {
-      [key: string]: number;
-    } = {};
-    Object.keys(noticeData).forEach((key) => {
-      const value = noticeData[key];
-
-      if (!unreadMsg[key]) {
-        unreadMsg[key] = 0;
-      }
-
-      if (Array.isArray(value)) {
-        unreadMsg[key] = value.filter((item) => !item.read).length;
-      }
-    });
-    return unreadMsg;
-  };
-
-  render() {
-    const { currentUser, fetchingNotices, onNoticeVisibleChange } = this.props;
-    const noticeData = this.getNoticeData();
-    const unreadMsg = this.getUnreadData(noticeData);
-    return (
-      <NoticeIcon
-        className={styles.action}
-        count={currentUser && currentUser.unreadCount}
-        onItemClick={(item) => {
-          this.changeReadState(item as NoticeItem);
-        }}
-        loading={fetchingNotices}
-        clearText="清空"
-        viewMoreText="查看更多"
-        onClear={this.handleNoticeClear}
-        onPopupVisibleChange={onNoticeVisibleChange}
-        onViewMore={() => message.info('Click on view more')}
-        clearClose
-      >
-        <NoticeIcon.Tab
-          tabKey="notification"
-          count={unreadMsg.notification}
-          list={noticeData.notification}
-          title="通知"
-          emptyText="你已查看所有通知"
-          showViewMore
-        />
-        <NoticeIcon.Tab
-          tabKey="message"
-          count={unreadMsg.message}
-          list={noticeData.message}
-          title="消息"
-          emptyText="您已读完所有消息"
-          showViewMore
-        />
-        <NoticeIcon.Tab
-          tabKey="event"
-          title="待办"
-          emptyText="你已完成所有待办"
-          count={unreadMsg.event}
-          list={noticeData.event}
-          showViewMore
-        />
-      </NoticeIcon>
-    );
-  }
-}
-
-export default connect(({ user, global, loading }: ConnectState) => ({
-  currentUser: user.currentUser,
-  collapsed: global.collapsed,
-  fetchingMoreNotices: loading.effects['global/fetchMoreNotices'],
-  fetchingNotices: loading.effects['global/fetchNotices'],
-  notices: global.notices,
-}))(GlobalHeaderRight);
diff --git a/src/components/GlobalHeader/RightContent.tsx b/src/components/GlobalHeader/RightContent.tsx
deleted file mode 100644
index ad7dc52..0000000
--- a/src/components/GlobalHeader/RightContent.tsx
+++ /dev/null
@@ -1,116 +0,0 @@
-import { Avatar, Dropdown, Menu, message, Modal } from 'antd';
-import { DownOutlined, UserOutlined, UserSwitchOutlined, CarryOutOutlined, HomeOutlined, ImportOutlined } from '@ant-design/icons';
-import React, { useEffect, useRef } from 'react';
-import moment from 'moment'
-import { connect, history } from 'umi';
-import { ConnectState } from '@/models/connect';
-import logo from '../../assets/logo.svg';
-import './index.less';
-import { getMenu, getLogout } from './services'
-import { getSessionUserData } from "@/utils/session";
-import { getToSecondUrl } from '@/pages/LoadingPage/service';
-
-const GlobalHeaderRight: React.FC<{}> = (props) => {
-  // let className = styles.right;
-  let data = getSessionUserData();
-  const [dataMenu, setDataMenu] = React.useState<any>([]);
-  const urlRef = useRef(null);
-  const handelRole = (item: any) => {
-    sessionStorage.setItem('roleData', JSON.stringify(item));
-    sessionStorage.setItem('roleAuthority', JSON.stringify([item.roleCode]));
-    let params = {
-      roleIdList: [item.roleId]
-    }
-    history.push('/Dashboard')
-    window.location.reload()
-    getMenu(params).then(res => {
-      if (res?.code == 1) {
-        setDataMenu(res?.data)
-      } else {
-        message.error("数据错误请联系管理员")
-      }
-    })
-  }
-  //角色退出登录
-  const toLogout = () => {
-    // let _data = {
-    //   mall3_token: sessionStorage.getItem('Authorization')
-    // }
-    Modal.info({
-      title: '请确认是否退出？',
-      content: false,
-      onOk() {
-        getLogout().then((res) => {
-          if (res?.success) {
-            if (data?.userType == "0") {//联通智慧门户
-              window.close();
-            } else if (data?.userType == "1") {//合作方
-              window.close();
-            } else if (data?.userType == "2") {//专家
-              window.location.href = "/userformal/login"
-            }
-          }
-        })
-      },
-      closable: true,
-      centered: true,
-      okText: "确认退出",
-      className: "layout-modal-logout",
-    });
-  }
-
-  const droMenu = (
-    <Menu style={{ top: "17px" }}>
-      {data?.authorityList != undefined ?
-        data?.authorityList?.map((item: any, index: any) => (
-          <Menu.Item key={index}>
-            <a target="_blank" rel="noopener noreferrer" onClick={() => handelRole(item)}>{item.roleName}</a>
-          </Menu.Item>
-        )) : null}
-      <>
-        <Menu.Divider />
-        <Menu.Item key="exit">
-          <a key="1" onClick={() => toLogout()}>退出登录</a>
-        </Menu.Item>
-      </>
-    </Menu>
-  );
-
-  useEffect(() => {
-    const getUrl = async () => {
-      const response = await getToSecondUrl();
-      if (response?.success) {
-        urlRef.current = response?.data;
-      }
-    }
-    getUrl();
-  }, [])
-
-  return (
-    <div className="top-menu">
-      <div className="left-logo">
-        <img src={logo} alt="" />中国联通智慧供应链平台 ｜ 招标采购中心
-      </div>
-      <ul className="right-btns">
-        <li><ImportOutlined /><a onClick={() => { urlRef.current && window.open(urlRef.current); }}>交易平台2.0</a></li>
-        <li><HomeOutlined /><a onClick={() => history.push('/Dashboard')}>首页</a></li>
-        <li><CarryOutOutlined />{moment().format("YYYY-MM-DD")}</li>
-        {data?.organizationName == null ? null : (<li><UserSwitchOutlined />{data?.organizationName}</li>)}
-        <li>
-          <Avatar size="small" src="https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png" style={{ width: '30px' }} />
-          <Dropdown overlay={droMenu}>
-            <a className="antd-dropdown-link" style={{ color: "#fff" }}>
-              {data?.fullName} <DownOutlined />
-            </a>
-          </Dropdown>
-        </li>
-
-      </ul>
-
-    </div>
-  );
-};
-export default connect(({ settings }: ConnectState) => ({
-  theme: settings.navTheme,
-  layout: settings.layout,
-}))(GlobalHeaderRight);
diff --git a/src/components/GlobalHeader/index.less b/src/components/GlobalHeader/index.less
deleted file mode 100644
index 72eeb15..0000000
--- a/src/components/GlobalHeader/index.less
+++ /dev/null
@@ -1,47 +0,0 @@
-@import '~antd/es/style/themes/default.less';
-
-.top-menu {
-  .left-logo {
-    position: absolute;
-    float: left;
-    left: 0;
-    top: 4px;
-    font-size: 16px;
-    font-weight: 600;
-
-    img {
-      height: 30px;
-      margin-left: 20px;
-      margin-right: 10px;
-      position: relative;
-      top: -2px;
-    }
-  }
-
-  .right-btns {
-    float: right;
-
-    li {
-      float: left;
-      line-height: 56px;
-      font-size: 14px;
-      color: #fff;
-      padding: 0 14px;
-      list-style: none;
-
-      span {
-        padding-right: 6px;
-        font-size: 16px;
-      }
-
-      a {
-        color: #fff;
-      }
-    }
-  }
-}
-
-.layout-modal-logout .ant-modal-confirm-btns {
-  text-align: center;
-  width: 100%;
-}
\ No newline at end of file
diff --git a/src/components/GlobalHeader/services.ts b/src/components/GlobalHeader/services.ts
deleted file mode 100644
index 171b0b3..0000000
--- a/src/components/GlobalHeader/services.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import request from '@/utils/request';
-
-export async function getMenu(params: any) {
-  let requestUrl = '/api/core-service-usercenter-public/v1.0/menu/findMenuList';
-  return request(requestUrl, {
-    method: 'POST',
-    data: params,
-  });
-}
-
-export async function fgetUserMsg(params: any) {
-  return request('/api/core-service-ebtp-userinfo/v1/userinfo/get', {
-    method: 'GET',
-    headers: { 'Authorization': params },
-    data: params,
-  });
-}
-
-export async function getLogout() { // 退出登录，注销
-  return request('/api/core-service-ebtp-userinfo/v1/userinfo/logout', {
-    method: 'get',
-    // params
-  });
-}
diff --git a/src/components/HeaderDropdown/index.less b/src/components/HeaderDropdown/index.less
deleted file mode 100644
index 7c5ad71..0000000
--- a/src/components/HeaderDropdown/index.less
+++ /dev/null
@@ -1,16 +0,0 @@
-@import '~antd/es/style/themes/default.less';
-
-.container > * {
-  background-color: @popover-bg;
-  border-radius: 4px;
-  box-shadow: @shadow-1-down;
-}
-
-@media screen and (max-width: @screen-xs) {
-  .container {
-    width: 100% !important;
-  }
-  .container > * {
-    border-radius: 0 !important;
-  }
-}
\ No newline at end of file
diff --git a/src/components/HeaderDropdown/index.tsx b/src/components/HeaderDropdown/index.tsx
deleted file mode 100644
index cc60727..0000000
--- a/src/components/HeaderDropdown/index.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { DropDownProps } from 'antd/es/dropdown';
-import { Dropdown } from 'antd';
-import React from 'react';
-import classNames from 'classnames';
-import styles from './index.less';
-
-declare type OverlayFunc = () => React.ReactNode;
-
-export interface HeaderDropdownProps extends Omit<DropDownProps, 'overlay'> {
-  overlayClassName?: string;
-  overlay: React.ReactNode | OverlayFunc | any;
-  placement?: 'bottomLeft' | 'bottomRight' | 'topLeft' | 'topCenter' | 'topRight' | 'bottomCenter';
-}
-
-const HeaderDropdown: React.FC<HeaderDropdownProps> = ({ overlayClassName: cls, ...restProps }) => (
-  <Dropdown overlayClassName={classNames(styles.container, cls)} {...restProps} />
-);
-
-export default HeaderDropdown;
diff --git a/src/components/HeaderSearch/index.less b/src/components/HeaderSearch/index.less
deleted file mode 100644
index 9af69d5..0000000
--- a/src/components/HeaderSearch/index.less
+++ /dev/null
@@ -1,30 +0,0 @@
-@import '~antd/es/style/themes/default.less';
-
-.headerSearch {
-  .input {
-    width: 0;
-    min-width: 0;
-    overflow: hidden;
-    background: transparent;
-    border-radius: 0;
-    transition: width 0.3s, margin-left 0.3s;
-    :global(.ant-select-selection) {
-      background: transparent;
-    }
-    input {
-      padding-right: 0;
-      padding-left: 0;
-      border: 0;
-      box-shadow: none !important;
-    }
-    &,
-    &:hover,
-    &:focus {
-      border-bottom: 1px solid @border-color-base;
-    }
-    &.show {
-      width: 210px;
-      margin-left: 8px;
-    }
-  }
-}
diff --git a/src/components/HeaderSearch/index.tsx b/src/components/HeaderSearch/index.tsx
deleted file mode 100644
index 290d431..0000000
--- a/src/components/HeaderSearch/index.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import { SearchOutlined } from '@ant-design/icons';
-import { AutoComplete, Input } from 'antd';
-import useMergeValue from 'use-merge-value';
-import { AutoCompleteProps } from 'antd/es/auto-complete';
-import React, { useRef } from 'react';
-
-import classNames from 'classnames';
-import styles from './index.less';
-
-export interface HeaderSearchProps {
-  onSearch?: (value?: string) => void;
-  onChange?: (value?: string) => void;
-  onVisibleChange?: (b: boolean) => void;
-  className?: string;
-  placeholder?: string;
-  options: AutoCompleteProps['options'];
-  defaultOpen?: boolean;
-  open?: boolean;
-  defaultValue?: string;
-  value?: string;
-}
-
-const HeaderSearch: React.FC<HeaderSearchProps> = (props) => {
-  const {
-    className,
-    defaultValue,
-    onVisibleChange,
-    placeholder,
-    open,
-    defaultOpen,
-    ...restProps
-  } = props;
-
-  const inputRef = useRef<Input | null>(null);
-
-  const [value, setValue] = useMergeValue<string | undefined>(defaultValue, {
-    value: props.value,
-    onChange: props.onChange,
-  });
-
-  const [searchMode, setSearchMode] = useMergeValue(defaultOpen || false, {
-    value: props.open,
-    onChange: onVisibleChange,
-  });
-
-  const inputClass = classNames(styles.input, {
-    [styles.show]: searchMode,
-  });
-
-  return (
-    <div
-      className={classNames(className, styles.headerSearch)}
-      onClick={() => {
-        setSearchMode(true);
-        if (searchMode && inputRef.current) {
-          inputRef.current.focus();
-        }
-      }}
-      onTransitionEnd={({ propertyName }) => {
-        if (propertyName === 'width' && !searchMode) {
-          if (onVisibleChange) {
-            onVisibleChange(searchMode);
-          }
-        }
-      }}
-    >
-      <SearchOutlined
-        key="Icon"
-        style={{
-          cursor: 'pointer',
-        }}
-      />
-      <AutoComplete
-        key="AutoComplete"
-        className={inputClass}
-        value={value}
-        style={{
-          height: 28,
-          marginTop: -6,
-        }}
-        options={restProps.options}
-        onChange={setValue}
-      >
-        <Input
-          ref={inputRef}
-          defaultValue={defaultValue}
-          aria-label={placeholder}
-          placeholder={placeholder}
-          onKeyDown={(e) => {
-            if (e.key === 'Enter') {
-              if (restProps.onSearch) {
-                restProps.onSearch(value);
-              }
-            }
-          }}
-          onBlur={() => {
-            setSearchMode(false);
-          }}
-        />
-      </AutoComplete>
-    </div>
-  );
-};
-
-export default HeaderSearch;
diff --git a/src/components/LayLeftMenu/index.less b/src/components/LayLeftMenu/index.less
deleted file mode 100644
index 377dbb8..0000000
--- a/src/components/LayLeftMenu/index.less
+++ /dev/null
@@ -1,39 +0,0 @@
-.myselfContent {
-    // width: 200px;
-    // position: absolute;
-    width: 180px;
-    background-color: #ffffff;
-    text-align: center;
-    float: left;
-    border-right: solid;
-    border-width: 1px;
-    border-color: whitesmoke;
-}
-.bace-layout-room{
-    padding-left: 200px;
-}
-.xsy-next-btn{
-    text-align: center;
-}
-.xsy-over-btn{
-    text-align: center;
-    margin-top: 16px;
-}
-.xsy-menu-style{
-    text-align: center;
-    overflow-x: hidden;
-    overflow-y: auto;
-    .ant-menu-item:hover{
-        background-color: rgb(247, 221, 217);
-    }
-}
-.xsy-menu-style::-webkit-scrollbar {
-    width:0px;
-    overflow:visible
-}
-.xsy-spin-div{
-    // text-align: center;
-    // position:absolute; 
-    // bottom:50px;
-    margin-top: 100px;
-}
diff --git a/src/components/LayLeftMenu/index.tsx b/src/components/LayLeftMenu/index.tsx
deleted file mode 100644
index ef6e4e5..0000000
--- a/src/components/LayLeftMenu/index.tsx
+++ /dev/null
@@ -1,627 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { history } from 'umi';
-import {
-  getLeftMenu,
-  getBtnText,
-  nextNode,
-  getLeader,
-  finishTurn,
-  openTurn,
-  getGys,
-  finishFlow,
-  getOfferUserId,
-  getSingIds,
-  firstNextNode,
-  queryGys
-} from './service';
-import { Menu, Button, Modal, message, Spin, Transfer, Tooltip, Tag, Select } from 'antd';
-import { getRoomId, getSessionUserData, getSessionRoleData } from '@/utils/session';
-
-import './index.less';
-import { CarryOutOutlined, DownOutlined, ExclamationCircleOutlined, ReloadOutlined } from '@ant-design/icons';
-import { btnAuthority } from '@/utils/authority';
-//评审室内流程菜单
-const Index: React.FC<{}> = () => {
-  const { confirm } = Modal;
-  const { SubMenu } = Menu;
-  const [data, setData] = React.useState<any>([]);
-  const [spin, spinSet] = useState<boolean>(false);
-  const [leader, setLeader] = useState('');
-  const [nodeId, nodeIdSet] = useState('');//节点id
-  const [turnId, turnIdSet] = useState('');//轮次id
-  const [btnText, btnTextSet] = useState(''); //按钮文字
-  const [firstNextStep, firstNextStepSet] = useState(false); //是否轮次第一个节点
-  const [instTurnName, instTurnNameSet] = useState(''); //第几轮
-  const [btnMes, btnMesSet] = useState('');
-  const [flowFinish, flowFinishSet] = useState<boolean>(false); //流程是否结束
-  const [stop, stopSet] = useState<boolean>(false); //终止流程 按钮显隐
-  const [finishAllTurn, finishAllTurnSet] = useState<boolean>(false); //所有轮次是否结束
-  const [menuShow, menuShowSet] = useState<string[]>([]);
-  const [count, countSet] = useState<any>(0); //触发useEffect
-  const [chooseGys, chooseGysSet] = useState<any>(false); //选择供应商
-  const [offerUserId, offerUserIdSet] = useState<any>(''); //评审专家id
-  const [singUserId, singUserIdSet] = useState<any>([]); //评审专家id
-  const userId = getSessionUserData().userId;
-  const role = getSessionRoleData().roleCode;
-  //获取比选一阶段二次项目，自定义流程，当前供应商
-  const isBxOneSecondCustom = sessionStorage.getItem("isBxOneSecondCustom");
-  function showConfirm(mes?: any, confirmFlag?: boolean) {
-    //环节流转提示
-    mes == '是否开启' ? (mes = mes + instTurnName + '？') : mes;
-    confirm({
-      title: mes,
-      icon: <ExclamationCircleOutlined />,
-      centered: true,
-      okText: '确定',
-      cancelText: '取消',
-      async onOk() {
-        await handleOk(confirmFlag);
-      },
-      onCancel() {
-        spinSet(false);
-      },
-    });
-  }
-  function overConfirm(mes?: any) {
-    //结束流程提示
-    confirm({
-      title: mes,
-      icon: <ExclamationCircleOutlined />,
-      okText: '确定',
-      cancelText: '取消',
-      centered: true,
-      async onOk() {
-        await finishFlowFc();
-      },
-      onCancel() {
-        spinSet(false);
-      },
-    });
-  }
-  const handleOk = async (confirmFlag?: boolean) => {
-    if (btnText == '开启') {
-      await getGysData();
-    }
-    if (btnText == '结束轮次') {
-      await finishTurnFc(confirmFlag);
-    }
-    if (btnText == '下一步') {
-      await nextStep(confirmFlag);
-    }
-    return;
-  };
-  //下一步方法
-  async function nextStep(confirmFlag?: boolean) {
-    spinSet(true);
-    if (firstNextStep) {
-      await firstNextNode(turnId, confirmFlag).then((res: any) => {
-        if (res.code === 200) {
-          if (res.data.result) {
-            message.success('成功进入下一节点');
-            countSet(count + 1);
-          } else {
-            if (res.data.confirmFlag) {
-              showConfirm(res.data.message, true);
-            }
-          }
-        } else {
-          countSet(count + 1);
-        }
-      });
-    } else {
-      await nextNode(nodeId, confirmFlag).then((res) => {
-        if (res.code === 200) {
-          if (res.data.result) {
-            message.success('成功进入下一节点');
-            countSet(count + 1);
-          } else {
-            if (res.data.confirmFlag) {
-              showConfirm(res.data.message, true);
-            }
-          }
-        } else {
-          countSet(count + 1);
-        }
-      });
-    }
-  }
-  //开启轮次方法
-  async function openTurnFc() {
-    spinSet(true);
-    await openTurn({ assessRoomId: getRoomId(), roundIdList: targetKeys }).then((res) => {
-      if (res.code === 200) {
-        message.success('开启轮次成功');
-        chooseGysSet(false);
-      }
-    });
-    countSet(count + 1); //触发useEffect
-  }
-  //结束轮次方法
-  async function finishTurnFc(confirmFlag?: boolean) {
-    spinSet(true);
-    await finishTurn(turnId, confirmFlag).then((res) => {
-      if (res.code === 200) {
-        if (res.data.result) {
-          message.success('结束轮次成功');
-          countSet(count + 1); //触发useEffect
-        } else {
-          if (res.data.confirmFlag) {
-            showConfirm(res.data.message, true);
-          }
-        }
-      } else {
-        countSet(count + 1); //触发useEffect
-      }
-    });
-  }
-  //结束流程方法
-  async function finishFlowFc() {
-    spinSet(true);
-    await finishFlow(getRoomId()).then((res) => {
-      if (res.code === 200) {
-        message.success('结束流程成功');
-      }
-    });
-    countSet(count + 1); //触发useEffect
-  }
-  //取数据
-  async function getData(leader?: any, offerUserId?: any, ids?: any) {
-    let nowTurn: string[] = [];
-    let name: any = '';
-    let indexT: any = 0;
-    let url = '';
-    let nodeIdT = '';
-    let turnIdT = '';
-    spinSet(true);
-    await getLeftMenu(getRoomId()).then((res) => {
-      if (res.code == 200) {
-        res.data.map((item: any, index: any) => {
-          //跳转当前节点页面
-          if (item.status == 1) {
-            turnIdT = item.id;
-          }
-          item.nodeVOList.map((item: any) => {
-            if (item.status == 1 && item.moduleUrl != null) {
-              nodeIdT = item.id;
-              url =
-                makeUrl(item.moduleUrl, leader) +
-                `?turnId=${item.instTurnId}&nodeId=${item.id}&turnSort=${item.instTurnSort}`;
-              if (item.moduleUrl === '/EvaRoom/Eva/BidOffer' && userId != offerUserId) {
-                //报价评审  只有评审分工分到的专家能点
-                url = '';
-              }
-              if (item.moduleUrl === '/EvaRoom/Eva/Sing' || item.moduleUrl === '/EvaRoom/Eva/Openning') {
-                //唱价（询价）、唱价   只有可查看报价的专家可看
-                if (role == 'ebtp-expert' && ids.findIndex((item: any) => item == userId) == -1) {
-                  url = '';
-                }
-              }
-            }
-          });
-          if (item.status == 1) {
-            nowTurn.push(`${item.instTurnSort}SubMenu`);
-          }
-          //获取要开启的轮次名
-          if (item.status == 2) {
-            indexT = index + 1;
-          }
-          if (index == indexT) {
-            name = item.instTurnName;
-          }
-        });
-        menuShowSet(nowTurn);
-        setData(res.data);
-        nodeIdSet(nodeIdT);
-        turnIdSet(turnIdT);
-        instTurnNameSet(name);
-      } else {
-        message.info('请联系管理员');
-      }
-    });
-    //取按钮
-    await getBtnText(getRoomId()).then((res) => {
-      let btntxt = '';
-      let btnMesT = '';
-      let flowFinishT = false;
-      let stopT = true;
-      let finishAllTurnT = false;
-      if (res.code == 200) {
-        if (res.data.openTurnButton) {
-          btntxt = '开启';
-          btnMesT = '是否开启';
-          stopT = false;
-        } else if (res.data.finishTurnButton) {
-          btntxt = '结束轮次';
-          btnMesT = '是否结束轮次？';
-        } else if (res.data.firstNextStepButton) {
-          btntxt = '下一步';
-          btnMesT = '是否进入下一环节？';
-        } else if (res.data.nextStepButton) {
-          btntxt = '下一步';
-          btnMesT = '是否进入下一环节？';
-        }
-        if (res.data.flowFinish) {
-          flowFinishT = true;
-        }
-        if (res.data.finishAllTurn) {
-          finishAllTurnT = true;
-          stopT = false;
-        }
-      }
-      btnTextSet(btntxt);
-      btnMesSet(btnMesT);
-      firstNextStepSet(res?.data?.firstNextStepButton);
-      flowFinishSet(flowFinishT);
-      finishAllTurnSet(finishAllTurnT);
-      stopSet(stopT);
-    });
-    spinSet(false);
-    url != '' && history.push(url);
-  }
-  //专家获取数据
-  async function expertGetData(ids: any) {
-    let leader = '';
-    let offerUserId = '';
-    await getLeader(getRoomId(), getSessionUserData().userId).then((res) => {
-      if (res.code == 200) {
-        leader = res.data;
-        setLeader(res.data);
-      }
-    });
-    await getOfferUserId(getRoomId()).then((res) => {
-      if (res.code == 200) {
-        offerUserId = res.data[0];
-        offerUserIdSet(res.data[0]);
-      }
-    });
-    getData(leader, offerUserId, ids);
-  }
-  //处理url
-  function makeUrl(url: any, leader: any) {
-    if (
-      url == '/EvaRoom/Eva/BidPreliminary' ||
-      url == '/EvaRoom/Eva/BidDetailed' ||
-      url == '/EvaRoom/Eva/BidOffer' ||
-      url == '/EvaRoom/Eva/BidNumber'
-    ) {
-      url = url + leader;
-    }
-    return url;
-  }
-  //初始化
-  useEffect(() => {
-    spinSet(true);
-    let ids: any;
-    if (getSessionRoleData().roleCode === 'ebtp-expert') {
-      //ebtp-expert
-      //可查看报价专家ids
-      getSingIds(getRoomId()).then((res: any) => {
-        if (res.code == 200) {
-          ids = res.data;
-          singUserIdSet(res.data);
-        }
-      }).then(() => {
-        expertGetData(ids);
-      })
-    } else {
-      getData();
-    }
-  }, [count]);
-
-  //选择供应商
-
-  const [gysData, gysDataSet] = useState<any>([]);
-  const [firstRvwScs, firstRvwScsSet] = useState<any>([]);//初审合格的
-  const [firstRvwFail, firstRvwFailSet] = useState<any>([]);//初审不合格的
-  const [targetKeys, setTargetKeys] = useState<any>([]);
-  const [firstRvw, firstRvwSet] = useState<any>(false);//是否经历初审  控制显示合格不合格数量显隐
-  const [targetCount, targetCountSet] = useState<any>({ scsCount: 0, failCount: 0 });//进入下一轮的  合格的数量 不合格的数量
-  const [selectedKeys, setSelectedKeys] = useState<any>([]);
-  const [selectedKeysTransfer, setSelectedKeysTransfer] = useState<any>([]);//穿梭框用
-  const [chooseTurn, chooseTurnSet] = useState<boolean>(false);//查看供应商选择情况vis
-  const modalHeight = (window.innerHeight * 96) / 100;
-  const onChange = (nextTargetKeys: any, direction: any, moveKeys: any) => {
-    if (chooseTurn) return;
-    setTargetKeys(nextTargetKeys);
-    //遍历移动的数据 控制合格不合格显示数量
-    if (firstRvw) {
-      let scsChange: number = 0;
-      let failChange: number = 0;
-      moveKeys.map((item: any) => {
-        firstRvwScs.includes(item) && scsChange++;
-        firstRvwFail.includes(item) && failChange++;
-      });
-      if (direction === 'left') {
-        targetCountSet({ scsCount: targetCount.scsCount - scsChange, failCount: targetCount.failCount - failChange })
-      } else {
-        targetCountSet({ scsCount: targetCount.scsCount + scsChange, failCount: targetCount.failCount + failChange })
-      }
-    }
-  };
-
-  const onSelectChange = (sourceSelectedKeys: any, targetSelectedKeys: any) => {
-    if (chooseTurn) return;
-    setSelectedKeysTransfer([...sourceSelectedKeys, ...targetSelectedKeys]);
-  };
-
-  //取当前轮次所有供应商
-  async function getGysData() {
-    let dataT: any = [];
-    let _scs: any = [];
-    let _fail: any = [];
-    let target: any = [];
-    let firstRvw = false;//是否经历初审
-    await getGys(getRoomId()).then((res) => {
-      if (res.code == 200) {
-        res.data.map((item: any, index: number) => {
-          let one = {
-            key: item.id,
-            title: item.companyName,
-            firstRvwResult: item.firstRvwResult,//0 未通过 1通过 2没经历初审
-          }
-          dataT.push(one);
-          item.firstRvwResult === 0 && _fail.push(one.key);//按类别存key
-          item.firstRvwResult === 1 && _scs.push(one.key);
-          item.firstRvwResult !== 0 && target.push(item.id);//右侧数据
-          index === 1 && item.firstRvwResult < 2 && (firstRvw = true);//是否经历初审
-        });
-      }
-    });
-    gysDataSet(dataT);
-    setTargetKeys(target);
-    firstRvwScsSet(_scs);
-    firstRvwFailSet(_fail);
-    firstRvwSet(firstRvw);
-    targetCountSet({ scsCount: target.length, failCount: 0 })
-    chooseGysSet(true);
-    countSet(count + 1); //触发useEffect
-  }
-
-  const { Option } = Select;
-
-  function returnGysModal() {
-    const select = <Select
-      style={{ width: 100 }}
-      placeholder={'请选择'}
-      onChange={async (value: any) => {
-        spinSet(true);
-        let thisTurnId = data[value].id;
-        let preTurnId = data[value - 1].id;
-        await queryGys(thisTurnId, preTurnId).then((res) => {
-          if (res?.code == 200) {
-            let all = [...res?.data[thisTurnId], ...res?.data[preTurnId]]
-            let target: any[] = [];
-            res?.data[thisTurnId].map((i: { key: any; }) => {
-              target.push(i.key)
-            })
-            gysDataSet(all);//穿梭框数据源
-            setTargetKeys(target);//穿梭框右侧数据 keys
-            targetCountSet({ scsCount: target.length, failCount: 0 })
-          }
-        }).finally(() => spinSet(false))
-      }}
-    >
-      {
-        data?.map((i: any, index: any) => {
-          if (index == 0 || i.status === 3) return;//1:进行中；2:已结束；3:未开启
-          return <Option key={i.id + 'option'} value={index}>{i.instTurnName}</Option>
-        })
-      }
-    </Select >
-    const footer = chooseTurn ? { footer: <Button type='primary' onClick={() => closeFc()}>关闭</Button> } : {};
-
-    const closeFc = async () => {
-      chooseGysSet(false);
-      chooseTurnSet(false);
-      gysDataSet([]);
-      firstRvwSet(false);
-    }
-
-    return (
-      <Modal
-        visible={chooseGys}
-        centered
-        width={1200}
-        style={{ maxHeight: modalHeight }}
-        destroyOnClose
-        {...footer}
-        okButtonProps={{ disabled: spin }}
-        bodyStyle={{ maxHeight: modalHeight - 107, overflowY: 'auto' }}
-        title={chooseTurn ? '查看已开启轮次所选供应商' : '选择进入下一轮次的供应商'}
-        onCancel={() => closeFc()}
-        onOk={() => {
-          if (chooseTurn) {
-            closeFc();
-            return
-          }
-          if (targetKeys.length > 0) {
-            openTurnFc();
-          } else {
-            message.error('未选中供应商');
-          }
-        }}
-      >
-        <Spin spinning={spin}>
-          {
-            chooseTurn ?
-              <div style={{ fontSize: 16, fontWeight: 'bold', marginBottom: 16 }}>查看开启&nbsp;{select}&nbsp;时供应商选择情况</div>
-              :
-              <p style={{ fontSize: 16, fontWeight: 'bold' }}>温馨提示：选择一个或以上的选项后，点击对应的方向键，可以把选中的选项移动到另一栏。</p>
-          }
-          <Transfer
-            dataSource={gysData}
-            listStyle={{ width: '50%', height: 400 }}
-            titles={[chooseTurn ? '未进入所选轮次的供应商' : '可选供应商（不进入下一轮）', chooseTurn ? '已进入所选轮次的供应商' : '进入下一轮供应商']}
-            targetKeys={targetKeys}
-            selectedKeys={selectedKeysTransfer}
-            onChange={onChange}
-            onSelectChange={onSelectChange}
-            disabled={isBxOneSecondCustom == "1"}
-            selectAllLabels={[, (info: { selectedCount: number, totalCount: number }) => <>
-              {
-                info.selectedCount != 0 && `${info.selectedCount}/`
-              }
-              {info.totalCount}&nbsp;项&nbsp;&nbsp;
-              {firstRvw &&
-                <>
-                  {targetCount.scsCount > 0 &&
-                    <><Tag color="success">初审合格</Tag>：{targetCount.scsCount} 家&nbsp;&nbsp;</>
-                  }
-                  {targetCount.failCount > 0 &&
-                    <><Tag color="error">初审不合格</Tag>：{targetCount.failCount} 家</>
-                  }
-                </>
-              }
-            </>]}
-            render={(item: any) => {
-              return (
-                <>
-                  {item.firstRvwResult === 1 && <Tag color="success">初审合格</Tag>}
-                  {item.firstRvwResult === 0 && <Tag color="error">初审不合格</Tag>}
-                  {item.title}
-                </>
-              )
-            }}
-          />
-        </Spin>
-      </Modal>
-    );
-  }
-  function onOpenChange(openKeys: any) {
-    menuShowSet([openKeys[openKeys.length - 1]]);
-  }
-  function onSelect({ selectedKeys }: any) {
-    setSelectedKeys(selectedKeys);
-  }
-  return (
-    <>
-      <div className="myselfContent xsy-menu-style" style={{ height: innerHeight - 106 }}>
-        <Spin spinning={spin} wrapperClassName="xsy-spin">
-          <div>
-            <Tooltip placement="top" title={'刷新流程'}>
-              <a
-                style={{ float: 'right', marginRight: '10px' }}
-                onClick={async () => {
-                  spinSet(true);
-                  setSelectedKeys([]);
-                  menuShowSet([]);
-                  await getData();
-                  // await getBtn();
-                  // history.push('/EvaRoom/Eva');
-                  spinSet(false);
-                }}
-              >
-                <ReloadOutlined spin={spin} />
-              </a>
-            </Tooltip>
-            {
-              data?.length > 1 && <Tooltip placement="top" title={'查看已开启轮次所选供应商'}>
-                <a
-                  style={{ float: 'right', marginRight: '10px' }}
-                  onClick={async () => {
-                    gysDataSet([]);//穿梭框数据源
-                    setTargetKeys([]);//穿梭框右侧数据 keys
-                    chooseGysSet(true);
-                    chooseTurnSet(true);
-                  }}
-                >
-                  <CarryOutOutlined />
-                </a>
-              </Tooltip>
-            }
-          </div>
-          <div>
-            <Menu
-              // defaultSelectedKeys={['1SubMenu']}
-              openKeys={menuShow}
-              expandIcon={() => <DownOutlined style={{ fontSize: '10px', fontWeight: 'bolder' }} />}
-              mode="inline"
-              onOpenChange={onOpenChange}
-              selectedKeys={selectedKeys}
-              onSelect={onSelect}
-              className="xsy-menu-style"
-              style={{ height: innerHeight - 325, paddingBottom: '' }}
-              inlineIndent={58}
-            >
-              {data.map((item: any) => (
-                <SubMenu key={`${item.instTurnSort}SubMenu`} title={item.instTurnName}>
-                  {item.nodeVOList.map((item2: any, index: any) => {
-                    //可查看报价的专家 （唱价节点）
-                    let singDis;
-                    if (item2.moduleUrl === '/EvaRoom/Eva/Sing') {
-                      singDis = item2.moduleUrl === '/EvaRoom/Eva/Sing' && role == 'ebtp-expert' && singUserId.findIndex((item: any) => item == userId) == -1;
-                    }
-                    if (item2.moduleUrl === '/EvaRoom/Eva/Openning') {
-                      singDis = item2.moduleUrl === '/EvaRoom/Eva/Openning' && role == 'ebtp-expert' && singUserId.findIndex((item: any) => item == userId) == -1;
-                    }
-                    //修改跳转地址并加参数 轮次id 节点id 轮次号
-                    let url = makeUrl(item2.moduleUrl, leader) + `?turnId=${item2.instTurnId}&nodeId=${item2.id}&turnSort=${item2.instTurnSort}`;
-                    //报价评审  只有评审分工分到的专家能点
-                    let offerDis = item2.moduleUrl === '/EvaRoom/Eva/BidOffer' && userId != offerUserId;
-                    //是否跳过节点 0-不跳过 1-跳过节点
-                    let skipStatus = item2.skipStatus == 1;
-                    let disabled = item2.status == 3 ||
-                      item2.moduleUrl == null ||
-                      item2.moduleUrl == undefined ||
-                      offerDis ||
-                      singDis ||
-                      skipStatus
-                    return (
-                      <Menu.Item
-                        key={`${item.instTurnSort}${index}MenuItem`}
-                        disabled={disabled}
-                        onClick={() => {
-                          let empty = new Promise(function (resolve, reject) {
-                            if (makeUrl(item2.moduleUrl, leader) === window.location.pathname && !disabled) {
-                              history.push('/EvaRoom/Eva')
-                            }
-                            resolve(true);
-                          });
-                          empty.finally(() => history.push(url));
-                        }}
-                      >
-                        {item2.instNodeName}
-                      </Menu.Item>
-                    );
-                  })}
-                </SubMenu>
-              ))}
-            </Menu>
-          </div>
-          <div className="xsy-spin-div">
-            <div>
-              <Button
-                type="primary"
-                hidden={
-                  flowFinish || btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])
-                }
-                onClick={() => showConfirm(btnMes, false)}
-                className="xsy-next-btn"
-              >
-                {btnText == '开启' ? btnText + instTurnName : btnText}
-              </Button>
-            </div>
-            <div>
-              <Button
-                hidden={
-                  stop ||
-                  flowFinish ||
-                  btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])
-                }
-                className="xsy-over-btn"
-                onClick={() => {
-                  overConfirm('是否要终止流程？');
-                }}
-              >
-                终止流程
-              </Button>
-            </div>
-          </div>
-        </Spin>
-      </div>
-      {/* 选择供应商 */}
-      {returnGysModal()}
-    </>
-  );
-};
-export default Index;
diff --git a/src/components/LayLeftMenu/service.ts b/src/components/LayLeftMenu/service.ts
deleted file mode 100644
index 3fb0364..0000000
--- a/src/components/LayLeftMenu/service.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import request from "@/utils/request";
-
-/**
- *  获取左侧菜单数据
- * @param params 
- */
-export async function getLeftMenu(params: any,) {
-    return request(`/api/biz-service-ebtp-process/v1/flow/query/${params}`);
-}
-
-// 显示按钮判断
-export async function getBtnText(params: any) {
-    return request(`/api/biz-service-ebtp-process/v1/flow/query/button/${params}`, {
-        method: 'GET',
-        params: {
-        }
-    });
-}
-
-// 评审室流程流转按钮返回判断
-export async function nextNode(nodeId: any, confirmFlag: any) {//下一步
-    return request(`/api/biz-service-ebtp-process/v1/flow/control/nextNode/${nodeId}?confirmFlag=${confirmFlag}`, {
-        method: 'POST',
-    });
-}
-export async function firstNextNode(turnId: any, confirmFlag: any) {//下一步 第一个节点
-    return request(`/api/biz-service-ebtp-process/v1/flow/control/first/nextNode/${turnId}?confirmFlag=${confirmFlag}`, {
-        method: 'POST',
-    });
-}
-export async function finishFlow(assessRoomId: any) {//流程结束
-    return request(`/api/biz-service-ebtp-process/v1/flow/control/tp/finishFlow/${assessRoomId}`, {
-        method: 'POST',
-    });
-}
-export async function finishTurn(turnId: any, confirmFlag: any) {//轮次结束
-    return request(`/api/biz-service-ebtp-process/v1/flow/control/finishTurn/${turnId}?confirmFlag=${confirmFlag}`, {
-        method: 'POST',
-    });
-}
-export async function openTurn(data: any) {//轮次开启
-    return request(`/api/biz-service-ebtp-process/v1/flow/control/openTurn`, {
-        method: 'POST',
-        data: data,
-    });
-}
-//获取当前轮次供应商
-export async function getGys(assessRoomId: any) {
-    return request(`/api/biz-service-ebtp-rsms/v1/reviewresult/assessroom/suppliers_round?assessRoomId=${assessRoomId}`);
-    // return request(`/api/biz-service-ebtp-tender/v1/supplier_register/assessroom/suppliers_round?assessRoomId=${assessRoomId}`);
-}
-//获取专家身份
-export async function getLeader(params: any, data: any) {
-    return request(`/api/biz-service-ebtp-rsms/v1/jury/member/queryRole?roomId=${params}&userId=${data}`, {
-        method: 'GET',
-    });
-}
-//获取报价评审分给的专家id
-export async function getOfferUserId(assessId?: any) {
-    return request(`/api/biz-service-ebtp-rsms/v1/jury/divide/priceUser/${assessId}`, {
-        method: 'GET',
-    });
-}
-//获取可查看报价的专家ids
-export async function getSingIds(assessId?: any) {
-    return request(`/api/biz-service-ebtp-rsms/v1/jury/divide/viewPriceUser/${assessId}`, {
-        method: 'GET',
-    });
-}
-//查看开启轮次时选择供应商
-export async function queryGys(turnId?: any,preTurnId?:any) {
-    return request(`/api/biz-service-ebtp-tender/v1/supplier_register/turn/suppliers/${turnId}/${preTurnId}`, {
-        method: 'GET',
-    });
-}
\ No newline at end of file
diff --git a/src/components/NoticeIcon/NoticeList.less b/src/components/NoticeIcon/NoticeList.less
deleted file mode 100644
index 65e0c40..0000000
--- a/src/components/NoticeIcon/NoticeList.less
+++ /dev/null
@@ -1,103 +0,0 @@
-@import '~antd/es/style/themes/default.less';
-
-.list {
-  max-height: 400px;
-  overflow: auto;
-  &::-webkit-scrollbar {
-    display: none;
-  }
-  .item {
-    padding-right: 24px;
-    padding-left: 24px;
-    overflow: hidden;
-    cursor: pointer;
-    transition: all 0.3s;
-
-    .meta {
-      width: 100%;
-    }
-
-    .avatar {
-      margin-top: 4px;
-      background: @component-background;
-    }
-    .iconElement {
-      font-size: 32px;
-    }
-
-    &.read {
-      opacity: 0.4;
-    }
-    &:last-child {
-      border-bottom: 0;
-    }
-    &:hover {
-      background: @primary-1;
-    }
-    .title {
-      margin-bottom: 8px;
-      font-weight: normal;
-    }
-    .description {
-      font-size: 12px;
-      line-height: @line-height-base;
-    }
-    .datetime {
-      margin-top: 4px;
-      font-size: 12px;
-      line-height: @line-height-base;
-    }
-    .extra {
-      float: right;
-      margin-top: -1.5px;
-      margin-right: 0;
-      color: @text-color-secondary;
-      font-weight: normal;
-    }
-  }
-  .loadMore {
-    padding: 8px 0;
-    color: @primary-6;
-    text-align: center;
-    cursor: pointer;
-    &.loadedAll {
-      color: rgba(0, 0, 0, 0.25);
-      cursor: unset;
-    }
-  }
-}
-
-.notFound {
-  padding: 73px 0 88px;
-  color: @text-color-secondary;
-  text-align: center;
-  img {
-    display: inline-block;
-    height: 76px;
-    margin-bottom: 16px;
-  }
-}
-
-.bottomBar {
-  height: 46px;
-  color: @text-color;
-  line-height: 46px;
-  text-align: center;
-  border-top: 1px solid @border-color-split;
-  border-radius: 0 0 @border-radius-base @border-radius-base;
-  transition: all 0.3s;
-  div {
-    display: inline-block;
-    width: 50%;
-    cursor: pointer;
-    transition: all 0.3s;
-    user-select: none;
-
-    &:only-child {
-      width: 100%;
-    }
-    &:not(:only-child):last-child {
-      border-left: 1px solid @border-color-split;
-    }
-  }
-}
diff --git a/src/components/NoticeIcon/NoticeList.tsx b/src/components/NoticeIcon/NoticeList.tsx
deleted file mode 100644
index 7c1b6ab..0000000
--- a/src/components/NoticeIcon/NoticeList.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import { Avatar, List } from 'antd';
-
-import React from 'react';
-import classNames from 'classnames';
-import { NoticeIconData } from './index';
-import styles from './NoticeList.less';
-
-export interface NoticeIconTabProps {
-  count?: number;
-  name?: string;
-  showClear?: boolean;
-  showViewMore?: boolean;
-  style?: React.CSSProperties;
-  title: string;
-  tabKey: string;
-  data?: NoticeIconData[];
-  onClick?: (item: NoticeIconData) => void;
-  onClear?: () => void;
-  emptyText?: string;
-  clearText?: string;
-  viewMoreText?: string;
-  list: NoticeIconData[];
-  onViewMore?: (e: any) => void;
-}
-const NoticeList: React.SFC<NoticeIconTabProps> = ({
-  data = [],
-  onClick,
-  onClear,
-  title,
-  onViewMore,
-  emptyText,
-  showClear = true,
-  clearText,
-  viewMoreText,
-  showViewMore = false,
-}) => {
-  if (!data || data.length === 0) {
-    return (
-      <div className={styles.notFound}>
-        <img
-          src="https://gw.alipayobjects.com/zos/rmsportal/sAuJeJzSKbUmHfBQRzmZ.svg"
-          alt="not found"
-        />
-        <div>{emptyText}</div>
-      </div>
-    );
-  }
-  return (
-    <div>
-      <List<NoticeIconData>
-        className={styles.list}
-        dataSource={data}
-        renderItem={(item, i) => {
-          const itemCls = classNames(styles.item, {
-            [styles.read]: item.read,
-          });
-          // eslint-disable-next-line no-nested-ternary
-          const leftIcon = item.avatar ? (
-            typeof item.avatar === 'string' ? (
-              <Avatar className={styles.avatar} src={item.avatar} />
-            ) : (
-              <span className={styles.iconElement}>{item.avatar}</span>
-            )
-          ) : null;
-
-          return (
-            <List.Item
-              className={itemCls}
-              key={item.key || i}
-              onClick={() => onClick && onClick(item)}
-            >
-              <List.Item.Meta
-                className={styles.meta}
-                avatar={leftIcon}
-                title={
-                  <div className={styles.title}>
-                    {item.title}
-                    <div className={styles.extra}>{item.extra}</div>
-                  </div>
-                }
-                description={
-                  <div>
-                    <div className={styles.description}>{item.description}</div>
-                    <div className={styles.datetime}>{item.datetime}</div>
-                  </div>
-                }
-              />
-            </List.Item>
-          );
-        }}
-      />
-      <div className={styles.bottomBar}>
-        {showClear ? (
-          <div onClick={onClear}>
-            {clearText} {title}
-          </div>
-        ) : null}
-        {showViewMore ? (
-          <div
-            onClick={(e) => {
-              if (onViewMore) {
-                onViewMore(e);
-              }
-            }}
-          >
-            {viewMoreText}
-          </div>
-        ) : null}
-      </div>
-    </div>
-  );
-};
-
-export default NoticeList;
diff --git a/src/components/NoticeIcon/index.less b/src/components/NoticeIcon/index.less
deleted file mode 100644
index 45251cd..0000000
--- a/src/components/NoticeIcon/index.less
+++ /dev/null
@@ -1,35 +0,0 @@
-@import '~antd/es/style/themes/default.less';
-
-.popover {
-  position: relative;
-  width: 336px;
-}
-
-.noticeButton {
-  display: inline-block;
-  cursor: pointer;
-  transition: all 0.3s;
-}
-.icon {
-  padding: 4px;
-  vertical-align: middle;
-}
-
-.badge {
-  font-size: 16px;
-}
-
-.tabs {
-  :global {
-    .ant-tabs-nav-list {
-      margin: auto;
-    }
-
-    .ant-tabs-nav-scroll {
-      text-align: center;
-    }
-    .ant-tabs-bar {
-      margin-bottom: 0;
-    }
-  }
-}
diff --git a/src/components/NoticeIcon/index.tsx b/src/components/NoticeIcon/index.tsx
deleted file mode 100644
index f91740e..0000000
--- a/src/components/NoticeIcon/index.tsx
+++ /dev/null
@@ -1,135 +0,0 @@
-import { BellOutlined } from '@ant-design/icons';
-import { Badge, Spin, Tabs } from 'antd';
-import useMergeValue from 'use-merge-value';
-import React from 'react';
-import classNames from 'classnames';
-import NoticeList, { NoticeIconTabProps } from './NoticeList';
-
-import HeaderDropdown from '../HeaderDropdown';
-import styles from './index.less';
-
-const { TabPane } = Tabs;
-
-export interface NoticeIconData {
-  avatar?: string | React.ReactNode;
-  title?: React.ReactNode;
-  description?: React.ReactNode;
-  datetime?: React.ReactNode;
-  extra?: React.ReactNode;
-  style?: React.CSSProperties;
-  key?: string | number;
-  read?: boolean;
-}
-
-export interface NoticeIconProps {
-  count?: number;
-  bell?: React.ReactNode;
-  className?: string;
-  loading?: boolean;
-  onClear?: (tabName: string, tabKey: string) => void;
-  onItemClick?: (item: NoticeIconData, tabProps: NoticeIconTabProps) => void;
-  onViewMore?: (tabProps: NoticeIconTabProps, e: MouseEvent) => void;
-  onTabChange?: (tabTile: string) => void;
-  style?: React.CSSProperties;
-  onPopupVisibleChange?: (visible: boolean) => void;
-  popupVisible?: boolean;
-  clearText?: string;
-  viewMoreText?: string;
-  clearClose?: boolean;
-  emptyImage?: string;
-  children: React.ReactElement<NoticeIconTabProps>[];
-}
-
-const NoticeIcon: React.FC<NoticeIconProps> & {
-  Tab: typeof NoticeList;
-} = (props) => {
-  const getNotificationBox = (): React.ReactNode => {
-    const {
-      children,
-      loading,
-      onClear,
-      onTabChange,
-      onItemClick,
-      onViewMore,
-      clearText,
-      viewMoreText,
-    } = props;
-    if (!children) {
-      return null;
-    }
-    const panes: React.ReactNode[] = [];
-    React.Children.forEach(children, (child: React.ReactElement<NoticeIconTabProps>): void => {
-      if (!child) {
-        return;
-      }
-      const { list, title, count, tabKey, showClear, showViewMore } = child.props;
-      const len = list && list.length ? list.length : 0;
-      const msgCount = count || count === 0 ? count : len;
-      const tabTitle: string = msgCount > 0 ? `${title} (${msgCount})` : title;
-      panes.push(
-        <TabPane tab={tabTitle} key={tabKey}>
-          <NoticeList
-            {...child.props}
-            clearText={clearText}
-            viewMoreText={viewMoreText}
-            data={list}
-            onClear={(): void => onClear && onClear(title, tabKey)}
-            onClick={(item): void => onItemClick && onItemClick(item, child.props)}
-            onViewMore={(event): void => onViewMore && onViewMore(child.props, event)}
-            showClear={showClear}
-            showViewMore={showViewMore}
-            title={title}
-          />
-        </TabPane>,
-      );
-    });
-    return (
-      <Spin spinning={loading} delay={300}>
-        <Tabs className={styles.tabs} onChange={onTabChange}>
-          {panes}
-        </Tabs>
-      </Spin>
-    );
-  };
-
-  const { className, count, bell } = props;
-
-  const [visible, setVisible] = useMergeValue<boolean>(false, {
-    value: props.popupVisible,
-    onChange: props.onPopupVisibleChange,
-  });
-  const noticeButtonClass = classNames(className, styles.noticeButton);
-  const notificationBox = getNotificationBox();
-  const NoticeBellIcon = bell || <BellOutlined className={styles.icon} />;
-  const trigger = (
-    <span className={classNames(noticeButtonClass, { opened: visible })}>
-      <Badge count={count} style={{ boxShadow: 'none' }} className={styles.badge}>
-        {NoticeBellIcon}
-      </Badge>
-    </span>
-  );
-  if (!notificationBox) {
-    return trigger;
-  }
-
-  return (
-    <HeaderDropdown
-      placement="bottomRight"
-      overlay={notificationBox}
-      overlayClassName={styles.popover}
-      trigger={['click']}
-      visible={visible}
-      onVisibleChange={setVisible}
-    >
-      {trigger}
-    </HeaderDropdown>
-  );
-};
-
-NoticeIcon.defaultProps = {
-  emptyImage: 'https://gw.alipayobjects.com/zos/rmsportal/wAhyIChODzsoKIOBHcBk.svg',
-};
-
-NoticeIcon.Tab = NoticeList;
-
-export default NoticeIcon;
diff --git a/src/components/PageLoading/index.tsx b/src/components/PageLoading/index.tsx
deleted file mode 100644
index 096c58f..0000000
--- a/src/components/PageLoading/index.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { PageLoading } from '@ant-design/pro-layout';
-
-// loading components from code split
-// https://umijs.org/plugin/umi-plugin-react.html#dynamicimport
-export default PageLoading;
diff --git a/src/components/Promenu/index.less b/src/components/Promenu/index.less
deleted file mode 100644
index c0f0dd1..0000000
--- a/src/components/Promenu/index.less
+++ /dev/null
@@ -1,101 +0,0 @@
-.MuiTabs-root {
-    height: 75px;
-    .PrivateTabIndicator-colorPrimary-3 {
-        background-color: #ffffff;
-    }
-    .bar-base {
-        border-right: 1px solid #f3f3f3;
-        display:flex;
-        flex-shrink: 0;
-    }
-    .jss3 {
-        background-color: rgba(0,0,0,.0) !important;
-    } 
-    .MuiTabs-scroller {
-        overflow-y: hidden;
-    }
-    .link-title {
-        line-height: 91px;
-        height: 91px;
-        font-size: 12px;
-        padding: 0 10px;
-        color: #666;
-        span {
-            display: inline-block;
-            margin-right: 6px;
-            width: 10px;
-            height: 10px;
-            background-color: #b30000;
-            position: relative;
-            top: 0px;
-            //border: 3px solid rgba(250, 90, 90, 0.3);
-            border-radius: 10px;
-        }
-    }
-    // .bar-base:nth-child(1) .link-title span {
-    //     background-color: #028eed;
-    //     border: 3px solid #bac2c7a8;
-    // }
-    // .bar-base:nth-child(2) .link-title span {
-    //     background-color: #ba0300;
-    //     border: 3px solid #fbe5e585;
-    // }
-    // .bar-base:nth-child(3) .link-title span {
-    //     background-color: #058fea;
-    //     border: 3px solid #d0e7f7a8;
-    // }
-    // .bar-base:nth-child(4) .link-title span {
-    //     background-color: #ffcc5f;
-    //     border: 3px solid  #fbf3e287;
-    // }
-    // .bar-base:nth-child(5) .link-title span {
-    //     background-color: #999999;
-    //     border: 3px solid #ffeeee75;
-    // }
-    // .bar-base:nth-child(6) .link-title span {
-    //     background-color: #b30000;
-    //     border: 3px solid #fbe5e585;
-    // }
-    // .bar-base:nth-child(7) .link-title span {
-    //     background-color: #028eed;
-    //     border: 3px solid #d0e7f7a8;
-    // }
-    .link-style {
-        display: flex;
-        flex-wrap: wrap; 
-        align-items: center;
-        width: 100%;
-        height: 91px;
-        margin-right: 20px;
-        a {
-            // flex-wrap: wrap;
-            color: #333;
-            font-size: 14px;
-            line-height: 27px;
-            width: 50%;
-            height: 27px;
-            padding: 0 18px;
-            text-align: center;
-        }
-        a:hover {
-            color: #980000;
-        }
-    }
-}
-.horizontal-stepper {
-    padding-left: 0px !important;
-}
-.horizontal-stepper .MuiStepConnector-horizontal {
-    //横线宽度
-    min-width: 60px;
-}
-.horizontal-stepper .MuiStepIcon-completed {
-    color: #b30000 !important;
-}
-.horizontal-stepper .MuiStepIcon-active {
-    color: #b30000 !important;
-}
-.horizontal-stepper .MuiStep-completed {
-    // min-width: 90px ;
-}
-
diff --git a/src/components/Promenu/index.tsx b/src/components/Promenu/index.tsx
deleted file mode 100644
index df22467..0000000
--- a/src/components/Promenu/index.tsx
+++ /dev/null
@@ -1,329 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { makeStyles, Theme } from '@material-ui/core/styles';
-import AppBar from '@material-ui/core/AppBar';
-import Tabs from '@material-ui/core/Tabs';
-import { PageHeader, Button, message, Steps, Space, Card, Dropdown, Menu } from 'antd';
-import { Link, history } from 'umi';
-import './index.less';
-import { getReadInfo, menuList, updateReadStatus } from './service/service';
-import { getProName, getSessionRoleData, getProTypeCode, getDefId, getPurchaseCanOperate, getReturnURL, getProId, getProMethod } from '@/utils/session';
-import { Step, StepButton, StepLabel, Stepper, Toolbar, Popover, Typography } from '@material-ui/core';
-import { isEmpty } from '@/utils/CommonUtils';
-import { CustomerServiceTwoTone } from '@ant-design/icons';
-
-const useStyles = makeStyles((theme: Theme) => ({
-  root: {
-    flexGrow: 1,
-    width: '100%',
-    backgroundColor: theme.palette.background.paper,
-  },
-  popover: {
-    pointerEvents: 'none',
-  },
-  paper: {
-    padding: theme.spacing(1),
-  },
-}));
-
-function getUrlRelativePath() {
-  let url = document.location.toString();
-  let arrUrl = url.split("//");
-  let start = arrUrl[1].indexOf("/");
-  let relUrl = arrUrl[1].substring(start);
-  return relUrl;
-}
-
-
-const Promenu: React.FC<{}> = () => {
-  //获取采购方式
-  const MethodDict = getProMethod();
-  const classes = useStyles();
-  //流程数据
-  const [data, setData] = React.useState<any>([]);
-  //角色
-  const randerRole = getSessionRoleData().roleCode;
-  //总步骤条数
-  const [progress, setProgress] = useState<any>();
-  //当前步骤条数
-  const [current, setCurrent] = useState<any>();
-  const [buttonValue, setButtonValue] = useState<any>();
-  const url = getUrlRelativePath();
-  const projectId = getProId();
-  const defId = getDefId();
-  //项目名称
-  const [proName, setProName] = useState<string>("");
-  //收藏状态 0-已收藏 d-未收藏
-  const [subStatus, setSubStatus] = useState<string | null>(null);
-  //收藏数据
-  const [subData, setSubData] = useState<any>();
-  //收藏loading
-  const [subLoading, setSubLoading] = useState<boolean>(false);
-
-  const [anchorEl, setAnchorEl] = React.useState<HTMLElement | null>(null);
-
-  const [anchorName, setAnchorName] = useState<string>("");
-  const scrollButtonsDesktop = document.getElementsByClassName("MuiTabs-scrollButtonsDesktop").length;
-  const open = Boolean(anchorEl);
-
-  useEffect(() => {
-    menuList({ defId: defId, projectId: projectId }).then(res => {
-      if (res.code === 200) {
-        let data = res.data;
-        setData(data);
-        setProgress(data.length);
-        setCurrent(getCurrentLinks(data) + 1);
-        setButtonValue(stepButtonClick(findURL(data)));
-      }
-    })
-    getReadInfo({ projectId: projectId }).then(res => {
-      if (res?.code == 200) {
-        const data = res?.data;
-        if (data) {
-          setSubStatus(data.status);
-          setSubData(data);
-        } else {
-          setSubStatus("");
-        }
-      }
-    })
-    setProName(getProName());
-  }, []);
-  /**
-   * 获取当前环节
-   */
-  const getCurrentLinks = (data: any) => {
-    let num = -1;
-    for (let i = 0; i < data.length; i++) {
-      //1、已进行；2、当前环节；3、未开启
-      if (data[i].taskStatus === 1) {
-        num = i;
-      }
-    }
-    return num;
-  }
-
-  /**
-   * 变更收藏状态
-   * @param status 
-   * @returns 
-   */
-  const changeSubStatus = (data: any, status: string) => {
-    const params = {
-      id: data ? data?.id : null,
-      projectId: projectId,
-      status
-    }
-    setSubLoading(true);
-    updateReadStatus(params).then(res => {
-      if (res?.code == 200) {
-        setSubStatus(status);
-        message.success(status == '0' ? '添加收藏成功' : '移除收藏成功')
-      }
-    }).finally(() => {
-      setSubLoading(false);
-    })
-  }
-
-  const stepButtonClick = (data: any) => {
-    if (isEmpty(data) || isEmpty(data.funcList)) {
-      return null;
-    }
-    const funcList = data.funcList;
-    return loadFuncList(funcList);
-  }
-  /**
-   * 生成button数据
-   * @param funcList 
-   * @returns 
-   */
-  const loadFuncList = (funcList: any[]) => {
-    let arr: JSX.Element[] = [];
-    if (isEmpty(funcList)) {
-      return arr;
-    }
-    const url = getUrlRelativePath();
-    arr = funcList.map((item: any, index: number) =>
-      <Button key={index} size="small" onClick={() => clickEnter(funcList, item.funcUrl)} type={url === item.funcUrl ? "primary" : "default"}>
-        {item.funcName}
-      </Button>
-    );
-    return arr;
-  }
-  /**
-   * 进入页面
-   * @param funcList 
-   * @param funcUrl 
-   */
-  const clickEnter = (funcList: any[], funcUrl: string) => {
-    history.push(funcUrl);
-    setButtonValue(loadFuncList(funcList));
-  }
-
-  /**
-   * 查找跟当前页面匹配的值（url）
-   * @param data 
-   * @returns 
-   */
-  const findURL = (data: any[]) => {
-    if (isEmpty(data)) {
-      return null;
-    }
-    for (const item of data) {
-      for (const i of item.funcList) {
-        if (i.funcUrl === url) {
-          return item;
-        }
-      }
-    }
-    return null;
-  }
-
-  const getFuncName = (data: any) => {
-    const funcList = data.funcList;
-    if (isEmpty(funcList)) {
-      return "";
-    }
-    const names = funcList.map((item: any) => item.funcName);
-    return names.join(" | ");
-  }
-
-  const handlePopoverOpen = (event: React.MouseEvent<HTMLElement, MouseEvent>, data: any) => {
-    setAnchorName(getFuncName(data));
-    setAnchorEl(event.currentTarget);
-  };
-
-  const handlePopoverClose = () => {
-    setAnchorEl(null);
-  };
-  const initChatUI = () => { //智慧客服
-    if (MethodDict != 'procurement_mode_6' && MethodDict != 'procurement_mode_7' && window.location.pathname.indexOf('BidEvaluation') != -1) {
-      message.warn('非谈判类项目【评标】阶段禁止沟通')
-    } else {
-      var tempForm = document.getElementById('tempForm_CustomerService') as HTMLFormElement
-      if (tempForm) {
-        var hideInput = document.getElementById('tempInput_CustomerService') as HTMLInputElement
-        if (hideInput) {
-          hideInput.value = window.location.pathname
-        } else {
-          hideInput = document.createElement("input")
-          hideInput.id = 'tempInput_CustomerService'
-          hideInput.type = "hidden"
-          hideInput.name = 'sceneUrl'
-          hideInput.value = window.location.pathname
-          tempForm.appendChild(hideInput)
-        }
-        tempForm.submit();
-      } else {
-        message.warn('请先选择跟进的项目')
-      }
-    }
-  }
-  return (
-    <div key='promenuDiv1' style={{ borderRadius: "6px", overflow: "hidden" }}>
-      <div key='promenuDiv2' className="site-page-header-ghost-wrapper" style={{ background: '#ffffff' }}>
-        <PageHeader
-          title="项目名称"
-          subTitle={proName}
-          extra={[
-            (randerRole == 'ebtp-supervision' && subStatus == "0")
-              ? <Button key="qxdy" disabled={subLoading} onClick={() => changeSubStatus(subData, "d")}>移除收藏</Button> : null,
-            (randerRole == 'ebtp-supervision' && (subStatus == "d" || subStatus == ""))
-              ? <Button key="daiyue" disabled={subLoading} onClick={() => changeSubStatus(subData, "0")}>添加收藏</Button> : null,
-            (randerRole == 'ebtp-agency-project-manager' || randerRole == 'ebtp-purchase' || randerRole == 'ebtp-supervision')
-              ? <Button key="jiandang" onClick={() => history.push("/Project/ProjectManage/ProjectManager/ProjectInformationManagement")}>项目建档</Button> : null,
-            (randerRole == 'ebtp-agency-project-manager' || randerRole == 'ebtp-purchase' || randerRole == 'ebtp-supervision') && defId != 'inquiry'
-              ? <Button key="guidang" onClick={() => {
-                history.push("/ProjectLayout/Archive/projectArchive")
-                setButtonValue(stepButtonClick(data?.[data?.length - 1]))
-              }}>项目归档</Button> : null,
-            <Button key="customerservice" onClick={() => {
-              initChatUI() //智慧客服
-            }} icon={<CustomerServiceTwoTone />}>我要咨询</Button>,
-            ((randerRole == 'ebtp-agency-project-manager' || randerRole == 'ebtp-purchase' || randerRole == 'ebtp-supervision') && MethodDict != "procurement_mode_7")
-              ? <Button key="manageyiyi" onClick={() => history.push("/Project/ProjectManage/ProjectManager/ObjectionComplaint")}>异议回复</Button> : null,
-            (randerRole == 'ebtp-supplier' && MethodDict != "procurement_mode_7")
-              ? <Button key="supplieryiyi" onClick={() => history.push("/Project/ProjectManage/Supplier/ObjectionComplaint")}>异议投诉</Button> : null,
-            <Button key="fanhui1" type="primary" onClick={() => history.push(getReturnURL())}>返回</Button>
-            // randerRole == 'ebtp-agency-project-manager' ? <Button key="fanhui1" type="primary"><Link to={`/BidManage/ProjectList?proTypeCode=${getProTypeCode()}`}>返回</Link></Button> : null,
-            // randerRole == 'ebtp-purchase' ? (getPurchaseCanOperate() != null && getPurchaseCanOperate() != undefined ? <Button key="fanhui1" type="primary"><Link to={`/Project/EntrustAssign/ProjectManager/PurchasingManagerEnquiries`}>返回</Link></Button>
-            //   : <Button key="fanhui1" type="primary"><Link to={`/BidManage/ProjectList?proTypeCode=${getProTypeCode()}`}>返回</Link></Button>) : null,
-            // randerRole == 'ebtp-supplier' ? <Button key="fanhui2" type="primary"><Link to={`/BidManage/ProjectsInvolvedList?proTypeCode=${getProTypeCode()}`}>返回</Link></Button> : null,
-            // randerRole == 'ebtp-auction-manager' ? <Button key="fanhui3" type="primary"><Link to={`/Auction/AuctionManagerProject`}>返回</Link></Button> : null
-          ]}
-        >
-        </PageHeader>
-      </div>
-      <div key='promenuDiv3' className={classes.root}>
-        <AppBar position="static" color="default" style={{ background: '#ffffff', boxShadow: 'none' }}>
-          <Tabs
-            variant="scrollable"
-            scrollButtons="auto"
-            indicatorColor="primary"
-            // textColor="primary"
-            value={false}
-            key='promenuTab'
-          >
-            <Stepper
-              className="horizontal-stepper"
-              activeStep={current}
-              style={{
-                width: progress > 10 ? "" : '100%',
-                marginLeft: scrollButtonsDesktop === 0 ? '24px' : void 0,
-                // paddingTop: '34px'
-              }}
-            >
-
-              {data.map((item: any, index: number) =>
-                <Step
-                  key={index + 'Step'}
-                  onMouseEnter={(e) => handlePopoverOpen(e, item)}
-                  onMouseLeave={handlePopoverClose}
-                >
-                  <StepButton
-                    disabled={false}
-                    key={index + 'StepButton'}
-                    onClick={() => setButtonValue(stepButtonClick(item))}
-                  >
-                    {item.taskName}
-                  </StepButton>
-                </Step>
-              )}
-
-            </Stepper>
-          </Tabs>
-          <Space
-            style={{
-              paddingLeft: scrollButtonsDesktop === 0 ? '24px' : '50px',
-              paddingBottom: '8px'
-            }}
-          >
-            {buttonValue}
-          </Space>
-        </AppBar>
-
-        <Popover
-          id="mouse-over-popover"
-          className={classes.popover}
-          classes={{
-            paper: classes.paper,
-          }}
-          open={open}
-          anchorEl={anchorEl}
-          anchorOrigin={{
-            vertical: 'top',
-            horizontal: 'center',
-          }}
-          transformOrigin={{
-            vertical: 'bottom',
-            horizontal: 'center',
-          }}
-          onClose={handlePopoverClose}
-        >
-          {anchorName}
-        </Popover>
-      </div>
-    </div>
-  );
-}
-
-export default Promenu;
\ No newline at end of file
diff --git a/src/components/Promenu/service/service.ts b/src/components/Promenu/service/service.ts
deleted file mode 100644
index 8a31df6..0000000
--- a/src/components/Promenu/service/service.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import request from '@/utils/request';
-// import {getSessionRoleData,getDefId} from '@/utils/session';
-
-// export async function menuList(params: any,data: any) {
-//     return request(`/api/biz-service-ebtp-process/v1/projectconfig/${data}`, {
-//       method: 'GET',
-//       params: { ...params }
-//     });
-// }
-
-
-export async function menuList(params: any) {
-
-  return request(`/api/biz-service-ebtp-process/v1/projectconfig/getListByDefId`, {
-    method: 'GET',
-    params: { ...params }
-  });
-}
-/**
- * 收藏用-查询收藏信息（项目id或收藏id）
- * @param params 
- * @returns 
- */
-export async function getReadInfo(params: any) {
-  return request('/api/biz-service-ebtp-project/v1/notification/getReading', {
-    method: 'POST',
-    data: { ...params },
-  });
-}
-/**
- * 收藏用-变更收藏状态（0-已收藏 d-未收藏）
- * @param params 
- * @returns 
- */
-export async function updateReadStatus(params: any) {
-  return request('/api/biz-service-ebtp-project/v1/notification/addOrUpdate', {
-    method: 'POST',
-    data: { ...params },
-  });
-}
\ No newline at end of file
diff --git a/src/components/RiskModal/index.tsx b/src/components/RiskModal/index.tsx
deleted file mode 100644
index fd91b8f..0000000
--- a/src/components/RiskModal/index.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import React from 'react';
-import { Button, Modal } from 'antd';
-import { history } from 'umi';
-
-interface RiskModalProps {
-    modalVisible: boolean;
-    onCancel: () => void;
-    onSubmit?: () => Promise<any>;//确认后调用接口
-    isResult: boolean;
-    role: string;
-}
-/**
- * 供应商股权关系，风险弹窗
- * @param props 
- * @returns 
- */
-const RiskModal: React.FC<RiskModalProps> = (props) => {
-    const { modalVisible, onCancel, isResult, role, onSubmit = () => Promise<any> } = props;
-    const onOk = async () => {
-        if (role == "ebtp-agency-project-manager" || role == "ebtp-purchase") {//代理或采购经理
-            if (!isResult) {
-                history.push('/EvaRoom/Evaluation/BidControl/BidControlManager?n=1');
-            }
-        } else if (role == "ebtp-expert") {//专家
-            history.push('/EvaRoom/Evaluation/BidControl/Jury?n=1');
-        }
-        if (!isResult) {
-            const result = await onSubmit();
-            if (result) onCancel();
-        } else {
-            onCancel();
-        }
-    }
-
-    return (
-        <Modal
-            destroyOnClose
-            visible={modalVisible}
-            onCancel={() => onCancel()}
-            bodyStyle={{ padding: '40px 40px 30px' }}
-            centered
-            maskClosable={false}
-            footer={null}
-        >
-            <div style={{ textAlign: 'center' }}>
-                <h3 style={{ fontWeight: 'bold', marginBottom: '20px' }}>{((role == "ebtp-agency-project-manager") && isResult) ? "供应商关联关系存在疑似违规行为，请确保专家组长已确认风险！" : "供应商关联关系存在疑似违规行为，请前往【风险点展示】界面查看风险！"}</h3>
-                <Button key='ok' type='primary' onClick={() => onOk()}>确认</Button>
-            </div>
-        </Modal>
-    );
-};
-
-export default RiskModal;
diff --git a/src/components/Upload/react-resumable.js b/src/components/Upload/react-resumable.js
deleted file mode 100644
index 8848f1d..0000000
--- a/src/components/Upload/react-resumable.js
+++ /dev/null
@@ -1,533 +0,0 @@
-import React from "react";
-import { Table, Divider, Space, Tag, Progress, Button, Row, Col, Modal, Steps } from 'antd';
-import { PauseOutlined, DeleteOutlined, CaretRightOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
-import Resumablejs from "./resumable";
-import SparkMD5 from "./spark-md5";
-import './style.css';
-import { getCurrentTime, getTendererFileStatus } from './service';
-import { getProId } from '@/utils/session';
-
-function getUuid() {
-    return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-      var r = Math.random() * 16 | 0,
-        v = c == 'x' ? r : (r & 0x3 | 0x8);
-      return v.toString(16);
-    });
-  }
-
-function isIE() {
-    if(!!window.ActiveXObject || "ActiveXObject" in window){
-        return true
-    } else {
-        return false
-    }
-}
-
-/** 
- * 大文件上传组件
- */
-export default class ReactResumableJs extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-            fileList: [],// 任务队列
-            isPaused: false,// 暂停上传
-            isUploading: false,// 正在上传
-            isSupported: false,// 浏览器支持H5分片接口
-            task: {// 当前执行的任务
-                id: 0,// 任务id
-                prograss: 0,// 任务进度
-            },
-            timer: 0,// 计时器
-            redText: false,
-            btnHide: false,
-            projectId: getProId(),
-        };
-        this.resumable = null;
-        this.timerInterval;
-    }
-
-    componentDidMount = () => {
-        // 实例化上传组件( 用的是开源组件 resumablejs )
-        let _resumableField = this.__createResumbleObj();
-
-        // 当前浏览器是否支持 H5 Api
-        this.setState({ isSupported: _resumableField.support });
-
-        // 绑定上传组件， 拖拽组件
-        _resumableField.assignBrowse(this.uploader);
-
-        // 关闭拖拽功能
-        // _resumableField.assignDrop(this.dropZone);
-
-        /* 注册新增文件通知 */
-        _resumableField.on('fileAdded', this.__fileAddedListener.bind(this));
-        /* 注册上传处理中文件通知 */
-        _resumableField.on('fileProgress', this.__fileProgressListener.bind(this));
-        /** 文件上传完成 */
-        _resumableField.on('fileSuccess', this.__fileSuccessListener.bind(this));
-        /** 文件上传失败 */
-        _resumableField.on('fileError', this.__fileErrorListener.bind(this));
-
-        this.resumable = _resumableField;
-    };
-
-    // componentWillReceiveProps = (newProps) => {
-    //     this.resumable.updateQuery(newProps.query);
-    //     this.resumable.headers = this.props.headers;
-
-    //     this.setState({ fileList: [], task: { id: 0, prograss: 0 } });
-    //     this.setState({ timer: 0, redText: false });
-    //     clearInterval(this.timerInterval);
-    // }
-
-    render() {
-        // AntDesign Step组件， 用于指示业务运行阶段
-        const { Step } = Steps;
-        const columns = [
-            {
-                title: '描述',
-                dataIndex: 'filename',
-                key: 'filename',
-                render: text => <b>{text}</b>,
-            },
-            {
-                title: '进度',
-                dataIndex: 'prograss',
-                key: 'prograss',
-                width: '40%',
-                responsive: ['lg'],
-                render: (val, record) => <Progress percent={val} status={record.error ? "exception" : "active"} />,
-            },
-            {
-                title: '动作',
-                dataIndex: 'action',
-                key: 'action',
-                width: '20%',
-                responsive: ['md'],
-                render: (text, record) => {
-                    if (record.uploading && !this.state.btnHide) {
-                        return (
-                            <Space size="middle">
-                                <Button type="dashed" style={{ display: !record.pause && !record.complete && !record.error ? '' : 'none' }} icon={<PauseOutlined />} onClick={() => this.__uploadPause(record.filename)}>暂停</Button>
-                                <Button type="dashed" style={{ display: record.pause && !record.complete && !record.error ? '' : 'none' }} icon={<CaretRightOutlined />} onClick={() => this.__uploadResum(record.filename)}>恢复</Button>
-                                <Button type="danger" style={{ display: record.pause || record.error ? '' : 'none' }} icon={<DeleteOutlined />} onClick={() => this.__removeFile(record.filename)}>移除</Button>
-                            </Space>
-                        );
-                    }
-                },
-            },
-        ];
-
-        return (
-            <>
-                <Row>
-                    <Col span={24}>
-                        <div id={this.props.dropTargetID} ref={node => this.dropZone = node} style={{ display: this.state.fileList.length === 0 ? '' : 'none' }}>
-                            <div className="resumable-error" style={{ display: this.state.isSupported ? 'none' : '' }}>
-                                Your browser, unfortunately, is not supported by Resumable.js. The library requires support for <a href="http://www.w3.org/TR/FileAPI/">the HTML5 File API</a> along with <a href="http://www.w3.org/TR/FileAPI/#normalization-of-params">file slicing</a>.
-                            </div>
-                            <div style={{ display: this.state.isSupported ? '' : 'none' }}>
-                                {
-                                    isIE() ? 
-                                    <div className="redCenter">推荐使用谷歌、火狐、360浏览器的极速模式下上传文件</div> : null
-                                }
-                                <div className="resumable-drop">
-                                    <a className="resumable-browse"
-                                        ref={node => { this.uploader = node; this.dropZone = node; }}
-                                        type="file"
-                                        id={this.props.uploaderID}
-                                        className='btn'
-                                        name={this.props.uploaderID + '-upload'}
-                                        accept={this.props.fileAccept || '*'}
-                                        disabled={this.props.disableInput || false}><u>点击链接添加文件</u></a>
-                                </div>
-                            </div>
-                        </div>
-                    </Col>
-                </Row>
-
-                <Row>
-                    <Col span={24}>
-                        <center className="ebtp-message-title">
-                            <h1>总体作业已用时</h1>
-                            <h2>{(() => {
-                                let _timer = this.state.timer;
-                                let _hour = parseInt(_timer / 3600);
-                                let _minute = parseInt(_timer % 3600 / 60);
-                                let _second = parseInt(_timer % 3600 % 60);
-
-                                return this.__format(_hour) + ":" + this.__format(_minute) + ":" + this.__format(_second);
-                            })()}</h2>
-                        </center>
-                    </Col>
-                    <Col span={24} style={{ paddingTop: '5px' }}>
-                        <Steps current={this.state.task.id} percent={this.state.task.prograss}>
-                            <Step title="文件上传" description="文件上传." />
-                            <Step title="文件验证" description="文件验证." />
-                            <Step title="任务完成" description="任务完成." />
-                        </Steps>
-                    </Col>
-                </Row>
-
-                <Divider dashed />
-
-                <Row>
-                    <Col span={24}>
-                        <Table columns={columns} className={this.state.redText ? 'redError' : ''} dataSource={[...this.state.fileList]} pagination={false} bordered />
-                    </Col>
-                </Row>
-
-            </>
-        );
-    }
-
-    /**
-     * 格式化计时器
-     * @param {*} value 
-     */
-    __format(value) {
-        if (value < 10) {
-            return '0' + value;
-        }
-        return value;
-    }
-
-    /**
-     * 实例化上传组件
-     */
-    __createResumbleObj() {
-        return new Resumablejs({
-            target: this.props.service,
-            query: this.props.query,// 自定义参数
-            headers: this.props.headers,// 自定请求义头
-            forceChunkSize: true,// 是否严格执行分片
-            fileType: this.props.filetypes,
-            maxFiles: this.props.maxFiles,
-            maxFileSize: this.props.maxFileSize,
-            endTime: this.props.endTime,
-            currentDate: this.props.currentDate,
-            chunkSize: this.props.chunkSize,
-            testChunks: true,// 不启用测试块
-            simultaneousUploads: this.props.simultaneousUploads,
-            fileParameterName: this.props.fileParameterName,
-            forceChunkSize: true,// 是否严格执行分片
-            maxChunkRetries: 10,// 最大重试次数
-            chunkRetryInterval: 1000,// 重试间隔时间 10 秒
-            throttleProgressCallbacks: 1,// 上传进度播报周期 (1秒)
-            forceChunkSize: this.props.forceChunkSize,
-        });
-    }
-
-    /**
-     * 添加文件时的监听
-     * 
-     * @param {*} file 
-     */
-    __fileAddedListener(resumable) {
-        // 更新文件队列表单
-        let strIndex = resumable.fileName.lastIndexOf(".")
-        let fileSuffix = resumable.fileName.substring(strIndex + 1, resumable.fileName.length)
-        if (this.props.fileAccept == ('.' + fileSuffix)) {
-            let _cache = this.state.fileList;
-            _cache.length = 0;
-            _cache.push({
-                key: _cache.length + 1,
-                filename: resumable.fileName,
-                uploading: true,
-                prograss: Math.floor(resumable.progress() * 100),
-            });
-            // 更新组件状态，进行组件重绘
-            this.setState({ fileList: _cache });
-
-            if (typeof this.props.onFileAdded === "function") {
-                this.props.onFileAdded(resumable.file, resumable);
-            }
-
-            getCurrentTime().then((res) => {
-                if (res.code == 200) {
-                    let currentTiem = new Date(res.data).getTime()
-                    if(currentTiem > this.props.endTime){
-                        if (typeof this.props.onUploadError === "function") {
-                            this.props.onUploadError('超过截止时间');
-                        }
-                    }else{
-                        let data = {
-                          "tdocCatalogId": this.props.currentDate.tdocCatalogId,
-                          "tdocId": this.props.currentDate.tdocId,
-                          "tendererId": this.props.currentDate.tendererId,
-                          "tpId": this.state.projectId,
-                        }
-                        getTendererFileStatus(data).then((res) => { // 判断是否已投标
-                          if (res.code == 200) {
-                            if(res.data == false){
-                              
-                                var fileReader = new FileReader();
-                                if (fileReader.readAsBinaryString === undefined) {
-                                    FileReader.prototype.readAsBinaryString = function (fileData) { //解决ie11 大文件堆栈溢出的问题（for arrayBufferToString）
-                                        var binary = "";
-                                        var pt = this;
-                                        var reader = new FileReader();
-                                        reader.onload = function (e) {
-                                            var bytes = new Uint8Array(reader.result);
-                                            var length = bytes.byteLength;
-                                            for (var i = 0; i < length; i++) {
-                                                binary += String.fromCharCode(bytes[i]);
-                                            }
-                                            pt.content = binary;
-                                            pt.onload(pt); //页面内data取pt.content文件内容
-                                        }
-                                        reader.readAsArrayBuffer(fileData);
-                                    }
-                                } 
-                                fileReader.readAsBinaryString(resumable.file);
-                                fileReader.onload = e => {
-                                    resumable.uniqueIdentifier = SparkMD5.hashBinary(e.target.result);
-                                    if ((fileSuffix == 'file' && resumable.file.size < 200 * 1024 * 1024) || (fileSuffix == 'zip' && resumable.file.size < 500 * 1024 * 1024)) {
-                                        resumable.fileRealName = resumable.fileName
-                                        resumable.fileName = getUuid()+'.'+fileSuffix
-                                        resumable.upload();
-                                        // 计时器
-                                        this.timerInterval = setInterval(() => { this.setState({ timer: this.state.timer + 1 }); }, 1000);
-                                    } else {
-                                        if (typeof this.props.onUploadError === "function") {
-                                            this.props.onUploadError(resumable);
-                                        }
-                                    }
-                                }
-
-                            } else {
-                                if (typeof this.props.onUploadError === "function") {
-                                    this.props.onUploadError('撤销后再上传');
-                                }
-                            }
-                          } else {
-                            this.setState({ btnHide: true });
-                            if (typeof this.props.onUploadError === "function") {
-                                this.props.onUploadError(resumable);
-                            }
-                          }
-                        })
-                    }
-                } else {
-                    if (typeof this.props.onUploadError === "function") {
-                        this.props.onUploadError(resumable);
-                    }
-                }
-            })
-        } else {
-            if (typeof this.props.onUploadError === "function") {
-                this.props.onUploadError(resumable);
-            }
-        }
-    }
-
-    /**
-     * 文件上传进度播报
-     * @param {*} file 
-     */
-    __fileProgressListener(file) {
-        // 更新文件队列表单
-        let _cache = this.state.fileList;
-
-        let matchedObj = _cache.find((obj) => obj.filename === file.fileRealName);
-
-        if (matchedObj) {
-            matchedObj.prograss = Math.floor(file.progress() * 100);
-            // 更新组件状态，进行组件重绘
-            this.setState({ fileList: _cache, task: { id: 0, process: matchedObj.prograss } });
-        }
-    }
-
-    /**
-     * 文件上传完成
-     * @param {*} file 
-     */
-    __fileSuccessListener(file) {
-        let _cache = this.state.fileList;
-        let matchedObj = _cache.find((obj) => obj.filename === file.fileName);
-
-        if (matchedObj) {
-            matchedObj.complete = true;
-            this.setState({ fileList: _cache });// 更新组件状态，进行组件重绘
-        }
-        if (typeof this.props.onUploadSuccess === "function") {
-            _cache.length = 0;// 清空已完成的任务条目
-
-            this.props.onUploadSuccess(file, _cache, (index, description, percent) => {
-                let obj = _cache[index];
-
-                if (obj) {
-                    obj.prograss = Math.floor(percent);
-                    obj.filename = description;
-                    this.setState({ fileList: _cache, task: { id: 1, prograss: obj.prograss } });
-                }
-                // 确认是否所有任务都已完成
-                if (obj.prograss >= 100) {
-                    // this.setState({ fileList: [], task: { id: 0, prograss: 0 } });
-                    // this.setState({ timer: 0 });
-                    // clearInterval(this.timerInterval);
-                    clearInterval(this.timerInterval);
-                    this.setState({ timer: this.state.timer, task: { id: 2, prograss: 100 } })
-                } else if (obj.prograss == 2) {
-                    clearInterval(this.timerInterval);
-                    this.setState({ redText: true, timer: this.state.timer })
-                } else {
-                    this.setState({ fileList: _cache, task: { id: 1, prograss: obj.prograss } });
-                }
-            });
-        }
-    }
-
-    /**
-     * 文件上传失败
-     * @param {*} file 
-     */
-    __fileErrorListener(file) {
-        // 更新文件队列表单
-        let _cache = this.state.fileList;
-
-        let matchedObj = _cache.find((obj) => obj.filename === file.fileName);
-
-        if (matchedObj) {
-            matchedObj.error = true;
-
-            // 更新组件状态，进行组件重绘
-            this.setState({ fileList: _cache });
-        }
-
-        if (typeof this.props.onUploadError === "function") {
-            this.props.onUploadError(file, this.resumable);
-        }
-    }
-
-    /** 
-     * 移除上传列表中的文件
-    */
-    __removeFile(filename) {
-        /** 查询当前文件 */
-        const file = this.resumable.files.find(obj => obj.file.name === filename);
-        const selfRef = this;
-
-        if (!file.isComplete()) {
-            const { confirm } = Modal;
-            confirm({
-                title: '确定要移除当前任务吗?',
-                icon: <ExclamationCircleOutlined />,
-                content: '当前上传任务尚未完成，移除后将无法恢复，确定要执行该操作吗?',
-                centered: true,
-                okText: '确定',
-                okType: 'danger',
-                cancelText: '取消',
-                onOk() {// 取消选中文件的上传操作
-                    file.cancel();
-                    selfRef.__handleRemoveFile(filename);
-                },
-            });
-        } else {
-            selfRef.__handleRemoveFile(filename);
-        }
-    }
-
-    __handleRemoveFile(filename) {
-        // 更新文件队列表单
-        let _cache = this.state.fileList;
-        // 移除指定的元素
-        _cache.splice(_cache.findIndex((obj) => obj.filename === filename), 1);
-
-        if (typeof this.props.onCancelUpload === "function") {
-            this.props.onCancelUpload(filename);
-        }
-        // 停止计时器
-        clearInterval(this.timerInterval);
-        // 修改上传列表状态
-        this.setState({ fileList: _cache, timer: 0 });
-    }
-
-    /** 
-     * 暂停上传
-    */
-    __uploadPause(filename) {
-        // 取消选中文件的上传操作
-        this.resumable.files.find(obj => obj.file.name === filename)._pause = true;
-        // 更新文件队列表单
-        let _cache = this.state.fileList;
-
-        let matchedObj = _cache.find((obj) => obj.filename === filename);
-
-        if (matchedObj) {
-            matchedObj.pause = true;
-
-            if (typeof this.props.onPauseUpload === "function") {
-                this.props.onPauseUpload(filename);
-            }
-            // 更新组件状态，进行组件重绘
-            this.setState({ fileList: _cache });
-            // 停止计时器
-            clearInterval(this.timerInterval);
-        }
-    }
-
-    /** 
-     * 恢复上传
-    */
-    __uploadResum(filename) {
-        let file = this.resumable.files.find(obj => obj.file.name === filename);
-        // 取消暂停状态
-        file._pause = false;
-        // 取消选中文件的上传操作
-        file.upload();
-        // 更新文件队列表单
-        let _cache = this.state.fileList;
-
-        let matchedObj = _cache.find((obj) => obj.filename === filename);
-
-        if (matchedObj) {
-            delete matchedObj.pause;
-
-            if (typeof this.props.onResumeUpload === "function") {
-                this.props.onResumeUpload(filename);
-            }
-            // 更新组件状态，进行组件重绘
-            this.setState({ fileList: _cache });
-            // 继续计时
-            this.timerInterval = setInterval(() => { this.setState({ timer: this.state.timer + 1 }); }, 1000);
-        }
-    }
-}
-
-/**
- * 对外暴露的属性值
- */
-ReactResumableJs.defaultProps = {
-    maxFiles: 10,// 添加最大文件数
-    uploaderID: 'default-resumable-uploader',
-    dropTargetID: 'dropTarget',
-    query: {},
-    headers: {},
-    fileAccept: "*",// 文件头类型
-    endTime: 0, // 应答截止时间
-    currentDate: {},
-    maxFileSize: 1204 * 1024 * 1024 * 1024,// max size 1T
-    onUploadErrorCallback: (file, errorCount) => { },
-    onFileRemoved: file => file,
-    onCancelUpload: () => true,
-    onPauseUpload: () => true,
-    onResumeUpload: () => true,
-    onStartUpload: () => true,
-    onUploadSuccess: () => true,
-    onFileAdded: () => true,
-    onUploadError: () => true,
-    disableDragAndDrop: false,// 允许拖拽操作
-    chunkSize: 5 * 1024 * 1024,// 每个分批那的尺寸 5M
-    simultaneousUploads: 5,// 同步上传的分片数
-    fileParameterName: 'file',
-    generateUniqueIdentifier: null,
-    maxFilesErrorCallback: null,
-    cancelButton: false,
-    pause: false,
-    startButton: null,
-    pauseButton: null,
-    previousText: "",
-    forceChunkSize: false,
-};
diff --git a/src/components/Upload/resumable.js b/src/components/Upload/resumable.js
deleted file mode 100644
index e28f862..0000000
--- a/src/components/Upload/resumable.js
+++ /dev/null
@@ -1,1226 +0,0 @@
-/*
-* MIT Licensed
-* http://www.23developer.com/opensource
-* http://github.com/23/resumable.js
-* Steffen Tiedemann Christensen, steffen@23company.com
-*/
-
-(function() {
-  "use strict";
-
-  var Resumable = function(opts) {
-      if (! (this instanceof Resumable)) {
-          return new Resumable(opts);
-      }
-      this.version = 1.0;
-      // SUPPORTED BY BROWSER?
-      // Check if these features are support by the browser:
-      // - File object type
-      // - Blob object type
-      // - FileList object type
-      // - slicing files
-      this.support = ((typeof(File) !== 'undefined') && (typeof(Blob) !== 'undefined') && (typeof(FileList) !== 'undefined') && ( !! Blob.prototype.webkitSlice || !!Blob.prototype.mozSlice || !!Blob.prototype.slice || false));
-      if (!this.support) return (false);
-
-      // PROPERTIES
-      var $ = this;
-      $.files = []; // 文件队列
-      $.defaults = {
-          chunkSize: 1 * 1024 * 1024,
-          // 单片尺寸，默认为1M
-          forceChunkSize: false,
-          // 是否强制分片
-          simultaneousUploads: 3,
-          // 同时上传线程数
-          fileParameterName: 'file',
-          // 文件参数名称
-          chunkNumberParameterName: 'resumableChunkNumber',
-          // 分块编号
-          chunkSizeParameterName: 'resumableChunkSize',
-          // 分块大小
-          currentChunkSizeParameterName: 'resumableCurrentChunkSize',
-          // 当前分块大小
-          totalSizeParameterName: 'resumableTotalSize',
-          // 总的文件大小
-          typeParameterName: 'resumableType',
-          // MIME类型
-          identifierParameterName: 'resumableIdentifier',
-          // 标识符
-          fileNameParameterName: 'resumableFilename',
-          // 文件名称
-          relativePathParameterName: 'resumableRelativePath',
-          // 相对路径
-          totalChunksParameterName: 'resumableTotalChunks',
-          // 总的分块数量
-          dragOverClass: 'dragover',
-          // 样式
-          throttleProgressCallbacks: 0.5,
-          // 进度条
-          query: {},
-          // 查询参数
-          headers: {},
-          // 头信息
-          preprocess: null,
-          // 预处理
-          preprocessFile: null,
-          // 预处理文件
-          method: 'multipart',
-          // 上传方式
-          uploadMethod: 'POST',
-          // 上传方法
-          testMethod: 'GET',
-          // 测试方法
-          prioritizeFirstAndLastChunk: false,
-          // 块的优先级
-          target: '/',
-          // 目标路径
-          testTarget: null,
-          // 测试目标路径
-          parameterNamespace: '',
-          // 参数命名空间
-          testChunks: true,
-          // 测试块
-          generateUniqueIdentifier: null,
-          // 生成文件唯一标识
-          getTarget: null,
-          // 获取目标
-          maxChunkRetries: 100,
-          // 最多重试次数
-          chunkRetryInterval: undefined,
-          // 重试间隔
-          permanentErrors: [404, 409, 415, 500, 501],
-          // 异常码
-          maxFiles: undefined,
-          // 最大文件数
-          withCredentials: false,
-          // 是否使用ssl
-          xhrTimeout: 0,
-          // 访问超时
-          clearInput: true,
-          // 上传后清空input组件
-          chunkFormat: 'blob',
-          // 块文件格式
-          setChunkTypeFromFile: false,
-          // 块类型是否来源于文件
-          maxFilesErrorCallback: function(files, errorCount) { // 达到最大文件数量时反馈
-              var maxFiles = $.getOpt('maxFiles');
-              alert('Please upload no more than ' + maxFiles + ' file' + (maxFiles === 1 ? '': 's') + ' at a time.');
-          },
-          minFileSize: 1,
-          // 最小文件尺寸
-          minFileSizeErrorCallback: function(file, errorCount) { // 小于最小尺寸的文件提示
-              alert(file.fileName || file.name + ' is too small, please upload files larger than ' + $h.formatSize($.getOpt('minFileSize')) + '.');
-          },
-          maxFileSize: undefined,
-          // 最大文件尺寸
-          maxFileSizeErrorCallback: function(file, errorCount) { // 超过最大值时报错
-              alert(file.fileName || file.name + ' is too large, please upload files less than ' + $h.formatSize($.getOpt('maxFileSize')) + '.');
-          },
-          fileType: [],
-          // 文件类型
-          fileTypeErrorCallback: function(file, errorCount) { // 不符合的文件类型报错
-              alert(file.fileName || file.name + ' has type not allowed, please upload files of type ' + $.getOpt('fileType') + '.');
-          }
-      };
-      $.opts = opts || {}; // 配置参数
-      /** 属性值提取器 */
-      $.getOpt = function(o) {
-          var $opt = this;
-          // Get multiple option if passed an array
-          if (o instanceof Array) {
-              var options = {};
-              $h.each(o,
-              function(option) {
-                  options[option] = $opt.getOpt(option);
-              });
-              return options;
-          }
-          // Otherwise, just return a simple option
-          if ($opt instanceof ResumableChunk) {
-              if (typeof $opt.opts[o] !== 'undefined') {
-                  return $opt.opts[o];
-              } else {
-                  $opt = $opt.fileObj;
-              }
-          }
-          if ($opt instanceof ResumableFile) {
-              if (typeof $opt.opts[o] !== 'undefined') {
-                  return $opt.opts[o];
-              } else {
-                  $opt = $opt.resumableObj;
-              }
-          }
-          if ($opt instanceof Resumable) {
-              if (typeof $opt.opts[o] !== 'undefined') {
-                  return $opt.opts[o];
-              } else {
-                  return $opt.defaults[o];
-              }
-          }
-      };
-      /** 自定义的 indexOf 辅助方法 */
-      $.indexOf = function(array, obj) {
-          if (array.indexOf) {
-              return array.indexOf(obj);
-          }
-          for (var i = 0; i < array.length; i++) {
-              if (array[i] === obj) {
-                  return i;
-              }
-          }
-          return - 1;
-      }
-
-      // EVENTS
-      // catchAll(event, ...)
-      // fileSuccess(file), fileProgress(file), fileAdded(file, event), filesAdded(files, filesSkipped), fileRetry(file),
-      // fileError(file, message), complete(), progress(), error(message, file), pause()
-      $.events = [];
-      $.on = function(event, callback) {
-          $.events.push(event.toLowerCase(), callback);
-      };
-      $.fire = function() {
-          // `arguments` is an object, not array, in FF, so:
-          var args = [];
-          for (var i = 0; i < arguments.length; i++) args.push(arguments[i]);
-          // Find event listeners, and support pseudo-event `catchAll`
-          var event = args[0].toLowerCase();
-          for (var i = 0; i <= $.events.length; i += 2) {
-              if ($.events[i] == event) $.events[i + 1].apply($, args.slice(1));
-              if ($.events[i] == 'catchall') $.events[i + 1].apply(null, args);
-          }
-          if (event == 'fileerror') $.fire('error', args[2], args[1]);
-          if (event == ' fileprogress') $.fire('progress');
-      };
-
-      // INTERNAL HELPER METHODS (handy, but ultimately not part of uploading)
-      var $h = {
-          /** 停止事件 */
-          stopEvent: function(e) {
-              e.stopPropagation();
-              e.preventDefault();
-          },
-          // 迭代器
-          each: function(o, callback) {
-              if (typeof(o.length) !== 'undefined') {
-                  for (var i = 0; i < o.length; i++) {
-                      // Array or FileList
-                      if (callback(o[i]) === false) return;
-                  }
-              } else {
-                  for (i in o) {
-                      // Object
-                      if (callback(i, o[i]) === false) return;
-                  }
-              }
-          },
-          /** 标识符生成器 */
-          generateUniqueIdentifier: function(file, event) {
-              // 优先使用自定义标识符生成器
-              var custom = $.getOpt('generateUniqueIdentifier');
-              if (typeof custom === 'function') {
-                  return custom(file, event);
-              }
-
-              // Current client datetime
-              var d = new Date().getTime();
-              // Time in microseconds since page-load or 0 if unsupported
-              var d2 = (performance && performance.now && (performance.now() * 1000)) || 0;
-              var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g,
-              function(c) {
-                  var r = Math.random() * 16; // random number between 0 and 16
-                  if (d > 0) { // Use timestamp until depleted
-                      r = (d + r) % 16 | 0;
-                      d = Math.floor(d / 16);
-                  } else { // Use microseconds since page-load if supported
-                      r = (d2 + r) % 16 | 0;
-                      d2 = Math.floor(d2 / 16);
-                  }
-                  return (c === 'x' ? r: (r & 0x3 | 0x8)).toString(16);
-              });
-              // 默认使用UUID作为任务标识
-              return uuid;
-          },
-          /** 自定义辅助函数 */
-          contains: function(array, test) {
-              var result = false;
-
-              $h.each(array,
-              function(value) {
-                  if (value == test) {
-                      // 检查的结果
-                      result = true;
-                      // 退出迭代器
-                      return false;
-                  }
-                  return true;
-              });
-
-              return result;
-          },
-          /** 格式化文件尺寸描述 */
-          formatSize: function(size) {
-              if (size < 1024) {
-                  return size + ' bytes';
-              } else if (size < 1024 * 1024) {
-                  return (size / 1024.0).toFixed(0) + ' KB';
-              } else if (size < 1024 * 1024 * 1024) {
-                  return (size / 1024.0 / 1024.0).toFixed(1) + ' MB';
-              } else {
-                  return (size / 1024.0 / 1024.0 / 1024.0).toFixed(1) + ' GB';
-              }
-          },
-          getTarget: function(request, params) {
-              var target = $.getOpt('target');
-
-              if (request === 'test' && $.getOpt('testTarget')) {
-                  target = $.getOpt('testTarget') === '/' ? $.getOpt('target') : $.getOpt('testTarget');
-              }
-
-              if (typeof target === 'function') {
-                  return target(params);
-              }
-
-              var separator = target.indexOf('?') < 0 ? '?': '&';
-              var joinedParams = params.join('&');
-
-              return target + separator + joinedParams;
-          }
-      };
-
-      /** 拖拽释放动作 */
-      var onDrop = function(e) {
-          // 从当前元素中移除拖拽样式
-          e.currentTarget.classList.remove($.getOpt('dragOverClass'));
-          // 停止拖拽事件
-          $h.stopEvent(e);
-
-          // handle dropped things as items if we can (this lets us deal with folders nicer in some cases)
-          if (e.dataTransfer && e.dataTransfer.items) {
-              loadFiles(e.dataTransfer.items, event);
-          }
-          // else handle them as files
-          else if (e.dataTransfer && e.dataTransfer.files) {
-              loadFiles(e.dataTransfer.files, event);
-          }
-      };
-      var onDragLeave = function(e) {
-          e.currentTarget.classList.remove($.getOpt('dragOverClass'));
-      };
-      var onDragOverEnter = function(e) {
-          e.preventDefault();
-          var dt = e.dataTransfer;
-          if ($.indexOf(dt.types, "Files") >= 0) { // only for file drop
-              e.stopPropagation();
-              dt.dropEffect = "copy";
-              dt.effectAllowed = "copy";
-              e.currentTarget.classList.add($.getOpt('dragOverClass'));
-          } else { // not work on IE/Edge....
-              dt.dropEffect = "none";
-              dt.effectAllowed = "none";
-          }
-      };
-
-      /**
-     * processes a single upload item (file or directory)
-     * @param {Object} item item to upload, may be file or directory entry
-     * @param {string} path current file path
-     * @param {File[]} items list of files to append new items to
-     * @param {Function} cb callback invoked when item is processed
-     */
-      function processItem(item, path, items, cb) {
-          var entry;
-          if (item.isFile) {
-              // file provided
-              return item.file(function(file) {
-                  file.relativePath = path + file.name;
-                  items.push(file);
-                  cb();
-              });
-          } else if (item.isDirectory) {
-              // item is already a directory entry, just assign
-              entry = item;
-          } else if (item instanceof File) {
-              items.push(item);
-          }
-          if ('function' === typeof item.webkitGetAsEntry) {
-              // get entry from file object
-              entry = item.webkitGetAsEntry();
-          }
-          if (entry && entry.isDirectory) {
-              // directory provided, process it
-              return processDirectory(entry, path + entry.name + '/', items, cb);
-          }
-          if ('function' === typeof item.getAsFile) {
-              // item represents a File object, convert it
-              item = item.getAsFile();
-              if (item instanceof File) {
-                  item.relativePath = path + item.name;
-                  items.push(item);
-              }
-          }
-          cb(); // indicate processing is done
-      }
-
-      /**
-     * cps-style list iteration.
-     * invokes all functions in list and waits for their callback to be
-     * triggered.
-     * @param  {Function[]}   items list of functions expecting callback parameter
-     * @param  {Function} cb    callback to trigger after the last callback has been invoked
-     */
-      function processCallbacks(items, cb) {
-          if (!items || items.length === 0) {
-              // empty or no list, invoke callback
-              return cb();
-          }
-          // invoke current function, pass the next part as continuation
-          items[0](function() {
-              processCallbacks(items.slice(1), cb);
-          });
-      }
-
-      /**
-     * recursively traverse directory and collect files to upload
-     * @param  {Object}   directory directory to process
-     * @param  {string}   path      current path
-     * @param  {File[]}   items     target list of items
-     * @param  {Function} cb        callback invoked after traversing directory
-     */
-      function processDirectory(directory, path, items, cb) {
-          var dirReader = directory.createReader();
-          var allEntries = [];
-
-          function readEntries() {
-              dirReader.readEntries(function(entries) {
-                  if (entries.length) {
-                      allEntries = allEntries.concat(entries);
-                      return readEntries();
-                  }
-
-                  // process all conversion callbacks, finally invoke own one
-                  processCallbacks(allEntries.map(function(entry) {
-                      // bind all properties except for callback
-                      return processItem.bind(null, entry, path, items);
-                  }), cb);
-              });
-          }
-
-          readEntries();
-      }
-
-      /**
-     * process items to extract files to be uploaded
-     * @param  {File[]} items items to process
-     * @param  {Event} event event that led to upload
-     */
-      function loadFiles(items, event) {
-          if (!items.length) {
-              return; // nothing to do
-          }
-          $.fire('beforeAdd');
-          var files = [];
-          processCallbacks(Array.prototype.map.call(items,
-          function(item) {
-              // bind all properties except for callback
-              return processItem.bind(null, item, "", files);
-          }),
-          function() {
-              if (files.length) {
-                  // at least one file found
-                  appendFilesFromFileList(files, event);
-              }
-          });
-      };
-
-      var appendFilesFromFileList = function(fileList, event) {
-          // check for uploading too many files
-          var errorCount = 0;
-          var o = $.getOpt(['maxFiles', 'minFileSize', 'maxFileSize', 'maxFilesErrorCallback', 'minFileSizeErrorCallback', 'maxFileSizeErrorCallback', 'fileType', 'fileTypeErrorCallback']);
-          if (typeof(o.maxFiles) !== 'undefined' && o.maxFiles < (fileList.length + $.files.length)) {
-              // if single-file upload, file is already added, and trying to add 1 new file, simply replace the already-added file
-              if (o.maxFiles === 1 && $.files.length === 1 && fileList.length === 1) {
-                  $.removeFile($.files[0]);
-              } else {
-                  o.maxFilesErrorCallback(fileList, errorCount++);
-                  return false;
-              }
-          }
-          var files = [],
-          filesSkipped = [],
-          remaining = fileList.length;
-          var decreaseReamining = function() {
-              if (!--remaining) {
-                  // all files processed, trigger event
-                  if (!files.length && !filesSkipped.length) {
-                      // no succeeded files, just skip
-                      return;
-                  }
-                  window.setTimeout(function() {
-                      $.fire('filesAdded', files, filesSkipped);
-                  },
-                  0);
-              }
-          };
-          $h.each(fileList,
-          function(file) {
-              var fileName = file.name;
-              var fileType = file.type; // e.g video/mp4
-              if (o.fileType.length > 0) {
-                  var fileTypeFound = false;
-                  for (var index in o.fileType) {
-                      // For good behaviour we do some inital sanitizing. Remove spaces and lowercase all
-                      o.fileType[index] = o.fileType[index].replace(/\s/g, '').toLowerCase();
-
-                      // Allowing for both [extension, .extension, mime/type, mime/*]
-                      var extension = ((o.fileType[index].match(/^[^.][^/] + $ / )) ? '.': '') + o.fileType[index];
-
-                      if ((fileName.substr( - 1 * extension.length).toLowerCase() === extension) ||
-                      //If MIME type, check for wildcard or if extension matches the files tiletype
-                      (extension.indexOf('/') !== -1 && ((extension.indexOf('*') !== -1 && fileType.substr(0, extension.indexOf('*')) === extension.substr(0, extension.indexOf('*'))) || fileType === extension))) {
-                          fileTypeFound = true;
-                          break;
-                      }
-                  }
-                  if (!fileTypeFound) {
-                      o.fileTypeErrorCallback(file, errorCount++);
-                      return true;
-                  }
-              }
-
-              if (typeof(o.minFileSize) !== 'undefined' && file.size < o.minFileSize) {
-                  o.minFileSizeErrorCallback(file, errorCount++);
-                  return true;
-              }
-              if (typeof(o.maxFileSize) !== 'undefined' && file.size > o.maxFileSize) {
-                  o.maxFileSizeErrorCallback(file, errorCount++);
-                  return true;
-              }
-
-              function addFile(uniqueIdentifier) {
-                  if (!$.getFromUniqueIdentifier(uniqueIdentifier)) { (function() {
-                          file.uniqueIdentifier = uniqueIdentifier;
-                          var f = new ResumableFile($, file, uniqueIdentifier);
-                          $.files.push(f);
-                          files.push(f);
-                          f.container = (typeof event != 'undefined' ? event.srcElement: null);
-                          window.setTimeout(function() {
-                              $.fire('fileAdded', f, event)
-                          },
-                          0);
-                      })()
-                  } else {
-                      filesSkipped.push(file);
-                  };
-                  decreaseReamining();
-              }
-              // directories have size == 0
-              var uniqueIdentifier = $h.generateUniqueIdentifier(file, event);
-              if (uniqueIdentifier && typeof uniqueIdentifier.then === 'function') {
-                  // Promise or Promise-like object provided as unique identifier
-                  uniqueIdentifier.then(function(uniqueIdentifier) {
-                      // unique identifier generation succeeded
-                      addFile(uniqueIdentifier);
-                  },
-                  function() {
-                      // unique identifier generation failed
-                      // skip further processing, only decrease file count
-                      decreaseReamining();
-                  });
-              } else {
-                  // non-Promise provided as unique identifier, process synchronously
-                  addFile(uniqueIdentifier);
-              }
-          });
-      };
-
-      // INTERNAL OBJECT TYPES
-      function ResumableFile(resumableObj, file, uniqueIdentifier) {
-          var $ = this;
-          $.opts = {};
-          $.getOpt = resumableObj.getOpt;
-          $._prevProgress = 0;
-          $.resumableObj = resumableObj;
-          $.file = file;
-          $.fileName = file.fileName || file.name; // Some confusion in different versions of Firefox
-          $.size = file.size;
-          $.relativePath = file.relativePath || file.webkitRelativePath || $.fileName;
-          $.uniqueIdentifier = uniqueIdentifier;
-          $._pause = false;
-          $.container = '';
-          $.preprocessState = 0; // 0 = unprocessed, 1 = processing, 2 = finished
-          var _error = uniqueIdentifier !== undefined;
-
-          // Callback when something happens within the chunk
-          var chunkEvent = function(event, message) {
-              // event can be 'progress', 'success', 'error' or 'retry'
-              switch (event) {
-              case 'progress':
-                  $.resumableObj.fire('fileProgress', $, message);
-                  break;
-              case 'error':
-                  $.abort();
-                  _error = true;
-                  $.chunks = [];
-                  $.resumableObj.fire('fileError', $, message);
-                  break;
-              case 'success':
-                  if (_error) return;
-                  $.resumableObj.fire('fileProgress', $, message); // it's at least progress
-                  if ($.isComplete()) {
-                      $.resumableObj.fire('fileSuccess', $, message);
-                  }
-                  break;
-              case 'retry':
-                  $.resumableObj.fire('fileRetry', $);
-                  break;
-              }
-          };
-
-          // Main code to set up a file object with chunks,
-          // packaged to be able to handle retries if needed.
-          $.chunks = [];
-          $.abort = function() {
-              // Stop current uploads
-              var abortCount = 0;
-              $h.each($.chunks,
-              function(c) {
-                  if (c.status() == 'uploading') {
-                      c.abort();
-                      abortCount++;
-                  }
-              });
-              if (abortCount > 0) $.resumableObj.fire('fileProgress', $);
-          };
-          $.cancel = function() {
-              // Reset this file to be void
-              var _chunks = $.chunks;
-              $.chunks = [];
-              // Stop current uploads
-              $h.each(_chunks, function(c) {
-                  if (c.status() == 'uploading') {
-                      c.abort();
-                      $.resumableObj.uploadNextChunk();
-                  }
-              });
-              // Set up request and listen for event
-              $.xhr = new XMLHttpRequest();
-              // Add data from the query options
-              var params = [['identifierParameterName='+$.uniqueIdentifier]];
-
-              // Append the relevant chunk and send it
-              $.xhr.open('DELETE', $h.getTarget('delete', params));
-              $.xhr.timeout = $.getOpt('xhrTimeout');
-              $.xhr.withCredentials = $.getOpt('withCredentials');
-              $.xhr.send(null);
-
-              $.resumableObj.removeFile($);
-              $.resumableObj.fire('fileProgress', $);
-          };
-          $.retry = function() {
-              $.bootstrap();
-              var firedRetry = false;
-              $.resumableObj.on('chunkingComplete',
-              function() {
-                  if (!firedRetry) $.resumableObj.upload();
-                  firedRetry = true;
-              });
-          };
-          $.bootstrap = function() {
-              $.abort();
-              _error = false;
-              // Rebuild stack of chunks from file
-              $.chunks = [];
-              $._prevProgress = 0;
-              var round = $.getOpt('forceChunkSize') ? Math.ceil: Math.floor;
-              var maxOffset = Math.max(round($.file.size / $.getOpt('chunkSize')), 1);
-              for (var offset = 0; offset < maxOffset; offset++) { (function(offset) {
-                      window.setTimeout(function() {
-                          $.chunks.push(new ResumableChunk($.resumableObj, $, offset, chunkEvent));
-                          $.resumableObj.fire('chunkingProgress', $, offset / maxOffset);
-                      },
-                      0);
-                  })(offset)
-              }
-              window.setTimeout(function() {
-                  $.resumableObj.fire('chunkingComplete', $);
-              },
-              0);
-          };
-          $.progress = function() {
-              if (_error) return (1);
-              // Sum up progress across everything
-              var ret = 0;
-              var error = false;
-              $h.each($.chunks,
-              function(c) {
-                  if (c.status() == 'error') error = true;
-                  ret += c.progress(true); // get chunk progress relative to entire file
-              });
-              ret = (error ? 1 : (ret > 0.99999 ? 1 : ret));
-              ret = Math.max($._prevProgress, ret); // We don't want to lose percentages when an upload is paused
-              $._prevProgress = ret;
-              return (ret);
-          };
-          $.isUploading = function() {
-              var uploading = false;
-              $h.each($.chunks,
-              function(chunk) {
-                  if (chunk.status() == 'uploading') {
-                      uploading = true;
-                      return (false);
-                  }
-              });
-              return (uploading);
-          };
-          $.isComplete = function() {
-              var outstanding = false;
-              if ($.preprocessState === 1) {
-                  return (false);
-              }
-              $h.each($.chunks,
-              function(chunk) {
-                  var status = chunk.status();
-                  if (status == 'pending' || status == 'uploading' || chunk.preprocessState === 1) {
-                      outstanding = true;
-                      return (false);
-                  }
-              });
-              return (!outstanding);
-          };
-          $.pause = function(pause) {
-              if (typeof(pause) === 'undefined') {
-                  $._pause = ($._pause ? false: true);
-              } else {
-                  $._pause = pause;
-              }
-          };
-          $.isPaused = function() {
-              return $._pause;
-          };
-          $.preprocessFinished = function() {
-              $.preprocessState = 2;
-              $.upload();
-          };
-          $.upload = function() {
-              var found = false;
-              if ($.isPaused() === false) {
-                  var preprocess = $.getOpt('preprocessFile');
-                  if (typeof preprocess === 'function') {
-                      switch ($.preprocessState) {
-                      case 0:
-                          $.preprocessState = 1;
-                          preprocess($);
-                          return (true);
-                      case 1:
-                          return (true);
-                      case 2:
-                          break;
-                      }
-                  }
-                  $h.each($.chunks,
-                  function(chunk) {
-                      if (chunk.status() == 'pending' && chunk.preprocessState !== 1) {
-                          chunk.send();
-                          found = true;
-                          return (false);
-                      }
-                  });
-              }
-              return (found);
-          }
-          $.markChunksCompleted = function(chunkNumber) {
-              if (!$.chunks || $.chunks.length <= chunkNumber) {
-                  return;
-              }
-              for (var num = 0; num < chunkNumber; num++) {
-                  $.chunks[num].markComplete = true;
-              }
-          };
-
-          // Bootstrap and return
-          $.resumableObj.fire('chunkingStart', $);
-          $.bootstrap();
-          return (this);
-      }
-
-      function ResumableChunk(resumableObj, fileObj, offset, callback) {
-          var $ = this;
-          $.opts = {};
-          $.getOpt = resumableObj.getOpt;
-          $.resumableObj = resumableObj;
-          $.fileObj = fileObj;
-          $.fileObjSize = fileObj.size;
-          $.fileObjType = fileObj.file.type;
-          $.offset = offset;
-          $.callback = callback;
-          $.lastProgressCallback = (new Date);
-          $.tested = false;
-          $.retries = 0;
-          $.pendingRetry = false;
-          $.preprocessState = 0; // 0 = unprocessed, 1 = processing, 2 = finished
-          $.markComplete = false;
-
-          // Computed properties
-          var chunkSize = $.getOpt('chunkSize');
-          $.loaded = 0;
-          $.startByte = $.offset * chunkSize;
-          $.endByte = Math.min($.fileObjSize, ($.offset + 1) * chunkSize);
-          if ($.fileObjSize - $.endByte < chunkSize && !$.getOpt('forceChunkSize')) {
-              // The last chunk will be bigger than the chunk size, but less than 2*chunkSize
-              $.endByte = $.fileObjSize;
-          }
-          $.xhr = null;
-
-          // test() makes a GET request without any data to see if the chunk has already been uploaded in a previous session
-          $.test = function() {
-              // Set up request and listen for event
-              $.xhr = new XMLHttpRequest();
-
-              var testHandler = function(e) {
-                  $.tested = true;
-                  if (e.target.responseText === 'true') {
-                      $.callback($.status(), $.message());
-                      $.resumableObj.uploadNextChunk();
-                  } else {
-                      $.send();
-                  }
-              };
-              $.xhr.addEventListener('load', testHandler, false);
-              $.xhr.addEventListener('error', testHandler, false);
-              $.xhr.addEventListener('timeout', testHandler, false);
-
-              // Add data from the query options
-              var params = [];
-              var parameterNamespace = $.getOpt('parameterNamespace');
-              var customQuery = $.getOpt('query');
-              if (typeof customQuery == 'function') customQuery = customQuery($.fileObj, $);
-              $h.each(customQuery,
-              function(k, v) {
-                  params.push([encodeURIComponent(parameterNamespace + k), encodeURIComponent(v)].join('='));
-              });
-              // Add extra data to identify chunk
-              params = params.concat([
-              // define key/value pairs for additional parameters
-              ['chunkNumberParameterName', $.offset + 1], ['chunkSizeParameterName', $.getOpt('chunkSize')], ['currentChunkSizeParameterName', $.endByte - $.startByte], ['totalSizeParameterName', $.fileObjSize], ['typeParameterName', $.fileObjType], ['identifierParameterName', $.fileObj.uniqueIdentifier], ['fileNameParameterName', $.fileObj.fileName], ['relativePathParameterName', $.fileObj.relativePath], ['totalChunksParameterName', $.fileObj.chunks.length]].filter(function(pair) {
-                  // include items that resolve to truthy values
-                  // i.e. exclude false, null, undefined and empty strings
-                  return $.getOpt(pair[0]);
-              }).map(function(pair) {
-                  // map each key/value pair to its final form
-                  return [parameterNamespace + $.getOpt(pair[0]), encodeURIComponent(pair[1])].join('=');
-              }));
-              // Append the relevant chunk and send it
-              $.xhr.open($.getOpt('testMethod'), $h.getTarget('test', params));
-              $.xhr.timeout = $.getOpt('xhrTimeout');
-              $.xhr.withCredentials = $.getOpt('withCredentials');
-              // Add data from header options
-              var customHeaders = $.getOpt('headers');
-              if (typeof customHeaders === 'function') {
-                  customHeaders = customHeaders($.fileObj, $);
-              }
-              $h.each(customHeaders, function(k, v) {
-                  $.xhr.setRequestHeader(k, v);
-              });
-              $.xhr.send(null);
-          };
-
-          $.preprocessFinished = function() {
-              $.preprocessState = 2;
-              $.send();
-          };
-
-          // send() uploads the actual data in a POST call
-          $.send = function() {
-              var preprocess = $.getOpt('preprocess');
-              if (typeof preprocess === 'function') {
-                  switch ($.preprocessState) {
-                  case 0:
-                      $.preprocessState = 1;
-                      preprocess($);
-                      return;
-                  case 1:
-                      return;
-                  case 2:
-                      break;
-                  }
-              }
-              if ($.getOpt('testChunks') && !$.tested) {
-                  $.test();
-                  return;
-              }
-
-              // Set up request and listen for event
-              $.xhr = new XMLHttpRequest();
-
-              // Progress
-              $.xhr.upload.addEventListener('progress',
-              function(e) {
-                  if ((new Date) - $.lastProgressCallback > $.getOpt('throttleProgressCallbacks') * 1000) {
-                      $.callback('progress');
-                      $.lastProgressCallback = (new Date);
-                  }
-                  $.loaded = e.loaded || 0;
-              },
-              false);
-              $.loaded = 0;
-              $.pendingRetry = false;
-              $.callback('progress');
-
-              // Done (either done, failed or retry)
-              var doneHandler = function(e) {
-                  var status = $.status();
-
-                  if (status == 'success' || status == 'error') {
-                      $.callback(status, $.message());
-                      $.resumableObj.uploadNextChunk();
-                  } else if (!$.fileObj.isPaused()) {
-                      $.callback('retry', $.message());
-                      $.abort();
-                      $.retries++;
-                      var retryInterval = $.getOpt('chunkRetryInterval');
-                      if (retryInterval !== undefined) {
-                          $.pendingRetry = true;
-                          setTimeout($.send, retryInterval);
-                      } else {
-                          $.send();
-                      }
-                  }
-              };
-              $.xhr.addEventListener('load', doneHandler, false);
-              $.xhr.addEventListener('error', doneHandler, false);
-              $.xhr.addEventListener('timeout', doneHandler, false);
-
-              // Set up the basic query data from Resumable
-              var query = [['chunkNumberParameterName', $.offset + 1], ['chunkSizeParameterName', $.getOpt('chunkSize')], ['currentChunkSizeParameterName', $.endByte - $.startByte], ['totalSizeParameterName', $.fileObjSize], ['typeParameterName', $.fileObjType], ['identifierParameterName', $.fileObj.uniqueIdentifier], ['fileNameParameterName', $.fileObj.fileName], ['relativePathParameterName', $.fileObj.relativePath], ['totalChunksParameterName', $.fileObj.chunks.length], ].filter(function(pair) {
-                  // include items that resolve to truthy values
-                  // i.e. exclude false, null, undefined and empty strings
-                  return $.getOpt(pair[0]);
-              }).reduce(function(query, pair) {
-                  // assign query key/value
-                  query[$.getOpt(pair[0])] = pair[1];
-                  return query;
-              },
-              {});
-              // Mix in custom data
-              var customQuery = $.getOpt('query');
-              if (typeof customQuery == 'function') customQuery = customQuery($.fileObj, $);
-              $h.each(customQuery,
-              function(k, v) {
-                  query[k] = v;
-              });
-
-              var func = ($.fileObj.file.slice ? 'slice': ($.fileObj.file.mozSlice ? 'mozSlice': ($.fileObj.file.webkitSlice ? 'webkitSlice': 'slice')));
-              var bytes = $.fileObj.file[func]($.startByte, $.endByte, $.getOpt('setChunkTypeFromFile') ? $.fileObj.file.type: "");
-              var data = null;
-              var params = [];
-
-              var parameterNamespace = $.getOpt('parameterNamespace');
-              if ($.getOpt('method') === 'octet') {
-                  // Add data from the query options
-                  data = bytes;
-                  $h.each(query,
-                  function(k, v) {
-                      params.push([encodeURIComponent(parameterNamespace + k), encodeURIComponent(v)].join('='));
-                  });
-              } else {
-                  // Add data from the query options
-                  data = new FormData();
-                  $h.each(query,
-                  function(k, v) {
-                      data.append(parameterNamespace + k, v);
-                      // 文件上传不支持 GET 方式， 这段拼接url的代码取消
-                      // params.push([encodeURIComponent(parameterNamespace + k), encodeURIComponent(v)].join('='));
-                  });
-                  if ($.getOpt('chunkFormat') == 'blob') {
-                      data.append(parameterNamespace + $.getOpt('fileParameterName'), bytes, $.fileObj.fileName);
-                  } else if ($.getOpt('chunkFormat') == 'base64') {
-                      var fr = new FileReader();
-                      fr.onload = function(e) {
-                          data.append(parameterNamespace + $.getOpt('fileParameterName'), fr.result);
-                          $.xhr.send(data);
-                      }
-                      fr.readAsDataURL(bytes);
-                  }
-              }
-
-              var target = $h.getTarget('upload', params);
-              var method = $.getOpt('uploadMethod');
-
-              $.xhr.open(method, target);
-              if ($.getOpt('method') === 'octet') {
-                  $.xhr.setRequestHeader('Content-Type', 'application/octet-stream');
-              }
-              $.xhr.timeout = $.getOpt('xhrTimeout');
-              $.xhr.withCredentials = $.getOpt('withCredentials');
-              // Add data from header options
-              var customHeaders = $.getOpt('headers');
-              if (typeof customHeaders === 'function') {
-                  customHeaders = customHeaders($.fileObj, $);
-              }
-              $h.each(customHeaders, function(k, v) {
-                  $.xhr.setRequestHeader(k, v);
-              });
-
-              if ($.getOpt('chunkFormat') == 'blob') {
-                  $.xhr.send(data);
-              }
-          };
-          $.abort = function() {
-              // Abort and reset
-              if ($.xhr) $.xhr.abort();
-              $.xhr = null;
-          };
-          $.status = function() {
-              // Returns: 'pending', 'uploading', 'success', 'error'
-              if ($.pendingRetry) {
-                  // if pending retry then that's effectively the same as actively uploading,
-                  // there might just be a slight delay before the retry starts
-                  return ('uploading');
-              } else if ($.markComplete) {
-                  return 'success';
-              } else if (!$.xhr) {
-                  return ('pending');
-              } else if ($.xhr.readyState < 4) {
-                  // Status is really 'OPENED', 'HEADERS_RECEIVED' or 'LOADING' - meaning that stuff is happening
-                  return ('uploading');
-              } else {
-                  if ($.xhr.status == 200 || $.xhr.status == 201) {
-                      // HTTP 200, 201 (created)
-                      return ('success');
-                  } else if ($h.contains($.getOpt('permanentErrors'), $.xhr.status) || $.retries >= $.getOpt('maxChunkRetries')) {
-                      // HTTP 400, 404, 409, 415, 500, 501 (permanent error)
-                      return ('error');
-                  } else {
-                      // this should never happen, but we'll reset and queue a retry
-                      // a likely case for this would be 503 service unavailable
-                      $.abort();
-                      return ('pending');
-                  }
-              }
-          };
-          $.message = function() {
-              return ($.xhr ? $.xhr.responseText: '');
-          };
-          $.progress = function(relative) {
-              if (typeof(relative) === 'undefined') relative = false;
-              var factor = (relative ? ($.endByte - $.startByte) / $.fileObjSize: 1);
-              if ($.pendingRetry) return (0);
-              if ((!$.xhr || !$.xhr.status) && !$.markComplete) factor *= .95;
-              var s = $.status();
-              switch (s) {
-              case 'success':
-              case 'error':
-                  return (1 * factor);
-              case 'pending':
-                  return (0 * factor);
-              default:
-                  return ($.loaded / ($.endByte - $.startByte) * factor);
-              }
-          };
-          return (this);
-      }
-
-      // QUEUE
-      $.uploadNextChunk = function() {
-          var found = false;
-
-          // In some cases (such as videos) it's really handy to upload the first
-          // and last chunk of a file quickly; this let's the server check the file's
-          // metadata and determine if there's even a point in continuing.
-          if ($.getOpt('prioritizeFirstAndLastChunk')) {
-              $h.each($.files,
-              function(file) {
-                  if (file.chunks.length && file.chunks[0].status() == 'pending' && file.chunks[0].preprocessState === 0) {
-                      file.chunks[0].send();
-                      found = true;
-                      return (false);
-                  }
-                  if (file.chunks.length > 1 && file.chunks[file.chunks.length - 1].status() == 'pending' && file.chunks[file.chunks.length - 1].preprocessState === 0) {
-                      file.chunks[file.chunks.length - 1].send();
-                      found = true;
-                      return (false);
-                  }
-              });
-              if (found) return (true);
-          }
-
-          // Now, simply look for the next, best thing to upload
-          $h.each($.files,
-          function(file) {
-              found = file.upload();
-              if (found) return (false);
-          });
-          if (found) return (true);
-
-          // The are no more outstanding chunks to upload, check is everything is done
-          var outstanding = false;
-          $h.each($.files,
-          function(file) {
-              if (!file.isComplete()) {
-                  outstanding = true;
-                  return (false);
-              }
-          });
-          if (!outstanding) {
-              // All chunks have been uploaded, complete
-              $.fire('complete');
-          }
-          return (false);
-      };
-
-      /**
-       * 绑定dom组件
-       * 
-       * @param {*} domNodes 
-       * @param {*} isDirectory 
-       */
-      $.assignBrowse = function(domNodes) {
-          // 保持入参的格式一致性，如果调用者只传入的单一的对象，我们也要将其转换成数组统一处理
-          if (typeof(domNodes.length) == 'undefined') domNodes = [domNodes];
-          $h.each(domNodes, domNode => {
-              var input;
-              if (domNode.tagName === 'INPUT' && domNode.type === 'file') {
-                  input = domNode;
-              } else {
-                  input = document.createElement('input');
-                  input.setAttribute('type', 'file');
-                  input.style.display = 'none';
-
-                  // 隐藏html上传控件，通过自定义父的事件传播来控制上传
-                  domNode.addEventListener('click', () => {
-                      // 设置可上传文件类型
-                      input.setAttribute('accept', domNode.getAttribute('accept'));
-
-                      // 为兼容各浏览器的组件隐藏方式，采用冗余方案就行配置
-                      input.style.opacity = 0;
-                      input.style.display = 'block';
-                      input.focus();
-                      input.click();
-                      input.style.display = 'none';
-                  }, false);
-                  domNode.appendChild(input);
-              }
-              var maxFiles = $.getOpt('maxFiles');
-              if (typeof(maxFiles) === 'undefined' || maxFiles != 1) {
-                  input.setAttribute('multiple', 'multiple');
-              } else {
-                  input.removeAttribute('multiple');
-              }
-              // When new files are added, simply append them to the overall list
-              input.addEventListener('change', e => {
-                  appendFilesFromFileList(e.target.files, e);
-                  if ($.getOpt('clearInput')) { e.target.value = ''; }
-              }, false);
-          });
-      }; $.assignDrop = function(domNodes) {
-          if (typeof(domNodes.length) == 'undefined') domNodes = [domNodes];
-
-          $h.each(domNodes,
-          function(domNode) {
-              domNode.addEventListener('dragover', onDragOverEnter, false);
-              domNode.addEventListener('dragenter', onDragOverEnter, false);
-              domNode.addEventListener('dragleave', onDragLeave, false);
-              domNode.addEventListener('drop', onDrop, false);
-          });
-      }; $.unAssignDrop = function(domNodes) {
-          if (typeof(domNodes.length) == 'undefined') domNodes = [domNodes];
-
-          $h.each(domNodes,
-          function(domNode) {
-              domNode.removeEventListener('dragover', onDragOverEnter);
-              domNode.removeEventListener('dragenter', onDragOverEnter);
-              domNode.removeEventListener('dragleave', onDragLeave);
-              domNode.removeEventListener('drop', onDrop);
-          });
-      }; $.isUploading = function() {
-          var uploading = false;
-          $h.each($.files,
-          function(file) {
-              if (file.isUploading()) {
-                  uploading = true;
-                  return (false);
-              }
-          });
-          return (uploading);
-      }; $.upload = function() {
-          // Make sure we don't start too many uploads at once
-          if ($.isUploading()) return;
-          // Kick off the queue
-          $.fire('uploadStart');
-          for (var num = 1; num <= $.getOpt('simultaneousUploads'); num++) {
-              $.uploadNextChunk();
-          }
-      }; $.pause = function() {
-          // Resume all chunks currently being uploaded
-          $h.each($.files,
-          function(file) {
-              file.abort();
-          });
-          $.fire('pause');
-      }; $.cancel = function() {
-          $.fire('beforeCancel');
-          for (var i = $.files.length - 1; i >= 0; i--) {
-              $.files[i].cancel();
-          }
-          $.fire('cancel');
-      }; $.progress = function() {
-          var totalDone = 0;
-          var totalSize = 0;
-          // Resume all chunks currently being uploaded
-          $h.each($.files,
-          function(file) {
-              totalDone += file.progress() * file.size;
-              totalSize += file.size;
-          });
-          return (totalSize > 0 ? totalDone / totalSize: 0);
-      }; $.addFile = function(file, event) {
-          appendFilesFromFileList([file], event);
-      }; $.addFiles = function(files, event) {
-          appendFilesFromFileList(files, event);
-      }; $.removeFile = function(file) {
-          for (var i = $.files.length - 1; i >= 0; i--) {
-              if ($.files[i] === file) {
-                  $.files.splice(i, 1);
-              }
-          }
-      }; $.getFromUniqueIdentifier = function(uniqueIdentifier) {
-          var ret = false;
-          $h.each($.files,
-          function(f) {
-              if (f.uniqueIdentifier == uniqueIdentifier) ret = f;
-          });
-          return (ret);
-      }; $.getSize = function() {
-          var totalSize = 0;
-          $h.each($.files,
-          function(file) {
-              totalSize += file.size;
-          });
-          return (totalSize);
-      }; $.handleDropEvent = function(e) {
-          onDrop(e);
-      }; $.handleChangeEvent = function(e) {
-          appendFilesFromFileList(e.target.files, e);
-          e.target.value = '';
-      }; $.updateQuery = function(query) {
-          $.opts.query = query;
-      };
-
-      return (this);
-  };
-
-  // Node.js-style export for Node and Component
-  if (typeof module != 'undefined') {
-      module.exports = Resumable;
-  } else if (typeof define === "function" && define.amd) {
-      // AMD/requirejs: Define the module
-      define(function() {
-          return Resumable;
-      });
-  } else {
-      // Browser: Expose to window
-      window.Resumable = Resumable;
-  }
-
-})();
\ No newline at end of file
diff --git a/src/components/Upload/service.ts b/src/components/Upload/service.ts
deleted file mode 100644
index 6f9f30b..0000000
--- a/src/components/Upload/service.ts
+++ /dev/null
@@ -1,14 +0,0 @@
- import request from '@/utils/request';
-
-export async function getCurrentTime(id: any) { // 获取当前时间戳
-  return request('/api/biz-service-ebtp-extend/v1/timeService/getServiceTime', {
-    method: 'get',
-  });
-}
-
-export async function getTendererFileStatus(data: any) { // 查看是否已经上传投标文件
-  return request('/api/biz-service-ebtp-resps/v1/tfile/getTendererFileStatus', {
-    method: 'post',
-    data: data
-  });
-}
diff --git a/src/components/Upload/spark-md5.js b/src/components/Upload/spark-md5.js
deleted file mode 100644
index f18052f..0000000
--- a/src/components/Upload/spark-md5.js
+++ /dev/null
@@ -1,751 +0,0 @@
-(function (factory) {
-    if (typeof exports === 'object') {
-        // Node/CommonJS
-        module.exports = factory();
-    } else if (typeof define === 'function' && define.amd) {
-        // AMD
-        define(factory);
-    } else {
-        // Browser globals (with support for web workers)
-        var glob;
-
-        try {
-            glob = window;
-        } catch (e) {
-            glob = self;
-        }
-
-        glob.SparkMD5 = factory();
-    }
-}(function (undefined) {
-
-    'use strict';
-
-    /*
-     * Fastest md5 implementation around (JKM md5).
-     * Credits: Joseph Myers
-     *
-     * @see http://www.myersdaily.org/joseph/javascript/md5-text.html
-     * @see http://jsperf.com/md5-shootout/7
-     */
-
-    /* this function is much faster,
-      so if possible we use it. Some IEs
-      are the only ones I know of that
-      need the idiotic second function,
-      generated by an if clause.  */
-    var add32 = function (a, b) {
-        return (a + b) & 0xFFFFFFFF;
-    },
-        hex_chr = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'];
-
-
-    function cmn(q, a, b, x, s, t) {
-        a = add32(add32(a, q), add32(x, t));
-        return add32((a << s) | (a >>> (32 - s)), b);
-    }
-
-    function md5cycle(x, k) {
-        var a = x[0],
-            b = x[1],
-            c = x[2],
-            d = x[3];
-
-        a += (b & c | ~b & d) + k[0] - 680876936 | 0;
-        a  = (a << 7 | a >>> 25) + b | 0;
-        d += (a & b | ~a & c) + k[1] - 389564586 | 0;
-        d  = (d << 12 | d >>> 20) + a | 0;
-        c += (d & a | ~d & b) + k[2] + 606105819 | 0;
-        c  = (c << 17 | c >>> 15) + d | 0;
-        b += (c & d | ~c & a) + k[3] - 1044525330 | 0;
-        b  = (b << 22 | b >>> 10) + c | 0;
-        a += (b & c | ~b & d) + k[4] - 176418897 | 0;
-        a  = (a << 7 | a >>> 25) + b | 0;
-        d += (a & b | ~a & c) + k[5] + 1200080426 | 0;
-        d  = (d << 12 | d >>> 20) + a | 0;
-        c += (d & a | ~d & b) + k[6] - 1473231341 | 0;
-        c  = (c << 17 | c >>> 15) + d | 0;
-        b += (c & d | ~c & a) + k[7] - 45705983 | 0;
-        b  = (b << 22 | b >>> 10) + c | 0;
-        a += (b & c | ~b & d) + k[8] + 1770035416 | 0;
-        a  = (a << 7 | a >>> 25) + b | 0;
-        d += (a & b | ~a & c) + k[9] - 1958414417 | 0;
-        d  = (d << 12 | d >>> 20) + a | 0;
-        c += (d & a | ~d & b) + k[10] - 42063 | 0;
-        c  = (c << 17 | c >>> 15) + d | 0;
-        b += (c & d | ~c & a) + k[11] - 1990404162 | 0;
-        b  = (b << 22 | b >>> 10) + c | 0;
-        a += (b & c | ~b & d) + k[12] + 1804603682 | 0;
-        a  = (a << 7 | a >>> 25) + b | 0;
-        d += (a & b | ~a & c) + k[13] - 40341101 | 0;
-        d  = (d << 12 | d >>> 20) + a | 0;
-        c += (d & a | ~d & b) + k[14] - 1502002290 | 0;
-        c  = (c << 17 | c >>> 15) + d | 0;
-        b += (c & d | ~c & a) + k[15] + 1236535329 | 0;
-        b  = (b << 22 | b >>> 10) + c | 0;
-
-        a += (b & d | c & ~d) + k[1] - 165796510 | 0;
-        a  = (a << 5 | a >>> 27) + b | 0;
-        d += (a & c | b & ~c) + k[6] - 1069501632 | 0;
-        d  = (d << 9 | d >>> 23) + a | 0;
-        c += (d & b | a & ~b) + k[11] + 643717713 | 0;
-        c  = (c << 14 | c >>> 18) + d | 0;
-        b += (c & a | d & ~a) + k[0] - 373897302 | 0;
-        b  = (b << 20 | b >>> 12) + c | 0;
-        a += (b & d | c & ~d) + k[5] - 701558691 | 0;
-        a  = (a << 5 | a >>> 27) + b | 0;
-        d += (a & c | b & ~c) + k[10] + 38016083 | 0;
-        d  = (d << 9 | d >>> 23) + a | 0;
-        c += (d & b | a & ~b) + k[15] - 660478335 | 0;
-        c  = (c << 14 | c >>> 18) + d | 0;
-        b += (c & a | d & ~a) + k[4] - 405537848 | 0;
-        b  = (b << 20 | b >>> 12) + c | 0;
-        a += (b & d | c & ~d) + k[9] + 568446438 | 0;
-        a  = (a << 5 | a >>> 27) + b | 0;
-        d += (a & c | b & ~c) + k[14] - 1019803690 | 0;
-        d  = (d << 9 | d >>> 23) + a | 0;
-        c += (d & b | a & ~b) + k[3] - 187363961 | 0;
-        c  = (c << 14 | c >>> 18) + d | 0;
-        b += (c & a | d & ~a) + k[8] + 1163531501 | 0;
-        b  = (b << 20 | b >>> 12) + c | 0;
-        a += (b & d | c & ~d) + k[13] - 1444681467 | 0;
-        a  = (a << 5 | a >>> 27) + b | 0;
-        d += (a & c | b & ~c) + k[2] - 51403784 | 0;
-        d  = (d << 9 | d >>> 23) + a | 0;
-        c += (d & b | a & ~b) + k[7] + 1735328473 | 0;
-        c  = (c << 14 | c >>> 18) + d | 0;
-        b += (c & a | d & ~a) + k[12] - 1926607734 | 0;
-        b  = (b << 20 | b >>> 12) + c | 0;
-
-        a += (b ^ c ^ d) + k[5] - 378558 | 0;
-        a  = (a << 4 | a >>> 28) + b | 0;
-        d += (a ^ b ^ c) + k[8] - 2022574463 | 0;
-        d  = (d << 11 | d >>> 21) + a | 0;
-        c += (d ^ a ^ b) + k[11] + 1839030562 | 0;
-        c  = (c << 16 | c >>> 16) + d | 0;
-        b += (c ^ d ^ a) + k[14] - 35309556 | 0;
-        b  = (b << 23 | b >>> 9) + c | 0;
-        a += (b ^ c ^ d) + k[1] - 1530992060 | 0;
-        a  = (a << 4 | a >>> 28) + b | 0;
-        d += (a ^ b ^ c) + k[4] + 1272893353 | 0;
-        d  = (d << 11 | d >>> 21) + a | 0;
-        c += (d ^ a ^ b) + k[7] - 155497632 | 0;
-        c  = (c << 16 | c >>> 16) + d | 0;
-        b += (c ^ d ^ a) + k[10] - 1094730640 | 0;
-        b  = (b << 23 | b >>> 9) + c | 0;
-        a += (b ^ c ^ d) + k[13] + 681279174 | 0;
-        a  = (a << 4 | a >>> 28) + b | 0;
-        d += (a ^ b ^ c) + k[0] - 358537222 | 0;
-        d  = (d << 11 | d >>> 21) + a | 0;
-        c += (d ^ a ^ b) + k[3] - 722521979 | 0;
-        c  = (c << 16 | c >>> 16) + d | 0;
-        b += (c ^ d ^ a) + k[6] + 76029189 | 0;
-        b  = (b << 23 | b >>> 9) + c | 0;
-        a += (b ^ c ^ d) + k[9] - 640364487 | 0;
-        a  = (a << 4 | a >>> 28) + b | 0;
-        d += (a ^ b ^ c) + k[12] - 421815835 | 0;
-        d  = (d << 11 | d >>> 21) + a | 0;
-        c += (d ^ a ^ b) + k[15] + 530742520 | 0;
-        c  = (c << 16 | c >>> 16) + d | 0;
-        b += (c ^ d ^ a) + k[2] - 995338651 | 0;
-        b  = (b << 23 | b >>> 9) + c | 0;
-
-        a += (c ^ (b | ~d)) + k[0] - 198630844 | 0;
-        a  = (a << 6 | a >>> 26) + b | 0;
-        d += (b ^ (a | ~c)) + k[7] + 1126891415 | 0;
-        d  = (d << 10 | d >>> 22) + a | 0;
-        c += (a ^ (d | ~b)) + k[14] - 1416354905 | 0;
-        c  = (c << 15 | c >>> 17) + d | 0;
-        b += (d ^ (c | ~a)) + k[5] - 57434055 | 0;
-        b  = (b << 21 |b >>> 11) + c | 0;
-        a += (c ^ (b | ~d)) + k[12] + 1700485571 | 0;
-        a  = (a << 6 | a >>> 26) + b | 0;
-        d += (b ^ (a | ~c)) + k[3] - 1894986606 | 0;
-        d  = (d << 10 | d >>> 22) + a | 0;
-        c += (a ^ (d | ~b)) + k[10] - 1051523 | 0;
-        c  = (c << 15 | c >>> 17) + d | 0;
-        b += (d ^ (c | ~a)) + k[1] - 2054922799 | 0;
-        b  = (b << 21 |b >>> 11) + c | 0;
-        a += (c ^ (b | ~d)) + k[8] + 1873313359 | 0;
-        a  = (a << 6 | a >>> 26) + b | 0;
-        d += (b ^ (a | ~c)) + k[15] - 30611744 | 0;
-        d  = (d << 10 | d >>> 22) + a | 0;
-        c += (a ^ (d | ~b)) + k[6] - 1560198380 | 0;
-        c  = (c << 15 | c >>> 17) + d | 0;
-        b += (d ^ (c | ~a)) + k[13] + 1309151649 | 0;
-        b  = (b << 21 |b >>> 11) + c | 0;
-        a += (c ^ (b | ~d)) + k[4] - 145523070 | 0;
-        a  = (a << 6 | a >>> 26) + b | 0;
-        d += (b ^ (a | ~c)) + k[11] - 1120210379 | 0;
-        d  = (d << 10 | d >>> 22) + a | 0;
-        c += (a ^ (d | ~b)) + k[2] + 718787259 | 0;
-        c  = (c << 15 | c >>> 17) + d | 0;
-        b += (d ^ (c | ~a)) + k[9] - 343485551 | 0;
-        b  = (b << 21 | b >>> 11) + c | 0;
-
-        x[0] = a + x[0] | 0;
-        x[1] = b + x[1] | 0;
-        x[2] = c + x[2] | 0;
-        x[3] = d + x[3] | 0;
-    }
-
-    function md5blk(s) {
-        var md5blks = [],
-            i; /* Andy King said do it this way. */
-
-        for (i = 0; i < 64; i += 4) {
-            md5blks[i >> 2] = s.charCodeAt(i) + (s.charCodeAt(i + 1) << 8) + (s.charCodeAt(i + 2) << 16) + (s.charCodeAt(i + 3) << 24);
-        }
-        return md5blks;
-    }
-
-    function md5blk_array(a) {
-        var md5blks = [],
-            i; /* Andy King said do it this way. */
-
-        for (i = 0; i < 64; i += 4) {
-            md5blks[i >> 2] = a[i] + (a[i + 1] << 8) + (a[i + 2] << 16) + (a[i + 3] << 24);
-        }
-        return md5blks;
-    }
-
-    function md51(s) {
-        var n = s.length,
-            state = [1732584193, -271733879, -1732584194, 271733878],
-            i,
-            length,
-            tail,
-            tmp,
-            lo,
-            hi;
-
-        for (i = 64; i <= n; i += 64) {
-            md5cycle(state, md5blk(s.substring(i - 64, i)));
-        }
-        s = s.substring(i - 64);
-        length = s.length;
-        tail = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-        for (i = 0; i < length; i += 1) {
-            tail[i >> 2] |= s.charCodeAt(i) << ((i % 4) << 3);
-        }
-        tail[i >> 2] |= 0x80 << ((i % 4) << 3);
-        if (i > 55) {
-            md5cycle(state, tail);
-            for (i = 0; i < 16; i += 1) {
-                tail[i] = 0;
-            }
-        }
-
-        // Beware that the final length might not fit in 32 bits so we take care of that
-        tmp = n * 8;
-        tmp = tmp.toString(16).match(/(.*?)(.{0,8})$/);
-        lo = parseInt(tmp[2], 16);
-        hi = parseInt(tmp[1], 16) || 0;
-
-        tail[14] = lo;
-        tail[15] = hi;
-
-        md5cycle(state, tail);
-        return state;
-    }
-
-    function md51_array(a) {
-        var n = a.length,
-            state = [1732584193, -271733879, -1732584194, 271733878],
-            i,
-            length,
-            tail,
-            tmp,
-            lo,
-            hi;
-
-        for (i = 64; i <= n; i += 64) {
-            md5cycle(state, md5blk_array(a.subarray(i - 64, i)));
-        }
-
-        // Not sure if it is a bug, however IE10 will always produce a sub array of length 1
-        // containing the last element of the parent array if the sub array specified starts
-        // beyond the length of the parent array - weird.
-        // https://connect.microsoft.com/IE/feedback/details/771452/typed-array-subarray-issue
-        a = (i - 64) < n ? a.subarray(i - 64) : new Uint8Array(0);
-
-        length = a.length;
-        tail = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-        for (i = 0; i < length; i += 1) {
-            tail[i >> 2] |= a[i] << ((i % 4) << 3);
-        }
-
-        tail[i >> 2] |= 0x80 << ((i % 4) << 3);
-        if (i > 55) {
-            md5cycle(state, tail);
-            for (i = 0; i < 16; i += 1) {
-                tail[i] = 0;
-            }
-        }
-
-        // Beware that the final length might not fit in 32 bits so we take care of that
-        tmp = n * 8;
-        tmp = tmp.toString(16).match(/(.*?)(.{0,8})$/);
-        lo = parseInt(tmp[2], 16);
-        hi = parseInt(tmp[1], 16) || 0;
-
-        tail[14] = lo;
-        tail[15] = hi;
-
-        md5cycle(state, tail);
-
-        return state;
-    }
-
-    function rhex(n) {
-        var s = '',
-            j;
-        for (j = 0; j < 4; j += 1) {
-            s += hex_chr[(n >> (j * 8 + 4)) & 0x0F] + hex_chr[(n >> (j * 8)) & 0x0F];
-        }
-        return s;
-    }
-
-    function hex(x) {
-        var i;
-        for (i = 0; i < x.length; i += 1) {
-            x[i] = rhex(x[i]);
-        }
-        return x.join('');
-    }
-
-    // In some cases the fast add32 function cannot be used..
-    if (hex(md51('hello')) !== '5d41402abc4b2a76b9719d911017c592') {
-        add32 = function (x, y) {
-            var lsw = (x & 0xFFFF) + (y & 0xFFFF),
-                msw = (x >> 16) + (y >> 16) + (lsw >> 16);
-            return (msw << 16) | (lsw & 0xFFFF);
-        };
-    }
-
-    // ---------------------------------------------------
-
-    /**
-     * ArrayBuffer slice polyfill.
-     *
-     * @see https://github.com/ttaubert/node-arraybuffer-slice
-     */
-
-    if (typeof ArrayBuffer !== 'undefined' && !ArrayBuffer.prototype.slice) {
-        (function () {
-            function clamp(val, length) {
-                val = (val | 0) || 0;
-
-                if (val < 0) {
-                    return Math.max(val + length, 0);
-                }
-
-                return Math.min(val, length);
-            }
-
-            ArrayBuffer.prototype.slice = function (from, to) {
-                var length = this.byteLength,
-                    begin = clamp(from, length),
-                    end = length,
-                    num,
-                    target,
-                    targetArray,
-                    sourceArray;
-
-                if (to !== undefined) {
-                    end = clamp(to, length);
-                }
-
-                if (begin > end) {
-                    return new ArrayBuffer(0);
-                }
-
-                num = end - begin;
-                target = new ArrayBuffer(num);
-                targetArray = new Uint8Array(target);
-
-                sourceArray = new Uint8Array(this, begin, num);
-                targetArray.set(sourceArray);
-
-                return target;
-            };
-        })();
-    }
-
-    // ---------------------------------------------------
-
-    /**
-     * Helpers.
-     */
-
-    function toUtf8(str) {
-        if (/[\u0080-\uFFFF]/.test(str)) {
-            str = unescape(encodeURIComponent(str));
-        }
-
-        return str;
-    }
-
-    function utf8Str2ArrayBuffer(str, returnUInt8Array) {
-        var length = str.length,
-           buff = new ArrayBuffer(length),
-           arr = new Uint8Array(buff),
-           i;
-
-        for (i = 0; i < length; i += 1) {
-            arr[i] = str.charCodeAt(i);
-        }
-
-        return returnUInt8Array ? arr : buff;
-    }
-
-    function arrayBuffer2Utf8Str(buff) {
-        return String.fromCharCode.apply(null, new Uint8Array(buff));
-    }
-
-    function concatenateArrayBuffers(first, second, returnUInt8Array) {
-        var result = new Uint8Array(first.byteLength + second.byteLength);
-
-        result.set(new Uint8Array(first));
-        result.set(new Uint8Array(second), first.byteLength);
-
-        return returnUInt8Array ? result : result.buffer;
-    }
-
-    function hexToBinaryString(hex) {
-        var bytes = [],
-            length = hex.length,
-            x;
-
-        for (x = 0; x < length - 1; x += 2) {
-            bytes.push(parseInt(hex.substr(x, 2), 16));
-        }
-
-        return String.fromCharCode.apply(String, bytes);
-    }
-
-    // ---------------------------------------------------
-
-    /**
-     * SparkMD5 OOP implementation.
-     *
-     * Use this class to perform an incremental md5, otherwise use the
-     * static methods instead.
-     */
-
-    function SparkMD5() {
-        // call reset to init the instance
-        this.reset();
-    }
-
-    /**
-     * Appends a string.
-     * A conversion will be applied if an utf8 string is detected.
-     *
-     * @param {String} str The string to be appended
-     *
-     * @return {SparkMD5} The instance itself
-     */
-    SparkMD5.prototype.append = function (str) {
-        // Converts the string to utf8 bytes if necessary
-        // Then append as binary
-        this.appendBinary(toUtf8(str));
-
-        return this;
-    };
-
-    /**
-     * Appends a binary string.
-     *
-     * @param {String} contents The binary string to be appended
-     *
-     * @return {SparkMD5} The instance itself
-     */
-    SparkMD5.prototype.appendBinary = function (contents) {
-        this._buff += contents;
-        this._length += contents.length;
-
-        var length = this._buff.length,
-            i;
-
-        for (i = 64; i <= length; i += 64) {
-            md5cycle(this._hash, md5blk(this._buff.substring(i - 64, i)));
-        }
-
-        this._buff = this._buff.substring(i - 64);
-
-        return this;
-    };
-
-    /**
-     * Finishes the incremental computation, reseting the internal state and
-     * returning the result.
-     *
-     * @param {Boolean} raw True to get the raw string, false to get the hex string
-     *
-     * @return {String} The result
-     */
-    SparkMD5.prototype.end = function (raw) {
-        var buff = this._buff,
-            length = buff.length,
-            i,
-            tail = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-            ret;
-
-        for (i = 0; i < length; i += 1) {
-            tail[i >> 2] |= buff.charCodeAt(i) << ((i % 4) << 3);
-        }
-
-        this._finish(tail, length);
-        ret = hex(this._hash);
-
-        if (raw) {
-            ret = hexToBinaryString(ret);
-        }
-
-        this.reset();
-
-        return ret;
-    };
-
-    /**
-     * Resets the internal state of the computation.
-     *
-     * @return {SparkMD5} The instance itself
-     */
-    SparkMD5.prototype.reset = function () {
-        this._buff = '';
-        this._length = 0;
-        this._hash = [1732584193, -271733879, -1732584194, 271733878];
-
-        return this;
-    };
-
-    /**
-     * Gets the internal state of the computation.
-     *
-     * @return {Object} The state
-     */
-    SparkMD5.prototype.getState = function () {
-        return {
-            buff: this._buff,
-            length: this._length,
-            hash: this._hash
-        };
-    };
-
-    /**
-     * Gets the internal state of the computation.
-     *
-     * @param {Object} state The state
-     *
-     * @return {SparkMD5} The instance itself
-     */
-    SparkMD5.prototype.setState = function (state) {
-        this._buff = state.buff;
-        this._length = state.length;
-        this._hash = state.hash;
-
-        return this;
-    };
-
-    /**
-     * Releases memory used by the incremental buffer and other additional
-     * resources. If you plan to use the instance again, use reset instead.
-     */
-    SparkMD5.prototype.destroy = function () {
-        delete this._hash;
-        delete this._buff;
-        delete this._length;
-    };
-
-    /**
-     * Finish the final calculation based on the tail.
-     *
-     * @param {Array}  tail   The tail (will be modified)
-     * @param {Number} length The length of the remaining buffer
-     */
-    SparkMD5.prototype._finish = function (tail, length) {
-        var i = length,
-            tmp,
-            lo,
-            hi;
-
-        tail[i >> 2] |= 0x80 << ((i % 4) << 3);
-        if (i > 55) {
-            md5cycle(this._hash, tail);
-            for (i = 0; i < 16; i += 1) {
-                tail[i] = 0;
-            }
-        }
-
-        // Do the final computation based on the tail and length
-        // Beware that the final length may not fit in 32 bits so we take care of that
-        tmp = this._length * 8;
-        tmp = tmp.toString(16).match(/(.*?)(.{0,8})$/);
-        lo = parseInt(tmp[2], 16);
-        hi = parseInt(tmp[1], 16) || 0;
-
-        tail[14] = lo;
-        tail[15] = hi;
-        md5cycle(this._hash, tail);
-    };
-
-    /**
-     * Performs the md5 hash on a string.
-     * A conversion will be applied if utf8 string is detected.
-     *
-     * @param {String}  str The string
-     * @param {Boolean} raw True to get the raw string, false to get the hex string
-     *
-     * @return {String} The result
-     */
-    SparkMD5.hash = function (str, raw) {
-        // Converts the string to utf8 bytes if necessary
-        // Then compute it using the binary function
-        return SparkMD5.hashBinary(toUtf8(str), raw);
-    };
-
-    /**
-     * Performs the md5 hash on a binary string.
-     *
-     * @param {String}  content The binary string
-     * @param {Boolean} raw     True to get the raw string, false to get the hex string
-     *
-     * @return {String} The result
-     */
-    SparkMD5.hashBinary = function (content, raw) {
-        var hash = md51(content),
-            ret = hex(hash);
-
-        return raw ? hexToBinaryString(ret) : ret;
-    };
-
-    // ---------------------------------------------------
-
-    /**
-     * SparkMD5 OOP implementation for array buffers.
-     *
-     * Use this class to perform an incremental md5 ONLY for array buffers.
-     */
-    SparkMD5.ArrayBuffer = function () {
-        // call reset to init the instance
-        this.reset();
-    };
-
-    /**
-     * Appends an array buffer.
-     *
-     * @param {ArrayBuffer} arr The array to be appended
-     *
-     * @return {SparkMD5.ArrayBuffer} The instance itself
-     */
-    SparkMD5.ArrayBuffer.prototype.append = function (arr) {
-        var buff = concatenateArrayBuffers(this._buff.buffer, arr, true),
-            length = buff.length,
-            i;
-
-        this._length += arr.byteLength;
-
-        for (i = 64; i <= length; i += 64) {
-            md5cycle(this._hash, md5blk_array(buff.subarray(i - 64, i)));
-        }
-
-        this._buff = (i - 64) < length ? new Uint8Array(buff.buffer.slice(i - 64)) : new Uint8Array(0);
-
-        return this;
-    };
-
-    /**
-     * Finishes the incremental computation, reseting the internal state and
-     * returning the result.
-     *
-     * @param {Boolean} raw True to get the raw string, false to get the hex string
-     *
-     * @return {String} The result
-     */
-    SparkMD5.ArrayBuffer.prototype.end = function (raw) {
-        var buff = this._buff,
-            length = buff.length,
-            tail = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-            i,
-            ret;
-
-        for (i = 0; i < length; i += 1) {
-            tail[i >> 2] |= buff[i] << ((i % 4) << 3);
-        }
-
-        this._finish(tail, length);
-        ret = hex(this._hash);
-
-        if (raw) {
-            ret = hexToBinaryString(ret);
-        }
-
-        this.reset();
-
-        return ret;
-    };
-
-    /**
-     * Resets the internal state of the computation.
-     *
-     * @return {SparkMD5.ArrayBuffer} The instance itself
-     */
-    SparkMD5.ArrayBuffer.prototype.reset = function () {
-        this._buff = new Uint8Array(0);
-        this._length = 0;
-        this._hash = [1732584193, -271733879, -1732584194, 271733878];
-
-        return this;
-    };
-
-    /**
-     * Gets the internal state of the computation.
-     *
-     * @return {Object} The state
-     */
-    SparkMD5.ArrayBuffer.prototype.getState = function () {
-        var state = SparkMD5.prototype.getState.call(this);
-
-        // Convert buffer to a string
-        state.buff = arrayBuffer2Utf8Str(state.buff);
-
-        return state;
-    };
-
-    /**
-     * Gets the internal state of the computation.
-     *
-     * @param {Object} state The state
-     *
-     * @return {SparkMD5.ArrayBuffer} The instance itself
-     */
-    SparkMD5.ArrayBuffer.prototype.setState = function (state) {
-        // Convert string to buffer
-        state.buff = utf8Str2ArrayBuffer(state.buff, true);
-
-        return SparkMD5.prototype.setState.call(this, state);
-    };
-
-    SparkMD5.ArrayBuffer.prototype.destroy = SparkMD5.prototype.destroy;
-
-    SparkMD5.ArrayBuffer.prototype._finish = SparkMD5.prototype._finish;
-
-    /**
-     * Performs the md5 hash on an array buffer.
-     *
-     * @param {ArrayBuffer} arr The array buffer
-     * @param {Boolean}     raw True to get the raw string, false to get the hex one
-     *
-     * @return {String} The result
-     */
-    SparkMD5.ArrayBuffer.hash = function (arr, raw) {
-        var hash = md51_array(new Uint8Array(arr)),
-            ret = hex(hash);
-
-        return raw ? hexToBinaryString(ret) : ret;
-    };
-
-    return SparkMD5;
-}));
\ No newline at end of file
diff --git a/src/components/Upload/style.css b/src/components/Upload/style.css
deleted file mode 100644
index cd039d9..0000000
--- a/src/components/Upload/style.css
+++ /dev/null
@@ -1,36 +0,0 @@
-
-/* Uploader: Drag & Drop */
-.resumable-error {font-size:14px; font-style:italic;}
-.resumable-drop {padding:25px 15px; font-size:22px; text-align:center; color:#666; font-weight:bold;background-color:#eee; border:2px dashed #aaa; border-radius:10px; z-index:9999;}
-.dragover {padding:30px; color:#555; background-color:#ddd; border:1px solid #999;}
-.ebtp-message-title { margin-top: 10px;}
-
-/* Uploader: Progress bar */
-.resumable-progress {margin:30px 0 30px 0; width:100%;}
-.progress-container {height:7px; background:#9CBD94; position:relative; }
-.progress-bar {position:absolute; top:0; left:0; bottom:0; background:#45913A; width:0;}
-.progress-text {font-size:11px; line-height:9px; padding-left:10px;}
-.progress-pause {padding:0 0 0 7px;}
-.progress-resume-link {display:none;}
-.is-paused .progress-resume-link {display:inline;}
-.is-paused .progress-pause-link {display:none;}
-.is-complete .progress-pause {display:none;}
-
-/* Uploader: List of items being uploaded */
-.resumable-list {overflow:auto; margin-right:-20px;}
-.uploader-item {width:148px; height:90px; background-color:#666; position:relative; border:2px solid black; float:left; margin:0 6px 6px 0;}
-.uploader-item-thumbnail {width:100%; height:100%; position:absolute; top:0; left:0;}
-.uploader-item img.uploader-item-thumbnail {opacity:0;}
-.uploader-item-creating-thumbnail {padding:0 5px; font-size:9px; color:white;}
-.uploader-item-title {position:absolute; font-size:9px; line-height:11px; padding:3px 50px 3px 5px; bottom:0; left:0; right:0; color:white; background-color:rgba(0,0,0,0.6); min-height:27px;}
-.uploader-item-status {position:absolute; bottom:3px; right:3px;}
-
-/* Uploader: Hover & Active status */
-.uploader-item:hover, .is-active .uploader-item {border-color:#4a873c; cursor:pointer; }
-.uploader-item:hover .uploader-item-title, .is-active .uploader-item .uploader-item-title {background-color:rgba(74,135,60,0.8);}
-
-/* Uploader: Error status */
-.is-error .uploader-item:hover, .is-active.is-error .uploader-item {border-color:#900;}
-.is-error .uploader-item:hover .uploader-item-title, .is-active.is-error .uploader-item .uploader-item-title {background-color:rgba(153,0,0,0.6);}
-.is-error .uploader-item-creating-thumbnail {display:none;}
-.redCenter{ color: #900; text-align: center;}
diff --git a/src/components/richText/braft/index.tsx b/src/components/richText/braft/index.tsx
deleted file mode 100644
index bbc6a1e..0000000
--- a/src/components/richText/braft/index.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import React, { useEffect, useImperativeHandle, useState } from 'react'
-// 引入编辑器组件
-import BraftEditor, { ControlType } from 'braft-editor'
-// 引入编辑器样式
-import 'braft-editor/dist/index.css'
-interface BraftType {
-  braftRef: any;//挂载,
-  disabled?: any;//是否可编辑
-  echo?: any;//回显内容
-  value?: any;
-  height?: number;
-  onChange?: (value: any) => void
-}
-const BraftText: React.FC<BraftType> = (props) => {
-  const {
-    braftRef,
-    echo,
-    disabled,
-    height,
-  } = props;
-
-  const [editorState, editorStateSet] = useState(BraftEditor.createEditorState(null));
-  //工具栏
-  const controls: ControlType[] = [
-    // 'undo', 'redo', 'separator',
-    'font-size', 'line-height', 'letter-spacing', 'separator',
-    'text-color', 'bold', 'italic', 'underline', 'separator',
-    'text-indent', 'text-align', 'separator',
-    'headings', 'list-ul', 'list-ol', 'separator',
-    'remove-styles', 'clear'
-  ]
-  //=========================================================================================================
-  useEffect(() => {
-    echo && editorStateSet(BraftEditor.createEditorState(echo))
-  }, [echo]);
-  /**
-  *提供给父级的内容
-  **/
-  useImperativeHandle(braftRef, () => ({
-    getHtml,
-  }));
-  const handleEditorChange = (editorState: any) => {
-    editorStateSet(editorState)
-  }
-  const getHtml = () => {
-    return editorState.toHTML();
-  }
-  return (
-    <div className="my-component" style={{ border: 'solid', borderWidth: '1px', borderColor: 'rgb(205,205,205)', height: height && height }}>
-      <BraftEditor
-        value={editorState}
-        onChange={handleEditorChange}
-        controls={!disabled ? controls : []}// 查看状态不显示菜单
-        readOnly={disabled}
-        placeholder={'为了能顺利发布，建议您内容去掉下划线等格式，尽量以纯文本形式发布并在粘贴后仔细检查是否有不对的地方。'}
-      />
-    </div>
-  )
-}
-export default BraftText;
\ No newline at end of file
diff --git a/src/components/richText/wang/fullScreen.tsx b/src/components/richText/wang/fullScreen.tsx
deleted file mode 100644
index e2c263c..0000000
--- a/src/components/richText/wang/fullScreen.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-// 引入 wangEditor
-import E from 'wangeditor' // npm 安装
-// 获取必要的变量，这些在下文中都会用到
-const { $, BtnMenu, DropListMenu, PanelMenu, DropList, Panel, Tooltip } = E
-
-// 第一，菜单 class ，Button 菜单继承 BtnMenu class
-class AlertMenu extends BtnMenu {
-  constructor(editor: E) {
-    // data-title属性表示当鼠标悬停在该按钮上时提示该按钮的功能简述
-      const $elem = E.$(
-          `<div data-title="Alert">
-              <button>alert</button>
-          </div>`
-      )
-      super($elem, editor)
-  }
-  // 菜单点击事件
-  clickHandler() {
-      // 做任何你想做的事情
-      // 可参考【常用 API】文档，来操作编辑器
-
-      alert('hello world')
-  }
-  // 菜单是否被激活（如果不需要，这个函数可以空着）
-  // 1. 激活是什么？光标放在一段加粗、下划线的文本时，菜单栏里的 B 和 U 被激活，如下图
-  // 2. 什么时候执行这个函数？每次编辑器区域的选区变化（如鼠标操作、键盘操作等），都会触发各个菜单的 tryChangeActive 函数，重新计算菜单的激活状态
-  tryChangeActive() {
-      // 激活菜单
-      // 1. 菜单 DOM 节点会增加一个 .w-e-active 的 css class
-      // 2. this.this.isActive === true
-      this.active()
-
-      // // 取消激活菜单
-      // // 1. 菜单 DOM 节点会删掉 .w-e-active
-      // // 2. this.this.isActive === false
-      // this.unActive()
-  }
-}
-export default AlertMenu;
\ No newline at end of file
diff --git a/src/components/richText/wang/index.tsx b/src/components/richText/wang/index.tsx
deleted file mode 100644
index ec07770..0000000
--- a/src/components/richText/wang/index.tsx
+++ /dev/null
@@ -1,265 +0,0 @@
-import React, { useEffect, useImperativeHandle, useRef, useState } from 'react';
-import AlertMenu from './fullScreen'
-import E from 'wangeditor';
-import { Button, message, Spin } from 'antd';
-import { pictureDisplayPath, uploadAttachmentPath } from '@/utils/DownloadUtils';
-import { isEmpty, isNotEmpty } from '@/utils/CommonUtils';
-import { createNewFileBid } from '@/services/download_';
-
-interface WangType {
-  braftRef: any;//挂载
-  disabled?: any;//是否可编辑
-  echo?: any;//回显内容
-  value?: any;
-  height?: number;
-  onChange?: (value: any) => void;
-  useImage?: boolean;//使用图片上传
-  imageId?: string;//图片objectId
-}
-let editor: any = null;
-
-const BraftText: React.FC<WangType> = (props) => {
-  let willCreate = true;
-
-  // 菜单 key ，各个菜单不能重复-自定义工具
-  const menuKey = 'alertMenuKey'
-  //======================================================================================state
-  const [content, setContent] = useState('');
-  const [fullScreen, fullScreenSet] = useState(false);
-  //遮罩
-  const [loading, setLoading] = useState(false);
-  //imageId
-  const objectId = useRef<string | null | undefined>(null);
-  const {
-    braftRef,
-    echo,
-    disabled,
-    value,
-    height,
-    onChange,
-    useImage,
-    imageId,
-  } = props;
-
-  const tools = [//工具栏
-    'head',//标题
-    'fontSize', //字号
-    // 'lineHeight', //行高
-    'foreColor', //颜色
-    'bold', //加粗
-    'italic', //斜体
-    'underline', //下划线
-    'strikeThrough', //文字删除线
-    'indent', //缩进
-    'justify', //文字对齐方式
-    'list', //列表
-    'undo', //撤销
-    'redo', //恢复
-    'fullscreen', //全屏
-
-    // 'image',//图片
-    // 'emoticon',//表情
-    // 'video',//视频
-    // 'table',//表格
-    // 'todo',//待办
-  ];
-
-  //=======================================================================================func
-  useEffect(() => {
-    if (willCreate) {
-      // 注：class写法需要在componentDidMount 创建编辑器
-      editor = new E("#div1");
-
-      //添加图片上传
-      useImage && tools.splice(-3, 0, 'image');
-      //工具栏
-      editor.config.menus = tools;
-      //提示
-      editor.config.placeholder = '为了能顺利发布，建议您内容去掉下划线等格式，尽量以纯文本形式发布。';
-      // 配置 onchange 回调函数
-      editor.config.onchange = editorOnChange;
-      // 注册菜单
-      // editor.menus.extend(menuKey, AlertMenu);
-
-      // 将菜单加入到 editor.config.menus 中    const menuKey = 'alertMenuKey' 
-      // 也可以通过配置 menus 调整菜单的顺序，参考【配置菜单】部分的文档    editor.config.menus.push(menuKey)
-      // editor.config.menus = editor.config.menus.concat(menuKey)
-
-      // 设置编辑区域高度为 500px
-      height && (editor.config.height = height);
-      //关闭网络上传图片
-      editor.config.showLinkImg = false;
-      // 关闭粘贴内容中的样式
-      editor.config.pasteFilterStyle = false;
-      // 忽略粘贴内容中的图片
-      editor.config.pasteIgnoreImg = true;
-      // 上传图片到服务器,对应的是controller层的@RequestMapping("/upload")
-      editor.config.uploadImgServer = uploadAttachmentPath;//接口名称
-      //自定义name,接收的时候图片文件的那么用这个，对应的是参数中的MultipartFile upimg名称,这个名称即上传到浏览器的参数名称
-      editor.config.uploadFileName = "multipartFiles";//这个需要和后台商量上传图片的名称
-      //设置请求体额外参数
-      if (useImage) {
-        if (isEmpty(imageId)) {
-          createNewFileBid().then(res => {//获取雪花id
-            editor.config.uploadImgParams = {
-              appCode: 'ebtp-cloud-frontend',
-              objectId: res?.id,
-            };
-            objectId.current = res?.id;
-          })
-        } else {
-          editor.config.uploadImgParams = {
-            appCode: 'ebtp-cloud-frontend',
-            objectId: imageId,
-          };
-          objectId.current = imageId;
-        }
-      }
-      // 将 timeout 时间改为 60s
-      editor.config.uploadImgTimeout = 60000;
-      // 将图片大小限制为 600k
-      editor.config.uploadImgMaxSize = 600 * 1024;
-      // 限制一次最多上传 1 张图片
-      editor.config.uploadImgMaxLength = 1;
-      //上传图片的错误提示默认使用alert弹出,也可以自定义用户体验更好的提示方式
-      editor.config.customAlert = function (info: string) {
-        const repinfo = info.replace(/0.5859375M/g, '600K');
-        // info 是需要提示的内容
-        message.error(repinfo);
-      };
-      // 上传图片的结果反馈
-      editor.config.uploadImgHooks = {
-        before: function (xhr: any, editor: any, files: any) {
-          // 图片上传之前触发
-          // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象，files 是选择的图片文件
-          // 如果返回的结果是 {prevent: true, msg: 'xxxx'} 则表示用户放弃上传
-          // return {
-          // prevent: true,
-          // msg: '放弃上传'
-          // }
-          // console.log("before:",xhr)
-          if (isEmpty(objectId.current)) {
-            return {
-              prevent: true,
-              msg: '上传失败，原因：上传参数错误'
-            }
-          }
-          setLoading(true);
-          return {
-            prevent: false,
-          }
-        },
-        success: function (xhr: any, editor: any, result: any) {
-          // 图片上传并返回结果，图片插入成功之后触发
-          // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象，result 是服务器端返回的结果
-          // console.log("success:",result)
-        },
-        fail: function (xhr: any, editor: any, result: any) {
-          // 图片上传并返回结果，但图片插入错误时触发
-          // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象，result 是服务器端返回的结果
-        },
-        error: function (xhr: any, editor: any) {
-          // 图片上传出错时触发
-          // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象
-        },
-        // 上传图片超时
-        timeout: function (xhr: any) {
-          message.error('服务器超时！');
-          setLoading(false);
-        },
-        // 如果服务器端返回的不是 {errno:0, data: [...]} 这种格式，可使用该配置
-        // （但是，服务器端返回的必须是一个 JSON 格式字符串！！！否则会报错）
-        customInsert: function (insertImg: (arg0: any) => void, result: any, editor: any) {
-          // 图片上传并返回结果，自定义插入图片的事件（而不是编辑器自动插入图片！！！）
-          // insertImg 是插入图片的函数，参数editor 是编辑器对象，result 是服务器端返回的结果
-          // 举例：假如上传图片成功后，服务器端返回的是 {url:'....'} 这种格式，即可这样插入图片：
-          if (result?.success) {
-            const url = pictureDisplayPath + '?filePath=' + result.data[0].sysStorageVO.filePath;
-            insertImg(url);
-          } else {
-            message.error('图片上传失败！');
-          }
-          setLoading(false);
-          // var url = result.result.remote_path;
-          // insertImg(url);
-          // result 必须是一个 JSON 格式字符串！！！否则报错
-        }
-      };
-      /**一定要创建 */
-      editor.create();
-
-      willCreate = false;
-    }
-
-    return () => {
-      // 组件销毁时销毁编辑器  注：class写法需要在componentWillUnmount中调用
-      editor.destroy()
-      setLoading(false);
-      setContent('');
-    }
-  }, []);
-
-  useEffect(() => {
-    //控制是否可编辑
-    disabled && makeDis();
-  }, [disabled])
-
-  useEffect(() => {
-    // 重新设置编辑器内容
-    echo && editor.txt.html(echo);
-  }, [echo])
-  /**
-  *提供给父级的内容
-  **/
-  useImperativeHandle(braftRef, () => ({
-    getText,
-    getHtml,
-    getHtml1,
-    makeDis,
-    getImageId,
-  }));
-
-  // 获取html方法1
-  function getHtml() {
-    return content
-  }
-
-  // 获取html方法2
-  function getHtml1() {
-    return editor.txt.html()
-  }
-
-  // 获取text
-  function getText() {
-    alert(editor.txt.text())
-  }
-
-  //change
-  function editorOnChange(newHtml: any) {
-    setContent(newHtml);
-    triggerChange(newHtml)
-  }
-
-  //不可编辑
-  function makeDis() {
-    editor && editor.disable();
-  }
-
-  //form取值
-  const triggerChange = (newHtml: any) => {
-    onChange?.(newHtml);
-  };
-
-  //获取富文本图片objectId
-  function getImageId() {
-    return objectId.current;
-  }
-  return (
-    <Spin spinning={loading} tip={"上传中……"}>
-      <div>
-        <div id="div1" style={{ textAlign: 'left' }}></div>
-      </div>
-    </Spin>
-  )
-}
-export default BraftText
\ No newline at end of file
diff --git a/src/models/bidev.js b/src/models/bidev.js
deleted file mode 100644
index d4d0e79..0000000
--- a/src/models/bidev.js
+++ /dev/null
@@ -1,204 +0,0 @@
-import { fetchManagerList,openBizassessroom,resetVerificationCode,fetchJuryList,fetchSupplierList
-        ,fetchJuryMemInfo,updateJuryMemInfo,validateVerificationCode,fetchbidslist
-        ,fetchPreSupplierList,fetchPreList,fetchPreListt,bxmultifetchPreListt,pushRedirectRe,getCheckedByRoomId,checkOpenBidSupplier,zmmultiOpenBizassessroom } from '../services/bidev';
-import { message } from 'antd';
-import { getProId } from '@/utils/session';
-import { getURLInformation } from '@/utils/CommonUtils';
-  // import { message } from 'antd';
-  // import { stringify } from 'qs';
-  
-export default {
-  namespace: 'bidev',
-
-  state: {
-    supplierList:[],
-    managerList:[],
-    JuryList:[],
-    JuryInfo:[],
-    bidslist:[]
-  },
-
-  effects: {
-    // 查询招标代理列表
-    *fetchManagerList({payload,callback}, { call, put }){
-      const response =yield call(fetchManagerList,payload)
-      if(response.code==200){
-        yield put({ type: 'save', payload: {managerList:response.data} });
-      }
-    },
-    // 开启评审室
-    *openBizassessroom({payload,callback}, { call, put }){
-      const response =yield call(openBizassessroom,payload)
-      if(response?.code==200){
-        // 查询招标代理列表
-        const params={
-          pageNo:1,
-          pageSize:10,
-          // roomType:2,
-          roomType: getURLInformation('roomType'),
-          tpId:getProId()//项目id
-        }
-        yield put({ type: 'fetchManagerList', payload: {...params} });
-        message.success("开启成功！")
-      }
-      callback();
-    },
-    // 开启评审室（多轮招募）
-    *zmmultiOpenBizassessroom({payload,callback}, { call, put }){
-      const response =yield call(zmmultiOpenBizassessroom,payload)
-      if(response.code==200){
-        // 查询招标代理列表
-        const params={
-          pageNo:1,
-          pageSize:10,
-          // roomType:2,
-          roomType: getURLInformation('roomType'),
-          tpId:getProId()//项目id
-        }
-        yield put({ type: 'fetchManagerList', payload: {...params} });
-        message.success("开启成功！")
-      }
-      callback();
-    },
-    // 重置校验码
-    *resetVerificationCode({payload,callback}, { call, put }){
-      const response =yield call(resetVerificationCode,payload)
-      if(response.code==200){
-        // 查询招标代理列表
-        const params={
-          pageNo:payload.pageNo,
-          pageSize:payload.pageSize,
-          // roomType:2,
-          roomType: getURLInformation('roomType'),
-          tpId:payload.tpId//项目id
-        }
-        yield put({ type: 'fetchManagerList', payload: {...params} });
-      }
-    },
-    // 查询专家地列表
-    *fetchJuryList({payload,callback}, { call, put }){
-      const response =yield call(fetchJuryList,payload)
-      if(response.code==200){
-        yield put({ type: 'save', payload: {JuryList:response.data} });
-      }
-    },
-    *fetchSupplierList({payload,callback}, { call, put }){
-      const response =yield call(fetchSupplierList,payload)
-      if(response.code==200){
-        yield put({ type: 'save', payload: {supplierList:response.data} });
-      }
-    },
-    *fetchJuryMemInfo({payload,callback}, { call, put }){
-      const response =yield call(fetchJuryMemInfo,payload)
-      if(response.code==200){
-        yield put({ type: 'save', payload: {JuryInfo:response.data} });
-        if(callback) callback(response,"success")
-      }else{
-        if(callback) callback(response,"fail")
-      }
-    },
-    // 新更新评委信息
-    *updateJuryMemInfo({payload,callback}, { call, put }){
-      const response =yield call(updateJuryMemInfo,payload)
-      if(response.code==200){
-        if(callback) callback(response,"success")
-      }else{
-        if(callback) callback(response,"fail")
-      }
-    },
-    *validateVerificationCode({payload,callback}, { call, put }){
-      const response =yield call(validateVerificationCode,payload)
-      if(response.code==200){
-        if(response.success==true){
-          if(callback) callback(response,"success")
-        }else{
-          if(callback) callback(response,"fail")
-        }
-      }
-    },
-    *fetchbidslist({payload,callback}, { call, put }){
-      const response =yield call(fetchbidslist,payload)
-      if(response.code==200){
-        yield put({ type: 'save', payload: {bidslist:response.data} });
-      }
-    },
-    // 获取初审汇总表title
-    *fetchPreList({payload,callback}, { call, put }){
-      const response =yield call(fetchPreList,payload)
-      // const response=preList;
-      if(response.code==200){
-        if(callback) callback(response,"success")
-        yield put({ type: 'save', payload: {preList:response.data} });
-      }else{
-        if(callback) callback(response,"fail")
-      }
-    },
-    // 获取初审汇总表datasource
-    *fetchPreSupplierList({payload,callback}, { call, put }){
-      const response =yield call(fetchPreSupplierList,payload)
-      // const response =preSupplierList;
-      if(response.code==200){
-        if(callback) callback(response,"success")
-        yield put({ type: 'save', payload: {preSupplierList:response.data}});
-      }else{
-        if(callback) callback(response,"fail")
-      }
-    },
-    *fetchPreListt({payload,callback}, { call, put }){
-      const response =yield call(fetchPreListt,payload)
-      // const response =preSupplierList;
-      if(response.code==200){
-        if(callback) callback(response,"success")
-        yield put({ type: 'save', payload: {preSupplierList:response.data}});
-      }else{
-        if(callback) callback(response,"fail")
-      }
-    },
-    *bxmultifetchPreListt({payload,callback}, { call, put }){
-      const response =yield call(bxmultifetchPreListt,payload)
-      // const response =preSupplierList;
-      if(response.code==200){
-        if(callback) callback(response,"success")
-        yield put({ type: 'save', payload: {preSupplierList:response.data}});
-      }else{
-        if(callback) callback(response,"fail")
-      }
-    },
-    *pushRedirectRe({payload,callback}, { call, put }){
-      const response =yield call(pushRedirectRe,payload)
-      if(response.code==200){
-        if(response.success==true){
-          if(callback) callback(response,"success")
-        }else{
-          if(callback) callback(response,"fail")
-        }
-      }
-    },
-    *getCheckedByRoomId({payload,callback}, { call, put }){
-      const response =yield call(getCheckedByRoomId,payload)
-      if(response.code==200){
-        if(response.success==true){
-          if(callback) callback(response)
-        }else{
-          if(callback) callback(response)
-        }
-      }
-    },
-    *checkOpenBidSupplier({payload,callback}, { call, put }){
-      const response =yield call(checkOpenBidSupplier,payload)
-      if(response.code==200){
-        if(callback) callback(response)
-      }
-    },
-  },
-
-  reducers: {
-    save(state, { payload }) {
-      return {
-        ...state,
-        ...payload,
-      };
-    }
-  }
-}
-  
\ No newline at end of file
diff --git a/src/models/connect.d.ts b/src/models/connect.d.ts
deleted file mode 100644
index 30101dc..0000000
--- a/src/models/connect.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { MenuDataItem, Settings as ProSettings } from '@ant-design/pro-layout';
-import { GlobalModelState } from './global';
-import { UserModelState } from './user';
-import { StateType } from './login';
-
-export { GlobalModelState, UserModelState };
-
-export interface Loading {
-  global: boolean;
-  effects: { [key: string]: boolean | undefined };
-  models: {
-    global?: boolean;
-    menu?: boolean;
-    setting?: boolean;
-    user?: boolean;
-    login?: boolean;
-  };
-}
-
-export interface ConnectState {
-  global: GlobalModelState;
-  loading: Loading;
-  settings: ProSettings;
-  user: UserModelState;
-  login: StateType;
-}
-
-export interface Route extends MenuDataItem {
-  routes?: Route[];
-}
diff --git a/src/models/dashboard.js b/src/models/dashboard.js
deleted file mode 100644
index d3e39a0..0000000
--- a/src/models/dashboard.js
+++ /dev/null
@@ -1,381 +0,0 @@
-import {
-  fetchDowntlist, fetchprojectRecords, fetchJuryUpList, fetchJuryDownlist, fetchSupplierUpList, fetchDisposalList, fetchParticipants,
-  fetchSupplierDownLeftList, fetchSupplierDownRightList, fetchtlist, fetchtlistre, fetchtPageList, fetchtShotList, fetchtClarify
-} from '../services/dashboard';
-import { message } from 'antd';
-import { getProId } from '@/utils/session';
-import { getURLInformation } from '@/utils/CommonUtils';
-// import { message } from 'antd';
-// import { stringify } from 'qs';
-
-const procurementmodelist = [
-  {
-    "id": 11,
-    "code": "procurement_mode_1",
-    "dicName": "公开招标",
-    "parentCode": "procurement_mode",
-    "parentType": "procurement_mode=entrust",
-    "useFlag": "0",
-    "defaultFlag": null,
-    "orderFlag": 1,
-    "description": "采购方式"
-  },
-  {
-    "id": 12,
-    "code": "procurement_mode_2",
-    "dicName": "邀请招标",
-    "parentCode": "procurement_mode",
-    "parentType": "procurement_mode=entrust",
-    "useFlag": "0",
-    "defaultFlag": null,
-    "orderFlag": 2,
-    "description": "采购方式"
-  },
-  {
-    "id": 13,
-    "code": "procurement_mode_3",
-    "dicName": "公开比选",
-    "parentCode": "procurement_mode",
-    "parentType": "procurement_mode=entrust",
-    "useFlag": "0",
-    "defaultFlag": null,
-    "orderFlag": 3,
-    "description": "采购方式"
-  },
-  {
-    "id": 16,
-    "code": "procurement_mode_4",
-    "dicName": "公开招募",
-    "parentCode": "procurement_mode",
-    "parentType": "procurement_mode=entrust",
-    "useFlag": "0",
-    "defaultFlag": null,
-    "orderFlag": 4,
-    "description": "采购方式"
-  },
-  {
-    "id": 17,
-    "code": "procurement_mode_5",
-    "dicName": "竞争性谈判",
-    "parentCode": "procurement_mode",
-    "parentType": "procurement_mode=entrust",
-    "useFlag": "0",
-    "defaultFlag": null,
-    "orderFlag": 5,
-    "description": "采购方式"
-  },
-  {
-    "id": 65,
-    "code": "procurement_mode_6",
-    "dicName": "单一来源",
-    "parentCode": "procurement_mode",
-    "parentType": "procurement_mode=entrust",
-    "useFlag": "0",
-    "defaultFlag": null,
-    "orderFlag": 6,
-    "description": "采购方式"
-  },
-  {
-    "id": 66,
-    "code": "procurement_mode_7",
-    "dicName": "公开询价",
-    "parentCode": "procurement_mode",
-    "parentType": "procurement_mode=entrust",
-    "useFlag": "0",
-    "defaultFlag": null,
-    "orderFlag": 7,
-    "description": "采购方式"
-  },
-  {
-    "id": 67,
-    "code": "procurement_mode_8",
-    "dicName": "竞拍",
-    "parentCode": "procurement_mode",
-    "parentType": "procurement_mode=entrust",
-    "useFlag": "0",
-    "defaultFlag": null,
-    "orderFlag": 8,
-    "description": "采购方式"
-  },
-  {
-    "id": 130,
-    "code": "procurement_mode_9",
-    "dicName": "单一来源简化流程",
-    "parentCode": "procurement_mode",
-    "parentType": "procurement_mode=entrust",
-    "useFlag": "0",
-    "defaultFlag": null,
-    "orderFlag": 9,
-    "description": "采购方式"
-  }
-]
-const sttlist = [
-  {
-    id: 1,
-    title: "公开招标",
-    description: "公开招标的数量",
-    valid: ["procurement_mode_1", "procurement_mode_2"],
-    count: 0
-  },
-  {
-    id: 2,
-    title: "公开比选",
-    description: "公开比选的数量",
-    valid: ["procurement_mode_3"],
-    count: 0
-  },
-  {
-    id: 3,
-    title: "谈判",
-    description: "谈判的数量",
-    valid: ["procurement_mode_5", "procurement_mode_6"],
-    count: 0
-  },
-  {
-    id: 4,
-    title: "招募",
-    description: "招募的数量",
-    valid: ["procurement_mode_4"],
-    count: 0
-  },
-  {
-    id: 5,
-    title: "询价",
-    description: "询价的数量",
-    valid: ["procurement_mode_7"],
-    count: 0
-  },
-  {
-    id: 6,
-    title: "竞拍",
-    description: "竞拍的数量",
-    valid: ["procurement_mode_8"],
-    count: 0
-  }
-]
-const data = [{
-  projectCount: "100",
-  bidMethodDict: "procurement_mode_1"
-},
-{
-  projectCount: "100",
-  bidMethodDict: "procurement_mode_3"
-},
-{
-  projectCount: "100",
-  bidMethodDict: "procurement_mode_5"
-}]
-export default {
-  namespace: 'dashboard',
-
-  state: {
-    downlist: [],
-    projectlist: [],
-    Juryuplist: [],
-    Jurydownlist: [],
-    supplieruplist: [],
-    supplierleftlist: [],
-    supplierrightlist: [],
-    staloading: false,
-    tlist: [],
-    trelist: [],
-    idList: [],
-    dateNum: 0,
-    pagelist: [],
-    shotList: [],
-    disposalList: 0,
-    Participants: 0
-  },
-
-  effects: {
-    // 项目经理
-    *fetchDowntlist({ payload, callback }, { call, put }) {
-      const response = yield call(fetchDowntlist, payload)
-      if (response.code == 200) {
-        yield put({ type: 'save', payload: { downlist: response.data } })
-      }
-    },
-    *fetchprojectRecords({ payload, callback }, { call, put }) {
-      const response = yield call(fetchprojectRecords, payload)
-      if (response.code == 200 && response.data.length > 0) {
-        let newlist = [
-          {
-            id: 1,
-            title: "公开招标",
-            description: "公开招标的数量",
-            valid: ["procurement_mode_1", "procurement_mode_2"],
-            count: 0
-          },
-          {
-            id: 2,
-            title: "公开比选",
-            description: "公开比选的数量",
-            valid: ["procurement_mode_3"],
-            count: 0
-          },
-          {
-            id: 3,
-            title: "谈判",
-            description: "谈判的数量",
-            valid: ["procurement_mode_5", "procurement_mode_6"],
-            count: 0
-          },
-          {
-            id: 4,
-            title: "招募",
-            description: "招募的数量",
-            valid: ["procurement_mode_4"],
-            count: 0
-          },
-          {
-            id: 5,
-            title: "询价",
-            description: "询价的数量",
-            valid: ["procurement_mode_7"],
-            count: 0
-          },
-        ]
-        // for(let t of procurementmodelist){
-        for (let z of newlist) {
-          for (let k of response.data) {
-            if (z.valid.indexOf(k.bidMethodDict) != -1) {
-              z.count = parseInt(z.count) + parseInt(k.projectCount)
-            }
-          }
-        }
-        // }
-        // let newtlist=newlist.filter((item)=>{
-        //   return item.count!=0
-        // })
-        yield put({ type: 'save', payload: { projectlist: newlist, staloading: false } });
-      } else {
-        yield put({ type: 'save', payload: { projectlist: [], staloading: false } });
-      }
-    },
-    // 专家
-    *fetchJuryUpList({ payload, callback }, { call, put }) {
-      const response = yield call(fetchJuryUpList, payload)
-      if (response.code == 200) {
-        const keys = Object.keys(response.data);
-        let t = 0;
-        const Juryuplist = keys.map(item => {
-          t++;
-          return { id: t, key: item, value: response.data[item], description: item + "的数量" };
-        })
-        yield put({ type: 'save', payload: { Juryuplist: Juryuplist } });
-      }
-      yield put({ type: 'save', payload: { staloading: false } });
-    },
-    *fetchJuryDownlist({ payload, callback }, { call, put }) {
-      const response = yield call(fetchJuryDownlist, payload)
-      if (response.code == 200) {
-        yield put({ type: 'save', payload: { Jurydownlist: response.data.records } });
-      }
-    },
-    // 供应商
-    *fetchSupplierUpList({ payload, callback }, { call, put }) {
-      const response = yield call(fetchSupplierUpList, payload)
-      if (response.code == 200) {
-        let newlist = response.data;
-        if (newlist.length > 0) {
-          for (let t of newlist) {
-            t.description = t.title + "的数量"
-          }
-        }
-        yield put({ type: 'save', payload: { supplieruplist: newlist } });
-      }
-      yield put({ type: 'save', payload: { staloading: false } });
-    },
-    *fetchSupplierDownLeftList({ payload, callback }, { call, put }) {
-      const response = yield call(fetchSupplierDownLeftList, payload)
-      if (response.code == 200) {
-        yield put({ type: 'save', payload: { supplierleftlist: response.data } });
-      }
-    },
-    *fetchSupplierDownRightList({ payload, callback }, { call, put }) {
-      const response = yield call(fetchSupplierDownRightList, payload)
-      if (response.code == 200) {
-        yield put({ type: 'save', payload: { supplierrightlist: response.data.records } });
-      }
-    },
-    *fetchtlist({ payload, callback }, { call, put }) {
-      const response = yield call(fetchtlist, payload)
-      if (response.code == 200) {
-        let tlist = response.data.records
-        if (tlist.length > 0) {
-          let k = 1;
-          for (let t of tlist) {
-            t.sort = k;
-            t++;
-          }
-        }
-        yield put({ type: 'save', payload: { tlist: tlist } });
-      }
-    },
-    *fetchtlistre({ payload, callback }, { call, put }) {
-      const response = yield call(fetchtlistre, payload)
-      if (response.code == 200) {
-        let trelist = response?.records?.slice(0,6)
-        if (trelist.length > 0) {
-          let k = 1;
-          for (let t of trelist) {
-            t.sort = k;
-            t++;
-          }
-        }
-        yield put({ type: 'save', payload: { trelist: trelist } });
-      }
-    },
-    *fetchtClarify({ payload, callback }, { call, put }) { // 首页澄清列表
-      const response = yield call(fetchtClarify, payload)
-      // if (response.code == 200) {
-        if(response.length > 0){
-          let clarifyList = response
-          let idList = []
-          let dateNum = clarifyList[0].datanum
-          if (clarifyList.length > 0) {
-            clarifyList.map((item, index) => {
-              idList.push(item.id)
-            })
-          }
-          yield put({ type: 'save', payload: { idList: idList, dateNum: dateNum } });
-        }
-      // }
-    },
-    // 内拍处置经理
-    *fetchtPageList({ payload, callback }, { call, put }) {
-      const response = yield call(fetchtPageList, payload)
-      if (response.code == 200) {
-        yield put({ type: 'save', payload: { pagelist: response.data.records } })
-      }
-    },
-    *fetchDisposalList({ payload, callback }, { call, put }) {
-      const response = yield call(fetchDisposalList, payload)
-      if (response.code == 200) {
-        yield put({ type: 'save', payload: { disposalList: response.data, staloading: false } });
-      }
-    },
-    // 内拍参拍人
-    *fetchtShotList({ payload, callback }, { call, put }) {
-      const response = yield call(fetchtShotList, payload)
-      if (response.code == 200) {
-        yield put({ type: 'save', payload: { shotList: response.data.records } })
-      }
-    },
-    *fetchParticipants({ payload, callback }, { call, put }) {
-      const response = yield call(fetchParticipants, payload)
-      if (response.code == 200) {
-        yield put({ type: 'save', payload: { Participants: response.data, staloading: false } });
-      }
-    },
-  },
-
-  reducers: {
-    save(state, { payload }) {
-      return {
-        ...state,
-        ...payload,
-      };
-    }
-  }
-}
diff --git a/src/models/global.ts b/src/models/global.ts
deleted file mode 100644
index 5d4c4e4..0000000
--- a/src/models/global.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-import { Subscription, Reducer, Effect } from 'umi';
-
-import { NoticeIconData } from '@/components/NoticeIcon';
-import { queryNotices } from '@/services/user';
-import { ConnectState } from './connect.d';
-
-export interface NoticeItem extends NoticeIconData {
-  id: string;
-  type: string;
-  status: string;
-}
-
-export interface GlobalModelState {
-  collapsed: boolean;
-  notices: NoticeItem[];
-}
-
-export interface GlobalModelType {
-  namespace: 'global';
-  state: GlobalModelState;
-  effects: {
-    fetchNotices: Effect;
-    clearNotices: Effect;
-    changeNoticeReadState: Effect;
-  };
-  reducers: {
-    changeLayoutCollapsed: Reducer<GlobalModelState>;
-    saveNotices: Reducer<GlobalModelState>;
-    saveClearedNotices: Reducer<GlobalModelState>;
-  };
-  subscriptions: { setup: Subscription };
-}
-
-const GlobalModel: GlobalModelType = {
-  namespace: 'global',
-
-  state: {
-    collapsed: false,
-    notices: [],
-  },
-
-  effects: {
-    *fetchNotices(_, { call, put, select }) {
-      const data = yield call(queryNotices);
-      yield put({
-        type: 'saveNotices',
-        payload: data,
-      });
-      const unreadCount: number = yield select(
-        (state: ConnectState) => state.global.notices.filter((item) => !item.read).length,
-      );
-      yield put({
-        type: 'user/changeNotifyCount',
-        payload: {
-          totalCount: data.length,
-          unreadCount,
-        },
-      });
-    },
-    *clearNotices({ payload }, { put, select }) {
-      yield put({
-        type: 'saveClearedNotices',
-        payload,
-      });
-      const count: number = yield select((state: ConnectState) => state.global.notices.length);
-      const unreadCount: number = yield select(
-        (state: ConnectState) => state.global.notices.filter((item) => !item.read).length,
-      );
-      yield put({
-        type: 'user/changeNotifyCount',
-        payload: {
-          totalCount: count,
-          unreadCount,
-        },
-      });
-    },
-    *changeNoticeReadState({ payload }, { put, select }) {
-      const notices: NoticeItem[] = yield select((state: ConnectState) =>
-        state.global.notices.map((item) => {
-          const notice = { ...item };
-          if (notice.id === payload) {
-            notice.read = true;
-          }
-          return notice;
-        }),
-      );
-
-      yield put({
-        type: 'saveNotices',
-        payload: notices,
-      });
-
-      yield put({
-        type: 'user/changeNotifyCount',
-        payload: {
-          totalCount: notices.length,
-          unreadCount: notices.filter((item) => !item.read).length,
-        },
-      });
-    },
-  },
-
-  reducers: {
-    changeLayoutCollapsed(state = { notices: [], collapsed: true }, { payload }): GlobalModelState {
-      return {
-        ...state,
-        collapsed: payload,
-      };
-    },
-    saveNotices(state, { payload }): GlobalModelState {
-      return {
-        collapsed: false,
-        ...state,
-        notices: payload,
-      };
-    },
-    saveClearedNotices(state = { notices: [], collapsed: true }, { payload }): GlobalModelState {
-      return {
-        ...state,
-        collapsed: false,
-        notices: state.notices.filter((item): boolean => item.type !== payload),
-      };
-    },
-  },
-
-  subscriptions: {
-    setup({ history }): void {
-      // Subscribe history(url) change, trigger `load` action if pathname is `/`
-      history.listen(({ pathname, search }): void => {
-        if (typeof window.ga !== 'undefined') {
-          window.ga('send', 'pageview', pathname + search);
-        }
-      });
-    },
-  },
-};
-
-export default GlobalModel;
diff --git a/src/models/setting.ts b/src/models/setting.ts
deleted file mode 100644
index 37a4ea7..0000000
--- a/src/models/setting.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Reducer } from 'umi';
-import defaultSettings, { DefaultSettings } from '../../config/defaultSettings';
-
-export interface SettingModelType {
-  namespace: 'settings';
-  state: DefaultSettings;
-  reducers: {
-    changeSetting: Reducer<DefaultSettings>;
-  };
-}
-
-const updateColorWeak: (colorWeak: boolean) => void = (colorWeak) => {
-  const root = document.getElementById('root');
-  if (root) {
-    root.className = colorWeak ? 'colorWeak' : '';
-  }
-};
-
-const SettingModel: SettingModelType = {
-  namespace: 'settings',
-  state: defaultSettings,
-  reducers: {
-    changeSetting(state = defaultSettings, { payload }) {
-      const { colorWeak, contentWidth } = payload;
-
-      if (state.contentWidth !== contentWidth && window.dispatchEvent) {
-        window.dispatchEvent(new Event('resize'));
-      }
-      updateColorWeak(!!colorWeak);
-      return {
-        ...state,
-        ...payload,
-      };
-    },
-  },
-};
-export default SettingModel;
diff --git a/src/models/user.ts b/src/models/user.ts
deleted file mode 100644
index ff5160d..0000000
--- a/src/models/user.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { Effect, Reducer } from 'umi';
-
-import { queryCurrent, query as queryUsers } from '@/services/user';
-
-export interface CurrentUser {
-  avatar?: string;
-  name?: string;
-  title?: string;
-  group?: string;
-  signature?: string;
-  tags?: {
-    key: string;
-    label: string;
-  }[];
-  userid?: string;
-  unreadCount?: number;
-}
-
-export interface UserModelState {
-  currentUser?: CurrentUser;
-}
-
-export interface UserModelType {
-  namespace: 'user';
-  state: UserModelState;
-  effects: {
-    fetch: Effect;
-    fetchCurrent: Effect;
-  };
-  reducers: {
-    saveCurrentUser: Reducer<UserModelState>;
-    changeNotifyCount: Reducer<UserModelState>;
-  };
-}
-
-const UserModel: UserModelType = {
-  namespace: 'user',
-
-  state: {
-    currentUser: {},
-  },
-
-  effects: {
-    *fetch(_, { call, put }) {
-      const response = yield call(queryUsers);
-      yield put({
-        type: 'save',
-        payload: response,
-      });
-    },
-    *fetchCurrent(_, { call, put }) {
-      const response = yield call(queryCurrent);
-      yield put({
-        type: 'saveCurrentUser',
-        payload: response,
-      });
-    },
-  },
-
-  reducers: {
-    saveCurrentUser(state, action) {
-      return {
-        ...state,
-        currentUser: action.payload || {},
-      };
-    },
-    changeNotifyCount(
-      state = {
-        currentUser: {},
-      },
-      action,
-    ) {
-      return {
-        ...state,
-        currentUser: {
-          ...state.currentUser,
-          notifyCount: action.payload.totalCount,
-          unreadCount: action.payload.unreadCount,
-        },
-      };
-    },
-  },
-};
-
-export default UserModel;
diff --git a/src/models/xsyModel.ts b/src/models/xsyModel.ts
deleted file mode 100644
index 183ef15..0000000
--- a/src/models/xsyModel.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-export default {
-  namespace: 'xsyModel',
-  state: {
-    sectionId: '',
-    turnId: '',
-  },
-  effects: {
-    *fetchSecIdTurnId({ payload, callback }:any, { call, put }:any) {
-      const params = { sectionId: payload.sectionId, turnId: payload.turnId };
-      yield put({ type: 'save', payload: params })
-    }
-  },
-  reducers: {
-    save(state: any, { payload }: any) {
-      return {
-        sectionId:payload.sectionId,
-        turnId:payload.turnId,
-
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/pages/401.tsx b/src/pages/401.tsx
deleted file mode 100644
index 9810220..0000000
--- a/src/pages/401.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import { logoutTokenApi } from '@/services/login';
-import { getURLInformation, isNotEmpty } from '@/utils/CommonUtils';
-import { getSessionRoleData } from '@/utils/session';
-import { Button, Result, Typography } from 'antd';
-import React, { useEffect, useState } from 'react';
-import { history } from 'umi';
-
-const messageMap = {
-  401: '您的用户信息有误，请联系管理员',
-  402: '您的用户角色信息缺失，请联系管理员',
-  403: '您的用户角色信息异常，请重新登录',
-  90401: '您的登录已超时，请重新登录',
-  404: '系统错误，请联系管理员',
-  405: '您的用户无权限访问'
-};
-
-const RequestTimeoutPage: React.FC<{}> = () => {
-  const code: any = getURLInformation('code') == null ? '404' : getURLInformation('code');
-  const { Text } = Typography;
-  const [time, setTime] = useState<number>(10);
-  const roleData = getSessionRoleData();
-  // const token = sessionStorage.getItem('Authorization');
-
-  useEffect(() => {
-    let timeInteval: any
-    if (code == 402 && isNotEmpty(roleData)) {
-      timeInteval = setInterval(() => { // 倒计时
-        setTime(n => {
-          if (n == 1) {
-            clearInterval(timeInteval)
-            redirect();
-          }
-          return n - 1;
-        })
-      }, 1000);
-    } else {
-      clearInterval(timeInteval);
-    }
-    return () => {
-      clearInterval(timeInteval);
-    }
-  }, []);
-
-  const redirect = () => {
-    if (isNotEmpty(roleData)) {
-      history.replace({
-        pathname: '/Dashboard',
-      })
-    }
-  }
-  const redirectLogin = () => {
-    logoutTokenApi().then(res => {
-      history.replace({
-        pathname: '/userformal/login',
-      })
-    })
-  }
-
-  return (
-    <Result
-      title={messageMap[code]}
-      extra={isNotEmpty(roleData) && code == 402 ? <Text type="secondary" strong>{time}秒后进入默认角色</Text> : code == 403 ? <Button type="primary" onClick={() => redirectLogin()}>重新登录</Button> : null}
-    />
-  );
-};
-
-export default RequestTimeoutPage;
diff --git a/src/pages/register/DomesticForm.tsx b/src/pages/register/DomesticForm.tsx
deleted file mode 100644
index 4c78709..0000000
--- a/src/pages/register/DomesticForm.tsx
+++ /dev/null
@@ -1,949 +0,0 @@
-/* 境内企业/机构 表单项 */
-import React from 'react';
-import { Form, Input, Button, Select, Upload, DatePicker, Row, Col, Table, Cascader } from 'antd';
-import {
-  MobileOutlined,
-  MailOutlined,
-  EnvironmentOutlined,
-  UploadOutlined,
-  PlusOutlined,
-  DeleteOutlined,
-} from '@ant-design/icons';
-import { Radio } from 'antd';
-import { message } from 'antd';
-
-const { Option } = Select;
-const { TextArea } = Input;
-
-// 中国省市区级联数据
-const addressOptions = [
-  {
-    value: '330000',
-    label: '浙江省',
-    children: [
-      {
-        value: '330100',
-        label: '杭州市',
-        children: [
-          { value: '330102', label: '上城区' },
-          { value: '330103', label: '下城区' },
-          { value: '330104', label: '江干区' },
-          { value: '330105', label: '拱墅区' },
-          { value: '330106', label: '西湖区' },
-          { value: '330108', label: '滨江区' },
-        ],
-      },
-      {
-        value: '330200',
-        label: '宁波市',
-        children: [
-          { value: '330203', label: '海曙区' },
-          { value: '330205', label: '江北区' },
-          { value: '330206', label: '北仑区' },
-          { value: '330211', label: '镇海区' },
-          { value: '330212', label: '鄞州区' },
-        ],
-      },
-    ],
-  },
-  {
-    value: '310000',
-    label: '上海市',
-    children: [
-      {
-        value: '310100',
-        label: '上海市',
-        children: [
-          { value: '310101', label: '黄浦区' },
-          { value: '310104', label: '徐汇区' },
-          { value: '310105', label: '长宁区' },
-          { value: '310106', label: '静安区' },
-          { value: '310107', label: '普陀区' },
-          { value: '310109', label: '虹口区' },
-          { value: '310110', label: '杨浦区' },
-          { value: '310112', label: '闵行区' },
-        ],
-      },
-    ],
-  },
-  {
-    value: '440000',
-    label: '广东省',
-    children: [
-      {
-        value: '440100',
-        label: '广州市',
-        children: [
-          { value: '440103', label: '荔湾区' },
-          { value: '440104', label: '越秀区' },
-          { value: '440105', label: '海珠区' },
-          { value: '440106', label: '天河区' },
-          { value: '440111', label: '白云区' },
-          { value: '440112', label: '黄埔区' },
-        ],
-      },
-      {
-        value: '440300',
-        label: '深圳市',
-        children: [
-          { value: '440303', label: '罗湖区' },
-          { value: '440304', label: '福田区' },
-          { value: '440305', label: '南山区' },
-          { value: '440306', label: '宝安区' },
-          { value: '440307', label: '龙岗区' },
-          { value: '440308', label: '盐田区' },
-        ],
-      },
-    ],
-  },
-  {
-    value: '110000',
-    label: '北京市',
-    children: [
-      {
-        value: '110100',
-        label: '北京市',
-        children: [
-          { value: '110101', label: '东城区' },
-          { value: '110102', label: '西城区' },
-          { value: '110105', label: '朝阳区' },
-          { value: '110106', label: '丰台区' },
-          { value: '110107', label: '石景山区' },
-          { value: '110108', label: '海淀区' },
-        ],
-      },
-    ],
-  },
-];
-
-interface DomesticFormProps {
-  form: any;
-  countdown: number;
-  handleGetCaptcha: () => void;
-}
-
-const DomesticForm: React.FC<DomesticFormProps> = ({ form, countdown, handleGetCaptcha }) => {
-  return (
-    <>
-      <div className="form-section-title">基本信息</div>
-
-      {/* 营业执照附件和有效期 */}
-      <Row gutter={24}>
-        <Col span={8}>
-          <Form.Item
-            name="businessLicense"
-            label="营业执照附件"
-            rules={[{ required: true, message: '请上传营业执照附件' }]}
-          >
-            <Upload
-              name="businessLicense"
-              action="/api/upload"
-              listType="text"
-              maxCount={1}
-              beforeUpload={(file) => {
-                const isValidFormat =
-                  file.type === 'application/pdf' ||
-                  file.type === 'image/jpeg' ||
-                  file.type === 'image/png';
-                if (!isValidFormat) {
-                  message.error('只能上传PDF/JPG/PNG格式文件!');
-                }
-                const isLt10M = file.size / 1024 / 1024 < 10;
-                if (!isLt10M) {
-                  message.error('文件大小不能超过10MB!');
-                }
-                return isValidFormat && isLt10M;
-              }}
-            >
-              <Button icon={<UploadOutlined />}>上传文件</Button>
-            </Upload>
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="businessLicenseExpiry"
-            label="营业执照有效期"
-            rules={[{ required: false, message: '请选择营业执照有效期' }]}
-          >
-            <DatePicker placeholder="请选择日期" style={{ width: '100%' }} />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="companyName"
-            label="企业名称"
-            rules={[{ required: true, message: '请输入企业名称' }]}
-          >
-            <Input placeholder="请输入企业名称" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="socialCreditCode"
-            label="统一社会信用代码"
-            rules={[
-              { required: true, message: '请输入统一社会信用代码' },
-              { pattern: /^[0-9A-HJ-NPQRTUWXY]{18}$/, message: '请输入正确的统一社会信用代码' },
-            ]}
-          >
-            <Input placeholder="请输入正确的统一社会信用代码" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="legalPerson"
-            label="企业法定代表人"
-            rules={[{ required: true, message: '请输入企业法定代表人/负责人' }]}
-          >
-            <Input placeholder="张三" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="registeredCapitalGroup"
-            label="注册资本"
-            rules={[{ required: true, message: '请输入注册资本' }]}
-          >
-            <Input.Group compact style={{ display: 'flex' }}>
-              <span
-                style={{
-                  display: 'flex',
-                  alignItems: 'center',
-                  padding: '0 11px',
-                  border: '1px solid #d9d9d9',
-                  borderRight: 0,
-                  backgroundColor: '#f5f5f5',
-                  borderRadius: '2px 0 0 2px',
-                }}
-              >
-                人民币
-              </span>
-              <Form.Item
-                name="registeredCapital"
-                noStyle
-                rules={[{ required: true, message: '请输入注册资本金额' }]}
-              >
-                <Input
-                  type="number"
-                  placeholder="请输入金额"
-                  style={{ flex: 1, borderRadius: '0' }}
-                />
-              </Form.Item>
-              <span
-                style={{
-                  display: 'flex',
-                  alignItems: 'center',
-                  padding: '0 11px',
-                  border: '1px solid #d9d9d9',
-                  borderLeft: 0,
-                  backgroundColor: '#f5f5f5',
-                  borderRadius: '0 2px 2px 0',
-                }}
-              >
-                万元
-              </span>
-            </Input.Group>
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="companyType"
-            label="企业性质"
-            rules={[{ required: true, message: '请选择企业性质' }]}
-          >
-            <Select placeholder="请选择企业性质">
-              <Option value="limited">有限责任公司</Option>
-              <Option value="joint">股份有限公司</Option>
-              <Option value="individual">个体工商户</Option>
-              <Option value="other">其他</Option>
-            </Select>
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="supplierType"
-            label="供应商类型"
-            rules={[{ required: true, message: '请选择供应商类型' }]}
-          >
-            <Select placeholder="请选择类型">
-              <Option value="manufacturer">制造商</Option>
-              <Option value="agent">代理商</Option>
-              <Option value="service">服务商</Option>
-              <Option value="other">其他</Option>
-            </Select>
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item name="parentCompanyInfo" label="母公司/出资人">
-            <Input placeholder="请输入母公司或出资人信息" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="registeredAddress"
-            label="注册地址"
-            rules={[{ required: true, message: '请输入注册地址' }]}
-          >
-            <Input prefix={<EnvironmentOutlined />} placeholder="上海市普陀区XX路1888号" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item name="officeAddress" label="办公地址">
-            <Input
-              prefix={<EnvironmentOutlined />}
-              placeholder="请具体注明省、市、区、路、门牌号"
-            />
-          </Form.Item>
-        </Col>
-        <Col span={24}>
-          <Form.Item
-            name="businessScope"
-            label="经营范围"
-            rules={[{ required: true, message: '请输入经营范围' }]}
-            labelCol={{ span: 2 }}
-            wrapperCol={{ span: 21 }}
-          >
-            <TextArea
-              placeholder="金融专用产品、广告传媒"
-              rows={2}
-              maxLength={200}
-              showCount
-              style={{ resize: 'none' }}
-            />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="contactPerson"
-            label="联系人姓名"
-            rules={[{ required: true, message: '请输入联系人姓名' }]}
-          >
-            <Input placeholder="请输入联系人姓名" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="contactPhone"
-            label="联系人手机"
-            rules={[
-              { required: true, message: '请输入联系人手机号' },
-              { pattern: /^1[3-9]\d{9}$/, message: '请输入有效的手机号' },
-            ]}
-          >
-            <Input prefix={<MobileOutlined />} placeholder="请输入11位手机号码" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="captcha"
-            label="验证码"
-            rules={[{ required: true, message: '请输入验证码' }]}
-          >
-            <Row gutter={8}>
-              <Col span={14}>
-                <Input placeholder="请输入短信验证码" />
-              </Col>
-              <Col span={10}>
-                <Button
-                  type="primary"
-                  style={{ marginTop: 0 }}
-                  disabled={countdown > 0}
-                  onClick={handleGetCaptcha}
-                >
-                  {countdown > 0 ? `${countdown}s` : '获取验证码'}
-                </Button>
-              </Col>
-            </Row>
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item name="contactIdType" label="联系人身份类别">
-            <Select placeholder="请选择类型">
-              <Option value="idcard">居民身份证</Option>
-              <Option value="passport">护照</Option>
-              <Option value="other">其他证件</Option>
-            </Select>
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item name="contactIdNumber" label="联系人证件号码">
-            <Input placeholder="请填写联系人正确的身份证号" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="contactEmail"
-            label="联系人邮箱"
-            rules={[
-              { type: 'email', message: '请输入有效的电子邮箱' },
-              { required: true, message: '请输入电子邮箱' },
-            ]}
-          >
-            <Input prefix={<MailOutlined />} placeholder="请输入企业联系电话" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item name="telephone" label="固定电话">
-            <Input placeholder="XXX@XXX.com" />
-          </Form.Item>
-        </Col>
-      </Row>
-
-      {/* 资质信息 */}
-      <div className="form-section-title">资质信息</div>
-
-      <Form.List name="qualifications">
-        {(fields, { add, remove }) => (
-          <>
-            <Table
-              dataSource={fields.map((field) => ({
-                ...field,
-                key: field.key,
-                fieldKey: field.name,
-              }))}
-              pagination={false}
-              bordered
-              size="middle"
-              className="qualification-table"
-              rowKey="key"
-              columns={[
-                {
-                  title: '序号',
-                  dataIndex: 'name',
-                  width: 60,
-                  render: (_, __, index) => index + 1,
-                },
-                {
-                  title: '资质证书类型',
-                  dataIndex: 'certType',
-                  render: (_, record) => (
-                    <Form.Item
-                      name={[record.name, 'certType']}
-                      noStyle
-                      rules={[{ required: true, message: '请选择资质证书类型' }]}
-                    >
-                      <Select placeholder="请选择类型" style={{ width: '100%' }}>
-                        <Option value="机构资质">机构资质</Option>
-                        <Option value="CMMI资质等级">CMMI资质等级</Option>
-                        <Option value="质量体系认证">质量体系认证</Option>
-                        <Option value="环境管理体系认证">环境管理体系认证</Option>
-                        <Option value="行业资质">行业资质</Option>
-                      </Select>
-                    </Form.Item>
-                  ),
-                },
-                {
-                  title: '资质名称',
-                  dataIndex: 'certName',
-                  render: (_, record) => (
-                    <Form.Item
-                      name={[record.name, 'certName']}
-                      noStyle
-                      rules={[{ required: true, message: '请输入资质名称' }]}
-                    >
-                      <Input placeholder="请输入资质名称" />
-                    </Form.Item>
-                  ),
-                },
-                {
-                  title: '资质证书编号',
-                  dataIndex: 'certNumber',
-                  render: (_, record) => (
-                    <Form.Item
-                      name={[record.name, 'certNumber']}
-                      noStyle
-                      rules={[{ required: true, message: '请输入资质证书编号' }]}
-                    >
-                      <Input placeholder="请输入证书编号" />
-                    </Form.Item>
-                  ),
-                },
-                {
-                  title: '资质类别和等级',
-                  dataIndex: 'certLevel',
-                  render: (_, record) => (
-                    <Form.Item name={[record.name, 'certLevel']} noStyle>
-                      <Input placeholder="请输入资质类别和等级" />
-                    </Form.Item>
-                  ),
-                },
-                {
-                  title: '发证机构',
-                  dataIndex: 'issuingAuthority',
-                  render: (_, record) => (
-                    <Form.Item
-                      name={[record.name, 'issuingAuthority']}
-                      noStyle
-                      rules={[{ required: true, message: '请输入发证机构' }]}
-                    >
-                      <Input placeholder="请输入发证机构" />
-                    </Form.Item>
-                  ),
-                },
-                {
-                  title: '发证日期',
-                  dataIndex: 'issueDate',
-                  render: (_, record) => (
-                    <Form.Item
-                      name={[record.name, 'issueDate']}
-                      noStyle
-                      rules={[{ required: true, message: '请选择发证日期' }]}
-                    >
-                      <DatePicker placeholder="年/月/日" style={{ width: '100%' }} />
-                    </Form.Item>
-                  ),
-                },
-                {
-                  title: '资质有效期至',
-                  dataIndex: 'expiryDate',
-                  render: (_, record) => (
-                    <Form.Item
-                      name={[record.name, 'expiryDate']}
-                      noStyle
-                      rules={[{ required: true, message: '请选择资质有效期' }]}
-                    >
-                      <DatePicker placeholder="年/月/日" style={{ width: '100%' }} />
-                    </Form.Item>
-                  ),
-                },
-                {
-                  title: '附件',
-                  dataIndex: 'certFile',
-                  render: (_, record) => (
-                    <Form.Item
-                      name={[record.name, 'certFile']}
-                      noStyle
-                      rules={[{ required: true, message: '请上传资质证书附件' }]}
-                    >
-                      <Upload name="certFile" action="/api/upload" listType="text" maxCount={1}>
-                        <Button type="link" size="small">
-                          上传
-                        </Button>
-                      </Upload>
-                    </Form.Item>
-                  ),
-                },
-                {
-                  title: '操作',
-                  width: 70,
-                  render: (_, record) => (
-                    <Button
-                      type="link"
-                      danger
-                      icon={<DeleteOutlined />}
-                      onClick={() => remove(record.name)}
-                    >
-                      删除
-                    </Button>
-                  ),
-                },
-              ]}
-            />
-            <Form.Item style={{ marginTop: 16 }} wrapperCol={{ span: 24 }}>
-              <Button type="dashed" onClick={() => add()} block icon={<PlusOutlined />}>
-                添加行
-              </Button>
-            </Form.Item>
-          </>
-        )}
-      </Form.List>
-
-      <div className="form-section-title">开票信息</div>
-
-      <Row gutter={24}>
-        <Col span={8}>
-          <Form.Item
-            name="invoiceType"
-            label="纳税人类型"
-            rules={[{ required: true, message: '请选择纳税人类型' }]}
-          >
-            <Select placeholder="请选择纳税人类型">
-              <Option value="general">一般纳税人</Option>
-              <Option value="small">小规模纳税人</Option>
-            </Select>
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="invoiceTitle"
-            label="开票抬头"
-            rules={[{ required: true, message: '请输入开票抬头' }]}
-          >
-            <Input placeholder="请输入开票抬头" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="taxpayerNumber"
-            label="纳税人识别号"
-            rules={[{ required: true, message: '请输入纳税人识别号' }]}
-          >
-            <Input placeholder="请输入纳税人识别号" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item name="invoiceAddress" label="开票地址">
-            <Input placeholder="请输入开票地址" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item name="invoicePhone" label="开票电话">
-            <Input placeholder="请输入开票电话" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item name="invoiceBank" label="开票户行">
-            <Input placeholder="请输入开票银行" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item name="bankAccountNumber" label="开票户行账号">
-            <Input placeholder="请输入开票户行账号" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item name="generalTaxpayerCert" label="一般纳税人资格证明">
-            <Upload
-              name="generalTaxpayerCert"
-              action="/api/upload"
-              listType="text"
-              maxCount={1}
-              beforeUpload={(file) => {
-                const isValidFormat =
-                  file.type === 'application/pdf' ||
-                  file.type === 'image/jpeg' ||
-                  file.type === 'image/png';
-                if (!isValidFormat) {
-                  message.error('只能上传PDF/JPG/PNG格式文件!');
-                }
-                const isLt10M = file.size / 1024 / 1024 < 10;
-                if (!isLt10M) {
-                  message.error('文件大小不能超过10MB!');
-                }
-                return isValidFormat && isLt10M;
-              }}
-            >
-              <Button icon={<UploadOutlined />}>上传文件</Button>
-            </Upload>
-          </Form.Item>
-        </Col>
-      </Row>
-
-      <div className="form-section-title">银行账户</div>
-
-      <Form.List name="bankAccounts">
-        {(fields, { add, remove }) => (
-          <>
-            <Table
-              dataSource={fields.map((field) => ({
-                ...field,
-                key: field.key,
-                fieldKey: field.name,
-              }))}
-              pagination={false}
-              bordered
-              size="middle"
-              className="qualification-table"
-              rowKey="key"
-              columns={[
-                {
-                  title: '序号',
-                  dataIndex: 'name',
-                  width: 60,
-                  render: (_, __, index) => index + 1,
-                },
-                {
-                  title: '开户银行',
-                  dataIndex: 'bankName',
-                  render: (_, record) => (
-                    <Form.Item
-                      name={[record.name, 'bankName']}
-                      noStyle
-                      rules={[{ required: true, message: '请输入开户银行' }]}
-                    >
-                      <Input placeholder="请输入开户银行" />
-                    </Form.Item>
-                  ),
-                },
-                {
-                  title: '账户名称',
-                  dataIndex: 'accountName',
-                  render: (_, record) => (
-                    <Form.Item
-                      name={[record.name, 'accountName']}
-                      noStyle
-                      rules={[{ required: true, message: '请输入账户名称' }]}
-                    >
-                      <Input placeholder="请输入账户名称" />
-                    </Form.Item>
-                  ),
-                },
-                {
-                  title: '账号',
-                  dataIndex: 'accountNumber',
-                  render: (_, record) => (
-                    <Form.Item
-                      name={[record.name, 'accountNumber']}
-                      noStyle
-                      rules={[{ required: true, message: '请输入账号' }]}
-                    >
-                      <Input placeholder="请输入账号" />
-                    </Form.Item>
-                  ),
-                },
-                {
-                  title: '国家、省、市',
-                  dataIndex: 'location',
-                  render: (_, record) => (
-                    <Form.Item
-                      name={[record.name, 'address']}
-                      noStyle
-                      rules={[{ required: true, message: '请选择地址' }]}
-                    >
-                      <Cascader
-                        options={addressOptions}
-                        placeholder="请选择省市区"
-                        showSearch={{
-                          filter: (inputValue, path) => {
-                            return path.some((option) => {
-                              if (typeof option.label === 'string') {
-                                return (
-                                  option.label.toLowerCase().indexOf(inputValue.toLowerCase()) > -1
-                                );
-                              }
-                              return false;
-                            });
-                          },
-                        }}
-                      />
-                    </Form.Item>
-                  ),
-                },
-                {
-                  title: '操作',
-                  width: 70,
-                  render: (_, record) => (
-                    <Button
-                      type="link"
-                      danger
-                      icon={<DeleteOutlined />}
-                      onClick={() => remove(record.name)}
-                    >
-                      删除
-                    </Button>
-                  ),
-                },
-              ]}
-            />
-            <Form.Item style={{ marginTop: 16 }} wrapperCol={{ span: 24 }}>
-              <Button type="dashed" onClick={() => add()} block icon={<PlusOutlined />}>
-                添加行
-              </Button>
-            </Form.Item>
-          </>
-        )}
-      </Form.List>
-
-      <div className="form-section-title">社会准则符合性自查问卷</div>
-
-      <div className="questionnaire-header">填写人信息：</div>
-      <Row gutter={24}>
-        <Col span={8}>
-          <Form.Item
-            name="surveyCompanyName"
-            label="供应商名称"
-            rules={[{ required: true, message: '请输入供应商名称' }]}
-          >
-            <Input placeholder="请输入供应商名称" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="surveyPersonName"
-            label="姓名"
-            rules={[{ required: true, message: '请输入姓名' }]}
-          >
-            <Input placeholder="请输入姓名" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="surveyPosition"
-            label="职位"
-            rules={[{ required: true, message: '请输入职位' }]}
-          >
-            <Input placeholder="请输入职位" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="surveyPhone"
-            label="电话号"
-            rules={[{ required: true, message: '请输入电话号' }]}
-          >
-            <Input placeholder="请输入电话号" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="surveyEmail"
-            label="邮箱"
-            rules={[
-              { type: 'email', message: '请输入有效的电子邮箱' },
-              { required: true, message: '请输入电子邮箱' },
-            ]}
-          >
-            <Input placeholder="请输入电子邮箱" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="surveyDate"
-            label="日期"
-            rules={[{ required: true, message: '请选择日期' }]}
-          >
-            <DatePicker placeholder="请选择日期" style={{ width: '100%' }} />
-          </Form.Item>
-        </Col>
-      </Row>
-
-      <div className="questionnaire-header" style={{ marginTop: '20px' }}>
-        问卷：
-      </div>
-      <Table
-        pagination={false}
-        bordered
-        size="middle"
-        rowKey="id"
-        dataSource={[
-          {
-            id: 1,
-            question:
-              '法律法规：\n我们确保经营和提供的产品服务遵守国家及各业务所在地的所有使用法律、法规及健康和安全：',
-          },
-          {
-            id: 2,
-            question:
-              '健康和安全：\n我们为员工提供符合法律法规的安全且健康的工作场所。我们建立安全管理体系，并向员工传达工作场所或生活设施的健康和安全标准，致力于减少工作对员工造成的伤害和疾病。',
-          },
-          {
-            id: 3,
-            question:
-              '环境：\n我们能够以环境友好的方式经营。我们遵守适用的环境法律、法规和标准，并建立有效的环境管理体系。\n我们遵守贵集团对相关产品或服务的部分附加环境要求，这些要求和规定体现在设计与产品规范的合同文档中。',
-          },
-          {
-            id: 4,
-            question:
-              '监督和记录\n我们保留记录遵守所有法律和此行为准则的必要文件，并根据要求为贵集团提供对文件的查看权。我们接允许贵集团在适当的时候，以验证行为准则执行为目的的现场勘查',
-          },
-        ]}
-        columns={[
-          {
-            title: '序号',
-            dataIndex: 'id',
-            width: 60,
-            align: 'center',
-          },
-          {
-            title: '问题',
-            dataIndex: 'question',
-            render: (text) => <div style={{ whiteSpace: 'pre-line' }}>{text}</div>,
-          },
-          {
-            title: '回复',
-            width: 650,
-            render: (_, record) => (
-              <Form.Item
-                name={['survey', `question${record.id}`]}
-                rules={[{ required: true, message: '请选择答案' }]}
-              >
-                <Radio.Group>
-                  <Radio value="yes">是</Radio>
-                  <Radio value="no">否</Radio>
-                  {record.id !== 1 && (
-                    <>
-                      <Radio value="partialYes">尚未完全符合，但将在企业发展中完善</Radio>
-                      <Radio value="noPlan">无任何计划</Radio>
-                    </>
-                  )}
-                </Radio.Group>
-              </Form.Item>
-            ),
-          },
-        ]}
-      />
-
-      <div className="form-section-title">供应商反商业贿赂承诺书</div>
-
-      <Row gutter={24}>
-        <Col span={12}>
-          <div className="upload-label">
-            请加盖公司公章后上传
-            <Button
-              type="link"
-              href="/templates/anti-bribery-template.docx"
-              download="供应商反商业贿赂承诺书模板.docx"
-            >
-              下载模版
-            </Button>
-          </div>
-          <Form.Item
-            name="antiBriberyDoc"
-            rules={[{ required: true, message: '请上传已盖章的反商业贿赂承诺书' }]}
-          >
-            <Upload
-              name="antiBriberyDoc"
-              action="/api/upload"
-              listType="text"
-              maxCount={1}
-              beforeUpload={(file) => {
-                const isValidFormat =
-                  file.type === 'application/pdf' ||
-                  file.type === 'application/msword' ||
-                  file.type ===
-                    'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
-                if (!isValidFormat) {
-                  message.error('只能上传PDF/DOC/DOCX格式文件!');
-                }
-                const isLt10M = file.size / 1024 / 1024 < 10;
-                if (!isLt10M) {
-                  message.error('文件大小不能超过10MB!');
-                }
-                return isValidFormat && isLt10M;
-              }}
-            >
-              <Button icon={<UploadOutlined />}>上传文件</Button>
-            </Upload>
-          </Form.Item>
-        </Col>
-      </Row>
-
-      <div className="form-section-title">其他附件</div>
-
-      <Row gutter={24}>
-        <Col span={24}>
-          <Form.Item name="otherAttachments">
-            <div className="upload-label">其他附件（非必须上传）</div>
-            <Upload
-              name="otherAttachments"
-              action="/api/upload"
-              listType="text"
-              multiple
-              beforeUpload={(file) => {
-                const isLt20M = file.size / 1024 / 1024 < 20;
-                if (!isLt20M) {
-                  message.error('文件大小不能超过20MB!');
-                }
-                return isLt20M;
-              }}
-            >
-              <Button icon={<UploadOutlined />}>上传</Button>
-            </Upload>
-          </Form.Item>
-        </Col>
-      </Row>
-    </>
-  );
-};
-
-export default DomesticForm;
diff --git a/src/pages/register/supplier.tsx b/src/pages/register/supplier.tsx
index d418007..f86127f 100644
--- a/src/pages/register/supplier.tsx
+++ b/src/pages/register/supplier.tsx
@@ -1,10 +1,10 @@
 // 供应商注册
 import React, { useState } from 'react';
 import { useIntl, history } from 'umi';
-import { Form, Button, message, Radio } from 'antd';
+import { Form, Button, message, Radio, Checkbox, Modal } from 'antd';
 import { HomeOutlined } from '@ant-design/icons';
-import DomesticForm from './DomesticForm';
-import ForeignForm from './ForeignForm';
+import DomesticForm from './supplier/DomesticForm';
+import ForeignForm from './supplier/ForeignForm';
 import './register.less';
 
 const SupplierRegister: React.FC = () => {
@@ -13,6 +13,7 @@ const SupplierRegister: React.FC = () => {
   const [supplierType, setSupplierType] = useState<string>('domestic');
   const [loading, setLoading] = useState(false);
   const [countdown, setCountdown] = useState(0);
+  const [modalVisible, setModalVisible] = useState(false);
 
   // 获取短信验证码
   const handleGetCaptcha = () => {
@@ -74,15 +75,11 @@ const SupplierRegister: React.FC = () => {
           onFinish={onFinish}
           layout="horizontal"
           labelAlign="right"
-           size='large'
-          labelCol={{ span: 6 }}
-          wrapperCol={{ span: 18 }}
+          size="large"
+          labelCol={{ span: 7 }}
+          wrapperCol={{ span: 17 }}
         >
-          <Form.Item
-            label="企业类型"
-            labelCol={{ span:2 }}
-            wrapperCol={{ span: 19 }}
-          >
+          <Form.Item label="企业类型" labelCol={{ span: 2 }} wrapperCol={{ span: 19 }}>
             <Radio.Group onChange={handleSupplierTypeChange} value={supplierType}>
               <Radio.Button value="domestic">境内企业/机构</Radio.Button>
               <Radio.Button value="foreign">境外企业</Radio.Button>
@@ -94,20 +91,84 @@ const SupplierRegister: React.FC = () => {
           ) : (
             <ForeignForm form={form} countdown={countdown} handleGetCaptcha={handleGetCaptcha} />
           )}
-
-          <Form.Item wrapperCol={{ offset: 5, span: 14 }}>
-            <Button type="primary" htmlType="submit" loading={loading}>
-              {intl.formatMessage({ id: 'register.submit' })}
-            </Button>
-            <div style={{ marginTop: 16, textAlign: 'center' }}>
-              {intl.formatMessage({ id: 'register.hasAccount' })}
-              <a onClick={() => history.push('/login')} style={{ marginLeft: 8 }}>
-                {intl.formatMessage({ id: 'register.login' })}
-              </a>
+          <Form.Item
+            name="agreement"
+            valuePropName="checked"
+            labelCol={{ span: 2 }}
+            wrapperCol={{ span: 19 }}
+            rules={[
+              {
+                validator: (_, value) =>
+                  value
+                    ? Promise.resolve()
+                    : Promise.reject(new Error('请阅读并同意注册信息承诺书')),
+              },
+            ]}
+          >
+            <Checkbox>
+              我已阅读并同意
+              <Button
+                type="link"
+                onClick={(e) => {
+                  e.preventDefault();
+                  e.stopPropagation();
+                  setModalVisible(true);
+                }}
+              >
+                《注册信息承诺书》
+              </Button>
+            </Checkbox>
+          </Form.Item>
+          <Form.Item wrapperCol={{ span: 24 }}>
+            <div style={{ textAlign: 'center' }}>
+              <Button type="primary" htmlType="submit" loading={loading}>
+                {intl.formatMessage({ id: 'register.submit' })}
+              </Button>
             </div>
           </Form.Item>
         </Form>
       </div>
+
+      {/* 注册信息承诺书弹窗 */}
+      <Modal
+        title="注册信息承诺书"
+        visible={modalVisible}
+        onOk={() => {
+          console.log('点击了确定按钮');
+          setModalVisible(false);
+        }}
+        onCancel={() => {
+          console.log('点击了取消按钮');
+          setModalVisible(false);
+        }}
+        width={700}
+        okText="我知道了"
+        cancelButtonProps={{ style: { display: 'none' } }}
+        destroyOnClose
+        maskClosable={false}
+      >
+        <div style={{ maxHeight: '60vh', overflow: 'auto' }}>
+          <p>尊敬的用户：</p>
+          <p>感谢您注册使用我们的平台。请您仔细阅读以下承诺内容：</p>
+          <ol>
+            <li>
+              本人/单位承诺所提供的注册信息真实、准确、完整，不存在虚假记载、误导性陈述或重大遗漏。
+            </li>
+            <li>本人/单位承诺遵守平台的各项规则和要求，不从事任何违法违规活动。</li>
+            <li>
+              本人/单位了解并同意，如提供虚假信息或违反平台规则，平台有权终止服务并追究相关责任。
+            </li>
+            <li>本人/单位承诺妥善保管账号和密码，对账号下的所有操作和行为负责。</li>
+            <li>本人/单位同意平台在必要范围内合法使用所提供的信息，用于提供服务和改善用户体验。</li>
+            <li>
+              本人/单位承诺遵守国家法律法规和行业规范，恪守商业道德，不从事任何损害平台或其他用户利益的行为。
+            </li>
+            <li>本人/单位承诺所上传的资质文件和证明材料真实有效，并对其真实性和合法性负责。</li>
+            <li>本人/单位了解并同意，平台有权根据业务需要对用户资料进行审核，并保留最终解释权。</li>
+          </ol>
+          <p>特此承诺！</p>
+        </div>
+      </Modal>
     </div>
   );
 };
diff --git a/src/pages/register/ForeignForm.tsx b/src/pages/register/supplier/CommonFormSections.tsx
similarity index 66%
rename from src/pages/register/ForeignForm.tsx
rename to src/pages/register/supplier/CommonFormSections.tsx
index 3dfef78..56000b8 100644
--- a/src/pages/register/ForeignForm.tsx
+++ b/src/pages/register/supplier/CommonFormSections.tsx
@@ -1,10 +1,10 @@
-/* 境外企业 表单项 */
+/**
+ * 供应商注册表单通用部分
+ * 封装了国内企业和境外企业注册表单相同的部分
+ */
 import React from 'react';
-import { Form, Input, Button, Select, Upload, DatePicker, Row, Col, Cascader, Table, Radio } from 'antd';
+import { Form, Input, Button, Select, Upload, DatePicker, Row, Col, Table, Radio, Cascader } from 'antd';
 import {
-  MobileOutlined,
-  MailOutlined,
-  EnvironmentOutlined,
   UploadOutlined,
   PlusOutlined,
   DeleteOutlined,
@@ -12,10 +12,10 @@ import {
 import { message } from 'antd';
 
 const { Option } = Select;
-const { TextArea } = Input;
+const { LIST_IGNORE } = Upload;
 
 // 中国省市区级联数据
-const addressOptions = [
+export const addressOptions = [
   {
     value: '330000',
     label: '浙江省',
@@ -51,286 +51,17 @@ const addressOptions = [
   },
 ];
 
-interface ForeignFormProps {
+interface CommonFormSectionsProps {
   form: any;
-  countdown: number;
-  handleGetCaptcha: () => void;
 }
 
-const ForeignForm: React.FC<ForeignFormProps> = ({ form, countdown, handleGetCaptcha }) => {
+/**
+ * 资质信息表单部分
+ * 包含资质证书类型、名称、编号、等级、发证机构、发证日期、有效期等
+ */
+export const QualificationSection: React.FC<CommonFormSectionsProps> = ({ form }) => {
   return (
     <>
-      <div className="form-section-title">基本信息</div>
-
-      <Row gutter={24}>
-        <Col span={8}>
-          <Form.Item
-            name="companyName"
-            label="企业名称"
-            rules={[{ required: true, message: '请输入企业名称' }]}
-          >
-            <Input placeholder="请输入企业名称" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="companyEnglishName"
-            label="企业英文名称"
-            rules={[{ required: true, message: '请输入企业英文名称' }]}
-          >
-            <Input placeholder="请输入企业英文名称" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="companyRegNumber"
-            label="公司注册号"
-            rules={[{ required: true, message: '请输入公司注册号' }]}
-          >
-            <Input placeholder="请输入公司注册号" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="country"
-            label="国家/地区"
-            rules={[{ required: true, message: '请选择国家/地区' }]}
-          >
-            <Select placeholder="请选择国家/地区">
-              <Option value="US">美国</Option>
-              <Option value="UK">英国</Option>
-              <Option value="JP">日本</Option>
-              <Option value="DE">德国</Option>
-              <Option value="FR">法国</Option>
-              <Option value="AU">澳大利亚</Option>
-              <Option value="CA">加拿大</Option>
-              <Option value="SG">新加坡</Option>
-              <Option value="HK">中国香港</Option>
-              <Option value="OTHER">其他</Option>
-            </Select>
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="registrationPassword"
-            label="登录密码"
-            rules={[
-              { required: true, message: '请输入登录密码' },
-              { min: 8, message: '密码长度为8-20位' },
-              {
-                pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*])[A-Za-z\d!@#$%^&*]{8,20}$/,
-                message: '需要同时包含字母、数字、大小写',
-              },
-            ]}
-          >
-            <Input.Password placeholder="长度为8-20位，需要同时包含字母、数字、大小写" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="confirmPassword"
-            label="确认密码"
-            rules={[
-              { required: true, message: '请再次输入密码' },
-              ({ getFieldValue }) => ({
-                validator(_, value) {
-                  if (!value || getFieldValue('registrationPassword') === value) {
-                    return Promise.resolve();
-                  }
-                  return Promise.reject(new Error('两次输入的密码不一致'));
-                },
-              }),
-            ]}
-          >
-            <Input.Password placeholder="请再次输入密码" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="registeredAddress"
-            label="注册地址"
-            rules={[{ required: true, message: '请输入注册地址' }]}
-          >
-            <Input prefix={<EnvironmentOutlined />} placeholder="请具体注明" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item name="officeAddress" label="办公地址">
-            <Input prefix={<EnvironmentOutlined />} placeholder="请具体注明" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item name="parentCompanyInfo" label="母公司/出资人">
-            <Input placeholder="请输入母公司或出资人信息" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="legalPerson"
-            label="企业法定代表人"
-            rules={[{ required: true, message: '请输入企业法定代表人' }]}
-          >
-            <Input placeholder="请输入企业法定代表人" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="companyType"
-            label="企业性质"
-            rules={[{ required: true, message: '请选择企业性质' }]}
-          >
-            <Select placeholder="请选择企业性质">
-              <Option value="corporation">公司制企业</Option>
-              <Option value="partnership">合伙企业</Option>
-              <Option value="joint">合资企业</Option>
-              <Option value="sole">独资企业</Option>
-              <Option value="other">其他</Option>
-            </Select>
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="supplierType"
-            label="供应商类型"
-            rules={[{ required: true, message: '请选择供应商类型' }]}
-          >
-            <Select placeholder="请选择供应商类型">
-              <Option value="manufacturer">制造商</Option>
-              <Option value="agent">代理商</Option>
-              <Option value="service">服务商</Option>
-              <Option value="other">其他</Option>
-            </Select>
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="registeredCapitalGroup"
-            label="注册资本"
-            rules={[{ required: true, message: '请输入注册资本' }]}
-          >
-            <Input.Group compact style={{ display: 'flex' }}>
-              <Form.Item name="capitalCurrency" noStyle initialValue="USD">
-                <Select style={{ width: 100, borderRadius: '2px 0 0 2px' }}>
-                  <Option value="USD">美元</Option>
-                  <Option value="EUR">欧元</Option>
-                  <Option value="GBP">英镑</Option>
-                  <Option value="JPY">日元</Option>
-                  <Option value="HKD">港币</Option>
-                </Select>
-              </Form.Item>
-              <Form.Item
-                name="capitalAmount"
-                noStyle
-                rules={[{ required: true, message: '请输入金额' }]}
-              >
-                <Input
-                  type="number"
-                  placeholder="请输入金额"
-                  style={{ flex: 1, borderRadius: '0 2px 2px 0', marginLeft: -1 }}
-                />
-              </Form.Item>
-            </Input.Group>
-          </Form.Item>
-        </Col>
-        <Col span={16}>
-          <Form.Item
-            name="businessScope"
-            label="经营范围"
-            labelCol={{ span: 2 }}
-            wrapperCol={{ span: 21 }}
-            rules={[{ required: true, message: '请输入经营范围' }]}
-          >
-            <TextArea placeholder="请输入经营范围" rows={2} maxLength={200} showCount />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="contactName"
-            label="联系人姓名"
-            rules={[{ required: true, message: '请输入联系人姓名' }]}
-          >
-            <Input placeholder="请输入联系人姓名" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="contactPhone"
-            label="联系人手机"
-            rules={[
-              { required: true, message: '请输入联系人手机号码' },
-              { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码' },
-            ]}
-          >
-            <Input
-              placeholder="请输入11位手机号码"
-              prefix={<MobileOutlined />}
-              addonAfter={
-                <Button
-                  type="link"
-                  size="small"
-                  disabled={countdown > 0}
-                  onClick={handleGetCaptcha}
-                >
-                  {countdown ? `${countdown}秒后重新获取` : '获取验证码'}
-                </Button>
-              }
-            />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="verificationCode"
-            label="验证码"
-            rules={[
-              { required: true, message: '请输入验证码' },
-              { pattern: /^\d{6}$/, message: '请输入6位数字验证码' },
-            ]}
-            extra="该手机号用于后续联系和找回密码"
-          >
-            <Input placeholder="请输入验证码" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="contactIdType"
-            label="联系人身份类别"
-            rules={[{ required: true, message: '请选择联系人身份类别' }]}
-          >
-            <Select placeholder="请选择类型">
-              <Option value="internal">境内人士</Option>
-              <Option value="external">境外（非大陆人士）</Option>
-            </Select>
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="contactIdNumber"
-            label="联系人证件号码"
-            rules={[{ required: true, message: '请输入联系人证件号码' }]}
-          >
-            <Input placeholder="请填写联系人正确的身份证号" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name="contactEmail"
-            label="联系人邮箱"
-            rules={[
-              { type: 'email', message: '请输入有效的电子邮箱' },
-              { required: true, message: '请输入电子邮箱' },
-            ]}
-          >
-            <Input prefix={<MailOutlined />} placeholder="XXX@XXX.com" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item name="telephone" label="固定电话">
-            <Input placeholder="请输入企业联系电话" />
-          </Form.Item>
-        </Col>
-      </Row>
-
-      {/* 资质信息 */}
       <div className="form-section-title">资质信息</div>
 
       <Form.List name="qualifications">
@@ -485,8 +216,17 @@ const ForeignForm: React.FC<ForeignFormProps> = ({ form, countdown, handleGetCap
           </>
         )}
       </Form.List>
+    </>
+  );
+};
 
-      {/* 开票信息 */}
+/**
+ * 开票信息表单部分
+ * 包含纳税人类型、开票抬头、纳税人识别号、开票地址等
+ */
+export const InvoiceSection: React.FC<CommonFormSectionsProps> = ({ form }) => {
+  return (
+    <>
       <div className="form-section-title">开票信息</div>
 
       <Row gutter={24}>
@@ -567,8 +307,17 @@ const ForeignForm: React.FC<ForeignFormProps> = ({ form, countdown, handleGetCap
           </Form.Item>
         </Col>
       </Row>
+    </>
+  );
+};
 
-      {/* 银行账户 */}
+/**
+ * 银行账户表单部分
+ * 包含开户银行、账户名称、账号、所在地区等
+ */
+export const BankAccountSection: React.FC<CommonFormSectionsProps> = ({ form }) => {
+  return (
+    <>
       <div className="form-section-title">银行账户</div>
 
       <Form.List name="bankAccounts">
@@ -682,8 +431,17 @@ const ForeignForm: React.FC<ForeignFormProps> = ({ form, countdown, handleGetCap
           </>
         )}
       </Form.List>
+    </>
+  );
+};
 
-      {/* 社会准则符合性自查问卷 */}
+/**
+ * 社会准则符合性自查问卷部分
+ * 包含填写人信息和问卷内容
+ */
+export const SurveySection: React.FC<CommonFormSectionsProps> = ({ form }) => {
+  return (
+    <>
       <div className="form-section-title">社会准则符合性自查问卷</div>
 
       <div className="questionnaire-header">填写人信息：</div>
@@ -796,6 +554,7 @@ const ForeignForm: React.FC<ForeignFormProps> = ({ form, countdown, handleGetCap
               <Form.Item
                 name={['survey', `question${record.id}`]}
                 rules={[{ required: true, message: '请选择答案' }]}
+                wrapperCol={{ span: 24 }}
               >
                 <Radio.Group>
                   <Radio value="yes">是</Radio>
@@ -812,10 +571,17 @@ const ForeignForm: React.FC<ForeignFormProps> = ({ form, countdown, handleGetCap
           },
         ]}
       />
+    </>
+  );
+};
 
-      {/* 供应商反商业贿赂承诺书 */}
+/**
+ * 供应商反商业贿赂承诺书和其他附件部分
+ */
+export const AttachmentSection: React.FC<CommonFormSectionsProps> = ({ form }) => {
+  return (
+    <>
       <div className="form-section-title">供应商反商业贿赂承诺书</div>
-
       <Row gutter={24}>
         <Col span={12}>
           <div className="upload-label">
@@ -845,10 +611,12 @@ const ForeignForm: React.FC<ForeignFormProps> = ({ form, countdown, handleGetCap
                     'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
                 if (!isValidFormat) {
                   message.error('只能上传PDF/DOC/DOCX格式文件!');
+                  return LIST_IGNORE;
                 }
                 const isLt10M = file.size / 1024 / 1024 < 10;
                 if (!isLt10M) {
                   message.error('文件大小不能超过10MB!');
+                  return LIST_IGNORE;
                 }
                 return isValidFormat && isLt10M;
               }}
@@ -859,9 +627,7 @@ const ForeignForm: React.FC<ForeignFormProps> = ({ form, countdown, handleGetCap
         </Col>
       </Row>
 
-      {/* 其他附件 */}
       <div className="form-section-title">其他附件</div>
-
       <Row gutter={24}>
         <Col span={24}>
           <Form.Item name="otherAttachments">
@@ -875,6 +641,7 @@ const ForeignForm: React.FC<ForeignFormProps> = ({ form, countdown, handleGetCap
                 const isLt20M = file.size / 1024 / 1024 < 20;
                 if (!isLt20M) {
                   message.error('文件大小不能超过20MB!');
+                  return LIST_IGNORE;
                 }
                 return isLt20M;
               }}
@@ -887,5 +654,3 @@ const ForeignForm: React.FC<ForeignFormProps> = ({ form, countdown, handleGetCap
     </>
   );
 };
-
-export default ForeignForm;
diff --git a/src/pages/register/supplier/DomesticForm.tsx b/src/pages/register/supplier/DomesticForm.tsx
new file mode 100644
index 0000000..2858362
--- /dev/null
+++ b/src/pages/register/supplier/DomesticForm.tsx
@@ -0,0 +1,315 @@
+/* 境内企业/机构 表单项 */
+import React from 'react';
+import { Form, Input, Button, Select, Upload, DatePicker, Row, Col, message } from 'antd';
+import {
+  MobileOutlined,
+  MailOutlined,
+  EnvironmentOutlined,
+  UploadOutlined,
+} from '@ant-design/icons';
+
+/**
+ * 引入通用表单组件
+ */
+import {
+  QualificationSection,
+  InvoiceSection,
+  BankAccountSection,
+  SurveySection,
+  AttachmentSection,
+} from './CommonFormSections';
+
+const { Option } = Select;
+const { TextArea } = Input;
+
+// 移除不再需要的addressOptions
+
+interface DomesticFormProps {
+  form: any;
+  countdown: number;
+  handleGetCaptcha: () => void;
+}
+
+/**
+ * 境内企业注册表单
+ * 基本信息部分为境内企业特有
+ * 其他部分使用通用表单组件
+ */
+const DomesticForm: React.FC<DomesticFormProps> = ({ form, countdown, handleGetCaptcha }) => {
+  return (
+    <>
+      <div className="form-section-title">基本信息</div>
+
+      {/* 营业执照附件和有效期 */}
+      <Row gutter={24}>
+        <Col span={8}>
+          <Form.Item
+            name="businessLicense"
+            label="营业执照附件"
+            rules={[{ required: true, message: '请上传营业执照附件' }]}
+          >
+            <Upload
+              name="businessLicense"
+              action="/api/upload"
+              listType="text"
+              maxCount={1}
+              beforeUpload={(file) => {
+                const isValidFormat =
+                  file.type === 'application/pdf' ||
+                  file.type === 'image/jpeg' ||
+                  file.type === 'image/png';
+                if (!isValidFormat) {
+                  message.error('只能上传PDF/JPG/PNG格式文件!');
+                }
+                const isLt10M = file.size / 1024 / 1024 < 10;
+                if (!isLt10M) {
+                  message.error('文件大小不能超过10MB!');
+                }
+                return isValidFormat && isLt10M;
+              }}
+            >
+              <Button icon={<UploadOutlined />}>上传文件</Button>
+            </Upload>
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="businessLicenseExpiry"
+            label="营业执照有效期"
+            rules={[{ required: false, message: '请选择营业执照有效期' }]}
+          >
+            <DatePicker placeholder="请选择日期" style={{ width: '100%' }} />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="companyName"
+            label="企业名称"
+            rules={[{ required: true, message: '请输入企业名称' }]}
+          >
+            <Input placeholder="请输入企业名称" />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="socialCreditCode"
+            label="统一社会信用代码"
+            rules={[
+              { required: true, message: '请输入统一社会信用代码' },
+              { pattern: /^[0-9A-HJ-NPQRTUWXY]{18}$/, message: '请输入正确的统一社会信用代码' },
+            ]}
+          >
+            <Input placeholder="请输入正确的统一社会信用代码" />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="legalPerson"
+            label="企业法定代表人"
+            rules={[{ required: true, message: '请输入企业法定代表人/负责人' }]}
+          >
+            <Input placeholder="张三" />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="registeredCapitalGroup"
+            label="注册资本"
+            rules={[{ required: true, message: '请输入注册资本' }]}
+          >
+            <Input.Group compact style={{ display: 'flex' }}>
+              <span
+                style={{
+                  display: 'flex',
+                  alignItems: 'center',
+                  padding: '0 11px',
+                  border: '1px solid #d9d9d9',
+                  borderRight: 0,
+                  backgroundColor: '#f5f5f5',
+                  borderRadius: '2px 0 0 2px',
+                }}
+              >
+                人民币
+              </span>
+              <Form.Item
+                name="registeredCapital"
+                noStyle
+                rules={[{ required: true, message: '请输入注册资本金额' }]}
+              >
+                <Input
+                  type="number"
+                  placeholder="请输入金额"
+                  style={{ flex: 1, borderRadius: '0' }}
+                />
+              </Form.Item>
+              <span
+                style={{
+                  display: 'flex',
+                  alignItems: 'center',
+                  padding: '0 11px',
+                  border: '1px solid #d9d9d9',
+                  borderLeft: 0,
+                  backgroundColor: '#f5f5f5',
+                  borderRadius: '0 2px 2px 0',
+                }}
+              >
+                万元
+              </span>
+            </Input.Group>
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="companyType"
+            label="企业性质"
+            rules={[{ required: true, message: '请选择企业性质' }]}
+          >
+            <Select placeholder="请选择企业性质">
+              <Option value="limited">有限责任公司</Option>
+              <Option value="joint">股份有限公司</Option>
+              <Option value="individual">个体工商户</Option>
+              <Option value="other">其他</Option>
+            </Select>
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="supplierType"
+            label="供应商类型"
+            rules={[{ required: true, message: '请选择供应商类型' }]}
+          >
+            <Select placeholder="请选择类型">
+              <Option value="manufacturer">制造商</Option>
+              <Option value="agent">代理商</Option>
+              <Option value="service">服务商</Option>
+              <Option value="other">其他</Option>
+            </Select>
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item name="parentCompanyInfo" label="母公司/出资人">
+            <Input placeholder="请输入母公司或出资人信息" />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="registeredAddress"
+            label="注册地址"
+            rules={[{ required: true, message: '请输入注册地址' }]}
+          >
+            <Input prefix={<EnvironmentOutlined />} placeholder="上海市普陀区XX路1888号" />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item name="officeAddress" label="办公地址">
+            <Input
+              prefix={<EnvironmentOutlined />}
+              placeholder="请具体注明省、市、区、路、门牌号"
+            />
+          </Form.Item>
+        </Col>
+        <Col span={24}>
+          <Form.Item
+            name="businessScope"
+            label="经营范围"
+            rules={[{ required: true, message: '请输入经营范围' }]}
+            labelCol={{ span: 2 }}
+            wrapperCol={{ span: 21 }}
+          >
+            <TextArea
+              placeholder="金融专用产品、广告传媒"
+              rows={2}
+              maxLength={200}
+              showCount
+              style={{ resize: 'none' }}
+            />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="contactPerson"
+            label="联系人姓名"
+            rules={[{ required: true, message: '请输入联系人姓名' }]}
+          >
+            <Input placeholder="请输入联系人姓名" />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="contactPhone"
+            label="联系人手机"
+            rules={[
+              { required: true, message: '请输入联系人手机号' },
+              { pattern: /^1[3-9]\d{9}$/, message: '请输入有效的手机号' },
+            ]}
+          >
+            <Input prefix={<MobileOutlined />} placeholder="请输入11位手机号码" />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="captcha"
+            label="验证码"
+            rules={[{ required: true, message: '请输入验证码' }]}
+          >
+            <Row gutter={8}>
+              <Col span={14}>
+                <Input placeholder="请输入短信验证码" />
+              </Col>
+              <Col span={10}>
+                <Button
+                  type="primary"
+                  style={{ marginTop: 0 }}
+                  disabled={countdown > 0}
+                  onClick={handleGetCaptcha}
+                >
+                  {countdown > 0 ? `${countdown}s` : '获取验证码'}
+                </Button>
+              </Col>
+            </Row>
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item name="contactIdType" label="联系人身份类别">
+            <Select placeholder="请选择类型">
+              <Option value="idcard">居民身份证</Option>
+              <Option value="passport">护照</Option>
+              <Option value="other">其他证件</Option>
+            </Select>
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item name="contactIdNumber" label="联系人证件号码">
+            <Input placeholder="请填写联系人正确的身份证号" />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="contactEmail"
+            label="联系人邮箱"
+            rules={[
+              { type: 'email', message: '请输入有效的电子邮箱' },
+              { required: true, message: '请输入电子邮箱' },
+            ]}
+          >
+            <Input prefix={<MailOutlined />} placeholder="请输入企业联系电话" />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item name="telephone" label="固定电话">
+            <Input placeholder="XXX@XXX.com" />
+          </Form.Item>
+        </Col>
+      </Row>
+
+      {/* 使用通用表单组件 */}
+      <QualificationSection form={form} />
+      <InvoiceSection form={form} />
+      <BankAccountSection form={form} />
+      <SurveySection form={form} />
+      <AttachmentSection form={form} />
+    </>
+  );
+};
+
+export default DomesticForm;
diff --git a/src/pages/register/supplier/ForeignForm.tsx b/src/pages/register/supplier/ForeignForm.tsx
new file mode 100644
index 0000000..088e318
--- /dev/null
+++ b/src/pages/register/supplier/ForeignForm.tsx
@@ -0,0 +1,318 @@
+/* 境外企业 表单项 */
+import React from 'react';
+import { Form, Input, Button, Select, Row, Col } from 'antd';
+import {
+  MobileOutlined,
+  MailOutlined,
+  EnvironmentOutlined,
+} from '@ant-design/icons';
+/**
+ * 引入通用表单组件
+ */
+import {
+  QualificationSection,
+  InvoiceSection,
+  BankAccountSection,
+  SurveySection,
+  AttachmentSection,
+} from './CommonFormSections';
+
+const { Option } = Select;
+const { TextArea } = Input;
+
+interface ForeignFormProps {
+  form: any;
+  countdown: number;
+  handleGetCaptcha: () => void;
+}
+
+/**
+ * 境外企业注册表单
+ * 基本信息部分为境外企业特有
+ * 其他部分使用通用表单组件
+ */
+const ForeignForm: React.FC<ForeignFormProps> = ({ form, countdown, handleGetCaptcha }) => {
+  return (
+    <>
+      {/* 境外企业特有的基本信息部分 */}
+      <div className="form-section-title">基本信息</div>
+
+      <Row gutter={24}>
+        <Col span={8}>
+          <Form.Item
+            name="companyName"
+            label="企业名称"
+            rules={[{ required: true, message: '请输入企业名称' }]}
+          >
+            <Input placeholder="请输入企业名称" />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="companyEnglishName"
+            label="企业英文名称"
+            rules={[{ required: true, message: '请输入企业英文名称' }]}
+          >
+            <Input placeholder="请输入企业英文名称" />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="companyRegNumber"
+            label="公司注册号"
+            rules={[{ required: true, message: '请输入公司注册号' }]}
+          >
+            <Input placeholder="请输入公司注册号" />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="country"
+            label="国家/地区"
+            rules={[{ required: true, message: '请选择国家/地区' }]}
+          >
+            <Select placeholder="请选择国家/地区">
+              <Option value="US">美国</Option>
+              <Option value="UK">英国</Option>
+              <Option value="JP">日本</Option>
+              <Option value="DE">德国</Option>
+              <Option value="FR">法国</Option>
+              <Option value="AU">澳大利亚</Option>
+              <Option value="CA">加拿大</Option>
+              <Option value="SG">新加坡</Option>
+              <Option value="HK">中国香港</Option>
+              <Option value="OTHER">其他</Option>
+            </Select>
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="registrationPassword"
+            label="登录密码"
+            rules={[
+              { required: true, message: '请输入登录密码' },
+              { min: 8, message: '密码长度为8-20位' },
+              {
+                pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*])[A-Za-z\d!@#$%^&*]{8,20}$/,
+                message: '需要同时包含字母、数字、大小写',
+              },
+            ]}
+          >
+            <Input.Password placeholder="长度为8-20位，需要同时包含字母、数字、大小写" />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="confirmPassword"
+            label="确认密码"
+            rules={[
+              { required: true, message: '请再次输入密码' },
+              ({ getFieldValue }) => ({
+                validator(_, value) {
+                  if (!value || getFieldValue('registrationPassword') === value) {
+                    return Promise.resolve();
+                  }
+                  return Promise.reject(new Error('两次输入的密码不一致'));
+                },
+              }),
+            ]}
+          >
+            <Input.Password placeholder="请再次输入密码" />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="registeredAddress"
+            label="注册地址"
+            rules={[{ required: true, message: '请输入注册地址' }]}
+          >
+            <Input prefix={<EnvironmentOutlined />} placeholder="请具体注明" />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item name="officeAddress" label="办公地址">
+            <Input prefix={<EnvironmentOutlined />} placeholder="请具体注明" />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item name="parentCompanyInfo" label="母公司/出资人">
+            <Input placeholder="请输入母公司或出资人信息" />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="legalPerson"
+            label="企业法定代表人"
+            rules={[{ required: true, message: '请输入企业法定代表人' }]}
+          >
+            <Input placeholder="请输入企业法定代表人" />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="companyType"
+            label="企业性质"
+            rules={[{ required: true, message: '请选择企业性质' }]}
+          >
+            <Select placeholder="请选择企业性质">
+              <Option value="corporation">公司制企业</Option>
+              <Option value="partnership">合伙企业</Option>
+              <Option value="joint">合资企业</Option>
+              <Option value="sole">独资企业</Option>
+              <Option value="other">其他</Option>
+            </Select>
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="supplierType"
+            label="供应商类型"
+            rules={[{ required: true, message: '请选择供应商类型' }]}
+          >
+            <Select placeholder="请选择供应商类型">
+              <Option value="manufacturer">制造商</Option>
+              <Option value="agent">代理商</Option>
+              <Option value="service">服务商</Option>
+              <Option value="other">其他</Option>
+            </Select>
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            label="注册资本"
+            required
+            style={{ marginBottom: 0 }}
+          >
+            <Input.Group compact style={{ display: 'flex' }}>
+              <Form.Item name="capitalCurrency" noStyle initialValue="USD">
+                <Select style={{ width: 100, borderRadius: '2px 0 0 2px' }}>
+                  <Option value="USD">美元</Option>
+                  <Option value="EUR">欧元</Option>
+                  <Option value="GBP">英镑</Option>
+                  <Option value="JPY">日元</Option>
+                  <Option value="HKD">港币</Option>
+                </Select>
+              </Form.Item>
+              <Form.Item
+                name="capitalAmount"
+                noStyle
+                rules={[{ required: true, message: '请输入注册资本金额' }]}
+              >
+                <Input
+                  type="number"
+                  placeholder="请输入金额"
+                  style={{ flex: 1, borderRadius: '0 2px 2px 0', marginLeft: -1 }}
+                />
+              </Form.Item>
+            </Input.Group>
+          </Form.Item>
+        </Col>
+        <Col span={24}>
+          <Form.Item
+            name="businessScope"
+            label="经营范围"
+            labelCol={{ span: 2 }}
+            wrapperCol={{ span: 21 }}
+            rules={[{ required: true, message: '请输入经营范围' }]}
+          >
+            <TextArea placeholder="请输入经营范围" rows={2} maxLength={200} showCount />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="contactName"
+            label="联系人姓名"
+            rules={[{ required: true, message: '请输入联系人姓名' }]}
+          >
+            <Input placeholder="请输入联系人姓名" />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="contactPhone"
+            label="联系人手机"
+            rules={[
+              { required: true, message: '请输入联系人手机号码' },
+              { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码' },
+            ]}
+          >
+            <Input
+              placeholder="请输入11位手机号码"
+              prefix={<MobileOutlined />}
+              addonAfter={
+                <Button
+                  type="link"
+                  size="small"
+                  disabled={countdown > 0}
+                  onClick={handleGetCaptcha}
+                >
+                  {countdown ? `${countdown}秒后重新获取` : '获取验证码'}
+                </Button>
+              }
+            />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="verificationCode"
+            label="验证码"
+            rules={[
+              { required: true, message: '请输入验证码' },
+              { pattern: /^\d{6}$/, message: '请输入6位数字验证码' },
+            ]}
+            extra="该手机号用于后续联系和找回密码"
+          >
+            <Input placeholder="请输入验证码" />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="contactIdType"
+            label="联系人身份类别"
+            rules={[{ required: true, message: '请选择联系人身份类别' }]}
+          >
+            <Select placeholder="请选择类型">
+              <Option value="internal">境内人士</Option>
+              <Option value="external">境外（非大陆人士）</Option>
+            </Select>
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="contactIdNumber"
+            label="联系人证件号码"
+            rules={[{ required: true, message: '请输入联系人证件号码' }]}
+          >
+            <Input placeholder="请填写联系人正确的身份证号" />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            name="contactEmail"
+            label="联系人邮箱"
+            rules={[
+              { type: 'email', message: '请输入有效的电子邮箱' },
+              { required: true, message: '请输入电子邮箱' },
+            ]}
+          >
+            <Input prefix={<MailOutlined />} placeholder="XXX@XXX.com" />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item name="telephone" label="固定电话">
+            <Input placeholder="请输入企业联系电话" />
+          </Form.Item>
+        </Col>
+      </Row>
+
+      {/* 使用通用表单组件 */}
+      <QualificationSection form={form} />
+      <InvoiceSection form={form} />
+      <BankAccountSection form={form} />
+      <SurveySection form={form} />
+      <AttachmentSection form={form} />
+    </>
+  );
+};
+
+export default ForeignForm;
diff --git a/src/services/bidev.js b/src/services/bidev.js
deleted file mode 100644
index ef92bc1..0000000
--- a/src/services/bidev.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import request from '@/utils/request';
-import { stringify } from 'qs';
-// 查询项目经理评审室列表
-export async function fetchManagerList(params) {
-  return request(`/api/biz-service-ebtp-process/v1/bizassessroom/manager/list`,
-    { method: 'POST', data: { ...params } });
-}
-// 开启评审
-export async function openBizassessroom(params) {
-  return request(`/api/biz-service-ebtp-process/v1/bizassessroom/openRoom/${params.id}`,
-    { method: 'POST' });
-}
-// 开启评审多轮招募
-export async function zmmultiOpenBizassessroom(params) {
-  return request(`/api/biz-service-ebtp-process/v1/assessroom/zmmulti/openRoom/${params.id}`,
-    { method: 'POST' });
-}
-
-export async function resetVerificationCode(params) {
-  return request(`/api/biz-service-ebtp-process/v1/bizassessroom/update/captcha/${params.id}`,
-    { method: 'post' });
-}
-
-export async function fetchJuryList(params) {
-  return request(`/api/biz-service-ebtp-process/v1/bizassessroom/jury/list?${stringify(params)}`);
-}
-
-export async function fetchSupplierList(params) {
-  return request(`/api/biz-service-ebtp-process/v1/bizassessroom/supplier/list?${stringify(params)}`);
-}
-
-export async function fetchJuryMemInfo(params) {
-  return request(`/api/biz-service-ebtp-rsms/v1/jury/member/baseinfo/${params.roomId}`);
-}
-
-export async function updateJuryMemInfo(params) {
-  return request(`/api/biz-service-ebtp-rsms/v1/jury/member/update`,
-    { method: 'POST', params: params });
-}
-
-export async function validateVerificationCode(params) {
-  return request(`/api/biz-service-ebtp-process/v1/bizassessroom/check/captcha?${stringify(params)}`,
-    { method: 'POST' });
-}
-
-export async function fetchbidslist(params) {
-  return request(`/api/biz-service-ebtp-tender/v1/supplier_register/assessroom/suppliers?${stringify(params)}`);
-}
-
-export async function pushRedirectRe(params) {
-  return request(`/api/biz-service-ebtp-rsms/v1/jury/member/confirm`, { method: 'post', data: params });
-}
-// 查询初审汇总表
-export async function fetchPreList(params) {
-  return request(`/api/biz-service-ebtp-rsms/v1/bid/eval/summary/findEarlySummary`, {
-    method: 'POST',
-    data: {
-      ...params
-    }
-  });
-}
-// 查询供应商信息
-export async function fetchPreSupplierList(params) {
-  return request(`/api/biz-service-ebtp-rsms/v1/bid/eval/detail/findRegister?${stringify(params)}`);
-}
-// 查询详审汇总表
-export async function fetchPreListt(params) {
-  return request(`/api/biz-service-ebtp-rsms/v1/bid/eval/summary/findResultSummary`, {
-    method: 'POST',
-    data: {
-      ...params
-    }
-  });
-}
-
-// 查询有限数量制（公开比选）
-export async function bxmultifetchPreListt(params) {
-  return request(`/api/biz-service-ebtp-rsms/v1/bxmulti/eval/summary/findResultSummary`, {
-    method: 'POST',
-    data: {
-      ...params
-    }
-  });
-}
-// 根据评审室id获取确认承诺书状态
-export async function getCheckedByRoomId(params) {
-  return request(`/api/biz-service-ebtp-rsms/v1/jury/member/check/confirmStatus?${stringify(params)}`)
-}
-//开启评审室判断供应商数量
-export async function checkOpenBidSupplier(params) {
-  return request(`/api/biz-service-ebtp-tender/v1/supplier_register/tender/count/${params}`)
-}
diff --git a/src/services/common.ts b/src/services/common.ts
deleted file mode 100644
index 76a41fa..0000000
--- a/src/services/common.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import request from '@/utils/request';
-/**
- * 根据评审室id获取评审室信息
- * 2021.8.11 zhoujianlong
- * @param data 
- * @returns 
- */
-export async function getRoomDataById(params: any) {
-    return request(`/api/biz-service-ebtp-process/v1/bizassessroom/${params}`);
-}
-
-/**
- * 根据标段id获取标段信息
- * 2021.8.11 zhoujianlong
- * @param data 
- * @returns 
- */
-export async function getSectionDataById(params: any) {
-    return request(`/api/biz-service-ebtp-project/v1/projectSection/${params}`);
-}
-/**
- * 根据projectId，tpId，项目id获取项目信息
- * 2023.4.19 zhoujianlong
- * @param id
- * @returns 
- */
-export async function getProjectDataById(id?: any) {
-    return request(`/api/biz-service-ebtp-project/v1/projectRecord/${id}`);
-}
\ No newline at end of file
diff --git a/src/services/dashboard.js b/src/services/dashboard.js
deleted file mode 100644
index 6a89b27..0000000
--- a/src/services/dashboard.js
+++ /dev/null
@@ -1,99 +0,0 @@
-import request from '@/utils/request';
-import { stringify } from 'qs';
-
-export async function fetchDowntlist(params) {
-  return request(`/api/biz-service-ebtp-project/v1/projectRecord/getUserProjectRecordListByProcurementMode/${params.limit}`,{
-  method: 'POST',
-  data: {
-    ...params
-  }})
-}
-
-export async function fetchprojectRecords(params) {
-  return request(`/api/biz-service-ebtp-project/v1/projectRecord/getUserProjectRecordCount/${params.selectDate}`,{
-  method: 'POST',
-  data: {
-    ...params
-  }});
-}
-
-export async function fetchJuryUpList(params) {
-  return request(`/api/biz-service-ebtp-process/v1/bizassessroom/jury/reviewcount/${params.selectDate}`)
-}
-
-export async function fetchJuryDownlist(params) {
-  return request(`/api/biz-service-ebtp-process/v1/bizassessroom/jury/list?${stringify(params)}`)
-}
-
-export async function fetchSupplierUpList(params) {
-  return request(`/api/biz-service-ebtp-tender/v1/index/project/register`,{
-  method: 'POST',
-  data: {
-    ...params
-  }});
-}
-
-export async function fetchSupplierDownLeftList() {
-  return request(`/api/biz-service-ebtp-tender/v1/index/project/invited`)
-}
-
-export async function fetchSupplierDownRightList(params) {
-  return request(`/api/biz-service-ebtp-tender/v1/index/project/processing`,{
-    method: 'POST',
-    data: {
-      ...params
-    }})
-}
-
-
-export async function fetchtlist(params) {
-  return request(`/api/biz-service-ebtp-extend/v1/bizbidnotice/list`,{
-    method: 'POST',
-    data: {
-      ...params
-    }})
-}
-
-export async function fetchtlistre(params) {
-  return request(`/api/biz-service-ebtp-extend/v1/message/describeSiteMsg`, {
-    method: 'POST',
-    data: {
-      ...params
-    }
-  })
-}
-
-export async function fetchtPageList(params) {
-  return request('/api/biz-service-ebtp-auction/v1/bidders/InteriorManagerProjectList/getPageList',{
-    method: 'POST',
-    data: {
-      ...params
-    }
-  });
-}
-
-export async function fetchtShotList(params) {
-  return request('/api/biz-service-ebtp-auction/v1/bidders/myInnershot/getPageList',{
-    method: 'POST',
-    data: {
-      ...params
-    }
-  });
-}
-
-export async function fetchDisposalList(params) { // 内拍处置经理首页项目统计
-  return request(`/api/biz-service-ebtp-auction/v1/auction/count/${params.selectDate}`)
-}
-
-export async function fetchParticipants(params) { // 内拍参拍人首页项目统计
-  return request(`/api/biz-service-ebtp-auction/v1/auction/biddersCount/${params.selectDate}`)
-}
-
-export async function fetchtClarify(params) { // 首页澄清列表
-  return request('/api/biz-service-ebtp-extend/v1/message/selectMsgListByType',{
-    method: 'POST',
-    data: {
-      ...params
-    }
-  });
-}
\ No newline at end of file
diff --git a/src/services/downLoad.ts b/src/services/downLoad.ts
deleted file mode 100644
index a7d94c2..0000000
--- a/src/services/downLoad.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import request from '@/utils/request';
-/**
- * 根据项目id获取引用供应商资质库信息状态
- * 2021.8.6 zhoujianlong
- * @param data 
- * @returns 
- */
-export async function getStatusByProId(params: any) {
-    return request('/api/biz-service-ebtp-resps/v1/tdoc/isQuoteSupplier', {
-        method: 'POST',
-        params: params
-    });
-}
\ No newline at end of file
diff --git a/src/services/download_.ts b/src/services/download_.ts
deleted file mode 100644
index b1c4b58..0000000
--- a/src/services/download_.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { downloadSecretKeyPath, findFilelistPath, findFilelistPathBySecond, getSnowIdPath, removeFilePath } from '@/utils/DownloadUtils';
-import request from '@/utils/request';
-/**
- * 获取密钥（用于下载附件）
- * @param {主键} fileId 
- * @returns 
- */
-export async function getDownloadSecretKey({ fileId }: any) {
-    return request(downloadSecretKeyPath, {
-        method: 'GET',
-        params: { fileId },
-    });
-}
-/**
- * 获取雪花id
- * @returns 
- */
-export async function createNewFileBid() {
-    return request(getSnowIdPath, {
-        method: 'GET'
-    })
-}
-/**
- * 根据fileId删除文件
- * @param {主键} fileId 
- * @returns 
- */
-export async function removeFileByOid(fileId: string) {
-    return request(removeFilePath, {
-        method: 'POST',
-        params: { fileId },
-    })
-}
-
-/**
- * 根据objectIdList查询文件列表
- * @param {业务id列表} objectIdList 
- * @returns 
- */
-export async function getFilelist(objectIdList: string[]) {
-    return request(findFilelistPath, {
-        method: 'POST',
-        data: [...objectIdList],
-    })
-}
-
-/**
- * 根据bid查询文件列表（2.0）
- * @param {业务id列表} id 
- * @returns 
- */
-export async function getFilelistBySecond(id: string, p: string) {
-    return fetch(findFilelistPathBySecond + '?id=' + id + '&p=' + p, {
-        method: 'POST',
-    })
-}
\ No newline at end of file
diff --git a/src/services/login.ts b/src/services/login.ts
deleted file mode 100644
index 4f9b7c6..0000000
--- a/src/services/login.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-import request from '@/utils/request';
-import { getEncrypt } from '@/utils/session';
-
-export interface LoginParamsType {
-  userName: string;
-  password: string;
-  captcha: string;
-  tmpToken: string;
-}
-
-export interface FaceLoginParamsType {
-  userName: string;
-  multipartFiles: Blob;
-}
-
-
-const sm2 = require('sm-crypto').sm2;
-const encrypt = getEncrypt();
-
-
-
-
-// 天宫合作方登录
-export async function CooperfakeAccountLogin(params: LoginParamsType) {
-  // return request('/api/mall-auth/partnerLogin', {
-  return request('/api/sys-manager-ebtp-project/auth/partnerLogin', {
-    method: 'POST',
-    requestType: 'form',
-    headers: {
-      'clientId': `${REACT_APP_CLIENT_KEY}`,
-    },
-    data: {
-      'username': params.userName,
-      // 'password': params.password,
-      'password': '04' + sm2.doEncrypt(params.password, encrypt.publicKey, encrypt.cipherMode),
-      'captcha': params.captcha,
-      'token': params.tmpToken,
-    },
-  });
-}
-
-
-// 天宫专家登录
-export async function ZjfakeAccountLogin(params: LoginParamsType) {
-  // return request('/api/mall-auth/expertLogin', {
-  return request('/api/auth/expertLogin', {
-    method: 'POST',
-    requestType: 'form',
-    headers: {
-      'clientId': `${REACT_APP_CLIENT_KEY}`,
-    },
-    data: {
-      'identityCard': params.userName,
-      // 'password': params.password,
-      'password': '04' + sm2.doEncrypt(params.password, encrypt.publicKey, encrypt.cipherMode),
-      captcha: params.captcha,
-      token: params.tmpToken,
-    },
-  });
-}
-
-// 专家人脸登录
-export async function ZjfakeFaceLogin(params: FaceLoginParamsType) {
-  var formData = new FormData();
-  formData.append('idNo', params.userName);
-  formData.append('multipartFiles', params.multipartFiles, 'upload_face.jpeg');
-  return request('/api/core-service-ebtp-userinfo/outer/v1/ebtp/face/faceCompare', {
-    method: 'POST',
-    requestType: 'form',
-    mode: 'cors',
-    body: formData
-  });
-}
-
-// 天宫云门户
-export async function CloudfakeAccountLogin(params: LoginParamsType) {
-  // return request('/api/mall-auth/login', {
-  return request('/api/auth/login', {
-    method: 'POST',
-    requestType: 'form',
-    headers: {
-      'clientId': `${REACT_APP_CLIENT_KEY}`,
-    },
-    data: {
-      'username': params.userName,
-      // 'password': params.password,
-      'password': '04' + sm2.doEncrypt(params.password, encrypt.publicKey, encrypt.cipherMode),
-      captcha: params.captcha,
-      token: params.tmpToken,
-    },
-  });
-}
-/**
- * 刷新Token
- * @param params
- * @returns
- */
-export async function refreshTokenApi(params: any) {
-  return request('/api/core-service-ebtp-userinfo/v1/auth/oauth/token', {
-    method: 'POST',
-    requestType: 'form',
-    data: params,
-  });
-}
-
-export async function getPassword(params: any) { // 获取后台验证码接口
-  return request('/api/core-service-ebtp-userinfo/v1/userpassword/validatePassword', {
-    method: 'POST',
-    params: params
-  });
-}
-/**
- * 发送手机验证码
- * @param params
- * @returns
- */
-export async function getFakeCaptcha(params: any) {
-  return request('/api/notification/v1/notification/savaSmsByPhoneNew', {
-    method: 'POST',
-    data: { ...params },
-    requestType: 'json',
-  });
-}
-
-/**
- * 用户登出
- * @param params
- * @returns
- */
-export async function logoutTokenApi() {
-  return request('/api/core-service-ebtp-userinfo/v1/userinfo/logout', {
-    method: 'GET',
-    // params: params
-  });
-}
diff --git a/src/services/untilService.ts b/src/services/untilService.ts
deleted file mode 100644
index 68acc42..0000000
--- a/src/services/untilService.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import request from '@/utils/request';
-import {doc} from "prettier";
-/*雪花id获取*/
-export async function SnowflakeID() {
-  return request('/api/core-service-ebtp-updownload/v1/business/id', {method: 'get'})
-}
-/*文档中心 根据bid获取文件列表 直接返回 upload组件 fileList 格式*/
-export async function getFileBidList(BidID: any) {
-  if(BidID==null||BidID==""||BidID==undefined){
-    return ;
-  }
-  const Msg = <any>[];
-  await request('/api/core-service-ebtp-updownload/v1/attachment/find',
-    {
-      method: 'post',
-      data: {
-        "bidList": [BidID]
-      }
-    }
-  ).then(res => {
-    if (res?.[BidID]?.length > 0) {
-      for (const f in res[BidID]) {
-        Msg.push(
-          {
-            uid: res[BidID][f].id,
-            name: res[BidID][f].filename,
-            status: 'done',
-            url: '/api/core-service-ebtp-updownload/v1/attachment/download/oid/' + res[BidID][f].id,
-          }
-        )
-      }
-
-    }
-  })
-  return Msg;
-}
-/*文档中心 逻辑删除 根据objectid */
-export async function deleteFileObjId(ObjId: any) {
-   request('/api/core-service-ebtp-updownload/v1/attachment/item/'+ObjId,
-    {
-      method: 'delete',
-    }
-  )
-
-}
diff --git a/src/services/user.ts b/src/services/user.ts
deleted file mode 100644
index 1988721..0000000
--- a/src/services/user.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import request from '@/utils/request';
-
-export async function query(): Promise<any> {
-  return request('/api/users');
-}
-
-export async function queryCurrent(): Promise<any> {
-  return request('/api/currentUser');
-}
-
-export async function queryNotices(): Promise<any> {
-  return request('/api/notices');
-}
diff --git a/src/utils/AboutAnnouncementHelp.ts b/src/utils/AboutAnnouncementHelp.ts
deleted file mode 100644
index 169722d..0000000
--- a/src/utils/AboutAnnouncementHelp.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * 公告时间相关提示 工具
- */
-import { getDefId, getProOpenTenderForm } from "@/utils/session";
-import { getURLInformation } from "./CommonUtils";
-/**
-* 文件获取开始时间
-* */
-export function AnnouncementGetMsg1(Msg?: any) {
-  let msg = null;
-  msg = Msg + "需晚于当前时间";
-  return msg;
-}
-export function AnnouncementGetMsg2(Msg1?: any, Msg2?: any) {
-  let msg = null;
-  let days = 5;
-  let defId = getDefId();
-  if (defId == "negotiation_competitive_public"//竞争性谈判-公开参与
-    || defId == "negotiation_competitive_invite"//竞争性谈判-邀请参与
-    || defId == "negotiation_single"//单一来源
-    || defId == "negotiation_single_simple"//单一来源简化
-  ) {
-    days = 3
-  }
-
-  msg = Msg1 + "需与" + Msg2 + "间隔不少于" + days + "天";
-  return msg;
-}
-export function AnnouncementGetMsg3(Msg1?: any, Msg2?: any, Msg3?: any) {
-  let msg = null;
-  let defId = getDefId();
-  let roomType = getURLInformation('roomType') //预审后审标识 1-预审阶段 2-后审阶段
-  let tendF = getProOpenTenderForm();
-  if (defId == "negotiation_competitive_public"//竞争性谈判-公开参与
-    || defId == "negotiation_competitive_invite"//竞争性谈判-邀请参与
-    || defId == "negotiation_single"//单一来源
-    || defId == "negotiation_single_simple"//单一来源简化
-    || defId == "recruit_multi"//招募 多轮
-    || defId == "recruit"//招募 单轮
-  ) {
-    msg = Msg1 + "需晚于或等于" + Msg2;
-  } else if (defId == "comparison_one_prequalification"//公开比选一阶段-资格预审
-    || defId == "comparison_multi_prequalification"//公开比选多阶段-资格预审
-    || defId == "comparison_one"//公开比选一阶段
-    || defId == "comparison_multi"//公开比选多阶段
-  ) {
-    msg = Msg1 + "需与" + Msg3 + "间隔不少于8天";//2022.2.21比选时间间隔业务逻辑修改
-  } else if (defId == "bid_qualification"//公开招标-资格后审
-    || defId == "bid_invitation"//邀请招标
-  ) {
-    /*依法必招*/
-    if (tendF == "open_tender_form_1") {
-      msg = Msg1 + "需与" + Msg3 + "间隔不少于20天,并且晚于或等于" + Msg2;
-    } else {
-      msg = Msg1 + "需与" + Msg3 + "间隔不少于15天,并且晚于或等于" + Msg2;
-    }
-  } else if (defId == "bid_prequalification"//公开招标-资格预审
-  ) {
-    if (roomType == '1') {//预审阶段
-      msg = Msg1 + "需与" + Msg2 + "间隔不少于5天";
-    } else { //后审阶段
-      /*依法必招*/
-      if (tendF == "open_tender_form_1") {
-        msg = Msg1 + "需与" + Msg3 + "间隔不少于20天,并且晚于或等于" + Msg2;
-      } else {
-        msg = Msg1 + "需与" + Msg3 + "间隔不少于15天,并且晚于或等于" + Msg2;
-      }
-    }
-  }
-
-  return msg;
-}
-export function AnnouncementGetMsg4(Msg1?: any, Msg2?: any) {
-  let msg = null;
-  let defId = getDefId();
-  if (defId == "bid_prequalification"//公开招标-资格预审
-    || defId == "bid_qualification"//公开招标-资格后审
-    || defId == "bid_invitation"//邀请招标
-  ) {
-    msg = Msg1 + "需与" + Msg2 + "相同";
-    /*
-    *  *  -12- negotiation_competitive_public 竞争性谈判-公开参与
-    *     -13- negotiation_competitive_invite 竞争性谈判-邀请参与
-    *  *  -14- negotiation_single 单一来源
-    *  *  -6-  comparison_one_prequalification 公开比选一阶段-资格预审
- *        -7-  comparison_multi_prequalification 公开比选多阶段-资格预审
- *        -8-  comparison_one 公开比选一阶段
- *        -9-  comparison_multi 公开比选多阶段
- *  *     -10- recruit 公开招募 即 单轮
-    * */
-  } else if (defId == "negotiation_competitive_public"//竞争性谈判-公开参与
-    || defId == "negotiation_competitive_invite"//竞争性谈判-邀请参与
-    || defId == "negotiation_single"//单一来源
-    || defId == "negotiation_single_simple"//单一来源简化
-    || defId == "comparison_one_prequalification"//公开比选一阶段-资格预审
-    || defId == "comparison_multi_prequalification"//公开比选多阶段-资格预审
-    || defId == "comparison_one"//公开比选一阶段
-    || defId == "comparison_multi"//公开比选多阶段
-    || defId == "recruit"//公开招募 即 单轮
-  ) {
-    msg = Msg1 + "需晚于或等于" + Msg2;
-  }
-
-  return msg;
-}
diff --git a/src/utils/Authorized.ts b/src/utils/Authorized.ts
deleted file mode 100644
index 5c78964..0000000
--- a/src/utils/Authorized.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import RenderAuthorize from '@/components/Authorized';
-import { getAuthority } from './authority';
-/* eslint-disable eslint-comments/disable-enable-pair */
-/* eslint-disable import/no-mutable-exports */
-let Authorized = RenderAuthorize(getAuthority());
-
-// Reload the rights component
-const reloadAuthorized = (): void => {
-  Authorized = RenderAuthorize(getAuthority());
-};
-
-/**
- * hard code
- * block need it。
- */
-window.reloadAuthorized = reloadAuthorized;
-
-export { reloadAuthorized };
-export default Authorized;
diff --git a/src/utils/CommonUtils.ts b/src/utils/CommonUtils.ts
deleted file mode 100644
index 52ee6b4..0000000
--- a/src/utils/CommonUtils.ts
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * @Author: liqiang
- * @Date: 2020-11-24 15:26:54
- * @LastEditTime: 2021-03-05 13:49:12
- * @LastEditors: Please set LastEditors
- * @Description: In User Settings Edit
- * @FilePath: \ebtp-cloud-frontend\src\utils\CommonUtils.ts
- */
-
-/**
- * 判断是否等于空
- * @param value
- */
-export function isEmpty(value: any) {
-  return value === null || value === void 0 || value === '';
-}
-/**
- * 判断不等于空
- * @param value
- */
-export function isNotEmpty(value: any) {
-  return value !== null && value !== void 0 && value !== '';
-}
-
-/**
- * proTable下拉选格式转换
- * @param data 字典数据
- */
-export function proTableValueEnum(data: any) {
-  let json = {};
-  if (isEmpty(data)) {
-    return json;
-  }
-  for (const item of data) {
-    json[item.code] = { text: item.dicName };
-  }
-  return json;
-}
-/**
- * 字典返回值
- * @param data 字典数据
- */
-export function returnDictVal(data: any, value: any) {
-  let val = '';
-  if (isEmpty(data)) {
-    return val;
-  }
-  for (const item of data) {
-    item.code === value ? val = item.dicName : null;
-  }
-  return val;
-}
-/**
- * procurementType标的类型转换多个 20220927
- */
-export function multipleTypeTransform(value: string | null | undefined, valueEnum: any): string {
-  if (valueEnum && value) {
-    return value.split(",").map(item => valueEnum[item].text).join();
-  }
-  return "-";
-}
-
-/**
- * 获取url路径信息
- * @param name
- */
-export function getURLInformation(name: string) {
-  let reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
-  let r = window.location.search.substr(1).match(reg);
-  return r !== null ? unescape(r[2]) : null;
-}
-/**
- * 获取url路径参数信息
- * @param name 
- * @returns 
- */
-export function getUrlParam(name: string) {
-  var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); //构造一个含有目标参数的正则表达式对象
-  var r = window.location.search.substr(1).match(reg); //匹配目标参数
-  if (r != null) return decodeURI(r[2]); //decodeURI参数内容。
-  return null; //返回参数值
-}
-/**
- * 获取全部url路径信息
- * @param name
- * @returns 包含全部参数的对象
- */
-export function getTotalURLInformation() {
-  let query: any = location.search.substring(1)
-  let params = {}
-  query = query.split('&')
-  query?.forEach((ele: any, index: any) => {
-    let q = query[index].split('=')
-    if (q.length == 2) {
-      params[q[0]] = q[1]
-    }
-  });
-  return params
-}
-/**
- * 跨工程跳转
- * @param url url多个参数 & => %26 
- */
-export function JumpToOutside(url: string) {
-  const uri = encodeURIComponent(url)
-  window.location.href = (`http://10.242.31.158:8100/auth/oauth/authorize?response_type=code&client_id=KgPEkttG&redirect_uri=${uri}&mall3_token=${sessionStorage.getItem('Authorization')}`)
-}
-
-
-
-
-/**
- * proTable下拉选格式转换 增加筛选 仅展示inspect中数据
- * @param data 字典数据
- */
-export function proTableValueEnumOther(data: any, inspect?: any) {
-  let json = {};
-  if (isEmpty(data)) {
-    return json;
-  }
-  for (const item of data) {
-    if (inspect.toString().indexOf(item.code) >= 0) {
-      json[item.code] = { text: item.dicName };
-    }
-  }
-  return json;
-}
-/**
- * 根据字典值返回字典名称数据
- * @param dictData 
- * @param value 
- */
-export function getDictName(dictData: any, value: any) {
-  if (isEmpty(dictData)) {
-    return '';
-  }
-  for (const item of dictData) {
-    if (value === item.code) {
-      return item.dicName;
-    }
-  }
-  return '';
-}
-/**
- * 根据采购方式获取proTypeCode
- * @param bidMethodDict 
- */
-export function getProTypeCodeByBidMethodDict(bidMethodDict: any) {
-  if (isEmpty(bidMethodDict)) {
-    return '';
-  }
-  let proTypeCode;
-  switch (bidMethodDict) {
-    case 'procurement_mode_1':
-    case 'procurement_mode_2':
-      proTypeCode = 'procurement_mode_1,procurement_mode_2';
-      break;
-    case 'procurement_mode_3':
-      proTypeCode = 'procurement_mode_3';
-      break;
-    case 'procurement_mode_4':
-      proTypeCode = 'procurement_mode_4';
-      break;
-    case 'procurement_mode_5':
-    case 'procurement_mode_6':
-      proTypeCode = 'procurement_mode_5,procurement_mode_6';
-      break;
-    case 'procurement_mode_7':
-      proTypeCode = 'procurement_mode_7';
-      break;
-    case 'procurement_mode_8':
-      proTypeCode = 'procurement_mode_8';
-      break;
-    case 'procurement_mode_9':
-      proTypeCode = 'procurement_mode_8';
-      break;
-    default:
-      proTypeCode = '';
-  }
-  return proTypeCode;
-}
-/**
- * 根据获取字典名
- * @param data 
- * @param value 
- */
-export function getDictNameByVal(data: any[], value: any) {
-  if (isEmpty(data) || isEmpty(value)) {
-    return "";
-  }
-  for (const item of data) {
-    if (item.code === String(value)) {
-      return item.dicName;
-    }
-  }
-  return "";
-}
-/**
- * 获取当前路由相对路径
- * @returns 
- */
-export function getUrlRelativePath() {
-  let url = document.location.toString();
-  let arrUrl = url.split("//");
-  let start = arrUrl[1].indexOf("/");
-  let relUrl = arrUrl[1].substring(start);
-  if (relUrl.indexOf("?") != -1) {
-    relUrl = relUrl.split("?")[0];
-  }
-  return relUrl;
-}
-/**
- * 获取目标字符第几次出现的位置
- * @param str 
- * @param cha 
- * @param num 
- * @returns 
- */
-function findString(str: string, cha: string, num: number) {
-  let x = str.indexOf(cha);
-  for (var i = 0; i < num; i++) {
-    x = str.indexOf(cha, x + 1);
-  }
-  return x;
-}
-
-const projectTypeCodeMaps = new Map();
-//招标
-projectTypeCodeMaps.set("/Bid", ["procurement_mode_1", "procurement_mode_2"]);
-//比选
-projectTypeCodeMaps.set("/Comparison", ["procurement_mode_3"]);
-//招募
-projectTypeCodeMaps.set("/Recruit", ["procurement_mode_4"]);
-//谈判
-projectTypeCodeMaps.set("/Negotiation", ["procurement_mode_5", "procurement_mode_6",]);
-//询价
-projectTypeCodeMaps.set("/Inquiry", ["procurement_mode_7"]);
-
-/**
- * 获取ProTypeCode
- * @returns 
- */
-export function getProjectTypeCode() {
-  let url = getUrlRelativePath();
-  for (const item of projectTypeCodeMaps.keys()) {
-    if (url.indexOf(item) !== -1) {
-      return projectTypeCodeMaps.get(item);
-    }
-  }
-  return [];
-}
-/**
- * 根据传入采购方式返回该路径
- * @param bidMethodDict 
- * @returns 
- */
-export function getBidMethodDictTypeCode(bidMethodDict: string) {
-  for (const [key, value] of projectTypeCodeMaps.entries()) {
-    if (value.indexOf(bidMethodDict) !== -1) {
-      return key;
-    }
-  }
-  let url = getUrlRelativePath(),
-    index = findString(url, "/", 1);
-  url = url.substring(0, index);
-  return url;
-}
-/**
- * 将阿拉伯数字翻译成中文的大写数字
- * @param num 
- * @returns 
- */
-export const numberToChinese = (num: any) => {
-  var AA = new Array("零", "一", "二", "三", "四", "五", "六", "七", "八", "九", "十");
-  var BB = new Array("", "十", "百", "仟", "萬", "億", "点", "");
-  var a = ("" + num).replace(/(^0*)/g, "").split("."),
-    k = 0,
-    re = "";
-  for (var i = a[0].length - 1; i >= 0; i--) {
-    switch (k) {
-      case 0:
-        re = BB[7] + re;
-        break;
-      case 4:
-        if (!new RegExp("0{4}//d{" + (a[0].length - i - 1) + "}$")
-          .test(a[0]))
-          re = BB[4] + re;
-        break;
-      case 8:
-        re = BB[5] + re;
-        BB[7] = BB[5];
-        k = 0;
-        break;
-    }
-    if (k % 4 == 2 && a[0].charAt(i + 2) != '0' && a[0].charAt(i + 1) == '0')
-      re = AA[0] + re;
-    if (a[0].charAt(i) != '0')
-      re = AA[a[0].charAt(i)] + BB[k % 4] + re;
-    k++;
-  }
-
-  if (a.length > 1) // 加上小数部分(如果有小数部分)
-  {
-    re += BB[6];
-    for (var i = 0; i < a[1].length; i++)
-      re += AA[a[1].charAt(i)];
-  }
-  if (re == '一十')
-    re = "十";
-  if (re.match(/^一/) && re.length == 3)
-    re = re.replace("一", "");
-  return re;
-}
-/**
- * 页面内锚点滚动方法
- * @param anchorName 
- */
-export const scrollToAnchor = (anchorName: string) => {
-  if (anchorName) {
-    // 找到锚点
-    let anchorElement = document.getElementById(anchorName);
-    // 如果对应id的锚点存在，就跳转到锚点
-    if (anchorElement) { anchorElement.scrollIntoView({ block: 'start', behavior: 'smooth' }); }
-  }
-}
-/**
- * 删除行首行尾的空白字符方法（包括空格、制表符、换页符等等）
- * @param str 
- * @returns 
- */
-export const trim = (str: string): string => {
-  if (isNotEmpty(str)) {
-    let _str = str.replace(/(^\s*)|(\s*$)/g, "");
-    _str = _str.replace(/[<>|\\/?？:：*""“”\s\r\n\t]/g, "");
-    return _str;
-  }
-  return '';
-}
\ No newline at end of file
diff --git a/src/utils/CustomerService.ts b/src/utils/CustomerService.ts
deleted file mode 100644
index d23d9d6..0000000
--- a/src/utils/CustomerService.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-  /*客服系统专用*/
-  //跨系统post传参
-  export const bizServiceCustomService =  REACT_APP_CUSTOMERSERVICE_USERCENTER + '&client_id=' + REACT_APP_CUSTOMERSERVICE_CLIENT_ID + '&redirect_uri=' + REACT_APP_CUSTOMERSERVICE_REDIRECT + '/redirect?page=home&mall3_token=';//智慧客服
-  //export const bizServiceCustomService = REACT_APP_CUSTOMERSERVICE_USERCENTER + '&client_id=S00hFPxc&redirect_uri=http://localhost:3000/redirect?page=home&mall3_token=';//智慧客服
-  export function windowOpenChatUI(inputList:any,pathname:string) {
-    if(inputList && inputList.length>0){
-      var tempForm = document.getElementById('tempForm_CustomerService') as HTMLFormElement
-      if(tempForm) document.body.removeChild(tempForm);
-      tempForm = document.createElement("form")
-      tempForm.id="tempForm_CustomerService" 
-      tempForm.method="post"
-      tempForm.action = bizServiceCustomService + sessionStorage.getItem('Authorization')
-      tempForm.target='_blank'
-      inputList.map((input: any)=>{
-        let labelName= input.label!=null?`_CustomerServiceLabel_${input.label}`:''
-        var hideInput = document.createElement("input")
-        hideInput.type="hidden"
-        hideInput.name= input.paraName
-        hideInput.value = input.isEncode?`${encodeURI(input.paraVal)}${labelName}`:`${input.paraVal}${labelName}`
-        tempForm.appendChild(hideInput)
-      })
-      var input = document.createElement("input")
-      input.id = 'tempInput_CustomerService'
-      input.name= 'sceneUrl'
-      input.value= pathname
-      input.type="hidden"
-      tempForm.appendChild(input)
-      document.body.appendChild(tempForm);
-      if(tempForm){
-        tempForm.submit();
-        document.body.removeChild(tempForm);
-      }
-    }
-  }
-  //创建临时表单
-  export function createHiddenForm(inputList:any,pathname:string) {
-    if(inputList && inputList.length>0){
-      var tempForm = document.getElementById('tempForm_CustomerService') as HTMLFormElement
-      if(tempForm) document.body.removeChild(tempForm);
-      tempForm = document.createElement("form")
-      tempForm.id="tempForm_CustomerService" 
-      tempForm.method="post"
-      tempForm.action = bizServiceCustomService + sessionStorage.getItem('Authorization')
-      tempForm.target='_blank'
-      inputList.map((input: any)=>{
-        let labelName= input.label!=null?`_CustomerServiceLabel_${input.label}`:''
-        var hideInput = document.createElement("input")
-        hideInput.type="hidden"
-        hideInput.name= input.paraName
-        hideInput.value = input.isEncode?`${encodeURI(input.paraVal)}${labelName}`:`${input.paraVal}${labelName}`
-        tempForm.appendChild(hideInput)
-      })
-      var input = document.createElement("input")
-      input.id = 'tempInput_CustomerService'
-      input.name= 'sceneUrl'
-      input.value= pathname
-      input.type="hidden"
-      tempForm.appendChild(input)
-      document.body.appendChild(tempForm);
-    }
-  }
-  //提交临时表单
-  export function submitHiddenForm() {
-    var tempForm = document.getElementById('tempForm_CustomerService') as HTMLFormElement
-    if(tempForm){
-      tempForm.submit();
-      document.body.removeChild(tempForm);
-    }
-  }
\ No newline at end of file
diff --git a/src/utils/DateUtils.ts b/src/utils/DateUtils.ts
deleted file mode 100644
index 4937f7d..0000000
--- a/src/utils/DateUtils.ts
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * @Author: liqiang
- * @Date: 2020-12-02 14:25:23
- * @LastEditTime: 2021-03-25 15:46:32
- * @LastEditors: Please set LastEditors
- * @Description: 日期工具类
- * @FilePath: \ebtp-cloud-frontend\src\utils\DateUtils.ts
- */
-
-import moment from "moment";
-import { isEmpty } from "./CommonUtils";
-/**
- * 日期时间格式
- */
-export const dateTimeFormatter = 'yyyy-MM-DD HH:mm:ss';
-
-/**
- * 用于保存 日期格式化
- * @param date 
- */
-export function saveDateTimeFormatter(date: any) {
-    if (isEmpty(date)) {
-        return date;
-    }
-    return date.format(dateTimeFormatter);
-}
-/**
- * 用于回显 日期格式化
- * @param date 
- */
-export function echoDateTimeFormatter(date: any) {
-    if (isEmpty(date)) {
-        return date;
-    }
-    return moment(date, dateTimeFormatter);
-}
-/**
- * 判断当前时间是否超过指定时间
- */
-export function nowExceedSpecifiedTime(specifiedTime: string) {
-    let now = new Date(),
-        specified = new Date(specifiedTime);
-    return now.getTime() > specified.getTime();
-}
-
-export function showTimeDefaultValue() {
-    return moment('YYYY/MM/DD HH:mm:ss');
-}
-
-function range(start: any, end: any) {
-    const result = [];
-    for (let i = start; i < end; i++) {
-        result.push(i);
-    }
-    return result;
-}
-/**
- * 禁止选择当前之前的日期
- * @param current 
- */
-export function datePickerDisabledDate(current: any) {
-    return current && current < moment().subtract(1, 'days').endOf('day');
-}
-/**
- * 禁止选择当前之前的时间
- * @param current 
- */
-export function datePickerDisabledTime(current: any) {
-    if (current) {
-        let today = moment().date();
-        if (today == current.date()) {
-            let hour = Number(moment().hour());
-            let minute = Number(moment().minutes());
-            return {
-                disabledHours: () => range(0, hour),
-                disabledMinutes: () => hour === current.hour() ? range(0, minute) : []
-            };
-        } else {
-            return {
-                disabledHours: () => [],
-                disabledMinutes: () => []
-            };
-        }
-    }
-    return {
-        disabledHours: () => range(0, 24),
-        disabledMinutes: () => range(0, 60),
-        disabledSeconds: () => range(0, 60)
-    };
-}
-
-/**
- * 判断当前时间是否在两个时间段之内
- * @param d1 开始时间
- * @param d2 结束时间
- */
-export function nowInDateBetwen(d1: any, d2: any) {
-    if (isEmpty(d1) || isEmpty(d2)) {
-        return false;
-    }
-    //如果时间格式是正确的，那下面这一步转化时间格式就可以不用了
-    // let dateBegin = new Date(d1.replace(/-/g, "/"));//将-转化为/，使用new Date
-    // let dateEnd = new Date(d2.replace(/-/g, "/"));//将-转化为/，使用new Date
-    //将-转化为/，使用new Date
-    let dateBegin = new Date(d1),
-        //将-转化为/，使用new Date
-        dateEnd = new Date(d2),
-        //获取当前时间
-        dateNow = new Date();
-    let beginDiff = dateNow.getTime() - dateBegin.getTime();//时间差的毫秒数       
-    let beginDayDiff = Math.floor(beginDiff / (24 * 3600 * 1000));//计算出相差天数
-    //时间差的毫秒数
-    let endDiff = dateEnd.getTime() - dateNow.getTime();
-    //计算出相差天数 
-    let endDayDiff = Math.floor(endDiff / (24 * 3600 * 1000));
-    //已过期
-    if (endDayDiff < 0) {
-        return false
-    }
-    //没到开始时间
-    if (beginDayDiff < 0) {
-        return false;
-    }
-    return true;
-}
-/**
- * 获取最大时间
- * @param arr 
- */
-export function getMaxDate(arr: string[]) {
-    if (isEmpty(arr) || arr.length === 0) {
-        return null;
-    }
-    let index = 0;
-    for (let i = 1; i < arr.length; i++) {
-        let date = new Date(arr[i]);
-        index = new Date(arr[index]).getTime() > date.getTime() ? index : i;
-    }
-    return arr[index];
-}
-/**
- * 判断两个日期间隔天数
- * @param date1 
- * @param date2 
- */
-export function judgmentIntervalDay(date1: any, date2: any) {
-    // let dateSpan,
-    //     iDays;
-    // date1 = Date.parse(date1);
-    // date2 = Date.parse(date2);
-    // dateSpan = date2 - date1;
-    // dateSpan = Math.abs(dateSpan);
-    // iDays = Math.floor(dateSpan / (24 * 3600 * 1000));
-    // return iDays
-    date1 = moment(date1).startOf('day')
-    date2 = moment(date2).startOf('day')
-    return date2?.diff(date1, "days")
-};
-/**
- * 判断第一个时间是否大于第二个
- * @param date1 
- * @param date2 
- */
-export function judgmentOfTwoTimePeriods(date1: string, date2: string) {
-    let d1 = new Date(date1),
-        d2 = new Date(date2);        
-    return d1.getTime() > d2.getTime();
-}
-/**
- * 给日期加n天或者减n天
- * @param date 
- * @param day 
- */
-export function addOrSubtractADayFromTheDate(date: string, day: number) {
-    if(isEmpty(date)){
-        return null;
-    }
-    let d1 = new Date(date);
-    let d2 = d1.setDate(d1.getDate() + day);
-    return moment(d2).format(dateTimeFormatter);
-}
diff --git a/src/utils/Download.js b/src/utils/Download.js
deleted file mode 100644
index 640f52a..0000000
--- a/src/utils/Download.js
+++ /dev/null
@@ -1,164 +0,0 @@
-/**
- * @desc:这是一个文件下载组件
- * @param:参数说明
- *    apiUrl:接口地址
- *    objectId: objectId
- *    fileId: fileId
- *    icon: 下载图片设置
- *    text: 下载文本设置
- *    method: //请求方式
- *    fileName: //下载文件命名
- *    type: //文件格式
- *    btnName: //按钮名称
- *    form: //map集合 用到的参数
- *    downFileBtnClass: 按钮样式设置
- *    downFileBtnClass: 按钮样式设置
- * 
- */
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { Button, Icon, message } from 'antd';
-import { getSessionUserData, getUserToken } from '@/utils/session';
-import request from 'umi-request';
-import '@/assets/xsy_style.less'
-import './utils.less'
-import { downloadFileObjectId, downloadFile } from './DownloadUtils';
-
-
-class FileDown extends PureComponent {
-  constructor(props) {
-    super(props);
-    this.state = {
-      loadingStatus: true,
-      buttonDisabled: false
-    }
-  }
-
-  //文件下载操作
-  handleDownFile = (event, apiUrl, objectId, fileId, method, fileName, type, form) => {
-    event.preventDefault();
-    event.stopPropagation();
-    //开启loading 按钮置灰
-    this.setState({
-      loadingStatus: false,
-      buttonDisabled: true,
-    });
-    if (objectId) {
-      downloadFileObjectId(objectId);
-    } else if (fileId) {
-      downloadFile({ uid: fileId });
-    } else {
-      if (fileName != undefined) {
-        let haveParam = apiUrl.indexOf('?') != -1;//判断路径里是否有？
-        apiUrl = haveParam ? apiUrl + '&n=' + fileName : apiUrl + '?n=' + fileName + '.' + type;
-      }
-      window.location.href = apiUrl;
-    }
-    // window.fetch(apiUrl, {
-    //   method: method,
-    //   params: method === "GET" ? { ...form?.getFieldsValue() } : null,
-    //   data: method === "POST" ? { ...form?.getFieldsValue() } : null,
-    //   headers:{
-    //     JwtToken: getSessionUserData() == null ? null : getSessionUserData().userId,
-    //     Authorization: getUserToken(),
-    //   },
-    //   // 重要
-    //   responseType: 'blob',
-    // }).then(res => {
-    //   // const blob = new Blob([res]);
-    //   // const objectURL = URL.createObjectURL(blob);
-    //   // let btn = document.createElement('a');
-    //   // btn.download = `${fileName}.${type}`;
-    //   // btn.href = objectURL;
-    //   // btn.click();
-    //   // URL.revokeObjectURL(objectURL);
-    //   // btn = null;
-    //   // 这里才是下载附件逻辑处理的地方
-    //   res.blob().then(blob => {
-    //     const blobUrl = window.URL.createObjectURL(blob);
-    //     const aElement = document.createElement("a");
-    //     const filename = `${fileName}.${type}`; // 设置文件名称
-    //     aElement.href = blobUrl; // 设置a标签路径
-    //     aElement.download = filename;
-    //     aElement.click();
-    //     window.URL.revokeObjectURL(blobUrl);
-    //   });
-
-    //   this.setState({
-    //     loadingStatus: true,
-    //     buttonDisabled: false,
-    //   });
-    // }).catch((error) => {
-    //   //关闭loading 按钮恢复正常
-    //   this.setState({
-    //     loadingStatus: true,
-    //     buttonDisabled: false,
-    //   });
-    //   message.error('下载失败');
-    // });
-    setTimeout(() => {
-      this.setState({
-        loadingStatus: true,
-        buttonDisabled: false,
-      });
-    }, 1000);
-  };
-
-  render() {
-    const { apiUrl, objectId, fileId, icon, method, fileName, type, btnName, form, tag, } =
-    {
-      tag: "0",
-      ...this.props
-    };
-    const { loadingStatus, buttonDisabled } = this.state;
-
-
-    return (
-      <>
-        {
-          tag === 'a' ?
-            <Button type='text' onClick={(event) => this.handleDownFile(event, apiUrl, objectId, fileId, method, fileName, type, form)}>
-              {btnName}
-            </Button> :
-            tag === 'vrbre' ?
-              <Button
-                // type="primary"
-                size="small"
-                onClick={(event) => this.handleDownFile(event, apiUrl, objectId, fileId, method, fileName, type, form)}
-                disabled={buttonDisabled}
-                className="vrbre"
-              // style={{background: "rgb(8,66,173) !important",border:"1px solid #FFFFFF !important",color:"#FFFFFF !important"}}
-              >
-                {/* <Icon type={loadingStatus ? icon : 'loading'} /> */}
-                {btnName}
-              </Button> :
-              <Button
-                type="primary"
-                onClick={(event) => this.handleDownFile(event, apiUrl, objectId, fileId, method, fileName, type, form)}
-                disabled={buttonDisabled}
-              >
-                {/* <Icon type={loadingStatus ? icon : 'loading'} /> */}
-                {btnName}
-              </Button>
-        }
-      </>
-    );
-  }
-}
-
-//定义属性 类型以及是否必填项
-FileDown.proTypes = {
-  apiUrl: PropTypes.isRequired,//地址
-  objectId: PropTypes.isRequired, //objectId
-  fileId: PropTypes.isRequired, //fileId
-  method: PropTypes.isRequired,//请求方式
-  fileName: PropTypes.isRequired,//下载文件命名
-  type: PropTypes.isRequired,//文件格式
-  btnName: PropTypes.isRequired,//按钮名称
-  form: PropTypes.isRequired,//map集合 用到的参数
-};
-//定义属性的默认值
-FileDown.defaultProps = {
-  icon: 'download',
-};
-export default FileDown;
diff --git a/src/utils/DownloadNew.tsx b/src/utils/DownloadNew.tsx
deleted file mode 100644
index e74fa8d..0000000
--- a/src/utils/DownloadNew.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-import React, { useState, } from 'react';
-import { Button, message } from 'antd';
-import { getSessionUserData, getUserToken } from '@/utils/session';
-interface FileDownProps {
-  apiUrl?: any,//地址
-  method?: any,//请求方式
-  fileName?: any,//下载文件命名
-  type?: any,//文件格式
-  btnName?: any,//按钮名称
-  form?: any,//map集合 用到的参数
-  complete?: () => void,//李强 下载完执行刷新
-  beforeClick?: () => Promise<boolean>,//李丹 点击前调用
-}
-const FileDown: React.FC<FileDownProps> = (props) => {
-  const { apiUrl, method, fileName, type, btnName, form, complete, beforeClick } = props
-  const [loadingStatus, loadingStatusSet] = useState<boolean>(true);
-  const [buttonDisabled, buttonDisabledSet] = useState<boolean>(false);
-  //文件下载操作
-  async function handleDownFile(event: any, apiUrl: any, method: any, fileName: any, type: any, form: any) {
-    event.preventDefault();
-    event.stopPropagation();
-    //开启loading 按钮置灰
-    loadingStatusSet(false);
-    buttonDisabledSet(true);
-    if (beforeClick != undefined) {
-      await beforeClick().then((res) => {
-        if (res) {
-          if (fileName != undefined) {
-            let haveParam = apiUrl.indexOf('?') != -1;//判断路径里是否有？
-            apiUrl = haveParam ? apiUrl + '&n=' + fileName : apiUrl + '?n=' + fileName + '.' + type;
-          }
-          window.location.href = apiUrl;
-        }
-      }).catch(() => {
-        loadingStatusSet(true);
-        buttonDisabledSet(false);
-        if (complete != undefined) {
-          complete();
-        }
-      })
-    } else {
-      window.location.href = apiUrl;
-    }
-    loadingStatusSet(true);
-    buttonDisabledSet(false);
-    if (complete != undefined) {
-      complete();
-    }
-    // window.fetch(apiUrl, {
-    //   method: method,
-    //   params: method === "GET" && form != null ? { ...form?.getFieldsValue() } : null,
-    //   data: method === "POST" && form != null ? { ...form?.getFieldsValue() } : null,
-    //   headers: {
-    //     JwtToken: getSessionUserData() == null ? null : getSessionUserData().userId,
-    //     Authorization: getUserToken(),
-    //   },
-    //   // 重要
-    //   responseType: 'blob',
-    // }).then(res => {
-    //   // const blob = new Blob([res]);
-    //   // const objectURL = URL.createObjectURL(blob);
-    //   // let btn = document.createElement('a');
-    //   // btn.download = `${fileName}.${type}`;
-    //   // btn.href = objectURL;
-    //   // btn.click();
-    //   // URL.revokeObjectURL(objectURL);
-    //   // btn = null;
-    //   // 这里才是下载附件逻辑处理的地方
-    //   res.blob().then(blob => {
-    //     const blobUrl = window.URL.createObjectURL(blob);
-    //     const aElement = document.createElement("a");
-    //     const filename = `${fileName}.${type}`; // 设置文件名称
-    //     aElement.href = blobUrl; // 设置a标签路径
-    //     aElement.download = filename;
-    //     aElement.click();
-    //     window.URL.revokeObjectURL(blobUrl);
-    //   });
-    //   loadingStatusSet(true);
-    //   buttonDisabledSet(false);
-    //   complete();
-    // }).catch((error) => {
-    //   //关闭loading 按钮恢复正常
-    //   loadingStatusSet(true);
-    //   buttonDisabledSet(false);
-    //   complete();
-    //   message.error('下载失败');
-    // });
-  };
-
-  return (
-    <Button
-      type="primary"
-      onClick={(event) => handleDownFile(event, apiUrl, method, fileName, type, form)}
-      disabled={buttonDisabled}
-    >
-      {btnName}
-    </Button>
-  )
-};
-export default FileDown;
\ No newline at end of file
diff --git a/src/utils/DownloadUtils.ts b/src/utils/DownloadUtils.ts
deleted file mode 100644
index 1fca0a1..0000000
--- a/src/utils/DownloadUtils.ts
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * @Author: zhoujianlong 
- * @Date: 2022-03-03 09:06:36 
- * @Last Modified by: zhoujianlong
- * @Last Modified time: 2022-12-23 23:21:01
- */
-
-import { getDownloadSecretKey, getFilelist, getFilelistBySecond } from "@/services/download_";
-import { message } from "antd";
-import { Dispatch, SetStateAction, useEffect, useRef, useState } from "react";
-import { isEmpty, isNotEmpty } from "./CommonUtils";
-
-/**
- * 文件上传
- */
-export const uploadAttachmentPath = '/api/doc/v1.0/files/upload';
-/**
- * 获取密钥
- */
-export const downloadSecretKeyPath = '/api/doc/api/data-service-document-center/outer/v1.0/files/getSecretKey';
-/**
- * 文件下载（必须有密钥）
- */
-export const downloadAttachmentPath = '/api/doc/api/data-service-document-center/outer/v1.0/files/getDownload';
-/**
- * 获取雪花id
- */
-export const getSnowIdPath = '/api/core-service-ebtp-updownload/v1/business/id';
-/**
- * 文件物理删除
- */
-export const removeFilePath = '/api/doc/v1.0/files/disk';
-/**
- * 查询文件列表（根据objectId）
- */
-export const findFilelistPath = '/api/doc/v1.0/files/queryReturn';
-/**
- * 图片展示
- */
-export const pictureDisplayPath = '/api/doc/v1.0/files/display';
-/**
- * 文件下载（不用文件流）
- */
-export const downloadPath = '/api/doc/v1.0/files/download';
-/**
- * 查询文件列表（根据2.0 bid）
- */
-export const findFilelistPathBySecond = '/downloadfile/v1/file/getFileListById';
-/**
-* 文件下载（根据2.0 bid fileId）
-*/
-export const downloadPathBySecond = '/downloadfile/v1/file/downloadFileStreamById';
-
-export interface FilelistProps {
-   uid: string,
-   name: string,
-   status: 'uploading' | 'done' | 'error' | 'removed',
-   url: string,
-}
-/**
- * 校验3.0 ObjectId
- * @param objectId 
- * @returns 
- */
-export const checkObjectId = (objectId: string) => {
-   const pattern = /[a-zA-Z]+/;
-   return objectId.length == 19 && !pattern.test(objectId);
-}
-/**
- * 取当前时间时间戳（加密）
- * @returns 
- */
-const getTimeStamp = () => {
-   const cipherMode = '1';
-   const publicKey = '045631900E382D3DA75BD3E977CD6B28556DA3DF15820945F9BFB69E0F7456DF22D4EAB9CCD45B3B4959B85CEB4A2C4BB03AB5E4C08BA6A79E5B7C6AB63C20D932';
-   const sm2 = require('sm-crypto').sm2;
-   const date = Math.round(new Date().getTime() / 1000);
-   return '04' + sm2.doEncrypt(date, publicKey, cipherMode);
-}
-/**
- * 文件下载
- * @param {fileId} uid 
- */
-export const downloadFile = async ({ uid, name }: any) => {
-   if (isNotEmpty(uid)) {
-      if (checkObjectId(uid)) {//判断3.0 fileId
-         const keyRes = await getDownloadSecretKey({ fileId: uid });//获取key
-         keyRes?.success && (window.location.href = downloadAttachmentPath + '?fileId=' + uid + '&documentSecretKey=' + keyRes?.data);
-      } else {
-         window.location.href = downloadPathBySecond + '?id=' + uid + '&p=' + getTimeStamp();
-      }
-      // keyRes?.success && window.fetch(downloadAttachmentPath + '?fileId=' + uid + '&documentSecretKey=' + keyRes?.data, {
-      //    method: "GET",
-      //    headers: {
-      //       Authorization: getUserToken(),
-      //       currentRoleCode: getSessionRoleData()?.roleCode,
-      //    },
-      //    credentials: 'include',
-      // }).then((response) => {
-      //    // 这里才是下载附件逻辑处理的地方
-      //    response.blob().then(blob => {
-      //       const blobUrl = window.URL.createObjectURL(blob);
-      //       const aElement = document.createElement("a");
-      //       aElement.href = blobUrl; // 设置a标签路径
-      //       aElement.download = name;
-      //       aElement.click();
-      //       window.URL.revokeObjectURL(blobUrl);
-      //    });
-      // });
-   }
-}
-/**
- * objectId文件下载（只含一个文件）
- * @param {业务Id} objectId 
- */
-export const downloadFileObjectId = (objectId: string) => {
-   if (isNotEmpty(objectId)) {
-      if (checkObjectId(objectId)) {//判断3.0 objectId
-         getFilelist([objectId]).then(res => {
-            if (res?.success && res?.data?.length > 0) {
-               downloadFile({ uid: res?.data[res?.data?.length - 1].fileId });
-            } else {
-               message.info("文档中心错误或文件不存在");
-            }
-         })
-      } else {
-         window.location.href = downloadPathBySecond + '?id=' + objectId + '&p=' + getTimeStamp();
-      }
-   }
-}
-/**
- * objectId获取文件下载链接（只含一个文件）
- * @param {业务Id} objectId 
- * @returns 
- */
-export const getDownloadFileUrl = async (objectId: string) => {
-   let url = null;
-   if (isNotEmpty(objectId)) {
-      if (checkObjectId(objectId)) {//判断3.0 objectId
-         await getFilelist([objectId]).then(async res => {
-            if (res?.success && res?.data?.length > 0) {
-               const keyRes = await getDownloadSecretKey({ fileId: res?.data[res?.data?.length - 1].fileId });//获取key
-               url = downloadAttachmentPath + '?fileId=' + res?.data[res?.data?.length - 1].fileId + '&documentSecretKey=' + keyRes?.data
-            }
-         })
-      } else {
-         url = downloadPathBySecond + '?id=' + objectId + '&p=' + getTimeStamp();
-      }
-
-   }
-   return url;
-}
-/**
- * objectId获取文件下载链接
- * @param objectId 
- * @returns 
- */
-export const useDownLoadUrl = (objectId: string): string[] => {
-   const [url, setUrl] = useState<string>("");
-   useEffect(() => {
-      const getFileUrl = async () => {
-         console.log("objectId", objectId);
-         await getFilelist([objectId]).then(async res => {
-            if (res?.success && res?.data?.length > 0) {
-               const keyRes = await getDownloadSecretKey({ fileId: res?.data[res?.data?.length - 1].fileId });//获取key
-               let url = downloadAttachmentPath + '?fileId=' + res?.data[res?.data?.length - 1].fileId + '&documentSecretKey=' + keyRes?.data;
-               setUrl(url);
-            }
-         })
-      }
-      if (isNotEmpty(objectId)) {
-         if (checkObjectId(objectId)) {//判断3.0 objectId
-            getFileUrl();
-         } else {
-            let url = downloadPathBySecond + '?id=' + objectId + '&p=' + getTimeStamp();
-            setUrl(url);
-         }
-
-      }
-   }, [objectId])
-
-   return [url];
-}
-/**
- * 获取文件列表
- * @param objectId 
- * @returns 
- */
-export async function getFileListByBid(objectId: string) {
-   let result: FilelistProps[] = [];
-   if (isEmpty(objectId)) {
-      return [];
-   }
-   if (checkObjectId(objectId)) {//判断3.0 objectId
-      return getFilelist([objectId]).then(res => {
-         if (res?.success && res?.data?.length > 0) {
-            res?.data?.forEach(({ fileId, originalName, filePath }: any) => {
-               result.push({
-                  uid: fileId,
-                  name: originalName,
-                  status: 'done',
-                  url: originalName.endsWith(".png") || originalName.endsWith(".jpg") || originalName.endsWith(".jpeg") ? pictureDisplayPath + '?filePath=' + filePath : 'javascript:void(0);',
-               })
-            });
-            return result;
-         }
-         return [];
-      })
-   } else {
-      return getFilelistBySecond(objectId, getTimeStamp()).then(response => response.json()).then(res => {
-         if (res?.length > 0) {
-            res?.forEach(({ id, bid, filename }: any) => {
-               result.push({
-                  uid: id,
-                  name: filename,
-                  status: 'done',
-                  url: 'javascript:void(0);',
-               })
-            });
-            return result;
-         }
-         return [];
-      })
-   }
-
-}
\ No newline at end of file
diff --git a/src/utils/ExtendUpload/index.tsx b/src/utils/ExtendUpload/index.tsx
deleted file mode 100644
index 3e4571b..0000000
--- a/src/utils/ExtendUpload/index.tsx
+++ /dev/null
@@ -1,173 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Upload, Button, message, Modal, Spin } from "antd";
-import { UploadOutlined, CloseSquareOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
-import { getSessionRoleData, getUserToken } from '@/utils/session';
-import { UploadProps } from 'antd/lib/upload/interface';
-import { downloadFile, getFileListByBid, uploadAttachmentPath } from '../DownloadUtils';
-import { createNewFileBid, removeFileByOid } from '@/services/download_';
-
-interface ExtendUploadProps {
-  bid?: string;
-  value?: any;
-  onChange?: (value: any) => void;
-  btnName?: string;
-  maxCount?: number;
-  maxSize?: number;
-  uploadProps?: UploadProps;
-}
-const ExtendUpload: React.FC<ExtendUploadProps> = (props) => {
-
-
-  const { bid, onChange, btnName, maxCount, maxSize, uploadProps } = {
-    maxCount: 0,
-    maxSize: 30,
-    btnName: "上传",
-    ...props
-  };
-
-  const [spin, setSpin] = useState<boolean>(false);//加载
-  const [returnValue, setReturnValue] = useState<string>("");
-  const [fileList, setFileList] = useState<any>([]);
-
-  const triggerChange = (changedValue: any) => {
-    if (onChange) {
-      onChange(changedValue);
-    }
-  };
-
-  useEffect(() => {
-    initBidValue(bid)
-  }, [bid])
-
-  //初始化bid方法
-  const initBidValue = async (bid: any) => {
-    if (bid !== "" && bid !== null && bid !== undefined) {
-      fileListById(bid)
-      setReturnValue(bid);
-    } else {
-      await createNewFileBid().then(res => {
-        setReturnValue(res.id);
-        triggerChange("");
-      })
-    }
-  }
-
-  const fileBeforeUpload = (curFile: any, curFileList: any) => {
-    const promise = new Promise<File | void>((resolve, reject) => {
-      if (maxSize === 0) {
-
-      } else {
-        let curSize = curFile.size / 1024 / 1024;
-        if (maxSize <= curSize) {
-          message.error(`当前附件大小为"` + curSize.toFixed(2) + `M"，超过允许的最大值"` + maxSize + `M"，不可以继续上传！`);
-          reject(false);
-        }
-      }
-      if (maxCount === 0) {
-
-      } else {
-        let curCount = fileList.length;
-        if (maxCount <= curCount) {
-          message.error(`当前附件数量为"` + curCount + `"，已经达到允许的最大数量"` + maxCount + `"，不可以继续上传！`);
-          reject(false);
-        }
-      }
-      resolve(curFile);
-    });
-    return promise;
-  }
-  //fileChange中查询文件列表的方法封装
-  const fileListById = (fileId: any) => {
-    getFileListByBid(fileId).then(res => {
-      setFileList(res);
-      if (res?.length > 0) {
-        triggerChange(fileId);
-      } else {
-        triggerChange("");
-      }
-    }).finally(() => {
-      setSpin(false);
-    })
-  }
-
-  const fileChange = async (info: any) => {
-    const { file, fileList } = info;
-    setSpin(true);
-    if (file.status === 'uploading' || file.status === 'removed' || file.status === 'done' || file.status === 'error') {
-      if (file.status === 'uploading') {
-        setFileList(fileList);
-      } else {
-        if (file.status === 'removed') {
-          if (file?.uid !== "") {
-            await removeFileByOid(file.uid)
-          }
-          message.success("删除成功");
-        } else if (file.status === 'done') {
-          if (file?.response?.success) {
-            message.success("上传成功");
-          } else {
-            message.warn(file.response.message);
-          }
-        } else if (file.status === 'error') {
-          message.error("上传服务错误，请稍后再试");
-        }
-        //重新获取文件列表并确认是否返回文件id
-        fileListById(returnValue)
-      }
-    } else {
-      fileListById(returnValue)
-    }
-  }
-
-  const fileRemove = (info: any) => {
-    const promise = new Promise<boolean | void>(function (resolve, reject) {
-      Modal.confirm({
-        title: '删除附件',
-        icon: <ExclamationCircleOutlined />,
-        content: '确定要删除选中的附件?',
-        centered: true,
-        onOk() {
-          resolve(true);
-        },
-        onCancel() {
-          reject();
-        },
-      });
-    });
-    return promise;
-  }
-
-  return (
-    <>
-      <Spin spinning={spin}>
-        <Upload
-          onPreview={downloadFile}
-          {...uploadProps}
-          key={"file" + returnValue}
-          action={uploadAttachmentPath}
-          data={{
-            appCode: 'ebtp-cloud-frontend',
-            objectId: returnValue,
-          }}
-          headers={{
-            Authorization: getUserToken(),
-            currentRoleCode: getSessionRoleData()?.roleCode,
-          }}
-          name="multipartFiles"
-          beforeUpload={fileBeforeUpload}
-          onChange={fileChange}
-          onRemove={fileRemove}
-          showUploadList={{
-            removeIcon: <CloseSquareOutlined />,
-          }}
-          fileList={fileList}
-        >
-          {!uploadProps?.disabled ?
-            <Button disabled={uploadProps?.disabled} icon={<UploadOutlined />}>{btnName}</Button>
-            : null}
-        </Upload>
-      </Spin>
-    </>
-  )
-}
-export default ExtendUpload
diff --git a/src/utils/FlowUtils.ts b/src/utils/FlowUtils.ts
deleted file mode 100644
index b871dde..0000000
--- a/src/utils/FlowUtils.ts
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * @Author:liqiang
- * @Date: 2021-02-07 10:35:17
- * @LastEditTime: 2021-04-02 16:35:09
- * @Description: 根据流程不同显示不同名称
- * @FilePath: \ebtp-cloud-frontend\src\utils\Flow.ts
- */
-
-import { isEmpty } from "./CommonUtils";
-import { getDefId } from "./session";
-
-export const moduleName = {
-    //名称(招标、资审、招募)
-    name: 'name',
-    //标段名称
-    section: 'section',
-    //文件名称 (资审 招标 采购 招募 询价)
-    fileName: 'fileName',
-    //（投标 应答 资审投标）
-    response: 'response',
-    //费用名
-    cost: 'cost',
-    //开标 评审
-    review: 'review'
-}
-
-export const flowName = [
-    '',
-    'bid_prequalification',
-    'bid_qualification',
-    'bid_centralized_prequalification',
-    'bid_centralized_prequalification_bid',
-    'bid_invitation',
-    'comparison_one_prequalification',
-    'comparison_multi_prequalification',
-    'comparison_one',
-    'comparison_multi',
-    'recruit',
-    'recruit_multi',
-    'negotiation_competitive_public',
-    'negotiation_competitive_invite',
-    'negotiation_single',
-    'inquiry',
-    'auction',
-];
-
-//流程map
-const flow = setFlowName();
-
-/**
- * 根据传入模块名获取流程名称
- * @param name 
- */
-export function getFlowName(name: string) {
-    let defId = String(getDefId()),
-        data = flow.get(defId);
-    if (isEmpty(defId) || isEmpty(data)) {
-        return '';
-    }
-    return isEmpty(data[name]) ? "" : data[name];
-}
-
-export function getAllFlowNameByRoomType(bidMethodDict: any, roomType: any) {
-    if (bidMethodDict === 'procurement_mode_1' && roomType === '2') {
-        return getbidQualification();
-    } else if (bidMethodDict === 'procurement_mode_3' && roomType === '2') {
-        return getComparisonOne();
-    }
-    return getAllFlowName();
-}
-/**
- * 获取招标后审名称
- * @returns 
- */
-export function getbidQualification() {
-    let defId = flowName[2];
-    return flow.get(defId);
-}
-/**
- * 获取比选后审名称
- */
-export function getComparisonOne() {
-    let defId = String(getDefId());
-    switch (defId) {
-        //公开比选一阶段-资格预审
-        case "comparison_one_prequalification":
-        // 公开比选一阶段
-        case "comparison_one":
-            return flow.get("comparison_one");
-        //公开比选多阶段-资格预审
-        case "comparison_multi_prequalification":
-        //公开比选多阶段
-        case "comparison_multi":
-            return flow.get("comparison_multi");
-        default:
-            return {};
-    }
-}
-/**
- * 获取流程所有数据名称
- * @param name 
- */
-export function getAllFlowName() {
-    let defId = String(getDefId()),
-        data = flow.get(defId);
-    return isEmpty(data) ? {} : data;
-}
-/**
- * 设置流程名称
- */
-function setFlowName() {
-    let map = new Map();
-    for (let i = 1; i < flowName.length; i++) {
-        map.set(flowName[i], dependingOnTheProcess(i));
-    }
-    return map;
-}
-/**
- * 根据流程不同显示不同名称
- *  -1-  公开招标-资格预审
- *  -2-  公开招标-资格后审
- *  -3-  公开招标-集中资格预审
- *  -4-  公开招标-集中资格预审招标
- *  -5-  邀请招标
- *  -6-  公开比选一阶段-资格预审
- *  -7-  公开比选多阶段-资格预审
- *  -8-  公开比选一阶段
- *  -9-  公开比选多阶段
- *  -10- 公开招募
- *  -11- 常态化招募
- *  -12- 竞争性谈判-公开参与
- *  -13- 竞争性谈判-邀请参与
- *  -14- 单一来源
- *  -15- 询价
- *  -16- 内拍
- * @param i 
- */
-function dependingOnTheProcess(i: number) {
-    let data = {};
-    switch (i) {
-        //公开招标-资格预审
-        case 1:
-            data[moduleName.section] = '标段';
-            data[moduleName.fileName] = '资审';
-            data[moduleName.name] = '资审';
-            data[moduleName.response] = '投标';
-            data[moduleName.cost] = '标书费（元）';
-            data[moduleName.review] = '开标';
-            break;
-        //公开招标-资格后审
-        case 2:
-            data[moduleName.section] = '标段';
-            data[moduleName.fileName] = '招标';
-            data[moduleName.name] = '招标';
-            data[moduleName.response] = '投标';
-            data[moduleName.cost] = '标书费（元）';
-            data[moduleName.review] = '开标';
-            break;
-        //公开招标-集中资格预审
-        case 3:
-            data[moduleName.section] = '标段';
-            data[moduleName.fileName] = '资审';
-            data[moduleName.name] = '资审';
-            data[moduleName.response] = '投标';
-            data[moduleName.cost] = '标书费（元）';
-            data[moduleName.review] = '开标';
-            break;
-        //公开招标-集中资格预审招标
-        case 4:
-            data[moduleName.section] = '标段';
-            data[moduleName.fileName] = '资审';
-            data[moduleName.name] = '资审';
-            data[moduleName.response] = '投标';
-            data[moduleName.cost] = '标书费（元）';
-            data[moduleName.review] = '开标';
-            break;
-        //邀请招标
-        case 5:
-            data[moduleName.section] = '标段';
-            data[moduleName.fileName] = '招标';
-            data[moduleName.name] = '招标';
-            data[moduleName.response] = '投标';
-            data[moduleName.cost] = '标书费（元）';
-            data[moduleName.review] = '开标';
-            break;
-        //公开比选一阶段-资格预审
-        case 6:
-            data[moduleName.section] = '采购包';
-            data[moduleName.fileName] = '资审';
-            data[moduleName.name] = '资审';
-            data[moduleName.response] = '应答';
-            data[moduleName.cost] = '采购文件费用（元）';
-            data[moduleName.review] = '开启';
-            break;
-        //公开比选多阶段-资格预审
-        case 7:
-            data[moduleName.section] = '采购包';
-            data[moduleName.fileName] = '资审';
-            data[moduleName.name] = '资审';
-            data[moduleName.response] = '应答';
-            data[moduleName.cost] = '采购文件费用（元）';
-            data[moduleName.review] = '开始评审';
-            break;
-        //公开比选一阶段
-        case 8:
-            data[moduleName.section] = '采购包';
-            data[moduleName.fileName] = '采购';
-            data[moduleName.name] = '采购';
-            data[moduleName.response] = '应答';
-            data[moduleName.cost] = '采购文件费用（元）';
-            data[moduleName.review] = '开启';
-            break;
-        //公开比选多阶段
-        case 9:
-            data[moduleName.section] = '采购包';
-            data[moduleName.fileName] = '采购';
-            data[moduleName.name] = '采购';
-            data[moduleName.response] = '应答';
-            data[moduleName.cost] = '采购文件费用（元）';
-            data[moduleName.review] = '开始评审';
-            break;
-        // 公开招募
-        case 10:
-            data[moduleName.section] = '包件';
-            data[moduleName.fileName] = '招募';
-            data[moduleName.name] = '招募';
-            data[moduleName.response] = '应答';
-            data[moduleName.cost] = '招募文件费用(元)';
-            data[moduleName.review] = '开始评审';
-            break;
-        //常态化招募
-        case 11:
-            data[moduleName.section] = '包件';
-            data[moduleName.fileName] = '招募';
-            data[moduleName.name] = '招募';
-            data[moduleName.response] = '应答';
-            data[moduleName.cost] = '招募文件费用(元)';
-            data[moduleName.review] = '开始评审';
-            break;
-        //竞争性谈判-公开参与
-        case 12:
-            data[moduleName.section] = '采购包';
-            data[moduleName.fileName] = '采购';
-            data[moduleName.name] = '采购';
-            data[moduleName.response] = '应答';
-            data[moduleName.cost] = '采购文件费用（元）';
-            data[moduleName.review] = '开始评审';
-            break;
-        //竞争性谈判-邀请参与
-        case 13:
-            data[moduleName.section] = '采购包';
-            data[moduleName.fileName] = '采购';
-            data[moduleName.name] = '采购';
-            data[moduleName.response] = '应答';
-            data[moduleName.cost] = '采购文件费用（元）';
-            data[moduleName.review] = '开始评审';
-            break;
-        //单一来源
-        case 14:
-            data[moduleName.section] = '采购包';
-            data[moduleName.fileName] = '采购';
-            data[moduleName.name] = '采购';
-            data[moduleName.response] = '应答';
-            data[moduleName.cost] = '采购文件费用（元）';
-            data[moduleName.review] = '评审';
-            break;
-        //询价
-        case 15:
-            data[moduleName.section] = '采购包';
-            data[moduleName.fileName] = '询价';
-            data[moduleName.name] = '询价';
-            data[moduleName.response] = '应答';
-            data[moduleName.cost] = '询价文件费用（元）';
-            data[moduleName.review] = '评审';
-            break;
-        //内拍
-        case 16:
-            break;
-        default:
-    }
-    return data;
-}
-
diff --git a/src/utils/IParticipateIn.tsx b/src/utils/IParticipateIn.tsx
deleted file mode 100644
index f6aa773..0000000
--- a/src/utils/IParticipateIn.tsx
+++ /dev/null
@@ -1,369 +0,0 @@
-/*
- * @Author: liqiang
- * @Date: 2021-03-04 17:19:02
- * @LastEditTime: 2021-04-01 14:05:08
- * @LastEditors: Please set LastEditors
- * @Description: In User Settings Edit
- * @FilePath: \ebtp-cloud-frontend\src\utils\IParticipateIn.tsx
- */
-import { participationSave, participationSaveOther } from '@/pages/Tender/supplier/LookingForBusinessOpportunities/service';
-import ProTable from '@ant-design/pro-table';
-import { Button, Card, Checkbox, Form, Input, message, Modal } from 'antd';
-import React, { useEffect, useState } from 'react';
-import { useHistory } from 'umi';
-import { getBidMethodDictTypeCode, getProTypeCodeByBidMethodDict, isNotEmpty } from './CommonUtils';
-import { queryingPagingData } from './PageUtils';
-
-interface IParticipateInItem {
-    projectData: any,
-    visible: boolean,
-    setVisible: (value: boolean) => void
-}
-
-/**
- * 获取标段名称
- * @param bidMethodDict 
- */
-function getBsName(bidMethodDict: string) {
-    if (bidMethodDict.indexOf("procurement_mode_4") !== -1) {
-        return '包件';
-    }
-    if (bidMethodDict.indexOf("procurement_mode_3") !== -1 || bidMethodDict.indexOf("procurement_mode_5") !== -1) {
-        return '采购包';
-    }
-    return '标段';
-}
-
-function getSectionCheckbox(data: any) {
-    let value = [];
-    let flag = true;
-    for (const item of data) {
-        if (flag) {
-            value.push(
-                <Checkbox key={item.bsId} style={{ marginLeft: '8px' }} value={item.bsId}>
-                    {item.bsName}
-                </Checkbox>
-            )
-            flag = false;
-        } else {
-            value.push(
-                <Checkbox key={item.bsId} value={item.bsId}>
-                    {item.bsName}
-                </Checkbox>
-            )
-        }
-
-    }
-    return value;
-}
-const modalHeight = innerHeight * 96 / 100;
-/**
- * 我要参与
- * @param props 
- */
-const IParticipateIn: React.FC<IParticipateInItem> = (props) => {
-    const { projectData, visible, setVisible } = props;
-    const [form] = Form.useForm();
-    //保存遮罩
-    const [spinningLoading, setSpinningLoading] = useState<boolean>(false);
-    //常用联系人模态框
-    const [contactsVisible, setContactsVisible] = useState<boolean>(false);
-    //标段名称
-    const [bsName, setBsName] = useState<string>('');
-    //标段多选
-    const [sectionCheckbox, setSectionCheckbox] = useState<any[]>();
-    //采购方式
-    const [bidMethodDict, setBidMethodDict] = useState<string>('');
-    const history = useHistory();
-    //联系人数据
-    const [contactsItem, setContactsItem] = useState<any>(null);
-    useEffect(() => {
-        if (isNotEmpty(projectData)) {
-            setBsName(getBsName(projectData.bidMethodDict));
-            setBidMethodDict(projectData.bidMethodDict);
-            //标段信息
-            let sectionVOList = projectData.sectionVOList;
-            if (sectionVOList.length === 0) {
-                // 当前项目报名截止！
-                message.warning('当前项目报名截止！');
-                return;
-            }
-            setSectionCheckbox(getSectionCheckbox(sectionVOList));
-            form.resetFields();
-            setContactsItem(null);
-            let examinationMethodDict = "";
-            if (bidMethodDict.indexOf("procurement_mode_4") > -1) {
-                examinationMethodDict = projectData?.examinationMethodDict.replace("recruitment_method_", "")
-            }
-            form.setFieldsValue({
-                recruitType: examinationMethodDict,
-                projectId: projectData.id,
-                roomType: projectData.roomType
-            })
-        }
-    }, [projectData]);
-
-    /**
-   * 表单提交
-   * @param value
-   */
-    const formOnFinish = (value: any) => {
-        setSpinningLoading(true);
-        // value.bizSupplierContact = contactsItem === null ? {
-        //     contactName: value.contactName,
-        //     contactTelephone: value.contactTelephone,
-        //     contactEmail: value.contactEmail,
-        //     contactAddress: value.contactAddress,
-        //     fixedLine: value.fixedLine,
-        //     contactFax: value.contactFax
-        // } : contactsItem;
-        value.bizSupplierContact = form.getFieldsValue();
-        delete value['id'];
-        /*招募方式 调用特殊接口 2021 02 08 dqh*/
-        if (bidMethodDict.indexOf("procurement_mode_4") > -1) {
-            participationSaveOther(value).then(res => {
-                if (res.data) {
-                    message.success('操作成功！', 2, () => {
-                        history.push(`${getBidMethodDictTypeCode(bidMethodDict)}/Involved`);
-                        setSpinningLoading(false);
-                    });
-                } else {
-                    setSpinningLoading(false);
-                    message.error('操作失败！');
-                }
-            })
-        } else {
-            participationSave(value).then(res => {
-                if (res.data) {
-                    message.success('操作成功！', 2, () => {
-                        history.push(`${getBidMethodDictTypeCode(bidMethodDict)}/Involved`);
-                        setSpinningLoading(false);
-                    });
-                } else {
-                    setSpinningLoading(false);
-                    message.error('操作失败！');
-                }
-            })
-        }
-    }
-
-    /**
-   * 常用联系人
-   */
-    const contacts = () => {
-        const onCancel = () => setContactsVisible(false);
-        const select = (data: any) => {
-            form.setFieldsValue(data);
-            setContactsItem(data);
-            setContactsVisible(false);
-        }
-
-        const columns: any[] = [
-            {
-                title: '序号',
-                valueType: 'index',
-                width: '7%'
-            },
-            {
-                title: '姓名',
-                dataIndex: 'contactName',
-                width: '15%'
-            },
-            {
-                title: 'id',
-                dataIndex: 'id',
-                hideInTable: true,
-            },
-            {
-                title: '手机号码',
-                dataIndex: 'contactTelephone',
-                search: false,
-                width: '15%'
-            },
-            {
-                title: '地址',
-                dataIndex: 'contactAddress',
-                search: false,
-                width: '25%'
-            },
-            {
-                title: '电子邮箱',
-                dataIndex: 'contactEmail',
-                search: false,
-                width: '13%'
-            },
-            {
-                title: '操作',
-                valueType: 'option',
-                width: '5%',
-                render: (_: any, record: any) => [
-                    <a key="select" onClick={() => select(record)}>选择</a>
-                ]
-            },
-        ]
-        return (
-            <>
-                <Modal visible={contactsVisible}
-                    title="选择常用联系人"
-                    onCancel={onCancel}
-                    width={900}
-                    style={{ maxHeight: modalHeight }}
-                    bodyStyle={{ maxHeight: modalHeight - 107, overflowY: 'auto' }}
-                    maskClosable={false}
-                    footer={null}
-                    centered
-                >
-                    <Card>
-                        <ProTable
-                            rowKey="id"
-                            pagination={{ defaultPageSize: 10 }}
-                            size="small"
-                            columns={columns}
-                            options={false}
-                            request={params => queryingPagingData('/api/biz-service-ebtp-tender/v1/bizsuppliercontact/getSupplierContactByParam', 'post', params)}
-                        />
-                    </Card>
-                </Modal>
-            </>
-        )
-    }
-
-
-    const createForm = () => {
-        return (<Form
-            labelCol={{ span: 6 }}
-            wrapperCol={{ span: 13 }}
-            form={form}
-            onFinish={formOnFinish}
-        >
-            <h2 style={{ margin: '0px 0px 20px 0px' }}>
-                您即将参与 {projectData?.projectName}，请填写下列信息：
-            </h2>
-            <Form.Item
-                name="projectId"
-                hidden
-            >
-                <Input />
-            </Form.Item>
-            <Form.Item
-                name="recruitType"
-                hidden
-            >
-                <Input />
-            </Form.Item>
-            <Form.Item
-                name="id"
-                hidden
-            >
-                <Input />
-            </Form.Item>
-            <Form.Item
-                name="roomType"
-                hidden
-            >
-                <Input />
-            </Form.Item>
-
-            <Form.Item
-                label="联系人"
-                name="contactName"
-                rules={[{ required: true }]}
-            >
-                <Input maxLength={32} addonAfter={(<a onClick={() => setContactsVisible(true)}>常用联系人</a>)} />
-            </Form.Item>
-
-            <Form.Item
-                label="联系电话"
-                name="contactTelephone"
-                rules={[{ required: true },
-                { pattern: /^[1][3,4,5,6,7,8,9][0-9]{9}$/, message: '请输入正确的电话号码' }
-                ]}
-                extra={<span style={{ color: '#b30000' }}>平台短信提醒功能仅支持联通号段，其他运营商号段暂不支持</span>}
-            >
-                <Input maxLength={14} />
-            </Form.Item>
-
-
-            <Form.Item
-                label="邮箱"
-                name="contactEmail"
-                rules={[{ required: true }, { type: 'email', message: '请输入正确的邮箱格式' }]}
-            >
-                <Input maxLength={32} />
-            </Form.Item>
-
-            <Form.Item
-                label="地址"
-                name="contactAddress"
-            >
-                <Input maxLength={100} />
-            </Form.Item>
-
-            <Form.Item
-                label="固定电话"
-                name="fixedLine"
-                rules={[
-                    { pattern: /^(\(\d{3,4}\)|\d{3,4}-|\s)?\d{7,14}$/, message: '请输入正确的固定电话号码' }
-                ]}
-            >
-                <Input maxLength={32} />
-            </Form.Item>
-
-            <Form.Item
-                label="传真"
-                name="contactFax"
-                rules={[{ pattern: /^(\d{3,4}-)?\d{7,8}$/, message: '请输入正确的传真格式' }]}
-            >
-                <Input maxLength={32} />
-            </Form.Item>
-
-            <Form.Item
-                label={`选择${bsName}`}
-                name="packageIdList"
-                rules={[{ required: true }]}
-            >
-                <Checkbox.Group>
-                    {sectionCheckbox}
-                </Checkbox.Group>
-            </Form.Item>
-
-        </Form>
-        )
-    }
-    /**
- * 我要参与
- */
-    const modalBox = () => {
-        const OnOk = (): void => form.submit();
-        const onCancel = (): void => setVisible(false);
-        return (
-            <>
-                <Modal visible={visible}
-                    title="我要参与"
-                    onOk={OnOk}
-                    onCancel={onCancel}
-                    width="40%"
-                    maskClosable={false}
-                    centered
-                    style={{ maxHeight: modalHeight }}
-                    bodyStyle={{ maxHeight: modalHeight - 107, overflowY: 'auto' }}
-                    footer={[
-                        <Button key="back" onClick={onCancel}>
-                            取消
-                        </Button>,
-                        <Button key="submit" type="primary" loading={spinningLoading} onClick={OnOk}>
-                            保存
-                        </Button>,
-                    ]}
-                >
-                    {createForm()}
-                </Modal>
-                {contacts()}
-            </>
-        )
-    }
-
-    return modalBox();
-}
-
-export default IParticipateIn;
\ No newline at end of file
diff --git a/src/utils/InquiryBox.tsx b/src/utils/InquiryBox.tsx
deleted file mode 100644
index d3675b1..0000000
--- a/src/utils/InquiryBox.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Modal } from 'antd';
-import React from 'react';
-
-interface InquiryBoxItem {
-    visible: boolean,
-    message: string,
-    data: any,
-    setVisible: (value: boolean) => void,
-    onOk: (data: any) => void
-}
-/**
- * 询问框
- * @param props
- */
-const InquiryBox: React.FC<InquiryBoxItem> = (props) => {
-    const { visible, message, data, setVisible, onOk } = props;
-    return (
-        <>
-            <Modal
-                width={300}
-                centered
-                visible={visible}
-                maskClosable={false}
-                onCancel={() => setVisible(false)}
-                onOk={() => onOk(data)}
-            >
-                {message}
-            </Modal>
-        </>
-    )
-}
-export default InquiryBox;
\ No newline at end of file
diff --git a/src/utils/InvitationLetter.tsx b/src/utils/InvitationLetter.tsx
deleted file mode 100644
index daf885b..0000000
--- a/src/utils/InvitationLetter.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * @Author: liqiang
- * @Date: 2021-03-05 13:55:50
- * @LastEditTime: 2021-03-05 14:42:50
- * @LastEditors: Please set LastEditors
- * @Description: 邀请函信息
- * @FilePath: \ebtp-cloud-frontend\src\utils\InvitationLetter.tsx
- */
-import { getNoticeInfo } from '@/pages/Bid/Supplier/InvitationDetails/service';
-import { Button, Modal, Tabs } from 'antd';
-import React, { useEffect, useState } from 'react';
-import { isNotEmpty } from './CommonUtils';
-import ExtendUpload from './ExtendUpload';
-
-interface InvitationLetterItem {
-    projectData: any,
-    visible: boolean,
-    setVisible: (value: boolean) => void
-}
-const { TabPane } = Tabs;
-const modalHeight = innerHeight * 96 / 100;
-const InvitationLetter: React.FC<InvitationLetterItem> = (props) => {
-    const { projectData, visible, setVisible } = props;
-    const [announcementInformation, setAnnouncementInformation] = useState<any>();
-    useEffect(() => {
-        if (isNotEmpty(projectData)) {
-            getNoticeInfo(projectData.annoIds).then(res => {
-                setAnnouncementInformation(getAnnouncementInformation(res.data));
-            })
-        }
-    }, [projectData]);
-
-    /**
-     * 获取邀请函
-     * @param data
-     */
-    const getAnnouncementInformation = (data: any) => {
-        if (data.length === 0) {
-            return <div className="textAlignCenter">
-                <h1>该项目没有公告</h1>
-            </div>
-        }
-        return (
-            <Tabs>
-                {data.map((item: any, index: number) => {
-                    return (<TabPane tab={`邀请函${index + 1}`} key={index}>
-                        <div className="textAlignCenter">
-                            <h1>{String(item.annoNature) === '7' && '【变更公告】'}{item.annoTitle}</h1>
-                        </div>
-                        <p dangerouslySetInnerHTML={{ __html: item.contentWithStyle }}>
-                        </p>
-                        <ExtendUpload bid={item.attDatasetId} btnName="附件" uploadProps={{ disabled: true }} />
-                    </TabPane>
-                    )
-                })
-                }
-            </Tabs>
-        )
-    }
-    /**
-     * 关闭
-     */
-    const close = () => {
-        setVisible(false);
-        setAnnouncementInformation(null);
-    }
-
-    return <Modal visible={visible}
-        title="邀请函信息"
-        onCancel={close}
-        centered
-        destroyOnClose
-        width="50%"
-        style={{ maxHeight: modalHeight }}
-        bodyStyle={{ maxHeight: modalHeight - 107, overflowY: 'auto' }}
-        footer={[
-            <Button onClick={close}>取消</Button>
-        ]}
-    >
-        {announcementInformation}
-    </Modal>
-}
-
-export default InvitationLetter;
\ No newline at end of file
diff --git a/src/utils/IpassVerification.ts b/src/utils/IpassVerification.ts
deleted file mode 100644
index 1a646e4..0000000
--- a/src/utils/IpassVerification.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * @Author: liqiang
- * @Date: 2021-02-16 16:35:14
- * @LastEditTime: 2021-04-06 16:55:24
- * @LastEditors: Please set LastEditors
- * @Description: ipass验证
- * @FilePath: \ebtp-cloud-frontend\src\utils\IpassVerification.ts
- */
-import request from './request';
-import * as zwPlugin from './zwPlugin';
-import { Modal } from 'antd';
-const ccitCont1Value = 'CCIT Smartcard CSP V1.0';
-const ccitCont = ['CCITCont2', '2'];
-const deviceDefault = ['DEVICE_DEFAULT', '1'];
-const deviceDefaultValue = 'DEVICE_DEFAULT';
-const ccitCont2 = 'CCITCont2';
-const ipassKey = "12312312321";
-/**
- * 上传验证供应商(验证组织结构代码)
- */
-export function verificationSupplier(value:string) {
-    //判断是否安装控件
-    if (!zwPlugin.CheckComSetup()) {
-        warning("未检测到控件，请先安装控件！");
-        return false;
-    }
-    //获取版本号
-    // let version = zwPlugin.getVersion();
-    //判断是否插入key 0未插入 1已插入
-    if (zwPlugin.isUKConnect() == 0) {
-        warning('请插入您的IPASS设备后重试！');
-        return false;
-    }
-    //获取CSP
-    let cspNamebypid = zwPlugin.getCSPNamebypid();
-    let contName = cspNamebypid === ccitCont1Value ? deviceDefaultValue : ccitCont2;
-    //初始化密钥服务提供者
-    if (!zwPlugin.initProv(cspNamebypid, contName)) {
-        warning('初始化失败！');
-        return false;
-    }
-    //获取证书
-    let cert = ccitCont;
-    if (cspNamebypid === ccitCont1Value) {
-        cert = ['CCITCont1', '2'];
-    }
-    //获取证书
-    let certificate = zwPlugin.getCert(cert[0], cert[1]);
-    if (certificate === null) {
-        warning('获取IPASS证书失败！');
-        return false;
-    }
-    //获取组织机构代码
-    let certExtension = zwPlugin.getCertExtension(certificate, '1.3.6.1.4.1.5315.100.5.13');
-    //验证组织结构代码
-    if (certExtension.toUpperCase() === value.toUpperCase()) {
-        return true;
-    } else {
-        warning(`IPASS代码（${certExtension}）与组织机构代码（${value}）不一致，验证失败！`);
-        return false;
-    }
-}
-/**
- * 获取证书
- */
-function getCertificate(cspNamebypid: string) {
-    let cert = ccitCont;
-    if (cspNamebypid === ccitCont1Value) {
-        cert = deviceDefault;
-    }
-    //获取证书
-    return zwPlugin.getCert(cert[0], cert[1]);
-}
-
-function ipassVerification() {
-    //判断是否安装控件
-    if (!zwPlugin.CheckComSetup()) {
-        warning("未检测到控件，请先安装控件！");
-        return false;
-    }
-    //获取版本号
-    // let version = zwPlugin.getVersion();
-    //判断是否插入key 0未插入 1已插入
-    if (zwPlugin.isUKConnect() == 0) {
-        warning('请插入您的IPASS设备后重试！');
-        return false;
-    }
-    //获取CSP
-    let cspNamebypid = zwPlugin.getCSPNamebypid();
-    let contName = cspNamebypid === ccitCont1Value ? deviceDefaultValue : ccitCont2;
-    //初始化密钥服务提供者
-    if (!zwPlugin.initProv(cspNamebypid, contName)) {
-        warning('初始化失败！');
-        return false;
-    }
-    //获取证书
-    let certificate = getCertificate(cspNamebypid);
-    if (certificate === null) {
-        warning('获取IPASS证书失败！');
-        return false;
-    }
-    return true;
-}
-/**
- * ipass解密
- * @param value 
- */
-export function ipassDecrypt(value: string) {
-    if (!ipassVerification()) {
-        return null;
-    }
-    //解密
-    let asymDecrypt = zwPlugin.AsymDecrypt(value);
-    if (asymDecrypt === null) {
-        warning('解密失败！');
-        return null;
-    }
-    return asymDecrypt;
-}
-
-
-/**
- * 提示框
- * @param info 
- */
-function warning(info: string) {
-    Modal.warning({
-        title: info,
-        centered: true
-    });
-}
-
-/**
- * 验证账号密码
- */
-function verifyYourAccountPassword() {
-    let srcData = 'ALG_SIGN_RsaWithSHA1', iSignAlg = '2';
-    let signData = zwPlugin.signatureWithAlg(srcData, iSignAlg);
-    return signData;
-}
-
-
-/**
- * 根据id获取项目信息
- */
-export async function isIPassDecode(id: any) {
-    return request('/api/biz-service-ebtp-project/v1/projectRecord/' + id);
-}
diff --git a/src/utils/MessageUtils.ts b/src/utils/MessageUtils.ts
deleted file mode 100644
index 232fb98..0000000
--- a/src/utils/MessageUtils.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { message, Modal } from "antd";
-
-/*
- * @Author: liqiang
- * @Date: 2020-11-30 10:57:11
- * @LastEditTime: 2021-01-25 09:35:01
- * @LastEditors: Please set LastEditors
- * @Description: 消息提示
- * @FilePath: \ebtp-cloud-frontend\src\utils\MessageUtils.ts
- */
-/**
- * 保存修改提示
- * @param res 
- */
-export function saveMessage(res: any) {
-    if (res.code === 200) {
-        if (res.data) {
-            message.success('保存成功！');
-            return true;
-        } else {
-            message.error('操作失败！');
-            return false;
-        }
-    }
-    return false;
-}
-/**
- * 删除提示
- * @param res 
- */
-export function deleteMessage(res: any) {
-    if (res.code === 200) {
-        if (res.data) {
-            message.success('删除成功！');
-            return true;
-        } else {
-            message.error('操作失败！');
-            return false;
-        }
-    }
-    return false;
-
-}
-/**
- * 通用消息
- * @param res 
- */
-export function commonMessage(res: any) {
-    if (res.code === 200) {
-        if (res.data) {
-            message.success('操作成功！');
-            return true;
-        } else {
-            message.error('操作失败！');
-            return false;
-        }
-    }
-    return false;
-}
\ No newline at end of file
diff --git a/src/utils/NumberUtils.ts b/src/utils/NumberUtils.ts
deleted file mode 100644
index a504a5a..0000000
--- a/src/utils/NumberUtils.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import { isEmpty } from '@/utils/CommonUtils';
-/*
- * @Author: liqiang
- * @Date: 2020-11-27 16:12:36
- * @LastEditTime: 2021-03-30 15:52:01
- * @LastEditors: Please set LastEditors
- * @Description: 数字工具类
- * @FilePath: \ebtp-cloud-frontend\src\utils\NumberUtils.ts
- */
-/**
- * 金额正则
- */
-const amountReplace = /(\d)(?=(\d{3})+(?!\d))/g;
-
-function getZero(num: number) {
-    let number = '';
-    for (let i = 0; i < num; i++) {
-        number += '0';
-    }
-    return number;
-}
-/**
- * 数字转换金额格式
- * @param money 数字
- * @param retain 小数点后保留几位
- */
-export function digitalConversionAmount(money: string, retain: number) {
-    let zero = getZero(retain);
-    if (isEmpty(money)) {
-        return money;
-    }
-    if (money.indexOf('.') === -1) {
-        money = money.replace(amountReplace, '$1,') + '.' + zero;
-    } else {
-        let division = money.split('.');
-        money = division[0].replace(amountReplace, '$1,');
-        money = money + '.' + (division[1] + zero).substr(0, retain);
-    }
-    return money;
-};
-
-/**
- * 根据传入的数字保留几位小数
- * @param number 数字
- * @param retain 小数点后保留几位
- */
-export function enterTheNumberToRetainTheDecimal(number: any, retain: number) {
-    if (isEmpty(number)) {
-        return number;
-    }
-    let index = String(number).indexOf('.');
-    if (index === -1) {
-        return number;
-    } else {
-        number = String(number).substring(0, index + (retain + 1));
-        return number;
-    }
-}
-
-/**
- * 加法 两个数相加
- * @param arg1 
- * @param arg2 
- * @returns 
- */
-export function algebraicAddition(arg1: number, arg2: number) {
-    let r1, r2, m, c;
-  try {
-    r1 = arg1.toString().split(".")[1].length;
-  }
-  catch (e) {
-    r1 = 0;
-  }
-  try {
-    r2 = arg2.toString().split(".")[1].length;
-  }
-  catch (e) {
-    r2 = 0;
-  }
-  c = Math.abs(r1 - r2);
-  m = Math.pow(10, Math.max(r1, r2));
-  if (c > 0) {
-    let cm = Math.pow(10, c);
-    if (r1 > r2) {
-      arg1 = Number(arg1.toString().replace(".", ""));
-      arg2 = Number(arg2.toString().replace(".", "")) * cm;
-    } else {
-      arg1 = Number(arg1.toString().replace(".", "")) * cm;
-      arg2 = Number(arg2.toString().replace(".", ""));
-    }
-  } else {
-    arg1 = Number(arg1.toString().replace(".", ""));
-    arg2 = Number(arg2.toString().replace(".", ""));
-  }
-  return (arg1 + arg2) / m;
-}
diff --git a/src/utils/PageUtils.ts b/src/utils/PageUtils.ts
deleted file mode 100644
index db86c6d..0000000
--- a/src/utils/PageUtils.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * @Author: liqiang
- * @Date: 2020-11-21 12:29:53
- * @LastEditTime: 2020-12-14 17:13:46
- * @LastEditors: Please set LastEditors
- * @Description: In User Settings Edit
- * @FilePath: \ebtp-cloud-frontend\src\utils\PageUtils.ts
- */
-import request from '@/utils/request';
-import { RequestData } from '@ant-design/pro-table';
-
-function requestData(data: any, success: boolean, total: number) {
-    return {
-        data: data,
-        success: success,
-        total: total,
-    }
-}
-
-function setBasePageRequest(params: any) {
-    return {
-        ...params,
-        basePageRequest: {
-            "pageNo": params.current,
-            "pageSize": params.pageSize
-        }
-    };
-}
-
-/**
- * 用于ProTable
- * @param api 后台api路径 (/api/...)
- * @param method 请求方法(get, post...)
- * @param params 对象数据 ({})
- */
-export function queryingPagingData(api: string, method: string, params: any) {
-    sessionStorage.setItem("projectListPrm", JSON.stringify(params));
-    return new Promise<RequestData<any>>((resolve, reject) => {
-        let parameters = setBasePageRequest(params);
-        get(api, method, parameters).then(res => {
-            if (res.code === 200) {
-                resolve(requestData(res.data.records, res.success, res.data.total));
-            } else {
-                reject(requestData([], false, 0))
-            }
-        })
-    });
-}
-
-export async function get(api: string, method: string, params?: any) {
-    return request(api, {
-        method: method,
-        data: params,
-    });
-}
-
-
-
-
-
-
-function setPageRequest(params: any) {
-    return {
-        ...params,
-        "pageNo": params.current,
-        "pageSize": params.pageSize
-    };
-}
-
-/**
- * 用于ProTable
- * @param api 后台api路径 (/api/...)
- * @param method 请求方法(get, post...)
- * @param params 对象数据 ({})
- */
-export function queryProTable(api: string, method: string, params: any) {
-    return new Promise<RequestData<any>>((resolve, reject) => {
-        let parameters = setPageRequest(params);
-        get(api, method, parameters).then(res => {
-            if (res.code === 200) {
-                resolve(requestData(res.data.records, res.success, res.data.total));
-            } else {
-                reject(requestData([], false, 0))
-            }
-        })
-    });
-}
\ No newline at end of file
diff --git a/src/utils/PdfModal/PdfModal.tsx b/src/utils/PdfModal/PdfModal.tsx
deleted file mode 100644
index 40254e5..0000000
--- a/src/utils/PdfModal/PdfModal.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Modal, Button } from 'antd';
-import PDF from 'react-pdf-js';
-import ProCard from '@ant-design/pro-card';
-import FileDown from '@/utils/Download';
-import { getFileListByBid, useDownLoadUrl } from '../DownloadUtils';
-/**
- * Pdf Modal弹窗公共组件
- * 2021.8.25 zhoujianlong 根据定标结果通知书的弹出窗口改造初始版本，增加备注
- */
-interface PdfModalProps {
-  fileId: string; //文档中心id
-  downLoadFileName: string; //下载后的文件名称
-  modalVisible: boolean; //Modal 弹出还是关闭
-  onCancel: () => void; //关闭Modal方法
-}
-
-const PdfModal: React.FC<PdfModalProps> = (props) => {
-  const { fileId, downLoadFileName, modalVisible, onCancel } = props;
-  const [url] = useDownLoadUrl(fileId);
-  const [page, setPage] = useState<number>(1); //页码
-  const [pages, setPages] = useState<number>(0); //总页数
-  const [fileExist, setFileExist] = useState<string>('0'); //0：未验证，1：验证后有，2：验证后没有
-
-  useEffect(() => {
-    //判断文件是否存在
-    getFileListByBid(fileId).then((res) => {
-      if (res !== undefined && res.length > 0) {
-        setFileExist('1');
-      } else {
-        setFileExist('2');
-      }
-    });
-  }, [fileId]);
-
-  //文档总页码
-  const onDocumentComplete = (pages: any) => {
-    setPage(1);
-    setPages(pages);
-  };
-
-  //上一页
-  const handlePrevious = () => {
-    setPage(page - 1);
-  };
-
-  //下一页
-  const handleNext = () => {
-    setPage(page + 1);
-  };
-
-  const modalHeight = (window.innerHeight * 96) / 100;
-
-  return (
-    <Modal
-      destroyOnClose
-      visible={modalVisible}
-      title="预览"
-      onCancel={() => onCancel()}
-      width={'80%'}
-      centered
-      style={{ maxHeight: modalHeight }}
-      bodyStyle={{ maxHeight: modalHeight - 107, overflowY: 'auto' }}
-      footer={[
-        <>
-          <Button key="close" onClick={() => onCancel()}>
-            关闭
-          </Button>
-          {fileExist == '1' ? (
-            <>
-              <Button disabled={page === pages} key="nextBtn" onClick={() => handleNext()}>
-                {' '}
-                下一页
-              </Button>
-              <Button disabled={page === 1} key="preBtn" onClick={() => handlePrevious()}>
-                {' '}
-                上一页
-              </Button>
-              <FileDown
-                key="downLoadFile"
-                type="pdf"
-                objectId={fileId}
-                style={{ float: 'left' }}
-                fileName={downLoadFileName}
-                btnName="下载"
-                method="GET"
-                form={null}
-              />
-            </>
-          ) : null}
-        </>,
-      ]}
-    >
-      <ProCard layout="center" direction="column" ghost>
-        {fileExist == '0' ? (
-          <div />
-        ) : fileExist == '1' ? url != "" && (
-          <>
-            <PDF
-              file={url}
-              scale={1.6}
-              onDocumentComplete={onDocumentComplete}
-              page={page}
-            />
-          </>
-        ) : (
-          <span>对不起，您所查看的文件不存在，请与系统管理员联系！</span>
-        )}
-      </ProCard>
-    </Modal>
-  );
-};
-
-export default PdfModal;
diff --git a/src/utils/ReviewReportUpload/index.tsx b/src/utils/ReviewReportUpload/index.tsx
deleted file mode 100644
index 13e6953..0000000
--- a/src/utils/ReviewReportUpload/index.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import React from 'react';
-import { Form, Modal } from 'antd';
-import ExtendUpload from '@/utils/ExtendUpload';
-
-interface ReviewReportUploadProps {
-    modalVisible: boolean;//modal visible
-    onCancel: (value?: string) => void//modal submit
-    fileId: string;//upload fileId
-    readOnly: boolean;//readonly status true-readonly false-not readonly
-}
-
-const layout = {
-    labelCol: { span: 4 },
-    wrapperCol: { span: 20 },
-};
-
-const modalHeight = window.innerHeight * 96 / 100;
-
-/**
- * 评审室-评审结果评审报告上传附件
- * @param props 
- * @returns 
- */
-
-const ReviewReportUpload: React.FC<ReviewReportUploadProps> = (props) => {
-    const { modalVisible, onCancel, fileId, readOnly } = props;
-
-    const [form] = Form.useForm();
-
-    return (
-        <Modal
-            destroyOnClose
-            title={`${readOnly ? '下载' : '上传'}附件`}
-            visible={modalVisible}
-            onCancel={() => onCancel(form.getFieldValue('annexId'))}
-            okButtonProps={{ hidden: true }}
-            cancelText="返回"
-            style={{ maxHeight: modalHeight }}
-            bodyStyle={{ maxHeight: modalHeight - 107, overflowY: 'auto' }}
-            centered
-        >
-            <Form name="complex-form" {...layout} form={form}>
-                <Form.Item
-                    name="annexId"
-                    label="附件"
-                    extra={readOnly ? null : '每个文件最大20MB，不限制数量'}
-                >
-                    <ExtendUpload bid={fileId} btnName="上传" maxSize={20} uploadProps={{ name: "file", disabled: readOnly }}>
-                    </ExtendUpload>
-                </Form.Item>
-            </Form>
-        </Modal>
-    );
-};
-
-export default ReviewReportUpload;
diff --git a/src/utils/RiskPrevention/index.tsx b/src/utils/RiskPrevention/index.tsx
deleted file mode 100644
index 311cd86..0000000
--- a/src/utils/RiskPrevention/index.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import React from 'react';
-import { Modal, Tag } from 'antd';
-import { ExclamationCircleOutlined } from '@ant-design/icons';
-import type { ProColumns } from '@ant-design/pro-table';
-import ProTable from '@ant-design/pro-table';
-import './riskStyle.less'
-
-interface RiskPreventionProps {
-    modalVisible: boolean;
-    onCancel: () => void;
-    data: Array<any>;
-}
-
-const modalHeight = window.innerHeight * 96 / 100;
-
-/**
- * 风险防控通用
- * @param props 
- * @returns 
- */
-const RiskPrevention: React.FC<RiskPreventionProps> = (props) => {
-    const { modalVisible, onCancel, data } = props;
-
-    const columns: ProColumns<any[]>[] = [
-        {
-            dataIndex: 'regulationStrategy',
-            title: '规则响应策略',
-            width: '13%',
-            valueEnum: {
-                hard: { text: '强控', status: 'Error' },
-                soft: { text: '软控', status: 'Warning' },
-                alarm: { text: '预警', status: 'Processing' }
-            },
-        },
-        {
-            dataIndex: 'regulationName',
-            title: '规则模型名称',
-            width: '13%',
-        },
-        {
-            dataIndex: 'regulationRank',
-            title: '风险响应等级',
-            width: '13%',
-            valueEnum: {
-                first: { text: '风险一级' },
-                second: { text: '风险二级' },
-                third: { text: '风险三级' }
-            },
-        },
-        {
-            dataIndex: 'message',
-            title: '规则相应内容',
-        },
-    ];
-
-    return (
-        <Modal
-            destroyOnClose
-            title="风控中心校验结果"
-            visible={modalVisible}
-            width={'60%'}
-            style={{ maxHeight: modalHeight }}
-            bodyStyle={{ maxHeight: modalHeight - 107, overflowY: 'auto', padding: '8px 24px 16px' }}
-            centered
-            onCancel={() => onCancel()}
-            okButtonProps={{ hidden: true }}
-        >
-            <div>
-                <Tag icon={<ExclamationCircleOutlined />} color="warning" className="risk-top-tag">
-                    当前业务操作受以下风控规则限制
-                </Tag>
-                {data?.map(item => {
-                    return (
-                        <div>
-                            <div className="risk-table-title">
-                                <span className="table-scene-name">场景名称：<span>{item.sceneName}</span></span>
-                                <span>{item.publishDepartName}</span>
-                            </div>
-                            <ProTable<any>
-                                columns={columns}
-                                dataSource={item.regulationData}
-                                rowKey="regulationId"
-                                size='small'
-                                pagination={false}
-                                toolBarRender={false}
-                                search={false}
-                            />
-                        </div>
-                    )
-                })}
-            </div>
-        </Modal>
-    );
-};
-
-export default RiskPrevention;
diff --git a/src/utils/RiskPrevention/riskStyle.less b/src/utils/RiskPrevention/riskStyle.less
deleted file mode 100644
index 39813bd..0000000
--- a/src/utils/RiskPrevention/riskStyle.less
+++ /dev/null
@@ -1,19 +0,0 @@
-.risk-top-tag {
-    font-size: 14px;
-    width: 100%;
-    padding: 8px 16px;
-}
-
-.risk-table-title {
-    height: 40px;
-    line-height: 40px;
-    display: flex;
-    justify-content: space-between;
-    font-weight: bold;
-    .table-scene-name {
-        color: #7c7c7c;
-    }
-    :last-child {
-        color: #000;
-    }
-}
\ No newline at end of file
diff --git a/src/utils/RiskPreventionSoft/index.tsx b/src/utils/RiskPreventionSoft/index.tsx
deleted file mode 100644
index d368695..0000000
--- a/src/utils/RiskPreventionSoft/index.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Modal, Tag } from 'antd';
-import { ExclamationCircleOutlined } from '@ant-design/icons';
-import type { ProColumns } from '@ant-design/pro-table';
-import ProTable from '@ant-design/pro-table';
-import './riskStyle.less'
-
-interface RiskPreventionSoftProps {
-    modalVisible: boolean;
-    onCancel: () => void;
-    onSubmit: () => void;
-    data: Array<any>;
-}
-
-const modalHeight = window.innerHeight * 96 / 100;
-
-/**
- * 风险防控通用(软控)
- * @param props 
- * @returns 
- */
-const RiskPreventionSoft: React.FC<RiskPreventionSoftProps> = (props) => {
-    const { modalVisible, onCancel, onSubmit, data } = props;
-    const [confirmButtonVisible, setConfirmButtonVisible] = useState<boolean>(true);//是否显示确定按钮
-
-    const columns: ProColumns<any[]>[] = [
-        {
-            dataIndex: 'regulationStrategy',
-            title: '规则响应策略',
-            width: '13%',
-            valueEnum: {
-                hard: { text: '强控', status: 'Error' },
-                soft: { text: '软控', status: 'Warning' },
-                alarm: { text: '预警', status: 'Processing' }
-            },
-        },
-        {
-            dataIndex: 'regulationName',
-            title: '规则模型名称',
-            width: '13%',
-        },
-        {
-            dataIndex: 'regulationRank',
-            title: '风险响应等级',
-            width: '13%',
-            valueEnum: {
-                first: { text: '风险一级' },
-                second: { text: '风险二级' },
-                third: { text: '风险三级' }
-            },
-        },
-        {
-            dataIndex: 'message',
-            title: '规则相应内容',
-        },
-    ];
-    useEffect(()=>{
-        setConfirmButtonVisible(getButtonVisible());
-    },[])
-
-    const getButtonVisible = () => {
-        console.log(data);
-        for (const risk of data) {
-            for (const result of risk.result) {
-                for (const regulationData of result.regulationData) {
-                    if(regulationData.regulationStrategy=="hard"){
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    return (
-        <Modal
-            destroyOnClose
-            title="风控中心校验结果"
-            visible={modalVisible}
-            width={'60%'}
-            style={{ maxHeight: modalHeight }}
-            bodyStyle={{ maxHeight: modalHeight - 107, overflowY: 'auto', padding: '8px 24px 16px' }}
-            centered
-            onCancel={() => onCancel()}
-            okButtonProps={{hidden: confirmButtonVisible}}
-            onOk={() => {
-                onSubmit();
-                onCancel();
-            }}
-        >
-            <div>
-                <Tag icon={<ExclamationCircleOutlined />} color="warning" className="risk-top-tag">
-                    当前业务操作受以下风控规则限制
-                </Tag>
-                {data.map(ite => ite?.result.map((item: any) => (
-                    <div>
-                        <div className="risk-table-title">
-                            <span className="table-scene-name">场景名称：<span>{item.sceneName}</span></span>
-                            <span>{item.publishDepartName}</span>
-                        </div>
-                        <ProTable<any>
-                            columns={columns}
-                            dataSource={item.regulationData}
-                            rowKey="regulationId"
-                            size='small'
-                            pagination={false}
-                            toolBarRender={false}
-                            search={false}
-                        />
-                    </div>
-                )
-                ))}
-            </div>
-        </Modal>
-    );
-};
-
-export default RiskPreventionSoft;
diff --git a/src/utils/RiskPreventionSoft/riskStyle.less b/src/utils/RiskPreventionSoft/riskStyle.less
deleted file mode 100644
index 39813bd..0000000
--- a/src/utils/RiskPreventionSoft/riskStyle.less
+++ /dev/null
@@ -1,19 +0,0 @@
-.risk-top-tag {
-    font-size: 14px;
-    width: 100%;
-    padding: 8px 16px;
-}
-
-.risk-table-title {
-    height: 40px;
-    line-height: 40px;
-    display: flex;
-    justify-content: space-between;
-    font-weight: bold;
-    .table-scene-name {
-        color: #7c7c7c;
-    }
-    :last-child {
-        color: #000;
-    }
-}
\ No newline at end of file
diff --git a/src/utils/SeleApprovalProcess/index.tsx b/src/utils/SeleApprovalProcess/index.tsx
deleted file mode 100644
index c68d431..0000000
--- a/src/utils/SeleApprovalProcess/index.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * @Author: zhoujianlong
- * @Date: 2021-06-22 14:46:22
- * @Last Modified by: zhoujianlong
- * @Last Modified time: 2021-08-03 14:09:26
- */
-import React, { useState } from 'react';
-import { Modal, Button, message, Spin } from 'antd';
-import ProTable, { ProColumns } from '@ant-design/pro-table';
-import { ApprovalProcess } from './service';
-
-interface SeleApprovalProcessProps {
-  modalVisible: boolean; //弹窗visible
-  onCancel: () => void; //关闭弹窗方法回调
-  data: Array<any>[]; //传入列表展示的数组
-  annoId: any; //传入id
-}
-/**
- * 公告、变更公告、失败公告、邀请函、公示 选择审批流程
- */
-const SeleApprovalProcess: React.FC<SeleApprovalProcessProps> = (props) => {
-  const { modalVisible, onCancel, data, annoId } = props;
-  const modalHeight = (window.innerHeight * 96) / 100;
-  //loading
-  const [loading, setLoading] = useState<boolean>(false);
-  //发起审批操作
-  const toApprove = async (record: any) => {
-    setLoading(true);
-    await ApprovalProcess(annoId, { ...record })
-      .then((res) => {
-        if (res?.code == 200 && res?.success == true) {
-          message.success('操作成功');
-          onCancel();
-        }
-      })
-      .finally(() => {
-        setLoading(false);
-      });
-  };
-
-  const columns: ProColumns<any>[] = [
-    {
-      title: '序号',
-      key: 'key',
-      render: (_, record: any, index: any) => index + 1,
-    },
-    {
-      title: '流程名称',
-      dataIndex: 'workflowName',
-      key: 'workflowName',
-    },
-    {
-      title: '操作',
-      dataIndex: 'options',
-      key: 'options',
-      render: (_: any, record: any) => (
-        <Button type="text" key="sele_approve" onClick={() => toApprove(record)}>
-          发起审批
-        </Button>
-      ),
-    },
-  ];
-
-  return (
-    <Modal
-      destroyOnClose
-      title="请选择审批流程"
-      visible={modalVisible}
-      width={'40%'}
-      style={{ maxHeight: modalHeight }}
-      bodyStyle={{ maxHeight: modalHeight - 107, overflowY: 'auto' }}
-      centered
-      onCancel={() => onCancel()}
-      footer={null}
-    >
-      <Spin spinning={loading} delay={300} tip="正在发起审批，请稍等">
-        <ProTable
-          rowKey="id"
-          pagination={false}
-          search={false}
-          options={false}
-          columns={columns}
-          dataSource={data}
-          dateFormatter="string"
-        />
-      </Spin>
-    </Modal>
-  );
-};
-
-export default SeleApprovalProcess;
diff --git a/src/utils/SeleApprovalProcess/service.ts b/src/utils/SeleApprovalProcess/service.ts
deleted file mode 100644
index 1f1ad53..0000000
--- a/src/utils/SeleApprovalProcess/service.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import request from '@/utils/request';
-/**
- * 提交审批操作
- * @param params
- * @returns
- */
-export async function ApprovalProcess(params: any, data: any) {
-  return request(`/api/biz-service-ebtp-bid/v1/anno/approval/${params}`, {
-    method: 'POST',
-    data: data,
-  });
-}
-
-/**
- * 获取流程列表
- * @param params
- * @returns
- */
- export async function getApprProcessList(params: any) {
-  return request(`/api/biz-service-ebtp-bid/v1/anno/approval/list/${params}`, {
-    method: 'POST',
-  });
-}
diff --git a/src/utils/SupplierList/index.tsx b/src/utils/SupplierList/index.tsx
deleted file mode 100644
index a02247f..0000000
--- a/src/utils/SupplierList/index.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import React from 'react';
-import { Button, Modal, Spin } from "antd";
-import ProTable, { ProColumns } from "@ant-design/pro-table"
-import { getSupplierList } from "@/utils/SupplierList/service";
-
-
-/**
- * 供应商列表
- * */
-interface SupplierData {
-  SupplierListType: any;//
-  spin: boolean,
-  addSupplier: (param: any) => void;
-  onCancel: () => void;
-}
-
-
-const SupplierList: React.FC<SupplierData> = (props) => {
-  const { SupplierListType, spin, addSupplier, onCancel } = props;
-
-  const columns1: ProColumns<{}>[] = [
-    {
-      title: '供应商名称',
-      dataIndex: 'partnerName',
-      key: 'partnerName',
-      align: 'left',
-    },
-    {
-      title: '供应商编号',
-      dataIndex: 'organizationCode',
-      key: 'organizationCode',
-      hideInSearch: true,//列表中显示，查询条件中不显示
-      align: 'left',
-    },
-    {
-      title: '操作',
-      dataIndex: 'status',
-      key: "",
-      hideInSearch: true,//列表中显示，查询条件中不显示
-      align: 'left',
-      render: (_: any, record: any) => (
-        <>
-          <Button onClick={() => addSupplier(record)} type="text">添加</Button>
-        </>
-      )
-    },
-  ];
-
-  return (
-    <>
-      <Modal title={"供应商列表"} destroyOnClose width={"60%"} style={{ top: "2%", height: "96%", overflowY: "auto" }}
-        visible={SupplierListType}
-        onCancel={onCancel}
-        centered
-        footer={<Button onClick={onCancel}>取消</Button>}
-      >
-        <Spin spinning={spin}>
-          <ProTable
-            size={"small"}
-            columns={columns1}
-            request={async (params) => {
-              const msg = await getSupplierList({ ...params, pageNum: params.current });
-              return {
-                data: msg.data?.records, success: msg?.success, total: msg.data?.total,
-              }
-            }
-            }
-            rowKey="partnerMdmCode"
-            pagination={{
-              defaultPageSize: 10,
-              showQuickJumper: true,
-            }}
-            search={{
-              defaultCollapsed: true,
-              labelWidth: 100,
-              span: 12
-            }}
-            dateFormatter="string"
-            options={false}
-          />
-        </Spin>
-      </Modal>
-    </>
-  )
-}
-export default SupplierList
diff --git a/src/utils/SupplierList/index4user.tsx b/src/utils/SupplierList/index4user.tsx
deleted file mode 100644
index 83fe237..0000000
--- a/src/utils/SupplierList/index4user.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import React from 'react';
-import { Button, Modal, Spin } from "antd";
-import ProTable, { ProColumns } from "@ant-design/pro-table"
-import { getSupplierList, getSupplierUser } from "@/utils/SupplierList/service";
-
-
-/**
- * 供应商列表
- * */
-interface SupplierData {
-  SupplierBodyType: any;//
-  spin: boolean,
-  chooseSupplierUser: (param: any) => void;
-  partnerMdmCode: any;
-  onCancel: () => void;
-
-}
-
-
-const SupplierUserList: React.FC<SupplierData> = (props) => {
-  const { SupplierBodyType, spin, chooseSupplierUser, partnerMdmCode, onCancel } = props;
-
-  const columns1: ProColumns<{}>[] = [
-    {
-      title: '联系人',
-      dataIndex: 'empName',
-      key: 'empName',
-      align: 'left',
-    },
-    {
-      title: '账号',
-      dataIndex: 'userAccount',
-      key: 'userAccount',
-      align: 'left',
-      search: false,
-    },
-    {
-      title: '电话',
-      dataIndex: 'mobile',
-      key: 'mobile',
-      align: 'left',
-      search: false,
-    },
-    {
-      title: '操作',
-      dataIndex: 'status',
-      key: "",
-      align: 'left',
-      search: false,
-      render: (_: any, record: any) => (
-        <>
-          <Button onClick={() => chooseSupplierUser(record)} type="text">选择</Button>
-        </>
-      )
-    },
-  ];
-
-  return (
-    <>
-      <Modal title={"选择供应商联系人"} destroyOnClose width={"60%"} style={{ top: "2%", height: "96%", overflowY: "auto" }}
-        visible={SupplierBodyType} onCancel={onCancel}
-        footer={<Button onClick={onCancel}>取消</Button>}
-      >
-        <Spin spinning={spin}>
-          <ProTable
-            size={"small"}
-            columns={columns1}
-            request={async (params) => {
-              const msg = await getSupplierUser({
-                ...params, partnerMdmCode: partnerMdmCode, pageNum: params.current, pageSize: params.pageSize,
-              });
-              return {
-                data: msg.data?.records, success: msg?.success, total: msg?.data.total,
-              }
-            }
-            }
-            rowKey="partnerMdmCode"
-            pagination={{
-              defaultPageSize: 10,
-              showQuickJumper: true,
-            }}
-            dateFormatter="string"
-            options={false}
-          />
-        </Spin>
-      </Modal>
-    </>
-  )
-}
-export default SupplierUserList
diff --git a/src/utils/SupplierList/service.ts b/src/utils/SupplierList/service.ts
deleted file mode 100644
index 5abd9da..0000000
--- a/src/utils/SupplierList/service.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import request from "@/utils/request";
-/*获取供应商信息 后端 山分 */
-export async function getSupplierList(params: any) {
-  /*
-  * http://gysxxk.cn1.utools.club/serviceEshopProviderMdm/findPageProvider
-{  
-    "pageNum": 1,
-    "pageSize": 10
-}
-  * */
-  return request('/api/api/core-service-supplierbase/outer/v1.0/serviceEshopProviderMdm/findPageProvider', {
-    method: 'post',
-    data: {
-      ...params
-    }
-  })
-
-
-}
-/*获取供应商联系人信息 后端 吉分20230331版本 */
-export async function getSupplierUserByUserInfo(params: any) {
-  /*
-  *暂无url
-  * */
-  return request('/api/core-service-ebtp-userinfo/v1/userinfo/findUserCountListBySupplierCodePage', {
-    method: 'post',
-    data: {
-      ...params
-    }
-  })
-
-
-}
-/*获取供应商联系人信息 后端 山分 */
-export async function getSupplierUser(params: any) {
-  /*
-  *暂无url
-  * */
-  return request('/api/api/core-service-supplierbase/outer/v1.0/serviceEshopProviderEmpMdm/findUserCountListBySupplierCodePage', {
-    method: 'post',
-    data: {
-      ...params
-    }
-  })
-
-
-}
diff --git a/src/utils/authority.ts b/src/utils/authority.ts
deleted file mode 100644
index 66f40ec..0000000
--- a/src/utils/authority.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-//import { reloadAuthorized } from './Authorized';
-import { getRA, getPurchaseCanOperate } from './session';
-
-// use localStorage to store the authority info, which might be sent from server in actual project.
-export function getAuthority(str?: string): string | string[] {
-  const authorityString =
-    typeof str === 'undefined' && sessionStorage ? sessionStorage.getItem('roleAuthority') : str;
-  // authorityString could be admin, "admin", ["admin"]
-  let authority;
-  try {
-    if (authorityString) {
-      authority = JSON.parse(authorityString);
-    }
-  } catch (e) {
-    authority = authorityString;
-  }
-  if (typeof authority === 'string') {
-    return [authority];
-  }
-  // preview.pro.ant.design only do not use in your production.
-  // preview.pro.ant.design 专用环境变量，请不要在你的项目中使用它。
-  // if (!authority && ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION === 'site') {
-  //   return ['admin'];
-  // }
-  return authority;
-}
-
-// export function setAuthority(authority: string | string[]): void {
-//   const proAuthority = typeof authority === 'string' ? [authority] : authority;
-//   sessionStorage.setItem('roleAuthority', JSON.stringify(proAuthority));
-//   // auto reload
-//   reloadAuthorized();
-// }
-//全局按钮控制 登陆角色是否显示功能   不显示：return true
-export function btnAuthority(allowedRoles: string[], type?: string) {
-  const roles = getRA();//当前登陆账号的角色数组
-  let control = true;
-  
-  //根据session中的 采购经理是否可操作 属性，返回控制值
-  if (getPurchaseCanOperate() == null && type != '1') {
-    control = false;
-  }
-  //根据传入得可操作角色 返回控制值
-  if ((!control || type=='1') && allowedRoles?.length > 0 && roles != null) {
-    for (let index = 0; index < allowedRoles.length; index++) {
-      const element = allowedRoles[index];
-      control = !roles.includes(element);//传入的角色有一个有权限就跳出，反false(显示)
-      if (!control) {
-        break;
-      }
-    }
-  }
-
-  return control;
-}
diff --git a/src/utils/checkEmpty.ts b/src/utils/checkEmpty.ts
deleted file mode 100644
index cf2e004..0000000
--- a/src/utils/checkEmpty.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export default function checkUn (val: any) {
-  if (val == undefined || val == null || val == "" || val == [] || JSON.stringify(val) == "{}" || val == "null") {
-    return false;
-  } else {
-    return true;
-  }
-}
\ No newline at end of file
diff --git a/src/utils/comFormItem.tsx b/src/utils/comFormItem.tsx
deleted file mode 100644
index 4739f67..0000000
--- a/src/utils/comFormItem.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { DatePicker, Form, Input, Radio } from 'antd';
-import React from 'react';
-const FormItem = Form.Item;
-const { TextArea } = Input;
-//Input
-export function returnInput(name: any, label: string, edit: boolean, rules?: any, width?: any) {
-  return (
-    <FormItem name={name} label={label} rules={rules}>
-      <Input bordered={edit} readOnly={!edit} style={{ width: width }} />
-    </FormItem>
-  )
-}
-//TextArea
-export function returnArea(name: any, edit: boolean, label?: string,) {
-  const wrapperCol = { offset: label == undefined ? 6 : 0, span: 14 };
-  return (
-    <FormItem name={name} label={label} wrapperCol={wrapperCol}>
-      <TextArea bordered={edit} readOnly={!edit} />
-    </FormItem>
-  )
-}
-//DatePicker
-export function returnDatePicker(name: any, label: string, edit: boolean,) {
-  return (
-    <FormItem name={name} label={label}>
-      <DatePicker showNow={false} showTime format="YYYY-MM-DD HH:mm:ss" bordered={edit} disabled={!edit} />
-    </FormItem>
-  )
-}
-// //RadioGroup
-// export function returnRadioGroup(name: any, label: string, options: any, value: any, edit: boolean, onChange:()=>void) {
-//   return (
-//     <FormItem name={name} label={label}>
-//       <Radio.Group disabled={!edit} options={options} value={value} onChange={(e) => onChange(e, name)} />
-//     </FormItem>
-//   )
-// }
\ No newline at end of file
diff --git a/src/utils/isType.js b/src/utils/isType.js
deleted file mode 100644
index ed9493b..0000000
--- a/src/utils/isType.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * @Author: dongmin
- * @LastEditors: dongmin
- * @Date: 2021-04-02 16:30:40
- * @LastEditTime: 2021-04-02 18:44:47
- */
-
-const isType = function (type) {
-  return function (obj) {
-    return Object.prototype.toString.call(obj) === `[object ${type}]`;
-  }
-}
-
-export const isString = input => isType('String')(input);
-export const isNumber = input => isType('Number')(input);
-export const isUndefined = input => isType('Undefined')(input);
-export const isNull = input => isType('Null')(input);
-export const isNaN = input => isNaN(input);
-export const isArray = input => isType('Array')(input);
-export const isObject = input => isType('Object')(input);
-export const isFunction = input => isType('Function')(input);
-
-/**
- * 数据类型是否一致
- * @param {*} one 参数一
- * @param {*} other 另外一个参数
- * @returns {boolean} 是否一致
- */
-export const isSameType = (one, other) => Object.prototype.toString.call(one) === Object.prototype.toString.call(other)
-
-export default isType;
\ No newline at end of file
diff --git a/src/utils/lq.style.less b/src/utils/lq.style.less
deleted file mode 100644
index 38c6c45..0000000
--- a/src/utils/lq.style.less
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * @Author: liqiang
- * @Date: 2020-11-09 18:02:11
- * @LastEditTime: 2021-02-20 13:47:36
- * @LastEditors: Please set LastEditors
- * @Description: In User Settings Edit
- * @FilePath: \ebtp-cloud-frontend\src\utils\lq.style.less
- */
-@import '~antd/es/style/themes/default.less';
-
-@themeColors:#cb0000;
-@buttonColors:#1890ff;
-
-.background{
-  background-color: #fff;
-}
-.p10{
-  padding: 10px;
-  background-color: #fff;
-}
-.name {
-  color: #333;
-  padding: 0 15px 10px 0;
-  margin: 0;
-  font-weight: 700;
-  font-size: 16px;
-}
-.file{
-  color: @themeColors;
-  border-left: 5px solid @themeColors;
-  line-height: 18px;
-  padding-left: 7px;
-  margin: 3px 0;
-}
-.message{
-  margin-top: 12px;
-  border-top: 1px solid #ccc;
-  border-bottom: 1px solid @themeColors;
-  margin-bottom: 0;
-  .text{
-    background-color:@themeColors;
-    padding: 3px 8px;
-    color: #fff;
-    display: inline-block;
-    margin-top: 8px;
-  }
-}
-.table-mess{
-  p{
-    width: 33.33%;
-    display: inline-block;
-  }
-}
-.tr{
-  text-align: right;
-}
-.red{
-  color:@themeColors;
-}
-.f12{
-  font-size: 13px;
-}
-.b-red{
-  background-color: @themeColors !important;
-  border-color: @themeColors !important;
-  margin-left: 20px;
-  color: #fff;
-}
-.titBlock{
-    position: relative;
-    margin: 5px 10px;
-    height: 40px;
-    line-height: 40px;
-    border-bottom: 1px solid #ddd;
-}
-.titBlockI{
-    float: left;
-    margin: 10px 0 0 5px;
-    width: 4px;
-    height: 18px;
-    background: @themeColors;
-}
-.titBlockH4{
-    padding-left: 20px;
-    font-size: 16px;
-    color: @themeColors;
-}
-.spaceBetween{
-  margin: 0px 8px;
-}
-.ml20{
-  margin-left: 15px;
-}
-.t_left{ 
-  text-align:left;
-}
-.t_right{ 
-  text-align:right;
-}
-.f_left{ 
-  float:left;
-}
-.f_right{ 
-  float:right;
-}
-.textAlignCenter{
-  text-align:center;
-}
-.tit_block_i{
-  position: relative;
-  margin: 8px 0px;
-  height: 40px;
-  line-height: 40px;
-  border-bottom: 1px solid #ddd;
-}
-.tit_block_h4{
-  font-size: 16px;
-  color: @themeColors;
-}
-.input-border{
-  border: 1px solid #d9d9d9;
-}
-.input-invariable-grey{
-  color: rgba(0, 0, 0, 0.85) !important;
-}
-.button-colors{
-  color: @buttonColors;
-}
-.a-padding-left {
-  padding-left: 11px;
-}
-.input-text-resize {
-  resize:none;
-  .ant-input {
-    resize:none;
-  }
-}
-.maxW100{
-  .ant-col-12{
-    max-width: 100%;
-  }
-}
-.item-margin-top .ant-form-item-control-input{
-  margin-top: 5px;
-}
-.card-padding .ant-card-body{
-  padding: 8px 24px;
-}
-.w100{
-  width: 100%;
-  margin-left: 0 !important;
-}
-.table-border table {
-  border-top: 1px solid #ccc;
-  border-left: 1px solid #ccc;
-}
-.table-border table th, .table-border table td{
-  border-bottom: 1px solid #ccc;
-  border-right: 1px solid #ccc;
-  padding: 3px 5px;
-  min-height: 30px;
-}
-.table-border table th{
-  border-bottom: 2px solid #ccc;
-  text-align: center;
-  background-color: #f1f1f1;
-}
\ No newline at end of file
diff --git a/src/utils/session.ts b/src/utils/session.ts
deleted file mode 100644
index e9a2d38..0000000
--- a/src/utils/session.ts
+++ /dev/null
@@ -1,390 +0,0 @@
-import { getRoomDataById, getSectionDataById } from '@/services/common';
-import { message } from 'antd';
-import { getProTypeCodeByBidMethodDict, getURLInformation, getUrlRelativePath, isEmpty } from './CommonUtils';
-//取session项目id
-export function getProId() {
-  if (getSessionProjectData() == null) {
-    return null;
-  } else {
-    return getSessionProjectData().id;
-  }
-}
-/**
- * 获取流程Id(defId)
- * @returns
- *  -1-  bid_prequalification 公开招标-资格预审
- *  -2-  bid_qualification 公开招标-资格后审
- *  -3-  bid_centralized_prequalification 公开招标-集中资格预审
- *  -4-  bid_centralized_prequalification_bid 公开招标-集中资格预审招标
- *  -5-  bid_invitation 邀请招标
- *  -6-  comparison_one_prequalification 公开比选一阶段-资格预审
- *  -7-  comparison_multi_prequalification 公开比选多阶段-资格预审
- *  -8-  comparison_one 公开比选一阶段
- *  -9-  comparison_multi 公开比选多阶段
- *  -10- recruit 公开招募 即 单轮
- *  -11- recruit_multi 常态化招募 即 多轮
- *  -12- negotiation_competitive_public 竞争性谈判-公开参与
- *  -13- negotiation_competitive_invite 竞争性谈判-邀请参与
- *  -14- negotiation_single 单一来源
- *  -15- inquiry 询价
- *  -16- auction 内拍
- */
-//获取流程id
-export function getDefId() {
-  let id: any | null = sessionStorage.getItem('defId');
-  let defId = JSON.parse(id);
-  return defId
-}
-//获取proTypeCode 项目菜单返回用
-export function getProTypeCode() {
-  let proTypeCode: any = sessionStorage.getItem('proTypeCode');
-  return proTypeCode
-}
-
-/**
- * 获取项目名称
- */
-export function getProName() {
-  if (getSessionProjectData() === null) {
-    return null;
-  } else {
-    return getSessionProjectData().projectName;
-  }
-}
-/**
- * 获取采购方式
- */
-export function getProMethod() {
-  if (getSessionProjectData() === null) {
-    return null;
-  } else {
-    return getSessionProjectData().bidMethodDict;
-  }
-}
-/**
- * 获取比选方式（比选一阶段，比选多阶段）
- */
-export function getProSignDict() {
-  if (getSessionProjectData() === null) {
-    return null;
-  } else {
-    return getSessionProjectData().biddingSignDict;
-  }
-}
-
-/**
- * 获取开标时是否需要投标人ipass解密
- */
-export function getIPassDecode() {
-  if (getSessionProjectData() === null) {
-    return null;
-  } else {
-    return getSessionProjectData().isIPassDecode;
-  }
-}
-
-//取session全部字典数据
-export function getDicData() {
-  let data = sessionStorage.getItem('DicData');
-  if (data == null || data == undefined) {
-    return null
-  }
-  return data;
-}
-
-//取session评审室id
-export function getRoomId() {
-  let roomId = sessionStorage.getItem('roomId');
-  return roomId;
-}
-
-//取session评审室status(3为评审室结束)
-export function getRoomStatus() {
-  let roomStatus = sessionStorage.getItem('roomStatus');
-  return roomStatus;
-}
-
-//取session资审方式 1-资格预审 2-资格后审
-export function getRoomTypeByEva() {
-  let roomTypeByEva = sessionStorage.getItem('roomTypeByEva');
-  return roomTypeByEva;
-}
-
-//取session聊天室id
-export function getGroupId() {
-  let groupId = sessionStorage.getItem('groupId');
-  return groupId;
-}
-
-//取session专家聊天室id
-export function getExpertGroupId() {
-  let expertGroupId = sessionStorage.getItem('expertGroupId');
-  return expertGroupId;
-}
-
-
-
-/**
- * 获取session projectData项目信息（项目跟进）
- */
-export function getSessionProjectData() {
-  let projectData: any | null = sessionStorage.getItem('projectData');
-  projectData = JSON.parse(projectData);
-  return projectData;
-}
-
-/**
-* 获取session projectDocumentationData项目信息（项目建档）
-*/
-export function getSessionProjectDocumentationData() {
-  let projectData: any | null = sessionStorage.getItem('projectDocumentationData');
-  return JSON.parse(projectData);
-}
-
-/**
- * 获取session userData用户信息
- */
-export function getSessionUserData() {
-  let userData: any | null = sessionStorage.getItem('userData');
-  return JSON.parse(userData);
-}
-/**
- * 获取session userToken
- */
-export function getUserToken() {
-  let userToken: any = `Bearer ${sessionStorage.getItem('Authorization')}`;
-  return userToken;
-}
-
-/**
- * 获取session userRefreshToken
- */
-export function getUserRefreshToken() {
-  let userRefreshToken: any | null = sessionStorage.getItem('refreshToken');
-  return userRefreshToken;
-}
-
-/**
- * 获取session userScope
- */
-export function getUserScope() {
-  let userScope: any | null = sessionStorage.getItem('scope');
-  return userScope;
-}
-
-/**
- * 获取localStorage userData用户信息
- */
-// export function getLocalUserData(){
-//   let userData:any|null = sessionStorage.getItem('userInfo');
-//   return JSON.parse(userData);
-// }
-// export function getLocalUserData(){
-//   let userData:any|null = sessionStorage.getItem('userInfo');
-//   return JSON.parse(userData);
-// }
-
-/**
- * 获取采购类型合并字典
- */
-export function getDictBidMethodDictUnion() {
-  let dictData: any = getDicData();
-  //全字典数据对象
-  let dictDataObject = JSON.parse(dictData);
-  //采购方式合并--字典
-  let bidMethodUnion = [];
-  if (dictDataObject !== null) {
-    bidMethodUnion = dictDataObject['web_menu=web'];
-  }
-  return bidMethodUnion;
-}
-
-/**
- * 获取采购类别字典
- */
-export function getDictBidMethodDict() {
-  //采购方式合并--字典
-  let bidMethodUnion = getDictBidMethodDictUnion();
-  let dictData: any = getDicData();
-  //全字典数据对象
-  let dictDataObject = JSON.parse(dictData);
-  //采购方式--字典
-  let bidMethod: any[] = [];
-  //循环遍历所有合并的字典，从合并的字典中获取code值，拼成"01=web_menu""02=web_menu"
-  //的值，在从全部字典中获取采购方式的字典
-  if (bidMethodUnion?.length > 0) {
-    for (let i = 0; i < bidMethodUnion.length; i++) {
-      let key = bidMethodUnion[i]["code"] + "=web_menu";
-      let dict = dictDataObject[key];
-      if (dict?.length > 0) {
-        bidMethod = [...bidMethod, ...dict];
-      }
-    }
-  }
-  return bidMethod;
-}
-
-
-/**
- * 获取session roleData用户信息
- */
-export function getSessionRoleData() {
-  let roleData: any | null = sessionStorage.getItem('roleData');
-  return JSON.parse(roleData);
-}
-
-/**
- * 专家评审室列表存储session信息
- * @param record 评审室列表行数据
- */
-
-export async function jurySaveInfo(record: any) {
-  sessionStorage.setItem('projectData', JSON.stringify({
-    bidMethodDict: record?.bidMethodDict,//采购方式
-    id: record?.tpId//项目id
-  }));
-  sessionStorage.setItem('roomId', record.id);
-  sessionStorage.setItem("groupId", record.chatGroupId)
-  sessionStorage.setItem("expertGroupId", record.expertChatGroupId)
-  sessionStorage.setItem("sectionId", record.sectionId)
-  sessionStorage.setItem("roomTypeByEva", record.roomType)
-  sessionStorage.setItem("openTime", record.openTime)
-  await getQuotationMethodById(record.id)
-}
-
-/**
- * 获取国密加密算法需要的属性
- */
-export function getEncrypt() {
-  let encrypt = {
-    cipherMode: REACT_APP_PASSWORD_CIPHERMODE,
-    publicKey: REACT_APP_PASSWORD_PUBLICKEY
-  }
-  return encrypt;
-}
-
-export interface projectDataItem {
-  id?: string
-  bidMethodDict?: string
-  biddingSignDict?: string
-  isClientFile?: string
-  isIPassDecode?: string
-  isIPassFile?: string
-  projectName?: string
-  openTenderForm?: string
-  returnURL?: string
-}
-
-
-
-/**
- * 内拍项目跟进
- * @param projectData
- */
-export function auctionFollowUpAProjectManager(projectData: projectDataItem): void {
-  sessionStorage.setItem('projectData', JSON.stringify(projectData));
-  sessionStorage.setItem('defId', JSON.stringify('auction'));
-  let returnURL = projectData.returnURL ? projectData.returnURL : getUrlRelativePath();
-  sessionStorage.setItem('returnURL', returnURL);
-}
-
-/**
- * 获取session roleAuthority
- */
-export function getRA() {
-  let roleAuthority: any | null = sessionStorage.getItem('roleAuthority');
-  return JSON.parse(roleAuthority);
-}
-/**
- * 获取项目信息 适用法律
- */
-export function getProOpenTenderForm() {
-  if (getSessionProjectData() === null) {
-    return null;
-  } else {
-    return getSessionProjectData().openTenderForm;
-  }
-}
-/**
- * 获取session roleAuthority
- */
-export function getPurchaseCanOperate() {
-  let authority: string | null = sessionStorage.getItem('purchaseCanOperate');
-  return authority;
-}
-
-/**
- * 设置session roleAuthority
- */
-export function setPurchaseCanOperate() {
-  sessionStorage.setItem('purchaseCanOperate', '1');
-}
-
-/**
- * 删除session roleAuthority
- */
-export function removePurchaseCanOperate() {
-  sessionStorage.removeItem('purchaseCanOperate');
-}
-/**
- * 获取returnURL
- * @returns
- */
-export function getReturnURL() {
-  let returnURL = sessionStorage.getItem('returnURL');
-  return returnURL === null ? "" : returnURL;
-}
-
-/**
- * 获取getRoomReturnURL
- * @returns
- */
-export function getRoomReturnURL() {
-  let roomReturnURL = sessionStorage.getItem('roomReturnURL');
-  return roomReturnURL === null ? "" : roomReturnURL;
-}
-
-/**
- * 获取当前评审室对应标段的报价类型（只能在评审室内使用）
- * @returns
- */
-export function getSectionQuot() {
-  let returnURL = sessionStorage.getItem('sectionQuot');
-  return returnURL === null ? "0" : returnURL;
-}
-
-/**
- * 根据评审室id获取标段的报价类型
- * @param roomId
- * @returns 1-%（优惠率，折扣率） 0-元（总价，单价）
- */
-export async function getQuotationMethodById(roomId: any) {
-  if (roomId == undefined || roomId == '' || roomId == null) {
-    message.error('参数缺失')
-    return
-  } else {
-    await getRoomDataById(roomId).then(async res => {
-      if (res?.code == 200 && res?.success == true) {
-        let roomData = res?.data
-        await getSectionDataById(roomData?.sectionId).then(response => {
-          if (response?.code == 200 && response?.success == true) {
-            let quotationMethodDict = response?.data?.quotationMethodDict
-            let result = (quotationMethodDict == "quotation_method_2" || quotationMethodDict == "quotation_method_3") ? "1" : "0"
-            sessionStorage.setItem("sectionQuot", result)//roomType存入session
-          }
-        })
-      }
-    })
-  }
-}
-/**
- * 存储角色信息
- * @param {总数据} userData
- * @param {权限} role
- * @param {当前角色} roleData
- */
-export function setUserData(userData: any, role: string, roleData: any): void {
-  sessionStorage.setItem('userData', JSON.stringify(userData));
-  sessionStorage.setItem('roleAuthority', JSON.stringify([role]));
-  sessionStorage.setItem('roleData', JSON.stringify(roleData));
-}
diff --git a/src/utils/utils.less b/src/utils/utils.less
deleted file mode 100644
index 6b544d8..0000000
--- a/src/utils/utils.less
+++ /dev/null
@@ -1,23 +0,0 @@
-// mixins for clearfix
-// ------------------------
-.clearfix() {
-  zoom: 1;
-  &::before,
-  &::after {
-    display: table;
-    content: ' ';
-  }
-  &::after {
-    clear: both;
-    height: 0;
-    font-size: 0;
-    visibility: hidden;
-  }
-}
-
-.vrbre{
-  background: rgb(8,66,173) !important;
-  border:1px solid #FFFFFF !important;
-  color:#FFFFFF !important;
-  font-size: 10px;
-}
\ No newline at end of file
diff --git a/src/utils/utils.test.ts b/src/utils/utils.test.ts
deleted file mode 100644
index c2bb32d..0000000
--- a/src/utils/utils.test.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { isUrl } from './utils';
-
-describe('isUrl tests', (): void => {
-  it('should return false for invalid and corner case inputs', (): void => {
-    expect(isUrl([] as any)).toBeFalsy();
-    expect(isUrl({} as any)).toBeFalsy();
-    expect(isUrl(false as any)).toBeFalsy();
-    expect(isUrl(true as any)).toBeFalsy();
-    expect(isUrl(NaN as any)).toBeFalsy();
-    expect(isUrl(null as any)).toBeFalsy();
-    expect(isUrl(undefined as any)).toBeFalsy();
-    expect(isUrl('')).toBeFalsy();
-  });
-
-  it('should return false for invalid URLs', (): void => {
-    expect(isUrl('foo')).toBeFalsy();
-    expect(isUrl('bar')).toBeFalsy();
-    expect(isUrl('bar/test')).toBeFalsy();
-    expect(isUrl('http:/example.com/')).toBeFalsy();
-    expect(isUrl('ttp://example.com/')).toBeFalsy();
-  });
-
-  it('should return true for valid URLs', (): void => {
-    expect(isUrl('http://example.com/')).toBeTruthy();
-    expect(isUrl('https://example.com/')).toBeTruthy();
-    expect(isUrl('http://example.com/test/123')).toBeTruthy();
-    expect(isUrl('https://example.com/test/123')).toBeTruthy();
-    expect(isUrl('http://example.com/test/123?foo=bar')).toBeTruthy();
-    expect(isUrl('https://example.com/test/123?foo=bar')).toBeTruthy();
-    expect(isUrl('http://www.example.com/')).toBeTruthy();
-    expect(isUrl('https://www.example.com/')).toBeTruthy();
-    expect(isUrl('http://www.example.com/test/123')).toBeTruthy();
-    expect(isUrl('https://www.example.com/test/123')).toBeTruthy();
-    expect(isUrl('http://www.example.com/test/123?foo=bar')).toBeTruthy();
-    expect(isUrl('https://www.example.com/test/123?foo=bar')).toBeTruthy();
-  });
-});
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
deleted file mode 100644
index 71ed4ca..0000000
--- a/src/utils/utils.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { parse } from 'querystring';
-
-/* eslint no-useless-escape:0 import/prefer-default-export:0 */
-const reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)$/;
-
-export const isUrl = (path: string): boolean => reg.test(path);
-
-export const isAntDesignPro = (): boolean => {
-  if (ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION === 'site') {
-    return true;
-  }
-  return window.location.hostname === 'preview.pro.ant.design';
-};
-
-// 给官方演示站点用，用于关闭真实开发环境不需要使用的特性
-export const isAntDesignProOrDev = (): boolean => {
-  const { NODE_ENV } = process.env;
-  if (NODE_ENV === 'development') {
-    return true;
-  }
-  return isAntDesignPro();
-};
-
-export const getPageQuery = () => parse(window.location.href.split('?')[1]);
diff --git a/src/utils/zwPlugin.js b/src/utils/zwPlugin.js
deleted file mode 100644
index 8677315..0000000
--- a/src/utils/zwPlugin.js
+++ /dev/null
@@ -1,3491 +0,0 @@
-
-/********************************************************************
-created:	2017/05/26
-created:	16:10:2014   09:58
-filename: 	
-file path:	
-file base:	
-file ext:	
-author:		chenyadong
-
-purpose:	CA 控件、插件js统一脚本
-*********************************************************************/
-
-
-//密钥类型
-var AT_KEYEXCHANGE = 1;
-var AT_SIGNATURE = 2;
-
-//算法类型
-var ALG_RSA = 1;
-var	ALG_SM2 = 2;
-
-//证书解析项索引
-var CERT_ITEM_PUBKEY = 1;  //1:公钥，返回base64格式
-var	CERT_ITEM_ISSUER = 2;      //2:证书颁发者，返回如C=CN, S=jilin, L=changchun, O=CNC, OU=CNCCA, CN=CHINA NETCOM CLASS2 CA
-var	CERT_ITEM_SUBJECT = 3;     //3:证书主题信息，返回如C=CN, S=江苏, L=WUXI, CN=TEST4
-var	CERT_ITEM_BEFORE_TIME = 4; //4:证书生效日期，返回如2008-01-06 13:10:07
-var	CERT_TIEM_AFTER_TIME = 5;  //5:证书失效日期，返回如2008-01-06 13:10:07
-var	CERT_ITEM_SN = 6;          //6:证书序列号，返回如0983
-var	CERT_ITEM_SUBJECT_CN = 7;  //7:证书subect中的CN项
-
-//支持的签名算法	
-var	ALG_SIGN_RsaWithMD5 = 1;
-var	ALG_SIGN_RsaWithSHA1 = 2;
-var	ALG_SIGN_SM2WithSM3 = 3;
-
-//支持的对称加解密算法
-var ALG_SYM_DES = 1; //DES 算法
-var	ALG_SYM_TDES = 2;   //3des算法
-var	ALG_SYM_SM1 = 3;   //国密sm1算法
-var	ALG_SYM_AES = 4;   //aes算法
-
-//对于IE11的判断需要使用userAgent中的Trident进行判断
-export function isIE(){
-
-	var isIEof11 = isIE11();
-	var bisIE = checkBrowserISIE();
-	return ((navigator.appName.indexOf("Microsoft Internet Explorer")!=-1 && document.all) || isIEof11 || bisIE);
-}
-
-export function checkBrowserISIE() 
-{
-    return (!!window.ActiveXObject || 'ActiveXObject' in window) ? true : false;
-}
-//IE11的判断已经不能使用MSIE来判断 userAgent：Mozilla/5.0 (Windows NT 6.3; Trident/7.0; rv 11.0) like Gecko
-export function isIE11(){
-	var trident = navigator.userAgent.split(";")[2];
-	var trident64 = navigator.userAgent.split(";")[3];
-
-	if(trident == null && trident64 == null)
-	{
-		//alert("trident is null");
-		return false;
-	}
-	
-	var isx86 = false;
-	var isx64 = false;
-	
-	if(trident != null)
-	{
-		isx86 = navigator.userAgent.split(";")[2].toLowerCase().indexOf("trident")=="-1"?false:true;
-	}
-	
-	if(trident64 != null)
-	{
-		isx64 = navigator.userAgent.split(";")[3].toLowerCase().indexOf("trident")=="-1"?false:true;
-	}
-	
-	return isx86 || isx64;
-}
-
-//====================关键信息:加载插件、控件==================================
-//若是IE浏览器，则加载控件，若是其他浏览器，则加载插件
-//IE64位加载插件需要确定是否可以
-//=============================================================================
-if(isIE()){
-	if(typeof(zwPlugin) != 'object')
-	{
-		document.write('<object classid="CLSID:589F6929-9B41-4844-86FF-F61F0B35617C" id="zwPlugin" style="display:none">');
-		document.write('</object>');
-	}
-}else{
-	document.write('<object id="zwPlugin" type="application/x-zwplugin" width="0" height="0" style="display:none">');
-	document.write('</object>');
-}
-
-//js中使用的插件对象 
-const plugin = zwPlugin;
-
-//获取插件对象
-export function zwPlugin()
-{
-	return document.getElementById('zwPlugin');
-}
-   
- /********************http/https发送、接收信息****************************************/  
-  var _xmlhttp;
-  
-   export function GetHttpResult() {
-    if (_xmlhttp.readyState == 4 && _xmlhttp.status == 200) {
-        var obj = eval("(" + _xmlhttp.responseText + ")");
-        return obj;
-    }
-    else {
-        return null;
-    }
-}
-
-export function AjaxIO(json_in) {
-	try{
-		var _url= "http://127.0.0.1:8298";
-		var json = json_in;
-		if (_xmlhttp == null) {
-			if (window.XMLHttpRequest) { // code for IE7+, Firefox, Chrome, Opera, Safari
-				_xmlhttp = new XMLHttpRequest();
-			} else { // code for IE6, IE5
-				_xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
-			}
-		}
-
-		if ("https:" == document.location.protocol) {
-			_url = "https://127.0.0.1:8299";
-		}
-		
-		_xmlhttp.open("POST", _url, false);
-		_xmlhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-		
-		
-		_xmlhttp.send("json=" + json);
-	}
-	catch(e){
-		alert("证书助手功能异常，请修复或重装");
-	}
-}
-
-/*************************
-十进制转十六进制
-*****************************/
-export function dec2hex(decnum) {
-    var hexcode;
-    var hexnum = "0123456789ABCDEF";
-    var n;
-    n = 0;
-    hexcode = "";
-    while (n < 8) {
-        i = decnum & 0x0000000F;
-        hexcode = hexnum.substring(i, i + 1) + hexcode;
-        decnum = decnum >> 4;
-        n++;
-    }
-
-    hexcode = "0x" + hexcode;
-    return hexcode;
-}
-
-/*****************************
-检测控件是否安装
-*******************************/
-export function CheckComSetup()
-{
-	try{
-		if(!isIE())
-		{
-			// 调用接口
-			var request = new Object();
-			request.method = "checkComSetup";
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                   
-				return (ret.resultMSG==0)?true:false;
-            }
-		}
-		else{
-				plugin().CheckComSetup();
-				//  alert("控件已经安装");
-				
-				
-				return true;
-		}
-	}
-	catch(e){
-		//  alert("控件没有安装");
-		
-		
-		return false;
-	}
-}
-
-/************************************************************************/
-/*    获取插件版本号                                                    */
-/************************************************************************/
-export function getVersion()
-{
-	try{
-		var version = "";
-	
-		if (!isIE())
-		{
-			// 调用接口
-			var request = new Object();
-			request.method = "GetVersion";
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-                        alert("获取控件版本发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-                    }
-                    return ret.resultMSG;
-            }
-		}
-		else{
-			version =  plugin().GetVersion();
-			return version;
-		}
-	}
-	catch(e){
-		alert("请安装控件！");
-		 
-		
-		return version;
-	}
-}
-
-/************************************************************************/
-/*    枚举密钥服务提供者                                                    */
-/************************************************************************/
-export function enumProvider(listctl)
-{
-	try{
-		var i;
-		var element;
-
-		while (listctl.length > 0)
-		{
-			listctl.remove(0);
-		}
-		
-		if (!isIE())
-		{
-			// 调用接口
-			var request = new Object();
-			request.method = "EnumProvider";
-			request.iEnumType = 1;
-			
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-                        alert("枚举设备发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-                    }
-                   
-					enumProvider_list(listctl, ret.resultMSG);
-            }
-		}
-		else{
-			var listProvider = plugin().EnumProvider(1);
-			enumProvider_list(listctl, listProvider);
-		} 
-		
-	}catch(e)
-	{
-		if (e.description != "")
-		{
-			alert("列举设备发生错误!" + "\r\n" + "错误描述：" + e.description);
-			 
-			
-		}
-		else
-		{
-			alert("列举设备失败!");
-			 
-			
-		}
-		
-	}	
-}
-
-//枚举设备接口内部用方法
-export function enumProvider_list(listctl, listProvider)
-{
-	try{
-		var jsArray = listProvider.split("#");  
-
-		var length = jsArray.length;
-
-		var i = 0;
-
-		while(i < length/2)
-		{
-			element = document.createElement("OPTION");
-			element.text = jsArray[i*2];
-			element.value = jsArray[i*2+1];
-			listctl.add(element);
-			i++;
-		} 
-
-		if (listctl.length > 0)
-		{
-			listctl.selectedIndex = 0;
-		}
-
-		if(listctl.length == 0)
-		{
-			element = document.createElement("OPTION");
-
-			element.value = -1;
-			element.text = "请安装控件";
-			listctl.add(element);
-		}
-	}
-	catch(e)
-	{
-		if (e.description != "")
-		{
-			alert("列举设备发生错误!" + "\r\n" + "错误描述：" + e.description);
-			 
-			
-		}
-		else
-		{
-			alert("列举设备失败!");
-			 
-			
-		}
-	}
-}
-//获取CSP设备
-export function enumProvider1(){
-	try{
-		var i;
-		var element;
-		if (!isIE())
-		{
-			// 调用接口
-			var request = new Object();
-			request.method = "EnumProvider";
-			request.iEnumType = 1;
-			
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-                        alert("枚举设备发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					}
-					return ret.resultMSG;
-            }
-		}
-		else{
-			var listProvider = plugin().EnumProvider(1);
-			return listProvider;
-		} 
-		
-	}catch(e)
-	{
-		if (e.description != "")
-		{
-			alert("列举设备发生错误!" + "\r\n" + "错误描述：" + e.description);
-			 
-			
-		}
-		else
-		{
-			alert("列举设备失败!");
-			 
-			
-		}
-		
-	}	
-}
-
-/************************************************************************/
-/*    初始化服务提供者
-/*  @param  provName
-/*          CSP名称 
-/*  @param  contName
-/*          容器名称
-/*  @return 成功返回true， 失败返回false                                */
-/************************************************************************/
-export function initProv(provName, contName)
-{
-	
-	try{
-		if (!isIE())
-		{
-			// 调用接口
-			var request = new Object();
-			request.method = "InitProvider";
-			request.provName = provName;
-			request.contName = contName;
-			
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-				if (ret.errcode != 0) {
-					alert("初始化发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-				}
-				
-				return (ret.resultMSG == 0) ? true : false;
-            }
-		}
-		else{
-			var ret = plugin().InitProvider(provName, contName);
-			return (ret == 0) ? true : false;
-		}
-	}
-	catch(e){
-		if (e.description != "")
-		{	        
-			// alert(e.description);
-			
-			
-		}
-		
-		return false;
-	}	
-}
-
-
-/************************************************************************/
-/*    初始化服务提供者
-/*  @param  provName
-/*          CSP名称 
-/*  @param  contName
-/*          容器名称
-/*  @return 成功返回true， 失败返回false                                */
-/************************************************************************/
-export function InitProviderEX(provName)
-{
-	
-	try{
-		if (!isIE())
-		{
-			// 调用接口
-			var request = new Object();
-			request.method = "InitProviderEX";
-			request.provName = provName;
-			
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-				if (ret.errcode != 0) {
-					alert("初始化发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-				}
-				
-				return (ret.resultMSG == 0) ? true : false;
-            }
-		}
-		else{
-			var ret = plugin().InitProviderEX(provName);
-			return (ret == 0) ? true : false;
-		}
-	}
-	catch(e){
-		if (e.description != "")
-		{	        
-			// alert(e.description);
-			
-			
-		}
-		
-		return false;
-	}	
-}
-
-/************************************************************************/
-/*    获取设备序列号 成功返回版本号，失败返回null                                                   */
-/************************************************************************/
-export function readUKSN ()
-{
-	var ret;
-	
-	try{
-		if (!isIE())
-		{
-			// 调用接口
-			var request = new Object();
-			request.method = "readDeviceSN";
-			
-			AjaxIO(JSON.stringify(request));
-			
-			ret = GetHttpResult();
-            if (ret) {
-                if (ret.errcode != 0) {
-					alert("获取设备序列号发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-                else{
-					return ret.resultMSG;
-				}   
-				
-            }
-		}
-		else{
-			ret = plugin().ReadDeviceSN();
-			
-			return ret;
-		}	
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			// alert(e.description);
-			
-			
-		}
-		
-		return null;
-	}	
-}
-
-/************************************************************************/
-/*   清除用户的登录状态 ，成功返回0                                                */
-/************************************************************************/
-export function ClearUserPin()
-{
-	var ret;
-	
-	try{
-		if (!isIE())
-		{			
-			// 调用接口
-			var request = new Object();
-			request.method = "ClearDevicePwd";
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-                        alert("清除用户口令发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-                    }
-                   
-				return ret.resultMSG;
-            }
-		}
-		else{
-			ret = plugin().ClearDevicePwd();
-			return ret;
-		}
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			 
-			
-		}
-
-		return -1;
-	}	
-}
-
-/************************************************************************/
-/*   修改用户的密码，若原密码错误，则提示可尝试次数
-/*   @param oldPwd
-/*          设备的当前密码
-/*   @param newPwd
-/*          设备的新密码
-/*   @return 成功返回0，失败返回其他错误码                              */
-/************************************************************************/
-export function changeUKPin(oldPwd, newPwd)
-{
-	try{
-		if (!isIE())
-		{			
-			// 调用接口
-			var request = new Object();
-			request.method = "ChangeDevicePwd";
-			request.oldPwd = oldPwd;
-			request.newPwd = newPwd;
-			
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                if(ret.errcode != 0)
-				{
-					if(ret.resultMSG > 0 && ret.resultMSG <= 10)
-					{	
-						alert("您输入的当前密码错误，还剩" + ret.resultMSG + "次尝试机会！");
-						
-						
-					}
-					else{
-						alert("修改密码发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					}
-					return dec2hex(ret.errcode);
-				}
-				else if(ret.resultMSG == 0)
-				{
-					alert("密码修改成功！");
-					
-					
-					return ret.resultMSG; 
-				}
-            }
-			
-		}
-		else{
-			var ret =  plugin().ChangeDevicePwd(oldPwd, newPwd);
-			if(ret > 0 && ret <= 10)
-			{
-				
-				alert("您输入的当前密码错误，还剩" + ret + "次尝试机会！");
-				
-				
-			}
-			else if(ret == 0)
-			{
-				alert("密码修改成功！");
-				
-				
-			}
-			
-			return ret;
-		}	
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}
-
-		return dec2hex(e.number);
-	}	
-}
-
-/************************************************************************/
-/*   解锁用户的密码，若管理员密码错误，则提示可尝试次数
-/*   @param pukPwd
-/*          设备的当前sopin
-/*   @param newPwd
-/*          设备的新密码
-/*   @return 成功返回0，失败返回其他错误码                              */
-/************************************************************************/
-export function unblockUKPin(pukPwd, newPwd)
-{
-	try{
-		if (!isIE())
-		{			
-			// 调用接口
-			var request = new Object();
-			request.method = "UnLockUserPwd";
-			request.pukPwd = pukPwd;
-			request.newPwd = newPwd;
-			
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-				if(ret.errcode != 0)
-				{
-					if(ret.resultMSG > 0 && ret.resultMSG <= 10)
-					{
-						alert("您输入的iPASS解锁密码错误，还剩" + ret.resultMSG + "次尝试机会！");
-						
-						
-					}
-					else{
-						alert("解锁口令发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					}
-					
-					return dec2hex(ret.errcode);
-				}
-				else if(ret.resultMSG == 0)
-				{
-					alert("解锁密码成功！");
-					
-					
-					return ret.resultMSG;
-				}		
-            }
-			
-		}
-		else{
-			ret = plugin().UnLockUserPwd(pukPwd, newPwd);
-			if(ret > 0 && ret <= 10)
-			{
-				alert("您输入的iPASS解锁密码错误，还剩" + ret + "次尝试机会！");
-				
-				
-			}
-			else if(ret == 0)
-			{
-				alert("解锁密码成功！");
-				
-				
-			}
-			
-			return ret;
-		}
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}
-
-		return dec2hex(e.number);
-	}	
-}	
-
-/************************************************************************/
-/*   解锁用户的密码，若管理员密码错误，则提示可尝试次数
-/*   @param pukPwd
-/*          设备的当前sopin的密文
-/*   @param newPwd
-/*          设备的新密码，若输入为空，则内容将修改为”000000“
-/*   @return 成功返回0，失败返回其他错误码                              */
-/************************************************************************/
-export function unblockUKPinEx(pukPwd, newPwd)
-{
-	try{
-		if (!isIE())
-		{			
-			// 调用接口
-			var request = new Object();
-			request.method = "UnLockUserPwdEx";
-			request.pukPwd = pukPwd;
-			request.newPwd = newPwd;
-			
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-				if(ret.errcode != 0)
-				{
-					if(ret.resultMSG > 0 && ret.resultMSG <= 10)
-					{
-						alert("您输入的iPASS解锁密码错误，还剩" + ret.resultMSG + "次尝试机会！");
-						
-						
-					}
-					else{
-						alert("解锁口令发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					}
-					
-					return dec2hex(ret.errcode);
-				}
-				else if(ret.resultMSG == 0)
-				{
-					alert("解锁密码成功！");
-					
-					
-					return ret.resultMSG;
-				}
-            }
-		}
-		else{
-			var ret = plugin().UnLockUserPwdEx(pukPwd, newPwd);
-			if(ret > 0 && ret <= 10)
-			{
-				alert("您输入的iPASS解锁密码错误，还剩" + ret + "次尝试机会！");
-				
-				
-			}
-			else if(ret == 0)
-			{
-				alert("解锁密码成功！");
-				
-				
-			}
-			
-			return ret;
-		}
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}
-
-		return -1;
-	}
-}	
-
-/************************************************************************/
-/*   删除指定的容器
-/*   @param contName
-/*          指定的容器名称
-/*   @return 成功返回0，失败返回其他错误码                              */
-/************************************************************************/
-export function DeleteContainer(contName)
-{
-	try{
-		if (!isIE())
-		{			
-			// 调用接口
-			var request = new Object();
-			request.method = "DeleteContainer";
-			request.contName = contName;
-			
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                if (ret.errcode != 0) {
-					alert("删除容器发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-				}
-                   
-				return dec2hex(ret.resultMSG);
-            }
-		}
-		else{
-			var ret = plugin().DeleteContainer(contName);
-			return ret;
-		}
-		
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}
-
-		return dec2hex(e.number);
-	}	
-}	
-
-/************************************************************************/
-/*   根据不同的模长生成不同的密钥对，容器使用初始化时候的容器
-/*   @param module
-/*          模长，256-sm2  1024/2048-rsa
-/*   @return 成功返回base64的公钥，失败返回null                   */
-/************************************************************************/
-export function createPubKey (module)
-{
-	try{
-		if (!isIE())
-		{
-			// 调用接口
-			var request = new Object();
-			request.method = "CreatePubKey";
-			request.module = module;
-			request.iKeyType = AT_SIGNATURE;
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-					alert("生成密钥对发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-                else{
-					return ret.resultMSG;
-				}   	
-            }
-		}
-		else{
-			var pubkey = plugin().CreatePubKey(module, AT_SIGNATURE);
-			return pubkey;
-		}
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			// alert(e.description);
-			
-			
-		}
-
-		return null;
-	}		
-}	
-
-/************************************************************************/
-/*   生成临时的RSA密钥对，容器名称内部处理
-/*   @param keySpec
-/*          密钥类型，AT_SINAGURE/AT_KEYEXCHANGE
-/*   @param module
-/*          模长，1024/2038-rsa
-/*   @return 成功返回base64的公钥，失败返回null               */
-/************************************************************************/         
-export function GenTempRsaKeyPairWithKeySpec(keySpec, module)
-{
-	try{
-		if(!isIE())
-		{			
-			// 调用接口
-			var request = new Object();
-			request.method = "CreateTempKeyPair";
-			request.type = ALG_RSA;
-			request.keySpec = keySpec;
-			request.module = module;
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                if (ret.errcode != 0) {
-					alert("生成临时密钥发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-                else{   
-					return ret.resultMSG;
-				}
-            }
-		}
-		else{
-			var ret =  plugin().CreateTempKeyPair(ALG_RSA, keySpec, module);
-			return ret;
-		}
-		
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}
-		
-		return null;
-		
-	}			
-}	
-
-/************************************************************************/
-/*   生成临时的SM2密钥对，容器名称内部处理
-/*   @param keySpec
-/*          密钥类型，AT_SINAGURE/AT_KEYEXCHANGE
-/*   @param module
-/*          模长，256
-/*   @return 成功返回base64的公钥，失败返回null               */
-/************************************************************************/ 
-export function GenTempSM2KeyPairWithKeySpec(keySpec, module)
-{
-	try{
-		if(!isIE())
-		{			
-			// 调用接口
-			var request = new Object();
-			request.method = "CreateTempKeyPair";
-			request.type = ALG_SM2;
-			request.keySpec = keySpec;
-			request.module = module;
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-					alert("生成临时密钥对发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-                else{  
-					return ret.resultMSG;
-				}
-            }
-		}
-		else{
-			var ret =  plugin().CreateTempKeyPair(ALG_SM2, keySpec, module);
-			return ret;
-		}
-		
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}
-		
-		return null;
-		
-	}			
-}	
-
-/************************************************************************/
-/*   下载单证书
-/*   @param packdata
-/*          base64格式的证书数据
-/*   @param transactionId
-/*          交易码，没有实际用处
-/*   @return 成功返回true,失败返回false                                 */
-/************************************************************************/ 
-export function downloadSingle(packdata, transactionId)
-{
-	try{
-			if(!isIE())
-			{
-				// 调用接口
-				var request = new Object();
-				request.method = "DownloadSingleCert";
-				request.packdata = packdata;
-				request.transactionId = transactionId;
-				
-				AjaxIO(JSON.stringify(request));
-			
-				var ret = GetHttpResult();
-				if (ret) {
-					 if (ret.errcode != 0) {
-							alert("下载单证书发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-						}
-					   
-					return (ret.resultMSG==0)? true:false;
-				}
-			}
-			else 
-			{
-				if(plugin().DownloadSingleCert(packdata, transactionId) == 0)
-					return true;
-				else
-					return false;
-			}
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			// alert(e.description);
-			
-			
-		}
-
-		return false;
-	}	
-}	
-
-/************************************************************************/
-/*   下载双证书
-/*   @param packdata
-/*          base64格式的证书数据包，包括三部分，以“    ”分隔，
-/*                       分别为签名证书+加密证书+加密私钥
-/*   @param transactionId
-/*          交易码，没有实际用处
-/*   @return 成功返回true,失败返回false                                 */
-/************************************************************************/ 
-export function downloadDouble(packdata, transactionId)
-{
-	try{
-		if(!isIE())
-		{
-			// 调用接口
-			var request = new Object();
-			request.method = "downloadDouble";
-			request.packdata = packdata;
-			request.transactionId = transactionId;
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-                        alert("下载双证书发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-                    }
-                   
-				return (ret.resultMSG==0)? true:false;
-            }
-		}
-		else{
-			if(plugin().DownloadDoubleCert(packdata, transactionId) == 0)
-			{
-				return true;
-			}else{
-				return false;
-			}
-		}
-		
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			// alert(e.description);
-			
-			
-		}
-		
-		return false;
-	}
-}	
-
-/************************************************************************/
-/*   加密证书恢复
-/*   @param packdata
-/*          base64格式的证书数据包，包括两部分，以“    ”分隔，
-/*                       分别为加密证书+加密私钥
-/*   @param transactionId
-/*          交易码，没有实际用处
-/*   @return 成功返回true,失败返回false                                 */
-/************************************************************************/ 
-export function restoreKey (packdata, transactionId)
-{
-	try{
-		if(!isIE())
-		{			
-			// 调用接口
-			var request = new Object();
-			request.method = "RestoreCert";
-			request.packdata = packdata;
-			request.transactionId = transactionId;
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-                        alert("密钥恢复发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-                    }
-                   
-				return (ret.resultMSG == 0) ? true:false;
-            }
-		}
-		else{
-				if(plugin().RestoreCert(packdata, transactionId) == 0)
-				{
-					return true;
-				}else{
-					return false;
-				}	
-		}
-		
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}
-
-		return false;
-	}	
-}	
-
-/************************************************************************/
-/*   证书解析：获取证书公钥
-/*   @param base64Cert
-/*          base64格式的证书数据
-/*   @return 成功返回base64格式公钥,失败返回null                       */
-/************************************************************************/ 
-export function getCertPubKey(base64Cert)
-{
-	var ret;
-	
-	try{
-
-		if(!isIE())
-		{
-			// 调用接口
-			var request = new Object();
-			request.method = "getCertItemInfo";
-			request.base64Cert = base64Cert;
-			request.iCertItemType = CERT_ITEM_PUBKEY;
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-					alert("获取证书公钥发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-				else{
-					return ret.resultMSG;
-				}
-            }
-		}
-		else{
-			ret = plugin().getCertItemInfo(base64Cert, CERT_ITEM_PUBKEY);
-			return ret;
-		}
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			// alert(e.description);
-			
-			
-		}
-
-		
-		return null;
-	}	
-}	
-
-
-/************************************************************************/
-/*   证书解析：获取证书类型RSA、SM2
-/*   @param base64Cert
-/*          base64格式的证书数据
-/*   @return 成功返回RSA或SM2，失败返回null                       */
-/************************************************************************/ 
-export function getCertType(base64Cert)
-{
-	var ret;
-	
-	try{
-		if(!isIE())
-		{
-			// 调用接口
-			var request = new Object();
-			request.method = "getCertItemInfo";
-			request.base64Cert = base64Cert;
-			request.iCertItemType = CERT_ITEM_ALGTYPE;
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-					alert("获取证书类型发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-                else{   
-					return ret.resultMSG;
-				}
-            }
-		}
-		else{
-			ret = plugin().getCertItemInfo(base64Cert, CERT_ITEM_ALGTYPE);
-			return ret;
-		}
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}
-
-		return null;
-	}			
-}	
-
-/************************************************************************/
-/*   证书解析：获取证书颁发者信息
-/*   @param base64Cert
-/*          base64格式的证书数据
-/*   @return 成功返回C=CN, S=jilin, L=changchun, O=CNC, OU=CNCCA, 
-/*                   CN=CHINA NETCOM CLASS2 CA,失败返回null           */
-/************************************************************************/ 
-export function getCertIssuer(base64Cert)
-{
-	var ret;
-	
-	try{
-		if(!isIE())
-		{
-			// 调用接口
-			var request = new Object();
-			request.method = "getCertItemInfo";
-			request.base64Cert = base64Cert;
-			request.iCertItemType = CERT_ITEM_ISSUER;
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-					alert("获取证书颁发者发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-                else{  
-					return ret.resultMSG;
-				}
-            }
-		}
-		else{
-			ret = plugin().getCertItemInfo(base64Cert, CERT_ITEM_ISSUER);
-			return ret;
-		}
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			// alert(e.description);
-			
-			
-		}
-
-		return null;
-	}
-}	
-
-/************************************************************************/
-/*   证书解析：获取证书主题项
-/*   @param base64Cert
-/*          base64格式的证书数据
-/*   @return 成功返回C=CN, S=江苏, L=WUXI, CN=TEST4,失败返回null     */
-/************************************************************************/ 
-export function getCertSubject(base64Cert)
-{
-	var ret;
-	
-	try{
-		
-		if(!isIE())
-		{
-			// 调用接口
-			var request = new Object();
-			request.method = "getCertItemInfo";
-			request.base64Cert = base64Cert;
-			request.iCertItemType = CERT_ITEM_SUBJECT;
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-					alert("获取证书主题项发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-				else{ 
-					return ret.resultMSG;
-				}
-            }
-		}
-		else{
-			ret = plugin().getCertItemInfo(base64Cert, CERT_ITEM_SUBJECT);
-			return ret;
-		}
-		
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			// alert(e.description);
-			
-			
-		}
-
-		
-		return null;
-	}	
-}	
-
-/************************************************************************/
-/*   证书解析：获取证书生效时间
-/*   @param base64Cert
-/*          base64格式的证书数据
-/*   @return 成功返回2008-01-06 13:10:07格式日期,失败返回null        */
-/************************************************************************/
-export function getCertNotBefore (base64Cert)
-{
-	var ret;
-	
-	try{			
-		if(!isIE())
-		{
-			// 调用接口
-			var request = new Object();
-			request.method = "getCertItemInfo";
-			request.base64Cert = base64Cert;
-			request.iCertItemType = CERT_ITEM_BEFORE_TIME;
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                if (ret.errcode != 0) {
-					alert("获取证书生效时间发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-                else{  
-					return ret.resultMSG;
-				}
-            }
-		}
-		else{
-			ret = plugin().getCertItemInfo(base64Cert, CERT_ITEM_BEFORE_TIME);
-			return ret;
-		}
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			// alert(e.description);
-			
-			
-		}
-
-		return null;
-	}
-}	
-
-/************************************************************************/
-/*   证书解析：获取证书失效时间
-/*   @param base64Cert
-/*          base64格式的证书数据
-/*   @return 成功返回2008-01-06 13:10:07格式日期,失败返回null        */
-/************************************************************************/
-export function getCertNotAfter(base64Cert)
-{
-	var ret;
-	
-	try{		
-		if(!isIE())
-		{
-			// 调用接口
-			var request = new Object();
-			request.method = "getCertItemInfo";
-			request.base64Cert = base64Cert;
-			request.iCertItemType = CERT_TIEM_AFTER_TIME;
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-					alert("获取证书失效时间发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-				else{  
-					return ret.resultMSG;
-				}
-            }
-		}
-		else{
-			ret = plugin().getCertItemInfo(base64Cert, CERT_TIEM_AFTER_TIME);
-			return ret;
-		}
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			// alert(e.description);
-			
-			
-		}
-		return null;
-	}	
-}	
-
-/************************************************************************/
-/*   证书解析：获取证书序列号
-/*   @param base64Cert
-/*          base64格式的证书数据
-/*   @return 成功返回0983格式日期,失败返回null                          */
-/************************************************************************/
-export function getCertSN(base64Cert)
-{
-	var ret;
-	
-	try{
-		if(!isIE())
-		{
-			// 调用接口
-			var request = new Object();
-			request.method = "getCertItemInfo";
-			request.base64Cert = base64Cert;
-			request.iCertItemType = CERT_ITEM_SN;
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-					alert("获取证书序列号发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-                else{   
-					return ret.resultMSG;
-				}
-            }
-		}
-		else{
-			ret = plugin().getCertItemInfo(base64Cert, CERT_ITEM_SN);
-			return ret;
-		}
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			// alert(e.description);
-			
-			
-		}
-
-		return null;
-	}	
-}	
-
-/************************************************************************/
-/*   证书解析：获取证书扩展项信息
-/*   @param base64Cert
-/*          base64格式的证书数据
-/*   @param extensionID
-/*          扩展项的OID
-/*   @return 成功返回扩展项信息,失败返回null                            */
-/************************************************************************/
-export function getCertExtension (base64Cert, extensionID)
-{
-	var ret;
-	
-	try{
-		if(!isIE())
-		{
-			// 调用接口
-			var request = new Object();
-			request.method = "getCertExtension";
-			request.base64Cert = base64Cert;
-			request.extensionID = extensionID;
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-					alert("获取证书扩展项发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-                else{  
-					return ret.resultMSG;
-				}
-            }
-		}
-		else{
-			ret =  plugin().getCertExtensionInfo(base64Cert, extensionID);
-			return ret;
-		}
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			// alert(e.description);
-			
-			
-		}
-
-		return null;
-	}
-}	
-
-/************************************************************************/
-/*   获取随机数
-/*   @param randomLen
-/*          要获取的随机数长度
-/*   @return 成功返回base64格式的随机数,失败返回null                    */
-/************************************************************************/
-export function genRandom (randomLen)
-{
-	try{
-		if(!isIE())
-		{			
-			// 调用接口
-			var request = new Object();
-			request.method = "genRandom";
-			request.randomLen = randomLen;
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                if (ret.errcode != 0) {
-					alert("生成随机数发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-                else{   
-					return ret.resultMSG;
-				}
-            }
-		}else{
-			var ret =  plugin().genRandom(randomLen);
-			return ret;
-		}	
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}
-
-		return null;
-	}	
-}	
-
-/************************************************************************/
-/*   从指定的容器中获取证书
-/*   @param containerName
-/*          容器名称
-/*   @param iKeyType
-/*          容器类型
-/*   @return 成功返回base64格式的证书,失败返回null                      */
-/************************************************************************/
-export function getCert(containerName, iKeyType)
-{
-	try{
-		var certdata = "";
-
-		if(!isIE())
-		{
-			// alert(listProvider);
-			// 调用接口
-			var request = new Object();
-			request.method = "getCertByContName";
-			request.containerName = containerName;
-			request.iKeyType = iKeyType;
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-					alert("读取证书发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-                else{  
-					return ret.resultMSG;
-				}
-            }
-		}
-		else{
-			certdata = plugin().getCertByContName(containerName, iKeyType);
-			return certdata;
-		}
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			// alert(e.description);
-			
-			
-		}
-
-		return null;
-	}	
-}	
-	
-/************************************************************************/
-/*   对源数据使用指定的签名算法进行签名
-/*   @param srcData
-/*          源数据
-/*   @pram AlgType
-/*         签名算法，见ALG_SIGN_XXX定义
-/*   @return 成功返回base64格式的签名内容,失败返回null                  */
-/************************************************************************/
-export function signatureWithAlg (srcData, AlgType)
-{
-	try{
-		var signdata;
-
-		if(!isIE())
-		{
-			// alert(listProvider);
-			// 调用接口
-			var request = new Object();
-			request.method = "sign";
-			request.srcData = srcData;
-			request.AlgType = AlgType;
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-					alert("数字签名发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-				else{
-					return ret.resultMSG;
-				}
-            }
-		}
-		else{
-			signdata = plugin().sign(srcData, AlgType);
-			return signdata;
-		}
-	
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			// alert(e.description);
-			
-			
-		}
-
-		return null;
-	}	
-}		
-
-/************************************************************************/
-/*   使用证书对签名数据进行验签
-/*   @param srcData
-/*          源数据
-/*   @param signData
-/*          签名数据
-/*   @param certData
-/*          证书数据，base64格式
-/*   @pram iSignAlg
-/*         签名算法，参见ALG_SIGN_XXX定义
-/*   @return 成功返回true,失败返回false                                 */
-/************************************************************************/
-export function verifySign (srcData, signData, certData, iSignAlg)
-{
-	var ret = false;
-	
-	try{		       	 		
-		if(!isIE())
-		{
-			// 调用接口
-			var request = new Object();
-			request.method = "verifySignWithCert";
-			request.srcData = srcData;
-			request.signData = signData;
-			request.certData = certData;
-			request.iSignAlg = iSignAlg;
-
-			AjaxIO(JSON.stringify(request));
-		
-			var ret = GetHttpResult();
-			if (ret) {
-				 if (ret.errcode != 0) {
-						alert("验证签名发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					}
-				   
-				return (ret.resultMSG == 0) ? true :  false;
-			}
-		}
-		else{
-			ret = plugin().verifySignWithCert(srcData, signData, certData, iSignAlg);
-			return (ret == 0) ? true :  false;	
-		}	
-		
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			// alert(e.description);
-			
-			
-		}
-		return false;	
-	}	
-}
-
-/************************************************************************/
-/*   使用公钥对签名数据进行验签
-/*   @param srcData
-/*          源数据
-/*   @param signData
-/*          签名数据
-/*   @param pubKey
-/*          公钥数据，base64格式
-/*   @pram iSignAlg
-/*         签名算法，参见ALG_SIGN_XXX定义
-/*   @return 成功返回true,失败返回false                                 */
-/************************************************************************/
-export function verifyWithAlg (srcData, signData, pubKey, iSignAlg)
-{
-	var ret = -1;
-	         
-	try{		        
-		
-		if(!isIE())
-		{
-			// 调用接口
-			var request = new Object();
-			request.method = "verifySign";
-			request.srcData = srcData;
-			request.signData = signData;
-			request.iSignAlg = iSignAlg;
-			request.pubKey = pubKey;
-			
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                if (ret.errcode != 0) {
-					alert("验证签名发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-				}
-                   
-				return (ret.resultMSG == 0) ? true : false;	
-            }
-		}
-		else{
-			ret = plugin().verifySign(srcData, signData, iSignAlg, pubKey);
-			return (ret == 0) ? true : false;	
-		}	
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			// alert(e.description);
-			
-			
-		}	
-		return false;		
-	}	
-}	
-
-/************************************************************************/
-/*   使用内部私钥对文件进行签名，
-/*   @param fileName
-/*          文件绝对路径
-/*   @pram iSignAlg
-/*         签名算法，参见ALG_SIGN_XXX定义
-/*   @return 成功返回base64签名值，失败返回null                               */
-/************************************************************************/
-export function signFile (filePath,nAlg)
-{
-	try{	
-		if(!isIE())
-		{			
-			// 调用接口
-			var request = new Object();
-			request.method = "signFile";
-			request.filePath = filePath;
-			request.algType = nAlg;
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-					alert("文件签名发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-				else{ 
-					return ret.resultMSG;
-				}
-            }
-		}
-		else{
-			var ret = plugin().signFile(filePath, nAlg);
-			return ret;
-		}
-		
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}
-		
-		return null;	    
-	}	
-}	
-
-/************************************************************************/
-/*   使用外部公钥对文件进行验签
-/*   @param fileName
-/*          文件绝对路径
-/*   @pram iSignAlg
-/*         签名算法，参见ALG_SIGN_XXX定义
-/*   @return 成功返回true,失败返回false                                 */
-/************************************************************************/
-export function verifyFileSignature(filePath, signData, pubKey,nAlg)
-{
-	try{
-		if(!isIE())
-		{			
-			// 调用接口
-			var request = new Object();
-			request.method = "verifySignFile";
-			request.filePath = filePath;
-			request.signData = signData;
-			request.pubKey = pubKey;
-			request.algType = nAlg;
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-                        alert("枚举设备发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-                    }
-                   
-				return (ret.resultMSG==0) ? true:false;
-            }
-		}
-		else{
-			if(plugin().verifySignFile(filePath, signData, pubKey, nAlg) == 0)
-			{
-				return true;
-			}else{
-				return false;
-			} 
-		}		
-		 
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}
-
-		return false;	    
-	}		
-}	
-
-/************************************************************************/
-/*   北六项目定制接口：对源数据使用指定的SHA1签名算法进行签名
-/*   @param srcData
-/*          源数据
-/*   @return 成功返回base64格式的签名内容,失败返回null                  */
-/************************************************************************/
-export function signatureEx(srcData)
-{
-	try{
-		if(!isIE())
-		{			
-			// 调用接口
-			var request = new Object();
-			request.method = "signForESS";
-			request.srcData = srcData;
-			
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                if (ret.errcode != 0) {
-					alert("数字签名发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-                else{  
-					return ret.resultMSG;
-				}
-            }
-		}
-		else{
-			return  plugin().signForESS(srcData);
-		}
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}
-
-		return null;
-	}		
-}
-/************************************************************************/
-/*   自定义格式的数字信封
-/*       格式定义：算法（4个字节）+加密后数据长度（4个字节）+加密后数据+加密后密钥长度（4个字)+加密后的密钥
-/*   @param types
-/*          0：代表是文件；1：代表的是数据
-/*   @pram srcData
-/*         当types==0表示的是文件名称，全路径
-/*   @param certData
-/*         base64编码的证书，接受者证书；对于双证书模式，应该是用加密证书
-/*   @param outPath
-/*         当types等于0时候有效，表示数字信封文件全路径
-/*   @return  	当types==0,成功返回0,失败返回错误码
-				当types不等于0，成功返回base64编码信封数据，失败返回""	*/
-/************************************************************************/
-export function makeEnvelope (types, srcData, certData, outPath)
-{
-	try{
-		if(!isIE())
-		{			
-			// 调用接口
-			var request = new Object();
-			if(types == 0)
-			{
-				request.method = "makeEnvelopForFile";
-				request.inFilePath = srcData;
-				request.certData = certData;
-				request.outPath = outPath;
-			}
-			else{
-				request.method = "makeEnvelopForData";
-				request.srcData = srcData;
-				request.certData = certData;
-			}
-			
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-                        alert("解信封发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-                    }
-                   
-				return ret.resultMSG;
-            }
-		}
-		else{		
-			if(types == 0){
-				return plugin().makeEnvelopForFile(srcData, certData, outPath);
-			}
-			else{
-				return plugin().makeEnvelopForData(srcData, certData);
-			}
-			
-		}
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}
-
-		if(types == 0)
-		{
-			return e.number;
-		}
-		else{
-			return "";
-		}
-	}	
-}
-
-/************************************************************************/
-/*   自定义格式的数字信封解封操作
-/*       格式定义：算法（4个字节）+加密后数据长度（4个字节）+加密后数据+加密后密钥长度（4个字)+加密后的密钥
-/*   @param types
-/*          0：代表的是文件
-/*   @param evpData
-/*          当types=0时代表信封文件
-/*   @param outPath
-/*          当types等于0时代表明文文件
-/*
-/*   @return 当types=0时成功返回0,失败返回错误码
-			当types不等于0时，成功返回明文数据，失败返回"" */
-/************************************************************************/
-export function openEnvelope (types, evpData, outPath)
-{
-	try{		        
-		if(!isIE())
-		{			
-			// 调用接口
-			var request = new Object();
-			if(types == 0)
-			{
-				request.method = "openEnvelopForFile";
-				request.inPath = evpData;
-				request.outPath = outPath;
-			}
-			else{
-				request.method = "openEnvelopForData";
-				request.evpData = evpData;
-			}
-			
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-                        alert("解信封发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-                    }
-                   
-				return ret.resultMSG;
-            }
-		}
-		else{
-			
-			if(types == 0){
-				return plugin().openEnvelopForFile(evpData, outPath);
-			}
-			else{
-				return plugin().openEnvelopForData(evpData);
-			}
-		}		
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}
-
-		if(types == 0)
-		{
-			return e.number;
-		}
-		else{
-			return "";
-		}	    
-	}	
-}
-
-/************************************************************************/
-/*   对称加密
-/*   @param symAlg
-/*          对称加密算法，参见ALG_SYM_XXX的定义
-/*   @param srcData
-/*          源数据
-/*   @param keyData
-/*          对称密钥，base64格式
-/*   @return 成功返回base64格式密码,失败返回null                        */
-/************************************************************************/
-export function 	symEncrypt(symAlg, srcData, keyData)
-{
-	try{		        
-		if(!isIE())
-		{			
-			// 调用接口
-			var request = new Object();
-			request.method = "symEncrypt";
-			request.symAlg = symAlg;
-			request.srcData = srcData;
-			request.keyData = keyData;
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-					alert("对称加密发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-				else{
-					return ret.resultMSG;
-				}
-            }
-		}else{
-			var ret = plugin().symEncrypt(srcData, keyData, symAlg);
-			return ret;
-		}
-		
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}
-
-		return null;
-	}		
-}
-
-
-/************************************************************************/
-/*   对称解密
-/*   @param symAlg
-/*          对称加密算法，参见ALG_SYM_XXX的定义
-/*   @param encData
-/*          密文数据
-/*   @param keyData
-/*          对称密钥，base64格式
-/*   @return 成功返回明文数据,失败返回null                              */
-/************************************************************************/
-export function 	symDecrypt(symAlg, encData, keyData)
-{
-	try{		    
-		if(!isIE())
-		{			
-			// 调用接口
-			var request = new Object();
-			request.method = "symDecrypt";
-			request.symAlg = symAlg;
-			request.encData = encData;
-			request.keyData = keyData;
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-					alert("对称解密发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-                else{  
-					return ret.resultMSG;
-				}
-            }
-		}
-		else{
-			var ret = plugin().symDecrypt(encData, keyData, symAlg);
-			
-			return ret;
-		}
-		
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}	
-			
-		return null;
-	}	
-}
-
-/************************************************************************/
-/*   修改软证书的密码，对应的软证书为初始化时指定的软证书
-/*   @param oldPin
-/*          软证书的当前密码
-/*   @param newPin
-/*          软证书的新密码
-/*   @return 成功返回true,失败返回false                                 */
-/************************************************************************/
-export function ChangeUsrPin(oldPin, newPin)
-{
-	try{		
-		if(!isIE())
-		{			
-			// 调用接口
-			var request = new Object();
-			request.method = "changeSoftCertPwd";	
-			request.oldPin = oldPin;
-			request.newPin = newPin;
-		
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-                        alert("修改软证书密码发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-                    }
-                   
-				return (ret.resultMSG==0)?true:false;
-            }
-		}else{
-			if(plugin().changeSoftCertPwd(oldPin, newPin) == 0)
-			{
-				return true;
-			}else{
-				return false;
-			} 
-		}        
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}
-			
-		return false;
-	}	
-}
-
-/************************************************************************/
-/*   修改软证书的存储位置
-/*   @param path
-/*          软证书的新位置
-/*   @return 成功返回true,失败返回false                                 */
-/************************************************************************/
-export function setSoftCertPath (path)
-{
-	try{	
-		if(!isIE())
-		{			
-			// 调用接口
-			var request = new Object();
-			request.method = "setSoftCertNewPath";	
-			request.path = path;
-		
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-                        alert("修改软证书位置发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-                    }
-                   
-				return (ret.resultMSG==0)?true:false;
-            }
-		}else{
-			if(plugin().setSoftCertNewPath(path) == 0){
-				return true;
-			}else{
-				return false;
-			}
-		}		
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}
-		
-		return false;	    
-	}	
-}
-
-/**********************************************
-封装p7数字信封
-Plain：原文
-signAlg：签名算法，参见ALG_SIGN_XXX定义
-ReceiverCert：接收者证书，base64编码
-返回值：成功返回base64编码信封数据，失败返回null
-*************************************************/
-export function MakeP7Env(Plain, signAlg, ReceiverCert)
-{
-
-	try{		        
-		if(!isIE())
-		{			
-			// 调用接口
-			var request = new Object();
-			request.method = "P7MakeEnvelope";
-			request.Plain = Plain;
-			request.signAlg = signAlg;
-			request.ReceiverCert = ReceiverCert;
-			
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                if (ret.errcode != 0) {
-					alert("生成P7信封发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-                else{  
-					return ret.resultMSG;
-				}
-            }
-		}
-		else{
-			return plugin().P7MakeEnvelope(Plain, signAlg, ReceiverCert);   
-		}		
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}	    
-	}	
-
-	return null;
-}
-
-/**************************************************
-解p7信封
-EnvelopeData：base64编码p7信封
-nAlg：签名算法，参见ALG_SIGN_XXX定义
-返回值：成功返回明文数据，失败返回null
-****************************************************/
-export function OpenP7Env(EnvelopeData, nAlg)
-{
-	try{
-		if(!isIE())
-		{			
-			// 调用接口
-			var request = new Object();
-			request.method = "P7OpenEnvelope";
-			request.EnvelopeData = EnvelopeData;
-			request.nAlg = nAlg;
-
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-					alert("解P7信封发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-                else{  
-					return ret.resultMSG;
-				}
-            }
-		}
-		else{		
-
-			return plugin().P7OpenEnvelope(EnvelopeData, nAlg);   
-		}		
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}	
-
-		return null;		
-	}		
-}
-
-/****************************************
-p7数字签名
-Plain：原文
-nAlg：签名算法，参见ALG_SIGN_XXX定义
-返回值：成功返回base64格式p7签名值，失败返回null
-*********************************************/
-export function P7Signature(Plain, nAlg)
-{
-	try{		        
-		if(!isIE())
-		{			
-			// 调用接口
-			var request = new Object();
-			request.method = "P7Sign";
-			request.Plain = Plain;
-			request.nAlg = nAlg;
-
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                if (ret.errcode != 0) {
-					alert("P7签名发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-                else{ 
-					return ret.resultMSG;
-				}
-            }
-		}
-		else{
-			return plugin().P7Sign(Plain, nAlg);  
-		}			
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}	    
-	}	
-
-	return null;
-}
-
-/*********************************************
-验证p7签名
-Plain：原文
-SignData：p7格式签名值
-nAlg：签名算法，参见ALG_SIGN_XXX定义
-返回值：成功返回true，失败返回false
-***************************************************/
-export function VerifyP7Signature(Plain, SignData, nAlg)
-{
-
-	try{
-		if(!isIE())
-		{			
-			// 调用接口
-			var request = new Object();
-			request.method = "P7VerifySign";
-			request.Plain = Plain;
-			request.SignData = SignData;
-			request.nAlg = nAlg;
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-				if (ret.errcode != 0) {
-					alert("P7验签发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-				}
-                   
-				return (ret.resultMSG==0)?true : false;
-            }
-		}
-		else{
-			if(plugin().P7VerifySign(Plain, SignData, nAlg) == 0){
-				return true;
-			}
-		}
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}	
-		return false;		
-	}	
-}
-
-/************************************************
-外部证书加密
-srcData:原文
-certData：base64格式证书数据
-返回值：成功返回base64格式密文，失败返回null
-*************************************************/
-export function EncryptWithCert(srcData, certData)
-{
-	try{
-		if(!isIE())
-		{			
-			// 调用接口
-			var request = new Object();
-			request.method = "EncryptWithCert";
-			request.srcData = srcData;
-			request.certData = certData;
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                if (ret.errcode != 0) {
-					alert("证书加密发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-                else{   
-					return ret.resultMSG;
-				}
-            }
-		}
-		else{
-			var ret = plugin().EncryptWithCert(srcData, certData); 
-			return ret;
-		}			     
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}	
-		return null;		
-	}
-}
-
-/**************************************
-内部私钥解密
-cipherData：base64格式密文
-返回值：成功返回明文数据，失败返回null
-***************************************/
-export function AsymDecrypt(cipherData)
-{
-	try{
-		if(!isIE())
-		{			
-			// 调用接口
-			var request = new Object();
-			request.method = "AsymDecrypt";
-			request.cipherData = cipherData;
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                if (ret.errcode != 0) {
-					// alert("解密数据发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-                else{  
-					return ret.resultMSG;
-				}
-            }
-		}
-		else{
-			var ret = plugin().AsymDecrypt(cipherData);
-			return ret;
-		}	
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}
-		
-		return null;		
-	}	
-	
-}
-
-/***************************************
-将数据写入Ukey中的指定文件中
-srcData：待写入数据，可见字符串或base64编码格式字符串
-fileID：文件ID，整型
-返回值：成功返回true，失败返回false
-****************************************/
-export function WriteDataToUKey(srcData, fileID)
-{
-	try{
-		if(!isIE())
-		{
-			// 调用接口
-			var request = new Object();
-			request.method = "WriteDataToUKey";
-			request.srcData = srcData;
-			request.fileID = fileID;
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                   
-				return (ret.resultMSG==0)?true:false;
-            }
-		}
-		else{
-			if(plugin().WriteDataToUKey(srcData, fileID) == 0){
-				return true;
-			}
-		}
-		
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}	    
-	}	
-
-	return false;
-}
-
-/*****************************************
-读取Ukey中指定文件中的数据
-fileID：文件ID，整型
-返回值：成功返回读取到的数据，失败返回null
-********************************************/
-export function ReadDataFromUKey(fileID)
-{
-	try{
-		if(!isIE())
-		{
-			// 调用接口
-			var request = new Object();
-			request.method = "ReadDataFromUkey";
-			request.fileID = fileID;
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                if (ret.errcode != 0) {
-					alert("读取Ukey文件发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-				else{
-					return ret.resultMSG;
-				}
-            }
-		}
-		else{
-			return plugin().ReadDataFromUkey(fileID); 
-		}  		
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}	    
-	}	
-
-	return null;
-}
-
-/*****************************************
-获取已插入Ukey的CSP名称
-如果插入多支key，只获取识别到的第一支key
-成功返回Ukey的CSP名称，失败返回""
-**********************************************/
-export function getCSPNamebypid()
-{
-	try
-	{	
-		if(!isIE())
-		{
-			// 调用接口
-			var request = new Object();
-			request.method = "GetCspNameByPID";
-			AjaxIO(JSON.stringify(request));
-			
-			var ret = GetHttpResult();
-            if (ret) {
-                 if (ret.errcode != 0) {
-                        alert("获取CSP名称发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-                    }
-                   
-				return ret.resultMSG;
-            }
-		}
-		else{
-			var cspname;
-			var ret;
-			cspname = plugin().GetCspNameByPID();
-			if(cspname == "")
-			{
-				ret = plugin().InitProvider("CCIT Smartcard CSP V1.0", "CCITCont1");
-				if(ret == 0)
-				{
-					cspname = "CCIT Smartcard CSP V1.0";
-				}
-			}
-			return cspname;	
-		}
-	}
-	catch(e){
-		if (e.description != "")
-		{
-			try{
-				ret = plugin().InitProvider("CCIT Smartcard CSP V1.0", "CCITCont1");
-				if(ret == 0)
-				{
-					cspname = "CCIT Smartcard CSP V1.0";
-					return cspname;
-				}
-			}	        
-			catch(e)
-			{
-				return "";
-			}
-		}	
-		return "";
-	}
-}
-
-/*******************************
-//判断是否插入key
-返回值：已插入返回1，未插入返回0
-*****************************************/
-export function isUKConnect()
-{
-	if(!isIE())
-	{
-		// 调用接口
-		var request = new Object();
-		request.method = "GetCspNameByPID";
-		AjaxIO(JSON.stringify(request));
-			
-		var ret = GetHttpResult();
-		if (ret) {
-		
-			   
-			return (ret.errcode==0) ? 1:0;
-		}
-	}
-	else{
-		try{
-			var cspname = plugin().GetCspNameByPID();
-			if(cspname == "")
-			{
-				ret = plugin().InitProvider("CCIT Smartcard CSP V1.0", "CCITCont1");
-				if(ret == 0)
-				{
-					cspname = "CCIT Smartcard CSP V1.0";
-				}
-			}
-			
-			if(cspname == "")
-			{
-				return 0;
-			}
-			else{
-				return 1;
-			}
-		}
-		catch(e){
-			if (e.description != "")
-			{
-				try{
-					ret = plugin().InitProvider("CCIT Smartcard CSP V1.0", "CCITCont1");
-					if(ret == 0)
-					{
-						cspname = "CCIT Smartcard CSP V1.0";
-						return 1;
-					}
-				}	        
-				catch(e)
-				{
-					return 0;
-				}
-			}else{
-				return 0;
-			}		
-		}			
-	}
-}
-
-/*********************************************************
-展示证书详情
-cert：base64格式证书数据
-返回值：成功返回true，失败返回false
-**************************************************************/
-export function ViewCertInfo(cert)
- {
-	try{
-		if(!isIE())
-		{
-			var request = new Object();
-			request.method = "ViewCertInfo";
-			request.certData = certData;
-			
-			AjaxIO(JSON.stringify(request));
-		
-			var ret = GetHttpResult();
-			if (ret) {
-				
-				   
-				return (ret.resultMSG==0)? true:false;
-			}
-		}
-		else{
-			if(plugin().ViewCertInfo(cert) == 0){
-				return true;
-			}
-		}
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			// alert(e.description);
-			
-			
-		}	    
-	}	
-
-	return false;
- }
- 
- 
- 
-/************************************************** 
-选择签名证书，将签名证书所在容器置为当前容器。
-signCert:base64格式的签名证书数据
-返回值：成功返回0.失败返回错误码
-*******************************************************/
-export function selectSignCert(signCert)
-{
-	try{
-		if(!isIE())
-		{
-			var request = new Object();
-			request.method = "selectSignCert";
-			request.certData = certData;
-			
-			AjaxIO(JSON.stringify(request));
-		
-			var ret = GetHttpResult();
-			if (ret) {
-				return ret.resultMSG;
-			}
-		}
-		else{
-			var ret = 0;
-			ret = plugin().selectSignCert(signCert);   // 查找相匹配的签名证书,目的是为了 设置 容器索引
-
-			return ret;
-		}
-		
-	}catch(e)
-	{
-			if (e.description != "")
-			{
-				alert("选择签名证书发生错误！" + "\r\n" + "错误描述：" + e.description);
-			}
-			else
-			{
-				alert("选择签名证书失败.");
-			}
-			return -1;
-	}
-}
-
-
-
-/***********************
-[in]provName CSP名称
-		certData 管理员证书内容 --base64编码，本接口根据certData内容选择相应设备进行操作。
-		UserType 0 用户  1 管理员
-[retval]true--成功  false-失败
-[comments]根据管理员证书内容区分管理员key和用户key,当UserType传入0时初将用户设备置为当前设备，
-当UserType为1时置管理员设备为当前设备。调用本接口前不需要调用initProv接口
-***************************************/
-export function SetCurrentDevice(provName, certData, UserType)
-{
-	var RetVal = false;
-	
-    try{
-        RetVal = initProv(provName, "CCITCont1");
-		if(!RetVal)
-			return false;
-		if(!isIE())
-		{
-			var request = new Object();
-			request.method = "SetCurrentDevice";
-			request.certData = certData;
-			request.usrType = UserType;
-			
-			AjaxIO(JSON.stringify(request));
-		
-			var ret = GetHttpResult();
-			if (ret) {
-				if(ret.resultMSG == 0)
-					return true;
-				else
-					return false;
-			}
-		}
-		else{
-			RetVal =  plugin().SetCurrentDevice(certData, UserType);
-			if(RetVal != 0)
-				return false;
-			else
-				return true;
-		}
-		
-    }
-    catch(e){
-        if (e.description != "")
-        {
-            alert("发生错误！\r\n错误码:" + dec2hex(e.number) + "\r\n" + "错误描述：" + e.description);
-        }
-        else
-        {
-            alert("错误码:" + dec2hex(e.number));
-        }
-	    return false;
-    }
-}
-
-
-/************************************************************************/
-/*   北六项目定制接口：设置用户信息，多用户情况下以::分隔
-/*   @param usrList
-/*          用户列表
-/*   @return 成功返回true,失败返回false                                 */
-/************************************************************************/
-export function setBindUsr (usrList)
-{
-	try{
-		if(!isIE())
-		{
-			var request = new Object();
-			request.method = "writeBindUser";
-			request.usrList = usrList;
-			
-			AjaxIO(JSON.stringify(request));
-		
-			var ret = GetHttpResult();
-			if (ret) {
-			   if (ret.errcode != 0) {
-					alert("设置用户信息发生错误！" + "\r\n" + "错误描述：" + ret.errMsg);	
-				}
-				return (ret.resultMSG == 0)?true:false;
-			}
-		}
-		else{
-			if(plugin().writeBindUser(usrList) == 0)
-			{
-				return true;
-			}
-		}
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}
-	}	
-
-	return false;	
-
-}
-
-/************************************************************************/
-/*   北六项目定制接口：获取用户信息列表信息，
-/*                     若有多个用户，则弹出对话框让用户选择
-/*   @return 成功返回用户名称,失败返回null                                 */
-/************************************************************************/
-export function getBindUsr ()
-{
-	var ret = null;
-
-	try{		       	 
-		if(!isIE())
-		{
-			var request = new Object();
-			request.method = "readBindUser";
-			
-			AjaxIO(JSON.stringify(request));
-		
-			var ret = GetHttpResult();
-			if (ret) {
-			   if (ret.errcode != 0) {
-					alert("获取用户信息发生错误！" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-				else{
-					return ret.resultMSG;
-				}
-			}
-		}
-		else{
-			ret = plugin().readBindUser(); 
-			return ret;
-		}
-		   
-	}
-	catch(e){
-
-		if (e.description != "")
-		{	        
-			alert(e.description);
-			
-			
-		}
-		
-		return null;
-	}	
-}
-
-/**********************************
-验证Ukey口令
-usrPin:Ukey口令
-成功返回true，失败返回false
-************************************/
-export function VerifyPin(usrPin)
-{
-    try{
-		if(!isIE())
-		{
-			var request = new Object();
-			request.method = "VerifyPin";
-			request.usrPin = usrPin;
-			
-			AjaxIO(JSON.stringify(request));
-		
-			var ret = GetHttpResult();
-			if (ret) {
-			   if (ret.errcode != 0) {
-					if(ret.resultMSG > 0 && ret.resultMSG <= 10)
-					{
-						
-						alert("您输入的当前密码错误，还剩" + ret.resultMSG + "次尝试机会！");
-						
-						
-					}
-					else{
-						alert("口令验证失败！" + "\r\n" + "错误描述：" + ret.errMsg);
-					}
-				}
-				return (ret.resultMSG == 0)?true:false;
-			}
-		}
-		else{
-			var RetVal =  plugin().VerifyPin(usrPin);
-	
-			
-			if(RetVal != 0)
-			{
-				if(RetVal > 0 && RetVal <= 10)
-				{
-					alert("您输入的当前密码错误，还剩" + RetVal + "次尝试机会！");
-					
-					
-				}
-				else{
-					alert("口令验证失败！" + "\r\n" + "错误描述：" + ret.errMsg);
-				}
-				return false;
-			}	
-			else{
-				return true;
-			}
-		}	
-    }
-    catch(e){
-        if (e.description != "")
-        {
-            alert("验证口令发生错误！\r\n错误码:" + dec2hex(e.number) + "\r\n" + "错误描述：" + e.description);
-        }
-        else
-        {
-            alert("错误码:" + dec2hex(e.number));
-        }
-	    return false;
-    }
-}
-
-
-/**********************************
-检测Ukey中文件是否存在
-ulFileID:文件ID，整型
-成功返回true，失败返回false
-************************************/
-export function CheckUKFile(ulFileID)
-{
-    try{
-		if(!isIE())
-		{
-			var request = new Object();
-			request.method = "CheckUKFile";
-			request.ulFileID = ulFileID;
-			
-			AjaxIO(JSON.stringify(request));
-		
-			var ret = GetHttpResult();
-			if (ret) {
-			    if (ret.errcode != 0) {
-					alert("错误描述：" + ret.errMsg);
-				} 
-				return (ret.resultMSG == 0)?true:false;
-			}
-		}
-		else{
-			var RetVal =  plugin().CheckUKFile(ulFileID);
-			if(RetVal != 0)
-				return false;
-			else
-				return true;
-		}
-		
-    }
-    catch(e){
-        if (e.description != "")
-        {
-            alert("检测Ukey文件是否存在发生错误！\r\n错误码:" + dec2hex(e.number) + "\r\n" + "错误描述：" + e.description);
-        }
-        else
-        {
-            alert("错误码:" + dec2hex(e.number));
-        }
-	    return false;
-    }
-}
-
-
-/**********************************
-删除Ukey中文件
-ulFileID:文件ID
-成功返回true，失败返回false
-************************************/
-export function DeleteUKFile(ulFileID)
-{
-    try{
-		if(!isIE())
-		{
-			var request = new Object();
-			request.method = "DeleteUKFile";
-			request.ulFileID = ulFileID;
-			
-			AjaxIO(JSON.stringify(request));
-		
-			var ret = GetHttpResult();
-			if (ret) {
-			   if (ret.errcode != 0) {
-					alert("删除Ukey文件发生错误!" + "\r\n" + "错误描述：" + ret.errMsg);
-				}
-				return (ret.resultMSG == 0)?true:false;
-			}
-		}
-		else{
-			var RetVal =  plugin().DeleteUKFile(ulFileID);
-			if(RetVal != 0)
-				return false;
-			else
-				return true;
-		}
-		
-    }
-    catch(e){
-        if (e.description != "")
-        {
-            alert("删除Ukey文件发生错误！\r\n错误码:" + dec2hex(e.number) + "\r\n" + "错误描述：" + e.description);
-        }
-        else
-        {
-            alert("错误码:" + dec2hex(e.number));
-        }
-	    return false;
-    }
-}
-
-/**********************************
-设置是否显示错误信息
-ulFlag:0-不显示，非零-显示
-成功返回true，失败返回false
-************************************/
-export function SetDebug(ulFlag)
-{
-    try{
-		if(!isIE())
-		{
-			var request = new Object();
-			request.method = "SetDebug";
-			request.ulFlag = ulFlag;
-			
-			AjaxIO(JSON.stringify(request));
-		
-			var ret = GetHttpResult();
-			if (ret) {
-				return (ret.resultMSG == 0)?true:false;
-			}
-		}
-		else{
-			var RetVal =  plugin().SetDebug(ulFlag);
-			if(RetVal != 0)
-				return false;
-			else
-				return true;
-		}
-		
-    }
-    catch(e){
-        if (e.description != "")
-        {
-            alert("发生错误！\r\n错误码:" + dec2hex(e.number) + "\r\n" + "错误描述：" + e.description);
-        }
-        else
-        {
-            alert("错误码:" + dec2hex(e.number));
-        }
-	    return false;
-    }
-}
-
-/**********************************
-根据证书类型读取相应证书
-iKeyType:签名证书：AT_SIGNATURE；加密证书：AT_KEYEXCHANGE
-algType：算法类型，1-RSA；2-SM2
-成功返回base64编码证书，失败返回null
-************************************/
-export function getCertByType(iKeyType, algType)
-{
-    try{
-		if(!isIE())
-		{
-			var request = new Object();
-			request.method = "getCertByType";
-			request.iKeyType = iKeyType;
-			request.algType = algType;
-			
-			AjaxIO(JSON.stringify(request));
-		
-			var ret = GetHttpResult();
-			if (ret) {
-				if (ret.errcode != 0) {
-					alert("获取证书发生错误！" + "\r\n" + "错误描述：" + ret.errMsg);
-					return null;
-				}
-				else{
-					return ret.resultMSG;
-				}
-			}
-		}
-		else{
-			var RetVal =  plugin().getCertByType(iKeyType, algType);
-			
-			return RetVal;
-		}
-		
-    }
-    catch(e){
-        if (e.description != "")
-        {
-            alert("发生错误！\r\n错误码:" + dec2hex(e.number) + "\r\n" + "错误描述：" + e.description);
-        }
-        else
-        {
-            alert("错误码:" + dec2hex(e.number));
-        }
-	    return null;
-    }
-}
-
-/**********************************
-检测当前控件版本是否满足需求
-contrlVersion:要使用的控件版本
-返回值：0-满足要求，2-版本号位数不一致，3-不满足使用要求
-		其他-错误码
-************************************/
-export function CheckVerson(contrlVersion)
-{
-    try{
-		if(!isIE())
-		{
-			var request = new Object();
-			request.method = "CheckVerson";
-			request.contrlVersion = contrlVersion;
-			
-			AjaxIO(JSON.stringify(request));
-		
-			var ret = GetHttpResult();
-			if (ret) {
-				if (ret.errcode != 0) {
-					alert("版本检测发生错误！" + "\r\n" + "错误描述：" + ret.errMsg);
-					return ret.errcode;
-				}
-				else{
-					return ret.resultMSG;
-				}
-			}
-		}
-		else{
-			var RetVal =  plugin().CheckVerson(contrlVersion);
-			
-			return RetVal;
-		}
-		
-    }
-    catch(e){
-        if (e.description != "")
-        {
-            alert("发生错误！\r\n错误码:" + dec2hex(e.number) + "\r\n" + "错误描述：" + e.description);
-        }
-        else
-        {
-            alert("错误码:" + dec2hex(e.number));
-        }
-	    return dec2hex(e.number);
-    }
-}
-
-
-/**********************************
-安装根证书
-返回值：0-成功
-		其他-错误码
-************************************/
-export function CertInstall()
-{
-    try{
-		if(!isIE())
-		{
-			var request = new Object();
-			request.method = "CertInstall";
-			
-			AjaxIO(JSON.stringify(request));
-		
-			var ret = GetHttpResult();
-			if (ret) {
-				if (ret.errcode != 0) {
-					alert("安装根证书发生错误！" + "\r\n" + "错误描述：" + ret.errMsg);
-					return ret.errcode;
-				}
-				else{
-					return ret.resultMSG;
-				}
-			}
-		}
-		else{
-			var RetVal =  plugin().CertInstall();
-			
-			return RetVal;
-		}
-		
-    }
-    catch(e){
-        if (e.description != "")
-        {
-            alert("安装根证书发生错误！\r\n错误码:" + dec2hex(e.number) + "\r\n" + "错误描述：" + e.description);
-        }
-        else
-        {
-            alert("错误码:" + dec2hex(e.number));
-        }
-	    return dec2hex(e.number);
-    }
-}
-
-
-/**********************************
-获取已安装根证书个数
-返回值：0-14，已安装的根证书个数，其他-错误码
-************************************/
-export function IsCertsExist()
-{
-    try{
-		if(!isIE())
-		{
-			var request = new Object();
-			request.method = "IsCertsExist";
-			
-			AjaxIO(JSON.stringify(request));
-		
-			var ret = GetHttpResult();
-			if (ret) {
-				if (ret.errcode != 0) {
-					alert("发生错误！" + "\r\n" + "错误描述：" + ret.errMsg);
-					return ret.errcode;
-				}
-				else{
-					return ret.resultMSG;
-				}
-			}
-		}
-		else{
-			var RetVal =  plugin().IsCertsExist();
-			
-			return RetVal;
-		}
-		
-    }
-    catch(e){
-        if (e.description != "")
-        {
-            alert("发生错误！\r\n错误码:" + dec2hex(e.number) + "\r\n" + "错误描述：" + e.description);
-        }
-        else
-        {
-            alert("错误码:" + dec2hex(e.number));
-        }
-	    return dec2hex(e.number);
-    }
-}
-
-
-
-/**********************************
-检测当前控件版本下各组件版本是否正确
-返回值：0-成功，其他-错误码
-************************************/
-export function CheckContrlFile()
-{
-    try{
-		if(!isIE())
-		{
-			var request = new Object();
-			request.method = "CheckContrlFile";
-			
-			AjaxIO(JSON.stringify(request));
-		
-			var ret = GetHttpResult();
-			if (ret) {
-				if (ret.errcode != 0) {
-					alert("发生错误！" + "\r\n" + "错误描述：" + ret.errMsg);
-					return dec2hex(ret.errcode);
-				}
-				else{
-					return ret.resultMSG;
-				}
-			}
-		}
-		else{
-			var RetVal =  plugin().CheckContrlFile();
-			
-			return RetVal;
-		}
-		
-    }
-    catch(e){
-        if (e.description != "")
-        {
-            alert("发生错误！\r\n错误码:" + dec2hex(e.number) + "\r\n" + "错误描述：" + e.description);
-        }
-        else
-        {
-            alert("错误码:" + dec2hex(e.number));
-        }
-	    return dec2hex(e.number);
-    }
-}
\ No newline at end of file