Merge branch 'master' of http://123.207.147.179:8888/changsanjiao/server

# Conflicts:
#	res/其他数据模板.xlsx

src/biz/qyehPage.ts

@@ -4,8 +4,8 @@ import { get区域融合 } from "../data/analysisExcelData";
 
 
 function 特化一体化电网运行管理(number) {
-    let checkData = new Date('2021-10-25 00:00:00').valueOf() - new Date().valueOf();
-    return Math.ceil(checkData / (3600 * 1000 * 24)) + number;
+    let checkData = new Date().valueOf() - new Date('2021-10-25 00:00:00').valueOf();
+    return Math.floor(checkData / (3600 * 1000 * 24)) + number;
 }
 
 export function getData(req, res) {