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

# Conflicts:
#	res/yuyiServer.xlsx

serverConfig.xml

 <config>
     <port>40015</port>
     <dbPort>9096</dbPort>
-    <dbHost>192.168.0.71</dbHost>
+    <dbHost>192.168.0.72</dbHost>
     <sign>xxx90909082fsdahfjosadjfpoiwausjorip2hjklrhn1ioud0u124rx0qwejfokasjfolksaujfoas</sign>
     <!-- <imgPath>http://127.0.0.1:4980/yuyi/viewpage</imgPath> -->
-    <imgPath>http://192.168.0.189:40015</imgPath>
-    <imgFileUrl>http://192.168.0.189:9097</imgFileUrl>
+    <imgPath>http://192.168.0.72:40015</imgPath>
+    <imgFileUrl>http://192.168.0.72:9097</imgFileUrl>
 </config>

src/biz/qyszhx.ts

@@ -53,15 +53,12 @@ export async function getData(req, res) {
     let zzrzTableData = tablePackage(dbData["资质认证"].headerList[0], dbData["资质认证"].bodyList);
     ret['zzrzTable'] = getTableOut('资质认证表格', zzrzTableData);
 
-    let sxhc = keyValuePackage(dbData['失信核查'].count);
-    ret['sxhc'] = getKeyValueOut('失信核查', sxhc);
+    let sxhc = keyValuePackage(dbData['失信详情'].count);
+    ret['sxhc'] = getKeyValueOut('失信详情', sxhc);
 
-    let sxhcxx = keyValuePackage(dbData['失信核查'].dataList);
+    let sxhcxx = keyValuePackage(dbData['失信详情'].dataList);
     ret['sxhcxx'] = getKeyValueOut('风险提示', sxhcxx);
 
-    let sxxq = keyValuePackage(dbData['失信详情'].dataList);
-    ret['sxxq'] = getKeyValueOut('失信详情', sxxq);
-
     let wfhc = keyValuePackage(dbData['违法核查'].count);
     ret['wfhc'] = getKeyValueOut('违法核查', wfhc);
 

src/biz/zhyy.ts

@@ -36,6 +36,8 @@ export async function getData(req, res) {
     let qymyd = keyValuePackage(excelData['服务成果'].dataList);
     ret['qymyd'] = getKeyValueOut('企业满意度', qymyd);
 
+    ret['nrzqy'] = { title: "拟入驻企业", dataList: excelData["拟入驻企业"].bodyList };
+
     let fhqgk = keyValuePackage(dbData['孵化器概况']);
     ret['fhqgk'] = getKeyValueOut('孵化器概况', fhqgk);
 
@@ -51,8 +53,6 @@ export async function getData(req, res) {
     let yytg = getChart(dbData['运营推广']);
     ret['yytg'] = { title: "运营推广", dataList: yytg };
 
-    ret['nrzqy'] = { title: "拟入驻企业", dataList: dbData["拟入驻企业"] };
-
     let hzsj = keyValuePackage(dbData['汇总数据']);
     ret['hzsj'] = getKeyValueOut('汇总数据', hzsj);
 

src/data/db/out.ts

@@ -99,11 +99,6 @@ function getStartAndEndTimeYearList(startTime, endTime) {
 }
 
 
-
-
-
-
-
 export function getKeyValue(data) {
     let result = [];
     for (let key in data) {

src/data/db/qyfw.ts

@@ -153,9 +153,6 @@ export async function get入孵企业数量变化趋势(type, time, state) {
 }
 
 
-
-
-
 export async function getEnterpriseDetails(name, type) {
     let nowTime = new Date().valueOf();
 

src/data/db/qyszhx.ts

@@ -16,8 +16,7 @@ export async function getQyszhx(eId) {
         企业科创分: { count: [], dataList: [], chartData:[]}, //count:所属国际二级行业，chartData:饼图
         股权结构: { dataList: [], titleList: ['key', 'value'] },
         资质认证: {count:[], bodyList: [], headerList: [['生效时间', '证书类型', '状态']]}, //count:资质认证总数
-        失信核查: {count:[], dataList:[]},//todo
-        失信详情: {count:[], dataList: []},//todo
+        失信详情: {count:[], dataList:[]},//todo
         违法核查: {count:[], dataList: []},//todo
         企业服务申请情况: { dataList: [], titleList: ['key', 'value'] },
         企业服务申请类型: { dataList: [], titleList: ['key', 'value'] },
@@ -115,12 +114,12 @@ export async function getQyszhx(eId) {
 
     //企业风险动态：失信核查、失信详情、违法核查
     let 企业风险动态 = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.失信核查, {eId}, ["eId", "liandate", "anno", "executegov", "executestatus", "publicdate", "executeno", "actionRemark", "amount"]);
-    let qyfxdt = {失信核查:[], 失信详情:[], 违法核查:[]};
+    let qyfxdt = {失信详情:[], 违法核查:[]};
     企业风险动态.forEach( info => {
-        qyfxdt.失信核查.push(info.actionRemark);
+        qyfxdt.失信详情.push(info.actionRemark);
     })
-    qyszhx.失信核查.count = [{key:"失信核查次数", value:企业风险动态.length}];
-    qyszhx.失信核查.dataList = qyfxdt.失信核查;
+    qyszhx.失信详情.count = [{key:"失信核查次数", value:企业风险动态.length}];
+    qyszhx.失信详情.dataList = qyfxdt.失信详情;
 
     let 严重违法犯罪 = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.严重违法犯罪, {eId}, ["eId", "Type", "AddReason", "AddDate", "AddOffice", "RemoveReason", "RemoveDate", "RemoveOffice"]);
     严重违法犯罪.forEach( info => {

src/data/table/zhyyData.ts

@@ -41,7 +41,7 @@ export function zhyyTableData() {
     let keyValueOrTitleList = ["毕业情况", "服务成果"];//适配 饼图 键值以及需要多个key的
     let barChartList = []; //适配 柱状图 折线图 
     let stringList = [];
-    let decollatePlanarList =[];//适配 表格
+    let decollatePlanarList =["拟入驻企业"];//适配 表格
     let titltListConfig = {};
 
     let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);