新增单位水头损失属性;新增样式分级属性
This commit is contained in:
@@ -413,7 +413,7 @@ const Toolbar: React.FC<ToolbarProps> = ({
|
|||||||
{ key: "flow", label: "流量", unit: "m³/h" },
|
{ key: "flow", label: "流量", unit: "m³/h" },
|
||||||
{ key: "friction", label: "摩阻", unit: "" },
|
{ key: "friction", label: "摩阻", unit: "" },
|
||||||
{ key: "headloss", label: "水头损失", unit: "m" },
|
{ key: "headloss", label: "水头损失", unit: "m" },
|
||||||
{ key: "headlossPerKM", label: "单位水头损失", unit: "m/km" },
|
{ key: "unit_headloss", label: "单位水头损失", unit: "m/km" },
|
||||||
{ key: "quality", label: "水质", unit: "mg/L" },
|
{ key: "quality", label: "水质", unit: "mg/L" },
|
||||||
{ key: "reaction", label: "反应", unit: "1/d" },
|
{ key: "reaction", label: "反应", unit: "1/d" },
|
||||||
{ key: "setting", label: "设置", unit: "" },
|
{ key: "setting", label: "设置", unit: "" },
|
||||||
@@ -421,8 +421,8 @@ const Toolbar: React.FC<ToolbarProps> = ({
|
|||||||
{ key: "velocity", label: "流速", unit: "m/s" },
|
{ key: "velocity", label: "流速", unit: "m/s" },
|
||||||
];
|
];
|
||||||
const nodeComputedFields = [
|
const nodeComputedFields = [
|
||||||
{ key: "actualdemand", label: "实际需水量", unit: "m³/h" },
|
{ key: "actual_demand", label: "实际需水量", unit: "m³/h" },
|
||||||
{ key: "head", label: "水头", unit: "m" },
|
{ key: "total_head", label: "水头", unit: "m" },
|
||||||
{ key: "pressure", label: "压力", unit: "m" },
|
{ key: "pressure", label: "压力", unit: "m" },
|
||||||
{ key: "quality", label: "水质", unit: "mg/L" },
|
{ key: "quality", label: "水质", unit: "mg/L" },
|
||||||
];
|
];
|
||||||
@@ -448,11 +448,21 @@ const Toolbar: React.FC<ToolbarProps> = ({
|
|||||||
// 追加计算属性
|
// 追加计算属性
|
||||||
if (computedProperties) {
|
if (computedProperties) {
|
||||||
pipeComputedFields.forEach(({ key, label, unit }) => {
|
pipeComputedFields.forEach(({ key, label, unit }) => {
|
||||||
if (computedProperties[key] !== undefined) {
|
let value = computedProperties[key];
|
||||||
|
// 如果是单位水头损失且后端未返回,则通过水头损失/长度计算 (单位 m/km)
|
||||||
|
if (
|
||||||
|
key === "unit_headloss" &&
|
||||||
|
value === undefined &&
|
||||||
|
computedProperties.headloss !== undefined &&
|
||||||
|
properties.length
|
||||||
|
) {
|
||||||
|
value = (computedProperties.headloss / properties.length) * 1000;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (value !== undefined) {
|
||||||
result.properties.push({
|
result.properties.push({
|
||||||
label,
|
label,
|
||||||
value:
|
value: typeof value === "number" ? value.toFixed(3) : value,
|
||||||
computedProperties[key].toFixed?.(3) || computedProperties[key],
|
|
||||||
unit,
|
unit,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -466,7 +476,7 @@ const Toolbar: React.FC<ToolbarProps> = ({
|
|||||||
type: "节点",
|
type: "节点",
|
||||||
properties: [
|
properties: [
|
||||||
{
|
{
|
||||||
label: "海拔",
|
label: "高程",
|
||||||
value: properties.elevation?.toFixed?.(1),
|
value: properties.elevation?.toFixed?.(1),
|
||||||
unit: "m",
|
unit: "m",
|
||||||
},
|
},
|
||||||
@@ -509,7 +519,7 @@ const Toolbar: React.FC<ToolbarProps> = ({
|
|||||||
type: "水池",
|
type: "水池",
|
||||||
properties: [
|
properties: [
|
||||||
{
|
{
|
||||||
label: "海拔",
|
label: "高程",
|
||||||
value: properties.elevation?.toFixed?.(1),
|
value: properties.elevation?.toFixed?.(1),
|
||||||
unit: "m",
|
unit: "m",
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -294,6 +294,7 @@ const MapComponent: React.FC<MapComponentProps> = ({ children }) => {
|
|||||||
properties: [
|
properties: [
|
||||||
// { name: "需求量", value: "demand" },
|
// { name: "需求量", value: "demand" },
|
||||||
{ name: "高程", value: "elevation" },
|
{ name: "高程", value: "elevation" },
|
||||||
|
// 计算属性
|
||||||
{ name: "实际需求量", value: "actualdemand" },
|
{ name: "实际需求量", value: "actualdemand" },
|
||||||
{ name: "水头", value: "head" },
|
{ name: "水头", value: "head" },
|
||||||
{ name: "压力", value: "pressure" },
|
{ name: "压力", value: "pressure" },
|
||||||
@@ -315,10 +316,11 @@ const MapComponent: React.FC<MapComponentProps> = ({ children }) => {
|
|||||||
{ name: "管径", value: "diameter" },
|
{ name: "管径", value: "diameter" },
|
||||||
// { name: "粗糙度", value: "roughness" },
|
// { name: "粗糙度", value: "roughness" },
|
||||||
// { name: "局部损失", value: "minor_loss" },
|
// { name: "局部损失", value: "minor_loss" },
|
||||||
|
// 计算属性
|
||||||
{ name: "流量", value: "flow" },
|
{ name: "流量", value: "flow" },
|
||||||
{ name: "摩阻系数", value: "friction" },
|
{ name: "摩阻系数", value: "friction" },
|
||||||
{ name: "水头损失", value: "headloss" },
|
{ name: "水头损失", value: "headloss" },
|
||||||
{ name: "单位水头损失", value: "headlossPerKM" },
|
{ name: "单位水头损失", value: "unit_headloss" },
|
||||||
{ name: "水质", value: "quality" },
|
{ name: "水质", value: "quality" },
|
||||||
{ name: "反应速率", value: "reaction" },
|
{ name: "反应速率", value: "reaction" },
|
||||||
{ name: "设置值", value: "setting" },
|
{ name: "设置值", value: "setting" },
|
||||||
|
|||||||
Reference in New Issue
Block a user