From 50d33c74675a9d9eee957a685d9e55b77974f6f9 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期五, 06 一月 2023 16:44:06 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt
---
src/views/intellectInspect/intelligentLine/index.vue | 66 +++++++++++++++++++-------------
1 files changed, 39 insertions(+), 27 deletions(-)
diff --git a/src/views/intellectInspect/intelligentLine/index.vue b/src/views/intellectInspect/intelligentLine/index.vue
index bfb9b95..c20d361 100644
--- a/src/views/intellectInspect/intelligentLine/index.vue
+++ b/src/views/intellectInspect/intelligentLine/index.vue
@@ -1,14 +1,18 @@
<template>
- <div class="container">
+ <div class="container" id="screenFull">
<div class="big-title" @click="goBack()">国泰新华智能巡检系统</div>
<div style="height: 20px;font-size: 14px;line-height: 20px; color: #00ffff; margin-top: 4px">{{ present }}</div>
<div class="btns">
- <div class="fullbtn" @click="onScreenfullClick">
- <div class="toFull">
- <i class="iconfont" :title="isScreenfull ? $t('message.user.title6') : $t('message.user.title5')" :class="!isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"></i>
- </div>
- <div>全屏</div>
- </div>
+<!-- <div class="fullbtn" @click="onScreenfullClick">-->
+<!-- <div class="toFull">-->
+<!-- <i class="iconfont" :title="全屏" :class="!isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"></i>-->
+<!-- <el-icon>-->
+<!-- <FullScreen v-if="isScreenfull"/>-->
+<!-- <Close v-else/>-->
+<!-- </el-icon>-->
+<!-- </div>-->
+<!-- <div>全屏</div>-->
+<!-- </div>-->
<div class="backBtn" @click="goBack()">
<img src="../../../assets/loginPage/back-icon.png"/>
<div>退出</div>
@@ -17,6 +21,7 @@
<div class="blocks">
<div>
<div class="star-pic">
+ <dv-decoration-12 scanDur="5" haloDur="4" class="scan"/>
<div class="star-bg"><img src="../../../assets/loginPage/star-bg.png" /></div>
<div class="star"><img src="../../../assets/loginPage/device-pic.png" /></div>
</div>
@@ -87,7 +92,7 @@
<script lang="ts">
import screenfull from 'screenfull';
import { lineApi } from '/@/api/intelligentLine';
-import {toRefs, reactive, ref, onMounted, onUnmounted, computed, nextTick} from 'vue';
+import {toRefs, reactive, ref, onMounted, onUnmounted, computed, nextTick, onActivated} from 'vue';
import {useRoute} from 'vue-router';
import { storeToRefs } from 'pinia';
import { initBackEndControlRoutes } from '/@/router/backEnd';
@@ -100,7 +105,6 @@
// 定义接口来定义对象的类型
interface stateType {
present: string;
- isScreenfull: boolean;
path: string;
socket: any;
socketData: string;
@@ -117,7 +121,6 @@
const route = useRoute();
const state = reactive<stateType>({
present: '',
- isScreenfull: false,
path: '',
socketData: '',
socket: null,
@@ -135,6 +138,9 @@
getLine(state.id)
getUrl(state.id)
});
+ onActivated(()=>{
+ onScreenfullClick();
+ })
const dataList = computed(() => {
return userInfos.value.dataList;
@@ -150,7 +156,6 @@
alert('您的浏览器不支持socket');
} else {
// 实例化socket
- // debugger
let uid = userInfos.value.uid.toString()
var url = state.path + uid + '*' + id;
console.log(url,'url',uid,'uid')
@@ -188,7 +193,7 @@
const getLine = async (id:string) => {
let res = await lineApi().getLine({ id: id });
if (res.data.code === '200') {
- userInfos.value.dataList = res.data.data;
+ userInfos.value.dataList = res.data.data
} else {
ElMessage({
type: 'warning',
@@ -199,18 +204,12 @@
// 全屏
const onScreenfullClick = () => {
+ const element = document.getElementById('screenFull')
if (!screenfull.isEnabled) {
ElMessage.warning('暂不不支持全屏');
return false;
}
- screenfull.toggle();
- screenfull.on('change', () => {
- if (screenfull.isFullscreen) {
- state.isScreenfull = true;
- } else {
- state.isScreenfull = false;
- }
- });
+ screenfull.toggle(element);
};
// 返回
@@ -237,7 +236,7 @@
};
</script>
-<!-- Add "scoped" attribute to limit CSS to this component only -->
+<!-- Add "scoped" attribute to limit CSS to this components only -->
<style scoped lang="scss">
@media screen and (min-width: 1366px) {
.big-title {
@@ -1002,11 +1001,11 @@
width: 100%;
height: 100%;
display: flex;
- justify-content: center;
+ justify-content: left;
align-items: flex-start;
- overflow: hidden;
- overflow-x: auto;
- overflow-y: auto;
+ overflow-y: hidden;
+ overflow-x: hidden;
+ overflow: auto;
}
.line-map {
@@ -1365,15 +1364,28 @@
position: absolute;
width: calc((100vw - 120px) / 7);
height: calc((100vw - 120px) / 7);
- z-index: 999999999;
+ z-index: 9999;
bottom: 40px;
right: 40px;
padding: 20px;
+
+ .scan{
+ position: inherit;
+ width: 65%;
+ height: 65%;
+ z-index: 99997;
+ left: 0;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ margin: auto;
+ }
.star-bg {
position: inherit;
width: 100%;
height: 100%;
+ z-index: 99998;
left: 0;
top: 0;
img {
@@ -1382,11 +1394,11 @@
animation: circle 30s linear infinite;
}
}
-
.star {
position: inherit;
width: 100%;
height: 100%;
+ z-index: 99999;
left: 0;
top: 0;
img {
--
Gitblit v1.9.2