Skip to content

M
max_android_panel
Commit 15b0a1b9 by wujiabao
Options

关门改动

parent 56945370
Showing with 169 additions and 26 deletions
client/containers/PageContainer/PageContainer.jsx
...@@ -37,6 +37,7 @@ import {finishBoxRecovery} from "../../actions/recovery"; ...@@ -37,6 +37,7 @@ import {finishBoxRecovery} from "../../actions/recovery";
import replenishAction from "../../actions/replenish"; import replenishAction from "../../actions/replenish";
import AllClassify from '../AllClassifyContainer/AllClassifyContainer' import AllClassify from '../AllClassifyContainer/AllClassifyContainer'
import {willCloseDoor,closeDoorSuccess} from '../../actions/chooseTaskContainer' import {willCloseDoor,closeDoorSuccess} from '../../actions/chooseTaskContainer'
import {sendMsg} from '../../util/socket'
/*二期引用 end*/ /*二期引用 end*/
import {on,remove} from '../../util/event'; import {on,remove} from '../../util/event';
...@@ -75,7 +76,8 @@ class PageContainer extends React.Component { ...@@ -75,7 +76,8 @@ class PageContainer extends React.Component {
pageStyle : {}, pageStyle : {},
successCloseDoor : false, successCloseDoor : false,
showClassify : false, //显示右侧菜单栏，默认不显示,目前没用 showClassify : false, //显示右侧菜单栏，默认不显示,目前没用
isSend:false isSend:false,
area:''//区域
}; };
this.getPages = this.getPages.bind(this); //获取当前页面 this.getPages = this.getPages.bind(this); //获取当前页面
...@@ -180,7 +182,8 @@ class PageContainer extends React.Component { ...@@ -180,7 +182,8 @@ class PageContainer extends React.Component {
getSocketMsg(data){ getSocketMsg(data){
this.showError(JSON.stringify(data)); this.showError(JSON.stringify(data));
let {dispatch,state} = this.props; let {dispatch,state} = this.props;
let {isSend} = this.state; let {isSend , area} = this.state;
console.log(data,'kldasjdkljaskljdklsjakldjkla')
switch (data.type){ switch (data.type){
case 'SUCCESS_OPENDOOR': case 'SUCCESS_OPENDOOR':
this.showError(JSON.stringify(data)); this.showError(JSON.stringify(data));
...@@ -204,26 +207,55 @@ class PageContainer extends React.Component { ...@@ -204,26 +207,55 @@ class PageContainer extends React.Component {
} }
this.setState({ this.setState({
successCloseDoor : false successCloseDoor : false,
area:info.area
}); });
break; break;
case 'SUCCESS_CLOSEDOOR': case 'SUCCESS_CLOSEDOOR':
//关门成功 if(area==="A"){
if(isSend){ if(data.info.left_tread===1){
console.log("closedoor"); //关门成功
dispatch(logout()); if(isSend){
// this.endCountBack(); console.log("closedoor");
// remove(CONFIG.socketType.GETSTOREINFO,this) dispatch(logout());
// remove(CONFIG.socketType.GETSOCKETMSG,this) // this.endCountBack();
dispatch(closeDoorSuccess(state.commonInfo)) // remove(CONFIG.socketType.GETSTOREINFO,this)
this.setState({ // remove(CONFIG.socketType.GETSOCKETMSG,this)
showPage : showPage[initPage], dispatch(closeDoorSuccess(state.commonInfo))
showClock : false, this.setState({
popupInfo : defaultPopupInfo, showPage : showPage[initPage],
successCloseDoor : true, showClock : false,
isSend:false popupInfo : defaultPopupInfo,
}); successCloseDoor : true,
} isSend:false
});
}
}else{
sendMsg(JSON.stringify({type:'WILL_CLOSEDOOR'}))
}
}else if(area==="B"){
if(data.info.right_tread===1){
//关门成功
if(isSend){
console.log("closedoor");
dispatch(logout());
// this.endCountBack();
// remove(CONFIG.socketType.GETSTOREINFO,this)
// remove(CONFIG.socketType.GETSOCKETMSG,this)
dispatch(closeDoorSuccess(state.commonInfo))
this.setState({
showPage : showPage[initPage],
showClock : false,
popupInfo : defaultPopupInfo,
successCloseDoor : true,
isSend:false
});
}
}else{
sendMsg(JSON.stringify({type:'WILL_CLOSEDOOR'}))
}
}
break; break;
} }
} }
...@@ -278,6 +310,8 @@ class PageContainer extends React.Component { ...@@ -278,6 +310,8 @@ class PageContainer extends React.Component {
break; break;
case 'PF' : case 'PF' :
this.changePages(CONFIG.showPage[14]); this.changePages(CONFIG.showPage[14]);
case 'EH' :
this.changePages(CONFIG.showPage[12]);
break; break;
} }
} }
...@@ -705,6 +739,11 @@ class PageContainer extends React.Component { ...@@ -705,6 +739,11 @@ class PageContainer extends React.Component {
hidePopup={()=>this.hidePopup()} hidePopup={()=>this.hidePopup()}
/>; />;
break; break;
case showPage[12]:
pages =<TroubleContainer
headerInfo={commonInfo}
/>
break;
case showPage[131]: case showPage[131]:
pages = <HomePage headerInfo={commonInfo} pages = <HomePage headerInfo={commonInfo}
getTaskList={()=>{dispatch(getTaskList(commonInfo))}} getTaskList={()=>{dispatch(getTaskList(commonInfo))}}
......
client/containers/TroubleContainer/TroubleContainer.jsx
...@@ -7,6 +7,8 @@ import Qrcode from '../../components/CommonComponent/Qrcode/Qrcode' ...@@ -7,6 +7,8 @@ import Qrcode from '../../components/CommonComponent/Qrcode/Qrcode'
import FinishTrouble from '../../components/TroubleComponent/FinishTroubleComponent/FinishTroubleComponent' import FinishTrouble from '../../components/TroubleComponent/FinishTroubleComponent/FinishTroubleComponent'
import Button from '../../components/CommonComponent/ButtonComponent/ButtonComponent' import Button from '../../components/CommonComponent/ButtonComponent/ButtonComponent'
import PopModel from '../../components/CommonComponent/PopupComponent/PopupMiddleComponent' import PopModel from '../../components/CommonComponent/PopupComponent/PopupMiddleComponent'
import LeftContainer from '../LeftContainer/LeftContainer';
import RightContainer from '../RightContainer/RightContainer';
require('./index.css') require('./index.css')
const showDom={ const showDom={
...@@ -282,10 +284,10 @@ export default class TroubleContainer extends React.Component{ ...@@ -282,10 +284,10 @@ export default class TroubleContainer extends React.Component{
return( return(
<div className={"toubleContainer " + (showTrouble ? '' : 'hide')}> <div className={"toubleContainer " + (showTrouble ? '' : 'hide')}>
<HeaderComponent {/* <HeaderComponent
showHeader={CONFIG.headerStatus[1]} showHeader={CONFIG.headerStatus[1]}
headerInfo={headerInfo} headerInfo={headerInfo}
/> /> */}
{ {
this.state.showTrouble ? this.state.showTrouble ?
...@@ -346,11 +348,16 @@ export default class TroubleContainer extends React.Component{ ...@@ -346,11 +348,16 @@ export default class TroubleContainer extends React.Component{
render(){ render(){
return ( return (
<div className={"troubleContainers "+(this.state.showStatus === showDom[2] ? 'backfff' : '')} style={this.state.style}> <div>
{ <LeftContainer leftInfo={props.headerInfo} />
this.getDom() <RightContainer>
} <div className={"troubleContainers "+(this.state.showStatus === showDom[2] ? 'backfff' : '')} style={this.state.style}>
</div> {
this.getDom()
}
</div>
</RightContainer>
</div>
) )
} }
} }
client/containers/oldTroubleContainer/index.css 0 → 100644
/*.troubleContainers {*/
/*width: 100%;*/
/*height: 100%;*/
/*}*/
/*.troubleContainers.backfff {*/
/*background-color: #ffffff;*/
/*}*/
/*.troubleContent {*/
/*padding-left: 30px;*/
/*}*/
/*.troubleContent .troubleText {*/
/*height: 100px;*/
/*display: table-cell;*/
/*vertical-align: bottom;*/
/*}*/
/*.troubleContent .troubleBox {*/
/*margin: 20px 0;*/
/*}*/
/*.troubleContent .troubleBtnBox {*/
/*height: 80px;*/
/*width: 100%;*/
/*text-align: right;*/
/*padding-right: 30px;*/
/*}*/
/*.troubleContent .troubleBtn {*/
/*width: 413px;*/
/*height: 100%;*/
/*display: inline-block;*/
/*line-height: 80px;*/
/*text-align: center;*/
/*background-color: #ff7860;*/
/*border-radius: 10px;*/
/*}*/
/*---------px rem 分割线-----------*/
.troubleContainers {
width: 100%;
height: 100%;
}
.troubleContainers.backfff {
background-color: #ffffff;
}
.troubleContent {
padding-left: 0.25rem;
}
.troubleContent .troubleText {
height: 0.8333333333333334rem;
display: table-cell;
vertical-align: bottom;
}
.troubleContent .troubleBox {
margin: 0.16666666666666666rem 0;
}
.troubleContent .troubleBtnBox {
height: 0.6666666666666666rem;
width: 100%;
text-align: right;
padding-right: 0.25rem;
}
.troubleContent .troubleBtn {
width: 3.441666666666667rem;
height: 100%;
display: inline-block;
line-height: 0.6666666666666666rem;
text-align: center;
background-color: #ff7860;
border-radius: 0.08333333333333333rem;
}
/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LmNzcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTtJQUNJLFlBQVk7SUFDWixhQUFhO0NBQ2hCOztBQUVEO0lBQ0ksMEJBQTBCO0NBQzdCOztBQUVEO0lBQ0ksbUJBQW1CO0NBQ3RCOztBQUVEO0lBQ0ksY0FBYztJQUNkLG9CQUFvQjtJQUNwQix1QkFBdUI7Q0FDMUI7O0FBRUQ7SUFDSSxlQUFlO0NBQ2xCOztBQUVEO0lBQ0ksYUFBYTtJQUNiLFlBQVk7SUFDWixrQkFBa0I7SUFDbEIsb0JBQW9CO0NBQ3ZCOztBQUVEO0lBQ0ksYUFBYTtJQUNiLGFBQWE7SUFDYixzQkFBc0I7SUFDdEIsa0JBQWtCO0lBQ2xCLG1CQUFtQjtJQUNuQiwwQkFBMEI7SUFDMUIsb0JBQW9CO0NBQ3ZCOztBQUVEO0lBQ0ksWUFBWTtJQUNaLGFBQWE7Q0FDaEI7O0FBRUQ7SUFDSSwwQkFBMEI7Q0FDN0I7O0FBRUQ7SUFDSSxzQkFBc0I7Q0FDekI7O0FBRUQ7SUFDSSw4QkFBOEI7SUFDOUIsb0JBQW9CO0lBQ3BCLHVCQUF1QjtDQUMxQjs7QUFFRDtJQUNJLGlDQUFpQztDQUNwQzs7QUFFRDtJQUNJLDhCQUE4QjtJQUM5QixZQUFZO0lBQ1osa0JBQWtCO0lBQ2xCLHVCQUF1QjtDQUMxQjs7QUFFRDtJQUNJLDRCQUE0QjtJQUM1QixhQUFhO0lBQ2Isc0JBQXNCO0lBQ3RCLG1DQUFtQztJQUNuQyxtQkFBbUI7SUFDbkIsMEJBQTBCO0lBQzFCLHNDQUFzQztDQUN6QyIsImZpbGUiOiJpbmRleC5jc3MiLCJzb3VyY2VzQ29udGVudCI6WyIudHJvdWJsZUNvbnRhaW5lcnMge1xyXG4gICAgd2lkdGg6IDEwMCU7XHJcbiAgICBoZWlnaHQ6IDEwMCU7XHJcbn1cclxuXHJcbi50cm91YmxlQ29udGFpbmVycy5iYWNrZmZmIHtcclxuICAgIGJhY2tncm91bmQtY29sb3I6ICNmZmZmZmY7XHJcbn1cclxuXHJcbi50cm91YmxlQ29udGVudCB7XHJcbiAgICBwYWRkaW5nLWxlZnQ6IDMwcHg7XHJcbn1cclxuXHJcbi50cm91YmxlQ29udGVudCAudHJvdWJsZVRleHQge1xyXG4gICAgaGVpZ2h0OiAxMDBweDtcclxuICAgIGRpc3BsYXk6IHRhYmxlLWNlbGw7XHJcbiAgICB2ZXJ0aWNhbC1hbGlnbjogYm90dG9tO1xyXG59XHJcblxyXG4udHJvdWJsZUNvbnRlbnQgLnRyb3VibGVCb3gge1xyXG4gICAgbWFyZ2luOiAyMHB4IDA7XHJcbn1cclxuXHJcbi50cm91YmxlQ29udGVudCAudHJvdWJsZUJ0bkJveCB7XHJcbiAgICBoZWlnaHQ6IDgwcHg7XHJcbiAgICB3aWR0aDogMTAwJTtcclxuICAgIHRleHQtYWxpZ246IHJpZ2h0O1xyXG4gICAgcGFkZGluZy1yaWdodDogMzBweDtcclxufVxyXG5cclxuLnRyb3VibGVDb250ZW50IC50cm91YmxlQnRuIHtcclxuICAgIHdpZHRoOiA0MTNweDtcclxuICAgIGhlaWdodDogMTAwJTtcclxuICAgIGRpc3BsYXk6IGlubGluZS1ibG9jaztcclxuICAgIGxpbmUtaGVpZ2h0OiA4MHB4O1xyXG4gICAgdGV4dC1hbGlnbjogY2VudGVyO1xyXG4gICAgYmFja2dyb3VuZC1jb2xvcjogI2ZmNzg2MDtcclxuICAgIGJvcmRlci1yYWRpdXM6IDEwcHg7XHJcbn1cclxuXHJcbi50cm91YmxlQ29udGFpbmVycyB7XHJcbiAgICB3aWR0aDogMTAwJTtcclxuICAgIGhlaWdodDogMTAwJTtcclxufVxyXG5cclxuLnRyb3VibGVDb250YWluZXJzLmJhY2tmZmYge1xyXG4gICAgYmFja2dyb3VuZC1jb2xvcjogI2ZmZmZmZjtcclxufVxyXG5cclxuLnRyb3VibGVDb250ZW50IHtcclxuICAgIHBhZGRpbmctbGVmdDogMC4yNXJlbTtcclxufVxyXG5cclxuLnRyb3VibGVDb250ZW50IC50cm91YmxlVGV4dCB7XHJcbiAgICBoZWlnaHQ6IDAuODMzMzMzMzMzMzMzMzMzNHJlbTtcclxuICAgIGRpc3BsYXk6IHRhYmxlLWNlbGw7XHJcbiAgICB2ZXJ0aWNhbC1hbGlnbjogYm90dG9tO1xyXG59XHJcblxyXG4udHJvdWJsZUNvbnRlbnQgLnRyb3VibGVCb3gge1xyXG4gICAgbWFyZ2luOiAwLjE2NjY2NjY2NjY2NjY2NjY2cmVtIDA7XHJcbn1cclxuXHJcbi50cm91YmxlQ29udGVudCAudHJvdWJsZUJ0bkJveCB7XHJcbiAgICBoZWlnaHQ6IDAuNjY2NjY2NjY2NjY2NjY2NnJlbTtcclxuICAgIHdpZHRoOiAxMDAlO1xyXG4gICAgdGV4dC1hbGlnbjogcmlnaHQ7XHJcbiAgICBwYWRkaW5nLXJpZ2h0OiAwLjI1cmVtO1xyXG59XHJcblxyXG4udHJvdWJsZUNvbnRlbnQgLnRyb3VibGVCdG4ge1xyXG4gICAgd2lkdGg6IDMuNDQxNjY2NjY2NjY2NjY3cmVtO1xyXG4gICAgaGVpZ2h0OiAxMDAlO1xyXG4gICAgZGlzcGxheTogaW5saW5lLWJsb2NrO1xyXG4gICAgbGluZS1oZWlnaHQ6IDAuNjY2NjY2NjY2NjY2NjY2NnJlbTtcclxuICAgIHRleHQtYWxpZ246IGNlbnRlcjtcclxuICAgIGJhY2tncm91bmQtY29sb3I6ICNmZjc4NjA7XHJcbiAgICBib3JkZXItcmFkaXVzOiAwLjA4MzMzMzMzMzMzMzMzMzMzcmVtO1xyXG59XHJcbiJdfQ== */
\ No newline at end of file
client/reducers/common.js
...@@ -51,6 +51,10 @@ const NumChangeWord = (currentTaskType,childTaskNum)=>{ ...@@ -51,6 +51,10 @@ const NumChangeWord = (currentTaskType,childTaskNum)=>{
{ {
title:'问题反馈', title:'问题反馈',
children:[''] children:['']
},
{
title:'故障处理任务',
children:['']
} }
] ]
let type = currentTaskType; let type = currentTaskType;
...@@ -110,6 +114,15 @@ const NumChangeWord = (currentTaskType,childTaskNum)=>{ ...@@ -110,6 +114,15 @@ const NumChangeWord = (currentTaskType,childTaskNum)=>{
} }
} }
break; break;
case 'EH' :
{
let name=6;
taskName = arr[name - 1].title;
if (child) {
taskName = arr[name - 1].children[child - 1]
}
}
break;
} }
return taskName; return taskName;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment