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-04-10 12:02:07 +08:00
parent 7fc6510391
commit 131cabd70a
4 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -13,7 +13,7 @@ NODE_ENV = 'development'
# 沈阳合盈线上
# VITE_API_URL = "http://101.43.164.214:45022"
# 演示平台
# VITE_API_URL = 'http://jxj.zhgdyun.com:9809'
VITE_API_URL = 'http://jxj.zhgdyun.com:9809'
# 百色七参数线上地址
# VITE_API_URL = 'http://101.43.164.214:11111'
# 七参数标准版(测试平台)
@ -21,7 +21,7 @@ NODE_ENV = 'development'
# 七参数标准版(测试平台)
# VITE_API_URL = 'http://182.90.224.237:15551'
# agjt
VITE_API_URL = 'http://47.93.215.234:9809'
# VITE_API_URL = 'http://47.93.215.234:9809'
# 上传
VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='

4
src/config/config.ts
View File

@ -23,9 +23,9 @@ export const BAIDU_MAP_KEY: string = "";
export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL;
// 项目环境标识配置 部署时需更改对应的项目
// export const COMPANY: string = ""; //标准版
export const COMPANY: string = ""; //标准版
// export const COMPANY: string = "as"; //鞍山项目
export const COMPANY: string = "agjt"; //鞍钢集团
// export const COMPANY: string = "agjt"; //鞍钢集团
// export const COMPANY: string = "hfqc"; //合肥启程项目
// export const COMPANY: string = "jsyc"; // 江苏盐城项目
// export const COMPANY: string = "syhy"; //沈阳合盈盘锦项目 (需要去src\routers\modules\staticRouter.ts更换首页)

10
src/routers/modules/staticRouter.ts
View File

@ -129,11 +129,11 @@ export const staticRouter: RouteRecordRaw[] = [
name: "外墙脚手架监测",
component: () => import("@/views/sevenLargeScreen/safetyManagement/wallScaffold/wallScaffold.vue")
},
{
path: "/edgeProtection2",
name: "临边防护",
component: () => import("@/views/sevenLargeScreen/safetyManagement/edgeProtection/index_wdzs.vue")
},
// {
// path: "/edgeProtection2",
// name: "临边防护",
// component: () => import("@/views/sevenLargeScreen/safetyManagement/edgeProtection/index_wdzs.vue")
// },
{
path: "/toxicGasMonitor",
name: "有毒气体监测",

44
src/views/sevenLargeScreen/videoManagement/index.vue
View File

@ -47,7 +47,7 @@
<ysyPlayAndPlayback :ref="'ysy'" :ysyParams="ysyParams"></ysyPlayAndPlayback>
</div>
<!-- 播放海康 -->
<div ref="playWndBox" style="width: 96%; height: 100%;margin: 0 2% 0% 2%">
<div ref="playWndBox" style="width: 96%; height: 100%; margin: 0 2% 0% 2%">
<div id="playWnd" class="playWnd" style="width: 100%; height: 100%"></div>
<!-- :style="{
height: playWndHeight + 'px',
@ -105,19 +105,27 @@ const goToSafeHelmet = async () => {
}
};
// let objData = ref({
// // appkey: "24017757", //海康提供的appkey
// appkey: "23071374", //anjt的appkey
// // appkey: "", //anjt的appkey
// // ip: "182.101.141.23", //海康提供的ip
// ip: "10.168.1.100", //anjt的ip
// // ip: "", //anjt的ip
// // secret: "VJz0FbzmE6drPQ7egsBi", //海康提供的secret
// secret: "skaSIHSYPRIynnxz7o57", //anjt的secret
// // secret: "", //anjt的secret
// // port: 18443,
// port: 443,//anjt的端口
// // port: '',//anjt的端口
// playMode: 0, // 0 预览 1回放
// layout: "1x1" //页面展示的模块数【16】
// });
let objData = ref({
// appkey: "24017757", //海康提供的appkey
appkey: "23071374", //anjt的appkey
// appkey: "", //anjt的appkey
// ip: "182.101.141.23", //海康提供的ip
ip: "10.168.1.100", //anjt的ip
// ip: "", //anjt的ip
// secret: "VJz0FbzmE6drPQ7egsBi", //海康提供的secret
secret: "skaSIHSYPRIynnxz7o57", //anjt的secret
// secret: "", //anjt的secret
// port: 18443,
port: 443,//anjt的端口
// port: '',//anjt的端口
appkey: "24017757", //海康提供的appkey
ip: "182.101.141.23", //海康提供的ip
secret: "VJz0FbzmE6drPQ7egsBi", //海康提供的secret
port: 18443,
playMode: 0, // 0 预览 1回放
layout: "1x1" //页面展示的模块数【16】
});
@ -176,18 +184,18 @@ onMounted(async () => {
// 监听scroll事件，使插件窗口尺寸跟随DIV窗口变化
window.addEventListener("scroll", () => {
if (oWebControl.value == undefined) {
setTimeout(function(){
setTimeout(function () {
oWebControl.JS_Resize(playWndWidth.value * store.globalScale, playWndHeight.value * store.globalScale);
},200)
}, 200);
}
});
// 监听resize事件，使插件窗口尺寸跟随DIV窗口变化
window.addEventListener("resize", e => {
if (oWebControl.value == undefined) {
setTimeout(function(){
setTimeout(function () {
oWebControl.JS_Resize(playWndWidth.value * store.globalScale, playWndHeight.value * store.globalScale);
},200)
}, 200);
}
// if (oWebControl.value == undefined) {
// // console.log("wwwww", e);
@ -328,7 +336,7 @@ const init = (callback: (() => void) | undefined) => {
})
})
.then(function (oData: any) {
oWebControl.JS_Resize(playWndWidth.value * store.globalScale, playWndHeight.value * store.globalScale);; // 初始化后resize一次，规避firefox下首次显示窗口后插件窗口未与DIV窗口重合问题
oWebControl.JS_Resize(playWndWidth.value * store.globalScale, playWndHeight.value * store.globalScale); // 初始化后resize一次，规避firefox下首次显示窗口后插件窗口未与DIV窗口重合问题
if (callback) {
callback();