更改首页值班

src/consts/urlConsts.js

@@ -146,8 +146,8 @@ export const FscSerUrl = {
   bottomTableDataUrl: completePrefix(baseURI, 'bank/inspection/bottomTable'),
 
   //值班信息模块
-  middleHeaderDataUrl: completePrefix(baseURI, 'duty/middleHeader'),
-  middleTableListUrl: completePrefix(baseURI, 'duty/middleTableList?pageNumber={page}&pageSize={size}'),
+  middleHeaderDataUrl: completePrefix(baseURI, 'duty/middleHeader?orgCode={orgCode}'),
+  middleTableListUrl: completePrefix(baseURI, 'duty/middleTableList?orgCode={orgCode}'),
 
   middleHeaderAction1:completePrefix(baseURI, 'bank/inspection/patrolPlanList?start={start}&end={end}&deptId={depId}&deptName={deptName}'),
   getporintAction:completePrefix(baseURI, 'bank/inspection/getporint?pointid={pointid}'),

src/services/3dService.js

@@ -2,7 +2,7 @@ import formatUrl from 'amos-processor/lib/utils/urlFormat';
 import * as helper from 'base-r3d/lib/utils/helper';
 // import { helper } from 'amos-3d/lib/threeTools';
 import { FscSerUrl, FasSerUrl } from './../consts/urlConsts';
-import { commonGet, commonPost, singleFetch } from './../utils/request';
+import { commonGet, commonPost, singleFetch, getOrgCode} from './../utils/request';
 import { baseURI } from 'amos-processor/lib/config/endconf';
 
 //---------------- 加载模型、解析模型json -----------
@@ -273,15 +273,17 @@ export const rightTopChartAction = (companyId) => {
  * 查询主页一级值班信息
  * @param {*} id
  */
-export const middleTabletAction = ( page, size ) => {
-  return commonGet(formatUrl(FscSerUrl.middleTableListUrl,{ page, size }));
+export const middleTabletAction = () => {
+  let orgCode = getOrgCode();
+  return commonGet(formatUrl(FscSerUrl.middleTableListUrl, { orgCode }));
 };
 /**
  * 查询主页二级值班信息
  * @param {*} id
  */
-export const middleHeaderAction = ( page, size ) => {
-  return commonGet(formatUrl(FscSerUrl.middleHeaderDataUrl));
+export const middleHeaderAction = () => {
+  let orgCode = getOrgCode();
+  return commonGet(formatUrl(FscSerUrl.middleHeaderDataUrl,  { orgCode }));
 };
 /**
  * 查询主页支付累计数据

src/utils/request.js

@@ -7,6 +7,7 @@ import sysConsts from 'amos-processor/lib/config';
 import payload from './payload';
 
 const lsTool = Store.lsTool;
+const orgCode = 'orgCode';
 
 const defaultPageable = {
   page: 0,
@@ -20,8 +21,8 @@ const defaultHeaders = {
 
 /**
  * 删除全局变量requests中的地址
- * @param {*} url 
- * @param {*} method 
+ * @param {*} url
+ * @param {*} method
  */
 const delRequest = (url, method) => {
   if (window.requests && window.requests.length > 0) {
@@ -60,7 +61,7 @@ const getWithCookie = (url) => {
 
 const commonGet = (url) => {
   window.setLoading && window.setLoading(true);
-  return amosRequest(url, { 
+  return amosRequest(url, {
     timeout: 10000000 , method: 'GET',
     headers: compleHeaders(),
     reject(error){
@@ -140,4 +141,12 @@ export function setUserId(userId){
   return lsTool.write(sysConsts.userId, userId);
 }
 
+export function setOrgCode(orgCode){
+  return lsTool.write(orgCode, orgCode);
+}
+
+export function getOrgCode(){
+  return lsTool.read(orgCode);
+}
+
 export { amosRequest, commonGet, getWithCookie, singleFetch, commonPost, commonPut, commonDelete, convertDatalist, buildPageable, formatUrl };

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

@@ -11,6 +11,9 @@ const AmosConfig = endConf.AmosConfig;
 const imgs = {"二线技术":"/src/assets/indexChart/work.png",
               "二线业务":"/src/assets/indexChart/service.png"}
 
+const time = {'早班': '08:30-20:30',
+              '晚班': '20:30-次日08:30'}
+
 @eventConnect
 class MiddleTable extends Component {
   constructor(props) {
@@ -22,9 +25,7 @@ class MiddleTable extends Component {
     this.state = {
       headerData: {},
       dataList: [],
-      total: 0,//总页数
-      time: ['08:30-20:30','20:30-次日08:30'],
-      selectTime: '08:30-20:30',
+      arrangeName: null
     };
   }
 
@@ -41,40 +42,13 @@ class MiddleTable extends Component {
   }
 
   refreshDataList = () => {
-    middleTabletAction(this.pageConfig.current,this.pageConfig.pageSize).then(data => {
-      this.setState({ dataList: data.content, total:data.total })
+    middleTabletAction().then(data => {
+      this.setState({ dataList: data.content, arrangeName:data.arrangeName });
     });
   }
 
-
-  leftClick = () => {
-    if( this.pageConfig.current != 1 ){
-      this.pageConfig.current = this.pageConfig.current == 1 ? 1 : this.pageConfig.current - 1;
-      this.refreshDataList();
-      this.changeTime();
-    }
-  }
-
-  rightClick = () => {
-    const { total } = this.state;
-    let maxNum = Math.ceil( total/this.pageConfig.pageSize );
-    if( this.pageConfig.current < maxNum){
-      this.pageConfig.current = this.pageConfig.current + 1;
-      this.refreshDataList();
-      this.changeTime();
-    }
-  }
-
-  changeTime = () => {
-    const { selectTime, time } = this.state;
-    let newTime = time.filter( e => {
-      return e!=selectTime
-    })
-    this.setState({ selectTime:newTime[0] })
-  }
-
   render() {
-    const { headerData, dataList, time, selectTime } = this.state;
+    const { headerData, dataList, arrangeName, selectTime } = this.state;
     let leader = (headerData.leader && headerData.leader[0]) || {};
     let secondTier = headerData.secondTier || [];
     return (
@@ -117,11 +91,11 @@ class MiddleTable extends Component {
           <Row className='table-body-cotent firstPeople'>
             <Col className=''>
               <Row className='table-header-row title'>
-                <Col className='leftBtn' span={1}><img className='table-page-img' src="/src/assets/3dview/left.png" onClick={ () => this.leftClick() }/></Col>
+                {/* <Col className='leftBtn' span={1}><img className='table-page-img' src="/src/assets/3dview/left.png" onClick={ () => this.leftClick() }/></Col> */}
                 <Col span={7}>岗位</Col>
-                <Col span={8}>{ selectTime }</Col>
+                <Col span={8}>{time[arrangeName]}</Col>
                 <Col span={7}>电话</Col>
-                <Col className='rightBtn' span={1}><img className='table-page-img' src="/src/assets/3dview/right.png" onClick={ () => this.rightClick() }/></Col>
+                {/* <Col className='rightBtn' span={1}><img className='table-page-img' src="/src/assets/3dview/right.png" onClick={ () => this.rightClick() }/></Col> */}
               </Row>
               { dataList && dataList.map((d,index) => {
                 return (

src/view/bank/3dview/indexMap.js

@@ -29,6 +29,7 @@ import { calcCoorArrUtil } from 'UTILS/CalcCoorArrUtil';
 import { insertDistrict } from './common/mapUtils';
 import { getDictionaryList } from './../../../services/securityService';
 import { fetchJsonAction } from './../../../services/3dService';
+import { setOrgCode } from './../../../utils/request';
 import TwinkleDiv from './map/TwinkleDiv';
 import mqtt from 'mqtt';
 const AmosConfig = endConf.AmosConfig;
@@ -205,7 +206,7 @@ class IndexMap extends Component {
       currentCard: 1
     });
 
-    lsTool.write('orgCode', orgCode);
+    setOrgCode(orgCode);
   };
 
   /**