system-phone 1.2.85-test1 → 1.2.85-test2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-phone",
-  "version": "1.2.85-test1",
+  "version": "1.2.85-test2",
   "description": "手机模块 前端组件",
   "author": "何宁社 <524395609@qq.com>",
   "license": "ISC",

package/src/components/iot/InstructMessage.vue

@@ -237,6 +237,16 @@
   }
 </script>
 <style media="screen" scoped>
+div::-webkit-scrollbar {
+  width: 0 !important;
+  height: 0 !important;
+}
+
+div {
+  -ms-overflow-style: none;
+  overflow: -moz-scrollbars-none;
+}
+
 .font-head{
   font-size: 14px;
   font-weight: bold;

package/src/components/iot/iotMonitoringMain.vue

@@ -244,19 +244,19 @@
             orderitem: 'gb.id desc',
             condition: ` f_meternumber = '${this.f_meternumber}'`
           }
-          console.log('查询条件'+ JSON.stringify(data))
+          // console.log('查询条件'+ JSON.stringify(data))
           // this.$resetpost(`/rs/sql/iot_singleTable_OrderBy`, {data: data}).then((row) => {
             this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/iot_singleTable_OrderBy`, {data: data}).then((row) => {
-            console.log('查询返回'+JSON.stringify(row))
+            // console.log('查询返回'+JSON.stringify(row))
             return row.data[0]
           }).catch((e) => {
             this.$showMessage('表别名获取失败！')
-            console.log('错误信息+++++++'+JSON.stringify(e))
+            // console.log('错误信息+++++++'+JSON.stringify(e))
           })
 
         },
         async OpenValve(type) {
-          console.log('开阀')
+          // console.log('开阀')
           if (!this.f_meternumber) {
             this.$showMessage('请输入/扫描用户表号！')
             return
@@ -265,28 +265,28 @@
             if (res === 'confirm') {
               // let alias = await this.queryAlias()
               let data = {
-                userid: this.row.f_user_id,
+                userId: this.row.f_user_id,
                 content: {isOpen: type},
                 alias: this.row.f_alias,
                 inputtor: Vue.user.name,
                 moduleName: this.row.f_alias
               }
-              console.log('请求参数'+JSON.stringify(data))
+              // console.log('请求参数'+JSON.stringify(data))
               // http://ip:port/webmeter/rs/logic/syncSaveValveControlTemplate
               let http = new HttpResetClass()
               http.load('POST',`${this.$androidUtil.getProxyUrl()}/webmeter/rs/logic/syncSaveValveControlTemplate`, {data: data}).then((row) => {
                 // http.load('POST',`${this.$androidUtil.getProxyUrl()}/SJwebmeter`, {data: data}).then((row) => {
-                console.log('执行结果'+JSON.stringify(row))
+                // console.log('执行结果'+JSON.stringify(row))
                 this.$showMessage('发送成功！')
               }).catch((e) => {
                 this.$showMessage('发送失败！')
-                console.log('错误信息+++++++'+JSON.stringify(e))
+                // console.log('错误信息+++++++'+JSON.stringify(e))
               })
             }
           })
         },
         valveShutoff (type) {
-          console.log('关阀')
+          // console.log('关阀')
           if (!this.f_meternumber) {
             this.$showMessage('请输入/扫描用户表号！')
             return
@@ -295,22 +295,22 @@
             if (res === 'confirm') {
               // let alias = await this.queryAlias()
               let data = {
-                userid: this.row.f_user_id,
+                userId: this.row.f_user_id,
                 content: {isOpen: type},
                 alias: this.row.f_alias,
                 inputtor: Vue.user.name,
                 moduleName: this.row.f_alias
               }
-              console.log('请求参数'+JSON.stringify(data))
+              // console.log('请求参数'+JSON.stringify(data))
               // http://ip:port/webmeter/rs/logic/syncSaveValveControlTemplate
               let http = new HttpResetClass()
               http.load('POST',`${this.$androidUtil.getProxyUrl()}/webmeter/rs/logic/syncSaveValveControlTemplate`, {data: data}).then((row) => {
                 // http.load('POST',`${this.$androidUtil.getProxyUrl()}/SJwebmeter`, {data: data}).then((row) => {
-                console.log('执行结果'+JSON.stringify(row))
+                // console.log('执行结果'+JSON.stringify(row))
                 this.$showMessage('发送成功！')
               }).catch((e) => {
                 this.$showMessage('发送失败！')
-                console.log('错误信息+++++++'+JSON.stringify(e))
+                // console.log('错误信息+++++++'+JSON.stringify(e))
               })
             }
           })
@@ -327,7 +327,7 @@
               let condition = `f_meternumber = '${this.f_meternumber}'`
               console.log('修改条件===' + JSON.stringify(condition))
               http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/againOpenAccount`, {data: {condition: condition}},{resolveMsg: null, rejectMsg: null}).then((row) => {
-                console.log('修改返回' + JSON.stringify(row))
+                // console.log('修改返回' + JSON.stringify(row))
                 this.$showMessage('操作成功！将会在一段时间内重新生成开户指令！')
               }).catch((e) => {
                 this.$showMessage('操作失败！请稍后重试！')
@@ -353,10 +353,9 @@
           if(title==='基础'){
             let condition = `f_meternumber = '${this.f_meternumber}'`
             this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/getUserByMeter`, {data: {condition:condition}}).then((row) => {
-              console.log('查询返回'+JSON.stringify(row))
+              // console.log('查询返回'+JSON.stringify(row))
             this.row = row.data[0]
           }).catch((e) => {
-              console.log('正在维护！')
             console.log('错误信息+++++++'+JSON.stringify(e))
           })
           } else {