lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
高飞
2025-12-01 11:13:08 +08:00
parent 1de1e6f40c ace0e3b5e4
commit 6be2703fc5
26 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HJGL/TestPackage/TestPackagePrintService.cs
+1 -1
View File
@@ -601,7 +601,7 @@ namespace BLL
keyValuePairs.Add("ProjectName", projectName);
keyValuePairs.Add("UnitWorkName", UnitWorkName);
keyValuePairs.Add("UnitWorkCode", UnitWorkCode);
keyValuePairs.Add("UnitName2", unitNames);//施工单位
keyValuePairs.Add("UnitName2", unitNames);//施工单位 需要修改，取值来源焊工的单位去重
if (!string.IsNullOrEmpty(q.PipingClassId))
{
var PipingClass = BLL.Base_PipingClassService.GetPipingClassByPipingClassId(q.PipingClassId);
SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx
+1 -1
View File
@@ -7,7 +7,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>隐患整改单</title>
<link href="../../res/css/viewer.min.css" rel="stylesheet" />
<script src="../../res/js/jquery-3.4.1.min.js" type="text/javascript"></script>
<script src="../../res/js/jquery-3.7.1.min.js" type="text/javascript"></script>
<script src="../../res/js/viewer.min.js" type="text/javascript"></script>
<style type="text/css">
.f-grid-row .f-grid-cell-inner {
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+2 -3
View File
@@ -3364,9 +3364,9 @@
<Content Include="res\indexv1\js\old\draw-circle.js" />
<Content Include="res\indexv1\js\video-7.15.0.min.js" />
<Content Include="res\indexv1\js\world.js" />
<Content Include="res\index\js\jquery-3.7.1.min.js" />
<Content Include="res\js\hook.js" />
<Content Include="res\js\jquery-3.3.1.min.js" />
<Content Include="res\js\jquery-3.4.1.min.js" />
<Content Include="res\js\jquery-3.7.1.min.js" />
<Content Include="res\js\viewer.min.js" />
<Content Include="res\ol\bd09.js" />
<Content Include="res\ol\ol.css" />
@@ -6563,7 +6563,6 @@
<Content Include="res\index\js\china-contour.js" />
<Content Include="res\index\js\china.js" />
<Content Include="res\index\js\echarts.min.js" />
<Content Include="res\index\js\jquery-3.4.1.min.js" />
<Content Include="res\index\js\province\anhui.js" />
<Content Include="res\index\js\province\aomen.js" />
<Content Include="res\index\js\province\beijing.js" />
SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColorIn.aspx.cs
+3 -3
View File
@@ -64,7 +64,7 @@ namespace FineUIPro.Web.HJGL.BaseInfo
var fileName = rootPath + initPath + hdFileName.Text;
ResponeData responeData;
responeData = TwInOutplanmasterService.ImportData(fuAttachUrl.FileName, fileName, this.CurrUser.LoginProjectId, this.CurrUser.PersonId);
responeData = BaseMaterialcolorService.ImportData( fileName, this.CurrUser.LoginProjectId);
if (responeData.code == 1)
@@ -121,8 +121,8 @@ namespace FineUIPro.Web.HJGL.BaseInfo
if (e.EventArgument == "Confirm_OK")
{
var rootPath = Server.MapPath("~/");
var uploadfilepath = rootPath + Const.Tw_InPlanMasteTemplateUrl;
var filePath = Const.Tw_InPlanMasteTemplateUrl;
var uploadfilepath = rootPath + Const.HJGL_MaterialColorDataImportPath;
var filePath = Const.HJGL_MaterialColorDataImportPath;
var fileName = Path.GetFileName(filePath);
var info = new FileInfo(uploadfilepath);
var fileSize = info.Length;
SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs
+2 -2
View File
@@ -371,8 +371,8 @@ namespace FineUIPro.Web.HJGL.PreDesign
管线号 = x.PipelineCode,
类型 = x.TypeStr,
编号 = x.Code,
预制散件材料描述 = x.Matdef??"-",
数量 = x.Number,
预制散件材料描述 = x.Matdef??"/",
数量 = x.Number??1,
所在包装编号 = x.PackagingCode,
车次 = x.TrainNumber,
流水段 = x.FlowingSection
SGGL/FineUIPro.Web/Login.aspx
+1 -1
View File
@@ -162,7 +162,7 @@
</div>
</div>
</body>
<script type="text/javascript" src="res/index/js/jquery-3.4.1.min.js"></script>
<script type="text/javascript" src="res/index/js/jquery-3.7.1.min.js"></script>
<script type="text/javascript">
var $activeWrap = document.getElementById('activewrap')
var $active = document.getElementById('active')
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckContentEdit.aspx
+1 -1
View File
@@ -7,7 +7,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>现场安全检查</title>
<link href="../../res/css/common.css" rel="stylesheet" />
<script src="../../res/js/jquery-3.3.1.min.js"></script>
<script src="../../res/js/jquery-3.7.1.min.js"></script>
<style type="text/css">
.f-grid-row .f-grid-cell-inner {
white-space: normal;
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckInfo.aspx
+1 -1
View File
@@ -7,7 +7,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>发起检查</title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
<script src="../res/js/jquery-3.3.1.min.js" type="text/javascript"></script>
<script src="../res/js/jquery-3.7.1.min.js" type="text/javascript"></script>
<style type="text/css">
.labcenter {
text-align: center;
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNotice.aspx
+1 -1
View File
@@ -7,7 +7,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>检查通知单</title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
<script src="../res/js/jquery-3.3.1.min.js" type="text/javascript"></script>
<script src="../res/js/jquery-3.7.1.min.js" type="text/javascript"></script>
<style type="text/css">
.labcenter {
text-align: center;
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNoticeEdit.aspx
+1 -1
View File
@@ -7,7 +7,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>编辑检查通知单</title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
<script src="../res/js/jquery-3.3.1.min.js" type="text/javascript"></script>
<script src="../res/js/jquery-3.7.1.min.js" type="text/javascript"></script>
</head>
<body>
<form id="form1" runat="server">
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckReport.aspx
+1 -1
View File
@@ -7,7 +7,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>检查报告</title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
<script src="../res/js/jquery-3.3.1.min.js" type="text/javascript"></script>
<script src="../res/js/jquery-3.7.1.min.js" type="text/javascript"></script>
</head>
<body>
<form id="form1" runat="server">
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckTeamEdit.aspx
+1 -1
View File
@@ -7,7 +7,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>检查工作组维护</title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
<script src="../res/js/jquery-3.3.1.min.js" type="text/javascript"></script>
<script src="../res/js/jquery-3.7.1.min.js" type="text/javascript"></script>
<style type="text/css">
.f-grid-row .f-grid-cell-inner {
white-space: normal;
SGGL/FineUIPro.Web/TaskScheduling/InterFace/IFLogList.aspx
+1 -1
View File
@@ -6,7 +6,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
<script src="../res/js/jquery-3.3.1.min.js" type="text/javascript"></script>
<script src="../res/js/jquery-3.7.1.min.js" type="text/javascript"></script>
</head>
<body>
<form id="form1" runat="server">
SGGL/FineUIPro.Web/TaskScheduling/InterFace/InterFaceSet.aspx
+1 -1
View File
@@ -5,7 +5,7 @@
<head runat="server">
<title>接口设置</title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
<script src="../res/js/jquery-3.3.1.min.js" type="text/javascript"></script>
<script src="../res/js/jquery-3.7.1.min.js" type="text/javascript"></script>
<style>
.f-grid-row .f-grid-cell-inner {
white-space: normal;
SGGL/FineUIPro.Web/TaskScheduling/InterFace/InterFaceTask.aspx
+1 -1
View File
@@ -5,7 +5,7 @@
<head runat="server">
<title>接口数据信息</title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
<script src="../res/js/jquery-3.3.1.min.js" type="text/javascript"></script>
<script src="../res/js/jquery-3.7.1.min.js" type="text/javascript"></script>
<style>
.f-grid-row .f-grid-cell-inner {
white-space: normal;
SGGL/FineUIPro.Web/common/mainMenu_DigitalSite.aspx
+1 -1
View File
@@ -168,7 +168,7 @@
</div>
</div>
</body>
<script type="text/javascript" src="../res/index/js/jquery-3.4.1.min.js"></script>
<script type="text/javascript" src="../res/index/js/jquery-3.7.1.min.js"></script>
<script type="text/javascript" src="../res/index/js/swiper-3.4.2.jquery.min.js"></script>
<script type="text/javascript" src="../res/index/js/echarts.min.js"></script>
<script type="text/javascript">
SGGL/FineUIPro.Web/common/mainMenu_JDGL.aspx
+1 -1
View File
@@ -197,7 +197,7 @@
</div>
</div>
</body>
<script type="text/javascript" src="../res/index/js/jquery-3.4.1.min.js"></script>
<script type="text/javascript" src="../res/index/js/jquery-3.7.1.min.js"></script>
<script type="text/javascript" src="../res/index/js/swiper-3.4.2.jquery.min.js"></script>
<script type="text/javascript" src="../res/index/js/echarts.min.js"></script>
<script type="text/javascript">
SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx
+1 -1
View File
@@ -168,7 +168,7 @@
</div>
</div>
</body>
<script type="text/javascript" src="../res/index/js/jquery-3.4.1.min.js"></script>
<script type="text/javascript" src="../res/index/js/jquery-3.7.1.min.js"></script>
<script type="text/javascript" src="../res/index/js/swiper-3.4.2.jquery.min.js"></script>
<script type="text/javascript" src="../res/index/js/echarts.min.js"></script>
<script type="text/javascript">
SGGL/FineUIPro.Web/common/mainMenu_PHTGL.aspx
+1 -1
View File
@@ -168,7 +168,7 @@
</div>
</div>
</body>
<script type="text/javascript" src="../res/index/js/jquery-3.4.1.min.js"></script>
<script type="text/javascript" src="../res/index/js/jquery-3.7.1.min.js"></script>
<script type="text/javascript" src="../res/index/js/swiper-3.4.2.jquery.min.js"></script>
<script type="text/javascript" src="../res/index/js/echarts.min.js"></script>
<script type="text/javascript">
SGGL/FineUIPro.Web/common/mainMenu_PZHGL.aspx
+1 -1
View File
@@ -168,7 +168,7 @@
</div>
</div>
</body>
<script type="text/javascript" src="../res/index/js/jquery-3.4.1.min.js"></script>
<script type="text/javascript" src="../res/index/js/jquery-3.7.1.min.js"></script>
<script type="text/javascript" src="../res/index/js/swiper-3.4.2.jquery.min.js"></script>
<script type="text/javascript" src="../res/index/js/echarts.min.js"></script>
<script type="text/javascript">
SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx
+1 -1
View File
@@ -168,7 +168,7 @@
</div>
</div>
</body>
<script type="text/javascript" src="../res/index/js/jquery-3.4.1.min.js"></script>
<script type="text/javascript" src="../res/index/js/jquery-3.7.1.min.js"></script>
<script type="text/javascript" src="../res/index/js/swiper-3.4.2.jquery.min.js"></script>
<script type="text/javascript" src="../res/index/js/echarts.min.js"></script>
<script type="text/javascript">
SGGL/FineUIPro.Web/res/index/js/jquery-3.4.1.min.js
Vendored
-2
View File
File diff suppressed because one or more lines are too long
SGGL/FineUIPro.Web/res/index/js/jquery-3.7.1.min.js
Vendored
+2
View File
File diff suppressed because one or more lines are too long
SGGL/FineUIPro.Web/res/js/jquery-3.3.1.min.js
Vendored
-2
View File
File diff suppressed because one or more lines are too long
SGGL/FineUIPro.Web/res/js/jquery-3.4.1.min.js
Vendored
-2
View File
File diff suppressed because one or more lines are too long
SGGL/FineUIPro.Web/res/js/jquery-3.7.1.min.js
Vendored
+2
View File
File diff suppressed because one or more lines are too long