Commit 889dcfe7 by wujiabao

增加端口和版本查询

parent d6463c2d
......@@ -6,4 +6,5 @@ static
.idea
package-lock.json
.map
.vscode
......@@ -60,8 +60,15 @@ export default class HeaderComponent extends React.Component{
},this.countbackTime)
}
})
if(this.isShowVersionAndPort()){
this.props.changePages(CONFIG.showPage[8888])
}
}
//判断是否显示版本号和端口号页面
isShowVersionAndPort () {
return true
}
getHomeHeader(){
let headerInfo = this.props.headerInfo;
let {storeInfo,userInfo,taskInfo} = headerInfo;
......
......@@ -2,5 +2,6 @@ import swiperContainers from './swiperContainer'
import showPage from './showPage'
import socketType from './socketType'
import taskErrorType from './taskErrorType'
import machineInfo from './machineInfo'
module.exports = {swiperContainers,...showPage,socketType,taskErrorType}
\ No newline at end of file
module.exports = {swiperContainers,...showPage,socketType,taskErrorType , machineInfo }
\ No newline at end of file
// {}
const requestInfo = {
domainPort : '7788',
domainIp : '192.168.10.'
}
module.exports = requestInfo;
\ No newline at end of file
......@@ -18,6 +18,7 @@ const showPage = {
14 : 'Question', //二期问题反馈页面
141 : 'Question1', //二期问题反馈页面
15 : 'BoxRecoverySkus', //二期回收箱回收
8888 : 'MachineInfo'
};
const taskSchedule = { //任务进度序列号,后台给
1: showPage[5],
......
......@@ -107,6 +107,7 @@ export default class HomePageContainer extends React.Component{
showHeader={CONFIG.headerStatus[1]}
headerInfo={headerInfo}
showLogoutPopup={this.showLogoutPopup}
changePages = {this.props.changePages}
/>
{
props.closeDoor ? <div className={"homeContainer"} >
......
import React from 'react';
import HeaderComponent from '../../components/CommonComponent/HeaderComponent/HeaderComponent'
import Button from '../../components/CommonComponent/ButtonComponent/ButtonComponent';
export default class MachineInfo extends React.Component {
constructor(props){
super(props);
this.state = {
}
}
render(){
let props = this.props;
let {headerInfo , changePages} = props;
return(
<div>
<HeaderComponent
showHeader={CONFIG.headerStatus[1]}
headerInfo={headerInfo}
/>
<div className="machineInfo" style={{textAlign:'center', marginTop:'3rem'}}>
<p>当前版本号 {CURVERSION}</p>
<p>当前端口号 {CONFIG.machineInfo.domainPort} </p>
<Button text={'首页'} btnContainer={'colfff font30'} style={{background:'#ff7860',marginLeft:'50%',transform:' translate(-50%)',marginTop:'.5rem'}} option={()=>changePages(CONFIG.showPage[13])} />
</div>
</div>
)
}
}
\ No newline at end of file
......@@ -42,6 +42,7 @@ import AllClassify from '../AllClassifyContainer/AllClassifyContainer'
import {willCloseDoor,closeDoorSuccess} from '../../actions/chooseTaskContainer'
import {sendMsg} from '../../util/socket'
import PopModel from '../../components/CommonComponent/PopupComponent/PopupChildComponent'
import MachineInfo from '../MachineInfo/MachineInfo'
/*二期引用 end*/
import {on,remove} from '../../util/event';
......@@ -1094,6 +1095,12 @@ class PageContainer extends React.Component {
willCloseDoor={async ()=>{return await dispatch(willCloseDoor(commonInfo,true))}}
/>;
break;
case showPage[8888] :
pages = <MachineInfo
headerInfo = {commonInfo}
changePages={(data)=>this.changePages(data)}
/>
break;
case showPage[11]:
pages = <ReplenishContainer
headerInfo = {commonInfo}
......
......@@ -2,7 +2,7 @@ import fetch from 'isomorphic-fetch';
let domain = "http://192.168.10.63:7780";
const domainPort = "7788";
const domainPort = CONFIG.machineInfo.domainPort;
const myHeaders = new Headers({
// 'Access-Control-Allow-Origin': '*',
// 'Content-Type': 'text/plain;charset=UTF-8',
......
import {emit, on , remove} from './event'
import myLogger from './logger'
let domainIp = '192.168.10.';
let domainIp = CONFIG.machineInfo.domainIp;
const domainPort = "7788";
const domainPort = CONFIG.machineInfo.domainPort;
const socket = {};
......
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