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

pages/gasreport/gasreport.vue

@@ -681,12 +681,12 @@ export default {
         };
     },
     computed: {
-        username:function(){
-            return  uni.getStorageSync('login_user_info')['username']
+        username: function () {
+            return uni.getStorageSync('login_user_info')['realname']
         }
     },
     mounted() {
-        console.log(  uni.getStorageSync('login_user_info'),'ceshi00-----------')
+        console.log(uni.getStorageSync('login_user_info'), 'ceshi00-----------')
         this.getGasList()
         this.getMcList()
     },
@@ -778,7 +778,6 @@ export default {
             console.log(val.slice(-1), '----0000')
             if (val.slice(-1) === '0' || val.slice(-1) === '2' || val.slice(-1) === '4' || val.slice(-1) === '6' || val.slice(-1) === '8') {
                 this.formState.gw = val
-                console.log('2222=======')
                 this.isRule1 = true
             } else {
                 this.formState.gw = ''
@@ -1311,24 +1310,24 @@ export default {
                     tNight2: that.formState.temp
                 }
             }
-                new Promise((resolve, reject) => {
-                    api
-                        .getAdd({ ...param })
-                        .then((response) => {
-                            if (response.data.code == 200) {
-                                this.getGasList()
-                                this.isShowAdd = false
-                                this.clearData()
-                            } else {
-                                reject(response);
-                            }
-                        })
-                        .catch((error) => {
-                            console.log("catch===>response", response);
-                            reject(error);
-                        });
-                });
-           
+            new Promise((resolve, reject) => {
+                api
+                    .getAdd({ ...param })
+                    .then((response) => {
+                        if (response.data.code == 200) {
+                            this.getGasList()
+                            this.isShowAdd = false
+                            this.clearData()
+                        } else {
+                            reject(response);
+                        }
+                    })
+                    .catch((error) => {
+                        console.log("catch===>response", response);
+                        reject(error);
+                    });
+            });
+
 
         },
         getEditSave() {