diff --git a/MESWebSite/MESWebSite.csproj b/MESWebSite/MESWebSite.csproj index 0bbb4c3..6c71687 100644 --- a/MESWebSite/MESWebSite.csproj +++ b/MESWebSite/MESWebSite.csproj @@ -124,6 +124,7 @@ + @@ -1406,6 +1407,13 @@ KeepVersion.aspx + + PaintS_JCJL.aspx + ASPXCodeBehind + + + PaintS_JCJL.aspx + LogSearch.aspx ASPXCodeBehind diff --git a/MESWebSite/Manage/PaintS_JCJL.aspx b/MESWebSite/Manage/PaintS_JCJL.aspx new file mode 100644 index 0000000..b7112f8 --- /dev/null +++ b/MESWebSite/Manage/PaintS_JCJL.aspx @@ -0,0 +1,63 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PaintS_JCJL.aspx.cs" Inherits="MESWebSite.Manage.PaintS_JCJL" %> + + + + + + + + + + + + + + + + 生产线信息 + + +
+ + <%----%> + + +
+ + diff --git a/MESWebSite/Manage/PaintS_JCJL.aspx.cs b/MESWebSite/Manage/PaintS_JCJL.aspx.cs new file mode 100644 index 0000000..baab3ec --- /dev/null +++ b/MESWebSite/Manage/PaintS_JCJL.aspx.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace MESWebSite.Manage +{ + public partial class PaintS_JCJL : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + if (Request.Cookies["LoginUserInfo"] == null) + { + Response.Write(""); + } + } + } +} \ No newline at end of file diff --git a/MESWebSite/Manage/PaintS_JCJL.aspx.designer.cs b/MESWebSite/Manage/PaintS_JCJL.aspx.designer.cs new file mode 100644 index 0000000..d99b17e --- /dev/null +++ b/MESWebSite/Manage/PaintS_JCJL.aspx.designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为,如果 +// 重新生成代码,则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace MESWebSite.Manage +{ + + + public partial class PaintS_JCJL + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + } +} diff --git a/MESWebSite/Manage/Station.aspx b/MESWebSite/Manage/Station.aspx index ae79101..a0da34b 100644 --- a/MESWebSite/Manage/Station.aspx +++ b/MESWebSite/Manage/Station.aspx @@ -209,7 +209,9 @@ }); - dg = $('#tb').datagrid({ + dg = $('#tb').datagrid( + + { fitColumns: true, nowrap: false, striped: true,