Commit f9ebd5c8 authored by qinhaitao's avatar qinhaitao

Merge branch 'c_server_issues_solve' into 'c_server_ts_perf'

增加getStats的xlsxData返回值

See merge request !31
parents 93141e04 d54aa2b1
/** @format */ /** @format */
// var path = require('path');
var express = require('express') var express = require('express')
var bodyParser = require('body-parser') var bodyParser = require('body-parser')
var cookieParser = require('cookie-parser') var cookieParser = require('cookie-parser')
var { createProxyMiddleware } = require('http-proxy-middleware') var { createProxyMiddleware } = require('http-proxy-middleware')
const routers = require('../index') const routers = require('../index')
// const routers = require(process.cwd() + '/index')
const { port, serverProxy } = require('./package.json') const { port, serverProxy } = require('./package.json')
var app = express() var app = express()
......
...@@ -41,6 +41,7 @@ export default class StatController { ...@@ -41,6 +41,7 @@ export default class StatController {
commonStatGetStatsResult1 commonStatGetStatsResult1
) )
return resultsModel.success({ return resultsModel.success({
xlsxData: commonStatGetStatsResult1,
...commonStatBuildExcelResult2 ...commonStatBuildExcelResult2
}) })
} }
......
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