Skip to content

Y
yuyiViewServer
Commit 238475ca by Zllgogo
Options

Merge branch 'master' of http://123.207.147.179:8888/node_server/yuyiViewServer 

# Conflicts:
#	logs/error/error.2025-04-22.log.1
#	res/yuyiServer20250328.xlsx
parents ed911f31 7ad89fdf
Showing with 175 additions and 108 deletions
.gitignore
......@@ -5,4 +5,5 @@
/test
/public
*test*
*.log
\ No newline at end of file
*.log
yuyi_view.zip
logs/error/error.2025-03-13.log.1 deleted 100644 → 0
[2025-03-13T19:42:08.475] [ERROR] errorLogger - errorInfo => undefined |
[2025-03-13T19:42:09.712] [ERROR] errorLogger - errorInfo => undefined |
[2025-03-13T19:42:10.934] [ERROR] errorLogger - errorInfo => undefined |
[2025-03-13T19:42:12.206] [ERROR] errorLogger - errorInfo => undefined |
[2025-03-13T19:42:13.385] [ERROR] errorLogger - errorInfo => undefined |
[2025-03-13T19:42:14.591] [ERROR] errorLogger - errorInfo => undefined |
[2025-03-13T19:42:15.776] [ERROR] errorLogger - errorInfo => undefined |
[2025-03-13T19:42:16.962] [ERROR] errorLogger - errorInfo => undefined |
[2025-03-13T19:42:18.163] [ERROR] errorLogger - errorInfo => undefined |
[2025-03-13T19:43:16.960] [ERROR] errorLogger - errorInfo => undefined |
[2025-03-13T19:43:18.138] [ERROR] errorLogger - errorInfo => undefined |
[2025-03-13T19:43:19.329] [ERROR] errorLogger - errorInfo => undefined |
[2025-03-13T19:43:20.490] [ERROR] errorLogger - errorInfo => undefined |
logs/error/error.2025-03-13.log.2 deleted 100644 → 0
[2025-03-13T16:30:23.689] [ERROR] errorLogger - errorInfo => 数据查询失败 | undefined |
[2025-03-13T16:30:24.770] [ERROR] errorLogger - errorInfo => 数据查询失败 | undefined |
[2025-03-13T16:30:25.824] [ERROR] errorLogger - errorInfo => 数据查询失败 | undefined |
[2025-03-13T16:30:26.899] [ERROR] errorLogger - errorInfo => 数据查询失败 | undefined |
[2025-03-13T19:38:26.373] [ERROR] errorLogger - errorInfo => undefined |
[2025-03-13T19:38:27.604] [ERROR] errorLogger - errorInfo => undefined |
[2025-03-13T19:38:28.822] [ERROR] errorLogger - errorInfo => undefined |
[2025-03-13T19:38:30.004] [ERROR] errorLogger - errorInfo => undefined |
[2025-03-13T19:38:31.188] [ERROR] errorLogger - errorInfo => undefined |
[2025-03-13T19:38:32.377] [ERROR] errorLogger - errorInfo => undefined |
[2025-03-13T19:42:06.063] [ERROR] errorLogger - errorInfo => undefined |
[2025-03-13T19:42:07.285] [ERROR] errorLogger - errorInfo => undefined |
logs/error/error.2025-03-13.log.3 deleted 100644 → 0
[2025-03-13T16:28:27.789] [ERROR] errorLogger - errorInfo => 数据查询失败 | undefined |
[2025-03-13T16:28:29.754] [ERROR] errorLogger - errorInfo => 数据查询失败 | undefined |
[2025-03-13T16:29:55.874] [ERROR] errorLogger - errorInfo => 数据查询失败 | undefined |
[2025-03-13T16:29:56.995] [ERROR] errorLogger - errorInfo => 数据查询失败 | undefined |
[2025-03-13T16:29:58.083] [ERROR] errorLogger - errorInfo => 数据查询失败 | undefined |
[2025-03-13T16:29:59.162] [ERROR] errorLogger - errorInfo => 数据查询失败 | undefined |
[2025-03-13T16:30:00.232] [ERROR] errorLogger - errorInfo => 数据查询失败 | undefined |
[2025-03-13T16:30:01.304] [ERROR] errorLogger - errorInfo => 数据查询失败 | undefined |
[2025-03-13T16:30:21.520] [ERROR] errorLogger - errorInfo => 数据查询失败 | undefined |
[2025-03-13T16:30:22.607] [ERROR] errorLogger - errorInfo => 数据查询失败 | undefined |
logs/error/error.2025-04-22.log.1
<<<<<<< HEAD
[2025-04-22T12:43:42.602] [ERROR] errorLogger - errorInfo => 数据查询失败 | undefined |
[2025-04-22T12:43:43.711] [ERROR] errorLogger - errorInfo => 数据查询失败 | undefined |
[2025-04-22T12:43:44.803] [ERROR] errorLogger - errorInfo => 数据查询失败 | undefined |
......@@ -8,3 +9,15 @@
[2025-04-22T12:43:48.219] [ERROR] errorLogger - errorInfo => 数据查询失败 | undefined |
[2025-04-22T12:43:49.302] [ERROR] errorLogger - errorInfo => 数据查询失败 | undefined |
[2025-04-22T12:43:50.963] [ERROR] errorLogger - errorInfo => 数据查询失败 | undefined |
=======
[2025-04-22T21:02:05.470] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:02:06.582] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:02:07.685] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:02:09.345] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:02:29.679] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:02:30.776] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:02:31.874] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:02:33.006] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:02:34.117] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:02:35.223] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
>>>>>>> 7ad89fdf7b302dde05ba7817edd92c2544a5b880
logs/error/error.2025-04-22.log.2 0 → 100644
[2025-04-22T21:00:54.208] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:00:55.332] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:01:29.681] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:01:30.797] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:01:31.897] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:01:33.025] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:01:34.134] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:01:35.253] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:02:03.257] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:02:04.362] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
logs/error/error.2025-04-22.log.3 0 → 100644
[2025-04-22T21:00:29.682] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:00:30.780] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:00:31.888] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:00:33.012] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:00:34.265] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:00:36.289] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:00:49.778] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:00:50.879] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:00:51.989] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
[2025-04-22T21:00:53.105] [ERROR] errorLogger - errorInfo => 数据联合查询失败 | undefined |
serverConfig.xml
<config>
<port>40015</port>
<dbPort>9096</dbPort>
<dbHost>127.0.0.1</dbHost>
<dbHost>192.168.0.105</dbHost>
<sign>xxx90909082fsdahfjosadjfpoiwausjorip2hjklrhn1ioud0u124rx0qwejfokasjfolksaujfoas</sign>
<!-- <imgPath>http://127.0.0.1:4980/yuyi/viewpage</imgPath> -->
<imgPath>http://192.168.0.189:40015</imgPath>
......
src/biz/jxgljsc.ts
......@@ -14,10 +14,10 @@ export async function getData(req, res) {
let ret: any = {};
let zfqymjqkfxPackageData = keyValuePackage(excelData['在孵企业面积情况分析'].dataList);
let zfqymjqkfxPackageData = keyValuePackage(dbList.在孵企业面积情况分析.dataList);
ret['zfqymjqkfx'] = getKeyValueOut('在孵企业面积情况分析', zfqymjqkfxPackageData);
let zfqymjbhqsPackageData = onceYBarChartPackage(excelData['在孵企业面积变化趋势'], '', '');
let zfqymjbhqsPackageData = onceYBarChartPackage([dbList.在孵企业面积变化趋势], '', '');
ret['zfqymjbhqs'] = getOnceYBarChartOut('在孵企业面积变化趋势', zfqymjbhqsPackageData);
......
src/biz/zhyy.ts
......@@ -66,10 +66,10 @@ export async function getData(req, res) {
})
ret['dt'] = getTableOut('地图', dt);
let jyfxPackageData = keyValuePackage(excelData['就业分析'].dataList);
ret['jyfx'] = getKeyValueOut('就业分析', jyfxPackageData);
// let jyfxPackageData = keyValuePackage(dbData['就业分析'].dataList);
// let jyfxPackageData = keyValuePackage(excelData['就业分析'].dataList);
// ret['jyfx'] = getKeyValueOut('就业分析', jyfxPackageData);
let jyfxPackageData = keyValuePackage(dbData['就业分析'].dataList);
ret['jyfx'] = getKeyValueOut('就业分析', jyfxPackageData);
let jdjyrsqsfxPackageData = onceYBarChartPackage(dbData['年度就业人数趋势分析'], '', '');
ret['jdjyrsqsfx'] = getOnceYBarChartOut('年度就业人数趋势分析', jdjyrsqsfxPackageData);
......
src/config/enum.ts
......@@ -351,36 +351,14 @@ export enum SELECTPARAM {
}
/**
* 知识产权类型
* 知识产权 全类型
*/
export enum INTELLECTUALPROPERTYRIGHT {
// 软件著作 = 1,
export enum IPRALLTYPE {
软件著作权 = 1,
发明专利,
海外专利,
专利,
其他
// 植物新品种,
// 集成电路布图,
专利 = 100,
发明专利 = 101,
海外专利 = 102,
其他 = 200,
植物新品种 = 201,
集成电路布图 =202
}
/**
* 知识产权类型 前端用
*/
export enum IPRTYPECLIENT {
// 软件著作 = 1,
软件著作权 = 1,
发明专利,
海外专利,
植物新品种,
集成电路布图,
}
/**
* 知识产权类型专利 前端用
*/
export enum IPRTYPECLIENTZL {
发明专利 = 2,
海外专利,
}
\ No newline at end of file
src/data/db/qyszhx.ts
import moment = require("moment");
import { AWARDLEVEL, DEGREE, FINANCINGROUNDS, IPRTYPECLIENT, NEEDCATEGORY, OPERATIONALDATATYPE, QUARTER, TABLENAME } from "../../config/enum";
import { AWARDLEVEL, DEGREE, FINANCINGROUNDS, IPRALLTYPE, NEEDCATEGORY, OPERATIONALDATATYPE, QUARTER, TABLENAME } from "../../config/enum";
import { selectData, selectManyTableData } from "./operationalData";
import { getChart, getKeyValue, getYearList } from "./out";
import { changeEnumValue } from "../../tools/eccEnum";
......@@ -536,7 +536,7 @@ function get租房补贴(企业资质信息, 企业专利信息, 参保记录信
企业专利信息.forEach(info => {
let { enterprise_iprs } = info;
enterprise_iprs.forEach(patent => {
if (patent.iprType === IPRTYPECLIENT.软件著作权) {
if (patent.iprType === IPRALLTYPE.软件著作权) {
ruanzhuCompleted = true;
}
});
......@@ -772,7 +772,7 @@ function get知识产权(data) {
let { enterprise_iprs } = info;
enterprise_iprs.forEach(patents => {
if (patents.iprType) {
let iprTypeStr = changeEnumValue(IPRTYPECLIENT, patents.iprType);
let iprTypeStr = changeEnumValue(IPRALLTYPE, patents.iprType);
if (!zscq[iprTypeStr]) zscq[iprTypeStr] = 0;
zscq[iprTypeStr] += patents.number;
}
......
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