优化

2 years ago · 155c1b6f52
parent 8707e7d213
commit 155c1b6f52
6 changed files with 48 additions and 167 deletions
--- a/FreeCarRegistration/target/FreeCarRegistration/META-INF/MANIFEST.MF
+++ b/FreeCarRegistration/target/FreeCarRegistration/META-INF/MANIFEST.MF
@ -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}
+
--- a/FreeCarRegistration/target/FreeCarRegistration/WEB-INF/classes/com/nmgs/entity/WxUnBindApply.class
+++ b/FreeCarRegistration/target/FreeCarRegistration/WEB-INF/classes/com/nmgs/entity/WxUnBindApply.class
--- a/FreeCarRegistrationView/FreeCarRegistration/assets/index.71972aff.js
+++ b/FreeCarRegistrationView/FreeCarRegistration/assets/index.71972aff.js
--- a/FreeCarRegistrationView/FreeCarRegistration/assets/index.c4ceb410.css
+++ b/FreeCarRegistrationView/FreeCarRegistration/assets/index.c4ceb410.css
--- a/FreeCarRegistrationView/FreeCarRegistration/index.html
+++ b/FreeCarRegistrationView/FreeCarRegistration/index.html
@ -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>
--- a/FreeCarRegistrationView/src/views/wxCharCarUser/gpy.vue
+++ b/FreeCarRegistrationView/src/views/wxCharCarUser/gpy.vue
@ -22,8 +22,8 @@
      <div align="center">
        <el-button type="primary" @click="connectGpy"
        >
-          <el-icon >
-           <VideoCamera />
+          <el-icon>
+            <VideoCamera/>
          </el-icon>
          <span style="vertical-align: middle;"> 连接高拍仪 </span>
        </el-button>
@ -35,8 +35,8 @@
      <div align="center">
        <el-button type="primary" @click="addImage"
                   :disabled="!gpyConnect">
-          <el-icon >
-<!--          <el-icon style="vertical-align: middle;margin-top: -5%">-->
+          <el-icon>
+            <!--          <el-icon style="vertical-align: middle;margin-top: -5%">-->
            <CameraFilled/>
          </el-icon>
          <span style="vertical-align: middle;"> 拍照 </span>
@ -59,7 +59,7 @@
        >
          <template #trigger>
            <el-button type="primary" @click="">
-              <el-icon >
+              <el-icon>
                <Upload/>
              </el-icon>
              <span style="vertical-align: middle;"> 上传 </span>
@ -68,7 +68,8 @@
        </el-upload>
      </div>
    </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 id='CameraCtl' :style="CameraStyle"></div>
      </div>
@ -128,11 +129,26 @@ export default {
      devName: '',
      imgSrc: '',
      uploadImageSrc: '',
+      // watchShowGpy: '',
      imgArr: [],

    }
  },
  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: {
      deep: true,
      handler(newValue) {
@ -176,11 +192,25 @@ export default {
    },
    closePage() {
      CloseConnect();
+      this.gpyConnect = false;
    },
    connectGpy() {
      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 width = height / 9 * 16;
+      this.CameraStyle = 'width:' + width + 'px;height:' + height + 'px';
      Cam_ControlInit(document.getElementById("CameraCtl"), 0, 0, width, height, this, true);
    },
    toConnectGPY() {
@ -188,6 +218,7 @@ export default {
      // console.log(this.devName)
      if (this.devName != null && this.devName != '') {
        this.gpyLoading = true
+        this.gpyConnect = true;
        const height = document.documentElement.clientHeight * 0.4;
        const width = height / 9 * 16;
        this.imgStyle = 'height:' + height * 0.45 + 'px;';
@ -216,6 +247,7 @@ export default {

  },
  beforeUnmount() {
+    this.gpyConnect = false;
    CloseConnect();
  }
 }