|
@@ -262,14 +262,14 @@ export default {
|
|
|
let compMarkerts={};
|
|
|
//产线提示框位置,元素顺序为默认位置,左位置和右位置
|
|
|
const markerPos=[
|
|
|
- [[-140, 87, 11],[-130, 87, 11],[-80, 87, 11]],
|
|
|
- [[-130, 75, 11],[-130, 75, 11],[-80, 75, 11]],
|
|
|
- [[-120, 64, 11],[-130, 64, 11],[-80, 64, 11]],
|
|
|
- [[-110, 53, 11],[-130, 53, 11],[-80, 53, 11]],
|
|
|
- [[-101, 43, 11],[-130, 43, 11],[-80, 43, 11]],
|
|
|
+ [[-140, 89, 11],[-130, 89, 11],[-80, 89, 11]],
|
|
|
+ [[-130, 77, 11],[-130, 77, 11],[-80, 77, 11]],
|
|
|
+ [[-120, 66, 11],[-130, 66, 11],[-80, 66, 11]],
|
|
|
+ [[-110, 55, 11],[-130, 55, 11],[-80, 55, 11]],
|
|
|
+ [[-101, 44, 11],[-130, 44, 11],[-80, 44, 11]],
|
|
|
[[-94, 33, 11],[-130, 33, 11],[-80, 33, 11]],
|
|
|
- [[-87, 21, 11],[-130, 21, 11],[-80, 21, 11]],
|
|
|
- [[-80, 10, 11],[-130, 10, 11],[-80, 10, 11]]
|
|
|
+ [[-87, 22, 11],[-130, 22, 11],[-80, 22, 11]],
|
|
|
+ [[-80, 11, 11],[-130, 11, 11],[-80, 11, 11]]
|
|
|
];
|
|
|
const btnFrontBg = require('@/assets/image/nav_btn_front.png');
|
|
|
watch(() => props.clickEvent, newVal=> {
|
|
@@ -765,16 +765,16 @@ export default {
|
|
|
[0.0014405644117746175, 0.5652582237894268, 0.8249127621831281], 1);
|
|
|
}else{
|
|
|
//非全屏模式下的视角
|
|
|
- player.Native.Camera.moveTo([-90.4534875451608, -201.60779996809177, 156.1529830648182],
|
|
|
- [-80.69618225097656,21.59876251220703,11.815500259399414],
|
|
|
- [0.001388561848385436, 0.544853112866498, 0.838530355619688], 1);
|
|
|
+ player.Native.Camera.moveTo([-96.28250048486545,-174.9589162690673,138.93124701014426],
|
|
|
+ [ -87.68050285922813,21.819011918402026,11.68395414100361],
|
|
|
+ [ 0.0013062340462677805,0.5429710874519466,0.8397503747804266], 1);
|
|
|
}
|
|
|
}
|
|
|
function HideWindow(){
|
|
|
if(isShowAI.value){
|
|
|
- player.Native.Camera.moveTo([-90.4534875451608, -201.60779996809177, 156.1529830648182],
|
|
|
- [-80.69618225097656,21.59876251220703,11.815500259399414],
|
|
|
- [0.001388561848385436, 0.544853112866498, 0.838530355619688], 1);
|
|
|
+ player.Native.Camera.moveTo([-96.28250048486545,-174.9589162690673,138.93124701014426],
|
|
|
+ [ -87.68050285922813,21.819011918402026,11.68395414100361],
|
|
|
+ [ 0.0013062340462677805,0.5429710874519466,0.8397503747804266], 1);
|
|
|
}
|
|
|
isShowAI.value=false;
|
|
|
for(var k in compMarkerts){
|
|
@@ -821,6 +821,16 @@ export default {
|
|
|
});
|
|
|
return;
|
|
|
}
|
|
|
+ var lineNo1 = compProctList.value[0].ai_prouct_no*1;
|
|
|
+ var lineNo2 = compProctList.value[1].ai_prouct_no*1;
|
|
|
+ if(lineNo1==lineNo2 && compProctList.value[0].compDate==compProctList.value[1].compDate && compProctList.value[0].compDateHour1==compProctList.value[1].compDateHour1){
|
|
|
+ ElMessage({
|
|
|
+ message:'对比分析的产线、日期及时点不能完全相同!',
|
|
|
+ type:'error',
|
|
|
+ customClass: 'custom-message'
|
|
|
+ });
|
|
|
+ return;
|
|
|
+ }
|
|
|
for(var k in compMarkerts){
|
|
|
if(player!=null && player.Native!=null)player.Native.GisMarker.destroy(k);
|
|
|
}
|
|
@@ -830,9 +840,7 @@ export default {
|
|
|
customClass: 'custom-message',
|
|
|
duration:0
|
|
|
});
|
|
|
- compMarkerts = {};
|
|
|
- var lineNo1 = compProctList.value[0].ai_prouct_no*1;
|
|
|
- var lineNo2 = compProctList.value[1].ai_prouct_no*1;
|
|
|
+ compMarkerts = {};
|
|
|
///api/yr/compare?line1=1&line2=2&time1=2025-05-13%2008:00:00&time2=2025-05-13%2009:00:00
|
|
|
var v={
|
|
|
line1:lineNo1,
|
|
@@ -872,9 +880,9 @@ export default {
|
|
|
+" \r 电(kWh) :"+line1Data.electricity
|
|
|
+" \r 气(GJ) :"+line1Data.gas;
|
|
|
}else{
|
|
|
- tipText = lineNo1+"#产线("+compProctList.value[0].compDate+")\r "+
|
|
|
- compProctList.value[0].compDateHour1+"时 "+
|
|
|
- compProctList.value[1].compDateHour1+"时\r合格率(%):"+line1Data.rate+" 合格率(%):"+line2Data.rate
|
|
|
+ tipText = lineNo1+"#产线\r"+
|
|
|
+ compProctList.value[0].compDate+" "+compProctList.value[0].compDateHour1+"时 "+
|
|
|
+ compProctList.value[1].compDate+" "+compProctList.value[1].compDateHour1+"时\r合格率(%):"+line1Data.rate+" 合格率(%):"+line2Data.rate
|
|
|
+" \r重 量(T):"+line1Data.weight.toString().padEnd(5," ")+" 重 量(T):"+line2Data.weight.toString().padEnd(5," ")
|
|
|
+" \r米 长(m):"+line1Data.length.toString().padEnd(5," ")+" 米 长(m):"+line2Data.length.toString().padEnd(5," ")
|
|
|
+" \r水(m3) :"+line1Data.water.toString().padEnd(5," ")+" 水(m3) :"+line2Data.water.toString().padEnd(5," ")
|