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

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

Browse Source 
# Conflicts:
#	SGGL/FineUIPro.Web/Web.config
#	SGGL/FineUIPro.Web/common/Menu_JDGL.xml
This commit is contained in:
汪青
2024-05-14 23:28:44 +08:00
parent 8c6b348597 1dde5b74dc
commit 2cf45527a1
119 changed files with 4257 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/common/Menu_JDGL.xml
+1
View File
@@ -11,6 +11,7 @@
<TreeNode id="D1FC6ACA-C789-401C-B9FB-3A96FFE4C8AC" Text="进度报表" NavigateUrl="JDGL/CostAnalysis/JDReport.aspx"></TreeNode>
<TreeNode id="9CAF311E-C234-4DA4-B235-D4E478FBD80E" Text="里程碑" NavigateUrl="JDGL/WBS/MilePost.aspx"></TreeNode>
<TreeNode id="94287B92-7E96-4B90-BC6F-DAF30AE3B314" Text="月度计划情况" NavigateUrl="JDGL/Check/MonthPlan.aspx"></TreeNode>
<TreeNode id="56A54B4B-BBA3-4249-9FFC-3A60DAC79059" Text="周进度计划" NavigateUrl="JDGL/Check/WeekPlan.aspx"></TreeNode>
<TreeNode id="92CBD072-20F8-45B1-9D17-6F7494DD2020" Text="数据导入" NavigateUrl=""><TreeNode id="F3AA42B3-5776-4992-A625-1216C579FEDE" Text="项目进度情况" NavigateUrl="JDGL/Check/ProgressCompletion.aspx"></TreeNode>
<TreeNode id="2AE9D982-A499-497F-8F54-ADDA5856887E" Text="工程量完成情况" NavigateUrl="JDGL/Check/QuantityCompletion.aspx"></TreeNode>
<TreeNode id="82E513B9-1A6F-495A-A633-EBC89CE5273A" Text="低温储罐完成情况" NavigateUrl="JDGL/Check/LowTankCompletion.aspx"></TreeNode>
SGGL/FineUIPro.Web/common/Menu_Personal.xml
+3
View File
@@ -6,4 +6,7 @@
<TreeNode id="C6EF06E5-9019-4583-8122-EA94FCC545C6" Text="员工总结" NavigateUrl=""></TreeNode>
<TreeNode id="AAF841AA-2EE8-4FEC-B1FB-B978736C6E1F" Text="员工责任书" NavigateUrl="Personal/PersonDuty.aspx"></TreeNode>
<TreeNode id="CB373458-30B0-4850-ABFF-B38D40A04D43" Text="员工绩效考核结果" NavigateUrl="Personal/PersonCheckInfo.aspx"></TreeNode>
<TreeNode id="522EAECC-3D40-4804-A066-A43BA8F6BFC1" Text="员工出差记录" NavigateUrl="Personal/BusinessTrip.aspx"></TreeNode>
<TreeNode id="16229932-671B-4E04-BB61-A5C7DE4CE47F" Text="员工开车绩效记录" NavigateUrl="Personal/TestRunPerformance.aspx"></TreeNode>
<TreeNode id="F0792B77-AEE4-4834-82C2-E5B75D0B0AB7" Text="开车月技术总结" NavigateUrl="Personal/TestRunMonthSummary.aspx"></TreeNode>
</Tree>
SGGL/FineUIPro.Web/common/Menu_TestRun.xml
+2
View File
@@ -69,10 +69,12 @@
<TreeNode id="0217CE50-3ABB-44F8-A38A-C9792C436639" Text="试车管理" NavigateUrl=""><TreeNode id="E3E38073-1DF4-4C02-AFC0-5C93EE7C23A8" Text="系统划分" NavigateUrl="TestRun/TestRunManage/DeviceRun.aspx"></TreeNode>
<TreeNode id="4B964B32-D5CC-48A2-8750-48BC4460C264" Text="工作包设置" NavigateUrl="TestRun/TestRunManage/SetWorkPackage.aspx"></TreeNode>
<TreeNode id="B6EE8E3B-77E2-416E-8985-3C78A2169B89" Text="工作包裁剪" NavigateUrl="TestRun/TestRunManage/SubSysWorkPackage.aspx"></TreeNode>
<TreeNode id="AF2B0CAD-DE15-4F15-A5EE-C8FB558D00C8" Text="检查项分组信息" NavigateUrl="TestRun/TestRunManage/TemplateItemGroup.aspx"></TreeNode>
<TreeNode id="545AACE6-34BE-4BAA-A495-B73198F1BDE2" Text="检查表模板" NavigateUrl="TestRun/TestRunManage/InspectTemplate.aspx"></TreeNode>
<TreeNode id="086DBD12-5649-4330-807A-44ABB257495F" Text="联动试车管理" NavigateUrl="TestRun/TestRunManage/SubInspectTerm.aspx"></TreeNode>
<TreeNode id="A593B611-82C1-40D8-BB6A-DD025DB62F8C" Text="联动试车确认" NavigateUrl="TestRun/TestRunManage/SubWorkInspect.aspx"></TreeNode>
<TreeNode id="4041089F-5CC2-4070-9556-7DAB83CF6292" Text="检查表尾项管理" NavigateUrl="TestRun/TestRunManage/InspectTailTermList.aspx"></TreeNode>
<TreeNode id="A593B611-82C1-40D8-BB6A-DD025DB62F8C" Text="联动试车确认" NavigateUrl="TestRun/TestRunManage/SubWorkInspect.aspx"></TreeNode>
<TreeNode id="2232ED9A-EA3C-4CB5-A53C-D96D3F5E0527" Text="尾项处理" NavigateUrl="TestRun/TestRunManage/TailTermHandleList.aspx"></TreeNode>
<TreeNode id="9489BD6A-1A95-43BC-85C0-A65751C2C85E" Text="尾项审核" NavigateUrl="TestRun/TestRunManage/TailTermApproveList.aspx"></TreeNode>
<TreeNode id="26F8468D-4358-4E2A-895D-8720A6F1FA89" Text="检查表会签" NavigateUrl="TestRun/TestRunManage/InspectWanderAboutList.aspx"></TreeNode>
SGGL/FineUIPro.Web/common/Menu_Transfer.xml
+18
View File
@@ -1,3 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Tree>
<TreeNode id="48545C6A-9D10-47F4-810F-DAB0CFCD5BF9" Text="Project Set up" NavigateUrl="Transfer/ProjectSetup.aspx">
</TreeNode>
<TreeNode id="D94C1BA4-9DFD-4514-AE12-6F886C5D8C9B" Text="Piping" NavigateUrl="Transfer/Piping.aspx"></TreeNode>
<TreeNode id="982F746C-084C-445C-9AE8-8C37BDFE7994" Text="Static Equipment" NavigateUrl="Transfer/StaticEquipment.aspx"></TreeNode>
<TreeNode id="7E2FB5F9-FB99-4455-B68F-460F1F9A2676" Text="Rotating Equipment" NavigateUrl="Transfer/RotatingEquipment.aspx"></TreeNode>
<TreeNode id="88F51059-55B4-4CD5-A38C-36404E5029F6" Text="Instrumentation" NavigateUrl="Transfer/Instrumentation.aspx"></TreeNode>
<TreeNode id="296E75D2-192A-4D1F-8471-DD34263F8691" Text="Electrical" NavigateUrl="Transfer/Electrical.aspx"></TreeNode>
<TreeNode id="95C39F86-C060-452E-BA37-D891C466A39B" Text="Civil Structure" NavigateUrl="Transfer/CivilStructure.aspx"></TreeNode>
<TreeNode id="794E64E2-FDD2-4B7D-8408-F7FB06F9C92A" Text="Firefighting" NavigateUrl="Transfer/Firefighting.aspx"></TreeNode>
<TreeNode id="58FFBD80-ACB9-4830-A18A-E025D9600D94" Text="Telecom" NavigateUrl="Transfer/Telecom.aspx"></TreeNode>
<TreeNode id="95295BF7-FB51-480D-9902-6ADA4E8427FC" Text="Plumbing" NavigateUrl="Transfer/Plumbing.aspx"></TreeNode>
<TreeNode id="05442049-1310-45B1-9D3D-CAAE759D8F3E" Text="HVAC" NavigateUrl="Transfer/HVAC.aspx"></TreeNode>
<TreeNode id="016903B1-3B86-4CF5-AFF8-FF8BE389BEE5" Text="Punchlist from" NavigateUrl="Transfer/PunchlistFrom.aspx"></TreeNode>
<TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="移交图表" NavigateUrl=""><TreeNode id="E6F5125D-DD94-4978-B7EB-D9C26694D86D" Text="全厂移交统计表" NavigateUrl="Transfer/Chart/Instrumentation.aspx"></TreeNode>
<TreeNode id="F97BCF55-E450-4007-AD84-AB64B3496204" Text="全厂移交统计递增表" NavigateUrl="Transfer/Chart/TransferChart.aspx"></TreeNode>
<TreeNode id="C2DD3E9E-DB18-466F-8FA0-19AD6E21EEF0" Text="Punchlist from" NavigateUrl="Transfer/Chart/PunchlistFrom.aspx"></TreeNode>
<TreeNode id="BB5EC5E1-A23D-4A3F-8772-CD40757974EC" Text="Punchlist from统计递增表" NavigateUrl="Transfer/Chart/PunchlistFromChart.aspx"></TreeNode>
</TreeNode>
</Tree>
SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
+4
View File
@@ -83,4 +83,8 @@
</TreeNode>
<TreeNode id="EA413D2A-8D29-4DE2-932D-8511BB7F6CB2" Text="各项目巡查汇总" NavigateUrl="ZHGL/InspectionSummary/InspectionSummary.aspx"></TreeNode>
<TreeNode id="F2133BD6-C786-407A-AD6F-3EEF613229A8" Text="施工管理绩效数据" NavigateUrl="ZHGL/Performance/PerformanceAllData.aspx"></TreeNode>
<TreeNode id="53D8CED2-9AA7-43EA-B27D-EA10A06DF713" Text="开车人员绩效管理" NavigateUrl=""><TreeNode id="383290E0-60AE-4D16-8B5E-3899B85EC2ED" Text="开车绩效评分标准" NavigateUrl="ZHGL/TestRunPerformance/TestRunPerformanceStandard.aspx"></TreeNode>
<TreeNode id="C1240FCB-4C72-445E-82B5-EBFAA87D0AC6" Text="开车人员月绩效报告" NavigateUrl="ZHGL/TestRunPerformance/TestRunPerformanceMonthReport.aspx"></TreeNode>
<TreeNode id="0C6BB051-6BD1-4E35-90CE-9376F3C2D454" Text="开车人员月技术总结" NavigateUrl="ZHGL/TestRunPerformance/TestRunMonthSummaryReport.aspx"></TreeNode>
</TreeNode>
</Tree>
SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx
+8 -8
View File
@@ -291,9 +291,9 @@
var one1 =<%=One1 %>
var one2 =<%=One2 %>
var one3 =<%=One3 %>
category_One('one1', "质量验收一次合格率", one1, one1 + "%")
category_One('one1', "施工质量一次共检合格率", one1, one1 + "%")
category_One('one2', "焊接一次拍片合格率", one2, one2 + "%")
category_One('one3', "质量问题整改完成率", one3, one3 + "%")
category_One('one3', "质量巡检问题整改率", one3, one3 + "%")
</script>
<script type="text/javascript">
function category_six(id, title, xArr, data) {
@@ -735,7 +735,7 @@
//var data = [12, 5, 28, 43, 22, 11]
//var data1 = [21, 9, 12, 15, 8, 43]
var series = [{
name: '质量验收一次合格率',
name: '施工质量一次共检合格率',
type: 'bar',
barGap: 0,
data: three.series[0].data,
@@ -876,7 +876,7 @@
//var data = [12, 5, 28, 43, 22, 11, 40, 21, 9]
//var data1 = [21, 9, 12, 15, 8, 43, 17, 11, 22]
var series = [{
name: '质量验收一次合格率',
name: '施工质量一次共检合格率',
type: 'bar',
barWidth: 30,
barGap: 0,
@@ -1045,7 +1045,7 @@
//var data = [12, 5, 28, 43, 22, 11]
//var data1 = [21, 9, 12, 15, 8, 43]
var series = [{
name: '质量验收一次合格率',
name: '施工质量一次共检合格率',
type: 'bar',
data: three.series[0].data,
itemStyle: { normal: { color: 'rgba(43,155,176,1)' } }
@@ -1060,7 +1060,7 @@
//xArr = ["专业1", "专业2", "专业3", "专业4", "专业5", "专业6"]
xArr = three2.categories
series = [{
name: '质量验收一次合格率',
name: '施工质量一次共检合格率',
type: 'bar',
data: three2.series[0].data,
itemStyle: { normal: { color: 'rgba(43,155,176,1)' } }
@@ -1077,7 +1077,7 @@
else if (value == 4) {
var xArr = four.categories
var series = [{
name: '质量验收一次合格率',
name: '施工质量一次共检合格率',
type: 'bar',
data: four.series[0].data,
itemStyle: { normal: { color: 'rgba(43,155,176,1)' } }
@@ -1091,7 +1091,7 @@
if (index == 2) {
xArr = four2.categories
series = [{
name: '质量验收一次合格率',
name: '施工质量一次共检合格率',
type: 'bar',
data: four2.series[0].data,
itemStyle: { normal: { color: 'rgba(43,155,176,1)' } }
SGGL/FineUIPro.Web/common/mainProject2.aspx
+4 -4
View File
@@ -588,7 +588,7 @@
var aPassChart = echarts.init(document.getElementById('hjmap'));
aPassChart.setOption(AOption1);
}
// 一次共检合格率
// 施工质量一次共检合格率
ycmap()
function ycmap() {
let allNumber = 70 // 总计
@@ -597,7 +597,7 @@
let AOption1 = {
title: [
{
text: '一次共检合格率',
text: '施工质量一次共检合格率',
bottom: fontSize(30),
left: 'center',
textStyle: {
@@ -673,7 +673,7 @@
var aPassChart = echarts.init(document.getElementById('ycmap'));
aPassChart.setOption(AOption1);
}
// 质量问题整改率
// 质量巡检问题整改率
zlmap()
function zlmap() {
let allNumber = 70 // 总计
@@ -682,7 +682,7 @@ zlmap()
let AOption1 = {
title: [
{
text: '质量问题整改率',
text: '质量巡检问题整改率',
bottom: fontSize(30),
left: 'center',
textStyle: {
SGGL/FineUIPro.Web/common/main_new.aspx
+3 -3
View File
@@ -491,7 +491,7 @@
let AOption1 = {
title: [
{
text: '质量问题整改率',
text: '质量巡检问题整改率',
bottom: fontSize(30),
left: 'center',
textStyle: {
@@ -567,7 +567,7 @@
var aPassChart = echarts.init(document.getElementById('zlmap'));
aPassChart.setOption(AOption1);
}
// 一次共检合格率
// 施工质量一次共检合格率
ycmap()
function ycmap() {
let allNumber = 70 // 总计
@@ -576,7 +576,7 @@
let AOption1 = {
title: [
{
text: '一次共检合格率',
text: '施工质量一次共检合格率',
bottom: fontSize(30),
left: 'center',
textStyle: {
SGGL/FineUIPro.Web/common/main_new1.aspx
+5 -5
View File
@@ -146,7 +146,7 @@
<div class="zl-number" style="color: #FF7474;"><%=getIsOnceInspectionManagement() %></div>
</div>
<div class="y_image_default y_column" style="width: 2.7625rem;">
<div class="zl-label">一次验收合格率</div>
<div class="zl-label">施工质量一次共检合格率</div>
<div class="zl-number" style="color: #FFA602;"><%=GetInspectionManagementZgl() %></div>
</div>
</div>
@@ -186,7 +186,7 @@
</div>
<div class="y_box js-hover" data-type="QualityProblem">
<div class="y_box_label y_image_default">质量问题治理数据</div>
<div class="y_box_label y_image_default">质量巡检问题治理数据</div>
<div class="y_box_main">
<div class="zl-card y_row">
<div class="y_image_default y_column">
@@ -421,7 +421,7 @@
let value = [<%=InspectionManagementSumCount%>]
//合格
let value1 = [<%=InspectionManagementOkCount%>]
//一次验收合格率
//施工质量一次共检合格率
let value2 = [<%=InspectionManagementOneOkCount%>]
//专业
let label = [<%=InspectionManagementZy%>]
@@ -434,7 +434,7 @@
legend: {
top: fontSize(10),
left: 'center',
data: [{ name: '总计', textStyle: { color: '#20AFFF' } }, { name: '合格', textStyle: { color: '#12CDA2' } }, { name: '一次验收合格率', textStyle: { color: '#FFA602' } }]
data: [{ name: '总计', textStyle: { color: '#20AFFF' } }, { name: '合格', textStyle: { color: '#12CDA2' } }, { name: '施工质量一次共检合格率', textStyle: { color: '#FFA602' } }]
},
xAxis: {
type: 'category',
@@ -516,7 +516,7 @@
},
},
{
name: '一次验收合格率',
name: '施工质量一次共检合格率',
data: value2,
type: 'line',
itemStyle: {