Commit 5eb9888b authored by xinglei's avatar xinglei

导出报表增加时间后缀

parent abbb64f7
...@@ -93,16 +93,16 @@ class RootView extends Component { ...@@ -93,16 +93,16 @@ class RootView extends Component {
} }
onPermissionFetch = () => { onPermissionFetch = () => {
const { onMenuLoadCompleted } = this.props; const { onMenuLoadCompleted } = this.props;
let roleSeq = lsTool.read('selectedRole'); let roleSeq = lsTool.read('selectedRole');
const token = lsTool.read(SysConsts.token); const token = lsTool.read(SysConsts.token);
searchMenusByRoleAction(roleSeq).then(res =>{ searchMenusByRoleAction(roleSeq).then(res =>{
console.log('searchMenusByRoleAction'); console.log('searchMenusByRoleAction');
let menus =this.get(res); let menus =this.get(res);
if(menus!=null&&menus.length>0){ if(menus!=null&&menus.length>0){
var arr2 = [] var arr2 = []
...@@ -123,20 +123,20 @@ class RootView extends Component { ...@@ -123,20 +123,20 @@ class RootView extends Component {
get= (res) =>{ get= (res) =>{
let tmp=[] let tmp=[]
for(var item11 of res){ for(var item11 of res){
if(item11.children!=null&&item11.children.length>0){ if(item11.children!=null&&item11.children.length>0){
if(item11.children[0].permissionType==='BUTTON'){ if(item11.children[0].permissionType==='BUTTON'){
item11.children=[] item11.children=[]
}else{ }else{
item11.children=this.get(item11.children); item11.children=this.get(item11.children);
} }
} }
tmp.push(item11) tmp.push(item11)
} }
return tmp; return tmp;
} }
...@@ -247,7 +247,7 @@ class RootView extends Component { ...@@ -247,7 +247,7 @@ class RootView extends Component {
!isSub ? ( !isSub ? (
<header className="patrol-view-header" > <header className="patrol-view-header" >
{/* <Icon icon="logo" /> */} {/* <Icon icon="logo" /> */}
<img src='/src/assets/auth/logs.jpg'></img> {/* <img src='/src/assets/auth/logs.jpg'></img> */}
<span>{company +depname|| ''}</span> <span>{company +depname|| ''}</span>
{window.isDisplayQR ? <div className="patrol-view-header-img"> {window.isDisplayQR ? <div className="patrol-view-header-img">
<Icon prefix='amosicon' icon="shouji" style={{ display: 'inline-block',fontSize: 15, color: 'white' }} /> <Icon prefix='amosicon' icon="shouji" style={{ display: 'inline-block',fontSize: 15, color: 'white' }} />
......
...@@ -81,7 +81,8 @@ class ExportSearch extends Component { ...@@ -81,7 +81,8 @@ class ExportSearch extends Component {
quest.push(obj); quest.push(obj);
} }
} }
exportExcel({ url: patrolUrls.daySituationExportUrl, method: 'post', body: quest }, '每日巡检情况报表'); const millisecond = moment().format('YYYYMMDDHHmmss');
exportExcel({ url: patrolUrls.daySituationExportUrl, method: 'post', body: quest }, '每日巡检情况报表' + millisecond);
} }
onChange = (key, e) => { onChange = (key, e) => {
......
...@@ -7,6 +7,7 @@ import { patrolUrls } from 'CONSTS/urlConsts'; ...@@ -7,6 +7,7 @@ import { patrolUrls } from 'CONSTS/urlConsts';
import ToolBar from './../../../component/toolbar'; import ToolBar from './../../../component/toolbar';
import './../../../../styles/view/patrol/statistics.scss'; import './../../../../styles/view/patrol/statistics.scss';
import { utils } from 'amos-tool'; import { utils } from 'amos-tool';
import moment from 'moment';
const dropnavs = [ const dropnavs = [
{ {
...@@ -32,7 +33,8 @@ class MonthSituationTable extends Component { ...@@ -32,7 +33,8 @@ class MonthSituationTable extends Component {
onExportExcel = () => { onExportExcel = () => {
const { searchParam } = this.props; const { searchParam } = this.props;
exportExcel({ url: patrolUrls.monthSituationExportUrl, method: 'post', body: searchParam }, '月度巡检情况报表'); const millisecond = moment().format('YYYYMMDDHHmmss');
exportExcel({ url: patrolUrls.monthSituationExportUrl, method: 'post', body: searchParam }, '月度巡检情况报表' + millisecond);
} }
onClickBootBar = type => { onClickBootBar = type => {
......
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