Skip to content

S
SatelliteDigital
提交 6cc37c1b authored 作者: 周欢凯's avatar 周欢凯
浏览文件
操作

更新

上级 54f39dfe
隐藏空白字符变更
内嵌 并排
正在显示 包含 25 行增加 和 75 行删除
src/pages/all/components/instant/instantCurve.vue
浏览文件 @ 6cc37c1b
......@@ -281,14 +281,14 @@ function initChart() {
const date = new Date(value);
const minutes = date.getMinutes();
if (minutes === 0 || minutes === 30) {
console.log(value, '判断分钟');
// console.log(value, '判断分钟');
return value
}
} else if (!isNaN(Number(value))) {
const date = new Date(value);
const minutes = date.getMinutes();
if (minutes === 0 || minutes === 30) {
console.log(timestampToHMS(value), '判断分钟11');
// console.log(timestampToHMS(value), '判断分钟11');
return timestampToHMS(value)
}
......
src/pages/footer/component/timers.vue
浏览文件 @ 6cc37c1b
......@@ -188,28 +188,9 @@ const jumpToSpecificTime = (targetTime, PerformDrag = false) => {
// 标记为手动选择时间点
isDraged.value = true;
is_flag_isRealtime.value = false;
// is_flag_isRealtime.value = false;
isConfirmedWithRange.value = false; // 设置为false以显示完整的选中区域
// 强制更新视图
// nextTick(() => {
// updateSelectedTimes();
// //console.log("跳转到指定时间:", targetTime, "滑块位置:", percentPosition);
// // 调用UE5回调函数
// // if (window.ue5) {
// // window.ue5("callBackTimeFn", String(JSON.stringify({
// // isRealtime: false,
// // replayTime: formatDateTime(targetTime),
// // taskCode: String(taskCode_everyChange.value) === "" ? useAppStoreInstance.globalRecordMainSysTaskCode || (useAppStoreInstance.globalSubsystemTaskCode) : String(taskCode_everyChange.value),
// // })));
// // wssOpenHandle({
// // isRealtime: false,
// // replayTime: formatDateTime(targetTime),
// // taskCode: String(taskCode_everyChange.value) === "" ? useAppStoreInstance.globalRecordMainSysTaskCode || (useAppStoreInstance.globalSubsystemTaskCode) : String(taskCode_everyChange.value),
// // });
// // }
// });
// playForward();
if (PerformDrag) {
endDrag();
......@@ -582,11 +563,6 @@ const disabledDate = (time) => {
const pick_select_date = ref();
const pick_select_date_handFn = (val) => {
if (!isDraged.value) {
// window.ue5("callBackTimeFn", String(JSON.stringify({
// taskCode:String(taskCode_everyChange.value) === "" ? useAppStoreInstance.globalRecordMainSysTaskCode || (useAppStoreInstance.globalSubsystemTaskCode) : String(taskCode_everyChange.value),
// })));
}
pick_select_date.value = val;
//console.log("dddddd",val);
isChange_flag_select_date.value = true;
......@@ -598,11 +574,15 @@ const taskCode_everyChange = ref('');
// 点击确认后，处理日期范围变化
const handleDateRangeChange = async (val, flag = false, RemoveSat) => {
if (RemoveSat) {
is_flag_isRealtime.value = false;
localStorage.setItem("is_flag_isRealtime", false);
window.ue5("RemoveSat", String(JSON.stringify({
Sat: true,
})))
} else {
localStorage.setItem("is_flag_isRealtime", true);
}
useAppStoreInstance.setglobalSubsystemSelectedStartTime(val);
jiangerTime.value = 0;
isChange_flag_firstBackDate.value = false;
hasPlayed.value = false;
......@@ -616,18 +596,9 @@ const handleDateRangeChange = async (val, flag = false, RemoveSat) => {
if (isChange_flag_select_date.value || useAppStoreInstance.globalisFromTosub) {
wssResponeFlag_isSuccess.value = true;
isPlaying.value = false;
// element plus组件显示加载中
// loading.value = ElLoading.service({
// lock: true,
// text: 'Loading',
// background: 'rgba(0, 0, 0, 0.7)',
// })
if (!flag) {
Loading.show()
//console.log("cao cao1,Loading.show()");
}
// debugger
// Loading.show()
if (val && val.length === 2) {
//console.log("cao cao11",val);
......@@ -636,13 +607,10 @@ const handleDateRangeChange = async (val, flag = false, RemoveSat) => {
endDateTime.value = new Date((new Date(val[1]))).toISOString();
// //console.log("//////////////////",val[0],"4444444444--",pick_select_date.value[0]);
// preTimeWindowEnd.value = new Date((new Date(new Date(selectedStartTime.value))).setSeconds(56+60)).toISOString();
useAppStoreInstance.setglobalSubsystemSelectedStartTime(val);
// useAppStoreInstance.setglobalSubsystemSelectedEndTime(formatDateTime(val[1]));
isDraged.value = false;
is_flag_isRealtime.value = false;
isDateRangeNotEmpty.value = false;
isConfirmedWithRange.value = true; // 标记为带范围确认
clearInterval(autoUpdateDateRange.value);
......@@ -677,10 +645,8 @@ const handleDateRangeChange = async (val, flag = false, RemoveSat) => {
taskCode: String(taskCode_everyChange.value) === "" ? useAppStoreInstance.globalRecordMainSysTaskCode || (useAppStoreInstance.globalSubsystemTaskCode) : String(taskCode_everyChange.value),
currentTime: (formatDateTime(selectedEndTime.value)),
status: isPlaying.value ? "stop" : "continue",
//时间参数
})))
console.log("走了这里3");
}
wssMessageHandle()
......@@ -708,24 +674,6 @@ const handleDateRangeChange = async (val, flag = false, RemoveSat) => {
isChange_flag_select_date.value = false;//表示已经选过时间段了
playbackSpeed.value = 1;
stopAutoPlay();
// 切换实时模式的时候，之前的播放任务停止
// wssOpenHandle({
// isRealtime: is_flag_isRealtime.value? true: false,
// // status: "stop",
// // taskCode: String(taskCode_everyChange.value) === "" ? useAppStoreInstance.globalRecordMainSysTaskCode || (useAppStoreInstance.globalSubsystemTaskCode) : String(taskCode_everyChange.value),
// })
// 标志实时模式
// if(window.ue5) {
// window.ue5("callBackTimeFn", String(JSON.stringify({
// isRealtime: is_flag_isRealtime.value? true: false,
// // startTime: formatDateTime(pick_select_date.value[0]),
// // endTime: formatDateTime(pick_select_date.value[1]),
// // taskCode: String(taskCode_everyChange.value) === "" ? useAppStoreInstance.globalRecordMainSysTaskCode || (useAppStoreInstance.globalSubsystemTaskCode) : String(taskCode_everyChange.value),
// })))
// wssOpenHandle({
// isRealtime: is_flag_isRealtime.value? true: false,
// })
// }
// 强制更新视图
nextTick(() => {
......@@ -992,14 +940,11 @@ const toggleAutoPlay = () => {
endTime: formatDateTime(new Date(endDateTime.value)),
speed: playbackSpeed.value,
taskCode: String(taskCode_everyChange.value) === "" ? useAppStoreInstance.globalRecordMainSysTaskCode || (useAppStoreInstance.globalSubsystemTaskCode) : String(taskCode_everyChange.value),
currentTime: (formatDateTime(selectedEndTime.value)),
status: isPlaying.value ? "stop" : "continue",
//时间参数
})))
console.log("走了这里4");
}
......@@ -1411,6 +1356,7 @@ const endDrag = () => {
speed: playbackSpeed.value,
status: isPlaying.value ? "continue" : "stop",
})));
console.log("走了这里5");
} else {
window.ue5("callBackTimeFn", String(JSON.stringify({
isRealtime: false,
......@@ -1419,7 +1365,7 @@ const endDrag = () => {
speed: playbackSpeed.value,
status: isPlaying.value ? "continue" : "stop",
})));
console.log("走了这里6");
wssOpenHandle({
isRealtime: false,
replayTime: formatDateTime(selectedEndTime.value),
......@@ -1545,16 +1491,19 @@ onMounted(() => {
wsTimeInstanceFn();
tempDateTime.value = ""
if (useAppStoreInstance.footerTimeHasedSelectTimeToSub) {
is_flag_isRealtime.value = localStorage.getItem("is_flag_isRealtime") === "true";
console.log("初始化走上面（历史模式恢复）", is_flag_isRealtime.value, useAppStoreInstance.globalLeftWssCONTINE.mode);
tempDateTime.value = useAppStoreInstance.globalTimeLineEndSelectTime
subSysToMainSysFirstDataBack.value = false;
//历史模式时间范围
dateRange.value = [new Date((new Date(useAppStoreInstance.globalSubsystemSelectedStartTime[0]))).toISOString(), new Date((new Date(useAppStoreInstance.globalSubsystemSelectedStartTime[1]))).toISOString()]
pick_select_date.value = [new Date(dateRange.value[0]).toString(), new Date(dateRange.value[1]).toString()]
if (!is_flag_isRealtime.value) {
dateRange.value = [new Date((new Date(useAppStoreInstance.globalSubsystemSelectedStartTime[0]))).toISOString(), new Date((new Date(useAppStoreInstance.globalSubsystemSelectedStartTime[1]))).toISOString()]
pick_select_date.value = [new Date(dateRange.value[0]).toString(), new Date(dateRange.value[1]).toString()]
}
{
// ⚠️ 保存离开前的 isRealtime 状态，因为 handleDateRangeChange 内部会把 is_flag_isRealtime 设为 false
const wasRealtime = useAppStoreInstance.globalLeftWssCONTINE.type === "realtime";
// const wasRealtime = useAppStoreInstance.globalLeftWssCONTINE.type === "realtime";
handleDateRangeChange(useAppStoreInstance.globalSubsystemSelectedStartTime, true);
// handleDateRangeChange 之后恢复 isRealtime 标志（否则实时模式会变成历史模式）
// if (wasRealtime) {
......@@ -1571,7 +1520,7 @@ onMounted(() => {
const restored = new Date(tempDateTime.value);
if (!isNaN(restored.getTime())) {
jumpToSpecificTime(restored, false);
console.log("滑块恢复到离开前位置:", tempDateTime.value, "isRealtime:", wasRealtime);
console.log("滑块恢复到离开前位置:", tempDateTime.value);
}
isPlaying.value = true;
}
......@@ -1580,7 +1529,7 @@ onMounted(() => {
// wssOpenHandle 放在 nextTick 内，保证 endHandlePercent 已恢复后再触发 startAutoPlay
});
wssOpenHandle({
isRealtime: wasRealtime,
isRealtime: is_flag_isRealtime.value,
status: 'continue',
messageTypeFalg: true,
taskCode: useAppStoreInstance.globalRecordMainSysTaskCode || (useAppStoreInstance.globalSubsystemTaskCode),
......@@ -1597,6 +1546,7 @@ onMounted(() => {
speed: playbackSpeed.value,
status: isPlaying.value ? "continue" : "stop",
})))
console.log("走了这里1");
}
}
useAppStoreInstance.setGlobalisFromTosub(false)
......@@ -1644,7 +1594,7 @@ const realTimeData = () => {
//时间参数
})))
console.log("走了这里2");
}
......
src/pages/rights/index.vue
浏览文件 @ 6cc37c1b
......@@ -124,9 +124,9 @@ const calculateConfig = (selectedTemplate) => {
component2.value = obj[selectedTemplate.availabilityCurveType]
component3.value = obj[selectedTemplate.latencyCurveType]
console.log('component1', component1.value)
console.log('component2', component2.value)
console.log('component3', component3.value)
// console.log('component1', component1.value)
// console.log('component2', component2.value)
// console.log('component3', component3.value)
const curveType = {
'1': '瞬时值曲线',
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论