system-phone 3.0.49-4 → 3.0.49-41

package/src/bootstrap/less/wells.less

@@ -1,29 +1,29 @@
-//
-// Wells
-// --------------------------------------------------
-
-
-// Base class
-.well {
-  min-height: 20px;
-  padding: 19px;
-  margin-bottom: 20px;
-  background-color: @well-bg;
-  border: 1px solid @well-border;
-  border-radius: @border-radius-base;
-  .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
-  blockquote {
-    border-color: #ddd;
-    border-color: rgba(0,0,0,.15);
-  }
-}
-
-// Sizes
-.well-lg {
-  padding: 24px;
-  border-radius: @border-radius-large;
-}
-.well-sm {
-  padding: 9px;
-  border-radius: @border-radius-small;
-}
+//
+// Wells
+// --------------------------------------------------
+
+
+// Base class
+.well {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: @well-bg;
+  border: 1px solid @well-border;
+  border-radius: @border-radius-base;
+  .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
+  blockquote {
+    border-color: #ddd;
+    border-color: rgba(0,0,0,.15);
+  }
+}
+
+// Sizes
+.well-lg {
+  padding: 24px;
+  border-radius: @border-radius-large;
+}
+.well-sm {
+  padding: 9px;
+  border-radius: @border-radius-small;
+}

package/src/components/AloneLoadParams.vue

@@ -1,26 +1,26 @@
-<template>
-  <div>
-     <p>获取参数中，请保持网络畅通</p>
-  </div>
-</template>
-
-<script>
-import co from 'co'
-import Vue from 'vue'
-import LoadParams from '../plugins/LoadParams'
-
-export default {
-  title: '加载参数',
-  props: {
-    componentName: {
-      type: String
-    }
-  },
-  ready () {
-    LoadParams.load().then(() => {
-      // this.$resetpost(Vue.dataUrl + 'rs/logic/androidLog', {data: {name: 'path', msg: '加载参数成功'}}, {resolveMsg: null, rejectMsg: null})
-      this.$goto(this.componentName)
-    })
-  }
-}
-</script>
+<template>
+  <div>
+     <p>获取参数中，请保持网络畅通</p>
+  </div>
+</template>
+
+<script>
+import co from 'co'
+import Vue from 'vue'
+import LoadParams from '../plugins/LoadParams'
+
+export default {
+  title: '加载参数',
+  props: {
+    componentName: {
+      type: String
+    }
+  },
+  ready () {
+    LoadParams.load().then(() => {
+      // this.$resetpost(Vue.dataUrl + 'rs/logic/androidLog', {data: {name: 'path', msg: '加载参数成功'}}, {resolveMsg: null, rejectMsg: null})
+      this.$goto(this.componentName)
+    })
+  }
+}
+</script>

package/src/components/AlreadyService.vue

@@ -1,193 +1,193 @@
-<template>
-  <div class="nav-bgcolor">
-    <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)">
-          <p></p>
-          <p class="pagesfoot">{{tab.name}}</p>
-          <!--<p class="pagesfoot">{{tab.name}}&nbsp;{{tab.icon}}</p>-->
-          <p></p>
-        </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>-->
-      <!--</div>-->
-    </div>
-  </div>
-</template>
-
-<script scoped>
-  import Vue from 'vue'
-  import  * as Util from '../Util'
-  export default {
-    title: '已办工作导航',
-    data () {
-      return {
-        titleName:'已办工作',
-        isMenu:true,
-        tabs: this.getTabs(),
-        text: '导航组件this',
-        beforeName:'已办工作',
-        sourcet:'竖屏'
-      }
-    },
-    ready () {
-      // this.getModelSum()
-    },
-
-    methods: {
-      // 查询本地所有待办
-      getModelSum(){
-        for(var i = 0;i<this.tabs.length;i++){
-          if(this.tabs[i].link == 'completed-zhihuan' ){
-            this.getZhihuan()
-          }
-          if(this.tabs[i].link == 'completed-repair' ){
-            this.getRepair()
-          }
-          if(this.tabs[i].link == 'area-plan' ){
-            this.getSafeCheck()
-          }
-        }
-
-      },
-      getRepair(){
-        var _this = this;
-        this.timeoutRepair = window.setInterval(function() {
-          let result = _this.$androidUtil.path({'alias':`getCompletedInfo`, 'data': {f_workorder_type: '报修单',condition:'1 = 1'}})
-          if (result.code === 200) {
-            console.log('查询得到的代办2' + JSON.stringify(result))
-            var crv = {
-              title: '维修已办',
-              sum: result.data.length
-            }
-            _this.changesum(crv)
-          }
-        }, 6000)
-      },
-      getSafeCheck(){
-        var _this = this;
-        this.timeoutRepair = window.setInterval(function() {
-          let result = _this.$androidUtil.path({'alias':`getSafecheckCompletedInfo`, 'data': {condition:'1 = 1'}})
-          if (result.code === 200) {
-            console.log('查询得到的安检已办' + JSON.stringify(result))
-            var crv = {
-              title: '安检已办',
-              sum: result.data.length
-            }
-            _this.changesum(crv)
-          }
-        }, 6000)
-      },
-      getZhihuan(){
-        var _this = this;
-        this.timeoutZhihuan = window.setInterval(function() {
-          let result = _this.$androidUtil.path({'alias':`getCompletedInfo`, 'data': {f_workorder_type: '置换通气单',condition:'1 = 1'}})
-          if (result.code === 200) {
-            console.log('查询得到的代办2' + JSON.stringify(result))
-            var crv = {
-              title: '置换已办',
-              sum: result.data.length
-            }
-            _this.changesum(crv)
-          }
-        }, 6000)
-      },
-      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(){
-        for(let funs in Vue.functions){
-          if(Vue.functions[funs].link == 'already-service'){
-            return Vue.functions[funs].children
-          }
-        }
-      },
-      imgback(val){
-        return require('../assets/'+val+'.png')
-      },
-      // 返回主界面
-      back(){
-        this.titleName = '主界面'
-        this.isMenu = true
-
-      },
-      gotopage(param,title) {
-        console.log('进入子组件')
-        var prpdata = {
-          _this:this,
-          title:title,
-          safe:false
-        }
-        this.$dispatch('gotoson',prpdata)
-        this.$goto(param,{sourcet:'竖屏',tabname:title})
-      },
-      mute () {
-        HostApp.mute()
-      }
-    },
-  }
-</script>
-<style lang="less">
-  .tab-befor-img  {
-    content: '';
-    background-size: 30px;
-    display: inline-block;
-    margin-right: 8px;
-    height: 30px;
-    width: 30px;
-    vertical-align: -35%;
-  }
-  .pageskuang{
-    vertical-align:middle;
-    display:table-cell;
-    width: 32%;
-    top:-50%;
-    margin-top: 1%;
-    margin-left: 1%;
-    border:1px solid #e3e3e3;
-    text-align: center;
-    background-color: #ffffff;
-  }
-  .pgesfoot{
-    font-size: 14px;
-    color: #666666;
-    /*    font-family: "Pingfhs";*/
-  }
-  .imgs{
-    width: 35px;
-    margin-top: 15px;
-  }
-  .pages-bgcolor{
-    text-align: center;
-    background-color: #f0f0ef;
-  }
-  img[src=""],img:not([src]){
-    opacity: 0;
-    border:none;
-    visibility: hidden;
-    max-width: none;
-  }
-
-  .manbiankuang{
-    width: 44%;
-    margin-top: 15px;
-    margin-left: 4%;
-    border:1px solid #e3e3e3;
-    border-radius:10px 10px 10px 10px;
-    text-align: center;
-    background-color: #ffffff;
-  }
-
-  .nav-bgcolor{
-    background-color: #ffffff;
-  }
-</style>
+<template>
+  <div class="nav-bgcolor">
+    <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)">
+          <p></p>
+          <p class="pagesfoot">{{tab.name}}</p>
+          <!--<p class="pagesfoot">{{tab.name}}&nbsp;{{tab.icon}}</p>-->
+          <p></p>
+        </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>-->
+      <!--</div>-->
+    </div>
+  </div>
+</template>
+
+<script scoped>
+  import Vue from 'vue'
+  import  * as Util from '../Util'
+  export default {
+    title: '已办工作导航',
+    data () {
+      return {
+        titleName:'已办工作',
+        isMenu:true,
+        tabs: this.getTabs(),
+        text: '导航组件this',
+        beforeName:'已办工作',
+        sourcet:'竖屏'
+      }
+    },
+    ready () {
+      // this.getModelSum()
+    },
+
+    methods: {
+      // 查询本地所有待办
+      getModelSum(){
+        for(var i = 0;i<this.tabs.length;i++){
+          if(this.tabs[i].link == 'completed-zhihuan' ){
+            this.getZhihuan()
+          }
+          if(this.tabs[i].link == 'completed-repair' ){
+            this.getRepair()
+          }
+          if(this.tabs[i].link == 'area-plan' ){
+            this.getSafeCheck()
+          }
+        }
+
+      },
+      getRepair(){
+        var _this = this;
+        this.timeoutRepair = window.setInterval(function() {
+          let result = _this.$androidUtil.path({'alias':`getCompletedInfo`, 'data': {f_workorder_type: '报修单',condition:'1 = 1'}})
+          if (result.code === 200) {
+            console.log('查询得到的代办2' + JSON.stringify(result))
+            var crv = {
+              title: '维修已办',
+              sum: result.data.length
+            }
+            _this.changesum(crv)
+          }
+        }, 6000)
+      },
+      getSafeCheck(){
+        var _this = this;
+        this.timeoutRepair = window.setInterval(function() {
+          let result = _this.$androidUtil.path({'alias':`getSafecheckCompletedInfo`, 'data': {condition:'1 = 1'}})
+          if (result.code === 200) {
+            console.log('查询得到的安检已办' + JSON.stringify(result))
+            var crv = {
+              title: '安检已办',
+              sum: result.data.length
+            }
+            _this.changesum(crv)
+          }
+        }, 6000)
+      },
+      getZhihuan(){
+        var _this = this;
+        this.timeoutZhihuan = window.setInterval(function() {
+          let result = _this.$androidUtil.path({'alias':`getCompletedInfo`, 'data': {f_workorder_type: '置换通气单',condition:'1 = 1'}})
+          if (result.code === 200) {
+            console.log('查询得到的代办2' + JSON.stringify(result))
+            var crv = {
+              title: '置换已办',
+              sum: result.data.length
+            }
+            _this.changesum(crv)
+          }
+        }, 6000)
+      },
+      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(){
+        for(let funs in Vue.functions){
+          if(Vue.functions[funs].link == 'already-service'){
+            return Vue.functions[funs].children
+          }
+        }
+      },
+      imgback(val){
+        return require('../assets/'+val+'.png')
+      },
+      // 返回主界面
+      back(){
+        this.titleName = '主界面'
+        this.isMenu = true
+
+      },
+      gotopage(param,title) {
+        console.log('进入子组件')
+        var prpdata = {
+          _this:this,
+          title:title,
+          safe:false
+        }
+        this.$dispatch('gotoson',prpdata)
+        this.$goto(param,{sourcet:'竖屏',tabname:title})
+      },
+      mute () {
+        HostApp.mute()
+      }
+    },
+  }
+</script>
+<style lang="less">
+  .tab-befor-img  {
+    content: '';
+    background-size: 30px;
+    display: inline-block;
+    margin-right: 8px;
+    height: 30px;
+    width: 30px;
+    vertical-align: -35%;
+  }
+  .pageskuang{
+    vertical-align:middle;
+    display:table-cell;
+    width: 32%;
+    top:-50%;
+    margin-top: 1%;
+    margin-left: 1%;
+    border:1px solid #e3e3e3;
+    text-align: center;
+    background-color: #ffffff;
+  }
+  .pgesfoot{
+    font-size: 14px;
+    color: #666666;
+    /*    font-family: "Pingfhs";*/
+  }
+  .imgs{
+    width: 35px;
+    margin-top: 15px;
+  }
+  .pages-bgcolor{
+    text-align: center;
+    background-color: #f0f0ef;
+  }
+  img[src=""],img:not([src]){
+    opacity: 0;
+    border:none;
+    visibility: hidden;
+    max-width: none;
+  }
+
+  .manbiankuang{
+    width: 44%;
+    margin-top: 15px;
+    margin-left: 4%;
+    border:1px solid #e3e3e3;
+    border-radius:10px 10px 10px 10px;
+    text-align: center;
+    background-color: #ffffff;
+  }
+
+  .nav-bgcolor{
+    background-color: #ffffff;
+  }
+</style>

package/src/components/AttendManage.vue

@@ -56,6 +56,56 @@
         </div>
       </modal>
     </validator>
+    <modal :show.sync="shownotices" backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <h3 style="text-align: center;">新公告提醒</h3>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div  class="auto app-text" style="margin-top: 5px;">
+          <div class="panel" style="padding: 10px 10px 5px 10px;">
+            <div class="panel-body panel-self">
+              <div class="col-xs-12">
+                <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>标题:</b></p>
+                <p class="panel-title col-xs-5 text-left input-font" style="width: 74%">{{notices.f_title}}</p>
+              </div>
+              <div class="col-xs-12">
+                <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>内容:</b></p>
+                <p class="panel-title col-xs-7 text-left input-font" style="width: 79%">{{ notices.f_explain }}</p>
+              </div>
+              <div class="col-xs-12">
+                <p class="panel-title text-left font" style="width: 23%;float: left"><b>状态:</b></p>
+                <p class="panel-title text-left input-font" style="width: 77%">{{notices.f_state}}</p>
+              </div>
+
+              <div class="col-xs-12">
+                <p class="panel-title text-left font" style="width: 30%;float: left"><b>发布时间:</b></p>
+                <p class="panel-title text-left input-font" style="width: 100%">{{notices.f_date}}</p>
+              </div>
+              <div class="col-xs-12">
+                <p class="panel-title text-left font" style="width: 30%;float: left"><b>结束时间:</b></p>
+                <p class="panel-title text-left input-font" style="width: 100%">{{notices.f_enddate}}</p>
+              </div>
+              <div class="col-xs-12">
+                <p class="panel-title text-left font" style="width: 30%;float: left"><b>操作人:</b></p>
+                <p class="panel-title text-left input-font" style="width: 100%">{{notices.f_operator}}</p>
+              </div>
+              <div class="col-xs-12">
+                <p class="panel-title text-left font" style="width: 30%;float: left"><b>紧急公告:</b></p>
+                <p class="panel-title text-left input-font" style="width: 100%">{{notices.f_urgency ? '是' : '否'}}</p>
+              </div>
+              <div class="col-xs-12">
+                <img-self :width="300" :height="400"  alt="无照片！！！" :src="notices.f_downloadfile.split(':')[1]"></img-self>
+              </div>
+              <div class="col-xs-12">
+                <button type="button" name="button" class="btn btn-primary" style="background-color:#499edf;float: right" @click="closeshowModal()">确认</button>
+              </div>
+            </div>
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
   </div>
 </template>
 
@@ -71,9 +121,15 @@
         showModal: false,
         isMenu: true,
         isshowTag:false,
+        shownotices:false,
         tabs: [],
         safeckNum:0,
         repairNum:0,
+        model:{},
+        notices:{},
+        weakPassword: false,
+        modifyPassword: false,
+        isShowStopGas:this.$appdata.getSingleValue('公告展示'),
         text: '导航组件this',
         beforeName: '待办工作',
         componentName: 'repair-first',
@@ -96,8 +152,72 @@
       this.getNoTagTabs()
       this.getmeterNum()
       this.getModelSum()
+      this.searchStopGas()
     },
     methods: {
+      closeshowModal(){
+        this.shownotices = false
+        this.saveIsShowStopGas()
+      },
+      searchStopGas(){
+        if(!this.isShowStopGas || !this.isShowStopGas == 'true'){
+          return
+        }
+        let http = new HttpResetClass()
+        var condition = `1=1 and f_state = '公告中' and f_typeofreceipt = '手机端'`
+        let data = {
+          items: '*',
+          tablename: 'T_STOPGAS',
+          condition: condition,
+          orderitem: 'id desc'
+        }
+        http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable_OrderBy`, {data: data}, {
+          resolveMsg: null,
+          rejectMsg: null
+        }).then((res) => {
+          this.notices = res.data[0]
+          this.showStopGas(res.data[0].id,Vue.user.id)
+        }).catch((e)=>{
+        })
+      },
+      showStopGas(stopId,userid){
+        let http = new HttpResetClass()
+        var condition = `f_stopgas_id = '${stopId}' and f_user_id = '${userid}'`
+        let data = {
+          items: '*',
+          tablename: 't_notice_notarize',
+          condition: condition,
+          orderitem: 'f_id desc'
+        }
+        http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable_OrderBy`, {data: data}, {
+          resolveMsg: null,
+          rejectMsg: null
+        }).then((res) => {
+          if (res.data.length === 0) {
+            this.shownotices = true
+          }else if (res.data[0].f_phstate !== '已确认' ){
+            this.model.f_id = res.data[0].f_id
+            this.shownotices = true
+          } else {
+            this.shownotices = false
+          }
+        }).catch((e)=>{
+          console.log('报错了！！')
+          console.error(e)
+        })
+      },
+      saveIsShowStopGas(){
+        this.model.f_stopgas_id = this.notices.id
+        this.model.f_phstate = '已确认'
+        this.model.f_user_id = Vue.user.id
+        console.log('保存', this.model)
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/savenoticenotarize`, {data:this.model}).then((res) => {
+          this.model.f_stopgas_id = ''
+          this.model.f_user_id = ''
+        }).catch((res) => {
+          console.log('打印报错信息'+ res)
+        })
+      },
       click (row) {
         let _this = this
         this.$dispatch('gotoson', {
@@ -184,7 +304,6 @@
             this.getSafeCheck()
           }
         }
-
       },
       getRepair(){
         if (!this.isShowRedNum || this.isShowRedNum != 'true') {