走自定义按钮后查询数据

chenxt
1 parent f898dd11
Showing 3 changed files with 6 additions and 21 deletions
src/mes/common/commonOperationBarComponent/MesToolbar.js
src/mes/common/commonOperationBarComponent/index.js
src/utils/config.js
@@ -20,7 +20,6 @@ const ToolbarFun = async (props) =&gt; {
  
   // const { sControlName } = btnConfig;
   // const btnName = sControlName.replace('BtnLeft.', '').replace('BtnRight.', '').toLowerCase();
-  console.log(btnName, props, 'btnName');
   let flag = 0;
   let interfaceArr = btnConfig.interface;
   if (btnName === 'btnadd') {
@@ -333,7 +332,6 @@ const handleBtnEent = async (props, btnConfig, name, sValue, nextInParams) =&gt; {
     props.onSaveState({ sCurrMemoProps });
   }
   const sButtonParam = btnConfig.sButtonParam;
-  console.log("11", btnConfig);
   const btn = commonUtils.convertStrToObj(sButtonParam);
   const sProName = btn.sproName;
   const inParams = [];
@@ -474,7 +472,6 @@ const handleBtnEent = async (props, btnConfig, name, sValue, nextInParams) =&gt; {
         item.bFilter = slaveFilterCondition;
       });
     }
-    console.log("inParams", inParams);
   }
  
   const iIndex = commonUtils.isNotEmptyObject(btnConfig) ? menuData.findIndex(item => item.sControlName === btnConfig.sControlName) : -1;
@@ -545,7 +542,6 @@ const handleBtnEent = async (props, btnConfig, name, sValue, nextInParams) =&gt; {
           sProName,
           JSON.stringify({ params: inParams, changeValue: sValue, sButtonParam: btn })
         );
-        console.log("result", result);
         if (result > 0) {
           /* 只有成功 才能调用接口 -5代表失败 */
           const asyncFunc = async () => {
@@ -610,19 +606,10 @@ const handleProcedureCall = async (props, btnConfig, proName, proInParam, other)
       slave3Data[iIndex].sCalcProDetail = returnData.msg;
       props.onSaveState({ slave3Data });
     }
-    props.onExecInstructSet({
-      btnConfig: {
-        showName: "刷新",
-        sInstruct: JSON.stringify([
-          {
-            opr: "refresh",
-          },
-        ])
-      }
-    });
+
   } else if (returnData.code === 1) {
     message.success(returnData.msg);
-    //  props.onButtonClick("BtnRefresh");
+    props.onRefresh()
   } else if (returnData.code === -8) {
     Modal.info({
       title: "温馨提示:",
@@ -822,7 +822,6 @@ const useCommonOperationBarComponentEvent = props =&gt; {
       style.color = "#000";
       defaultProps.style = style;
     }
-    console.log(defaultProps, 'defaultProps');
  
     return defaultProps;
   };
@@ -933,7 +932,6 @@ const CommonOperationBarComponent = basProps =&gt; {
   const btnLeftConfig = gdsconfigformslave.filter(
     item => item.bVisible && item.sControlName.includes("BtnLeft.")
   );
-  console.log(btnLeftConfig, gdsconfigformslave, 'btnLeftConfig');
  
   // 将扫码上料放到最后
   const scanCodeToLoadMaterialsIndex = btnLeftConfig.findIndex(
@@ -4,10 +4,10 @@ const bHttps = location.protocol === &#39;https:&#39;;
 export const webSite = {
   // ipAddress: '//t0.xlyprint.com:8000/xlyEntry/', /* 服务器地址 */
   // faceAddress: isDev ? '//192.168.11.22:8080/xlyFace' : '//' + location.host + '/xlyFace',
-  fileAddress: isDev ? '//km5cjx.gnway.cc:47400/xlyReport/' : '//' + location.host + '/xlyReport/', // 接口地址
-  faceAddress: isDev ? '//km5cjx.gnway.cc:47400/xlyFace' : '//' + location.host + '/xlyFace',
-  ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//km5cjx.gnway.cc:47400/xlyEntry/' : '//' + location.host + '/xlyEntry/',
-  interfaceAddress: isDev ? '//km5cjx.gnway.cc:47400/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址
+  fileAddress: isDev ? '//km5cjx.gnway.cc:43920/xlyReport/' : '//' + location.host + '/xlyReport/', // 接口地址
+  faceAddress: isDev ? '//km5cjx.gnway.cc:43920/xlyFace' : '//' + location.host + '/xlyFace',
+  ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//km5cjx.gnway.cc:43920/xlyEntry/' : '//' + location.host + '/xlyEntry/',
+  interfaceAddress: isDev ? '//km5cjx.gnway.cc:43920/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址
   // ipAddress: isDev ? '//ebc.jinjia.com:8091/xlyEntry/' : '//' + location.host + '/xlyEntry/',
   // interfaceAddress: isDev ? '//ebc.jinjia.com:8091/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址
   // ipAddress: isDev ? '//192.168.11.26:8080/xlyEntry/' : '//' + location.host + '/xlyEntry/',