no message

src/biz/qyfw.ts

 import { systemConfig } from '../config/serverConfig';
 import { getEnterprise, getEnterpriseDetails, get入孵企业数量变化趋势 } from '../data/db/qyfw';
-import { zhyyTableData } from '../data/table/zhyyData';
+import { dtTableData } from '../data/table/zhyyData';
 import { keyValuePackage, tablePackage } from '../dataPackage/inFrontOut';
 import { getKeyValueOut, getTableOut } from '../dataPackage/out';
 
@@ -8,20 +8,20 @@ import { getKeyValueOut, getTableOut } from '../dataPackage/out';
 
 export async function getData(req, res) {
     let dbData = await getEnterprise();
-    let excelData = zhyyTableData();
+    let dtExcelData = dtTableData();
 
     let ret:any = {};
 
-    let dtTableData = tablePackage(excelData["地图"].headerList[0], excelData["地图"].bodyList);
+    let dtTable = tablePackage(dtExcelData["地图"].headerList[0], dtExcelData["地图"].bodyList);
     let dt = {}
-    dtTableData.dataList.forEach(info => {
+    dtTable.dataList.forEach(info => {
         let { A, D } = info;
-        let loudongDetails = tablePackage(excelData[A].headerList[0], excelData[A].bodyList);
+        let loudongDetails = tablePackage(dtExcelData[A].headerList[0], dtExcelData[A].bodyList);
         let imgUrl = `${systemConfig.imgPath}/${D}`;
         info["D"] = imgUrl;
         if (!dt[A]) dt[A] = {dataList:[], tableData:[]};
         Object.keys(info).forEach((key, index) => {
-            dt[A].dataList.push({key:dtTableData.titleList[index], value:info[key]});
+            dt[A].dataList.push({key:dtTable.titleList[index], value:info[key]});
         })
         dt[A].tableData = getTableOut("表格数据", loudongDetails);
     });
@@ -72,14 +72,18 @@ export async function getData(req, res) {
 } 
 
 
+/**
+ * 企业数量变化趋势弹窗
+ * @param req 
+ * @param res 
+ */
 export async function getQianRuQianChu(req, res) {
     let {rufuType, rufuTime, rufuState} = req.body;
     //"月", "25/04", "全部"
 
     let ret:any = {};
 
-    let rufuqiyeTable = await get入孵企业数量变化趋势(rufuType, rufuTime, rufuState);
-
+    let rufuqiyeTable = await get入孵企业数量变化趋势(rufuType, rufuTime, rufuState); 
     ret['rufuqiye'] = {title:"入孵企业数量变化趋势表格", dataList:rufuqiyeTable};
   
     res.send(ret);

src/biz/zhyy.ts

 import { systemConfig } from '../config/serverConfig';
 import { getZhyy } from '../data/db/zhyy';
-import { zhyyTableData } from '../data/table/zhyyData';
+import { dtTableData, zhyyTableData } from '../data/table/zhyyData';
 import { keyValuePackage, tablePackage } from '../dataPackage/inFrontOut';
 import { getKeyValueOut, getTableOut } from '../dataPackage/out';
 import { getChart } from '../data/db/out';
@@ -9,25 +9,32 @@ import { getChart } from '../data/db/out';
 
 export async function getData(req, res) {
     let excelData = zhyyTableData();
+    let dtExcelData = dtTableData();
     let dbData = await getZhyy();
 
     let ret: any = {};
 
-    let dtTableData = tablePackage(excelData["地图"].headerList[0], excelData["地图"].bodyList);
+    let dtTable = tablePackage(dtExcelData["地图"].headerList[0], dtExcelData["地图"].bodyList);
     let dt = {}
-    dtTableData.dataList.forEach(info => {
+    dtTable.dataList.forEach(info => {
         let { A, D } = info;
         let loudongDetails = tablePackage(excelData[A].headerList[0], excelData[A].bodyList);
         let imgUrl = `${systemConfig.imgPath}/${D}`;
         info["D"] = imgUrl;
         if (!dt[A]) dt[A] = {dataList:[], tableData:[]};
         Object.keys(info).forEach((key, index) => {
-            dt[A].dataList.push({key:dtTableData.titleList[index], value:info[key]});
+            dt[A].dataList.push({key:dtTable.titleList[index], value:info[key]});
         })
         dt[A].tableData = getTableOut("表格数据", loudongDetails);
     });
 
     ret['dt'] = {title:"地图", dataList:dt};
+    
+    let byqk = keyValuePackage(excelData['毕业情况'].dataList);
+    ret['byqk'] = getKeyValueOut('毕业情况', byqk);
+    
+    let qymyd = keyValuePackage(excelData['服务成果'].dataList);
+    ret['qymyd'] = getKeyValueOut('企业满意度', qymyd);
 
     let fhqgk = keyValuePackage(dbData['孵化器概况']);
     ret['fhqgk'] = getKeyValueOut('孵化器概况', fhqgk);
@@ -41,9 +48,6 @@ export async function getData(req, res) {
     let fhyy = keyValuePackage(dbData['孵化运营'].dataList);
     ret['fhyy'] = getKeyValueOut('孵化运营', fhyy);
     
-    let byqk = keyValuePackage(dbData['毕业情况']);
-    ret['byqk'] = getKeyValueOut('毕业情况', byqk);
-    
     let yytg = getChart(dbData['运营推广']);
     ret['yytg'] = {title:"运营推广", dataList:yytg};
 
@@ -79,9 +83,6 @@ export async function getData(req, res) {
     let fwjl = tablePackage(dbData["服务记录"].headerList[0], dbData["服务记录"].bodyList);
     ret['fwjl'] = getTableOut('服务记录', fwjl);
     
-    let qymyd = keyValuePackage(dbData['企业满意度']);
-    ret['qymyd'] = getKeyValueOut('企业满意度', qymyd);
-    
     let fwcg = keyValuePackage(dbData['服务成果']);
     ret['fwcg'] = getKeyValueOut('服务成果', fwcg);
     

src/config/enum.ts

@@ -52,6 +52,7 @@ export enum TABLENAME {
     失信核查 = "dishonesty",
     严重违法犯罪 = "break_the_law",
     对外投资 = "overseas_investment",
+    运营推广信息表 = "info_operation_promotion",
     
 }
 
@@ -376,3 +377,42 @@ export enum IPRALLTYPE {
     植物新品种 = 201,
     集成电路布图 =202
 }
+
+
+export enum PROMOTIONTYPE {
+    线上推广 = 1,
+    线下推广,
+}
+
+
+/**
+ * 线上推广
+ */
+export enum ONLINEPROMOTION { 
+    视频号 = 1,
+    抖音,
+    小红书
+}
+
+
+/**
+ * 线下推广
+ */
+export enum OFFLINEPROMOTION { 
+    活动宣讲 = 1,
+    三方机构合作
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+

src/data/db/qyfw.ts

@@ -125,7 +125,7 @@ export async function get入孵企业数量变化趋势(type, time, state) {
     let 孵化企业dbList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业孵化信息, fuHuaParam, fhColumn, 孵化企业includeConf);
 
     let rfqyslbhqs = { bodyList: [], headerList: [['时间', '企业名称', '企业类型', '状态']] };
-
+    
     孵化企业dbList.forEach(info => {
         // 检查入孵开始时间的月份是否与当前月份相同
         let enterpriseName = info.enterprise.enterpriseName;
@@ -148,7 +148,7 @@ export async function get入孵企业数量变化趋势(type, time, state) {
             rfqyslbhqs.bodyList.push([moment(paramTime).format("YYYY-MM-DD"), enterpriseName, industry, qianruqianchu])
         }
     })
-    
+
     return rfqyslbhqs;
 }
 

src/data/db/zhyy.ts

 import moment = require("moment");
-import { AWARDLEVEL, EMIGRATIONTYPE, FOLLOWUPSTATUS, FUHUASTATE, INDUSTRY, MOVEOUTTYPE, NEEDCATEGORY, OPERATIONALDATATYPE, QUARTER, TABLENAME } from "../../config/enum";
+import { FOLLOWUPSTATUS, FUHUASTATE, NEEDCATEGORY, OFFLINEPROMOTION, ONLINEPROMOTION, OPERATIONALDATATYPE, PROMOTIONTYPE, TABLENAME } from "../../config/enum";
 import { selectData, selectManyTableData } from "./operationalData";
 import { changeEnumValue } from "../../tools/eccEnum";
 import { getChart, getYearList, get在孵企业面积, get在孵企业面积变化趋势 } from "./out";
@@ -85,13 +85,7 @@ export async function getZhyy() {
     let zhyy = {
         孵化器概况:[],
         在孵企业面积占比:[],
-        孵化运营:{ count:[], 
-            dataList:[
-                {key:"2019", value:"36"}, {key:"2020", value:"36"}, {key:"2021", value:"36"}, 
-                {key:"2022", value:"36"}, {key:"2023", value:"36"}, {key:"2024", value:"36"}
-            ]
-        },
-        毕业情况:[{key:"毕业未迁出", value:"23家"}, {key:"毕业已迁出", value:"4家"}],
+        孵化运营:{ count:[], dataList:[] },
         运营推广:{
             线上推广:{count:"78%", dataList:[{key:"视频号", value:17}, {key:"小红书", value:16}, {key:"抖音", value:18}]},
             线下推广:{count:"22%", dataList:[{key:"活动宣讲数", value:6}, {key:"三方机构合作", value:9}]}
@@ -154,7 +148,6 @@ export async function getZhyy() {
                 ["工商税务", "2025/04/21", "上海*********公司", "赵老师"],
             ], 
         },
-        企业满意度:[ {key:"企业满意度", value:"良好"} ],
         服务成果:[
             {key:"已办结", value:31},
             {key:"待办结", value:8}
@@ -196,8 +189,30 @@ export async function getZhyy() {
     zhyy.孵化运营.count = [{key:"在孵企业", value:`${在孵dbList.length}家`}];
 
     let {在孵企业面积变化趋势, 行业领域分布} = await get在孵企业面积变化趋势();
-    zhyy.孵化运营.dataList = [{}]
+    zhyy.孵化运营.dataList = 在孵企业面积变化趋势;
+
+    //运营推广
+    let promotionList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.运营推广信息表,{}, ["opId","promotionType", "promotionApp", "promotionNum"]);
+    let promotionInfo = {"线上推广": { count: '0%', dataList: [] },  "线下推广": { count: '0%', dataList: [] }};
+    let 线上推广 = {
+        total:0,
+        apps:{
+            ONLINEPROMOTION
+        }
+    }
 
+    if (promotionList.length) {
+        promotionList.forEach( info => {
+            let appStr = "";
+            if (info.promotionType == PROMOTIONTYPE.线上推广) {
+                appStr = changeEnumValue(ONLINEPROMOTION, info.promotionApp);
+                promotionInfo["线上推广"][appStr] = info.promotionNum;
+            } else if (info.promotionType == PROMOTIONTYPE.线下推广) {
+                appStr = changeEnumValue(OFFLINEPROMOTION, info.promotionApp);
+                promotionInfo["线下推广"][appStr] = info.promotionNum;
+            }
+        })
+    }
 
     
 

src/data/table/zhyyData.ts

@@ -21,8 +21,7 @@ function packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList,
     return result;
 }
 
-export function zhyyTableData() {
-    
+export function dtTableData() {
     let blockDataList = onceSheetBecomeOfblockData('yuyiServer.xlsx', '地图数据');
 
     let keyValueOrTitleList = [];//适配 饼图 键值以及需要多个key的
@@ -33,6 +32,24 @@ export function zhyyTableData() {
 
     let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
     return result;
+}
+
+
+export function zhyyTableData() {
+    let blockDataList = onceSheetBecomeOfblockData('yuyiServer.xlsx', '智慧运营');
+
+    let keyValueOrTitleList = ["毕业情况", "服务成果"];//适配 饼图 键值以及需要多个key的
+    let barChartList = []; //适配 柱状图 折线图 
+    let stringList = [];
+    let decollatePlanarList =[];//适配 表格
+    let titltListConfig = {};
+
+    let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
+    return result;
+}
+
+
+
+
+
 
-        
-}
\ No newline at end of file