Merge branch 'byll6.0' into newVersion6.0

src/modules/HomePage/index.jsx

@@ -32,7 +32,7 @@ class HomePage extends Component {
         //清除已保存的血压标签数据
         clearAddItems();
         //获取配置
-        getConfig();
+        // getConfig();
         //getChronicList&&getChronicList();//获取慢病列表
         // 获取并监听窗口宽度，用于有横向滚动条时患者信息和打印预览跟随滚动
         let width = $(window).width();
@@ -91,9 +91,9 @@ class HomePage extends Component {
               <div className={style['confirm-info']}>是否引用预问诊信息？</div>
               <p className={style.tip}>(引用数据会清除当前内容)</p>
           </ConfirmModal>
-          {flag?<div className={style['mask']}>
+          {/* {flag?<div className={style['mask']}>
                 <img src={loading} className={style['load']}/>
-            </div>:""}
+            </div>:""} */}
         </div>;
     }
 }

src/store/async-actions/homePage.js

@@ -18,7 +18,7 @@ const api = {
 //获取系统配置
 export const getSystemConfig = ()=>{
   const code = getUrlArgObject('hospitalId');
-  return json(api.getSystemConfig,{hospitalCode:code});
+  // return json(api.getSystemConfig,{hospitalCode:code});
 };
 function modulesParseJson(data){
   let json = {},obj={},saveTextJson={},moduleName={};

src/store/async-actions/patInfo.js

@@ -91,17 +91,17 @@ export const initHospitalInfo = (dispatch, getState) => {
 }
 //参数转换
 export const initPersonInfo = (dispatch, getState) => {
-    json('/tranFieldInfo/getInfoByUuid', {
-        "uuid": getUrlArgObject('hospitalId'),
-    }).then((res) => {
-        const data = res.data;
-        if (data.code == 0) {
-            dispatch(getInfos(data.data));
-            getPatientMessage(dispatch, getState);
-        } else {
-            console.log(res)
-        }
-    })
+    // json('/tranFieldInfo/getInfoByUuid', {
+    //     "uuid": getUrlArgObject('hospitalId'),
+    // }).then((res) => {
+    //     const data = res.data;
+    //     if (data.code == 0) {
+    //         dispatch(getInfos(data.data));
+    //         getPatientMessage(dispatch, getState);
+    //     } else {
+    //         console.log(res)
+    //     }
+    // })
 }
 
 //默认回读

src/utils/config.js

@@ -1,7 +1,7 @@
 // const host='http://192.168.3.1:5050';//赵
 // const host='http://192.168.3.100:5050';//王峰
 // const host='http://192.168.2.121:5050';//后端接口访问地址
-const host='http://192.168.2.236:5050';//后端接口访问地址
+const host='http://192.168.2.236:6060';//后端接口访问地址
 // const host='http://192.168.2.241:5050';//后端接口访问地址
 // const host='http://192.168.3.11:5050';//王宇
 //const host='http://192.168.2.164:8080';