no message

serverConfig.xml

@@ -36,4 +36,7 @@
         <floor>http://114.94.20.112:81/api/sign/analyse/floor</floor>
         <sign>http://114.94.20.112:81/api/sign/analyse/sign</sign>
     </bzbs>
+    <dgc>
+        <total>http://114.94.20.112:81/api/sign/analyse/total</total>
+    </dgc>
 </config>

src/biz/dgc.ts

@@ -3,7 +3,7 @@
 import { systemConfig } from "../config/serverConfig";
 import { postAxios } from "../util/request";
 import * as enumConfig from "../config/enum";
-import { seatPointDjTableData, seatPointT1TableData, seatPointT2TableData } from "../data/table/roomPoint";
+import { dgcPointDjTableData, dgcPointT1TableData, dgcPointT2TableData, seatPointDjTableData, seatPointT1TableData, seatPointT2TableData } from "../data/table/roomPoint";
 import { convertTIMDataToModelFormat } from "../dataPackage/tool";
 
 
@@ -659,11 +659,11 @@ export async function getSeat(req, res) {
  * @param req 
  * @param res 
  */
-export async function getSeatPoint(req, res) {
+export async function getDgcPoint(req, res) {
     let ret = {};
-    let excelT1Data = seatPointT1TableData();
-    let excelT2Data = seatPointT2TableData();
-    let excelDjData = seatPointDjTableData();
+    let excelT1Data = dgcPointT1TableData();
+    let excelT2Data = dgcPointT2TableData();
+    let excelDjData = dgcPointDjTableData();
 
     let TIMData = {
         "T1": excelT1Data["T1"],
@@ -673,22 +673,21 @@ export async function getSeatPoint(req, res) {
 
     const configs = {
         'T1': [
-            { imgName: 'F1', floorName: '1F', displayName: '1F', altitude: '(0M)', includeEmpty: true },
-            { imgName: 'F2', floorName: '2F', displayName: '2F', altitude: '(5.4M)', includeEmpty: true },
+            { imgName: '2F', floorName: '2F', displayName: '2F', altitude: '(5.4M)', includeEmpty: true },
         ],
         'T2': [
-            { imgName: 'F1', floorName: '1F', displayName: '1F', altitude: '(0M)', includeEmpty: true },
-            { imgName: 'F2', floorName: '2F', displayName: '2F', altitude: '(4.2M)', includeEmpty: true },
-            { imgName: 'F3', floorName: '3F', displayName: '3F', altitude: '(4.2M)', includeEmpty: true },
+            { imgName: '1F', floorName: '1F', displayName: '1F', altitude: '(0M)', includeEmpty: true },
+            { imgName: '2F', floorName: '2F', displayName: '2F', altitude: '(4.2M)', includeEmpty: true },
             { imgName: 'M2', floorName: 'M2', displayName: 'M2', altitude: '(8.55M)', includeEmpty: true },
         ],
         'Dj': [
-            { imgName: 'F3', floorName: '3F', displayName: '3F', altitude: '(12.15M)', includeEmpty: true },
+            { imgName: 'B1', floorName: 'B1', displayName: 'B1', altitude: '(-7.95M)', includeEmpty: true },
+            { imgName: '3F', floorName: '3F', displayName: '3F', altitude: '(12.15M)', includeEmpty: true },
         ]
     };
     
     // 转换TIMData为model格式
-    let modelTabs = convertTIMDataToModelFormat(TIMData, "seat", configs);
+    let modelTabs = convertTIMDataToModelFormat(TIMData, "dgc", configs);
     
     // ret['TIMData'] = TIMData;
     ret['modelTabs'] = modelTabs;

src/biz/zy.ts

@@ -666,17 +666,17 @@ export async function getSeatPoint(req, res) {
 
     const configs = {
         'T1': [
-            { imgName: 'F1', floorName: '1F', displayName: '1F', altitude: '(0.0M)', includeEmpty: true },
-            { imgName: 'F2', floorName: '2F', displayName: '2F', altitude: '(5.4M)', includeEmpty: true },
+            { imgName: '1F', floorName: '1F', displayName: '1F', altitude: '(0.0M)', includeEmpty: true },
+            { imgName: '2F', floorName: '2F', displayName: '2F', altitude: '(5.4M)', includeEmpty: true },
         ],
         'T2': [
-            { imgName: 'F1', floorName: '1F', displayName: '1F', altitude: '(0.0M)', includeEmpty: true },
-            { imgName: 'F2', floorName: '2F', displayName: '2F', altitude: '(4.2M)', includeEmpty: true },
+            { imgName: '1F', floorName: '1F', displayName: '1F', altitude: '(0.0M)', includeEmpty: true },
+            { imgName: '2F', floorName: '2F', displayName: '2F', altitude: '(4.2M)', includeEmpty: true },
             { imgName: 'M2', floorName: 'M2', displayName: 'M2', altitude: '(8.55M)', includeEmpty: true },
-            { imgName: 'F3', floorName: '3F', displayName: '3F', altitude: '(4.2M)', includeEmpty: true },
+            { imgName: '3F', floorName: '3F', displayName: '3F', altitude: '(4.2M)', includeEmpty: true },
         ],
         'Dj': [
-            { imgName: 'F3', floorName: '3F', displayName: '3F', altitude: '(12.15M)', includeEmpty: true },
+            { imgName: '3F', floorName: '3F', displayName: '3F', altitude: '(12.15M)', includeEmpty: true },
         ]
     };
     

src/data/table/roomPoint.ts

@@ -152,4 +152,48 @@ export function signPointDjTableData() {
     return result;
 }
 
+/**---------------------------------------登高车-------------------------------------------- */
+export function dgcPointT1TableData() {
+    let blockDataList = onceSheetBecomeOfblockData('汇总登高车定点.xlsx', 'T1');
+
+    let keyValueOrTitleList = ['T1']; //适配 饼图 键值以及需要多个Key的
+    let barChartList = []; //适配 柱状图 折线图
+    let stringList = [];
+    let decollatePlanarList = []; //适配 表格
+    let titleListConfig = {};
+
+    let result = packageDataProcess(blockDataList, titleListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
+    return result;
+}
+
+
+export function dgcPointT2TableData() {
+    let blockDataList = onceSheetBecomeOfblockData('汇总登高车定点.xlsx', 'T2');
+
+    let keyValueOrTitleList = ['T2']; //适配 饼图 键值以及需要多个Key的
+    let barChartList = []; //适配 柱状图 折线图
+    let stringList = [];
+    let decollatePlanarList = []; //适配 表格
+    let titleListConfig = {};
+
+    let result = packageDataProcess(blockDataList, titleListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
+    return result;
+}
+
+
+export function dgcPointDjTableData() {
+    let blockDataList = onceSheetBecomeOfblockData('汇总登高车定点.xlsx', '东郊');
+
+    let keyValueOrTitleList = ['东郊']; //适配 饼图 键值以及需要多个Key的
+    let barChartList = []; //适配 柱状图 折线图
+    let stringList = [];
+    let decollatePlanarList = []; //适配 表格
+    let titleListConfig = {};
+
+    let result = packageDataProcess(blockDataList, titleListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
+    return result;
+}
+
+
+
 

src/routers/router.ts

@@ -8,6 +8,7 @@ import * as md5Routers from '../biz/md5';
 import * as TIM2Routers from '../biz/TIM2';
 import * as zyRouters from '../biz/zy';
 import * as bzbsRouters from '../biz/bzbs';
+import * as dgcRouters from '../biz/dgc';
 
 
 export function setRouter(httpServer){
@@ -17,7 +18,7 @@ export function setRouter(httpServer){
     httpServer.post('/api/room/point', asyncHandler(TIMRouters.getRoomPoint)); //业务用房撒点
     httpServer.post('/api/seat/point', asyncHandler(zyRouters.getSeatPoint)); //座椅撒点
     httpServer.post('/api/sign/point', asyncHandler(bzbsRouters.getSignPoint)); //标志标识撒点
-    // httpServer.post('/api/seat/point', asyncHandler(zyRouters.getSeatPoint)); //登高车撒点
+    httpServer.post('/api/dgc/point', asyncHandler(dgcRouters.getDgcPoint)); //登高车撒点
     
     // 公开接口 - 生成签名（前端调用）
     httpServer.post('/api/auth/generateSign', asyncHandler(md5Routers.generateSignApi));