system-phone 3.0.49-6 → 3.0.49-60

package/src/components/LoginApp.vue

@@ -190,6 +190,15 @@ export default {
     },
     async confirm() {
       this.loaderShow = true
+      // 判断用户状态
+      let users = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`,{
+        data: {items: '*', tablename: 't_user', orderitem: 'id desc', condition:`ename = '${this.ename}' and (state='在职' or name like '%超级管理员%')`}
+      },{resolveMsg: null, rejectMsg: null})
+      if (users.data.length == 0) {
+        this.loaderShow = false
+        this.$showMessage("登陆失败,用户不存在")
+        return
+      }
       console.log('Vue.android：' + Vue.android)
       const userData = {username: this.ename, password: this.password}
       console.log('获取登陆信息：' + userData)
@@ -206,10 +215,8 @@ export default {
             resolveMsg: null,
             rejectMsg: null
           })
-          console.log('获取登陆信息：', ret.data)
-          //秦华---(siteId==站点id)===============(flatId==平板id)
-          this.$androidUtil.setPreference('siteId', ret.data.f_extend1 || '')
-          this.$androidUtil.setPreference('flatId', ret.data.f_extend2 || '')
+          this.$androidUtil.setPreference('siteId', ret.data.f_extend1 || users.data[0].f_extend1 || '')
+          this.$androidUtil.setPreference('flatId', ret.data.f_extend2 || users.data[0].f_extend2 || '')
           this.$androidUtil.setPreference('name', ret.data.name || '')
           this.$androidUtil.setPreference('ename', ret.data.ename || '')
           if ((JSON.stringify(ret.data).startsWith("{") || JSON.stringify(ret.data).data.startsWith("[")) && ret.data.code && ret.data.msg && ret.data.code !== 200) {
@@ -274,6 +281,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 +297,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 +314,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)
             }}
         }
         // 获取参数
@@ -326,7 +334,7 @@ export default {
         console.log('获取参数结束')
         this.loaderShow = false
         // 弱口令验证
-        if (this.weakPassword && !(/^(?:(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(this.password))) {
+        if (this.weakPassword && !(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(this.password))) {
           await this.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm'])
           this.modifyPassword = true
           return

package/src/components/ModifyPassWord.vue

@@ -158,8 +158,8 @@ export default {
         this.$showMessage('两次输入密码不一致！')
         return
       }
-      if (this.weakPassword && this.model.password && !(/^(?:(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(this.model.password))) {
-        this.$showMessage('新密码必须包含大小写字母、数字、符号！')
+      if (this.weakPassword && this.model.password && !(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(this.model.password))) {
+        this.$showMessage("密码必须是8~16位数字与大小字母外加特殊字符的组合，并且不能出现类似'123','abc'等连贯数字或者字母")
         return
       }
       // 检验原始密码是否符合 并修改密码

package/src/components/OnlineManage.vue

@@ -1,255 +1,256 @@
-<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,tab.navigate)">
-          <div class="badge" v-show="tab.name == '维修派发' && isShowRedNum && isShowRedNum == 'true'">
-            <div class="badge-content">{{ pointNum ? pointNum : 0 }}</div>
-          </div>
-          <div class="badge" v-show="tab.name == '抄表待办' && isShowRedNum && isShowRedNum == 'true'">
-            <div class="badge-content">{{ meterNum ? meterNum : 0 }}</div>
-          </div>
-          <div class="badge" v-show="tab.name == '信息公告' && isShowRedNum && isShowRedNum == 'true'">
-            <div class="badge-content">{{ infoNum ? infoNum : 0 }}</div>
-          </div>
-          <img class="imgs" :src="imgback(tab.name)" alt="">
-          <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 {HttpResetClass} from "vue-client";
-  import * as Util from "../Util";
-
-  export default {
-    title: '在线业务导航',
-    data() {
-      return {
-        titleName: '在线业务',
-        isMenu: true,
-        tabs: this.getTabs(),
-        text: '导航组件this',
-        isShowRedNum:this.$appdata.getSingleValue('手机端获取任务条数'),
-        beforeName: '在线业务',
-        sourcet: '竖屏',
-        pointNum: null,
-        infoNum: null,
-        meterNum: null
-      }
-    },
-    ready() {
-      this.getRepairNum()
-      this.getInfoNum()
-      this.getmeterNum()
-    },
-    methods: {
-      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 == 'online-manage') {
-            return Vue.functions[funs].children
-          }
-        }
-        this.getRepairNum()
-        this.getInfoNum()
-        this.getmeterNum()
-      },
-      getmeterNum() {
-        if (!this.isShowRedNum || this.isShowRedNum != 'true') {
-          return
-        }
-        this.timeOutGetmeterNum()
-      },
-      getInfoNum() {
-        if (!this.isShowRedNum || this.isShowRedNum != 'true') {
-          return
-        }
-        this.timeOutGetInfoNum()
-      },
-      getRepairNum() {
-        if (!this.isShowRedNum || this.isShowRedNum != 'true') {
-          return
-        }
-        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: "count(*) as count_num",
-          tablename: "T_STOPGAS",
-          orderitem: "1",
-          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[0].count_num
-        })
-      },
-      timeOutGetmeterNum() {
-        let val = {
-          items: "count(*) as count_num",
-          tablename: "t_handplan",
-          orderitem: "1",
-          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[0].count_num
-        })
-      },
-      imgback(val) {
-        return require('../assets/' + val + '.png')
-      },
-      // 返回主界面
-      back() {
-        this.titleName = '主界面'
-        this.isMenu = true
-
-      },
-      gotopage(param, title, navigate) {
-        console.log('进入子组件')
-        var prpdata = {
-          _this: this,
-          title: title,
-          safe: false
-        }
-        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},'self',this.getTabs)
-        }
-      },
-      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 {
-    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;
-  }
-
-  .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,tab.navigate)">
+          <div class="badge" v-show="tab.name == '维修派发' && isShowRedNum && isShowRedNum == 'true'">
+            <div class="badge-content">{{ pointNum ? pointNum : 0 }}</div>
+          </div>
+          <div class="badge" v-show="tab.name == '抄表待办' && isShowRedNum && isShowRedNum == 'true'">
+            <div class="badge-content">{{ meterNum ? meterNum : 0 }}</div>
+          </div>
+          <div class="badge" v-show="tab.name == '信息公告' && isShowRedNum && isShowRedNum == 'true'">
+            <div class="badge-content">{{ infoNum ? infoNum : 0 }}</div>
+          </div>
+          <img class="imgs" :src="imgback(tab.name)" alt="">
+          <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 {HttpResetClass} from "vue-client";
+  import * as Util from "../Util";
+
+  export default {
+    title: '在线业务导航',
+    data() {
+      return {
+        titleName: '在线业务',
+        isMenu: true,
+        tabs: this.getTabs(),
+        text: '导航组件this',
+        isShowRedNum:this.$appdata.getSingleValue('手机端获取任务条数'),
+        beforeName: '在线业务',
+        sourcet: '竖屏',
+        pointNum: null,
+        infoNum: null,
+        meterNum: null
+      }
+    },
+    ready() {
+      this.getRepairNum()
+      this.getInfoNum()
+      this.getmeterNum()
+    },
+    methods: {
+      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 == 'online-manage') {
+            return Vue.functions[funs].children
+          }
+        }
+        this.getRepairNum()
+        this.getInfoNum()
+        this.getmeterNum()
+      },
+      getmeterNum() {
+        if (!this.isShowRedNum || this.isShowRedNum != 'true') {
+          return
+        }
+        this.timeOutGetmeterNum()
+      },
+      getInfoNum() {
+        if (!this.isShowRedNum || this.isShowRedNum != 'true') {
+          return
+        }
+        this.timeOutGetInfoNum()
+      },
+      getRepairNum() {
+        if (!this.isShowRedNum || this.isShowRedNum != 'true') {
+          return
+        }
+        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: "count(*) as count_num",
+          tablename: "T_STOPGAS",
+          orderitem: "1",
+          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[0].count_num
+        })
+      },
+      timeOutGetmeterNum() {
+        let val = {
+          items: "count(*) as count_num",
+          tablename: "t_handplan",
+          orderitem: "1",
+          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[0].count_num
+        })
+      },
+      imgback(val) {
+        return require('../assets/' + val + '.png')
+      },
+      // 返回主界面
+      back() {
+        this.titleName = '主界面'
+        this.isMenu = true
+
+      },
+      gotopage(param, title, navigate) {
+        console.log('进入子组件')
+        var prpdata = {
+          _this: this,
+          title: title,
+          safe: false
+        }
+        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},'self',this.getTabs)
+        }
+      },
+      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 {
+    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;
+  }
+
+  .imgs {
+    width: 35px;
+    height: 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>