设备及目标信息展示速度

chenxt
1 parent 5e091393
Showing 3 changed files with 10 additions and 10 deletions
src/components/Common/CommonTable/index.js
src/mes/common/siderInfoComponent/index.js
src/mes/common/siderInfoComponent/index.less
@@ -1221,12 +1221,9 @@ class CommonTableRc extends React.Component {
   /**   行选择   */
   onDoubleClick = (name, record) => {
     if (this.props.onDoubleClickNew) {
-      console.log('onDoubleClick', 1111);
-
       this.props.onDoubleClickNew({ name, record });
     } else if (this.props.onDoubleClick !== undefined) {
       this.props.onDoubleClick(record);
-      console.log('onDoubleClick', 2222);
     }
  
   };
@@ -640,6 +640,8 @@ const DeviceTargetInfoComponent = () =&gt; {
         {equipmentTargetInformation}
       </div>
       {showConfig.map((config, index) => {
+        console.log(showConfig, 'showConfig');
+
         // if (index > 4) return "";
         // bPushDiff
         const { bPushDiff = false } = props?.app?.userinfo
@@ -648,12 +650,13 @@ const DeviceTargetInfoComponent = () =&gt; {
           odd: index % 2 === 0
         });
         const showTypeProps = handleGetShowTypeProps(config);
-        if (index > 4 && !bPushDiff) {
-          return ''
-        }
-        if (index > 4 && bPushDiff && !['dPieceDefectBQty', 'dPieceDefectAQty', 'dTotalAdjust'].includes(config?.sName)) {
-          return ''
+        if (
+          ['dPieceDefectAQty', 'dPieceDefectBQty'].includes(config?.sName) &&
+          !bPushDiff
+        ) {
+          return null; // 不满足条件，不渲染
         }
+        //   'dTotalAdjust', 'dSpeed'
         if (config?.sName?.endsWith("Qty")) {
           return (
             <div className={`${className} dynamicClock`}>
@@ -77,7 +77,7 @@
 // 工单类型
 .workOrdertype {
   position: relative;
-  .size(100%, calc(100% - 230px - 30px));
+  .size(100%, calc(100% - 160px - 30px));
   // .size(100%, calc(100% - 230px - 280px));
  
   :global {
@@ -219,7 +219,7 @@
 .deviceTargetInfo {
   //   .size(100%, 25%);
   .size(100%);
-  max-height: 330px;
+  max-height: 390px;
   //   margin-bottom: 15px;
   background-color: #FFF6DE;