From b32c0a21755ac3e86df0242d993398773cb627f2 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 04 十二月 2024 17:04:15 +0800
Subject: [PATCH] 修改资产界面
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/15-meter/02-main/AddAssetsSprinklerMainDlg.cs | 84 ------------------------------------------
1 files changed, 0 insertions(+), 84 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/15-meter/02-main/AddAssetsSprinklerMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/15-meter/02-main/AddAssetsSprinklerMainDlg.cs
index 5853028..5174d66 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/15-meter/02-main/AddAssetsSprinklerMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/15-meter/02-main/AddAssetsSprinklerMainDlg.cs
@@ -23,26 +23,6 @@
this.MeterCoefficientViewModelBindingSource.DataSource = _AssetsMeterCoefficient;
_MeterVmo = new Vmo.AssetsMeterMainVmo();
_MeterVmo.SeriesID = SeriesID;
- var allCaliber = await new Yw.BLL.SysDictData().GetByTypeCode("1");
- if (allCaliber != null)
- {
- foreach (var item in allCaliber)
- {
- var imageItem = new ImageComboBoxItem(item.Name, item.ID);
- TextEditCaliber.Properties.Items.Add(imageItem);
- }
- }
- var allMaterial = await new Yw.BLL.SysDictData().GetByTypeCode("3");
- if (allMaterial != null)
- {
- foreach (var item in allMaterial)
- {
- var imageItem = new ImageComboBoxItem(item.Name, item.ID);
- TextEditMaterial.Properties.Items.Add(imageItem);
- }
- }
- TextEditCaliber.SelectedIndex = 0;
- TextEditMaterial.SelectedIndex = 0;
this.selectFlagsPopupCtrl1.SetBindingData<AssetsFlags>();
}
@@ -66,65 +46,6 @@
return true;
}
- //鏉愭枡閫夋嫨鍙樺寲浜嬩欢
- private void TextEditMaterial_SelectedIndexChanged(object sender, EventArgs e)
- {
- if (_AssetsMeterCoefficient == null)
- return;
- var select = GetCoefficientByMaterial(TextEditMaterial.Text);
- if (select == null)
- {
- this.TextEditCoefficient.Text = string.Empty;
- return;
- }
- this.TextEditCoefficient.Text = select.MinorLoss.ToString();
- }
-
- //鍙ｅ緞閫夋嫨鍙樺寲浜嬩欢
- private void TextEditCaliber_SelectedIndexChanged(object sender, EventArgs e)
- {
- if (_AssetsMeterCoefficient == null)
- return;
- if (double.TryParse(TextEditCaliber.Text, out double caliber))
- {
- foreach (var item in _AssetsMeterCoefficient)
- {
- if (item.Caliber.HasValue)
- {
- if (Math.Abs(Convert.ToDouble(item.Caliber) - caliber) < 10)
- {
- this.TextEditCoefficient.Text = item.MinorLoss.ToString();
- return;
- }
- }
- }
- }
- }
-
- //鎵惧埌鏈�鐩歌繎鐨勬潗鏂�
- private AssetsMeterCoefficientVmo GetCoefficientByMaterial(string name)
- {
- AssetsMeterCoefficientVmo select = null;
- int maxMatchedChars = 0;
- foreach (var item in _AssetsMeterCoefficient)
- {
- int matchedChars = GetIntersect(item.Material, name);
- if (matchedChars > maxMatchedChars)
- {
- maxMatchedChars = matchedChars;
- select = item;
- return select;
- }
- }
- return select;
- }
-
- private int GetIntersect(string str1, string str2)
- {
- if (str1 == null || str2 == null) return 0;
- return string.Join("", str1.Intersect(str2)).Count();
- }
-
//瀹屾垚
private async void BtnOk_ClickAsync(object sender, EventArgs e)
{
@@ -133,11 +54,6 @@
_MeterVmo.Description = DescriptionTextEdit.Text.Trim();
_MeterVmo.Name = TextEditName.Text.Trim();
_MeterVmo.KeyWord = this.TextEditKeyWord.Text.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList();
- _MeterVmo.Material = TextEditMaterial.Text.Trim();
- if (double.TryParse(TextEditCaliber.Text, out double caliber))
- {
- _MeterVmo.Caliber = caliber;
- }
if (double.TryParse(TextEditMinorLoss.Text, out double minorLoss))
{
_MeterVmo.MinorLoss = minorLoss;
--
Gitblit v1.9.3