tangxu
2024-05-11 31c90f2c917573de7feb1979c7b0b2ae62e2cafd
修复接口
已修改5个文件
45 ■■■■ 文件已修改
BLL/IStation.BLL.Connect/AnaPrj.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Desktop/IStation.Desktop.ChCalc/App.config 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebApi/IStation.ChEr.WebApi.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/IStation.WinFrmUI.CalcErQu/IStation.WinFrmUI.CalcErQu.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageCalcParas.cs 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BLL/IStation.BLL.Connect/AnaPrj.cs
@@ -99,7 +99,7 @@
                return null;
            }
            string url = string.Format(@"{0}/AnaPrj/GetPrj?day={1}", ServiceParas.ApiServiceUrl, day.ToString("yyyy-MM-dd"));
            string url = string.Format(@"{0}/AnaPrj/GetPrjByDay?day={1}", ServiceParas.ApiServiceUrl, day.ToString("yyyy-MM-dd"));
            //先根据用户请求的uri构造请求地址
            //string serviceUrl = string.Format("{0}/{1}", this.BaseUri, uri);
Desktop/IStation.Desktop.ChCalc/App.config
@@ -2,9 +2,9 @@
<configuration>
    <appSettings>
        <!--API 路径 (xpump服务器http://47.100.245.85:86/")   真实  http://192.168.201.204:82/-->
        <add key="ApiServiceUrl" value="http://192.168.201.204:82/" />
        <add key="ApiPredictUrl" value="http://192.168.201.204:85" />
        <!--API 路径 (xpump服务器http://47.100.245.85:86/  http://47.100.245.85:8188/")   真实  http://192.168.201.204:82/-->
        <add key="ApiServiceUrl" value="http://47.100.245.85:86/" />
        <add key="ApiPredictUrl" value="http://47.100.245.85:8188/" />
        <add key="IsRemote" value="true" />
    </appSettings>
WebApi/IStation.ChEr.WebApi.csproj.user
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress>true</Use64BitIISExpress>
    <IISExpressSSLPort>44318</IISExpressSSLPort>
WinFrmUI/IStation.WinFrmUI.CalcErQu/IStation.WinFrmUI.CalcErQu.csproj
@@ -315,7 +315,6 @@
    <EmbeddedResource Include="PrjItemSpanTime\SetPrjItemSpanTimeDlg.resx">
      <DependentUpon>SetPrjItemSpanTimeDlg.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="Properties\licenses.licx" />
    <EmbeddedResource Include="RangeCtrl\RunTimeRangePanel.resx">
      <DependentUpon>RunTimeRangePanel.cs</DependentUpon>
    </EmbeddedResource>
WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageCalcParas.cs
@@ -47,14 +47,14 @@
            Task.Run(() =>
            {
                // 获取今日预测值(24点时) 
                var v = IStation.BLL.ReservoirWaterLevel.GetTodayEndPredictiveValue();
                if (v > 0)
                {
                    this.Invoke(new Action(() =>
                    {
                        textEdit当前水库水位.Text = Math.Round( v,2).ToString();
                    }));
                }
                //var v = IStation.BLL.ReservoirWaterLevel.GetTodayEndPredictiveValue();
                //if (v > 0)
                //{
                //    this.Invoke(new Action(() =>
                //    {
                //        textEdit当前水库水位.Text = Math.Round( v,2).ToString();
                //    }));
                //}
                var last3 = BLL.TotalWaterIn.GetLastDay3();
                if (last3 != null && last3.Count == 3)
@@ -625,15 +625,15 @@
        private void labRefresh水位_Click(object sender, EventArgs e)
        {     // 获取今日预测值(24点时) 
            var v = IStation.BLL.ReservoirWaterLevel.GetTodayEndPredictiveValue();
            if (v > 0)
            {
                textEdit当前水库水位.Text = Math.Round(v, 2).ToString();
            }
            else
            {
                MessageBox.Show("计算失败,可能没有今日的调度方案");
            }
            //var v = IStation.BLL.ReservoirWaterLevel.GetTodayEndPredictiveValue();
            //if (v > 0)
            //{
            //    textEdit当前水库水位.Text = Math.Round(v, 2).ToString();
            //}
            //else
            //{
            //    MessageBox.Show("计算失败,可能没有今日的调度方案");
            //}
        }