Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图

src/pages/OCTable/index.tsx

@@ -65,10 +65,10 @@ const OCTable: FC = (props) => {
                 <span>{excelResultValue}</span>
               </div>
               {
-                showDifference &&
+                showDifference && !!parseInt(calculateDifference(acctResultValue, excelResultValue || 0)) &&
                 <div className={cs(styles["danger"], styles["comparison-single-row"])}>
                   <span>{lanObj["差值"]}：</span>
-                  <span>{calculateDifference(acctResultValue, excelResultValue)}</span>
+                  <span>{calculateDifference(acctResultValue, excelResultValue || 0)}</span>
                 </div>
               }
             </div>;
@@ -104,7 +104,7 @@ const OCTable: FC = (props) => {
   return <Table
     rowKey="id" className={styles.tableWrapper}
     columns={columns} dataSource={dataSource} bordered size="small"
-    scroll={{ x: 1200, y: `calc(100vh - 137px)` }}
+    scroll={{ x: 1200, y: `calc(100vh - 165px)` }}
     pagination={{
       ...paginationFun(pageInfo, sizeChange, onChange, i18n),
       size: "default"