main
gaoshuguang 2 years ago
parent 8707e7d213
commit 155c1b6f52

@ -0,0 +1,9 @@
Manifest-Version: 1.0
Created-By: IntelliJ IDEA
Built-By: shuguang
Build-Jdk: version 1.8.0_121
Implementation-Title: FreeCarRegistration
Implementation-Version: 0.0.1-SNAPSHOT
Implementation-Vendor-Id: com.nmgs
Main-Class: ${start-class}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1,32 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8"/>
<link rel="icon" href="/favicon.ico"/>
<title></title>
<script type="module" crossorigin src="./assets/index.71972aff.js"></script>
<link rel="stylesheet" href="./assets/index.c4ceb410.css">
</head>
<body>
<div id="app">
<div class="loading">
<div class="loading-wrap">
<div class="loading-dots">
<span class="dot dot-spin">
<i></i>
<i></i>
<i></i>
<i></i>
</span>
</div>
<div class="loading-title">
正在缓冲...
</div>
</div>
</div>
</div>
<script type="text/javascript" src="../static/bmapOffline/map_load.js"></script>
</body>
</html>

@ -21,9 +21,9 @@
<el-col :span="3"> <el-col :span="3">
<div align="center"> <div align="center">
<el-button type="primary" @click="connectGpy" <el-button type="primary" @click="connectGpy"
> >
<el-icon > <el-icon>
<VideoCamera /> <VideoCamera/>
</el-icon> </el-icon>
<span style="vertical-align: middle;"> 连接高拍仪 </span> <span style="vertical-align: middle;"> 连接高拍仪 </span>
</el-button> </el-button>
@ -35,8 +35,8 @@
<div align="center"> <div align="center">
<el-button type="primary" @click="addImage" <el-button type="primary" @click="addImage"
:disabled="!gpyConnect"> :disabled="!gpyConnect">
<el-icon > <el-icon>
<!-- <el-icon style="vertical-align: middle;margin-top: -5%">--> <!-- <el-icon style="vertical-align: middle;margin-top: -5%">-->
<CameraFilled/> <CameraFilled/>
</el-icon> </el-icon>
<span style="vertical-align: middle;"> 拍照 </span> <span style="vertical-align: middle;"> 拍照 </span>
@ -59,7 +59,7 @@
> >
<template #trigger> <template #trigger>
<el-button type="primary" @click=""> <el-button type="primary" @click="">
<el-icon > <el-icon>
<Upload/> <Upload/>
</el-icon> </el-icon>
<span style="vertical-align: middle;"> 上传 </span> <span style="vertical-align: middle;"> 上传 </span>
@ -68,7 +68,8 @@
</el-upload> </el-upload>
</div> </div>
</el-col> </el-col>
<el-col :span="24" v-if="gpyConnect"> <!-- <el-col :span="24" v-if="gpyConnect">-->
<el-col :span="24" >
<div style="width: 100%" align="center"> <div style="width: 100%" align="center">
<div id='CameraCtl' :style="CameraStyle"></div> <div id='CameraCtl' :style="CameraStyle"></div>
</div> </div>
@ -128,11 +129,26 @@ export default {
devName: '', devName: '',
imgSrc: '', imgSrc: '',
uploadImageSrc: '', uploadImageSrc: '',
// watchShowGpy: '',
imgArr: [], imgArr: [],
} }
}, },
watch: { watch: {
// watchShowGpy:{
// deep: true,
// value: this.gpyConnect,
// handler(value) {
// if(value){
// const height = document.documentElement.clientHeight * 0.4;
// const width = height / 9 * 16;
// this.CameraStyle = 'width:' + width + 'px;height:' + height + 'px';
// Cam_ControlInit(document.getElementById("CameraCtl"), 0, 0, width, height, this, true);
// }
// },
// },
uploadImageSrc: { uploadImageSrc: {
deep: true, deep: true,
handler(newValue) { handler(newValue) {
@ -176,11 +192,25 @@ export default {
}, },
closePage() { closePage() {
CloseConnect(); CloseConnect();
this.gpyConnect = false;
}, },
connectGpy() { connectGpy() {
this.gpyLoading = true this.gpyLoading = true
this.gpyConnect = true;
const height = document.documentElement.clientHeight * 0.4;
const width = height / 9 * 16;
this.CameraStyle = 'width:' + width + 'px;height:' + height + 'px';
Cam_ControlInit(document.getElementById("CameraCtl"), 0, 0, width, height, this, true);
// this.connectGpy2();
},
connectGpy2() {
this.gpyLoading = true
this.gpyConnect = true;
const height = document.documentElement.clientHeight * 0.4; const height = document.documentElement.clientHeight * 0.4;
const width = height / 9 * 16; const width = height / 9 * 16;
this.CameraStyle = 'width:' + width + 'px;height:' + height + 'px';
Cam_ControlInit(document.getElementById("CameraCtl"), 0, 0, width, height, this, true); Cam_ControlInit(document.getElementById("CameraCtl"), 0, 0, width, height, this, true);
}, },
toConnectGPY() { toConnectGPY() {
@ -188,6 +218,7 @@ export default {
// console.log(this.devName) // console.log(this.devName)
if (this.devName != null && this.devName != '') { if (this.devName != null && this.devName != '') {
this.gpyLoading = true this.gpyLoading = true
this.gpyConnect = true;
const height = document.documentElement.clientHeight * 0.4; const height = document.documentElement.clientHeight * 0.4;
const width = height / 9 * 16; const width = height / 9 * 16;
this.imgStyle = 'height:' + height * 0.45 + 'px;'; this.imgStyle = 'height:' + height * 0.45 + 'px;';
@ -216,6 +247,7 @@ export default {
}, },
beforeUnmount() { beforeUnmount() {
this.gpyConnect = false;
CloseConnect(); CloseConnect();
} }
} }

Loading…
Cancel
Save