Commit caef2e79 by 孙香冬

no message

parent c7f5be7c
...@@ -10,15 +10,15 @@ import { getOnlieCarCount } from "../../data/interface/wsData"; ...@@ -10,15 +10,15 @@ import { getOnlieCarCount } from "../../data/interface/wsData";
export async function getYZY(req, res) { export async function getYZY(req, res) {
let ret:any = {}; let ret:any = {};
let {计算云资源, 使用率, 物理资源} = await getHardware(); // let {计算云资源, 使用率, 物理资源} = await getHardware();
// let 计算云资源 = {"cpu":"3568核", "内存":"4000G", "本地磁盘":"1999G", "云磁盘总量":"848484G"}; let 计算云资源 = {"cpu":"3568核", "内存":"4000G", "本地磁盘":"1999G", "云磁盘总量":"848484G"};
ret["api1"] = getKeyValueNumberOutData("计算云资源", 计算云资源 ); ret["api1"] = getKeyValueNumberOutData("计算云资源", 计算云资源 );
// let 使用率 = {"CPU":"63.9%", "内存":"30.4%", "本地磁盘":"29.6%", "云磁盘cds ssd池":"23%", "云磁盘cds sata池":"73%", "对象存储":"73.83%"}; let 使用率 = {"CPU":"63.9%", "内存":"30.4%", "本地磁盘":"29.6%", "云磁盘cds ssd池":"23%", "云磁盘cds sata池":"73%", "对象存储":"73.83%"};
ret["api2"] = getKeyValueNumberOutData("计算云资源使用率", 使用率 ); ret["api2"] = getKeyValueNumberOutData("计算云资源使用率", 使用率 );
// let 物理资源 = {"物理机":"100台", "网络设备":"34台", "安全设备":"4台", "机柜":"16台"}; let 物理资源 = {"物理机":"100台", "网络设备":"34台", "安全设备":"4台", "机柜":"16台"};
ret["api3"] = getKeyValueNumberOutData("物理资源", 物理资源 ); ret["api3"] = getKeyValueNumberOutData("物理资源", 物理资源 );
res.send(ret); res.send(ret);
...@@ -34,7 +34,7 @@ export async function getCSGK(req, res) { ...@@ -34,7 +34,7 @@ export async function getCSGK(req, res) {
result.forEach((info, index) => { result.forEach((info, index) => {
let {key, value} = info; let {key, value} = info;
let {dataNum, dataUnit} = separateDataAndUint(value); let {dataNum, dataUnit} = separateDataAndUint(value);
基础数据Info.push({key, value:dataNum, unit:dataUnit, icon:`http://192.168.0.117:30001/csgk/${index+1}.png`}); 基础数据Info.push({key, value:dataNum, unit:dataUnit, icon:`http://192.168.0.105:30001/csgk/${index+1}.png`});
}); });
ret["api1"] = ({title:"基础数据", dataList: 基础数据Info}); ret["api1"] = ({title:"基础数据", dataList: 基础数据Info});
......
...@@ -79,7 +79,7 @@ async function getTestLicense() { ...@@ -79,7 +79,7 @@ async function getTestLicense() {
测试牌照分布.forEach( item => { 测试牌照分布.forEach( item => {
let {enterprise, cnt} = item; let {enterprise, cnt} = item;
let imgItem = `http://192.168.0.117:30001/img/${enterprise}.png`; let imgItem = `http://192.168.0.105:30001/img/${enterprise}.png`;
测试牌照分布data[imgItem] = cnt; 测试牌照分布data[imgItem] = cnt;
测试牌照数 += cnt; 测试牌照数 += cnt;
}) })
......
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