system-phone 1.2.86 → 1.2.87-ycapply-2

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Mon Feb 22 14:09:14 CST 2021
-gradle.version=5.1.1
+#Tue Oct 27 14:57:49 CST 2020
+gradle.version=6.1

package/build/dev-server.js

@@ -40,23 +40,23 @@ var proxyTable = {
   // },
   '/rs/sql/getUserByMeter': {
      // target: 'http://127.0.0.1:8081'
-    target: 'http://localhost:8025'
+    target: 'http://192.168.50.4:8555'
   },
   '/rs/logic/againOpenAccount': {
     // target: 'http://127.0.0.1:8081'
-    target: 'http://localhost:8025'
+    target: 'http://192.168.50.4:8555'
   },
   '/rs/logic/againSendInstruct': {
     // target: 'http://127.0.0.1:8081'
-    target: 'http://localhost:8025'
+    target: 'http://192.168.50.4:8555'
   },
   '/rs/logic/cancelSendInstruct': {
     // target: 'http://127.0.0.1:8081'
-    target: 'http://localhost:8025'
+    target: 'http://192.168.50.4:8555'
   },
   '/rs/sql/iot_singleTable_OrderBy': {
     // target: 'http://127.0.0.1:8081'
-    target: 'http://localhost:8025'
+    target: 'http://192.168.50.4:8555'
   },
   // 呼叫系统主数据服务
   '/rs': {

package/package.json

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

package/src/components/LoginApp.vue

@@ -231,7 +231,7 @@
             this.$androidUtil.setPreference('login_user_cache', userStr)
             this.$androidUtil.setPreference('f_repairman_id', Util.f.id)
             this.$androidUtil.setPreference('f_repairman_name', Util.f.name)
-            this.$androidUtil.setPreference('f_role_name', Util.f.f_role_name)
+            this.$androidUtil.setPreference('f_role_name', Util.f.f_role_name || '')
             console.log("自动登陆标识"+Util.f.f_role_name)
             console.log(this.showauto)
             this.$androidUtil.setPreference('auto_login',this.showauto)

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/IotBaseInfo.vue

@@ -2,7 +2,7 @@
 <div class="flex">
   <div  class="cols-sm-12 col-md-12 col-xs-12 " >
     <div class="col-sm-3 col-md-3 col-xs-4 meterinfo">
-      <div class="flex" style="padding: 0.5rem">
+      <div class="flex" style="padding: 0.5rem;align-items: center">
         <img src="../../assets/pinpai.png" style="height:32px;width:32px;margin-bottom: 5px" alt="" >
         <span class="font-content">表具品牌</span>
         <span class="font-head">{{row.f_meter_brand}}</span>
@@ -10,49 +10,49 @@
 
     </div>
     <div class="col-sm-3 col-md-3 col-xs-4 meterinfo">
-      <div class="flex" style="padding: 0.5rem">
+      <div class="flex" style="padding: 0.5rem;align-items: center">
         <img src="../../assets/leixing.png" style="height:32px;width:32px;margin-bottom: 5px" alt="" >
         <span class="font-content">表具类型</span>
         <span class="font-head">{{row.f_meter_type}}</span>
       </div>
     </div>
     <div class="col-sm-3 col-md-3 col-xs-4 meterinfo">
-      <div class="flex" style="padding: 0.5rem">
+      <div class="flex" style="padding: 0.5rem;align-items: center">
         <img src="../../assets/biaohao.png" style="height:32px;width:32px;margin-bottom: 5px" alt="" >
         <span class="font-content">表号</span>
         <span class="font-head">{{row.f_meternumber}}</span>
       </div>
     </div>
     <div class="col-sm-3 col-md-3 col-xs-4 meterinfo">
-      <div class="flex" style="padding: 0.5rem">
+      <div class="flex" style="padding: 0.5rem;align-items: center">
         <img src="../../assets/guige.png" style="height:32px;width:32px;margin-bottom: 5px" alt="" >
         <span class="font-content">表具规格</span>
         <span class="font-head">{{row.f_meter_style}}</span>
       </div>
     </div>
     <div class="col-sm-3 col-md-3 col-xs-4 meterinfo">
-      <div class="flex" style="padding: 0.5rem">
+      <div class="flex" style="padding: 0.5rem;align-items: center">
         <img src="../../assets/xinghao.png" style="height:32px;width:32px;margin-bottom: 5px" alt="" >
         <span class="font-content">表具型号</span>
         <span class="font-head">{{row.f_type}}</span>
       </div>
     </div>
     <div class="col-sm-3 col-md-3 col-xs-4 meterinfo">
-      <div class="flex" style="padding: 0.5rem">
+      <div class="flex" style="padding: 0.5rem;align-items: center">
         <img src="../../assets/bieming.png" style="height:32px;width:32px;margin-bottom: 5px" alt="" >
         <span class="font-content">表具别名</span>
         <span class="font-head">{{row.f_alias}}</span>
       </div>
     </div>
     <div class="col-sm-3 col-md-3 col-xs-4 meterinfo">
-      <div class="flex" style="padding: 0.5rem">
+      <div class="flex" style="padding: 0.5rem;align-items: center">
         <img src="../../assets/yue.png" style="height:32px;width:32px;margin-bottom: 5px" alt="" >
         <span class="font-content">剩余金额</span>
         <span class="font-head">{{row.f_balance_amount}}</span>
       </div>
     </div>
     <div class="col-sm-3 col-md-3 col-xs-4 meterinfo">
-      <div class="flex" style="padding: 0.5rem">
+      <div class="flex" style="padding: 0.5rem;align-items: center">
         <img src="../../assets/qiliang.png" style="height:32px;width:32px;margin-bottom: 5px" alt="" >
         <span class="font-content">累计用气量</span>
         <span class="font-head">{{row.f_balance_gas}}</span>

package/src/components/iot/iotMonitoringMain.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="auto" style="background: #f8f8f8">
-    <div partial class="bg-white">
+  <div class="auto" style="background: #f8f8f8;">
+    <div partial class="bg-white ">
       <div class="row app-row " style="margin-top: 10px">
         <div class="col-xs-4">
           <img src="../../assets/表号.png" style="width: 20px;margin-bottom: 5px" alt="">
@@ -10,6 +10,15 @@
           <input  class="search_input input-font" placeholder="请输入您要查询的表号" v-model="f_meternumber" />
         </div>
       </div>
+      <div class="row app-row " style="margin-top: 10px">
+        <div class="col-xs-4">
+          <img src="../../assets/用户编号.png" style="width: 20px;margin-bottom: 5px" alt="">
+          <label  class="font ">用户编号：</label>
+        </div>
+        <div class="col-xs-8" >
+          <input  class="search_input input-font" placeholder="请输入用户编号" v-model="f_userinfo_code" />
+        </div>
+      </div>
       <div class="row text-center" style="padding-top: 10px;padding-bottom:10px;text-align: center">
         <button type="button" class="btn  btn-font" style="width: 25%;
       margin-right: 3%; background-color: #499edf;color:#FFFFFF;border-radius: 10px ;" @click="query(querytitle)">查询</button>
@@ -20,7 +29,7 @@
     <div class="meterinfo auto bg-white">
       <iot-meter-info :row="row"></iot-meter-info>
     </div>
-    <div>
+    <div class="">
       <div class="row bg-white" style="padding: 10px;margin-bottom: 5px">
         <div class="col-sm-12 " >
           <img src="../../assets/caozuo.png" style="width: 20px;margin-bottom: 5px" alt="">
@@ -32,11 +41,11 @@
       </div>
 
     </div>
-    <div class="bg-white">
+    <div class="bg-white" >
       <!--<div class="row" style="padding-left: 10px">-->
         <!--<label class="font_normal_body">信息查询</label>-->
       <!--</div>-->
-      <div class="row flex-row" style="justify-content: space-between">
+      <div class="row  auto flex-row" style="justify-content: space-between">
         <div @click="setquery('基础')"  >
          <label :class="querytitle == '基础' ? 'text-center div_ul2' : 'text-center div_ul'">基础</label>
         </div>
@@ -56,10 +65,10 @@
       <div v-if="model.rows.length == 0 && querytitle !== '基础'" style="margin-top: 20px">
         <label class="font_normal_body"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;暂无记录...&nbsp;&nbsp;&nbsp;</b></label>
       </div>
-      <div class="iotbaseinfo" v-if="querytitle == '基础'">
+      <div class="iotbaseinfo " v-if="querytitle == '基础'">
         <iot-base-info :row="row"></iot-base-info>
       </div>
-      <list :model="model" partial='list' v-if="querytitle == '指令查询'">
+      <list :model="model" partial='list' style="padding-bottom: 10px" v-if="querytitle == '指令查询'">
           <div partial>
             <div  class="auto app-text" style="margin-top: 5px; " @click="$parent.$parent.goto(row)">
               <div class="panel" style="padding: 10px 10px 5px 10px;">
@@ -95,7 +104,7 @@
             </div>
           </div>
         </list>
-      <list :model="model" partial='list' v-if="querytitle == '抄表查询'">
+      <list :model="model" partial='list' style="padding-bottom: 10px" v-if="querytitle == '抄表查询'">
         <div partial>
           <div  class="auto app-text" style="margin-top: 5px;">
             <div class="panel" style="padding: 10px 10px 5px 10px;">
@@ -123,7 +132,7 @@
           </div>
         </div>
       </list>
-      <list :model="model" partial='list' v-if="querytitle == '售气查询'">
+      <list :model="model" partial='list' style="padding-bottom: 10px" v-if="querytitle == '售气查询'">
         <div partial>
           <div  class="auto app-text" style="margin-top: 5px;">
             <div class="panel" style="padding: 10px 10px 5px 10px;">
@@ -156,7 +165,7 @@
           </div>
         </div>
       </list>
-      <list :model="model" partial='list' v-if="querytitle == '上报查询'">
+      <list :model="model" partial='list' style="padding-bottom: 10px" v-if="querytitle == '上报查询'">
         <div partial>
           <div  class="auto app-text" style="margin-top: 5px;">
             <div class="panel" style="padding: 10px 10px 5px 10px;">
@@ -208,6 +217,7 @@
       data () {
         return {
           f_meternumber: '',
+          f_userinfo_code:'',
           querytitle: '基础',
           row:{},
           model: {
@@ -221,12 +231,20 @@
       },
       methods: {
         goto(row){
-          console.log(row)
-          this.$goto('instruct-message',{row:row})
+        console.log(row)
+        let _this=this
+        var pardate = {
+          _this:_this,
+          title:'指令信息',
+          safe:false
+        }
+        this.$dispatch('gotoson',pardate)
+        this.$goto('instruct-message',{row:row}, 'self')
         },
         empty () {
           console.log('清空')
           this.f_meternumber = ''
+          this.f_userinfo_code = ''
         },
         // 查询表别名
         queryAlias() {
@@ -237,19 +255,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
@@ -258,28 +276,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
@@ -288,22 +306,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))
               })
             }
           })
@@ -319,8 +337,8 @@
               let http = new HttpResetClass()
               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))
+              http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/againOpenAccountnvm `, {data: {condition: condition}},{resolveMsg: null, rejectMsg: null}).then((row) => {
+                // console.log('修改返回' + JSON.stringify(row))
                 this.$showMessage('操作成功！将会在一段时间内重新生成开户指令！')
               }).catch((e) => {
                 this.$showMessage('操作失败！请稍后重试！')
@@ -333,10 +351,11 @@
         },
         query (title) {
           console.log('查询'+ JSON.stringify(title))
-          if (!this.f_meternumber) {
-            this.$showMessage('请输入/扫描用户表号！')
+          if (!this.f_meternumber&&!this.f_userinfo_code) {
+            this.$showMessage('请输入/扫描用户表号或输入用户编号！')
             return
           }
+          let condition = this.f_meternumber!==''? `f_meternumber = '${this.f_meternumber}'`:`f_userinfo_code = '${this.f_userinfo_code}'`
           let data = {
             items: '*',
             tablename: 't_instruct',
@@ -344,12 +363,15 @@
             f_meternumber: this.meternumber
           }
           if(title==='基础'){
-            let condition = `f_meternumber = '${this.f_meternumber}'`
+            // 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))
+              if(row.data.length===0)
+                this.$showMessage('未查询到用户信息')
+              // console.log('查询返回'+JSON.stringify(row))
+            // this.f_meternumber = row.data[0].f_meternumber
+            // this.f_userinfo_code = row.data[0].f_userinfo_code?row.data[0].f_userinfo_code:this.f_userinfo_code
             this.row = row.data[0]
           }).catch((e) => {
-              console.log('正在维护！')
             console.log('错误信息+++++++'+JSON.stringify(e))
           })
           } else {
@@ -358,28 +380,36 @@
               items: '*',
               tablename: 't_instruct',
               orderitem: 'f_instruct_date desc',
-              condition: ` f_meternumber = '${this.f_meternumber}'`
+              condition: condition
             }
           }else if (title == '抄表查询') {
             data = {
               items: '*',
               tablename: 't_handplan',
               orderitem: 'f_input_date desc',
-              condition: ` f_meternumber = '${this.f_meternumber}'`
+              condition: condition
             }
           }else if (title == '售气查询') {
+            if (!this.f_meternumber) {
+              this.$showMessage('请输入/扫描用户表号！')
+              return
+            }
             data = {
               items: '*',
               tablename: 't_sellinggas',
               orderitem: 'f_operate_date desc',
-              condition: ` f_meternumber = '${this.f_meternumber}'`
+              condition: condition
             }
           }else if (title == '上报查询') {
+            if (!this.f_meternumber) {
+              this.$showMessage('请输入/扫描用户表号！')
+              return
+            }
             data = {
               items: '*',
               tablename: 't_meteread',
               orderitem: 'f_hand_date  desc',
-              condition: ` f_meternumber = '${this.f_meternumber}'`
+              condition: condition
             }
           }
           console.log('查询条件'+ JSON.stringify(data))
@@ -387,6 +417,8 @@
           this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/iot_singleTable_OrderBy`, {data: data}).then((row) => {
             console.log('查询返回'+JSON.stringify(row))
             this.model.rows = row.data
+            // this.f_meternumber = row.data[0].f_meternumber
+            // this.f_userinfo_code = row.data[0].f_userinfo_code?row.data[0].f_userinfo_code:this.f_userinfo_code
           }).catch((e) => {
             console.log('正在维护！')
             console.log('错误信息+++++++'+JSON.stringify(e))

package/src/components/BlueToothConnect.vue

@@ -1,52 +0,0 @@
-<template>
-  <div style="background-color: #FFFFFF;">
-    <modal v-ref:modal :show.sync="showbluetooth"  width="80%" style="text-align:center">
-      <header slot="modal-header" class="modal-header" style="text-align:center">
-        <h3 class="modal-title">提示</h3>
-      </header>
-      <article slot="modal-body" style="text-align:center">
-        <p>{{msg}}</p>
-      </article>
-      <footer slot="modal-footer" class="modal-footer auto" style="text-align:center">
-        <button  v-if="msg==='蓝牙已断开，是否重新连接'" class="btn btn-lg btn-font btn-color button_spacing auto" style="width:48%" @click="connectBlueTooth()">确定</button>
-        <button class="btn btn-lg btn-font btn-color button_spacing auto" style="width:48%" @click="show()">取消</button>
-      </footer>
-    </modal>
-  </div>
-</template>
-<script>
-
-  import {HttpResetClass} from 'vue-client'
-
-  export default {
-    title: "蓝牙重新连接",
-    props: ['msg','showbluetooth'],
-    data() {
-      return {
-
-      }
-    },
-    methods: {
-      show(){
-        this.$emit('closebluetooth')
-      },
-      connectBlueTooth(){
-
-      }
-    },
-    ready() {
-
-    },
-    watch: {
-
-    },
-    computed: {
-
-    },
-    events: {
-
-    }
-  }
-</script>
-
-