diff --git a/DataBase/版本日志/SGGLDB_WH_2023-04-24.sql b/DataBase/版本日志/SGGLDB_WH_2023-04-24.sql new file mode 100644 index 00000000..334aa49e --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-04-24.sql @@ -0,0 +1,28 @@ +insert into [Base_CNProfessional] values +('13d9ee9a-e585-4b40-907a-91fefcfce370','DZ','װ',12) +GO +insert into [Base_CNProfessional] values +('5111e93d-1e8c-4ffa-ade1-8ad7934c2871','JH','ƻ',1) +GO +update [Base_CNProfessional] set SortIndex=6 where CNProfessionalId='BEFD0713-9BA2-4973-B0A8-7C54D41CCEC0' +GO +update [Base_CNProfessional] set SortIndex=9 where CNProfessionalId='CVDSFDSF-RFRE-CDDE-BFRE-DFVDFEFEW567' +GO +update [Base_CNProfessional] set SortIndex=5 where CNProfessionalId='DEB367FF-AD35-41A0-B68E-FA8E68737B93' +GO +insert into [Base_CNProfessional] values +('ee762383-15df-4612-8f44-e4bfb26b351d','HJ','',10) +GO +update [Base_CNProfessional] set SortIndex=3,[ProfessionalName]='' where CNProfessionalId='F41C5022-F499-4BD7-84B6-E87E4CE53CAC' +GO +delete from Base_CNProfessional where CNProfessionalId='13d9ee9a-e585-4b40-907a-91fefcfce370' +GO +delete from WBS_Breakdown +delete from WBS_Division +GO +alter table WBS_Division add SubItemType char(1) null +alter table WBS_Breakdown add CheckAcceptType char(1) null +GO +insert into WBS_Division select * from CNCEC_SUBQHSEDB..WBS_Division +insert into WBS_Breakdown select * from CNCEC_SUBQHSEDB..WBS_Breakdown +GO diff --git a/DataBase/版本日志/SGGLDB_WH_2023-04-24版本日志.txt b/DataBase/版本日志/SGGLDB_WH_2023-04-24版本日志.txt new file mode 100644 index 00000000..e1074e42 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-04-24版本日志.txt @@ -0,0 +1,3 @@ +--ADD BY GaoFei 2023-04-23 +1、修改质量WBS库为集团QHSE平台版本内容 +--END \ No newline at end of file diff --git a/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs b/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs index 29253454..881910b2 100644 --- a/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs +++ b/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs @@ -260,6 +260,7 @@ namespace BLL newBreakdownProject.YeZhu = breakdownProject.YeZhu; newBreakdownProject.FenBao = breakdownProject.FenBao; newBreakdownProject.SourceBreakdownId = breakdownProject.SourceBreakdownId; + newBreakdownProject.CheckAcceptType = breakdownProject.CheckAcceptType; db.WBS_BreakdownProject.InsertOnSubmit(newBreakdownProject); db.SubmitChanges(); @@ -288,6 +289,7 @@ namespace BLL newBreakdownProject.JianLi = breakdownProject.JianLi; newBreakdownProject.YeZhu = breakdownProject.YeZhu; newBreakdownProject.FenBao = breakdownProject.FenBao; + newBreakdownProject.CheckAcceptType = breakdownProject.CheckAcceptType; db.SubmitChanges(); } diff --git a/SGGL/BLL/CQMS/WBS/BreakdownService.cs b/SGGL/BLL/CQMS/WBS/BreakdownService.cs index ec105292..f858d9cc 100644 --- a/SGGL/BLL/CQMS/WBS/BreakdownService.cs +++ b/SGGL/BLL/CQMS/WBS/BreakdownService.cs @@ -65,6 +65,7 @@ namespace BLL x.WuHuan, x.JianLi, x.YeZhu, + x.CheckAcceptType, CheckPointsDef = Funs.GetSubStr(x.CheckPoints, 15), RecordAndCodeDef = Funs.GetSubStr(x.RecordAndCode, 15), x.ModelURL @@ -107,6 +108,7 @@ namespace BLL newBreakdown.WuHuan = breakdown.WuHuan; newBreakdown.JianLi = breakdown.JianLi; newBreakdown.YeZhu = breakdown.YeZhu; + newBreakdown.CheckAcceptType = breakdown.CheckAcceptType; db.WBS_Breakdown.InsertOnSubmit(newBreakdown); db.SubmitChanges(); @@ -134,6 +136,7 @@ namespace BLL newBreakdown.WuHuan = breakdown.WuHuan; newBreakdown.JianLi = breakdown.JianLi; newBreakdown.YeZhu = breakdown.YeZhu; + newBreakdown.CheckAcceptType = breakdown.CheckAcceptType; db.SubmitChanges(); } diff --git a/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs b/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs index 77c0c34d..bcbb8004 100644 --- a/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs +++ b/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs @@ -78,6 +78,7 @@ namespace BLL newDivisionProject.CNProfessionalId = divisionProject.CNProfessionalId; newDivisionProject.UnitWorkId = divisionProject.UnitWorkId; newDivisionProject.OldDivisionId = divisionProject.OldDivisionId; + newDivisionProject.SubItemType = divisionProject.SubItemType; db.WBS_DivisionProject.InsertOnSubmit(newDivisionProject); db.SubmitChanges(); } @@ -96,6 +97,7 @@ namespace BLL newDivisionProject.SuperDivisionId = divisionProject.SuperDivisionId; newDivisionProject.CNProfessionalId = divisionProject.CNProfessionalId; newDivisionProject.IsSelected = divisionProject.IsSelected; + newDivisionProject.SubItemType = divisionProject.SubItemType; db.SubmitChanges(); } diff --git a/SGGL/BLL/CQMS/WBS/DivisionService.cs b/SGGL/BLL/CQMS/WBS/DivisionService.cs index 81e4adee..1918d60e 100644 --- a/SGGL/BLL/CQMS/WBS/DivisionService.cs +++ b/SGGL/BLL/CQMS/WBS/DivisionService.cs @@ -75,6 +75,7 @@ namespace BLL newDivision.SortIndex = division.SortIndex; newDivision.SuperDivisionId = division.SuperDivisionId; newDivision.CNProfessionalId = division.CNProfessionalId; + newDivision.SubItemType = division.SubItemType; db.WBS_Division.InsertOnSubmit(newDivision); db.SubmitChanges(); } @@ -92,6 +93,7 @@ namespace BLL newDivision.SortIndex = division.SortIndex; newDivision.SuperDivisionId = division.SuperDivisionId; newDivision.CNProfessionalId = division.CNProfessionalId; + newDivision.SubItemType = division.SubItemType; db.SubmitChanges(); } diff --git a/SGGL/BLL/Common/AttachFileService.cs b/SGGL/BLL/Common/AttachFileService.cs index d40e30c0..0f63dabb 100644 --- a/SGGL/BLL/Common/AttachFileService.cs +++ b/SGGL/BLL/Common/AttachFileService.cs @@ -472,5 +472,33 @@ namespace BLL return list; } + + /// + /// 判断文件类型是否支持的预览 + /// + /// + /// + public static bool IsSupportFileType(string FiletExtension) + { + bool result = false; + List list = new List(); + list.Add(".doc"); + list.Add(".docx"); + list.Add(".pdf"); + list.Add(".txt"); + list.Add(".xlsx"); + list.Add(".xls"); + foreach (var item in list) + { + if (item == FiletExtension) + { + result = true; + break; + } + } + + return result; + + } } } diff --git a/SGGL/FineUIPro.Web/AttachFile/Look.aspx b/SGGL/FineUIPro.Web/AttachFile/Look.aspx new file mode 100644 index 00000000..523924a7 --- /dev/null +++ b/SGGL/FineUIPro.Web/AttachFile/Look.aspx @@ -0,0 +1,26 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Look.aspx.cs" Inherits="FineUIPro.Web.AttachFile.Look" %> + + + + + + + + + +
+ + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/AttachFile/Look.aspx.cs b/SGGL/FineUIPro.Web/AttachFile/Look.aspx.cs new file mode 100644 index 00000000..8f69c8ea --- /dev/null +++ b/SGGL/FineUIPro.Web/AttachFile/Look.aspx.cs @@ -0,0 +1,46 @@ +using BLL; +using System; +using System.IO; + +namespace FineUIPro.Web.AttachFile +{ + public partial class Look : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); + + var url = Request.Params["fileUrl"]; + // var Baseurl = "https://view.officeapps.live.com/op/embed.aspx?src="; + var Baseurl = "https://view.xdocin.com/view?src="; + var Fileurl = Funs.SGGLUrl + url.Replace(Funs.RootPath, ""); + var newurl = ""; + var FiletExtension = Path.GetExtension(url); + if (FiletExtension == ".docx" || FiletExtension == ".doc"|| FiletExtension == ".xls" || FiletExtension == ".xlsx") + { + newurl = Baseurl + Fileurl; + } + else if (FiletExtension == ".txt"|| FiletExtension== "pdf") + { + newurl = Fileurl; + } + else + { + newurl = Fileurl; + } + + this.LookHtml.Src = newurl; + this.Tab1.IFrameUrl = newurl; + //StreamReader fread = new StreamReader(url, System.Text.Encoding.GetEncoding("gb2312")); + //string ss = fread.ReadToEnd(); + //Response.Write(ss); + //fread.Close(); + //fread.Dispose(); + + } + + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/AttachFile/Look.aspx.designer.cs b/SGGL/FineUIPro.Web/AttachFile/Look.aspx.designer.cs new file mode 100644 index 00000000..021dd9b8 --- /dev/null +++ b/SGGL/FineUIPro.Web/AttachFile/Look.aspx.designer.cs @@ -0,0 +1,71 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为,如果 +// 重新生成代码,则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.AttachFile +{ + + + public partial class Look + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// TabStrip1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TabStrip TabStrip1; + + /// + /// Tab1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tab Tab1; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + + /// + /// LookHtml 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlIframe LookHtml; + } +} diff --git a/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx b/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx index 5b1c7f60..10baea49 100644 --- a/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx +++ b/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx @@ -1,5 +1,4 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="webuploader.aspx.cs" Inherits="FineUIPro.Web.AttachFile.webuploader" %> - @@ -29,16 +28,17 @@ @@ -48,7 +48,8 @@ ExpandUnusedSpace="True" CommandName="Attach" EnableAjax="false" /> - + +