Merge branch 'master' of http://182.92.126.35:3000/msx/Vent-App

manifest.json

@@ -5,7 +5,6 @@
     "versionName" : "2.2.22",
     "versionCode" : 1,
     "transformPx" : false,
-    "external" : true,
     "app-plus" : {
         "orientation" : [
             //竖屏正方向

package-lock.json

@@ -7,6 +7,7 @@
       "dependencies": {
         "dayjs": "^1.11.10",
         "echarts": "^5.5.1",
+        "es6-promise": "^4.2.8",
         "flv.js": "^1.6.2",
         "moment": "^2.30.1",
         "uview-ui": "^2.0.36",
@@ -41,6 +42,11 @@
         "tslib": "2.3.0"
       }
     },
+    "node_modules/es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmmirror.com/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+    },
     "node_modules/flv.js": {
       "version": "1.6.2",
       "resolved": "https://registry.npmmirror.com/flv.js/-/flv.js-1.6.2.tgz",
@@ -50,11 +56,6 @@
         "webworkify-webpack": "^2.1.5"
       }
     },
-    "node_modules/flv.js/node_modules/es6-promise": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmmirror.com/es6-promise/-/es6-promise-4.2.8.tgz",
-      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
-    },
     "node_modules/flv.js/node_modules/webworkify-webpack": {
       "version": "2.1.5",
       "resolved": "https://registry.npmmirror.com/webworkify-webpack/-/webworkify-webpack-2.1.5.tgz",
@@ -101,11 +102,13 @@
   "dependencies": {
     "dayjs": {
       "version": "1.11.12",
-      "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.12.tgz"
+      "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.12.tgz",
+      "integrity": "sha512-Rt2g+nTbLlDWZTwwrIXjy9MeiZmSDI375FvZs72ngxx8PDC6YXOeR3q5LAuPzjZQxhiWdRKac7RKV+YyQYfYIg=="
     },
     "echarts": {
       "version": "5.5.1",
       "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.5.1.tgz",
+      "integrity": "sha512-Fce8upazaAXUVUVsjgV6mBnGuqgO+JNDlcgF79Dksy4+wgGpQB2lmYoO4TSweFg/mZITdpGHomw/cNBJZj1icA==",
       "requires": {
         "tslib": "2.3.0",
         "zrender": "5.6.0"
@@ -126,6 +129,11 @@
         }
       }
     },
+    "es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmmirror.com/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+    },
     "flv.js": {
       "version": "1.6.2",
       "resolved": "https://registry.npmmirror.com/flv.js/-/flv.js-1.6.2.tgz",
@@ -135,11 +143,6 @@
         "webworkify-webpack": "^2.1.5"
       },
       "dependencies": {
-        "es6-promise": {
-          "version": "4.2.8",
-          "resolved": "https://registry.npmmirror.com/es6-promise/-/es6-promise-4.2.8.tgz",
-          "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
-        },
         "webworkify-webpack": {
           "version": "2.1.5",
           "resolved": "https://registry.npmmirror.com/webworkify-webpack/-/webworkify-webpack-2.1.5.tgz",
@@ -149,20 +152,24 @@
     },
     "moment": {
       "version": "2.30.1",
-      "resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz"
+      "resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how=="
     },
     "uview-ui": {
       "version": "2.0.37",
-      "resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-2.0.37.tgz"
+      "resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-2.0.37.tgz",
+      "integrity": "sha512-iBcWNmQa01Wr+z004G6XIVPDctOrJIAx7LObQceUAPxZh6kJYjIOAMp5JE1K4VpoMV5bKYDpCd0gmX+M4nTEQQ=="
     },
     "vuex": {
       "version": "3.6.2",
       "resolved": "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz",
+      "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==",
       "requires": {}
     },
     "zrender": {
       "version": "5.6.0",
       "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.0.tgz",
+      "integrity": "sha512-uzgraf4njmmHAbEUxMJ8Oxg+P3fT04O+9p7gY+wJRVxo8Ge+KmYv0WJev945EH4wFuc4OY2NLXz46FZrWS9xJg==",
       "requires": {
         "tslib": "2.3.0"
       },

pages/home/detail/autodoor/autodoor.vue

@@ -279,6 +279,7 @@ export default {
       },
       frontGateStatus: "", //前门状态
       rearGateStatus: "", //后门状态
+      midGateStatus: "", //状态
       windowAngle: 0, //前窗打开角度
       windowAngle1: 0, //后窗打开角度
       windowArea: "", //风窗面积设定值

pages/home/detail/doorAnimate/doorAnimate.vue

@@ -29,7 +29,7 @@
           ></div>
         </div>
         <div>
-          <video
+         <!-- <video
             v-if="item.type == 'flv'"
             :id="'cameraElement' + item.id"
             muted
@@ -38,7 +38,7 @@
             width="100%"
             height="100%"
             style="width: 100%"
-          ></video>
+          ></video> -->
         </div>
       </div>
       <div style="" v-show="doorcount == 2">
@@ -95,7 +95,7 @@
           ></div>
         </div>
         <div>
-          <video
+         <!-- <video
             v-if="item.type == 'flv'"
             :id="'cameraElement' + item.id"
             muted
@@ -104,7 +104,7 @@
             width="100%"
             height="100%"
             style="width: 100%"
-          ></video>
+          ></video> -->
         </div>
       </div>
       <div style="" v-show="doorcount == 3">
@@ -187,7 +187,7 @@
           ></div>
         </div>
         <div>
-          <video
+         <!-- <video
             v-if="item.type == 'flv'"
             :id="'cameraElement' + item.id"
             muted
@@ -196,7 +196,7 @@
             width="100%"
             height="100%"
             style="width: 100%"
-          ></video>
+          ></video> -->
         </div>
       </div>
       <div style="" v-show="doorcount == 4">
@@ -305,7 +305,7 @@
           ></div>
         </div>
         <div>
-          <video
+         <!-- <video
             v-if="item.type == 'flv'"
             :id="'cameraElement' + item.id"
             muted
@@ -314,7 +314,7 @@
             width="100%"
             height="100%"
             style="width: 100%"
-          ></video>
+          ></video> -->
         </div>
       </div>
     </div>
@@ -322,7 +322,7 @@
 </template>
 
 <script>
-import flvjs from "flv.js";
+// import flvjs from "flv.js";
 export default {
   data() {
     return {

pages/index/index.vue

@@ -7,8 +7,7 @@
         height: wvHeight + 'px',
         width: wvWidth + 'px',
         marginTop: wvTop + 'px',
-        border: 'none',
-        background: '#000',
+        border: 'none'
       }"
     >
       <u-loading-icon></u-loading-icon>
@@ -79,7 +78,7 @@ export default {
   data() {
     return {
       isLandScape: "",
-      PageCur: "tun2D",
+      PageCur: "device",
       tun3DPage: null,
       wvHeight: getApp().globalData.windowHeight,
       wvWidth: getApp().globalData.windowWidth,