system-phone 3.0.19 → 3.0.21

package/package.json

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

package/src/components/LoginApp.vue

@@ -278,7 +278,7 @@ export default {
         }
         // 设置当前登录人信息
         if ((JSON.stringify(ret.data).startsWith("{") || JSON.stringify(ret.data).startsWith("[")) && ret.data.code && ret.data.msg && ret.data.code === 200) {
-          Vue.prototype.$login = {jwt: ret.data.data.id,
+          Vue.$login = Vue.prototype.$login  = {jwt: ret.data.data.id,
             toStandardDateString () {
               let dt = new Date()
               let month = dt.getMonth() + 1
@@ -295,7 +295,7 @@ export default {
                 + ' ' + (hour < 10 ? '0' + hour : hour)
             }}
         } else {
-          Vue.prototype.$login = {jwt: ret.data.id,
+          Vue.$login = Vue.prototype.$login = {jwt: ret.data.id,
             toStandardDateString () {
               let dt = new Date()
               let month = dt.getMonth() + 1

package/src/components/OnlineManage.vue

@@ -1,20 +1,20 @@
 <template>
   <div class="nav-bgcolor">
     <div class="auto">
-      <div class="row nav-bgcolor" >
+      <div class="row nav-bgcolor">
         <div class="col-xs-6  manbiankuang" v-for="tab in tabs" @click="gotopage(tab.link,tab.name,tab.navigate)">
           <div class="badge" v-show="tab.name == '维修派发'">
-            <div class="badge-content">{{ pointNum?pointNum:0 }}</div>
+            <div class="badge-content">{{ pointNum ? pointNum : 0 }}</div>
           </div>
           <div class="badge" v-show="tab.name == '抄表待办'">
-            <div class="badge-content">{{ meterNum?meterNum:0 }}</div>
+            <div class="badge-content">{{ meterNum ? meterNum : 0 }}</div>
           </div>
           <div class="badge" v-show="tab.name == '信息公告'">
-            <div class="badge-content">{{ infoNum?infoNum:0 }}</div>
+            <div class="badge-content">{{ infoNum ? infoNum : 0 }}</div>
           </div>
           <img class="imgs" :src="imgback(tab.name)" alt="">
           <p></p>
-          <p class="pagesfoot">{{tab.name}}</p>
+          <p class="pagesfoot">{{ tab.name }}</p>
           <!--<p class="pagesfoot">{{tab.name}}&nbsp;{{tab.icon}}</p>-->
           <p></p>
         </div>
@@ -30,46 +30,47 @@
 <script scoped>
   import Vue from 'vue'
   import {HttpResetClass} from "vue-client";
+  import * as Util from "../Util";
 
   export default {
     title: '在线业务导航',
-    data () {
+    data() {
       return {
-        titleName:'在线业务',
-        isMenu:true,
+        titleName: '在线业务',
+        isMenu: true,
         tabs: this.getTabs(),
         text: '导航组件this',
         beforeName: '在线业务',
         sourcet: '竖屏',
         pointNum: null,
-        infoNum:null,
-        meterNum:null
+        infoNum: null,
+        meterNum: null
       }
     },
-    ready () {
+    ready() {
       // this.getModelSum()
     },
 
     methods: {
       //看去哪个页面
-      getModelSum(){
-        for(var i = 0;i<this.tabs.length;i++){
-          if(this.tabs[i].link == 'readmeter-home' ){
+      getModelSum() {
+        for (var i = 0; i < this.tabs.length; i++) {
+          if (this.tabs[i].link == 'readmeter-home') {
             this.getZhihuan()
           }
-          if(this.tabs[i].link == 'weiup-load' ){
+          if (this.tabs[i].link == 'weiup-load') {
             this.getRepair()
           }
-          if(this.tabs[i].link == 'upload-page' ){
+          if (this.tabs[i].link == 'upload-page') {
             this.getSafeCheck()
           }
         }
 
       },
-      getRepair(){
+      getRepair() {
         var _this = this;
-        this.timeoutRepair = window.setInterval(function() {
-          let result = _this.$androidUtil.path({'alias':'notUpload','data': {f_workorder_type: '报修单'}})
+        this.timeoutRepair = window.setInterval(function () {
+          let result = _this.$androidUtil.path({'alias': 'notUpload', 'data': {f_workorder_type: '报修单'}})
           if (result.code === 200) {
             console.log('查询得到的代办2' + JSON.stringify(result))
             var crv = {
@@ -80,10 +81,10 @@
           }
         }, 6000)
       },
-      getSafeCheck(){
+      getSafeCheck() {
         var _this = this;
-        this.timeoutRepair = window.setInterval(function() {
-          let result = _this.$androidUtil.path({'alias':'safecheckNotUpload','data': {}})
+        this.timeoutRepair = window.setInterval(function () {
+          let result = _this.$androidUtil.path({'alias': 'safecheckNotUpload', 'data': {}})
           if (result.code === 200) {
             console.log('查询得到的安检上传' + JSON.stringify(result))
             var crv = {
@@ -94,10 +95,10 @@
           }
         }, 6000)
       },
-      getZhihuan(){
+      getZhihuan() {
         var _this = this;
-        this.timeoutZhihuan = window.setInterval(function() {
-          let result = {code:200}
+        this.timeoutZhihuan = window.setInterval(function () {
+          let result = {code: 200}
           if (result.code === 200) {
             console.log('查询得到的代办2' + JSON.stringify(result))
             var crv = {
@@ -108,21 +109,21 @@
           }
         }, 6000)
       },
-      changesum(titdata){
-        for(var i = 0;i<this.tabs.length;i++){
-          if(this.tabs[i].name == titdata.title){
+      changesum(titdata) {
+        for (var i = 0; i < this.tabs.length; i++) {
+          if (this.tabs[i].name == titdata.title) {
             this.tabs[i].icon = titdata.sum + '单'
             console.log(JSON.stringify(this.tabs[i].icon))
             return
           }
         }
       },
-      getTabs(){
+      getTabs() {
         this.getRepairNum()
         this.getInfoNum()
         this.getmeterNum()
-        for(let funs in Vue.functions){
-          if(Vue.functions[funs].link == 'online-manage'){
+        for (let funs in Vue.functions) {
+          if (Vue.functions[funs].link == 'online-manage') {
             return Vue.functions[funs].children
           }
         }
@@ -131,13 +132,13 @@
         if (!Vue.android || !Vue.come || !Vue.come == 'tongchuan') {
           return
         }
-        window.setInterval( ()=> {
+        window.setInterval(() => {
           let val = {
-            items:"*",
-            tablename:"t_handplan",
-            orderitem:"id desc",
-            condition:`1=1 and f_inputtor = '${Vue.user.name}' and f_hand_state = '有效' and f_meter_state = '未抄表'`,
-            f_orgid:`'${Vue.user.orgid}'`
+            items: "*",
+            tablename: "t_handplan",
+            orderitem: "id desc",
+            condition: `1=1 and f_inputtor = '${Vue.user.name}' and f_hand_state = '有效' and f_meter_state = '未抄表'`,
+            f_orgid: `'${Vue.user.orgid}'`
           }
           let http = new HttpResetClass()
           http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: val}, {
@@ -146,20 +147,21 @@
           }).then((res) => {
             this.meterNum = res.data.length
           })
-        },100000)
+        }, 100000)
         this.timeOutGetmeterNum()
       },
       getInfoNum() {
         if (!Vue.android || !Vue.come || !Vue.come == 'tongchuan') {
           return
         }
-        window.setInterval( ()=> {
+        window.setInterval(() => {
+          let condition = " 1 = 1 and (f_enddate <= '" + Util.toStandardTimeString()+ "' or f_state = '公告中') "
           let val = {
-            items:"*",
-            tablename:"T_STOPGAS",
-            orderitem:"f_date desc",
-            condition:'1=1',
-            f_orgstr:`'${Vue.user.orgid}'`
+            items: "*",
+            tablename: "T_STOPGAS",
+            orderitem: "f_date desc",
+            condition: condition,
+            f_orgstr: `'${Vue.user.orgid}'`
           }
           let http = new HttpResetClass()
           http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: val}, {
@@ -168,14 +170,14 @@
           }).then((res) => {
             this.infoNum = res.data.length
           })
-        },100000)
+        }, 100000)
         this.timeOutGetInfoNum()
       },
       getRepairNum() {
         if (!Vue.android || !Vue.come || !Vue.come == 'tongchuan') {
           return
         }
-        window.setInterval( ()=> {
+        window.setInterval(() => {
           let condition = `1 = 1  and f_workorder_type = '报修单' and f_state = null `
           let val = {
             condition: {
@@ -191,10 +193,10 @@
           }).then((res) => {
             this.pointNum = res.data.length
           })
-        },100000)
+        }, 100000)
         this.timeOutGetRepairNum()
       },
-      timeOutGetRepairNum(){
+      timeOutGetRepairNum() {
 
         let condition = `1 = 1  and f_workorder_type = '报修单' and f_state = null `
         let val = {
@@ -212,13 +214,14 @@
           this.pointNum = res.data.length
         })
       },
-      timeOutGetInfoNum(){
+      timeOutGetInfoNum() {
+        let condition = " 1 = 1 and (f_enddate <= '" + Util.toStandardTimeString() + "' or f_state = '公告中') "
         let val = {
-          items:"*",
-          tablename:"T_STOPGAS",
-          orderitem:"f_date desc",
-          condition:'1=1',
-          f_orgstr:`'${Vue.user.orgid}'`
+          items: "*",
+          tablename: "T_STOPGAS",
+          orderitem: "f_date desc",
+          condition: condition,
+          f_orgstr: `'${Vue.user.orgid}'`
         }
         let http = new HttpResetClass()
         http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: val}, {
@@ -228,13 +231,13 @@
           this.infoNum = res.data.length
         })
       },
-      timeOutGetmeterNum(){
+      timeOutGetmeterNum() {
         let val = {
-          items:"*",
-          tablename:"t_handplan",
-          orderitem:"id desc",
-          condition:`1=1 and f_inputtor = '${Vue.user.name}' and f_hand_state = '有效' and f_meter_state = '未抄表'`,
-          f_orgid:`'${Vue.user.orgid}'`
+          items: "*",
+          tablename: "t_handplan",
+          orderitem: "id desc",
+          condition: `1=1 and f_inputtor = '${Vue.user.name}' and f_hand_state = '有效' and f_meter_state = '未抄表'`,
+          f_orgid: `'${Vue.user.orgid}'`
         }
         let http = new HttpResetClass()
         http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: val}, {
@@ -244,30 +247,30 @@
           this.meterNum = res.data.length
         })
       },
-      imgback(val){
-        return require('../assets/'+val+'.png')
+      imgback(val) {
+        return require('../assets/' + val + '.png')
       },
       // 返回主界面
-      back(){
+      back() {
         this.titleName = '主界面'
         this.isMenu = true
 
       },
-      gotopage(param,title,navigate) {
+      gotopage(param, title, navigate) {
         console.log('进入子组件')
         var prpdata = {
-          _this:this,
-          title:title,
-          safe:false
+          _this: this,
+          title: title,
+          safe: false
         }
-        this.$dispatch('gotoson',prpdata)
-        if(navigate){
+        this.$dispatch('gotoson', prpdata)
+        if (navigate) {
           this.$goto('embbed-page', {domainName: navigate, title: title, compName: param, login: Vue.user})
-        }else{
-          this.$goto(param,{sourcet:'竖屏',tabname:title})
+        } else {
+          this.$goto(param, {sourcet: '竖屏', tabname: title})
         }
       },
-      mute () {
+      mute() {
         HostApp.mute()
       }
     },
@@ -307,33 +310,38 @@
     width: 30px;
     vertical-align: -35%;
   }
-  .pageskuang{
-    vertical-align:middle;
-    display:table-cell;
+
+  .pageskuang {
+    vertical-align: middle;
+    display: table-cell;
     width: 32%;
-    top:-50%;
+    top: -50%;
     margin-top: 1%;
     margin-left: 1%;
-    border:1px solid #e3e3e3;
+    border: 1px solid #e3e3e3;
     text-align: center;
     background-color: #ffffff;
   }
-  .pgesfoot{
+
+  .pgesfoot {
     font-size: 14px;
     color: #666666;
     /*    font-family: "Pingfhs";*/
   }
-  .imgs{
+
+  .imgs {
     width: 35px;
     margin-top: 15px;
   }
-  .pages-bgcolor{
+
+  .pages-bgcolor {
     text-align: center;
     background-color: #f0f0ef;
   }
-  img[src=""],img:not([src]){
+
+  img[src=""], img:not([src]) {
     opacity: 0;
-    border:none;
+    border: none;
     visibility: hidden;
     max-width: none;
   }