连接socket的后续功能

client/actions/getStore.js

 import fetch from 'isomorphic-fetch';
 import actionTypes from '../actiontype/store'
+import {saveHeaderInfo} from './initHeader'
 const domain = ENV.domain;
 
 let json = {
@@ -27,18 +28,19 @@ const saveStoreInfo = (data)=>{
 
 const getStoreInfo = (storeId)=>{
     return(dispatch)=>{
-        // fetch(domain + '/web/pad_warehouse/getMachineData.action',{
-        //     credentials : 'include',
-        //     method : 'POST',
-        //     mode : 'cors',
-        //     body : {}
-        //
-        // }).then((response)=>response.json())
-        //     .then(json=>{
-        //         console.log(json);
-        //     }).catch(e=>{console.error(e)})
+        dispatch(saveHeaderInfo({storeId}));
+        fetch(domain + '/web/pad_warehouse/getMachineData.action',{
+            credentials : 'include',
+            method : 'POST',
+            mode : 'cors',
+            body : Object.assign({},{storeId})
+
+        }).then((response)=>response.json())
+            .then(json=>{
+                console.log(json);
+            }).catch(e=>{console.error(e)})
         if(json.meta.success && json.data.warehouse){
-            dispatch(saveStoreInfo(json.data.warehouse))
+            dispatch(saveStoreInfo(Object.assign({},json.data.warehouse,{id:storeId})))
         }else{
 
         }

client/actions/getTroubles.js

 import fetch from 'isomorphic-fetch';
 import actionTypes from '../actiontype/trouble'
 import userActionTypes from "../actiontype/user";
+import {saveHeaderInfo} from './initHeader'
 const domain = ENV.domain;
 
 let json = {
@@ -46,9 +47,8 @@ let json = {
             "employeeName": "机器库管员",
             "headImageUrl": "http://www.mjitech.com/static/coupon/gounian/banner_hongbaotupian-3-14.jpg"
         },
-        "taskIds": [
-            155
-        ]
+        "taskIds": 155
+
     }
 }
 
@@ -68,8 +68,11 @@ const saveUserInfo = (data)=>{
 }
 
 
-const getTroubleList = ()=>{
+const getTroubleList = (info)=>{
+    console.log(info);
+
     return(dispatch)=>{
+        dispatch(saveHeaderInfo(info));
         // fetch(domain + '/web/pad_warehouse/getMachineData.action',{
         //     credentials : 'include',
         //     method : 'POST',
@@ -81,6 +84,7 @@ const getTroubleList = ()=>{
         //         console.log(json);
         //     }).catch(e=>{console.error(e)})
         if(json.meta.success && json.data){
+            dispatch(saveHeaderInfo({taskId:json.data.taskIds}))
             if(json.data.employee){
                 //存储用户信息
                 dispatch(saveUserInfo(json.data.employee));

client/actions/initHeader.js

+import actionTypes from '../actiontype/initHeader'
+const domain = ENV.domain;
+
+let json = {
+    "meta": {
+        "code": "200",
+        "message": "成功",
+        "success": true
+    },
+    "data": {
+        "warehouse": {
+            "id": 13,
+            "name": "华贸商业街",
+            "image": "http://static.mjitech.com/static/tmp/2018-05-25/1527243213701.jpg",
+            "address": "华贸商业街（新光天地与利兹卡尔顿酒店之间广场）"
+        }
+    }
+};
+
+const saveHeaderInfo = (data)=>{
+    return{
+        type:actionTypes.INITHEADERS,
+        data
+    }
+};
+
+export {saveHeaderInfo}
+

client/actiontype/initHeader.js

+const actionTypes = {
+    INITHEADERS : 'INITHEADERS'
+}
+
+export default actionTypes;
\ No newline at end of file

client/components/CommonComponent/HeaderComponent/HeaderComponent.jsx

@@ -34,22 +34,25 @@ export default class HeaderComponent extends React.Component{
         return (
             <div className={"homeHeader clearfix"}>
                 {
-                    storeInfo ? <div className={"headerContent leftContent fl"}>
+                    <div className={"headerContent leftContent fl"}>
                         <div className={"headerlogo"}>
                             <img className={"logoImg"} src={UTILPATH.localImg.headlogo} alt=""/>
                         </div>
-                        <div className={"locationInfo"}>
+                        {
+                            storeInfo && storeInfo.id ? <div className={"locationInfo"}>
                                 <img className={"addIcon"} src={UTILPATH.localImg.addIcon} alt=""/>
                                 <div className={"local colfff"}>
                                     <p className={"font30"}>{storeInfo.name}</p>
-                                <p className={"font24"}>ID : 001</p>
+                                    <p className={"font24"}>ID : {storeInfo.id}</p>
                                 </div>
+                            </div> :null
+                        }
+
                     </div>
-                    </div> : null
                 }
 
                 {
-                    userinfo ?  <div className={"headerContent rightContent fr " + (userinfo.id ? '' : 'hide')}>
+                    userinfo  && userinfo.id ?  <div className={"headerContent rightContent fr "}>
                         <img className={"userheadImg"} src={ userinfo.headImageUrl || UTILPATH.localImg.defaultImg} alt=""/>
                         <div className={"userinfo font24 colfff"}>
                             <p>{userinfo.employeeName || ''}</p>

client/components/CommonComponent/HeaderComponent/index.css

@@ -52,7 +52,7 @@
 }
 .headerComponent .homeHeader .locationInfo .local {
     display: inline-block;
-    line-height: 34px;
+    line-height: 36px;
     vertical-align: middle;
 }
 .headerComponent .homeHeader .rightContent{

client/containers/HomeContainer/HomeContainer.jsx

 import React from 'react';
 import Clock from '../../components/CommonComponent/ClockComponent/ClockComponent'
+import HeaderComponent from '../../components/CommonComponent/HeaderComponent/HeaderComponent'
 require('./index.css');
 
 export default class HomeContainer extends React.Component{
@@ -21,7 +22,14 @@ export default class HomeContainer extends React.Component{
 
     render(){
         let props = this.props;
+        let {userInfo,storeInfo} = props;
         return(
+            <div>
+                <HeaderComponent
+                    showHeader={CONFIG.headerStatus[1]}
+                    userinfo={userInfo}
+                    storeInfo={storeInfo}
+                />
                 <div className={"homeContainer"}>
                     <img className={"homeIcon"} src={UTILPATH.localImg.defaultImg} alt=""/>
                     <div className={"homeText font40"}>感谢您辛勤工作，祝您今天顺利！</div>
@@ -35,6 +43,8 @@ export default class HomeContainer extends React.Component{
                         </div> : null
                     }
                 </div>
+            </div>
+
         )
     }
 }

client/containers/PageContainer/PageContainer.jsx

@@ -79,9 +79,10 @@ class PageContainer extends React.Component {
 
     componentWillMount() {
         let that = this;
+        let {dispatch} = this.props;
         on(CONFIG.socketType.GETSTOREINFO,this,function (data) {
             console.log("==GETSTOREINFO===")
-            console.log(data)
+            console.log(data);
             dispatch(getStoreInfo(data.storeId));
         })
         on(CONFIG.socketType.GETSOCKETMSG,this,function (data) {
@@ -94,9 +95,13 @@ class PageContainer extends React.Component {
     }
 
     getSocketMsg(data){
+        let {dispatch} = this.props;
         switch (data.type){
             case 'SUCCESS_OPENDOOR':
                 //执行开门
+                let info = JSON.parse(data.info);
+                console.log("SUCCESS_OPENDOOR " ,info);
+                dispatch(getTroubleList(info));
                 this.setState({
                     showPage : showPage[1]
                 },()=>{
@@ -327,7 +332,8 @@ class PageContainer extends React.Component {
                         />;
                 break;
             case showPage[7]:
-                pages = <HomeContainer showClock={this.state.showClock}/>;
+                pages = <HomeContainer showClock={this.state.showClock} storeInfo={state.storeInfo}
+                                       userInfo={state.userInfo}/>;
                 break;
             case showPage[8]:
                 pages = <FinishAskContainer />;

client/containers/TroubleContainer/TroubleContainer.jsx

@@ -39,8 +39,11 @@ export default class TroubleContainer extends React.Component{
 
 
     componentWillMount(){
-        let {initTroubleList} = this.props;
-        initTroubleList();
+        let {troubleList} = this.props;
+        // initTroubleList();
+        this.setState({
+            troubleList : troubleList
+        })
     }
 
     componentWillReceiveProps(nextProps){

client/reducers/index.js

@@ -5,6 +5,7 @@ import scanBarCodeContainer from './scanBarCodeContainer'
 import otherQuestion from './otherQuestion'
 import userInfo from './user'
 import refreshImg from './refreshImg'
+import headerInfo from './initHeader'
 
 export default combineReducers({
     troubleList,
@@ -12,7 +13,8 @@ export default combineReducers({
     scanBarCodeContainer,
     otherQuestion,
     userInfo,
-    refreshImg
+    refreshImg,
+    headerInfo
 })
 
 

client/reducers/initHeader.js

+import actionTypes from '../actiontype/initHeader';
+
+const saveHeaders = (content,data)=>{
+    return Object.assign({},content,data);
+}
+
+export default function(state={}, action) {
+    switch (action.type) {
+        case actionTypes.INITHEADERS:
+            return saveHeaders(state,action.data)
+        default:
+            return state;
+    }
+}
\ No newline at end of file

client/util/socket.js

@@ -2,7 +2,7 @@ import fetch from 'isomorphic-fetch';
 import {emit} from './event'
 
 
-let domainIp = '192.168.199.';
+let domainIp = '192.168.10.';
 
 let initIndex = 1;
 let totalIndex = 255 / 5;