*) 调整首页值班访问接口

src/consts/urlConsts.js

@@ -143,10 +143,12 @@ export const FscSerUrl = {
 
   getxuncountActionUrl: completePrefix(baseURI, 'bank/alarm/mobile/getxuncount'),
   rightTopChartDataUrl: completePrefix(baseURI, 'bank/inspection/rightTopChart?companyId={companyId}'),
-  middleHeaderDataUrl: completePrefix(baseURI, 'bank/duty/middleHeader'),
-  middleTableListUrl: completePrefix(baseURI, 'bank/duty/middleTableList?pageNumber={page}&pageSize={size}'),
   bottomTableDataUrl: completePrefix(baseURI, 'bank/inspection/bottomTable'),
 
+  //值班信息模块
+  middleHeaderDataUrl: completePrefix(baseURI, 'duty/middleHeader'),
+  middleTableListUrl: completePrefix(baseURI, 'duty/middleTableList?pageNumber={page}&pageSize={size}'),
+
   middleHeaderAction1:completePrefix(baseURI, 'bank/inspection/patrolPlanList?start={start}&end={end}&deptId={depId}&deptName={deptName}'),
   getporintAction:completePrefix(baseURI, 'bank/inspection/getporint?pointid={pointid}'),
   // 告警数据

src/view/bank/3dview/indexCharts/rightChartChild/middleTable.js

@@ -8,8 +8,8 @@ import { middleTabletAction, middleHeaderAction } from '../../../../../services/
 const eventConnect = Connect.eventConnect;
 const AmosConfig = endConf.AmosConfig;
 
-const imgs = {"技术岗":"/src/assets/indexChart/work.png",
-              "业务岗":"/src/assets/indexChart/service.png"}
+const imgs = {"二线技术":"/src/assets/indexChart/work.png",
+              "二线业务":"/src/assets/indexChart/service.png"}
 
 @eventConnect
 class MiddleTable extends Component {
@@ -75,22 +75,23 @@ class MiddleTable extends Component {
 
   render() {
     const { headerData, dataList, time, selectTime } = this.state;
-    let leader = headerData.leader || {};
-    let second = headerData.second || [];
+    let leader = (headerData.leader && headerData.leader[0]) || {};
+    let secondTier = headerData.secondTier || [];
     return (
         <div className='table-middle'>
           <div className='leaderBox'>
             <div className='leader'>
               <span className='itemLabel'>带班领导</span>
-              <span className='itemValue'>{leader.name || ''}{ leader.phone || ''}</span>
+              <span className='itemValue'>{leader.dutyName || ''}&nbsp;{ leader.mobile || ''}</span>
             </div>
             <div className='secondLine'>
               <span className='itemLabel'>二线人员</span>
               <div className='itemList'>
-                { second && second.map(e => {
-                  return (<div key={e.name + e.phone}>
-                    <img src={ imgs[e.post] }/><span style={{color:'#05ddf9'}}>{e.post}</span>&emsp;&emsp;
-                    {e.name} &emsp; { e.phone }
+                { secondTier && secondTier.map(e => {
+                  let postName = e.postName.replace('二线', '') + '岗';
+                  return (<div key={e.dutyName + e.phone}>
+                    <img src={ imgs[e.postName] }/><span style={{color:'#05ddf9'}}>{postName}</span>&emsp;&emsp;
+                    {e.dutyName} &emsp; { e.mobile }
                   </div>)
                 }) }
               </div>
@@ -125,9 +126,9 @@ class MiddleTable extends Component {
               { dataList && dataList.map((d,index) => {
                 return (
                   <Row className='table-header-row content' key={index}>
-                    <Col span={8}>{ d.post }</Col>
-                    <Col span={8}>{ d.name }</Col>
-                    <Col span={8}>{ d.phone }</Col>
+                    <Col span={8}>{ d.postName }</Col>
+                    <Col span={8}>{ d.dutyName }</Col>
+                    <Col span={8}>{ d.mobile }</Col>
                   </Row>
                 )
               }) }

src/view/bank/3dview/indexCharts/rightCharts.js

@@ -20,7 +20,7 @@ class RightCharts extends Component {
     };
   }
 
-  componentDidMount() {}
+  componentDidMount() { }
 
   componentWillUnmount() {
   }
@@ -34,13 +34,13 @@ class RightCharts extends Component {
     return (
       <div className="chart-content">
         {
-          chartsViewFlag === 'patrolMsg'?<div className='patrolMsg'>
+          chartsViewFlag === 'patrolMsg' ? <div className='patrolMsg'>
             <div className='point'>
               <div className='title'>
                 <span className='titleLeft'>
                   <span className='titleIcon' style={{ background: 'url("/src/assets/indexChart/point.png") no-repeat center center/100% 100%' }}></span>
                   今日巡检计划执行情况</span>
-                  <span className='titleRight'>{ now }</span>
+                <span className='titleRight'>{now}</span>
               </div>
               <div className='chartBody'>
                 <TopChart curCompanyId={this.props.currentCode} currentCode={this.props.currentCode} patrolDetailView={this.props.patrolDetailView} />
@@ -51,27 +51,27 @@ class RightCharts extends Component {
                 <span className='titleLeft'>
                   <span className='titleIcon' style={{ background: 'url("/src/assets/indexChart/point.png") no-repeat center center/100% 100%' }}></span>
                   值班信息</span>
-                <span className='titleRight'>{ now }</span>
+                <span className='titleRight'>{now}</span>
               </div>
               <div className='chartBody'>
-                  <MiddleTable/>
+                <MiddleTable />
               </div>
             </div>
-          </div>:''
+          </div> : ''
         }
 
         {
-          chartsViewFlag === 'applyMsg'?<div className='business'>
+          chartsViewFlag === 'applyMsg' ? <div className='business'>
             <div className='title'>
               <span className='titleLeft'>
                 <span className='titleIcon' style={{ background: 'url("/src/assets/indexChart/point.png") no-repeat center center/100% 100%' }}></span>
                 支付业务累计数据</span>
-              <span className='titleRight'>{ now }</span>
+              <span className='titleRight'>{now}</span>
             </div>
             <div className='chartBody'>
-              <BottomTable orgCode={this.props.currentCode}/>
+              <BottomTable orgCode={this.props.currentCode} />
             </div>
-          </div>:''
+          </div> : ''
         }
       </div>
     );