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

20221008 001 焊接分析修改和焊接修复

Browse Source
This commit is contained in:
李鹏飞
2022-10-08 15:20:07 +08:00
parent 5e4a7de2ac
commit ccb0a6152b
13 changed files with 1389 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx
+136 -45
View File
@@ -33,7 +33,24 @@
</div>
</div>
</div>
<%-- <div class="sub-section sub-section-01">
<div class="sub-section-header">
<span class="sub-section-title">工厂预制进度</span>
</div>
<div class="sub-section-inner">
<div id="echarts01" class="echarts-box" style="width: 80%; height: 80%;"></div>
</div>
</div>--%>
<div class="sub-section sub-section-02">
<div class="sub-section-header">
<span class="sub-section-title">管道实时预制率</span>
</div>
<div class="sub-section-inner">
<div id="echarts02" class="echarts-box" style="width: 80%; height: 80%;"></div>
</div>
</div>
<%--<div class="sub-section sub-section-02">
<div class="sub-section-header">
<span class="sub-section-title">项目焊接工程量统计</span>
<div class="sub-right-select">
@@ -49,11 +66,11 @@
<div class="sub-section-inner">
<div id="echarts02" class="echarts-box" style="width: 80%; height: 80%;"></div>
</div>
</div>
</div>--%>
<div class="sub-section sub-section-03">
<div class="sub-section-header">
<span class="sub-section-title">焊接缺陷分析</span>
<div class="sub-right-select">
<span class="sub-section-title">焊工功效分析</span>
<%--<div class="sub-right-select">
<div class="sub-select-name">
<span class="sub-select-value">按分包商</span><span class="dropdown-arrow"></span>
</div>
@@ -62,10 +79,12 @@
<li class="sub-select-li active" data-type="2">按单位工程</li>
<li class="sub-select-li" data-type="3">按材质类别</li>
</ul>
</div>
</div>--%>
</div>
<div class="sub-section-inner">
<div id="echarts03" class="echarts-box"></div>
<%--<div id="echarts03" class="echarts-box"></div>--%>
<div class="real-time-num" runat="server" id="divWelderEfficacyNum">
</div>
</div>
</div>
</div>
@@ -108,6 +127,7 @@
</div>
<div class="sub-section-inner">
<div id="echarts06" class="echarts-box"></div>
</div>
</div>
</div>
@@ -116,16 +136,42 @@
<script src="../res/indexv1/assets/js/echarts-5.2.0.min.js" type="text/javascript"></script>
<script src="../res/indexv1/assets/js/draw-circle.js" type="text/javascript"></script>
<script type="text/javascript">
// 施工分包商
var dataE05_Type01 = JSON.parse('<%=E05_Type01 %>');
var dataE05_Values01_1 = JSON.parse('<%=E05_Values01_1 %>');
var dataE05_Values01_2 = JSON.parse('<%=E05_Values01_2 %>');
// 单位工程
var dataE05_Type02 = JSON.parse('<%=E05_Type02 %>');
var dataE05_Values02_1 = JSON.parse('<%=E05_Values02_1 %>');
var dataE05_Values02_2 = JSON.parse('<%=E05_Values02_2 %>');
// 材料类别
var dataE05_Type03 = JSON.parse('<%=E05_Type03 %>');
var dataE05_Values03_1 = JSON.parse('<%=E05_Values03_1 %>');
var dataE05_Values03_2 = JSON.parse('<%=E05_Values03_2 %>');
var dataE08_Type01 = JSON.parse('<%=E08_Type01 %>');
var dataE08_Values01 = JSON.parse('<%=E08_Values01 %>');
// 单位工程
var dataE08_Type02 = JSON.parse('<%=E08_Type02 %>');
var dataE08_Values02 = JSON.parse('<%=E08_Values02 %>');
// 材料类别
var dataE08_Type03 = JSON.parse('<%=E08_Type03 %>');
var dataE08_Values03 = JSON.parse('<%=E08_Values03 %>');
$(function () {
///一次合格率
// 施工分包商
$('.sub-section-02 ul li').click(function () {
var value = $(this).text()
var type = $(this).attr('data-type')
$(this).parent('ul').siblings('.sub-select-name').find('.sub-select-value').text(value)
if (type == '1') {
<%-- if (type == '1') {
initEchart02({ canvasId: 'echarts02', y: <%=Dy1 %>, n: <%=Dy2 %> })
} else if (type == '2') {
initEchart02({ canvasId: 'echarts02', y: <%=HK1 %>, n: <%=HK2 %> })
}
initEchart02({ canvasId: 'echarts02', y: <%=HK1 %>, n: <%=HK2 %> })
}--%>
initEchart02({ canvasId: 'echarts02', y: <%=PipeRate1 %>, n: <%=PipeRate2 %> })
})
$('.sub-section-03 ul li').click(function () {
var value = $(this).text()
@@ -146,33 +192,35 @@
} else if (type == '3') {
initEchart03({ name: '按材质类别', value: [50, 150, 70, 160, 75, 5], indicator: indicator })
}
// initEchart02({ canvasId: 'echarts03', y: <%=PipeRate1 %>, n: <%=PipeRate2 %> })
})
$('.sub-section-04 ul li').click(function () {
var type = $(this).attr('data-type')
$(this).addClass('active').siblings().removeClass('active')
if (type == 'fbs') {
var data = [40, 90, 83, 95, 80, 40, 90, 83, 95, 80, 40]
initEchart04(data)
// 分包商
initEchart04(dataE08_Type01, dataE08_Values01)
} else if (type == 'dwgc') {
var data = [80, 90, 83, 55, 80, 40, 20, 83, 95, 80, 60]
initEchart04(data)
// 单位工程
initEchart04(dataE08_Type02, dataE08_Values02)
} else if (type == 'czlb') {
var data = [120, 30, 83, 95, 80, 40, 10, 83, 95, 80, 20]
initEchart04(data)
// 材质类别
initEchart04(dataE08_Type03, dataE08_Values03)
}
})
$('.sub-section-05 ul li').click(function () {
var type = $(this).attr('data-type')
$(this).addClass('active').siblings().removeClass('active')
if (type == 'fbs') {
var data = [100, 50, 100, 100, 100, 100, 100, 50, 100, 100, 100];
initEchart05(data)
// 分包商
initEchart05(dataE05_Type01, dataE05_Values01_1, dataE05_Values01_2)
} else if (type == 'dwgc') {
var data = [20, 50, 100, 100, 100, 45, 100, 50, 100, 100, 34];
initEchart05(data)
// 单位工程
initEchart05(dataE05_Type02, dataE05_Values02_1, dataE05_Values02_2)
} else if (type == 'czlb') {
var data = [40, 50, 100, 100, 34, 100, 100, 50, 100, 100, 45];
initEchart05(data)
// 材质类别
initEchart05(dataE05_Type03, dataE05_Values03_1, dataE05_Values03_2)
}
})
$('.sub-section-06 ul li').click(function () {
@@ -351,12 +399,12 @@
});
}
function initEchart04(data) {
function initEchart04(xAxisData,data) {
var chartDom = document.getElementById('echarts04');
var myChart = echarts.init(chartDom);
var option;
var xAxisData = ['类型1', '类型2', '类型3', '类型4', '类型5', '类型6', '类型7', '类型8', '类型9', '类型10', '类型11']
//xAxisData = ['类型1', '类型2', '类型3', '类型4', '类型5', '类型6', '类型7', '类型8', '类型9', '类型10', '类型11']
option = {
tooltip: {
trigger: 'axis',
@@ -452,18 +500,18 @@
});
}
function initEchart05(data) {
function initEchart05(xAxisData, data1, data2) {
var chartDom = document.getElementById('echarts05');
var myChart = echarts.init(chartDom);
var myChart = echarts.init(chartDom, null);
var option;
var xAxisData = ['类型1', '类型2', '类型3', '类型4', '类型5', '类型6', '类型7', '类型8', '类型9', '类型10', '类型11'];
option = {
color: ['#4989fb'],
color: ['#1ab1ff', '#4cffc3'],
grid: {
top: '10%',
top: '15%',
left: '3%',
right: '3%',
bottom: '2%',
bottom: '5%',
containLabel: true
},
tooltip: {
@@ -473,11 +521,30 @@
type: 'shadow'
}
},
legend: {
top: '4%',
left: 'center',
textStyle: {
// fontSize: 12,//字体大小
},
data: [{
name: '焊口数', icon: 'roundRect', textStyle: {
color: '#1ab1ff'
}
}, {
name: '完成焊口数', icon: 'roundRect', textStyle: {
color: '#4cffc3'
}
}],
itemWidth: 18, //图例的宽度
itemHeight: 10, //图例的高度
},
xAxis: {
data: xAxisData,
boundaryGap: true,
axisLabel: {
color: '#1ab1ff',
color: '#00b7f8',
interval: 0,
},
axisTick: {
show: false,
@@ -485,7 +552,7 @@
axisLine: {
onZero: true,
lineStyle: {
color: '#1ab1ff',
color: '#00b7f8',
width: 1,
}
},
@@ -493,8 +560,7 @@
yAxis: {
type: 'value',
axisLabel: {
show: true,
color: '#1ab1ff',
color: '#00b7f8',
},
axisTick: {
show: false,
@@ -503,28 +569,53 @@
show: true,
lineStyle: {
type: 'dashed',
color: '#0d3760 ',
color: '#2e87ac',
},
},
splitNumber: 5,
},
series: [
{
name: '焊接进度分析',
name: '焊口数',
type: 'bar',
barWidth: 20,
data: data,
data: data1,
barGap: '10%',/*多个并排柱子设置柱子之间的间距*/
itemStyle: {
color: '#1ab1ff',
emphasis: {
barBorderRadius: [10, 10, 0, 0],
},
normal: {
barBorderRadius: [10, 10, 0, 0],
color: new echarts.graphic.LinearGradient(
0, 1, 1, 0,
1, 1, 1, 0,
[
{ offset: 0, color: '#4989fb' },
{ offset: 1, color: '#18fbfd' }
{ offset: 0, color: '#4a88fb' },
{ offset: 1, color: '#1af6fd' }
]
)
}
}
},
{
name: '完成焊口数',
type: 'bar',
barWidth: 20,
data: data2,
barGap: '10%',/*多个并排柱子设置柱子之间的间距*/
itemStyle: {
color: '#4cffc3',
emphasis: {
barBorderRadius: [10, 10, 0, 0],
},
normal: {
barBorderRadius: [10, 10, 0, 0],
color: new echarts.graphic.LinearGradient(
1, 1, 1, 0,
[
{ offset: 0, color: '#4affc6' },
{ offset: 1, color: '#18fdf9' }
]
)
}
@@ -532,13 +623,13 @@
},
]
};
myChart.clear();//清空
option && myChart.setOption(option);
window.addEventListener("resize", function () {
myChart.resize();
});
}
function initEchart06(data) {
@@ -641,8 +732,9 @@
myChart.resize();
});
}
initEchart02({ canvasId: 'echarts02', y: <%=Dy1 %>, n: <%=Dy2 %> })
// initEchart02({ canvasId: 'echarts01', y: <%=GCRate1 %>, n: <%=GCRate2 %> })
// initEchart02({ canvasId: 'echarts02', y: <%=XCRate1 %>, n: <%=XCRate2 %> })
initEchart02({ canvasId: 'echarts02', y: <%=PipeRate1 %>, n: <%=PipeRate2 %> })
// 03的数值
var indicator = [
{ text: '问题1', max: 150, },
@@ -652,11 +744,10 @@
{ text: '问题3', max: 150, },
{ text: '问题2', max: 150, }
]
initEchart03({ name: '按分包商', value: [130, 93, 50, 90, 70, 60], indicator: indicator })
var data = [40, 90, 83, 95, 80, 40, 90, 83, 95, 80, 40]
initEchart04(data)
// initEchart03({ name: '按分包商', value: [130, 93, 50, 90, 70, 60], indicator: indicator })
initEchart04(dataE08_Type01, dataE08_Values01)
var data = [100, 50, 100, 100, 100, 100, 100, 50, 100, 100, 100];
initEchart05(data)
initEchart05(dataE05_Type01, dataE05_Values01_1, dataE05_Values01_2)
var data = [40, 90, 83, 95, 80, 40, 90, 83, 95, 80, 40]
initEchart06(data)
})