Skip to content

M
max_android_panel
Commit 1fd1a5ef by yaxiLiuu
Options

Merge branch 'dev' of git.mjitech.com:zhangxin/max_android_panel into dev

parents f1338701 77528d08
Showing with 411 additions and 129 deletions
client/actions/getTroubles.js
...@@ -36,18 +36,6 @@ let json = { ...@@ -36,18 +36,6 @@ let json = {
"errorCode": null, "errorCode": null,
"type": "OP", "type": "OP",
"files": [ "files": [
{
"id": 16,
"filePath": "/tmp/2016-08-16/1471329685902.jpg"
},
{
"id": 17,
"filePath": "/sku/0/0/427/1471329704482.jpg"
},
{
"id": 18,
"filePath": "/sku/0/0/426/1471330380712.jpg"
}
], ],
"parentProblemName": "机械故障", "parentProblemName": "机械故障",
"subProblemName": "其他问题111" "subProblemName": "其他问题111"
......
client/components/CommonComponent/ClockComponent/ClockComponent.jsx
import React from 'react'; import React from 'react';
require('./index.css'); require('./index.css');
const initCount = -1;
export default class ClockComponent extends React.Component{ export default class ClockComponent extends React.Component{
constructor(props){ constructor(props){
super(props); super(props);
this.state = { this.state = {
time : 60 count : initCount,
timer : null
};
this.time = 1000;
this.beginCountBack = this.beginCountBack.bind(this)
}
componentWillMount(){
console.log("componentWillMount")
let {totalTime} = this.props;
if(totalTime && totalTime > 0){
this.setState({
count : totalTime
},()=>{
this.beginCountBack()
})
}
}
componentWillReceiveProps(){
console.log("componentWillReceiveProps")
} }
componentWillUnmount(){
console.log("componentWillUnmount")
window.clearTimeout(this.state.timer);
this.setState({
timer : null,
count : initCount
})
}
beginCountBack(){
let {callback} = this.props;
let that = this;
console.log("timer ",this.state.timer);
if(!this.state.timer && this.state.count >= 0){
let count = this.state.count - 1;
console.log("count ",count," ",this.state.count);
this.state.timer = window.setTimeout(()=>{
if(count >= 0){
window.clearTimeout(that.state.timer);
that.setState({
timer : null,
count : count
},()=>{
that.beginCountBack();
})
}else{
//倒计时结束
window.clearTimeout(that.state.timer);
that.setState({
timer : null
},()=>{
console.log("倒计时结束");
callback();
})
}
},this.time)
}
} }
render(){ render(){
...@@ -14,7 +75,7 @@ export default class ClockComponent extends React.Component{ ...@@ -14,7 +75,7 @@ export default class ClockComponent extends React.Component{
return( return(
<div className={"clockComponent font32"} style={props.style}> <div className={"clockComponent font32"} style={props.style}>
<img className={"clockIcon"} src={UTILPATH.localImg.clockIcon} alt=""/> <img className={"clockIcon"} src={UTILPATH.localImg.clockIcon} alt=""/>
<span className={"clockTime"}>{this.state.time}s</span> <span className={"clockTime"}>{this.state.count}s</span>
</div> </div>
) )
} }
......
client/components/CommonComponent/PopupComponent/PopupComponent.jsx
...@@ -11,10 +11,7 @@ export default class PopupComponent extends React.Component{ ...@@ -11,10 +11,7 @@ export default class PopupComponent extends React.Component{
let {popupInfo} = props; let {popupInfo} = props;
let arrButton = popupInfo.popupButtons ? popupInfo.popupButtons : [] let arrButton = popupInfo.popupButtons ? popupInfo.popupButtons : []
let dom = arrButton.map((a,k)=>{ let dom = arrButton.map((a,k)=>{
return ( return a;
a.option && a.option instanceof Function ? <div key={"popuoButton"+k} className={"defaultPopupButton"} onClick={()=>a.option()}>{a.text}</div> :
<div key={"popuoButton"+k} className={"defaultPopupButton"}>{a.text}</div>
)
}); });
return ( return (
<div className={"defaultPopup col333"}> <div className={"defaultPopup col333"}>
......
client/components/TroubleComponent/TroubleItemComponent/TroubleItemComponent.jsx
...@@ -63,10 +63,10 @@ export default class TroubleItemComponent extends React.Component{ ...@@ -63,10 +63,10 @@ export default class TroubleItemComponent extends React.Component{
</div> </div>
<div className={"itemControl rel"}> <div className={"itemControl rel"}>
<div className={"plusImg controlBox "}> <div className={"plusImg controlBox "} onClick={()=>props.showQrcode(item.errorCode)}>
<img src={UTILPATH.localImg.plusIcon} alt=""/> <img src={UTILPATH.localImg.plusIcon} alt=""/>
</div> </div>
<div className={"refreshImg controlBox "}> <div className={"refreshImg controlBox "} onClick={()=>props.getRefreshImg(item.id,item.type)}>
<img src={UTILPATH.localImg.refreshIcon} alt=""/> <img src={UTILPATH.localImg.refreshIcon} alt=""/>
</div> </div>
</div> </div>
......
client/components/TroubleComponent/TroubleItemComponent/index.css
.editUploadItem .newTroubleContent .problemCategory{ .troubleItemComponent{
width: 1396px;
height: 608px;
border: 1px solid #e5e5e5;
background-color: #ffffff;
border-radius: 20px;
overflow: hidden;
padding: 42px 45px 0 45px;
position: relative;
}
.troubleItemComponent .border_e5{
border: 2px solid #e5e5e5;
border-radius: 10px;
}
.troubleItemComponent .border_dashed_e5{
border: 2px dashed #e5e5e5;
border-radius: 10px;
}
.troubleItemComponent .rel{
position: relative;
padding-left: 44px;
}
.troubleItemComponent .itemText{
font-weight: bold;
} }
.editUploadItem .newTroubleContent .DetailProblem{} .troubleItemComponent .itemWrongInfo{
.editUploadItem .newTroubleRemark{ height: 86px;
margin-top: 4px; position: relative;
} }
.editUploadItem .newTroubleRemark .startIcon{ .troubleItemComponent .itemWrongInfo>p{
float: left; line-height: 32px;
top: 50%;
transform: translateY(-50%);
position: absolute;
} }
.editUploadItem .newTroubleRemark .remarkContent{ .troubleItemComponent .star{
float: left; display: inline-block;
position: absolute;
top: 50%;
transform: translateY(-50%);
left: 0;
}
.troubleItemComponent .jugdeQuestion{
height: 61px;
line-height: 61px;
margin-bottom: 30px;
}
.troubleItemComponent .jugdeQuestion .questionBox{
height: 100%;
width: 161px;
text-align: center;
display: inline-block;
margin-left: 30px;
}
.troubleItemComponent .jugdeQuestion .questionBox.active{
border-color: #26ce61;
}
.troubleItemComponent .itemTextArea{
height: 198px;
margin-bottom: 29px;
}
.troubleItemComponent .itemTextAreaBox{
width: 1250px; width: 1250px;
height: 100%;
display: inline-block;
background-color: #f2f2f2;
padding: 20px;
overflow: hidden;
}
.itemTextAreaBoxs{
background-color: #f2f2f2;
border: none;
resize: none;
width: 100%;
height: 100%;
line-height: 40px;
text-align: justify;
}
.troubleItemComponent .itemTextArea .itemPlayceHolder{
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%,-50%);
} }
.editUploadItem .newTroubleRemark .remarkContent .editIcon{ .troubleItemComponent .itemTextArea .itemTextEdit{
text-align: right; text-align: right;
padding: 13px 10px; position: absolute;
font-size: 24px; line-height: 57px;
color: #ff7860; top: -57px;
right: 46px;
}
.troubleItemComponent .itemControl .controlBox{
width: 90px;
height: 90px;
position: relative;
display: inline-block;
margin-right: 30px;
}
.troubleItemComponent .itemControl .controlBox>img{
position: absolute;
width: 90px;
height: 90px;
top: 50%;
left: 50%;
transform: translate(-50%,-50%);
}
.troubleItemComponent .finishBox{
display: none;
position: absolute;
top: 0;
right: 0;
width: 0;
height: 0;
border-top: 63px solid #26ce61;
border-bottom: 63px solid transparent;
border-left: 63px solid transparent;
border-right: 63px solid #26ce61;
} }
.editUploadItem .newTroubleRemark .remarkContent .remarkText{ .troubleItemComponent .finishBox .finishText{
height: 198px; position: absolute;
border: 1px solid #e5e5e5;
border-radius: 10px;
background-color: #f2f2f2;
line-height: 198px;
text-align: center; text-align: center;
font-size: 24px; width: 178px;
color: #999999; height: 178px;
line-height: 126px;
left: -89px;
top: -89px;
transform: rotate(45deg);
} }
.editUploadItem .damageImgs .uploadImgRight{ .troubleItemComponent.finish{
float: left; border: 3px solid #26ce61;
} }
.editUploadItem .damageImgs .operationLeft{ .troubleItemComponent.finish .finishBox{
float: left; display: block;
} }
client/containers/PageContainer/PageContainer.jsx
...@@ -14,6 +14,8 @@ import OtherQuestionContainer from '../OtherQuestionContainer/OtherQuestionConta ...@@ -14,6 +14,8 @@ import OtherQuestionContainer from '../OtherQuestionContainer/OtherQuestionConta
import HomeContainer from '../HomeContainer/HomeContainer' import HomeContainer from '../HomeContainer/HomeContainer'
import FinishAskContainer from '../FinishAskContainer/FinishAskContainer' import FinishAskContainer from '../FinishAskContainer/FinishAskContainer'
import ChooseTaskContainer from '../ChooseTaskContainer/ChooseTaskContainer' import ChooseTaskContainer from '../ChooseTaskContainer/ChooseTaskContainer'
import Button from '../../components/CommonComponent/ButtonComponent/ButtonComponent';
import Clock from '../../components/CommonComponent/ClockComponent/ClockComponent'
require('./index.css') require('./index.css')
...@@ -35,7 +37,7 @@ class PageContainer extends React.Component { ...@@ -35,7 +37,7 @@ class PageContainer extends React.Component {
super(props); super(props);
// UTILPATH.socket.getIp(); // UTILPATH.socket.getIp();
this.state = { this.state = {
showPage : showPage[4], showPage : showPage[1],
lastPage : '', lastPage : '',
page : null, page : null,
popupInfo : defaultPopupInfo, popupInfo : defaultPopupInfo,
...@@ -48,11 +50,15 @@ class PageContainer extends React.Component { ...@@ -48,11 +50,15 @@ class PageContainer extends React.Component {
this.showQrCode = this.showQrCode.bind(this); this.showQrCode = this.showQrCode.bind(this);
this.saveLastPage = this.saveLastPage.bind(this); this.saveLastPage = this.saveLastPage.bind(this);
this.goBack = this.goBack.bind(this); this.goBack = this.goBack.bind(this);
this.handleTouch = this.handleTouch.bind(this);
this.beginCountBack = this.beginCountBack.bind(this);
this.endCountBack = this.endCountBack.bind(this);
this.showAlarm = this.showAlarm.bind(this);
this.maxCountBackTime = 300; this.maxCountBackTime = 300;
this.count = 1000; this.count = 1000;
this.countbackTimer = null; this.countbackTimer = null;
this.countBackTime = -1;
} }
componentWillMount() { componentWillMount() {
...@@ -73,9 +79,55 @@ class PageContainer extends React.Component { ...@@ -73,9 +79,55 @@ class PageContainer extends React.Component {
componentWillUnmount(){ componentWillUnmount(){
} }
//开始倒计时,看有没有操作，只是在整个开门过程中才监听
beginCountBack(){
this.countBackTime = this.maxCountBackTime;
clearTimeout(this.countbackTimer);
this.countbackTimer = null;
this.countBack.bind(this)();
}
endCountBack(){
this.countbackTimer = -1;
clearTimeout(this.countbackTimer);
this.countbackTimer = null;
}
countBack(){ countBack(){
if(!this.countbackTimer && this.countBackTime >= 0){
this.countBackTime--;
this.countbackTimer = window.setTimeout(()=>{
if(this.countBackTime > 0){
clearTimeout(this.countbackTimer);
this.countbackTimer = null;
this.countBack();
}else{
//超过300s未点击，进入异常状态
clearTimeout(this.countbackTimer);
this.countbackTimer = null;
let btnDom = <Button key={"pagecountBack1"} style={{'width':'260px'}} text={"关闭"} option={this.beginCountBack}/>
let clockDom = <Clock key={"pagecountBack2"} totalTime={60}
style={{'width':'260px','marginLeft':'30px','borderRadius':'10px'}}
callback={this.showAlarm}
/>
this.showPopup({
popupText : '您是否还在店铺准备执行您的任务',
popupButtons:[btnDom,clockDom]
})
}
},this.count);
}
} }
//弹出警告弹窗，并报警
showAlarm(){
console.log("showAlarm");
}
hidePopup(){ hidePopup(){
this.setState({ this.setState({
...@@ -172,13 +224,13 @@ class PageContainer extends React.Component { ...@@ -172,13 +224,13 @@ class PageContainer extends React.Component {
} }
handleTouch(){ handleTouch(){
this.countBackTime = this.maxCountBackTime;
} }
render() { render() {
let {state} = this.props; let {state} = this.props;
return ( return (
<div className={"pageContainer "} style={this.state.pageStyle} onTouch=""> <div className={"pageContainer "} style={this.state.pageStyle} onTouchStart={()=>this.handleTouch()}>
<PopupComponent popupInfo={this.state.popupInfo} /> <PopupComponent popupInfo={this.state.popupInfo} />
{this.getPages()} {this.getPages()}
......
client/containers/Qrcode/Qrcode.jsx
import React from 'react'; import React from 'react';
import ReactQrCode from 'qrcode.react' import ReactQrCode from 'qrcode.react'
import HeaderComponent from '../../components/CommonComponent/HeaderComponent/HeaderComponent'
require('./index.css'); require('./index.css');
export default class Qrcode extends React.Component{ export default class Qrcode extends React.Component{
constructor(props){ constructor(props){
super(props); super(props);
this.state = { this.getOtherHeader = this.getOtherHeader.bind(this);
url : 'http://www.baidu.com'
} }
getOtherHeader(){
let {goBack} = this.props;
return <div className={"otherHeader font32 clearfix"}>
<div className={"fl colfff"} onClick={()=>goBack()}>
<i className={"iconfont middle icon font58 icon-circle-left circleIcon"}></i>
<span className={"middle"}>添加照片</span>
</div>
</div>
} }
render(){ render(){
return( return(
<div>
<HeaderComponent
showHeader={CONFIG.headerStatus[2]}
>
{this.getOtherHeader()}
</HeaderComponent>
<div className="qrCodeContainer"> <div className="qrCodeContainer">
<div className={"qrcode"}> <div className={"qrcode"}>
<ReactQrCode value={this.state.url} size={312}/> <ReactQrCode value={this.props.url || ''} size={312}/>
</div> </div>
<div className={"qrcodeText font32"}> <div className={"qrcodeText font32"}>
请用手机微信扫一扫上方二维码 请用手机微信“扫一扫”上方二维码进行图片上传
</div> </div>
</div> </div>
</div>
) )
} }
} }
client/containers/TroubleContainer/index.css
.troubleContainer{ .troubleContainers{
width: 100%;
height: 100%;
}
.troubleContainers.backfff{
background-color: #ffffff;
}
.troubleContent{
padding-left: 30px; padding-left: 30px;
} }
.troubleContainer .troubleText{ .troubleContent .troubleText{
height: 100px; height: 100px;
display: table-cell; display: table-cell;
vertical-align: bottom; vertical-align: bottom;
} }
.troubleContainer .troubleBox{ .troubleContent .troubleBox{
margin: 20px 0; margin: 20px 0;
} }
.troubleContainer .troubleBtnBox{ .troubleContent .troubleBtnBox{
height: 80px; height: 80px;
width: 100%; width: 100%;
text-align: right; text-align: right;
padding-right: 30px; padding-right: 30px;
} }
.troubleContainer .troubleBtn{ .troubleContent .troubleBtn{
width: 413px; width: 413px;
height: 100%; height: 100%;
display: inline-block; display: inline-block;
...@@ -24,12 +31,3 @@ ...@@ -24,12 +31,3 @@
background-color: #ff7860; background-color: #ff7860;
border-radius: 10px; border-radius: 10px;
} }
.selectContainer{
text-align: center;
}
.selectButtons{
display: flex;
flex-direction: column;
align-items:center;
}
\ No newline at end of file
client/reducers/index.js
...@@ -4,13 +4,16 @@ import storeInfo from './store' ...@@ -4,13 +4,16 @@ import storeInfo from './store'
import scanBarCodeContainer from './scanBarCodeContainer' import scanBarCodeContainer from './scanBarCodeContainer'
import otherQuestion from './otherQuestion' import otherQuestion from './otherQuestion'
import userInfo from './user' import userInfo from './user'
import refreshImg from './refreshImg'
export default combineReducers({ export default combineReducers({
troubleList, troubleList,
storeInfo, storeInfo,
scanBarCodeContainer, scanBarCodeContainer,
otherQuestion, otherQuestion,
userInfo userInfo,
refreshImg
}) })
client/util/image.js
...@@ -4,6 +4,7 @@ import addIcon from '../image/addIcon.png'; ...@@ -4,6 +4,7 @@ import addIcon from '../image/addIcon.png';
import refreshIcon from '../image/refresh.png'; import refreshIcon from '../image/refresh.png';
import plusIcon from '../image/plusIcon.png'; import plusIcon from '../image/plusIcon.png';
import clockIcon from '../image/clock.png'; import clockIcon from '../image/clock.png';
import breakImg from '../image/breakImg.png';
const localHost = 'http://localhost:7788'; const localHost = 'http://localhost:7788';
const devHost = 'http://test.mjitech.com'; const devHost = 'http://test.mjitech.com';
...@@ -77,6 +78,6 @@ const handleImgLoad = (ref)=>{ ...@@ -77,6 +78,6 @@ const handleImgLoad = (ref)=>{
return style; return style;
} }
const localImg = {headlogo,defaultImg,addIcon,refreshIcon,plusIcon,clockIcon} const localImg = {headlogo,defaultImg,addIcon,refreshIcon,plusIcon,clockIcon,breakImg}
module.exports = {localHost,devHost,masterHost,getPic,handleImgError,handleImgLoad,localImg}; module.exports = {localHost,devHost,masterHost,getPic,handleImgError,handleImgLoad,localImg};
\ No newline at end of file
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