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

common/service/config.service.js

@@ -7,7 +7,7 @@ if (process.env.NODE_ENV == "development") {
   // BASE_URL = "http://10.248.135.10:9999"; // 大柳塔进
   // BASE_URL = "http://10.248.135.121:9999"; // 活鸡兔井
   // BASE_URL = "http://10.246.63.125:9999"; // 寸草塔二矿
-  // BASE_URL = "http://10.246.183.35:9999"; // 乌兰木伦
+  BASE_URL = "http://10.246.183.35:9999"; // 乌兰木伦
   // BASE_URL = "http://10.120.120.164:9999"; // 察哈素
   // BASE_URL = "http://182.92.126.35:9999"; // 生产环境
   BASE_URL = "http://172.16.53.16:9999"; //大海则

manifest.json

@@ -1,131 +1,130 @@
 {
-    "name" : "智能通风",
-    "appid" : "__UNI__2000523",
-    "description" : "",
-    "versionName" : "2.2.22",
-    "versionCode" : 1,
-    "transformPx" : false,
-    "app-plus" : {
-        "compatible" : {
-            "ignoreVersion" : true,
-            "runtimeVersion" : "4.23,4.29",
-            "compilerVersion" : "4.29"
-        },
-        "orientation" : [
-            //竖屏正方向
-            "portrait-primary",
-            //竖屏反方向
-            "portrait-secondary",
-            //横屏正方向
-            "landscape-primary",
-            //横屏反方向
-            "landscape-secondary",
-            //自然方向
-            "default"
-        ],
-        /* 5+App特有相关 */
-        "modules" : {
-            "Push" : {},
-            "VideoPlayer" : {},
-            "Camera" : {}
-        },
-        /* 模块配置 */
-        "distribute" : {
-            /* 应用发布信息 */
-            "android" : {
-                /* android打包配置 */
-                "permissions" : [
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
-                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.NFC\"/>",
-                    "<uses-sdk android:minSdkVersion=\"10\"/>",
-                    "<uses-feature android:name=\"android.hardware.nfc\" android:required=\"true\" />",
-                    "<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_MEDIA_IMAGES\" />",
-                    "<uses-permission android:name=\"android.permission.READ_MEDIA_AUDIO\" />",
-                    "<uses-permission android:name=\"android.permission.READ_MEDIA_VIDEO\" />"
-                ]
-            },
-            "ios" : {
-                "dSYMs" : false
-            },
-            /* ios打包配置 */
-            "sdkConfigs" : {
-                "ad" : {},
-                "maps" : {
-                    "amap" : {
-                        "name" : "",
-                        "appkey_ios" : "87f4d2a4a0c42e0c86cf312c8b8154e8",
-                        "appkey_android" : "87f4d2a4a0c42e0c86cf312c8b8154e8"
-                    }
-                },
-                "push" : {}
-            },
-            "splashscreen" : {
-                "iosStyle" : "default"
-            },
-            "icons" : {
-                "android" : {
-                    "hdpi" : "static/desk-img/72 – 1.png",
-                    "xhdpi" : "static/desk-img/96.png",
-                    "xxhdpi" : "static/desk-img/144.png",
-                    "xxxhdpi" : "static/desk-img/192.png"
-                }
-            }
-        },
-        "nativePlugins" : {}
+  "name": "智能通风",
+  "appid": "__UNI__2000523",
+  "description": "",
+  "versionName": "2.2.22",
+  "versionCode": 1,
+  "transformPx": false,
+  "app-plus": {
+    "compatible": {
+      "ignoreVersion": true,
+      "runtimeVersion": "4.23,4.29",
+      "compilerVersion": "4.29"
     },
-    /* SDK配置 */
-    "quickapp" : {},
-    /* 快应用特有相关 */
-    "mp-weixin" : {
-        "appid" : "wx2ba5c5690b35d173",
-        "setting" : {
-            "urlCheck" : false,
-            "es6" : true
+    "orientation": [
+      //竖屏正方向
+      "portrait-primary",
+      //竖屏反方向
+      "portrait-secondary",
+      //横屏正方向
+      "landscape-primary",
+      //横屏反方向
+      "landscape-secondary",
+      //自然方向
+      "default"
+    ],
+    /* 5+App特有相关 */
+    "modules": {
+      "VideoPlayer": {},
+      "Camera": {}
+    },
+    /* 模块配置 */
+    "distribute": {
+      /* 应用发布信息 */
+      "android": {
+        /* android打包配置 */
+        "permissions": [
+          "<uses-feature android:name=\"android.hardware.camera\"/>",
+          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+          "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+          "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+          "<uses-permission android:name=\"android.permission.NFC\"/>",
+          "<uses-sdk android:minSdkVersion=\"10\"/>",
+          "<uses-feature android:name=\"android.hardware.nfc\" android:required=\"true\" />",
+          "<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\"/>",
+          "<uses-permission android:name=\"android.permission.READ_MEDIA_IMAGES\" />",
+          "<uses-permission android:name=\"android.permission.READ_MEDIA_AUDIO\" />",
+          "<uses-permission android:name=\"android.permission.READ_MEDIA_VIDEO\" />"
+        ]
+      },
+      "ios": {
+        "dSYMs": false
+      },
+      /* ios打包配置 */
+      "sdkConfigs": {
+        "ad": {},
+        "maps": {
+          "amap": {
+            "name": "",
+            "appkey_ios": "87f4d2a4a0c42e0c86cf312c8b8154e8",
+            "appkey_android": "87f4d2a4a0c42e0c86cf312c8b8154e8"
+          }
         },
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "有定位功能需要导航定位"
-            }
+        "push": {}
+      },
+      "splashscreen": {
+        "iosStyle": "default"
+      },
+      "icons": {
+        "android": {
+          "hdpi": "static/desk-img/72 – 1.png",
+          "xhdpi": "static/desk-img/96.png",
+          "xxhdpi": "static/desk-img/144.png",
+          "xxxhdpi": "static/desk-img/192.png"
         }
+      }
     },
-    "h5" : {
-        "title" : "智能通风",
-        "domain" : "myhjdc.cn",
-        "router" : {
-            "mode" : "history"
-        }
+    "nativePlugins": {}
+  },
+  /* SDK配置 */
+  "quickapp": {},
+  /* 快应用特有相关 */
+  "mp-weixin": {
+    "appid": "wx2ba5c5690b35d173",
+    "setting": {
+      "urlCheck": false,
+      "es6": true
     },
-    "android" : {
-        "theme" : {
-            "primaryColor" : "#000000",
-            "window" : {
-                "fullscreen" : true,
-                "navigationBarColor" : "#000000"
-            }
-        },
-        "notch" : true
+    "permission": {
+      "scope.userLocation": {
+        "desc": "有定位功能需要导航定位"
+      }
+    }
+  },
+  "h5": {
+    "title": "智能通风",
+    "domain": "myhjdc.cn",
+    "router": {
+      "mode": "history"
+    }
+  },
+  "android": {
+    "theme": {
+      "primaryColor": "#000000",
+      "window": {
+        "fullscreen": true,
+        "navigationBarColor": "#000000"
+      }
     },
-    "fallbackLocale" : "zh-Hans"
+    "notch": true
+  },
+  "fallbackLocale": "zh-Hans"
 }

pages/home/detail/autodoor/autodoor.vue

@@ -13,7 +13,7 @@
     </u-navbar>
     <view class="main">
       <view class="u-page container">
-        <div class="button-grid flcard" v-if="this.TabCur == 'gate'">
+        <!-- <div class="button-grid flcard" v-if="this.TabCur == 'gate'">
           <u-button
             type="primary"
             text="打开前门"
@@ -69,7 +69,7 @@
             text="设定后窗面积"
             @click="showPasswordDialog('rearSetValue')"
           ></u-button>
-        </div>
+        </div> -->
         <div class="flcard" v-if="this.TabCur == 'gate'">
           <doorAnimate
             :gatestate1="frontGateStatus"
@@ -84,7 +84,6 @@
           <windrectAnimate
             :state="state"
             :title="title"
-            :videoURL="viedeoUrl"
             :height="height"
             :type="deviceType"
           >
@@ -95,12 +94,11 @@
             :fan1State="fan1State"
             :fan2State="fan2State"
             :title="title"
-            :videoURL="viedeoUrl"
             :height="height"
           >
           </fanlocalAnimate>
         </div>
-        <div class="flcard" v-if="this.TabCur == 'fanmain'">
+        <!-- <div class="flcard" v-if="this.TabCur == 'fanmain'">
           <fanmainAnimate
             ref="fanpage"
             style="width: 100%"
@@ -112,7 +110,7 @@
             :fundoor2="fundoor2"
             :nowfengji="qidongfengji"
           ></fanmainAnimate>
-        </div>
+        </div> -->
         <div class="flcard" style="" v-if="this.TabCur == 'window'">
           <windowAnimate
             :windowAngle="windowAngle"
@@ -666,7 +664,6 @@ export default {
       windowAngle: 0, //前窗打开角度
       windowAngle1: 0, //后窗打开角度
       windowArea: "", //风窗面积设定值
-      viedeoUrl: "", //监控url
       sign: "",
       title: "测风设备",
       fan1State: "",
@@ -676,6 +673,16 @@ export default {
       cameraList: [], //摄像数据
       showColum: {},
       deviceShowList: [],
+      isFirstRequest: true, // 是否是第一次请求
+      fanMsStatus: true,
+      qidongfengji: "1",
+      fanMsStatus: true, //true抽风，false反风
+      door1: 0, //风门1#      1打开 0 关闭
+      topdoor1: 0, //水平风门1#      1打开 0 关闭
+      fundoor1: 0, //蝶阀1#      1打开 0 关闭
+      door2: 0, //风门2#      1打开 0 关闭
+      topdoor2: 0, //水平风门2#      1打开 0 关闭
+      fundoor2: 0, //蝶阀2#      1打开 0 关闭
     };
   },
   onLoad(query) {
@@ -694,7 +701,9 @@ export default {
   },
   created() {
     this.getShowColum();
-    this.getDeviceInfo(this.itemId);
+    if (this.isFirstRequest) {
+      this.getDeviceInfo(this.itemId);
+    }
   },
   mounted() {
     this.startTimer();
@@ -728,14 +737,6 @@ export default {
               this.showColum = showlist;
               const key = this.TabCur + "_monitor";
               const key1 = this.deviceType + "_monitor";
-              // if (
-              //   this.showColum[key1].length &&
-              //   this.showColum[key1].length > 0
-              // ) {
-              //   this.deviceShowList = this.showColum[key1];
-              // } else {
-              //   this.deviceShowList = this.showColum[key] || [];
-              // }
               if (this.showColum?.[key1]?.length > 0) {
                 this.deviceShowList = this.showColum[key1];
               } else {
@@ -753,29 +754,6 @@ export default {
           });
       });
     },
-    // //获取app展示字段数据
-    // getShowList(type) {
-    //   const params = {
-    //     devicekind: type,
-    //     pagetype: "detail",
-    //     pageNo: 1,
-    //     pageSize: 100,
-    //   };
-    //   new Promise((resolve, reject) => {
-    //     api
-    //       .getShowColumList(params)
-    //       .then((response) => {
-    //         if (response.data.code == 200) {
-    //           this.typeList = response.data.result.records;
-    //         } else {
-    //           resolve(response);
-    //         }
-    //       })
-    //       .catch((error) => {
-    //         reject(error);
-    //       });
-    //   });
-    // },
     //获取详情数据
     getDeviceInfo(ID) {
       let IDString = String(ID); // 将 ID 转换为字符串
@@ -790,9 +768,11 @@ export default {
               var result = response.data.result.msgTxt[0].datalist[0];
               let newData = { ...result, ...result.readData };
               this.tableData = newData;
-              this.cameras = result.cameras;
-              this.getVideoUrlById(this.cameras);
-
+              if (this.isFirstRequest) {
+                this.cameras = result.cameras;
+                this.getVideoUrlById(this.cameras);
+                this.isFirstRequest = false; // 设置为 false，表示已经请求过数据
+              }
               if (this.tableData["frontGateClose"] == "1") {
                 this.tableData.frontGateOpen = "关闭";
               } else if (this.tableData["frontGateClose"] == "0") {
@@ -827,11 +807,13 @@ export default {
               this.warnFlag = result.warnLevel_str;
               this.readTime = result.readTime;
 
-              this.qidongfengji =
-                result.readData.Fan1MOT2_RunningStatus1_str === "停止" &&
-                result.readData.Fan1StartStatus_str === "停止"
-                  ? 1
-                  : 2;
+              this.qidongfengji = "1";
+              this.fundoor1 = 1;
+              this.door1 = 1;
+              this.topdoor1 = 1;
+              this.fundoor2 = 0;
+              this.door2 = 0;
+              this.topdoor2 = 0;
               var maxarea = result.maxarea;
               this.windowAngle =
                 (this.tableData.forntArea / maxarea) * 100 * 0.9;
@@ -872,16 +854,6 @@ export default {
                 addr: addr,
                 cameraCode: ID,
               });
-              uni.showModal({
-                title: "数据提示",
-                content: this.cameraList.addr
-                  ? `共${
-                      this.cameraList.cameraCode
-                    }条数据：\n${this.cameraList.join("\n\n")}`
-                  : "无数据",
-                showCancel: false,
-                confirmText: "知道了",
-              });
             } else {
               resolve(response);
             }

pages/login/login.vue

@@ -255,15 +255,16 @@ export default {
       });
     },
     saveClientId() {
-      var info = plus.push.getClientInfo();
-      var cid = info.clientid;
-      this.$http
-        .get("/sys/user/saveClientId", { params: { clientId: cid } })
-        .then((res) => {
-          console.log("res::saveClientId>", res);
-          //获取权限菜单
           this.getPermissionList();
-        });
+      // var info = plus.push.getClientInfo();
+      // var cid = info.clientid;
+      // this.$http
+      //   .get("/sys/user/saveClientId", { params: { clientId: cid } })
+      //   .then((res) => {
+      //     console.log("res::saveClientId>", res);
+      //     //获取权限菜单
+      //     this.getPermissionList();
+      //   });
     },
     changePassword() {
       this.showPassword = !this.showPassword;

pages/webview/webview.vue

@@ -185,19 +185,20 @@ export default {
     },
     saveClientId() {
       console.log("saveClientId=========================");
-      var info = plus.push.getClientInfo();
-      var cid = info.clientid;
-      this.$http
-        .get("/sys/user/saveClientId", {
-          params: {
-            clientId: cid,
-          },
-        })
-        .then((res) => {
-          console.log("res::saveClientId>", res);
-          //获取权限菜单
           this.getPermissionList();
-        });
+      // var info = plus.push.getClientInfo();
+      // var cid = info.clientid;
+      // this.$http
+      //   .get("/sys/user/saveClientId", {
+      //     params: {
+      //       clientId: cid,
+      //     },
+      //   })
+      //   .then((res) => {
+      //     console.log("res::saveClientId>", res);
+      //     //获取权限菜单
+      //     this.getPermissionList();
+      //   });
     },
   },
   onShow() {