fix panel1 css

client/components/CommonComponent/ButtonComponent/ButtonComponent.jsx

@@ -17,7 +17,7 @@ export default class ButtonComponent extends React.Component{
 
 
     render(){
     render(){
         let props = this.props;
         let props = this.props;
-        let {btnContainer="",style={},option=null} = props;
+        let {btnContainer="",style={}} = props;
         return(
         return(
             <div className={`buttonComponent ${btnContainer}`} style={style} onClick={this.handleButtonClick}>
             <div className={`buttonComponent ${btnContainer}`} style={style} onClick={this.handleButtonClick}>
                 {props.text}
                 {props.text}

client/containers/ChooseTaskContainer/ChooseTaskContainer.jsx

 import React from 'react';
 import React from 'react';
 import Button from '../../components/CommonComponent/ButtonComponent/ButtonComponent'
 import Button from '../../components/CommonComponent/ButtonComponent/ButtonComponent'
+import PopModel from '../../components/CommonComponent/PopupComponent/PopupChildComponent'
 import HeaderComponent from '../../components/CommonComponent/HeaderComponent/HeaderComponent'
 import HeaderComponent from '../../components/CommonComponent/HeaderComponent/HeaderComponent'
 require('./index.css');
 require('./index.css');
 
 

client/containers/FinishAskContainer/FinishAskContainer.jsx

@@ -40,7 +40,7 @@ export default class FinishAskContainer extends React.Component{
         console.log("closeDoor");
         console.log("closeDoor");
         this.props.hidePopup();
         this.props.hidePopup();
         //任务完成，超时不确定
         //任务完成，超时不确定
-        let btnDom = <Button key={"finishcloseDoorBack1"} style={{'width':UTILPATH.getRemByPx(260)}} text={"确定"} option={this.beginCloseDoor}/>
+        let btnDom = <Button btnContainer={"btne5"} key={"finishcloseDoorBack1"} style={{'width':UTILPATH.getRemByPx(260)}} text={"确定"} option={this.beginCloseDoor}/>
         let clockDom = <Clock key={"finiscloseDoorhBack2"} totalTime={30}
         let clockDom = <Clock key={"finiscloseDoorhBack2"} totalTime={30}
                               style={{'width':UTILPATH.getRemByPx(260),'marginLeft':UTILPATH.getRemByPx(30),'borderRadius':UTILPATH.getRemByPx(10)}}
                               style={{'width':UTILPATH.getRemByPx(260),'marginLeft':UTILPATH.getRemByPx(30),'borderRadius':UTILPATH.getRemByPx(10)}}
                               callback={this.beginCloseDoor}
                               callback={this.beginCloseDoor}
@@ -55,7 +55,7 @@ export default class FinishAskContainer extends React.Component{
         console.log("judgeTask");
         console.log("judgeTask");
         this.props.hidePopup();
         this.props.hidePopup();
         //任务完成，超时不确定
         //任务完成，超时不确定
-        let btnDom = <Button key={"finishjudgeTaskBack1"} style={{'width':UTILPATH.getRemByPx(260)}} text={"确定"} option={this.beginCloseDoor}/>
+        let btnDom = <Button btnContainer={"btne5"} key={"finishjudgeTaskBack1"} style={{'width':UTILPATH.getRemByPx(260)}} text={"确定"} option={this.beginCloseDoor}/>
         let clockDom = <Clock key={"finishjudgeTaskBack2"} totalTime={30}
         let clockDom = <Clock key={"finishjudgeTaskBack2"} totalTime={30}
                               style={{'width':UTILPATH.getRemByPx(260),'marginLeft':UTILPATH.getRemByPx(30),'borderRadius':UTILPATH.getRemByPx(10)}}
                               style={{'width':UTILPATH.getRemByPx(260),'marginLeft':UTILPATH.getRemByPx(30),'borderRadius':UTILPATH.getRemByPx(10)}}
                               callback={this.closeDoor}
                               callback={this.closeDoor}
@@ -79,8 +79,8 @@ export default class FinishAskContainer extends React.Component{
                         <p>您是否有其它任务</p>
                         <p>您是否有其它任务</p>
                     </div>
                     </div>
                     <div className={"finishAskButtons"}>
                     <div className={"finishAskButtons"}>
-                        <Button text={"有"} style={{'marginTop':UTILPATH.getRemByPx(120)}} option={this.selectTask}/>
-                        <Button text={"没有"} style={{'marginTop':UTILPATH.getRemByPx(40)}} option={this.beginCloseDoor}/>
+                        <Button text={"有"} style={{marginTop:UTILPATH.getRemByPx(120),width:'100%'}} option={this.selectTask}/>
+                        <Button text={"没有"} style={{marginTop:UTILPATH.getRemByPx(40),width:'100%'}} option={this.beginCloseDoor}/>
                         <Clock style={{'marginTop':UTILPATH.getRemByPx(40)}} totalTime={60}
                         <Clock style={{'marginTop':UTILPATH.getRemByPx(40)}} totalTime={60}
                                callback={this.judgeTask}/>
                                callback={this.judgeTask}/>
                     </div>
                     </div>

client/containers/OtherQuestionContainer/OtherQuestionContainer.jsx

@@ -181,7 +181,7 @@ export default class OtherQuestionContainer extends React.Component{
                         popupText:"提交前请输入相关信息，如果不想提交可以直接跳过(右上角)",
                         popupText:"提交前请输入相关信息，如果不想提交可以直接跳过(右上角)",
                         showPopup:true,
                         showPopup:true,
                         classNames : 'popupExtClass',
                         classNames : 'popupExtClass',
-                        popupButtons: [<ButtonComponent key={"btn"} option={this.handleShowPopo.bind(this)} text={"确定"}/>]
+                        popupButtons: [<ButtonComponent btnContainer={"btne5"}  key={"btn"} option={this.handleShowPopo.bind(this)} text={"确定"}/>]
                     }
                     }
                 })
                 })
             }
             }

client/containers/PageContainer/PageContainer.jsx

@@ -141,8 +141,8 @@ class PageContainer extends React.Component {
             dispatch(saveCommonInfo({ip:data.ip}));
             dispatch(saveCommonInfo({ip:data.ip}));
             dispatch(getStoreInfo(data.storeId));
             dispatch(getStoreInfo(data.storeId));
 
 
-            //dispatch(saveCommonInfo({userInfo:{employeeId:20}}));
-            //dispatch(getUserinfo(20,data.storeId));
+            // dispatch(saveCommonInfo({userInfo:{employeeId:20}}));
+            // dispatch(getUserinfo(20,data.storeId));
         });
         });
         on(CONFIG.socketType.GETSOCKETMSG,this,function (data) {
         on(CONFIG.socketType.GETSOCKETMSG,this,function (data) {
             console.log("==GETSTOREINFO===")
             console.log("==GETSTOREINFO===")
@@ -456,6 +456,9 @@ class PageContainer extends React.Component {
             //关门失败，上传警报
             //关门失败，上传警报
             this.failCloseDoor();
             this.failCloseDoor();
         }
         }
+        //写死的数据
+        this.tempLogout();
+
     }
     }
 
 
     playAlarmMusic(){
     playAlarmMusic(){
@@ -489,7 +492,7 @@ class PageContainer extends React.Component {
     showOpenDoorPage(){
     showOpenDoorPage(){
         console.log("showOpenDoorPage")
         console.log("showOpenDoorPage")
         this.setState({
         this.setState({
-            showPage : showPage[initPage],
+            showPage : showPage[7],
             showClock : true
             showClock : true
         })
         })
     }
     }