deng

chenxt
1 parent 6154a8a3
Showing 4 changed files with 18 additions and 10 deletions
src/components/Common/CommonComponent/index.js
src/index.less
src/mes/login/index.js
src/mes/scheduledTasks/machineTasks/index.js
@@ -1206,8 +1206,8 @@ export default class CommonComponent extends Component {
             options.push(option);
           } else {
             const option = this.props.showConfig.bCanInput ?
-              (<Option key={keyValue.toString()} label={res} value={keyValue.toString()} title={res}>{optionValue}</Option>) :
-              (<Option key={keyValue} value={keyValue} label={res} title={res}>{optionValue}</Option>);
+              (<Option key={keyValue.toString()} label={res} value={keyValue.toString()} title={res} >{optionValue}</Option>) :
+              (<Option key={keyValue} value={keyValue} label={res} title={res} className={this.props.dropdownClassName || ''}>{optionValue}</Option>);
             /*   返回值赋值   */
             options.push(option);
           }
@@ -1235,6 +1235,7 @@ export default class CommonComponent extends Component {
       }
     }
     /*   返回值   */
+    
     return options;
   };
@@ -4679,4 +4679,9 @@ ton:focus {
   input.ant-input.sStatusReject {
     color: #ff4D4f !important;
   }
-}
 \ No newline at end of file
+  .huge-font-option .ant-select-item-option-content {
+    font-size: 24px !important;
+    line-height: 32px !important;
+    height: 32px !important;
+  }
+}
@@ -386,7 +386,7 @@ const useLoginEvent = props =&gt; {
 };
 // 遍历登录文本组件
-const handleGetFormItem = (props, item) => {
+const handleGetFormItem = (props, item, isHuge) => {
   const { sModelsId } = initValue;
   const { masterData = {}, companys, faceLoginValue } = props;
@@ -456,7 +456,8 @@ const handleGetFormItem = (props, item) =&gt; {
     onFilterDropDownData: props.onFilterDropDownData,
     onSaveState: props.onSaveState,
     bPassWord: item.sName === "sPassWord",
-    style: { backgroundColor: "#eaeaea" }
+    style: { backgroundColor: "#eaeaea" },
+    dropdownClassName: isHuge ? 'huge-font-option' : ''
   };
   const showName = sLanguage === 'sChinese' ? item.sChinese : sLanguage === 'sEnglish' ? item.sEnglish
@@ -738,7 +739,7 @@ const FaceLoginAfterModal = props =&gt; {
         <Form form={form} layout="vertical" size="large">
           {configs
             .filter(item => item.sName !== "sPassWord")
-            .map(item => handleGetFormItem(props, item))}
+            .map(item => handleGetFormItem(props, item, true))}
         </Form>
       </div>
     </Modal>
@@ -432,10 +432,11 @@ const useInfoEvent = props =&gt; {
             tempTaskId: ""
           });
         }
-        props.onChangeRouter({
-          type: "name",
-          path: ["生产执行", "生产执行"]
-        });
+        // props.onChangeRouter({
+        //   type: "name",
+        //   path: ["生产执行", "生产执行"]
+        // });
+        handleRefresh();
       } else if (code === -7) {
         // 如果有开工中的任务，即接口返回-7，弹出确认窗体
         itemClickRef.current = { data: item };