lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20211111整合监控视频页面

This commit is contained in:
杨红卫 2021-11-11 10:27:26 +08:00
parent b614e3b4db 1f1d11cb42
commit 56662ce2c8
6 changed files with 446 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
DataBase/版本日志/SGGLDB_V2021-11-11-001.sql Normal file
View File

@ -0,0 +1,53 @@
CREATE TABLE [dbo].[HJGL_FirstOKRate](
[Id] [nvarchar](50) NOT NULL,
[ProjectId] [nvarchar](50) NULL,
[Type] [nvarchar](50) NULL,
[Code] [nvarchar](50) NULL,
[Name] [nvarchar](50) NULL,
[TotalNum] [int] NULL,
[OKNum] [int] NULL,
[Rate] [nvarchar](20) NULL,
CONSTRAINT [PK_HJGL_FirstOKRate] PRIMARY KEY CLUSTERED
(
[Id] ASC
)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
) ON [PRIMARY]
GO
ALTER TABLE [dbo].[HJGL_FirstOKRate] WITH CHECK ADD CONSTRAINT [FK_HJGL_FirstOKRate_Base_Project] FOREIGN KEY([ProjectId])
REFERENCES [dbo].[Base_Project] ([ProjectId])
GO
ALTER TABLE [dbo].[HJGL_FirstOKRate] CHECK CONSTRAINT [FK_HJGL_FirstOKRate_Base_Project]
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FirstOKRate', @level2type=N'COLUMN',@level2name=N'Id'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'外键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FirstOKRate', @level2type=N'COLUMN',@level2name=N'ProjectId'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'类型' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FirstOKRate', @level2type=N'COLUMN',@level2name=N'Type'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FirstOKRate', @level2type=N'COLUMN',@level2name=N'Code'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FirstOKRate', @level2type=N'COLUMN',@level2name=N'Name'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'一次拍片总数' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FirstOKRate', @level2type=N'COLUMN',@level2name=N'TotalNum'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'一次合格片数' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FirstOKRate', @level2type=N'COLUMN',@level2name=N'OKNum'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'一次拍片合格率' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FirstOKRate', @level2type=N'COLUMN',@level2name=N'Rate'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'焊接拍片一次合格率表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FirstOKRate'
GO

2
DataBase/菜单初始化脚本/1-4进度管理（Menu_JDGL）.sql
View File

@ -7,7 +7,7 @@ go
--VALUES('B707B4E0-EF73-4010-A13B-59263A5029C7','单位、分部、分项工程设置','',10,'0','Menu_JDGL',0,0,1) --VALUES('B707B4E0-EF73-4010-A13B-59263A5029C7','单位、分部、分项工程设置','',10,'0','Menu_JDGL',0,0,1)
--GO --GO
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
VALUES('858E83E9-ADE5-452E-BD65-82D8DFF872C0','分部、工作项及费用清单设置','JDGL/WBS/WBSSetAudit.aspx',10,'0','Menu_JDGL',0,1,1) VALUES('858E83E9-ADE5-452E-BD65-82D8DFF872C0','分部、工作项及费用清单裁剪','JDGL/WBS/WBSSetAudit.aspx',10,'0','Menu_JDGL',0,1,1)
GO GO
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
VALUES('004CD808-1E02-4AD8-8C4B-7F805C12CCDC','858E83E9-ADE5-452E-BD65-82D8DFF872C0','增加',1) VALUES('004CD808-1E02-4AD8-8C4B-7F805C12CCDC','858E83E9-ADE5-452E-BD65-82D8DFF872C0','增加',1)

55
SGGL/BLL/API/HJGL/APIGetHJDataService.cs
View File

@ -62,5 +62,60 @@ namespace BLL
} }
} }
#endregion #endregion
#region 保存一次拍片合格率
/// <summary>
/// 保存一次拍片合格率
/// </summary>
/// <param name="list">一次拍片合格率</param>
/// <returns></returns>
public static string SaveFirstOKRate(List<Model.HJGL_FirstOKRate> list)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
string message = string.Empty;
if (list.Count > 0)
{
var project = db.Base_Project.FirstOrDefault(x => x.HJProjectCode == list[0].ProjectId);
if (project != null)
{
string projectId = project.ProjectId;
var oldList = db.HJGL_FirstOKRate.Where(x => x.ProjectId == projectId);
if (oldList.Count() > 0)
{
db.HJGL_FirstOKRate.DeleteAllOnSubmit(oldList);
db.SubmitChanges();
}
foreach (var item in list)
{
Model.HJGL_FirstOKRate newFirstOKRate = new Model.HJGL_FirstOKRate
{
Id = SQLHelper.GetNewID(),
ProjectId = projectId,
Type = item.Type,
Code = item.Code,
Name = item.Name,
TotalNum = item.TotalNum,
OKNum = item.OKNum,
Rate = item.Rate,
};
db.HJGL_FirstOKRate.InsertOnSubmit(newFirstOKRate);
db.SubmitChanges();
}
message = "提交成功！";
}
else
{
message = "项目号不存在！";
}
}
else
{
message = "记录为空！";
}
return message;
}
}
#endregion
} }
} }

1
SGGL/FineUIPro.Web/ErrLog.txt
View File

@ -1 +0,0 @@


310
SGGL/Model/Model.cs
View File

@ -734,6 +734,9 @@ namespace Model
partial void InsertHJGL_FinishRate(HJGL_FinishRate instance); partial void InsertHJGL_FinishRate(HJGL_FinishRate instance);
partial void UpdateHJGL_FinishRate(HJGL_FinishRate instance); partial void UpdateHJGL_FinishRate(HJGL_FinishRate instance);
partial void DeleteHJGL_FinishRate(HJGL_FinishRate instance); partial void DeleteHJGL_FinishRate(HJGL_FinishRate instance);
partial void InsertHJGL_FirstOKRate(HJGL_FirstOKRate instance);
partial void UpdateHJGL_FirstOKRate(HJGL_FirstOKRate instance);
partial void DeleteHJGL_FirstOKRate(HJGL_FirstOKRate instance);
partial void InsertHJGL_Hard_Report(HJGL_Hard_Report instance); partial void InsertHJGL_Hard_Report(HJGL_Hard_Report instance);
partial void UpdateHJGL_Hard_Report(HJGL_Hard_Report instance); partial void UpdateHJGL_Hard_Report(HJGL_Hard_Report instance);
partial void DeleteHJGL_Hard_Report(HJGL_Hard_Report instance); partial void DeleteHJGL_Hard_Report(HJGL_Hard_Report instance);
@ -3921,6 +3924,14 @@ namespace Model
} }
} }
public System.Data.Linq.Table<HJGL_FirstOKRate> HJGL_FirstOKRate
{
get
{
return this.GetTable<HJGL_FirstOKRate>();
}
}
public System.Data.Linq.Table<HJGL_Hard_Report> HJGL_Hard_Report public System.Data.Linq.Table<HJGL_Hard_Report> HJGL_Hard_Report
{ {
get get
@ -22618,6 +22629,8 @@ namespace Model
private EntitySet<HJGL_FinishRate> _HJGL_FinishRate; private EntitySet<HJGL_FinishRate> _HJGL_FinishRate;
private EntitySet<HJGL_FirstOKRate> _HJGL_FirstOKRate;
private EntitySet<HJGL_LV_LeakVacuum> _HJGL_LV_LeakVacuum; private EntitySet<HJGL_LV_LeakVacuum> _HJGL_LV_LeakVacuum;
private EntitySet<HJGL_PC_PurgingCleaning> _HJGL_PC_PurgingCleaning; private EntitySet<HJGL_PC_PurgingCleaning> _HJGL_PC_PurgingCleaning;
@ -23116,6 +23129,7 @@ namespace Model
this._Hazard_HazardList = new EntitySet<Hazard_HazardList>(new Action<Hazard_HazardList>(this.attach_Hazard_HazardList), new Action<Hazard_HazardList>(this.detach_Hazard_HazardList)); this._Hazard_HazardList = new EntitySet<Hazard_HazardList>(new Action<Hazard_HazardList>(this.attach_Hazard_HazardList), new Action<Hazard_HazardList>(this.detach_Hazard_HazardList));
this._HJGL_Batch_BatchTrust = new EntitySet<HJGL_Batch_BatchTrust>(new Action<HJGL_Batch_BatchTrust>(this.attach_HJGL_Batch_BatchTrust), new Action<HJGL_Batch_BatchTrust>(this.detach_HJGL_Batch_BatchTrust)); this._HJGL_Batch_BatchTrust = new EntitySet<HJGL_Batch_BatchTrust>(new Action<HJGL_Batch_BatchTrust>(this.attach_HJGL_Batch_BatchTrust), new Action<HJGL_Batch_BatchTrust>(this.detach_HJGL_Batch_BatchTrust));
this._HJGL_FinishRate = new EntitySet<HJGL_FinishRate>(new Action<HJGL_FinishRate>(this.attach_HJGL_FinishRate), new Action<HJGL_FinishRate>(this.detach_HJGL_FinishRate)); this._HJGL_FinishRate = new EntitySet<HJGL_FinishRate>(new Action<HJGL_FinishRate>(this.attach_HJGL_FinishRate), new Action<HJGL_FinishRate>(this.detach_HJGL_FinishRate));
this._HJGL_FirstOKRate = new EntitySet<HJGL_FirstOKRate>(new Action<HJGL_FirstOKRate>(this.attach_HJGL_FirstOKRate), new Action<HJGL_FirstOKRate>(this.detach_HJGL_FirstOKRate));
this._HJGL_LV_LeakVacuum = new EntitySet<HJGL_LV_LeakVacuum>(new Action<HJGL_LV_LeakVacuum>(this.attach_HJGL_LV_LeakVacuum), new Action<HJGL_LV_LeakVacuum>(this.detach_HJGL_LV_LeakVacuum)); this._HJGL_LV_LeakVacuum = new EntitySet<HJGL_LV_LeakVacuum>(new Action<HJGL_LV_LeakVacuum>(this.attach_HJGL_LV_LeakVacuum), new Action<HJGL_LV_LeakVacuum>(this.detach_HJGL_LV_LeakVacuum));
this._HJGL_PC_PurgingCleaning = new EntitySet<HJGL_PC_PurgingCleaning>(new Action<HJGL_PC_PurgingCleaning>(this.attach_HJGL_PC_PurgingCleaning), new Action<HJGL_PC_PurgingCleaning>(this.detach_HJGL_PC_PurgingCleaning)); this._HJGL_PC_PurgingCleaning = new EntitySet<HJGL_PC_PurgingCleaning>(new Action<HJGL_PC_PurgingCleaning>(this.attach_HJGL_PC_PurgingCleaning), new Action<HJGL_PC_PurgingCleaning>(this.detach_HJGL_PC_PurgingCleaning));
this._HJGL_Pipeline = new EntitySet<HJGL_Pipeline>(new Action<HJGL_Pipeline>(this.attach_HJGL_Pipeline), new Action<HJGL_Pipeline>(this.detach_HJGL_Pipeline)); this._HJGL_Pipeline = new EntitySet<HJGL_Pipeline>(new Action<HJGL_Pipeline>(this.attach_HJGL_Pipeline), new Action<HJGL_Pipeline>(this.detach_HJGL_Pipeline));
@ -25485,6 +25499,19 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_FirstOKRate_Base_Project", Storage="_HJGL_FirstOKRate", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
public EntitySet<HJGL_FirstOKRate> HJGL_FirstOKRate
{
get
{
return this._HJGL_FirstOKRate;
}
set
{
this._HJGL_FirstOKRate.Assign(value);
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_LV_LeakVacuum_Base_Project", Storage="_HJGL_LV_LeakVacuum", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_LV_LeakVacuum_Base_Project", Storage="_HJGL_LV_LeakVacuum", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
public EntitySet<HJGL_LV_LeakVacuum> HJGL_LV_LeakVacuum public EntitySet<HJGL_LV_LeakVacuum> HJGL_LV_LeakVacuum
{ {
@ -28851,6 +28878,18 @@ namespace Model
entity.Base_Project = null; entity.Base_Project = null;
} }
private void attach_HJGL_FirstOKRate(HJGL_FirstOKRate entity)
{
this.SendPropertyChanging();
entity.Base_Project = this;
}
private void detach_HJGL_FirstOKRate(HJGL_FirstOKRate entity)
{
this.SendPropertyChanging();
entity.Base_Project = null;
}
private void attach_HJGL_LV_LeakVacuum(HJGL_LV_LeakVacuum entity) private void attach_HJGL_LV_LeakVacuum(HJGL_LV_LeakVacuum entity)
{ {
this.SendPropertyChanging(); this.SendPropertyChanging();
@ -116909,6 +116948,277 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HJGL_FirstOKRate")]
public partial class HJGL_FirstOKRate : INotifyPropertyChanging, INotifyPropertyChanged
{
private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
private string _Id;
private string _ProjectId;
private string _Type;
private string _Code;
private string _Name;
private System.Nullable<int> _TotalNum;
private System.Nullable<int> _OKNum;
private string _Rate;
private EntityRef<Base_Project> _Base_Project;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
partial void OnCreated();
partial void OnIdChanging(string value);
partial void OnIdChanged();
partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged();
partial void OnTypeChanging(string value);
partial void OnTypeChanged();
partial void OnCodeChanging(string value);
partial void OnCodeChanged();
partial void OnNameChanging(string value);
partial void OnNameChanged();
partial void OnTotalNumChanging(System.Nullable<int> value);
partial void OnTotalNumChanged();
partial void OnOKNumChanging(System.Nullable<int> value);
partial void OnOKNumChanged();
partial void OnRateChanging(string value);
partial void OnRateChanged();
#endregion
public HJGL_FirstOKRate()
{
this._Base_Project = default(EntityRef<Base_Project>);
OnCreated();
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
public string Id
{
get
{
return this._Id;
}
set
{
if ((this._Id != value))
{
this.OnIdChanging(value);
this.SendPropertyChanging();
this._Id = value;
this.SendPropertyChanged("Id");
this.OnIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
public string ProjectId
{
get
{
return this._ProjectId;
}
set
{
if ((this._ProjectId != value))
{
if (this._Base_Project.HasLoadedOrAssignedValue)
{
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
}
this.OnProjectIdChanging(value);
this.SendPropertyChanging();
this._ProjectId = value;
this.SendPropertyChanged("ProjectId");
this.OnProjectIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Type", DbType="NVarChar(50)")]
public string Type
{
get
{
return this._Type;
}
set
{
if ((this._Type != value))
{
this.OnTypeChanging(value);
this.SendPropertyChanging();
this._Type = value;
this.SendPropertyChanged("Type");
this.OnTypeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Code", DbType="NVarChar(50)")]
public string Code
{
get
{
return this._Code;
}
set
{
if ((this._Code != value))
{
this.OnCodeChanging(value);
this.SendPropertyChanging();
this._Code = value;
this.SendPropertyChanged("Code");
this.OnCodeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")]
public string Name
{
get
{
return this._Name;
}
set
{
if ((this._Name != value))
{
this.OnNameChanging(value);
this.SendPropertyChanging();
this._Name = value;
this.SendPropertyChanged("Name");
this.OnNameChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalNum", DbType="Int")]
public System.Nullable<int> TotalNum
{
get
{
return this._TotalNum;
}
set
{
if ((this._TotalNum != value))
{
this.OnTotalNumChanging(value);
this.SendPropertyChanging();
this._TotalNum = value;
this.SendPropertyChanged("TotalNum");
this.OnTotalNumChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OKNum", DbType="Int")]
public System.Nullable<int> OKNum
{
get
{
return this._OKNum;
}
set
{
if ((this._OKNum != value))
{
this.OnOKNumChanging(value);
this.SendPropertyChanging();
this._OKNum = value;
this.SendPropertyChanged("OKNum");
this.OnOKNumChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rate", DbType="NVarChar(20)")]
public string Rate
{
get
{
return this._Rate;
}
set
{
if ((this._Rate != value))
{
this.OnRateChanging(value);
this.SendPropertyChanging();
this._Rate = value;
this.SendPropertyChanged("Rate");
this.OnRateChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_FirstOKRate_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project
{
get
{
return this._Base_Project.Entity;
}
set
{
Base_Project previousValue = this._Base_Project.Entity;
if (((previousValue != value)
|| (this._Base_Project.HasLoadedOrAssignedValue == false)))
{
this.SendPropertyChanging();
if ((previousValue != null))
{
this._Base_Project.Entity = null;
previousValue.HJGL_FirstOKRate.Remove(this);
}
this._Base_Project.Entity = value;
if ((value != null))
{
value.HJGL_FirstOKRate.Add(this);
this._ProjectId = value.ProjectId;
}
else
{
this._ProjectId = default(string);
}
this.SendPropertyChanged("Base_Project");
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
protected virtual void SendPropertyChanging()
{
if ((this.PropertyChanging != null))
{
this.PropertyChanging(this, emptyChangingEventArgs);
}
}
protected virtual void SendPropertyChanged(String propertyName)
{
if ((this.PropertyChanged != null))
{
this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HJGL_Hard_Report")] [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HJGL_Hard_Report")]
public partial class HJGL_Hard_Report : INotifyPropertyChanging, INotifyPropertyChanged public partial class HJGL_Hard_Report : INotifyPropertyChanging, INotifyPropertyChanged
{ {

27
SGGL/WebAPI/Controllers/HJGL/GetHJDataController.cs
View File

@ -41,5 +41,32 @@ namespace WebAPI.Controllers
} }
#endregion #endregion
#region 保存一次拍片合格率
/// <summary>
/// 保存一次拍片合格率
/// </summary>
/// <param name="list">一次拍片合格率</param>
/// <returns></returns>
[HttpPost]
public Model.ResponeData SaveFirstOKRate([FromBody] List<Model.HJGL_FirstOKRate> list)
{
var responeData = new Model.ResponeData();
try
{
responeData.message = APIGetHJDataService.SaveFirstOKRate(list);
if (responeData.message == "提交成功！")
{
responeData.code = 1;
}
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
} }
} }