admin/zhgdlarge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-03-28 11:40:44 +08:00
parent 4d0ec77f96
commit 078cf5b8f7
6 changed files with 59 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/stores/index.ts
View File

@ -10,6 +10,7 @@ export const GlobalStore = defineStore({
id: "GlobalState",
// state: 返回对象的函数
state: (): GlobalState => ({
globalScale: 1,
sn: "",
// token
token: "",

1
src/stores/interface/index.ts
View File

@ -1,5 +1,6 @@
/* GlobalState */
export interface GlobalState {
globalScale: number | null;
sn: string | null;
Message: Object | null;
token: string | null;

21
src/views/sevenLargeScreen/digitalConstruction/carPosition/index.vue
View File

@ -260,7 +260,7 @@ import personOn from "@/assets/images/carPosition/personOn.png";
import { GlobalStore } from "@/stores";
import { ElMessage } from "element-plus";
import Card from "@/components/card.vue";
const store = GlobalStore();
const store:any = GlobalStore();
import { computed, reactive, ref, onMounted, onBeforeMount, watch } from "vue";
var mouseTool;
var marker;
@ -372,6 +372,15 @@ let formRules = ref({
}
]
});
const resetMapSize = () => {
console.log(666)
setTimeout(() => {
let mapContent:any = document.getElementById("mapContainer");
console.log(mapContent)
mapContent.style.transform = `scale(${1/store.globalScale})`;
}, 200);
};
onMounted(() => {
choiceMonth.value = formatMonthTime(dayValue.value);
console.log("当前月份", choiceMonth.value);
@ -380,7 +389,17 @@ onMounted(() => {
getCrewListData();
getFenceList();
getFenceType();
resetMapSize()
window.addEventListener("resize", e => {
resetMapSize()
});
});
onBeforeMount(() => {
window.removeEventListener("resize", e => {
resetMapSize()
});
});
// computed: {
// //Uploader实例
// // uploader() {

18
src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue
View File

@ -404,6 +404,14 @@ let addEditForm = ref({
type: 1,
driver: ""
});
const resetMapSize = () => {
console.log(666)
setTimeout(() => {
let mapContent:any = document.getElementById("mapContainer");
console.log(mapContent)
mapContent.style.transform = `scale(${1/store.globalScale})`;
}, 200);
};
onMounted(() => {
choiceMonth.value = formatMonthTime(dayValue.value);
// console.log("当前月份", choiceMonth.value);
@ -412,7 +420,17 @@ onMounted(() => {
getCrewListData();
getFenceList();
getFenceType();
resetMapSize()
window.addEventListener("resize", e => {
resetMapSize()
});
});
onBeforeMount(() => {
window.removeEventListener("resize", e => {
resetMapSize()
});
});
// computed: {
// //Uploader实例
// // uploader() {

5
src/views/sevenLargeScreen/indexL.vue
View File

@ -1,5 +1,5 @@
<template>
<ScaleBox :width="1920" :height="1080" bgc="transparent" :delay="100" :isFlat="false">
<ScaleBox :width="1920" :height="1080" bgc="transparent" :delay="100" :isFlat="false" @scaleChange="scaleChange">
<div class="largeScreen" ref="dataScreenRef">
<div class="header">
<!-- <div class="hearderIcon"><img src="@/assets/images/jxjLogo.png" alt="" /></div> -->
@ -98,6 +98,9 @@ let nowDate = ref("2023.11.16" as any);
let projectPassDay = ref(0 as any);
//获取项目信息
const projectTimeInfo = ref({} as any);
const scaleChange = (data:any) => {
store.globalScale = data;
}
const getProjectInfo = async () => {
getNowDate();
const res: any = await getTaskTimeDetail({ projectSn: store.sn });

25
src/views/sevenLargeScreen/videoManagement/index(插件版).vue
View File

@ -37,7 +37,7 @@
<ysyPlayAndPlayback :ref="'ysy'" :ysyParams="ysyParams"></ysyPlayAndPlayback>
</div>
<!-- 播放海康 -->
<div ref="playWndBox" style="width: 90%; height: 100%; margin: 0 5% 2% 5%">
<!-- <div ref="playWndBox" style="width: 90%; height: 100%; margin: 0 5% 2% 5%">
<div
id="playWnd"
class="playWnd"
@ -46,6 +46,9 @@
width: playWndWidth + 'px'
}"
></div>
</div> -->
<div ref="playWndBox" style="width: 96%; height: 100%;margin: 0 2% 0% 2%">
<div id="playWnd" class="playWnd" style="width: 100%; height: 100%"></div>
</div>
</Card>
</div>
@ -154,19 +157,21 @@ onMounted(async () => {
// 监听scroll事件，使插件窗口尺寸跟随DIV窗口变化
window.addEventListener("scroll", () => {
if (oWebControl.value == undefined) {
oWebControl.JS_Resize(tagDomObj?.clientWidth, tagDomObj?.clientHeight);
setTimeout(function(){
oWebControl.JS_Resize(playWndWidth.value * store.globalScale, playWndHeight.value * store.globalScale);
},200)
}
});
// 监听resize事件，使插件窗口尺寸跟随DIV窗口变化
window.addEventListener("resize", e => {
if (oWebControl.value == undefined) {
// console.log("wwwww", e);
oWebControl.JS_Resize(tagDomObj?.clientWidth, tagDomObj?.clientHeight);
// oWebControl.JS_Resize(playWndHeight.value, playWndWidth.value);
// setWndCover();
setTimeout(function(){
oWebControl.JS_Resize(playWndWidth.value * store.globalScale, playWndHeight.value * store.globalScale);
},200)
}
});
// 初始化播放器插件
nextTick(async () => {
@ -300,7 +305,7 @@ const init = (callback: (() => void) | undefined) => {
})
})
.then(function (oData: any) {
oWebControl.JS_Resize(playWndWidth.value, playWndHeight.value); // 初始化后resize一次，规避firefox下首次显示窗口后插件窗口未与DIV窗口重合问题
oWebControl.JS_Resize(playWndWidth.value * store.globalScale, playWndHeight.value * store.globalScale); // 初始化后resize一次，规避firefox下首次显示窗口后插件窗口未与DIV窗口重合问题
if (callback) {
callback();
@ -418,8 +423,8 @@ const previewVideo = (data: string | null) => {
height: 100%;
.videoPlayerBig {
width: 90%;
height: 90%;
width: 100%;
height: 100%;
position: relative;
}
}