滚动条整体修改

.stylelintrc.js

-const fabric = require('@umijs/fabric');
-
-module.exports = {
-    ...fabric.stylelint,
-};

src/components/DrawerPro/index.jsx

@@ -21,7 +21,7 @@ function DrawerPro(props) {
       placement="right"
       closable={true}
       getContainer={false}
-      style={{ position: 'absolute', transform: 'translateX(0)', maxWidth: '100%' }}
+      style={{ position: 'absolute', transform: 'translateX(0)' }}
       width={'100%'}
       destroyOnClose={true}
       {...props}

src/components/RightContent/AvatarDropdown.jsx

@@ -16,7 +16,7 @@ import Utf8 from 'crypto-js/enc-utf8';
 import moment from 'moment';
 import io from 'socket.io-client';
 const { NODE_ENV } = process.env;
-const websocketUrl = NODE_ENV == "development" ? "ws://192.168.40.110:9933" : `${window.location.protocol == "http:" ? "ws" : "wss"}://${window.location.host}`;
+const websocketUrl = NODE_ENV == "development" ? "ws://192.168.40.111:9933" : `${window.location.protocol == "http:" ? "ws" : "wss"}://${window.location.host}`;
 const socket = io(websocketUrl, {
   reconnectionDelay: 4000,
   transports: ['websocket'],

src/components/TagView/index.jsx

@@ -163,14 +163,15 @@ const TagView = ({ children, home }) => {
       </div>
       <div className={styles.child}>
         <div className={styles.contianbox}>
-          <Scrollbars
+          {/* <Scrollbars
             thumbMinSize={10}
             autoHide
             style={{ width: '100%', height: '100%' }}
             hideTracksWhenNotNeeded={true}
           >
             {refresh && children}
-          </Scrollbars>
+          </Scrollbars> */}
+          <div style={{ width: "100%", height: "100%" }}> {refresh && children}</div>
         </div>
       </div>
     </>

src/global.less

@@ -422,6 +422,42 @@ ol {
   }
 }
 
+.runtime-keep-alive-layout,
+.ant-table-content,
+.ant-drawer-body {
+  &::-webkit-scrollbar {
+    /*滚动条整体样式*/
+
+    width: 5px;
+    /*高宽分别对应横竖滚动条的尺寸*/
+
+    height: 5px;
+
+  }
+
+  &::-webkit-scrollbar-thumb {
+    /*滚动条里面小方块*/
+
+    // border-radius: 5px;
+
+    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+
+    background: #c1c1c1;
+
+  }
+
+  &::-webkit-scrollbar-track {
+    /*滚动条里面轨道*/
+
+    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+
+    border-radius: 0;
+
+    background: #fff;
+
+  }
+}
+
 .page-title {
   margin-bottom: 0;
   font-weight: 700;
@@ -461,9 +497,10 @@ ol {
 
 .runtime-keep-alive-layout,
 .runtime-keep-alive-layout-no {
-  height: auto !important;
-  min-height: 100% !important;
-  overflow: hidden !important;
+  // height: auto !important;
+  // min-height: 100% !important;
+  // overflow: hidden !important;
+  position: static !important;
 
   >div {
     height: 100%;

src/pages/check/order/index.jsx

@@ -248,7 +248,7 @@ function Order(props) {
   }, [drawer?.val, drawer?.item?.id]);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">点检接单</h3>}
         columns={columns}

src/pages/check/plan/index.jsx

@@ -450,7 +450,7 @@ function Plan(props) {
     });
   };
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">点检计划</h3>}
         columns={columns}

src/pages/check/standard/Project.jsx

@@ -110,7 +110,7 @@ function Project({ equipmentCheckStandardId }) {
   }, [drawer?.id]);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         columns={columns}
         actionRef={actionRef}

src/pages/check/standard/index.jsx

@@ -133,7 +133,7 @@ function Standard(props) {
   }, [drawer?.id]);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">点检标准</h3>}
         columns={columns}

src/pages/check/task/index.jsx

@@ -574,7 +574,7 @@ function Task(props) {
   }, [activeTabKey]);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">点检工单</h3>}
         columns={columns}

src/pages/device/account/index.jsx

@@ -2288,7 +2288,7 @@ function Model(props) {
 
   const containderef = useRef();
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <div className="ant-card-head" style={{ backgroundColor: 'white' }}>
         <div className="ant-card-head-wrapper">
           <div className="ant-card-head-title">

src/pages/device/model/index.jsx

@@ -132,7 +132,7 @@ function Model(props) {
   }, []);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">设备型号</h3>}
         columns={columns}

src/pages/device/supplier/index.jsx

@@ -420,7 +420,7 @@ function Supplier(props) {
     }
   };
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">设备供应商</h3>}
         columns={columns}

src/pages/device/type/index.jsx

@@ -193,7 +193,7 @@ function Type(props) {
   }, [drawer?.val]);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">设备类型</h3>}
         columns={columns}

src/pages/lease/contract/index.jsx

@@ -573,7 +573,7 @@ function Contract(props) {
 
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">租赁合同</h3>}
         columns={columns}

src/pages/lease/ledger/index.jsx

@@ -342,7 +342,7 @@ const Ledger = () => {
         </div>
         <div className={styles.ledgercontent}>
             <div className={styles.ledgerleft}>
-                <TreeRender url="/auth/sysFactory/getTree" onselected={onselecteTree} noaction={true} />
+                <TreeRender url="/auth/sysFactory/getTree" onselected={onselecteTree} noaction={true} maxWidth={240} />
             </div>
             <div className={styles.ledgerright}>
                 <AutoTable

src/pages/lease/ledger/index.less

 .ledgerbox {
     width: 100%;
     height: 100%;
-    overflow: hidden;
+    // overflow: hidden;
     background-color: #fff;
     display: flex;
     flex-direction: column;
-    position: relative;
+    // position: relative;
 
     .ledgerheader {
         width: 100%;
@@ -16,7 +16,7 @@
     .ledgercontent {
         flex: 1;
         width: 100%;
-        overflow: hidden;
+        // overflow: hidden;
         display: flex;
         justify-content: space-between;
 
@@ -34,6 +34,7 @@
             flex: 1;
             border-left: 1px solid #f0f0f0;
             overflow: hidden;
+            overflow-y: auto;
         }
     }
 }
\ No newline at end of file

src/pages/lease/supplier/index.jsx

@@ -380,7 +380,7 @@ function Supplier(props) {
     }
   };
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">设备供应商</h3>}
         columns={columns}

src/pages/lifeparts/count/index.jsx

@@ -212,7 +212,7 @@ function Warning(props) {
   }, []);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">寿命件台账</h3>}
         columns={columns}

src/pages/lifeparts/criterion/index.jsx

@@ -118,7 +118,7 @@ function Criterion(props) {
   }, []);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">寿命件标准</h3>}
         columns={columns}

src/pages/lifeparts/warning/index.jsx

@@ -205,7 +205,7 @@ function Warning(props) {
   }, []);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">寿命件预警</h3>}
         columns={columns}

src/pages/maintain/criterion/Project.jsx

@@ -109,7 +109,7 @@ function Project({ equipmentMaintainStandardId }) {
     });
   }, [drawer?.id]);
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         columns={columns}
         actionRef={actionRef}

src/pages/maintain/criterion/index.jsx

@@ -141,7 +141,7 @@ function Criterion(props) {
   }, [drawer?.equipmentModelId]);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">保养标准</h3>}
         columns={columns}

src/pages/maintain/orders/index.jsx

@@ -190,7 +190,7 @@ function Orders(props) {
   };
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">保养接单</h3>}
         columns={columns}

src/pages/maintain/plan/index.jsx

@@ -549,7 +549,7 @@ function Plan(props) {
   }, [activeTabKey]);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">保养计划</h3>}
         columns={columns}

src/pages/maintain/workOrder/index.jsx

@@ -815,7 +815,7 @@ function WorkOrder(props) {
   };
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">保养工单</h3>}
         columns={columns}

src/pages/repair/failure/index.jsx

@@ -179,7 +179,7 @@ function Failure(props) {
     }
   };
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">故障报修</h3>}
         columns={columns}

src/pages/repair/fault/index.jsx

@@ -355,7 +355,7 @@ function Fault(props) {
     }
   }
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">故障设置</h3>}
         columns={columns}

src/pages/repair/order/index.jsx

@@ -1693,7 +1693,7 @@ function Failure(props) {
 
   const containderef = useRef();
   return (
-    <div style={{ position: 'relative' }} ref={containderef}>
+    <div ref={containderef}>
       <AutoTable
         pagetitle={<h3 className="page-title">维修工单</h3>}
         columns={columns}

src/pages/repair/outsourcing/index.jsx

@@ -556,7 +556,7 @@ function Failure(props) {
     }
   };
   return (
-    <div style={{ position: 'relative' }} ref={containderef}>
+    <div ref={containderef}>
       <AutoTable
         pagetitle={<h3 className="page-title">外协工单</h3>}
         columns={columns}

src/pages/repair/platform/index.jsx

@@ -446,7 +446,7 @@ function Platform(props) {
     }
   }
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">接单平台</h3>}
         columns={columns}

src/pages/repair/track/index.jsx

@@ -686,7 +686,7 @@ function Failure(props) {
     }
   };
   return (
-    <div style={{ position: 'relative' }} ref={containderef}>
+    <div ref={containderef}>
       <AutoTable
         pagetitle={<h3 className="page-title">追踪工单</h3>}
         columns={columns}

src/pages/setting/factory/index.jsx

@@ -131,7 +131,7 @@ function Factory(props) {
   }, []);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">工厂管理</h3>}
         columns={columns}

src/pages/setting/organization/index.jsx

@@ -196,7 +196,7 @@ function Type(props) {
   }, [drawer.val]);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">组织管理</h3>}
         columns={columns}

src/pages/setting/production/index.jsx

@@ -136,7 +136,7 @@ function Section(props) {
   }, []);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">产线管理</h3>}
         columns={columns}

src/pages/setting/role/index.jsx

@@ -227,7 +227,7 @@ function Role(props) {
     );
   };
   // 数据分权
-  const distribution = (text, row, _, action) => {};
+  const distribution = (text, row, _, action) => { };
 
   const columns = useMemo(() => {
     let defcolumn = getcolumns(setDrawer);
@@ -245,7 +245,7 @@ function Role(props) {
   }, []);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">角色管理</h3>}
         columns={columns}

src/pages/setting/section/index.jsx

@@ -136,7 +136,7 @@ function Section(props) {
   }, []);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">工段管理</h3>}
         columns={columns}

src/pages/setting/users/index.jsx

@@ -268,7 +268,7 @@ function User(props) {
   }
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">用户管理</h3>}
         columns={columns}

src/pages/setting/workshop/index.jsx

@@ -135,7 +135,7 @@ function Factory(props) {
   }, []);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">车间管理</h3>}
         columns={columns}

src/pages/spare/edgestore/index.jsx

@@ -101,7 +101,7 @@ function Edgestore(props) {
   }, []);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">线边库存</h3>}
         columns={columns}

src/pages/spare/instore/index.jsx

@@ -121,7 +121,7 @@ function Instore(props) {
     return res?.data?.dataList;
   });
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">入库管理</h3>}
         columns={columns}

src/pages/spare/outstore/index.jsx

@@ -129,7 +129,7 @@ function Outstore(props) {
   }, [activeTabKey]);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">出库管理</h3>}
         columns={columns}

src/pages/spare/personalstore/index.jsx

@@ -110,7 +110,7 @@ function Personalstore(props) {
   }, []);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">个人库存</h3>}
         columns={columns}

src/pages/spare/record/index.jsx

@@ -101,7 +101,7 @@ function Record(props) {
   }, []);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">出入库记录</h3>}
         columns={columns}

src/pages/spare/requisition/index.jsx

@@ -138,11 +138,11 @@ function Requisition(props) {
   };
 
   const columns = useMemo(() => {
-    let defcolumn = getcolumns(setdrawer,drawer?.type, currentUser?.fullName).filter(
+    let defcolumn = getcolumns(setdrawer, drawer?.type, currentUser?.fullName).filter(
       (it) => it.key == activeTabKey,
     )[0]?.columns;
     let defpath =
-      getcolumns(setdrawer,drawer?.type).filter((it) => it.key == activeTabKey)[0]?.pathconfig ?? {};
+      getcolumns(setdrawer, drawer?.type).filter((it) => it.key == activeTabKey)[0]?.pathconfig ?? {};
     if (activeTabKey == 1) {
       return defcolumn.concat({
         title: '操作',
@@ -165,7 +165,7 @@ function Requisition(props) {
   }, [activeTabKey]);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">备件领用</h3>}
         columns={columns}

src/pages/spare/setting/index.jsx

@@ -114,7 +114,7 @@ function Setting(props) {
   }, []);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">备件设置</h3>}
         columns={columns}

src/pages/spare/spareback/index.jsx

@@ -164,7 +164,7 @@ function Spareback(props) {
   }, [activeTabKey]);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">备件回冲</h3>}
         columns={columns}

src/pages/spare/stock/index.jsx

@@ -39,7 +39,7 @@ function Stock(props) {
   }, []);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">备件库存</h3>}
         columns={columns}

src/pages/spare/supplier/index.jsx

@@ -142,7 +142,7 @@ function Supplier(props) {
   }, []);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">备件供应商</h3>}
         columns={columns}

src/pages/spare/userecord/index.jsx

@@ -101,7 +101,7 @@ function Record(props) {
   }, []);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">使用记录</h3>}
         columns={columns}

src/pages/system/dictionary/index.jsx

@@ -194,7 +194,7 @@ function Type(props) {
   }, [drawer.val]);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">数据字典</h3>}
         columns={columns}

src/pages/system/field/index.jsx

@@ -148,7 +148,7 @@ function Field(props) {
   }, [drawer?.formId]);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <div className="ant-card-head">
         <div className="ant-card-head-wrapper">
           <div className="ant-card-head-title">

src/pages/system/pushsetting/Notice.jsx

@@ -109,7 +109,7 @@ function Project({ businessMsgOptionId }) {
     });
   }, [drawer?.id]);
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         columns={columns}
         actionRef={actionRef}

src/pages/system/pushsetting/index.jsx

@@ -171,7 +171,7 @@ function Pushsetting(props) {
   };
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">推送配置</h3>}
         columns={columns}

src/pages/system/rules/index.jsx

@@ -162,7 +162,7 @@ function Rules(props) {
   }, []);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle={<h3 className="page-title">编号规则</h3>}
         columns={columns}

src/pages/welcome/index.jsx

@@ -92,7 +92,7 @@ function Welcome(props) {
   }, []);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div>
       <AutoTable
         pagetitle="系统首页"
         columns={columns}