From 4ef886afde61c81fe69e97485fca31f3a359545f Mon Sep 17 00:00:00 2001
From: "ruoxing.wang" <88384874@qq.com>
Date: Mon, 3 Mar 2025 08:41:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86=E5=96=B7=E6=B6=82?=
 =?UTF-8?q?=E8=80=81=E5=A4=96=E7=B3=BB=E7=BB=9F=E5=85=B3=E8=81=94=E7=9A=84?=
 =?UTF-8?q?=E5=BA=95=E6=BC=86=E4=BB=B6=E7=BB=91=E5=AE=9A=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MESWebSite/MESWebSite.csproj                  |  8 +++
 MESWebSite/Manage/PaintS_JCJL.aspx            | 63 +++++++++++++++++++
 MESWebSite/Manage/PaintS_JCJL.aspx.cs         | 20 ++++++
 .../Manage/PaintS_JCJL.aspx.designer.cs       | 26 ++++++++
 MESWebSite/Manage/Station.aspx                |  4 +-
 5 files changed, 120 insertions(+), 1 deletion(-)
 create mode 100644 MESWebSite/Manage/PaintS_JCJL.aspx
 create mode 100644 MESWebSite/Manage/PaintS_JCJL.aspx.cs
 create mode 100644 MESWebSite/Manage/PaintS_JCJL.aspx.designer.cs
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 @@
     <Content Include="Manage\KeepPlan.aspx" />
     <Content Include="Manage\KeepRecord.aspx" />
     <Content Include="Manage\KeepVersion.aspx" />
+    <Content Include="Manage\PaintS_JCJL.aspx" />
     <Content Include="Manage\LogSearch.aspx" />
     <Content Include="Manage\Manufacturer.aspx" />
     <Content Include="Manage\ModelChangeRecord.aspx" />
@@ -1406,6 +1407,13 @@
     <Compile Include="Manage\KeepVersion.aspx.designer.cs">
       <DependentUpon>KeepVersion.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Manage\PaintS_JCJL.aspx.cs">
+      <DependentUpon>PaintS_JCJL.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Manage\PaintS_JCJL.aspx.designer.cs">
+      <DependentUpon>PaintS_JCJL.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Manage\LogSearch.aspx.cs">
       <DependentUpon>LogSearch.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
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" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <link href="/CSS/Basics.css" rel="stylesheet" />
+    <link href="/Scripts/jquery-easyui-1.4.3/themes/metro/easyui.css" rel="stylesheet" type="text/css" />
+    <link href="/Scripts/jquery-easyui-1.4.3/themes/icon.css" rel="stylesheet" type="text/css" />
+    <link href="/Scripts/jquery-easyui-1.4.3/themes/color.css" rel="stylesheet" type="text/css" />
+    <script src="/Scripts/jquery-easyui-1.4.3/jquery.min.js" type="text/javascript"></script>
+    <script src="/Scripts/jquery-easyui-1.4.3/jquery.easyui.min.js" type="text/javascript"></script>
+    <script src="/Scripts/jquery-easyui-1.4.3/locale/easyui-lang-zh_CN.js" type="text/javascript"></script>
+    <script src="/Scripts/MyJs.js" type="text/javascript"></script>
+    <style>
+        #w td {
+            padding: 5px 5px;
+            text-align: left;
+            vertical-align: middle;
+        }
+
+        #w .title {
+            vertical-align: middle;
+            text-align: right;
+            height: 40px;
+        }
+
+        p {
+            padding: 5px;
+            font-size: small;
+            font-family: 微软雅黑;
+        }
+
+        .datagrid {
+            text-align: center;
+        }
+
+        .search_first{
+            margin-left: 33%
+        }
+        
+        /*  中等屏幕 桌面显示器 992至1400 */
+        @media screen and (min-width:992px) and (max-width:1400px){
+            .search_first{
+                margin-left: 1%
+            }
+        }
+    </style>
+    <title>生产线信息</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+       
+       <%--<script  type="text/javascript">
+           var url = "http://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer&hback=true&db=WMS!5e93!!5b58!!6c47!!603b!!62a5!!8868!-!4e00!!5382!!2f!!55b7!!6d82!MES!8ffd!!6eaf!!62a5!!8868!!2f!!55b7!!6d82!MES!62a5!!5e9f!!4ea7!!54c1!!660e!!7ec6!.db&platform=PC&au_act=login&adminv=lz&passv=123";
+           let targetWindow = window.open(url, "_blank");
+       </script>--%>
+     
+         
+    </form>
+</body>
+</html>
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("<script language=javascript>alert('您的登录信息已过期，请重新登录！');top.location.href='../Login.aspx';</script>");
+            }
+        }
+    }
+}
\ 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
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        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,
