no message

src/data/db/qyfw.ts

@@ -91,7 +91,7 @@ export async function getEnterprise() {
     let { hzsj, qyxqfw, qyxqqk, qyxqqkxq, xqclqk } = await getQyxqfw(企业服务dbList);
     qyfw.企业服务汇总数据.dataList = getKeyValue(hzsj);
     qyfw.企业需求服务.count = [{key:"截止目前企业需求数", value:qyxqfw.count}];
-    qyfw.企业需求服务.dataList = getKeyValue(qyxqfw.dataList);
+    qyfw.企业需求服务.dataList = qyxqfw.dataList;
     qyfw.企业需求情况.bodyList = qyxqqk;
     qyfw.企业需求情况详细.bodyList = qyxqqkxq;
     qyfw.需求处理情况.dataList = getKeyValue(xqclqk);
@@ -383,18 +383,20 @@ async function getRfqyfwqk(已受理企业服务dbList) {
 
     let month = getMonthList();
     let rfqyfwqk = {"全部":{ chartList:[], tableData:{bodyList: [], headerList: [['服务企业名称', '服务时间', "负责人", "服务状态"]] }}};
+    let 全部 = {};
     for (let key in fwxx) {
         if (!rfqyfwqk[key]) rfqyfwqk[key] = { chartList:[], tableData:{bodyList: [], headerList: [['服务企业名称', '服务时间', "负责人", "服务状态"]] }};
         for(let i = 0; i < month.length; i++) {
+            if (!全部[month[i]]) 全部[month[i]] = 0;
             let fuwuMonth = 0;
             fwxx[key].forEach(info => {
                 // 检查受理时间的月份是否与当前月份相同
                 let parsedStartTime = moment(info.shouLiTime); // 获取受理时间
                 if (parsedStartTime.isValid() && moment(parsedStartTime).format("YY/MM") === month[i]) {
                     fuwuMonth += 1;
+                    全部[month[i]] += 1
                 }
             })
-            rfqyfwqk["全部"].chartList.push({key:month[i], value:fuwuMonth});
             rfqyfwqk[key].chartList.push({key:month[i], value:fuwuMonth});
         }
         
@@ -405,22 +407,32 @@ async function getRfqyfwqk(已受理企业服务dbList) {
             let shouLiTime = moment(info.shouLiTime).format("YYYY-MM-DD");
             let followUpStatus = changeEnumValue(FOLLOWUPSTATUS, info.followUpStatus);
             rffwqk.push([enterpriseName, shouLiTime, "赵老师", followUpStatus]);
+            fwlx.dataList[0].tableData.bodyList.push([enterpriseName, shouLiTime, "赵老师", followUpStatus]);
         })
-        rfqyfwqk["全部"].tableData.bodyList = rffwqk;
         rfqyfwqk[key].tableData.bodyList = rffwqk;
     }
 
+    for (let key in 全部) {
+        fwlx.dataList[0].chartList.push({key, value:全部[key]});
+    }
+
     for (let key in NEEDCATEGORY) {
         let enumValue = NEEDCATEGORY[key];
         // 跳过未显式赋值的枚举成员（如果有的话，它们默认为枚举前一个成员的值加1）
         if (isNaN(Number(key))) { // 这里检查 key 是否可以被转换为数字，以识别枚举成员名称
             let needCategoryStr = changeEnumValue(NEEDCATEGORY, enumValue);
-            let value = fuWuQiYeTypeMap[needCategoryStr] || 0;
+            let value = fuWuQiYeTypeMap[needCategoryStr] || 0
+            let chartList = [];
+            let tableData = {bodyList: [], headerList: [['服务企业名称', '服务时间', "负责人", "服务状态"]]};
+            if (rfqyfwqk[needCategoryStr]) {
+                if (rfqyfwqk[needCategoryStr].chartList) chartList = rfqyfwqk[needCategoryStr].chartList;
+                if (rfqyfwqk[needCategoryStr].tableData) tableData = rfqyfwqk[needCategoryStr].tableData;
+            }
             fwlx.dataList.push({
                 key: needCategoryStr,
                 value: value,
-                chartList:rfqyfwqk[needCategoryStr].chartList, 
-                tableData:rfqyfwqk[needCategoryStr].tableData
+                chartList, 
+                tableData
             });
         }
     }