冲突

Shuxia Ning

2025-01-08 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/17-compressor/AssetsCompressorSingleMatchingCtrl.cs

@@ -1,15 +1,4 @@
using DevExpress.XtraBars.Ribbon.Drawing;
using DevExpress.XtraEditors;
using DevExpress.XtraMap;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using System.Data;

namespace HStation.WinFrmUI
{
@@ -33,6 +22,8 @@
        private AssetsCompressorSingleMatchingViewModel _row;
        private CompressorMatchingViewModel _viewModel;

        private long? _curveDbId;

        public class CompressorMatchingViewModel
        {
            public CompressorMatchingViewModel()
@@ -47,7 +38,7 @@
        /// <summary>
        /// 绑定数据
        /// </summary>
        public async void SetBindingData(string dbId)
        public async void SetBindingData(string dbId, string curveDbId)
        {
            var allList = await BLLFactory<HStation.BLL.AssetsCompressorMain>.Instance.GetAll();
            _allList = new List<AssetsCompressorSingleMatchingViewModel>();
@@ -56,6 +47,10 @@
            {
                var item = allList?.Find(x => x.ID == id);
                _selected = item;
            }
            if (long.TryParse(curveDbId, out long curveid))
            {
                _curveDbId = curveid;
            }
            Search();
            await Task.Delay(300);
@@ -137,15 +132,14 @@
            }
            _row = row;
            _viewModel.Vmo = row.Vmo;
            this.phartDiagramRelationGridViewCtrl1.SetBindingData(HStation.Assets.DataType.CompressorMain, row.Vmo.ID);
            this.phartDiagramRelationGridViewCtrl1.SetBindingData(HStation.Assets.DataType.CompressorMain, row.Vmo.ID, _curveDbId);
        }

        //曲线数据关联变化
        private void SelectData(List<PhartDiagramRelationExtensionsVmo> list)
        private void SelectData(PhartDiagramRelationExtensionsVmo def)
        {
            if (list != null && list.Count > 0)
            if (def != null)
            {
                var def = list.OrderByDescending(x => x.Importance).First();
                _viewModel.MatchingCurveDbId = def.ID.ToString();
                var curve = def.Diagram.GraphList[0].GetFeatPointList();