提交 f214a33e authored 作者: liujiaxing's avatar liujiaxing

更新

上级 84c9135c
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
changeSpeed() changeSpeed()
}" /> }" />
</el-select> </el-select>
<div class="resetClass" @click="resetclick">重置模式</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -66,7 +67,6 @@ ...@@ -66,7 +67,6 @@
</div> </div>
<span class="marker-label" :class="{ 'selected-label': isMarkerInSelectedRange(marker) }" <span class="marker-label" :class="{ 'selected-label': isMarkerInSelectedRange(marker) }"
v-if="((index) % showLength === 0 || index === timeMarkers.length - 1)" v-html="marker.label"></span> v-if="((index) % showLength === 0 || index === timeMarkers.length - 1)" v-html="marker.label"></span>
</div> </div>
</div> </div>
...@@ -97,8 +97,6 @@ ...@@ -97,8 +97,6 @@
</template> </template>
<script setup> <script setup>
import { VideoPlay, VideoPause, CaretLeft, CaretRight } from '@element-plus/icons-vue';
import { ElLoading, ElMessage } from 'element-plus' import { ElLoading, ElMessage } from 'element-plus'
import Loading from '@/pages/all/components/loadingComponent/index.js' import Loading from '@/pages/all/components/loadingComponent/index.js'
import { ref, onMounted, onUnmounted, computed, watch, nextTick, watchEffect } from 'vue'; import { ref, onMounted, onUnmounted, computed, watch, nextTick, watchEffect } from 'vue';
...@@ -106,7 +104,6 @@ import wss from '@/utils/requestSocekt.js' ...@@ -106,7 +104,6 @@ import wss from '@/utils/requestSocekt.js'
import wsTime from '@/utils/requestSocektTime.js' import wsTime from '@/utils/requestSocektTime.js'
import useAppStore from '@/store/module/app' import useAppStore from '@/store/module/app'
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { timeInfoApi } from '../../../api/Zodiac.js';
const wssInstance = ref(wss) const wssInstance = ref(wss)
const wsTimeInstance = ref(wsTime) const wsTimeInstance = ref(wsTime)
...@@ -347,7 +344,8 @@ const wssMessageHandle = () => { ...@@ -347,7 +344,8 @@ const wssMessageHandle = () => {
//console.log('我是timer获取的wssRespone:', data); //console.log('我是timer获取的wssRespone:', data);
//console.log("我走了seekConfirm",!(data?.isLagrangeInterpolation === true)); //console.log("我走了seekConfirm",!(data?.isLagrangeInterpolation === true));
let flagToNext = 0 let flagToNext = 0
Loading.hide() Loading.hide()//接受到后端ws传递的消息,这时候隐藏loading
if (data.type === 'control' && !(data.controlType === 'stop') && !(data.controlType === 'continue')) { if (data.type === 'control' && !(data.controlType === 'stop') && !(data.controlType === 'continue')) {
if (data.nextTimestamp) { if (data.nextTimestamp) {
preTimeWindowEnd.value = data.nextTimestamp || data.dataTime; preTimeWindowEnd.value = data.nextTimestamp || data.dataTime;
...@@ -732,7 +730,7 @@ const timeMarkers = computed(() => { ...@@ -732,7 +730,7 @@ const timeMarkers = computed(() => {
current.setHours(current.getHours() + 1); // 每次 +1 小时 current.setHours(current.getHours() + 1); // 每次 +1 小时
} }
// console.log('markers',markers) console.log('markers时间刻度信息----', markers)
return markers; return markers;
}); });
...@@ -1330,6 +1328,10 @@ const formatDateTimeOne = (timeStr) => { ...@@ -1330,6 +1328,10 @@ const formatDateTimeOne = (timeStr) => {
// } // }
// } // }
// 重置模式为实时模式
const resetclick = () => {
}
const tempDateTime = ref(new Date(useAppStoreInstance.globalTimeLineEndSelectTime)) const tempDateTime = ref(new Date(useAppStoreInstance.globalTimeLineEndSelectTime))
onMounted(() => { onMounted(() => {
wsTimeInstanceFn();//接受实时模式下的数据 wsTimeInstanceFn();//接受实时模式下的数据
...@@ -1397,7 +1399,7 @@ onMounted(() => { ...@@ -1397,7 +1399,7 @@ onMounted(() => {
isRealtime: is_flag_isRealtime.value, isRealtime: is_flag_isRealtime.value,
taskCode: String(taskCode_everyChange.value) === "" ? useAppStoreInstance.globalRecordMainSysTaskCode || (useAppStoreInstance.globalSubsystemTaskCode) : String(taskCode_everyChange.value), taskCode: String(taskCode_everyChange.value) === "" ? useAppStoreInstance.globalRecordMainSysTaskCode || (useAppStoreInstance.globalSubsystemTaskCode) : String(taskCode_everyChange.value),
speed: playbackSpeed.value, speed: playbackSpeed.value,
status: isPlaying.value ? "continue" : "stop", // status: isPlaying.value ? "continue" : "stop",
}))) })))
console.log("走了这里1"); console.log("走了这里1");
} }
...@@ -1442,7 +1444,7 @@ const realTimeData = () => { ...@@ -1442,7 +1444,7 @@ const realTimeData = () => {
taskCode: String(taskCode_everyChange.value) === "" ? useAppStoreInstance.globalRecordMainSysTaskCode || (useAppStoreInstance.globalSubsystemTaskCode) : String(taskCode_everyChange.value), taskCode: String(taskCode_everyChange.value) === "" ? useAppStoreInstance.globalRecordMainSysTaskCode || (useAppStoreInstance.globalSubsystemTaskCode) : String(taskCode_everyChange.value),
currentTime: dayjs(selectedEndTime.value).format('YYYY-MM-DD HH:mm'), currentTime: dayjs(selectedEndTime.value).format('YYYY-MM-DD HH:mm'),
status: isPlaying.value ? "continue" : "stop", // status: isPlaying.value ? "continue" : "stop",
//时间参数 //时间参数
}))) })))
...@@ -1602,6 +1604,7 @@ onUnmounted(() => { ...@@ -1602,6 +1604,7 @@ onUnmounted(() => {
.right_block { .right_block {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center;
padding: 0 10px; padding: 0 10px;
} }
...@@ -1863,4 +1866,12 @@ onUnmounted(() => { ...@@ -1863,4 +1866,12 @@ onUnmounted(() => {
:deep(.el-select__suffix) { :deep(.el-select__suffix) {
opacity: 0; opacity: 0;
} }
.resetClass {
height: 100%;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
}
</style> </style>
\ No newline at end of file
差异被折叠。
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论