system-phone 3.0.28 → 3.0.30

package/.idea/compiler.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="11" />
+  </component>
+</project>

package/.idea/encodings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>

package/.idea/gradle.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../af-gradle/gradle-3.5.1" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>

package/.idea/misc.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="jbr-11" project-jdk-type="JavaSDK" />
+  <component name="ProjectType">
+    <option name="id" value="jpab" />
+  </component>
+</project>

package/package.json

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

package/src/components/AttendManage.vue

@@ -3,19 +3,12 @@
     <div class="auto">
       <div class="row nav-bgcolor" >
         <div class="col-xs-6  manbiankuang" v-for="tab in tabs" @click="gotopage(tab.link,tab.name)">
+
           <img class="imgs" :src="imgback(tab.name)">
           <div class="badge"
-               v-show="isshowTag&&tab.num&&tab.num>0"
+          v-show="isshowTag&&tab.num&&tab.num>0"
           ><div class="badge-content">{{tab.num>99?'99+':tab.num}}</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">{{ safeckNum?safeckNum:0 }}</div>
-          </div>
-          <div class="badge" v-show="tab.name == '维修待办'">
-            <div class="badge-content">{{ repairNum?repairNum:0 }}</div>
-          </div>
+
           <p></p>
           <p class="pagesfoot">{{tab.name}}</p>
 
@@ -24,8 +17,8 @@
         </div>
       </div>
       <!--<div class="row" style="overflow:auto;">-->
-      <!--<repair-first v-show="componentName == 'repair-first'" worktype="报修单"  :sourcet="sourcet" tabname="维修待办" v-on:changesum="changesum"></repair-first>-->
-      <!--<zhihuan-first v-show="componentName == 'zhihuan-first'" worktype="置换通气单"  :sourcet="sourcet" tabname="置换待办" v-on:changesum="changesum"></zhihuan-first>-->
+        <!--<repair-first v-show="componentName == 'repair-first'" worktype="报修单"  :sourcet="sourcet" tabname="维修待办" v-on:changesum="changesum"></repair-first>-->
+        <!--<zhihuan-first v-show="componentName == 'zhihuan-first'" worktype="置换通气单"  :sourcet="sourcet" tabname="置换待办" v-on:changesum="changesum"></zhihuan-first>-->
       <!--</div>-->
     </div>
     <validator name="v">
@@ -65,20 +58,17 @@
   import {HttpResetClass} from "vue-client";
   export default {
     title: '待办工作导航',
-    data() {
+     data() {
       return {
         titleName: '待办工作',
         showModal: false,
         isMenu: true,
         isshowTag:false,
         tabs: [],
-        safeckNum:0,
-        repairNum:0,
         text: '导航组件this',
         beforeName: '待办工作',
         componentName: 'repair-first',
         sourcet: '竖屏',
-        meterNum:null,
         applyType: '',  // 报建类型
         // applyTypes:this.$appdata.getParam("手机报建类型"),
         applyTypes: [{label: '散户报建', value: '散户报建'}, {label: '工商户报建', value: '工商户报建'}, {
@@ -92,7 +82,14 @@
       }
     },
     ready () {
-      this.getNoTagTabs()
+      // this.getModelSum()
+      if(Vue.config.telephone&&Vue.config.telephone.TipConfig&&Vue.config.telephone.TipConfig.data){
+        this.isshowTag = true
+        this.getTabs()
+      }else{
+        this.getNoTagTabs()
+      }
+
     },
 
     methods: {
@@ -185,14 +182,7 @@
 
       },
       getRepair(){
-        if (this.$appdata.getSingleValue('红点') && this.$appdata.getSingleValue('红点') != 'true') {
-          return
-        }
         var _this = this;
-        let bbb = _this.$androidUtil.path({'alias':`getServiceMobile`,'data':{condition:'1 = 1'}})
-        if (bbb.code === 200) {
-          _this.repairNum = bbb.data.length
-        }
         this.timeoutRepair = window.setInterval(function() {
           let result = _this.$androidUtil.path({'alias':`getServiceMobile`,'data':{condition:'1 = 1'}})
           if (result.code === 200) {
@@ -201,20 +191,12 @@
               title: '维修待办',
               sum: result.data.length
             }
-            _this.repairNum = result.data.length
-            // _this.changesum(crv)
+            _this.changesum(crv)
           }
-        }, 100000)
+        }, 6000)
       },
       getSafeCheck(){
-        if (this.$appdata.getSingleValue('红点') && this.$appdata.getSingleValue('红点') != 'true') {
-          return
-        }
         var _this = this;
-        let aaa = _this.$androidUtil.path({'alias':`safecheckGetServiceMobile`,'data':{condition:'1 = 1'}})
-        if (aaa.code === 200) {
-          _this.safeckNum = aaa.data.length
-        }
         this.timeoutRepair = window.setInterval(function() {
           let result = _this.$androidUtil.path({'alias':`safecheckGetServiceMobile`,'data':{condition:'1 = 1'}})
           if (result.code === 200) {
@@ -223,15 +205,11 @@
               title: '安检待办',
               sum: result.data.length
             }
-            _this.safeckNum = result.data.length
-            // _this.changesum(crv)
+            _this.changesum(crv)
           }
-        }, 100000)
+        }, 6000)
       },
       getZhihuan(){
-        if (this.$appdata.getSingleValue('红点') && this.$appdata.getSingleValue('红点') != 'true') {
-          return
-        }
         var _this = this;
         this.timeoutZhihuan = window.setInterval(function() {
           let result = _this.$androidUtil.path({'alias':`getSubstitMobile`,'data':{condition:'1 = 1'}})
@@ -243,7 +221,7 @@
             }
             _this.changesum(crv)
           }
-        }, 100000)
+        }, 6000)
       },
       changesum(titdata){
         for(var i = 0;i<this.tabs.length;i++){
@@ -260,83 +238,56 @@
             this.$set('tabs',Vue.functions[funs].children)
           }
         }
-        this.getTabs()
       },
-      getTabs(){
-        if (Vue.android) {
-          if(Vue.config.telephone&&Vue.config.telephone.TipConfig&&Vue.config.telephone.TipConfig.data) {
-            this.isshowTag = true
-            const config = Vue.config.telephone.TipConfig.data
-            const user = Vue.user
-            console.log("Vue.android" + Vue.android)
-            const result = this.$androidUtil.syncBzLogic("TipConfig", {data: {config, user}})
-            if (result.code === 200) {
-              for (var i = 0; i < this.tabs.length; i++) {
-                result.result.forEach(ress => {
-                  if (this.tabs[i].link === ress.link) {
-                    this.$set('tabs[' + i + '].num', ress.num)
-                  }
+      async getTabs(){
+        const config = Vue.config.telephone.TipConfig.data
+        const user = Vue.user
+        console.log("Vue.android"+Vue.android)
+        if(Vue.android){
+          const result = this.$androidUtil.syncBzLogic("TipConfig",{data:{config,user}})
+          if(result.code === 200){
+            for(let funs in Vue.functions){
+              if(Vue.functions[funs].link == 'attend-manage'){
+                Vue.functions[funs].children.forEach(res=>{
+                  console.log(res)
+                  result.result.forEach(ress=>{
+                    if(res.link === ress.link){
+                      res.num=ress.num
+                    }
+                  })
                 })
+                this.$set('tabs',Vue.functions[funs].children)
               }
             }
-          }
-        } else {
-          const result = {
-            "code": 200,
-            "result": [{"link": "repair-first", "num": 50}, {"link": "current-create", "num": 30}]
-          }
-          if (result.code === 200) {
-            for (var i = 0; i < this.tabs.length; i++) {
-              result.result.forEach(ress => {
-                if (this.tabs[i].link === ress.link) {
-                  this.$set('tabs[' + i + '].num', ress.num)
-                }
-              })
+          }else{
+            for(let funs in Vue.functions){
+              if(Vue.functions[funs].link == 'attend-manage'){
+                this.$set('tabs',Vue.functions[funs].children)
+              }
             }
           }
-        }
-        this.getmeterNum()
-        this.getModelSum()
-      },
-      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}'`
+        }else{
+          const result = {"code":200,"result":[{"link":"repair-first","num":50},{"link":"current-create","num":30}]}
+          if(result.code === 200){
+            for(let funs in Vue.functions){
+              if(Vue.functions[funs].link == 'attend-manage'){
+                Vue.functions[funs].children.forEach(res=>{
+                  console.log(res)
+                  result.result.forEach(ress=>{
+                    if(res.link === ress.link){
+                      res.num=ress.num
+                    }
+                  })
+                })
+                this.$set('tabs',Vue.functions[funs].children)
+              }
+            }
+          }else{
+
           }
-          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
-            debugger
-            console.log("this.meterNum的值是：",this.meterNum)
-          })
-        },10000)
-        this.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}'`
+
         }
-        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')
@@ -349,7 +300,7 @@
       },
       gotopage(param,title) {
         if(title === '工程发起'){
-          this.showModal = !this.showModal
+            this.showModal = !this.showModal
         }else{
           console.log('进入子组件')
           var prpdata = {
@@ -358,7 +309,7 @@
             safe:false
           }
           this.$dispatch('gotoson',prpdata)
-          this.$goto(param,{sourcet:'竖屏',tabname:title},'self',this.getTabs)
+          this.$goto(param,{sourcet:'竖屏',tabname:title})
         }
       },
       mute () {
@@ -368,52 +319,52 @@
   }
 </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-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;
+  //transform: translate(50%,-50%);
+  right:0;
+  display: inline-flex;
+  vertical-align: middle;
+  box-sizing: content-box;
+  border-radius: 100px;
+  background-color: red;
+}
+.app-input {
+  label {
+    float: left;
   }
-  .badge{
-    top: 6px;
-    position: absolute;
-    max-height: 13px;
-    min-height: 8px;
-    //transform: translate(50%,-50%);
-    right:0;
-    display: inline-flex;
-    vertical-align: middle;
-    box-sizing: content-box;
-    border-radius: 100px;
-    background-color: red;
-  }
-  .app-input {
-    label {
-      float: left;
-    }
-    .select {
-      button {
-        border: none;
-        outline: none;
-        text-align: left;
-        .btn-placeholder {
-          color: #ACA899
-        }
+  .select {
+    button {
+      border: none;
+      outline: none;
+      text-align: left;
+      .btn-placeholder {
+        color: #ACA899
       }
     }
-    .datepicker {
-      .form-control:focus {
-        border: none!important;
-        outline: none!important;
-        -webkit-box-shadow: none;
-        box-shadow: none;
-      }
+  }
+  .datepicker {
+    .form-control:focus {
+      border: none!important;
+      outline: none!important;
+      -webkit-box-shadow: none;
+      box-shadow: none;
     }
   }
+}
   .tab-befor-img  {
     content: '';
     background-size: 30px;