Skip to content

M
max_android_panel
Commit 77528d08 by Zhang Xin
Options

找回代码

parent 3a2942b8
Showing with 167 additions and 61 deletions
client/actions/getTroubles.js
......@@ -36,18 +36,6 @@ let json = {
"errorCode": null,
"type": "OP",
"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": "机械故障",
"subProblemName": "其他问题111"
......
client/components/TroubleComponent/TroubleItemComponent/TroubleItemComponent.jsx
......@@ -63,10 +63,10 @@ export default class TroubleItemComponent extends React.Component{
</div>
<div className={"itemControl rel"}>
<div className={"plusImg controlBox "}>
<div className={"plusImg controlBox "} onClick={()=>props.showQrcode(item.errorCode)}>
<img src={UTILPATH.localImg.plusIcon} alt=""/>
</div>
<div className={"refreshImg controlBox "}>
<div className={"refreshImg controlBox "} onClick={()=>props.getRefreshImg(item.id,item.type)}>
<img src={UTILPATH.localImg.refreshIcon} alt=""/>
</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{}
.editUploadItem .newTroubleRemark{
margin-top: 4px;
.troubleItemComponent .itemWrongInfo{
height: 86px;
position: relative;
}
.editUploadItem .newTroubleRemark .startIcon{
float: left;
.troubleItemComponent .itemWrongInfo>p{
line-height: 32px;
top: 50%;
transform: translateY(-50%);
position: absolute;
}
.editUploadItem .newTroubleRemark .remarkContent{
float: left;
.troubleItemComponent .star{
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;
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;
padding: 13px 10px;
font-size: 24px;
color: #ff7860;
position: absolute;
line-height: 57px;
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{
height: 198px;
border: 1px solid #e5e5e5;
border-radius: 10px;
background-color: #f2f2f2;
line-height: 198px;
.troubleItemComponent .finishBox .finishText{
position: absolute;
text-align: center;
font-size: 24px;
color: #999999;
width: 178px;
height: 178px;
line-height: 126px;
left: -89px;
top: -89px;
transform: rotate(45deg);
}
.editUploadItem .damageImgs .uploadImgRight{
float: left;
.troubleItemComponent.finish{
border: 3px solid #26ce61;
}
.editUploadItem .damageImgs .operationLeft{
float: left;
.troubleItemComponent.finish .finishBox{
display: block;
}
client/containers/PageContainer/PageContainer.jsx
......@@ -37,7 +37,7 @@ class PageContainer extends React.Component {
super(props);
// UTILPATH.socket.getIp();
this.state = {
showPage : showPage[4],
showPage : showPage[1],
lastPage : '',
page : null,
popupInfo : defaultPopupInfo,
......
client/containers/Qrcode/Qrcode.jsx
import React from 'react';
import ReactQrCode from 'qrcode.react'
import HeaderComponent from '../../components/CommonComponent/HeaderComponent/HeaderComponent'
require('./index.css');
export default class Qrcode extends React.Component{
constructor(props){
super(props);
this.state = {
url : 'http://www.baidu.com'
this.getOtherHeader = this.getOtherHeader.bind(this);
}
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(){
return(
<div>
<HeaderComponent
showHeader={CONFIG.headerStatus[2]}
>
{this.getOtherHeader()}
</HeaderComponent>
<div className="qrCodeContainer">
<div className={"qrcode"}>
<ReactQrCode value={this.state.url} size={312}/>
<ReactQrCode value={this.props.url || ''} size={312}/>
</div>
<div className={"qrcodeText font32"}>
请用手机微信扫一扫上方二维码
请用手机微信“扫一扫”上方二维码进行图片上传
</div>
</div>
</div>
)
}
}
client/containers/TroubleContainer/index.css
.troubleContainer{
.troubleContainers{
width: 100%;
height: 100%;
}
.troubleContainers.backfff{
background-color: #ffffff;
}
.troubleContent{
padding-left: 30px;
}
.troubleContainer .troubleText{
.troubleContent .troubleText{
height: 100px;
display: table-cell;
vertical-align: bottom;
}
.troubleContainer .troubleBox{
.troubleContent .troubleBox{
margin: 20px 0;
}
.troubleContainer .troubleBtnBox{
.troubleContent .troubleBtnBox{
height: 80px;
width: 100%;
text-align: right;
padding-right: 30px;
}
.troubleContainer .troubleBtn{
.troubleContent .troubleBtn{
width: 413px;
height: 100%;
display: inline-block;
......@@ -24,12 +31,3 @@
background-color: #ff7860;
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'
import scanBarCodeContainer from './scanBarCodeContainer'
import otherQuestion from './otherQuestion'
import userInfo from './user'
import refreshImg from './refreshImg'
export default combineReducers({
troubleList,
storeInfo,
scanBarCodeContainer,
otherQuestion,
userInfo
userInfo,
refreshImg
})
client/util/image.js
......@@ -4,6 +4,7 @@ import addIcon from '../image/addIcon.png';
import refreshIcon from '../image/refresh.png';
import plusIcon from '../image/plusIcon.png';
import clockIcon from '../image/clock.png';
import breakImg from '../image/breakImg.png';
const localHost = 'http://localhost:7788';
const devHost = 'http://test.mjitech.com';
......@@ -77,6 +78,6 @@ const handleImgLoad = (ref)=>{
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};
\ 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