system-phone 1.2.123 → 1.2.125-qh

package/src/components/NavBottomVVV.vue

@@ -15,9 +15,9 @@
     </header>
     <article slot="modal-body" class="modal-body">
       <div class="form-group" style="text-align: center">
-        安检代办:{{result.safe[0].safenum}}条，其中即将到期预约单{{result.safeorder[0].safeyuyuenum}}条 <br/>
-        维修代办:{{result.tel[0].telnum}}条，其中即将到期预约单{{result.telorder[0].telyuyuenum}}条<br/>
-        报建代办:{{result.apply[0].applynum}}条，其中即将到期预约单{{result.applyorder[0].applyyuyuenum}}条<br/>
+        安检代办:{{result.safe[0].safenum}}条，其中预约单{{result.safeorder[0].safeyuyuenum}}条 <br/>
+        维修代办:{{result.tel[0].telnum}}条，其中预约单{{result.telorder[0].telyuyuenum}}条<br/>
+        报建代办:{{result.apply[0].applynum}}条，其中预约单{{result.applyorder[0].applyyuyuenum}}条<br/>
       </div>
     </article>
     <footer slot="modal-footer" class="modal-footer">
@@ -47,7 +47,7 @@ export default {
     }
   },
   ready(){
-    console.log("99999",Vue.user)
+    /* console.log("99999",Vue.user)
     new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/logic/getModuleUpcoming`,{
       id:Vue.user.id,
       name:Vue.user.name,
@@ -62,7 +62,7 @@ export default {
       // ${result.telorder[0].telyuyuenum}条需要处理的维修预约业务，<br/>
       // ${result.applyorder[0].applyyuyuenum}条需要处理的报建预约业务，<br/>
       // ${result.apply[0].applynum}条需要处理的报建待办业务`)
-    })
+    }) */
   },
   methods: {
     closeFile(){
@@ -74,6 +74,7 @@ export default {
           if (res === 'confirm') {
             //this.safe = false 返回父页面后不能修改父级页面定义的 是否返回提示
             this.delback()
+            this.$broadcast("return_notification",this.safe)
             this.backthis.$back()
             this.closeAndDelAudio()
           }

package/src/components/ToolsPage.vue

@@ -1,165 +1,162 @@
-<template>
-  <div class="page-header app-header auto">
-    <span style="margin-left:33px">{{title}}</span>
-    <div class="app-header-back" @click='back()' v-show="needBack">
-      <img src="../assets/返回.png" style="height: 20px;margin-right:-10px"/>
-    </div>
-    <div class="app-header-back"  v-show="!needBack">
-      <img src="../assets/denglu.png" style="height: 20px;margin-right:-10px;margin-top:-10px"/>
-      <span style="margin-left:5px;color: #ffffff;font-size: 1.0em;">{{loginname}}</span>
-    </div>
-    <div class="app-header-list" v-if="showList">
-    <dropdown>
-      <a  href="#" data-toggle="dropdown" class="dropdown-toggle" style="color: white;font-size:19px">
-        <div class="app-header-newaddserver" style="line-height: 1px;margin-top: -5px">
-          <img src="../assets/newadd3.png" style="height: 20px;margin-right:-10px"/>
-        </div>
-      </a>
-      <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right">
-        <li >
-        <a href="#" @click="gotopage('sell-info',{user:user})">
-        <img src="../assets/待办工单竖屏3.png"> 报修工单
-        </a>
-        <hr>
-        <a href="#" @click="gotopage('repair-message',{user:user})">
-        <img src="../assets/安检导航竖屏3.png"/> 安检计划
-        </a>
-        <hr>
-        <a href="#" @click="gotopage('changemeter-info',{user:user})">
-        <img src="../assets/手机抄表竖屏3.png"/> 抄表计划
-        </a>
-        <hr>
-        <hr>
-        </li>
-      </ul>
-    </dropdown>
-  </div>
-    <div class="app-header-guanbishengyin" style="line-height: 25px" @click='mute()'>
-      <img src="../assets/jingyin3.png" style="height: 20px;"/>
-    </div>
-  </div>
-</template>
-
-<script>
-  import Vue from 'vue'
-export default {
-  title: '通用头部组件',
-  data () {
-    return {
-      loginname: Vue.user.name
-    }
-  },
-  props: {
-    user:{
-      type:Object
-    },
-    userinfo:{
-      type:Object
-    },
-    // 是否显示列表控件
-    showList: {
-      type: Boolean,
-      default: false
-    },
-    title: {
-      type: String,
-      default: '燃气应用'
-    },
-    needBack: {
-      type: Boolean,
-      default: true
-    }
-  },
-  methods: {
-    // 新增工单
-    newadd(){
-      // 事件
-    },
-    // 跳转页面
-    gotopage(param,props) {
-      this.$goto(param,props)
-    },
-    back () {
-      // console.log('发送返回事件')
-      this.$emit('back')
-    },
-    // 关闭新消息响铃（静音）
-      mute () {
-        if(navigator.userAgent.match('iPad') || navigator.userAgent.match('iPhone')){
-            window.prompt("mute","")
-        }else{
-          HostApp.mute()
-        }
-    },
-  }
-}
-</script>
-<style scoped>
-  .app-header {
-    position: fixed;
-    top:0px;
-    width: 100%;
-    margin: 0px;
-    background: #499edf;
-    color: #FFF;
-    padding: 10px;
-    text-align: center;
-    font-size: 15px;
-    height: 7%;
-
-    /*margin-bottom: 20px;*/
-  }
-  .app-header-back {
-    position: absolute;
-    top: 12px;
-    color: #D8DCE5;
-  }
-  .app-header-list {
-    height: 40px;
-    float: right;
-    color: #D8DCE5;
-  }
-  .app-header-guanbishengyin {
-    margin-right: 10px;
-    float: right;
-    color: #D8DCE5;
-  }
-  .app-header-newaddserver {
-    margin-right: 10px;
-    float: right;
-    color: #D8DCE5;
-  }
-  .app-header-volume {
-    position: absolute;
-    top: 0;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    right: 20px;
-    color: #D8DCE5;
-    font-size: 1.5em;
-  }
-  .dropdown-menu {
-    background-color: #212a35;
-  }
-  .dropdown-menu a{
-    color: white;
-  }
-  .dropdown-menu a:hover{
-    color: white;
-    background-color: #6b85a3;
-  }
-  .dropdown-menu img{
-    width: 22%;
-    margin-top: -5px;
-  }
-  .dropdown-menu hr{
-    margin-top: 0px;
-    margin-bottom: 0px;
-    margin-right:0px;
-    width: 80%;
-  }
-  .glyphicon-menu-left{
-    color:#fff;
-  }
-</style>
+<template>
+  <div class="page-header app-header auto">
+    <span style="margin-left:33px">{{title}}</span>
+    <div class="app-header-back" @click='back()' v-show="needBack">
+      <img src="../assets/返回.png" style="height: 20px;margin-right:-10px"/>
+    </div>
+    <div class="app-header-back"  v-show="!needBack">
+      <img src="../assets/denglu.png" style="height: 20px;margin-right:-10px;margin-top:-10px"/>
+      <span style="margin-left:5px;color: #ffffff;font-size: 1.0em;">{{loginname}}</span>
+    </div>
+    <div class="app-header-list" v-if="showList">
+    <dropdown>
+      <a  href="#" data-toggle="dropdown" class="dropdown-toggle" style="color: white;font-size:19px">
+        <div class="app-header-newaddserver" style="line-height: 1px;margin-top: -5px">
+          <img src="../assets/newadd3.png" style="height: 20px;margin-right:-10px"/>
+        </div>
+      </a>
+      <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right">
+        <li >
+        <a href="#" @click="gotopage('sell-info',{user:user})">
+        <img src="../assets/待办工单竖屏3.png"> 报修工单
+        </a>
+        <hr>
+        <a href="#" @click="gotopage('repair-message',{user:user})">
+        <img src="../assets/安检导航竖屏3.png"/> 安检计划
+        </a>
+        <hr>
+        <a href="#" @click="gotopage('changemeter-info',{user:user})">
+        <img src="../assets/手机抄表竖屏3.png"/> 抄表计划
+        </a>
+        <hr>
+        <hr>
+        </li>
+      </ul>
+    </dropdown>
+  </div>
+  </div>
+</template>
+
+<script>
+  import Vue from 'vue'
+export default {
+  title: '通用头部组件',
+  data () {
+    return {
+      loginname: Vue.user.name
+    }
+  },
+  props: {
+    user:{
+      type:Object
+    },
+    userinfo:{
+      type:Object
+    },
+    // 是否显示列表控件
+    showList: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      default: '燃气应用'
+    },
+    needBack: {
+      type: Boolean,
+      default: true
+    }
+  },
+  methods: {
+    // 新增工单
+    newadd(){
+      // 事件
+    },
+    // 跳转页面
+    gotopage(param,props) {
+      this.$goto(param,props)
+    },
+    back () {
+      // console.log('发送返回事件')
+      this.$emit('back')
+    },
+    // 关闭新消息响铃（静音）
+      mute () {
+        if(navigator.userAgent.match('iPad') || navigator.userAgent.match('iPhone')){
+            window.prompt("mute","")
+        }else{
+          HostApp.mute()
+        }
+    },
+  }
+}
+</script>
+<style scoped>
+  .app-header {
+    position: fixed;
+    top:0px;
+    width: 100%;
+    margin: 0px;
+    background: #499edf;
+    color: #FFF;
+    padding: 10px;
+    text-align: center;
+    font-size: 15px;
+    height: 7%;
+
+    /*margin-bottom: 20px;*/
+  }
+  .app-header-back {
+    position: absolute;
+    top: 12px;
+    color: #D8DCE5;
+  }
+  .app-header-list {
+    height: 40px;
+    float: right;
+    color: #D8DCE5;
+  }
+  .app-header-guanbishengyin {
+    margin-right: 10px;
+    float: right;
+    color: #D8DCE5;
+  }
+  .app-header-newaddserver {
+    margin-right: 10px;
+    float: right;
+    color: #D8DCE5;
+  }
+  .app-header-volume {
+    position: absolute;
+    top: 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    right: 20px;
+    color: #D8DCE5;
+    font-size: 1.5em;
+  }
+  .dropdown-menu {
+    background-color: #212a35;
+  }
+  .dropdown-menu a{
+    color: white;
+  }
+  .dropdown-menu a:hover{
+    color: white;
+    background-color: #6b85a3;
+  }
+  .dropdown-menu img{
+    width: 22%;
+    margin-top: -5px;
+  }
+  .dropdown-menu hr{
+    margin-top: 0px;
+    margin-bottom: 0px;
+    margin-right:0px;
+    width: 80%;
+  }
+  .glyphicon-menu-left{
+    color:#fff;
+  }
+</style>