system-phone 3.0.49-1 → 3.0.49-11

package/package.json

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

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') {

package/src/components/LoginApp.vue

@@ -274,6 +274,7 @@ export default {
           this.$androidUtil.setPreference('login_user_cache', userStr)
           this.$androidUtil.setPreference('f_repairman_id', Util.f.id)
           this.$androidUtil.setPreference('f_repairman_name', Util.f.name)
+          this.$androidUtil.setPreference('f_orgid', Util.f.orgid)
           this.$androidUtil.setPreference('f_role_name', Util.f.f_role_name || '')
           console.log("自动登陆标识" + Util.f.f_role_name)
           console.log(this.showauto)
@@ -289,13 +290,13 @@ export default {
               return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
             }, toStandardTimeString () {
               let dt = new Date()
-              let month = dt.getMonth() + 1
+              let month = dt.getMonth()+1
               let date = dt.getDate()
               let hour = dt.getHours()
               let min = dt.getMinutes()
               let sec = dt.getSeconds()
-              return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
-                + ' ' + (hour < 10 ? '0' + hour : hour)
+              return dt.getFullYear() + '-' + (month<10? '0'+ month : month) + '-' + (date<10? '0'+ date : date)
+                + ' ' + (hour<10? '0'+ hour : hour) + ':' + (min<10? '0'+ min : min) + ':' + (sec<10? '0'+ sec : sec)
             }}
         } else {
           Vue.$login = Vue.prototype.$login = {jwt: ret.data.id,
@@ -306,13 +307,13 @@ export default {
               return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
             }, toStandardTimeString () {
               let dt = new Date()
-              let month = dt.getMonth() + 1
+              let month = dt.getMonth()+1
               let date = dt.getDate()
               let hour = dt.getHours()
               let min = dt.getMinutes()
               let sec = dt.getSeconds()
-              return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
-                + ' ' + (hour < 10 ? '0' + hour : hour)
+              return dt.getFullYear() + '-' + (month<10? '0'+ month : month) + '-' + (date<10? '0'+ date : date)
+                + ' ' + (hour<10? '0'+ hour : hour) + ':' + (min<10? '0'+ min : min) + ':' + (sec<10? '0'+ sec : sec)
             }}
         }
         // 获取参数