Skip to content

S
shanghaiTIM
Commit ea8b442a by PC-20251223ZVQQ\Administrator
Options

登高车、标志标识

parent 22bca205
Showing with 328 additions and 566 deletions
src/biz/bzbs.ts
......@@ -57,9 +57,9 @@ export async function getFloor(req, res) {
let ldStr = ld;
if (ld == "东交") ldStr = "DJ";
let lcStr = enumConfig[`${ldStr}_ywyf`][lc];
// let lcStr = enumConfig[`${ldStr}_ywyf`][lc];
let url = `${systemConfig.floorBZBS}?ld=${ld}&lc=${lcStr}`;
let url = `${systemConfig.floorBZBS}?ld=${ld}&lc=${lc}`;
let floorInfo = await postAxios(url, {}, {});
......@@ -77,8 +77,8 @@ export async function getFloor(req, res) {
export async function getSign(req, res) {
let ret:any = {};
let {bsmc} = req.body;
let url = `${systemConfig.signBZBS}?bsmc=${bsmc}`;
let {bsmc,ld,lc} = req.body;
let url = `${systemConfig.signBZBS}?bsmc=${bsmc}&ld=${ld}&lc=${lc}`;
let signInfo = await postAxios(url, {}, {});
......@@ -120,7 +120,7 @@ export async function getSignPoint(req, res) {
{ imgName: '4F', floorName: '4F', displayName: '4F', altitude: '(21.65M)', includeEmpty: true },
],
'Dj': [
{ imgName: 'B1', floorName: 'B1', displayName: 'B1', altitude: '(-4.8M)', includeEmpty: true },
{ imgName: 'B1', floorName: 'B1', displayName: 'B1', altitude: '(-7.95M)', includeEmpty: true },
{ imgName: '1F', floorName: '1F', displayName: '1F', altitude: '(0.0M)', includeEmpty: true },
{ imgName: '2F', floorName: '2F', displayName: '2F', altitude: '(6.6M)', includeEmpty: true },
{ imgName: '3F', floorName: '3F', displayName: '3F', altitude: '(12.15M)', includeEmpty: true },
......
src/biz/dgc.ts
......@@ -8,648 +8,293 @@ import { convertTIMDataToModelFormat } from "../dataPackage/tool";
/**
* 1、全部登高车数据
* 1、登高车数据
* @param req
* @param res
*/
export async function getTotal(req, res) {
let ret = {
"ztsj": {
"zyzs":"13600",
"zyzmj":"66656.38㎡",
"zyqys":"106",
"axzy":"2000"
"clzs": "999999",
"kycl": "88888",
"jyz": "11111",
"gzsl": "900000",
"clsyl": "82"
},
"qjzyzygl":[
"zygl": [
{
"key": "东交中心",
"zys": "40",
"zbs": "25",
"mj": "31"
"key": "东交中心", //图例名称
"zzc": "40", //图例值
"sts": "25", //图例值
"qbc": "31", //图例值
"jds": "31" //图例值
},
{
"key": "T1航站楼",
"zys": "40",
"zbs": "25",
"mj": "31"
"zzc": "40",
"sts": "25",
"qbc": "31",
"jds": "31"
},
{
"key": "T2航站楼",
"zys": "40",
"zbs": "25",
"mj": "31"
"zzc": "40",
"sts": "25",
"qbc": "31",
"jds": "31"
}
],
"jqn": "106",
"jqw": "106",
"zylx": "10",
"zypzlxfb":[
{
"key": "排椅",
"sl": "15"
},
{
"key": "躺椅",
"sl": "15"
},
{
"key": "沙发椅",
"sl": "15"
},
{
"key": "长凳",
"sl": "15"
"clsxfx": {
"clzz": {
"jcsj": {
"zzlxsl": "4种", //载重类型
"zdzzs": "250kg" //最大载重数
},
"clsxfxqs": [
{
"key": "125kg", //X轴名称
"sl": "15" //数量
},
{
"key": "136kg",
"sl": "15"
},
{
"key": "200kg",
"sl": "15"
}
]
},
{
"key": "临时座椅",
"sl": "15"
"dclx": {
"jcsj": {
"dclxsl": "3种"
},
"clsxfxqs": [
{
"key": "磷酸铁锂", //X轴名称
"sl": "15" //数量
},
{
"key": "铅酸电池",
"sl": "15"
},
{
"key": "即插即用",
"sl": "15"
}
]
}
],
"xxqfwxz":{
}, "zlsyqkfx": {
"jcsj": {
"xxqzs":"12",
"xxqzmj":"6"
"zlsy": "12000次",
"syl": "88.8%"
},
"xxqxz": [
{
"key":"东交中心",
"sl":"11",
"mj":"13"
},
{
"key":"T1航站楼",
"sl":"11",
"mj":"13"
},
{
"key":"T2航站楼",
"sl":"11",
"mj":"13"
}
]
},
"cdmbpzfx":{
"cdbzs": "132",
"cdmbfx": [
"zlsyqkfxqs": [
{
"key":"东交中心",
"ptc":"11",
"axc":"13",
"wxc":"13"
"key": "2024",
"value": "130"
},
{
"key":"T1航站楼",
"ptc":"11",
"axc":"13",
"wxc":"13"
"key": "2025",
"value": "1300"
},
{
"key":"T2航站楼",
"ptc":"11",
"axc":"13",
"wxc":"13"
"key": "2026",
"value": "13000"
}
]
},
"rcxjgl":{
}, "jsyxx": {
"jsys": "10人",
"jbxx": [{
"tx": "http://xxxxx.img",
"jsyxm": "张*封",
"zt": "有效",
"dwmc": "上海华地建设工程有限公司",
"jsz": "http://xxxxx.img"
}]
}, "cgxjfx": {
"jcsj": {
"xjjh":"12",
"ywc":"6",
"wwc":"3",
"fxwt":"3"
"xjjh": "12000",
"yxj": "10000",
"dxj": "2000"
},
"xjqk": [
"xjzxqsfx": [
{
"key":"问题类型1",
"sl":"11"
"key": "1月",
"yxj": "130",
"dxj": "130"
},
{
"key":"问题类型2",
"sl":"11"
"key": "2月",
"yxj": "1300",
"dxj": "130"
},
{
"key":"问题类型3",
"sl":"11"
"key": "3月",
"yxj": "13000",
"dxj": "130"
}
]
},
"zysszgjl":{
"zgcs": "",
"zysszgjlbg": {
"titleList":["整改时间", "位置", "负责人", "整改原因", "状态"],
"dataList":[
["", "", "", "", ""],
["", "", "", "", ""]
]
}
},
"bpbjsy": [
{
"key": "备品备件类型1",
"value": "2000"
},
{
"key": "备品备件类型2",
"value": "20000"
},
{
"key": "备品备件类型3",
"value": "30000"
}
],
"zyssghqksl":[
{
"key":"东交中心",
"ygh":"11",
"ghz":"13",
"dgh":"13"
},
{
"key":"T1航站楼",
"ygh":"11",
"ghz":"13",
"dgh":"13"
},
{
"key":"T2航站楼",
"ygh":"11",
"ghz":"13",
"dgh":"13"
}
],
"zyssghqkmj":[
{
"key":"东交中心",
"ygh":"11",
"ghz":"13",
"dgh":"13"
},
{
"key":"T1航站楼",
"ygh":"11",
"ghz":"13",
"dgh":"13"
},
{
"key":"T2航站楼",
"ygh":"11",
"ghz":"13",
"dgh":"13"
}
]
}
// let ret:any = {};
// let url = `${systemConfig.totalZY}`;
// let totalInfo = await postAxios(url, {}, {});
// ret = totalInfo.body;
res.send(ret);
}
/**
* 2、楼栋登高车数据
* @param req
* @param res
*/
export async function getTerminal(req, res) {
let ret = {
"ztsj": {
"zyzs": "13600",
"zyzmj": "66656.38㎡",
"zyqys": "106",
"axzy": "2000"
},
"zyzygl":[
{
"key": "排椅",
"zys": "40",
"zbs": "25",
"mj": "31"
},
{
"key": "吧椅",
"zys": "40",
"zbs": "25",
"mj": "31"
},
{
"key": "休闲区",
"zys": "40",
"zbs": "25",
"mj": "31"
},
],
"jqn": "106",
"jqw": "106",
"zylx": "10",
"zylxpb":[
{
"key": "排椅",
"value": "15"
},
{
"key": "躺椅",
"value": "10"
},
{
"key": "沙发椅",
"value": "13"
},
{
"key": "长凳",
"value": "21"
},
{
"key": "临时座椅",
"value": "17"
}
],
"xxqfwxz":{
"M2-60口-躺椅": {
"img": "http://ip:端口/1.jpg",
"wz": "M2层-60登记口",
"zys":"100",
"mj":"100㎡",
"rjmj":"1㎡",
"gg":"5个一排躺椅",
},
"M2-71口-云端椅": {
"img": "http://ip:端口/2.jpg",
"wz": "M2层-71登记口",
"zys":"100",
"mj":"100㎡",
"rjmj":"1㎡",
"gg":"云端椅",
}, "clwbfx": {
"jcsj": {
"wbjh": "8",
"ywb": "3",
"dwb": "0"
},
},
"cdmbpzfx":{
"cdbzs": "1654",
"cdmbfx": [
"clwbfxzb": [
{
"key":"普通充",
"sl":"11"
"key": "日常保养",
"value": "130"
},
{
"key":"爱心充",
"sl":"11"
"key": "更换配件",
"value": "1300"
},
{
"key":"无线充",
"sl":"11"
},
"key": "故障维修",
"value": "13000"
}
]
},
"rcxjgl":{
}, "jbxfx": {
"jcsj": {
"xjjh":"12",
"ywc":"6",
"wwc":"3",
"fxwt":"3",
"jbxs": "106",
"ywc": "100",
"wwc": "6"
},
"xjqk": [
"jbxfxqs": [
{
"key":"问题类型1",
"sl":"11",
"key": "5.21",
"jbsl": "130",
"ywc": "100",
"wwc": "30"
},
{
"key":"问题类型2",
"sl":"11",
"key": "5.22",
"jbsl": "30",
"ywc": "20",
"wwc": "10"
},
{
"key":"问题类型3",
"sl":"11",
},
"key": "5.23",
"jbsl": "10",
"ywc": "0",
"wwc": "10"
}
]
},
"zysszgjl":{
"zgcs": "",
"zysszgjlbg": {
"titleList":["整改时间", "位置", "负责人", "整改原因", "状态"],
"dataList":[
["", "", "", "", ""],
["", "", "", "", ""]
]
}
},
"bpbjsy": [
{
"key": "备品备件类型1",
"value": "2000",
},
{
"key": "备品备件类型2",
"value": "20000"
},
{
"key": "备品备件类型3",
"value": "30000"
}
],
"zyssghqk":[
{
"key":"已规划",
"sl":"11",
"mj":"13"
},
{
"key":"规划中",
"sl":"11",
"mj":"13"
},
{
"key":"待规划",
"sl":"11",
"mj":"13"
},
]
}
}
// let ret:any = {};
// let {ld} = req.body;
// let url = `${systemConfig.terminalZY}?ld=${ld}`;
// let terminalInfo = await postAxios(url, {}, {});
// ret = terminalInfo.body;
// let url = `${systemConfig.totalZY}`;
// let totalInfo = await postAxios(url, {}, {});
// ret = totalInfo.body;
res.send(ret);
}
/**
* 3、楼层登高车数据
* 2、单个车辆弹窗
* @param req
* @param res
*/
export async function getFloor(req, res) {
export async function getDevicePop(req, res) {
let ret = {
"ztsj": {
"zyzs": "13600",
"zyzmj": "66656.38㎡",
"zyqys": "106",
"axzy": "2000"
},
"zyzygl":[
{
"key": "排椅",
"zys": "40",
"zbs": "25",
"mj": "31"
},
{
"key": "吧椅",
"zys": "40",
"zbs": "25",
"mj": "31"
},
{
"key": "休闲区",
"zys": "40",
"zbs": "25",
"mj": "31"
},
],
"jqn": "106",
"jqw": "106",
"zylx": "10",
"zylxpb":[
{
"key": "排椅",
"value": "15"
},
{
"key": "躺椅",
"value": "10"
},
{
"key": "沙发椅",
"value": "13"
},
{
"key": "长凳",
"value": "21"
},
{
"key": "临时座椅",
"value": "17"
}
],
"cdmbpzfx":{
"cdbzs": "1654",
"cdmbfx": [
{
"key":"普通充",
"sl":"11"
"clxx": {
"clzp": "车辆照片",
"status": "使用中",
"deviceId": "T101",
"name": "蜘蛛车",
"type": "DT22",
"unit": "湖南安装",
"clzz": "200kg",
"cw": "T1出发一号门外",
"dclx": "无",
"fzr": "张*恒",
"fzrdh": "157*****517"
}, "clwbjl": {
"jcsj": {
"wbjh": "8",
"mcwb": "2026.05.25"
},
"clwbjlb": {
"titleList": ["维保时间", "维保项目", "负责人", "状态"],
"dataList": [{
"wbsj": "2026.05.23",
"wbxm": "日常保养",
"fzr": "xxx",
"zt": "已维保"
},
{
"key":"爱心充",
"sl":"11"
"wbsj": "2026.05.24",
"wbxm": "更换配件",
"fzr": "xxx",
"zt": "已维保"
},
{
"key":"无线充",
"sl":"11"
},
]
},
"rcxjqk":{
"wbsj": "2026.05.25",
"wbxm": "故障维修",
"fzr": "xxx",
"zt": "已维保"
}]
}
}, "cgxjfx": {
"jcsj": {
"xjjh":"12",
"ywc":"6",
"wwc":"3",
"fxwt":"3",
"xjjh": "8",
"mcxj": "2026.05.25"
},
"xjqk": [
"wtlyzb": [
{
"key":"问题类型1",
"sl":"11",
"key": "问题1",
"wtsl": "130"
},
{
"key":"问题类型2",
"sl":"11",
"key": "问题2",
"wtsl": "130"
},
{
"key":"问题类型3",
"sl":"11",
},
"key": "问题3",
"wtsl": "130"
}
]
},
"bxjl":{
}, "jbxjl": {
"jcsj": {
"jbxs": "106",
"ywc": "21",
"wwc": "85",
},
"bxjlbg": {
"titleList":["整改时间", "位置", "负责人", "整改原因", "状态"],
"dataList":[
["", "", "", "", ""],
["", "", "", "", ""],
]
}
},
"cqwxjfxyj": [
{
"key": "≥15天",
"value": "2000",
},
{
"key": "10-15天",
"value": "1320"
},
{
"key": "0-10天",
"value": "1000"
}
],
"zysszgjl":{
"zgcs": "",
"zysszgjlbg": {
"titleList":["整改时间", "位置", "负责人", "整改原因", "状态"],
"dataList":[
["", "", "", "", ""],
["", "", "", "", ""]
]
}
},
"zyssghqk":[
{
"key":"已规划",
"sl":"11",
"mj":"13"
},
{
"key":"规划中",
"sl":"11",
"mj":"13"
},
{
"key":"待规划",
"sl":"11",
"mj":"13"
},
]
}
// let ret:any = {};
// let {ld, lc} = req.body;
// let ldStr = ld;
// if (ld == "东交") ldStr = "DJ";
// let lcStr = enumConfig[`${ldStr}_ywyf`][lc];
// let url = `${systemConfig.floorZY}?ld=${ld}&lc=${lcStr}`;
// let floorInfo = await postAxios(url, {}, {});
// ret = floorInfo.body;
res.send(ret);
}
/**
* 4、登高车信息
* @param req
* @param res
*/
export async function getSeat(req, res) {
let ret = {
"zy": {
"zymc": "公安局门口扶梯下", //座椅名称
"qy": "禁区外", //区域
"lc": "东交F3", //楼层
"img": "http://ip/G-B1-3-B1.jpg" //图片
},
"zygl": {
"qyxf": "公安局楼梯下",
"qy": "禁区外",
"lc": "3F",
"zysl": "24个",
"zbsl": "6个",
"cdksl": "6个",
"axzy": "3个",
"zymj": "30㎡",
"zygg": "2座+1桌+2桌、3座+1桌+2座",
},
"jqn": "106",
"jqw": "106",
"zylx": "10",
"zylxpb":[
{
"key": "排椅",
"value": "15"
},
{
"key": "躺椅",
"value": "10"
},
{
"key": "沙发椅",
"value": "13"
},
{
"key": "长凳",
"value": "21"
},
{
"key": "临时座椅",
"value": "17"
}
],
"zysszgjl":{
"zgcs": "106",
"zysszgjlbg": {
"titleList":["整改时间", "位置", "负责人", "整改原因", "状态"],
"dataList":[
["", "", "", "", ""],
["", "", "", "", ""]
]
"jbxs": "8",
"wxz": "8",
"dwx": "0"
},
"jbxfxb": {
"titleList": ["接修时间", "接修原因", "负责人", "状态"],
"dataList": [{
"jxsj": "2026.01.01",
"jxyy": "xxxxxx",
"fzr": "xxx",
"zt": "维修中"
}, {
"jxsj": "2026.01.02",
"jxyy": "xxxxxx",
"fzr": "xxx",
"zt": "维修中"
}]
}
},
"rcxj":{
"fxwt": "0",
"dcl": "1",
},
"xjgd": [
{
"img": "http://ip/qk1.jpg",
"yhmc": "门把手损坏", //隐患名称
"fxsj": "2025-07-24", //发现时间
"yjclsj": "1天",
"fzr": "张三", //负责人
},
{
"img": "http://ip/qk2.jpg",
"yhmc": "灯光不亮",
"fxsj": "2025-07-24", //发现时间
"yjclsj": "1天",
"fzr": "李四",
}
]
}
}
// let ret:any = {};
// let {zymc} = req.body;
// let url = `${systemConfig.seatZY}?zymc=${zymc}`;
// let seatInfo = await postAxios(url, {}, {});
// ret = seatInfo.body;
res.send(ret);
}
......
src/biz/zy.ts
......@@ -5,6 +5,21 @@ import { postAxios } from "../util/request";
import * as enumConfig from "../config/enum";
import { seatPointDjTableData, seatPointT1TableData, seatPointT2TableData } from "../data/table/roomPoint";
import { convertTIMDataToModelFormat } from "../dataPackage/tool";
import { planaryArrayBecomeOfBlockData } from "../util/analysisExcel";
const xlsx = require('node-xlsx');
const path = require('path');
/** 读取座椅设施规划情况.xlsx的指定sheet，返回数据块列表 */
export async function readZyssghqkSheet(sheetName: string) {
const filePath = path.join(__dirname.substring(0, __dirname.indexOf("out")), "res", "座椅设施规划情况.xlsx");
const workSheets = xlsx.parse(filePath);
const sheetMap: any = {};
for (const sh of workSheets) {
sheetMap[sh.name] = sh.data;
}
return planaryArrayBecomeOfBlockData(sheetMap[sheetName]);
}
/**
......@@ -206,6 +221,36 @@ export async function getTotal(req, res) {
let totalInfo = await postAxios(url, {}, {});
ret = totalInfo.body;
// 读取座椅设施规划情况.xlsx文件中全局页里面的座椅数量数据
const blockList: any = await readZyssghqkSheet("全局");
const nameMap: any = { "东交": "东交中心", "T1": "T1航站楼", "T2": "T2航站楼" };
const slBlock = blockList.find((b: any) => b.blockTitle === "座椅数量");
if (slBlock && slBlock.blockData) {
const headerRow = slBlock.blockData[0];
const yghIdx = headerRow.indexOf("已规划");
const ghzIdx = headerRow.indexOf("规划中");
const dghIdx = headerRow.indexOf("待规划");
ret["zyssghqksl"] = slBlock.blockData.slice(1).map((row: any) => ({
key: nameMap[row[0]] || row[0],
ygh: String(row[yghIdx] ?? ""),
ghz: String(row[ghzIdx] ?? ""),
dgh: String(row[dghIdx] ?? "")
}))?? [];
}
const mjBlock = blockList.find((b: any) => b.blockTitle === "座椅面积");
if (mjBlock && mjBlock.blockData) {
const headerRow = mjBlock.blockData[0];
const yghIdx = headerRow.indexOf("已规划");
const ghzIdx = headerRow.indexOf("规划中");
const dghIdx = headerRow.indexOf("待规划");
ret["zyssghqkmj"] = mjBlock.blockData.slice(1).map((row: any) => ({
key: nameMap[row[0]] || row[0],
ygh: String(row[yghIdx] ?? ""),
ghz: String(row[ghzIdx] ?? ""),
dgh: String(row[dghIdx] ?? "")
}))?? [];
}
res.send(ret);
}
......@@ -377,7 +422,21 @@ export async function getTerminal(req, res) {
let terminalInfo = await postAxios(url, {}, {});
ret = terminalInfo.body;
// 读取座椅设施规划情况.xlsx文件中${ld}页里面表头为${ld}的数据
const blockList: any = await readZyssghqkSheet(ld);
const ldBlock = blockList.find((b: any) => b.blockTitle === ld);
if (ldBlock && ldBlock.blockData) {
const headerRow = ldBlock.blockData[0];
const slIdx = headerRow.indexOf("数量");
const mjIdx = headerRow.indexOf("面积");
ret["zyssghqk"] = ldBlock.blockData.slice(1).map((row: any) => ({
key: row[0],
sl: String(row[slIdx] ?? ""),
mj: String(row[mjIdx] ?? "")
}));
}
res.send(ret);
}
......@@ -549,6 +608,20 @@ export async function getFloor(req, res) {
let floorInfo = await postAxios(url, {}, {});
ret = floorInfo.body;
// 读取座椅设施规划情况.xlsx文件中${ld}页里面表头为${lc}的数据
const blockList: any = await readZyssghqkSheet(ld);
const lcBlock = blockList.find((b: any) => b.blockTitle === lc);
if (lcBlock && lcBlock.blockData) {
const headerRow = lcBlock.blockData[0];
const slIdx = headerRow.indexOf("数量");
const mjIdx = headerRow.indexOf("面积");
ret["zyssghqk"] = lcBlock.blockData.slice(1).map((row: any) => ({
key: row[0],
sl: String(row[slIdx] ?? ""),
mj: String(row[mjIdx] ?? "")
}));
}
res.send(ret);
}
......@@ -673,7 +746,7 @@ export async function getSeatPoint(req, res) {
{ 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: '3F', floorName: '3F', displayName: '3F', altitude: '(4.2M)', includeEmpty: true },
{ imgName: '3F', floorName: '3F', displayName: '3F', altitude: '(12.15M)', includeEmpty: true },
],
'Dj': [
{ imgName: '3F', floorName: '3F', displayName: '3F', altitude: '(12.15M)', includeEmpty: true },
......
src/config/enum.ts
......@@ -33,6 +33,12 @@ export enum T1_ywyf {
"2F" = "5.4M",
"3F" = "10.9M",
"4F" = "16.4M",
// "B1" = "B1（-8.85M）",
// "1F" = "1F（0.0M）",
// "2F" = "2F（5.4M）",
// "3F" = "3F（10.9M）",
// "4F" = "4F（16.4M）",
}
......@@ -49,11 +55,26 @@ export enum T2_ywyf {
"6F" = "28.65M",
"7F" = "32.65M",
"8F" = "36.65M",
// "B1" = "B1（-7.95M）",
// "1F" = "1F（0.0M）",
// "2F" = "2F（4.2M）",
// "M2" = "M2（8.55M）",
// "3F-1" = "3F-1（12.15M）",
// "3F-2" = "3F-2（13.55M）",
// "M3" = "M3（17.15M）",
// "4F" = "4F（21.65M）",
// "5F" = "5F（24.65M）",
// "6F" = "6F（28.65M）",
// "7F" = "7F（32.65M）",
// "8F" = "8F（36.65M）",
}
export enum DJ_ywyf {
"B1" = "B1",
"1F" = "F1",
"2F" = "F2",
"3F" = "F3",
"4F" = "F4",
"5F" = "F5",
......@@ -73,6 +94,12 @@ export enum T1 {
"2F" = "5.4M",
"3F" = "10.9M",
"4F" = "16.4M",
// "B1" = "B1（-8.85M）",
// "1F" = "1F（0.0M）",
// "2F" = "2F（5.4M）",
// "3F" = "3F（10.9M）",
// "4F" = "4F（16.4M）",
}
......@@ -89,11 +116,26 @@ export enum T2 {
"6F" = "28.65M",
"7F" = "32.65M",
"8F" = "36.65M",
// "B1" = "B1（-7.95M）",
// "1F" = "1F（0.0M）",
// "2F" = "2F（4.2M）",
// "M2" = "M2（8.55M）",
// "3F-1" = "3F-1（12.15M）",
// "3F-2" = "3F-2（13.55M）",
// "M3" = "M3（17.15M）",
// "4F" = "4F（21.65M）",
// "5F" = "5F（24.65M）",
// "6F" = "6F（28.65M）",
// "7F" = "7F（32.65M）",
// "8F" = "8F（36.65M）",
}
export enum DJ {
"东交B1" = "-4.8M",
"东交B1" = "-7.95M",
"东交1F" = "0.0M",
"东交2F" = "6.6M",
"东交3F" = "12.15M",
"东交4F" = "19.05M",
"东交5F" = "24.15M",
......
src/dataPackage/tool.ts
......@@ -138,19 +138,19 @@ function organizeDataByFloor(dataList, buildingType, fileName, configs) {
let mapItem;
// 检查这个房间是否是套房的主房间
if (suiteMap.has(item.fjh)) {
if (suiteMap.has(item.fjh??item.bh)) {
// 这是一个套房主房间
mapItem = {
name: item.fjh,
name: item.fjh??item.bh,
x: item.xzzb,
y: item.yzzb,
size: item.dwdx === 'default' ? 'medium' : item.dwdx, // 套房通常用medium尺寸
suites: suiteMap.get(item.fjh)
suites: suiteMap.get(item.fjh??item.bh)
};
} else {
// 普通房间
mapItem = {
name: item.fjh,
name: item.fjh??item.bh,
x: item.xzzb,
y: item.yzzb,
size: item.dwdx
......
src/routers/router.ts
......@@ -45,7 +45,9 @@ export function setRouter(httpServer){
httpServer.post('/api/sign/analyse/floor', asyncHandler(bzbsRouters.getFloor));
httpServer.post('/api/sign/analyse/sign', asyncHandler(bzbsRouters.getSign));
// 登高车
httpServer.post('/api/dgc/analyse/total', asyncHandler(dgcRouters.getTotal));
httpServer.post('/api/dgc/analyse/pop', asyncHandler(dgcRouters.getDevicePop));
}
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