!866 拆单超长板配置读取WebCad配置,心跳包更新token

pull/866/MERGE
cf-erp 5 years ago committed by ChenX
parent e6e1b41378
commit aaeb962bd0

@ -18,6 +18,7 @@ import { Intent } from "@blueprintjs/core";
import { Entity } from "../../DatabaseServices/Entity/Entity"; import { Entity } from "../../DatabaseServices/Entity/Entity";
import { OrderDataBlock, WaveType } from "./Models/CadBlock"; import { OrderDataBlock, WaveType } from "./Models/CadBlock";
import { ExceedMind } from "./ExceedBlocksMind"; import { ExceedMind } from "./ExceedBlocksMind";
import { userConfig } from "../../Editor/UserConfig";
export class ChaiDan implements Command export class ChaiDan implements Command
{ {
async exec() async exec()
@ -173,8 +174,9 @@ export async function GetProductsEntitys()
metalsList, metalsList,
}; };
} }
function checkBlock(blockList: OrderDataBlock[], goods: { length: number, width: number; } = { length: 2440, width: 1220 }): { result: boolean, warnBlocks: OrderDataBlock[], warnMsg: string; } function checkBlock(blockList: OrderDataBlock[]): { result: boolean, warnBlocks: OrderDataBlock[], warnMsg: string; }
{ {
let goods = { length: userConfig.maxSize.height, width: userConfig.maxSize.width };
let msg: string = ''; let msg: string = '';
let resultBlocks: OrderDataBlock[] = []; let resultBlocks: OrderDataBlock[] = [];
let lengthdeflashing: number = 6; //长修边 let lengthdeflashing: number = 6; //长修边

@ -46,7 +46,14 @@ export class TopPanelStore extends Singleton
//每20分钟发送一次心跳包 //每20分钟发送一次心跳包
setInterval(() => setInterval(() =>
{ {
PostJson(SignUrl.heart, {}); PostJson(SignUrl.heart, {}).then(data =>
{
if (data.err_code == 0)
{
localStorage.setItem(StoreageKeys.PlatSession, data.session);
localStorage.setItem(StoreageKeys.PlatToken, data.token);
}
});
}, 20 * 60 * 1000); }, 20 * 60 * 1000);
let needOpacityEls = [ let needOpacityEls = [
document.getElementById("app"), document.getElementById("app"),

Loading…
Cancel
Save