system-phone 3.0.28 → 3.0.30

package/src/components/OnlineManage.vue

@@ -1,20 +1,11 @@
 <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>
-          <div class="badge" v-show="tab.name == '抄表待办'">
-            <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>
-          <img class="imgs" :src="imgback(tab.name)" alt="">
+          <img class="imgs" :src="imgback(tab.name)">
           <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>
@@ -29,48 +20,44 @@
 
 <script scoped>
   import Vue from 'vue'
-  import {HttpResetClass} from "vue-client";
-  import * as Util from "../Util";
-
+  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
+        beforeName:'在线业务',
+        sourcet:'竖屏'
+
       }
     },
-    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 = {
@@ -81,10 +68,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 = {
@@ -95,10 +82,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 = {
@@ -109,199 +96,53 @@
           }
         }, 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() {
-        this.getRepairNum()
-        this.getInfoNum()
-        this.getmeterNum()
-        for (let funs in Vue.functions) {
-          if (Vue.functions[funs].link == 'online-manage') {
+      getTabs(){
+        for(let funs in Vue.functions){
+          if(Vue.functions[funs].link == 'online-manage'){
             return Vue.functions[funs].children
           }
         }
       },
-      getmeterNum() {
-        if (this.$appdata.getSingleValue('红点') && this.$appdata.getSingleValue('红点') != 'true') {
-          return
-        }
-        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}'`
-          }
-          let http = new HttpResetClass()
-          http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: val}, {
-            resolveMsg: null,
-            rejectMsg: null
-          }).then((res) => {
-            this.meterNum = res.data.length
-          })
-        }, 100000)
-        this.timeOutGetmeterNum()
-      },
-      getInfoNum() {
-        if (this.$appdata.getSingleValue('红点') && this.$appdata.getSingleValue('红点') != 'true') {
-          return
-        }
-        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: condition,
-            f_orgstr: `'${Vue.user.orgid}'`
-          }
-          let http = new HttpResetClass()
-          http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: val}, {
-            resolveMsg: null,
-            rejectMsg: null
-          }).then((res) => {
-            this.infoNum = res.data.length
-          })
-        }, 100000)
-        this.timeOutGetInfoNum()
-      },
-      getRepairNum() {
-        if (this.$appdata.getSingleValue('红点') && this.$appdata.getSingleValue('红点') != 'true') {
-          return
-        }
-        window.setInterval(() => {
-          let condition = `1 = 1  and f_workorder_type = '报修单' and f_state = null `
-          let val = {
-            condition: {
-              condition: condition,
-              sign: '1 = 1'
-            },
-            userid: Vue.user.name
-          }
-          let http = new HttpResetClass()
-          http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/path/operatorServiceAndroid`, {data: val}, {
-            resolveMsg: null,
-            rejectMsg: null
-          }).then((res) => {
-            this.pointNum = res.data.length
-          })
-        }, 100000)
-        this.timeOutGetRepairNum()
-      },
-      timeOutGetRepairNum() {
-
-        let condition = `1 = 1  and f_workorder_type = '报修单' and f_state = null `
-        let val = {
-          condition: {
-            condition: condition,
-            sign: '1 = 1'
-          },
-          userid: Vue.user.name
-        }
-        let http = new HttpResetClass()
-        http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/path/operatorServiceAndroid`, {data: val}, {
-          resolveMsg: null,
-          rejectMsg: null
-        }).then((res) => {
-          this.pointNum = res.data.length
-        })
-      },
-      timeOutGetInfoNum() {
-        let condition = " 1 = 1 and (f_enddate >= '" + Util.toStandardTimeString() + "' or f_state = '公告中') "
-        let val = {
-          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}, {
-          resolveMsg: null,
-          rejectMsg: null
-        }).then((res) => {
-          this.infoNum = res.data.length
-        })
-      },
-      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}'`
-        }
-        let http = new HttpResetClass()
-        http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: val}, {
-          resolveMsg: null,
-          rejectMsg: null
-        }).then((res) => {
-          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()
       }
     },
   }
 </script>
 <style lang="less">
-  .badge-content {
-    color: #fff;
-    box-sizing: border-box;
-    min-width: 8px;
-    font-size: 9px;
-    line-height: 12px;
-    white-space: nowrap;
-    font-weight: 400;
-    text-align: center;
-  }
-
-  .badge {
-    top: 6px;
-    position: absolute;
-    max-height: 13px;
-    min-height: 8px;
-    right: 0;
-    display: inline-flex;
-    vertical-align: middle;
-    box-sizing: content-box;
-    border-radius: 100px;
-    background-color: red;
-  }
-
-  .tab-befor-img {
+  .tab-befor-img  {
     content: '';
     background-size: 30px;
     display: inline-block;
@@ -310,53 +151,48 @@
     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;
   }
 
-  .manbiankuang {
+  .manbiankuang{
     width: 44%;
     margin-top: 15px;
     margin-left: 4%;
-    border: 1px solid #e3e3e3;
-    border-radius: 10px 10px 10px 10px;
+    border:1px solid #e3e3e3;
+    border-radius:10px 10px 10px 10px;
     text-align: center;
     background-color: #ffffff;
   }
 
-  .nav-bgcolor {
+  .nav-bgcolor{
     background-color: #ffffff;
   }
 </style>

package/src/components/RightTree.vue

@@ -168,10 +168,7 @@
         userid: this.userid
       }
       console.log('向资源服务发送请求')
-      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/search`, data,{
-        resolveMsg : null ,
-        rejectMsg : null,
-      }).then((ret) => {
+      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/search`, data).then((ret) => {
         console.log('向资源服务请求结束')
         // 去掉前面的两层节点
         ret.data[0].children[0].children.forEach((item) => {