提交 6687e9f0 authored 作者: zhuyongshuai's avatar zhuyongshuai

fix: 地面点击弹窗

上级 a38057f4
...@@ -192,7 +192,6 @@ const deviceStatusMap = ref([ ...@@ -192,7 +192,6 @@ const deviceStatusMap = ref([
// 监听 errorDeviceList 的变化 // 监听 errorDeviceList 的变化
watch(() => props.errorDeviceList, (newVal) => { watch(() => props.errorDeviceList, (newVal) => {
// //console.log("0000000000000",newVal.length,typeof newVal)
if(newVal.length === 0){ if(newVal.length === 0){
devices.value = [] devices.value = []
return return
......
...@@ -270,12 +270,15 @@ ...@@ -270,12 +270,15 @@
</div> </div>
<el-dialog v-model="errorDialogVisible" :show-close="false" :modal="false" width="300" hight="50" <!-- <el-dialog v-model="errorDialogVisible" :show-close="false" :modal="false" width="300" hight="50"
:destroy-on-close="true" :close-on-click-modal="true" style="background: rgba(0, 0, 0, 0);padding: 0;margin: 0;"> :destroy-on-close="true" style="background: rgba(0, 0, 0, 0);padding: 0;margin: 0;">
<errorDialog :errorDeviceList="errorDeviceList" :satlTitle="satlTitle" :baseDeviceList="baseDeviceList" <errorDialog :errorDeviceList="errorDeviceList" :satlTitle="satlTitle" :baseDeviceList="baseDeviceList"
@errorDialoghandleClose="errorDialoghandleClose"></errorDialog> @errorDialoghandleClose="errorDialoghandleClose"></errorDialog>
</el-dialog> </el-dialog> -->
<errorDialog v-if="errorDialogVisible" :errorDeviceList="errorDeviceList" :satlTitle="satlTitle" :baseDeviceList="baseDeviceList"
@errorDialoghandleClose="errorDialoghandleClose"></errorDialog>
</div> </div>
...@@ -355,9 +358,7 @@ const activeTabHandleClickTab = (value) => { ...@@ -355,9 +358,7 @@ const activeTabHandleClickTab = (value) => {
pageNum: 0, pageNum: 0,
pageSize: -1, pageSize: -1,
}).then(res => { }).then(res => {
//console.log(res.data, "s---------a");
primitiveFaultData.value = transformgroudSatelliteData(res.data) primitiveFaultData.value = transformgroudSatelliteData(res.data)
//console.log("11111EIRP111111*****", primitiveFaultData.value);
faultData.value = primitiveFaultData.value faultData.value = primitiveFaultData.value
if (searchEquipmentValue.value !== '') { if (searchEquipmentValue.value !== '') {
...@@ -367,9 +368,7 @@ const activeTabHandleClickTab = (value) => { ...@@ -367,9 +368,7 @@ const activeTabHandleClickTab = (value) => {
} }
if (value === 'equipment') { if (value === 'equipment') {
siteDataInfoListApi().then(res => { siteDataInfoListApi().then(res => {
//console.log(res.data, "s---------a");
primitiveSatelliteData.value = transformgroudSatelliteData(res.data) primitiveSatelliteData.value = transformgroudSatelliteData(res.data)
equipmentData.value = primitiveSatelliteData.value equipmentData.value = primitiveSatelliteData.value
if (searchEquipmentValue.value !== '') { if (searchEquipmentValue.value !== '') {
searchEquipmentList() searchEquipmentList()
...@@ -472,27 +471,26 @@ const baseDeviceList = ref({}) ...@@ -472,27 +471,26 @@ const baseDeviceList = ref({})
const satlTitle = ref('') const satlTitle = ref('')
function tableHandleRowClickFn(row, column, event) { function tableHandleRowClickFn(row, column, event) {
// console.log("错误设备的", errorDeviceListDetailsDialog.value);
// console.log("错误设备的", faultData.value)
if (activeTab.value === 'fault') { // if (activeTab.value === 'fault') {
// ElMessage.error('故障面板正在开启!') // ElMessage.error('故障面板正在开启!')
errorDialogVisible.value = true errorDialogVisible.value = true
errorDeviceList.value = errorDeviceListDetailsDialog.value.filter(item => item.siteId === row.siteId)[0]?.groundNetworkElementResponses || [] errorDeviceList.value = errorDeviceListDetailsDialog.value.filter(item => item.siteId === row.siteId)[0]?.groundNetworkElementResponses || []
// //console.log("11111EIRP111111row", row); // //console.log("11111EIRP111111row", row);
satlTitle.value = row.station ? row.station : '未知名称' satlTitle.value = row.station ? row.station : '未知名称'
//crossDeviceExtractResponseList 天线基本信息
baseDeviceList.value = errorDeviceListDetailsDialog.value.filter(item => item.siteId === row.siteId)[0]?.crossDeviceExtractResponseList || [] baseDeviceList.value = errorDeviceListDetailsDialog.value.filter(item => item.siteId === row.siteId)[0]?.crossDeviceExtractResponseList || []
//console.log('11111EIRP111111row过滤数据:',errorDeviceListDetailsDialog.value); //console.log('11111EIRP111111row过滤数据:',errorDeviceListDetailsDialog.value);
// ElMessage.success('点击了行:' + String(JSON.stringify({
// type:"DeviceFaultDialog",
// status:"open"
// })))
if (window.ue5) { if (window.ue5) {
window.ue5("callBackAllDialogFn", String(JSON.stringify({ window.ue5("callBackAllDialogFn", String(JSON.stringify({
type: "DeviceFaultDialog", type: "DeviceFaultDialog",
status: "open" status: "open"
}))); })));
} }
} // }
} }
...@@ -851,7 +849,7 @@ onBeforeMount(() => { ...@@ -851,7 +849,7 @@ onBeforeMount(() => {
} else { } else {
globaleAutoPlay.value = true; // 默认值 globaleAutoPlay.value = true; // 默认值
} }
// useAppStoreInstance.setGlobalLeftWssCONTINE(wss); useAppStoreInstance.setGlobalLeftWssCONTINE(wss);
// //console.log('最终设置的自动播放状态:', globaleAutoPlay.value, typeof globaleAutoPlay.value); // //console.log('最终设置的自动播放状态:', globaleAutoPlay.value, typeof globaleAutoPlay.value);
}) })
const messageHandler = ref('') const messageHandler = ref('')
...@@ -860,6 +858,7 @@ const errorDeviceListDetailsDialog = ref([]) ...@@ -860,6 +858,7 @@ const errorDeviceListDetailsDialog = ref([])
const tempCount = ref(0) const tempCount = ref(0)
watch(() => useAppStoreInstance.globalLeftWssCONTINE, val => { watch(() => useAppStoreInstance.globalLeftWssCONTINE, val => {
// console.log("useAppStoreInstance.globalLeftWssCONTINE 60一次推过来", val);
const JSONdata = val const JSONdata = val
// console.log("useAppStoreInstance.globalLeftWssCONTINE", JSONdata,(JSONdata.type === 'history' && !(JSONdata?.isLagrangeInterpolation === true) ),JSONdata.type === 'realtime'); // console.log("useAppStoreInstance.globalLeftWssCONTINE", JSONdata,(JSONdata.type === 'history' && !(JSONdata?.isLagrangeInterpolation === true) ),JSONdata.type === 'realtime');
if (JSONdata.type === 'history') { if (JSONdata.type === 'history') {
...@@ -874,7 +873,6 @@ watch(() => useAppStoreInstance.globalLeftWssCONTINE, val => { ...@@ -874,7 +873,6 @@ watch(() => useAppStoreInstance.globalLeftWssCONTINE, val => {
satelliteList.push(temp) satelliteList.push(temp)
}); });
//console.log("我走了这里", satelliteList);
primitiveSatelliteData.value = wssTransformSatelliteData(satelliteList) primitiveSatelliteData.value = wssTransformSatelliteData(satelliteList)
primitiveSatelliteData.value.sort((a, b) => { primitiveSatelliteData.value.sort((a, b) => {
...@@ -883,7 +881,6 @@ watch(() => useAppStoreInstance.globalLeftWssCONTINE, val => { ...@@ -883,7 +881,6 @@ watch(() => useAppStoreInstance.globalLeftWssCONTINE, val => {
sensitivity: 'base' // 忽略大小写和重音符号 sensitivity: 'base' // 忽略大小写和重音符号
}); });
}); });
//console.log("cao cao2,", primitiveSatelliteData.value,);
satelliteData.value = primitiveSatelliteData.value satelliteData.value = primitiveSatelliteData.value
primitiveEquipmentData.value = equipmentData.value primitiveEquipmentData.value = equipmentData.value
...@@ -898,10 +895,11 @@ watch(() => useAppStoreInstance.globalLeftWssCONTINE, val => { ...@@ -898,10 +895,11 @@ watch(() => useAppStoreInstance.globalLeftWssCONTINE, val => {
primitiveFaultData.value = [] primitiveFaultData.value = []
primitiveFaultData.value = wssTransformgroudSatelliteData(JSONdata.deviceFaultCondition) primitiveFaultData.value = wssTransformgroudSatelliteData(JSONdata.deviceFaultCondition)
faultData.value = primitiveFaultData.value faultData.value = primitiveFaultData.value
//console.log("此时的fault", primitiveFaultData.value);
if (searchEquipmentValue.value !== '') { if (searchEquipmentValue.value !== '') {
searchEquipmentList() searchEquipmentList()
} }
// console.log('JSONData',JSONdata)
errorDeviceListDetailsDialog.value = JSONdata?.gatewayStationDetails errorDeviceListDetailsDialog.value = JSONdata?.gatewayStationDetails
primitiveEquipmentData.value = [] primitiveEquipmentData.value = []
...@@ -917,8 +915,6 @@ watch(() => useAppStoreInstance.globalLeftWssCONTINE, val => { ...@@ -917,8 +915,6 @@ watch(() => useAppStoreInstance.globalLeftWssCONTINE, val => {
if (JSONdata.type === 'realtime') { if (JSONdata.type === 'realtime') {
console.log("11111EIRP111111rowrealtime");
const satelliteList = [] const satelliteList = []
JSONdata.CurrData.forEach(items => { JSONdata.CurrData.forEach(items => {
const temp = items.satelliteBasicInfoResponse const temp = items.satelliteBasicInfoResponse
...@@ -968,117 +964,6 @@ watch(() => useAppStoreInstance.globalLeftWssCONTINE, val => { ...@@ -968,117 +964,6 @@ watch(() => useAppStoreInstance.globalLeftWssCONTINE, val => {
onMounted(() => { onMounted(() => {
// (useAppStoreInstance.globalLeftWssCONTINE).onmessage = (event) => {
// const JSONdata = JSON.parse(event.data);
// //console.log("我走了onMounted", JSONdata.type === 'history', !(JSONdata?.isLagrangeInterpolation === true));
// if (JSONdata.type === 'history' && !(JSONdata?.isLagrangeInterpolation === true) && (JSONdata.groundSystem !== undefined)) {
// const satelliteList = []
// JSONdata.CurrData.forEach(items => {
// const temp = items.satelliteBasicInfoResponse
// temp.siteName = items?.currentGatewayAssociations || null
// satelliteList.push(temp)
// });
// //console.log("我走了这里", satelliteList);
// primitiveSatelliteData.value = wssTransformSatelliteData(satelliteList)
// primitiveSatelliteData.value.sort((a, b) => {
// return a.name.localeCompare(b.name, undefined, {
// numeric: true, // 启用数字排序
// sensitivity: 'base' // 忽略大小写和重音符号
// });
// });
// //console.log("cao cao2,", primitiveSatelliteData.value,);
// satelliteData.value = primitiveSatelliteData.value
// primitiveEquipmentData.value = equipmentData.value
// //console.log('我是left,type == history获取的wssRespone:', JSONdata.groundStationDeviceCount);
// // 地面数据,上层数据
// groundMetrics.value = wssTransformGroundSatelliteData(JSONdata.groundSystem)
// // 地面数据,下层数据
// primitiveFaultData.value = []
// primitiveFaultData.value = wssTransformgroudSatelliteData(JSONdata.deviceFaultCondition)
// faultData.value = primitiveFaultData.value
// //console.log("此时的fault", primitiveFaultData.value);
// if (searchEquipmentValue.value !== '') {
// searchEquipmentList()
// }
// errorDeviceListDetailsDialog.value = JSONdata?.gatewayStationDetails
// primitiveEquipmentData.value = []
// primitiveEquipmentData.value = wssTransformgroudSatelliteData(JSONdata.groundStationDeviceCount)
// //console.log("此时的equipment", primitiveEquipmentData.value);
// equipmentData.value = primitiveEquipmentData.value
// if (searchEquipmentValue.value !== '') {
// searchEquipmentList()
// }
// }
// if (JSONdata.type === 'realtime') {
// //console.log("11111EIRP111111rowrealtime");
// const satelliteList = []
// JSONdata.CurrData.forEach(items => {
// const temp = items.satelliteBasicInfoResponse
// temp.siteName = items.siteName
// satelliteList.push(temp)
// });
// primitiveSatelliteData.value = wssTransformSatelliteData(satelliteList)
// primitiveSatelliteData.value.sort((a, b) => {
// return a.name.localeCompare(b.name, undefined, {
// numeric: true, // 启用数字排序
// sensitivity: 'base' // 忽略大小写和重音符号
// });
// });
// //console.log("cao cao2,", primitiveSatelliteData.value,);
// satelliteData.value = primitiveSatelliteData.value
// primitiveEquipmentData.value = equipmentData.value
// // //console.log('我是left,type == history获取的wssRespone:', JSONdata.groundStationDeviceCount);
// // 地面数据,上层数据
// // groundMetrics.value = wssTransformGroundSatelliteData(JSONdata.groundSystem)
// // 地面数据,下层数据
// // primitiveFaultData.value = []
// // primitiveFaultData.value = wssTransformgroudSatelliteData(JSONdata.deviceFaultCondition)
// // faultData.value = primitiveFaultData.value
// // //console.log("此时的fault", primitiveFaultData.value);
// // if (searchEquipmentValue.value !== '') {
// // searchEquipmentList()
// // }
// // primitiveEquipmentData.value = []
// // primitiveEquipmentData.value = wssTransformgroudSatelliteData(JSONdata.groundStationDeviceCount)
// // //console.log("此时的equipment", primitiveEquipmentData.value);
// // equipmentData.value = primitiveEquipmentData.value
// // if (searchEquipmentValue.value !== '') {
// // searchEquipmentList()
// // }
// }
// // //console.log('我是left,type !!!= history获取的wssRespone:', JSONdata, typeof JSONdata.satelliteList);
// // 在这里处理您的业务逻辑
// };
// (useAppStoreInstance.globalLeftWssCONTINE).addEventListener('message', messageHandler.value);
// //console.log("组件挂载时的自动播放状态:", wss);
}) })
onUnmounted(() => { onUnmounted(() => {
if (messageHandler.value) { if (messageHandler.value) {
...@@ -1932,7 +1817,7 @@ onUnmounted(() => { ...@@ -1932,7 +1817,7 @@ onUnmounted(() => {
position: absolute; position: absolute;
bottom: 10px; bottom: 10px;
left: 400px; left: 400px;
z-index: 1001 !important; /* z-index: 1001 !important; */
} }
/* 左侧边栏滚动条美化 */ /* 左侧边栏滚动条美化 */
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论