Browse Source

统计概览 > 总统计表 增加终端总数接口

sophieChenyx 5 years ago
parent
commit
7e432332e0

+ 9 - 5
src/components/AXList/StandardTableList.js

@@ -68,7 +68,7 @@ export default class StandardTableList extends PureComponent {
   getListHeader = () => {
     const {
       showStatusSelect,
-      header: { basicSearch, onAdvanceFilterClick, onCreateClick, onDownload, campusAmount },
+      header: { basicSearch, onAdvanceFilterClick, onCreateClick, onDownload, campusAmount, terminalsAmount },
       footer: { pagination },
     } = this.props;
     const { keys } = basicSearch;
@@ -121,12 +121,16 @@ export default class StandardTableList extends PureComponent {
                 </a>
               )}
               {campusAmount !== undefined && (
-                <span
-                  style={{ marginLeft: 5, marginRight: 10, }}
-                >当前共有<span style={{fontWeight:600, color:'#5E8732'}}>{campusAmount}</span>个校区&nbsp;&nbsp;
-                <span style={{fontWeight:600, color:'#5E8732'}}>{pagination.totalSize}</span>个终端用户
+                <span style={{ marginLeft: 5, marginRight: 10}}>
+                当前共有<span style={{fontWeight:600, color:'#5E8732'}}>{campusAmount}</span>个校区
                 </span>
               )}
+              {terminalsAmount !== undefined && (
+                <span>
+                <span style={{fontWeight:600, color:'#5E8732'}}>{terminalsAmount}</span>个终端用户
+                </span>
+              )}
+
               <Button icon="sync" onClick={this.handleRefreshBtnClick}>刷新</Button>
               {/* noCreate 参数控制是否显示新建按钮 */}
               {onCreateClick !== undefined && (

+ 12 - 3
src/models/accounts.js

@@ -4,13 +4,12 @@ import {
   queryCampusList,
   queryTerminalsList,
   queryCampusAmount,
+  queryTerminalsAmount,
   queryTotalList,
-
 } from '../services/accounts';
 
 export default {
   namespace: 'accounts',
-
   state: {
     list: [],
     pageNo: 1,
@@ -19,7 +18,6 @@ export default {
     campusAmount: 0,
     currentItem: {},
   },
-
   effects: {
     *fetchCampusList({ payload }, { call, put }) {
       const response = yield call(queryCampusList, payload);
@@ -60,6 +58,17 @@ export default {
         });
       }
     },
+    *fetchTerminalsAmount({ payload }, { call, put }) {
+      const response = yield call(queryTerminalsAmount, payload);
+      if (response.success) {
+        yield put({
+          type: 'querySuccess',
+          payload: {
+            terminalsAmount: response.data,
+          },
+        });
+      }
+    },
     *fetchTotalList({ payload }, { call, put }) {
       const response = yield call(queryTotalList, payload);
       if (response.success) {

+ 1 - 1
src/routes/Dashboard/Accounts/AccountsCampus.js

@@ -27,7 +27,7 @@ export default class CampusAccountsPage extends Component {
   }
 
   handleDownloadOperation = () => {
-    //window.open('/api/stmt/campus/export');
+    // window.open('/api/stmt/campus/export');
     this.props.dispatch({
       type: 'accounts/fetchCampusExcel',
       payload: 'download',

+ 6 - 1
src/routes/Dashboard/Accounts/AccountsTotalList.js

@@ -25,6 +25,10 @@ export default class TotalListAccountsPage extends Component {
       payload: {}
     });
     this.props.dispatch({
+      type: 'accounts/fetchTerminalsAmount',
+      payload: {}
+    });
+    this.props.dispatch({
       type: 'accounts/fetchTotalList',
       payload: { ...this.state.Queryers }
     });
@@ -44,7 +48,7 @@ export default class TotalListAccountsPage extends Component {
   
   render() {
     const { loading,accounts } = this.props;
-    const { list, totalSize, pageSize, pageNo,  campusAmount} = accounts;
+    const { list, totalSize, pageSize, pageNo, campusAmount, terminalsAmount} = accounts;
     const basicSearch = {
       keys: [{
         name: '终端编号',
@@ -92,6 +96,7 @@ export default class TotalListAccountsPage extends Component {
           header={{
             basicSearch,
             campusAmount,
+            terminalsAmount,
             onFilterClick: this.handleFilterOperation,
           }}
           footer={{

+ 3 - 0
src/services/accounts.js

@@ -26,4 +26,7 @@ export async function queryTotalList(params) {
 
 export async function queryCampusAmount() {
   return request(`${api.acconutsCampusAmount}`);
+}
+export async function queryTerminalsAmount() {
+  return request(`${api.acconutsTerminalsAmount}`);
 }

+ 1 - 0
src/utils/config.js

@@ -150,6 +150,7 @@ const apiObj = {
   accountsTerminalsDownload: '/stmt/terminal/user/export',
   acconutsTotalList: '/stmt/stats/page',
   acconutsCampusAmount: '/stmt/stats/campus/totalsize',
+  acconutsTerminalsAmount: '/stmt/stats/terminal/user/totalsize',
 };
 
 /**