system-phone 1.4.0 → 3.0.2-tc

package/src/components/LoginAppNew.vue

@@ -0,0 +1,587 @@
+<template>
+  <div class="loginbg" id="outheight">
+    <!--输入框-->
+    <div class="htmleaf-container">
+      <div class="wrapper" :class="{'form-success': login}">
+        <div class="container">
+          <h3 style="color:white; margin-top: 15px">欢迎使用</h3>
+          <p class="form" style="margin-top:{{margintop}}px">
+            <input type="text" v-model="ename" class="usericon">
+            <input :type="showpass==true?'text':'password'" v-model="password" class="psicon"><img :src="imageurl" style="width: 20px;margin-bottom: 5px;position: absolute;left: 62%;bottom: 43%;" alt="" @click="changepass()">
+            <button type="button" id="login-button" @click.prevent="confirm()"><strong>登录</strong></button>
+          </p>
+          <div class="row">
+            <img src="../assets/选中.png" style="width: 20px;margin-bottom: 5px" alt="" v-if="showsave"@click="showoff()">
+            <img src="../assets/未选.png" style="width: 20px;margin-bottom: 5px" alt="" v-if="!showsave" @click="showon()">
+            <span class="text-left font">记住密码</span>
+            <img src="../assets/选中.png" style="width: 20px;margin-bottom: 5px" alt="" v-if="showauto == '1'"@click="showoff1()">
+            <img src="../assets/未选.png" style="width: 20px;margin-bottom: 5px" alt="" v-if="showauto == '2'" @click="showon1()">
+            <span class="text-left font">自动登录</span>
+            <p></p>
+            <span class="devicetext">设备码：{{deviceIemi}}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!--<load-appdata @ready="onReady"></load-appdata>-->
+    <div style="width: 100%;height: 100%;position: fixed;top: 0px;" v-show="loaderShow">
+      <div id="loading" class="loading">登陆中...</div>
+    </div>
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+  import * as Util from '../Util'
+  import JSEncrypt from 'jsencrypt'
+  import $ from 'jquery'
+  import co from 'co'
+  //获取json配置文件
+  let asyncReady = async function(self,url) {
+    // 获取配置信息
+    try {
+      // console.log(`获取参数信息++++${Vue.user.f_orgids}+++++${Vue.androidUtil.getProxyUrl()}`)
+      await self.$appdata.load()
+      let that = self
+      let res = await Vue.resetget(`${url}/phone/rs/vue`,{data: {}},{resolveMsg: null, rejectMsg: null})
+      that.$set('config',res.data)
+      Vue.config2 = res.data
+      console.log("手机端获取.json文件")
+      console.log(JSON.stringify(self.config))
+    } catch (error) {
+      // 此处业务数据装载异常不做任何处理，理论上不会有任何异常
+      console.log(error)
+    }
+  }
+
+  //装载业务数据
+  let asyncLoadData = async function(self,url) {
+    try {
+      // 读取报建本地配置文件
+      var result = HostApp.readLocalFile('workflow_apply.json')
+      if(result.code == 500){
+        console.log('不存在流程配置文件，即不使用报建app')
+        return
+      }
+      var data = JSON.parse(result.data)
+      console.log('读取报建配置文件成功,存入缓存中的data=>' + JSON.stringify(data))
+      Vue.workflow_vue = Vue.prototype.$workflow_vue = data
+    } catch (error) {
+      // 此处业务数据装载异常不做任何处理，理论上不会有任何异常,只有当app版本端版本较低无readlocalfile时会异常
+      console.log(error)
+    }
+  }
+
+  export default {
+    title: '登录系统',
+    data() {
+      return {
+        loaderShow:false,
+        config:{},
+        ename: '',
+        password: '',
+        showsave:true,
+        continueLogin:true,
+        showauto:'2',  // 1 自动登陆  2取消自动登陆
+        showpass:false,
+        imageurl:require('../assets/miwen.png'),
+        deviceIemi:'无法获取该设备码，请联系管理员',
+        loginSafe:false,
+        margintop: document.documentElement.clientHeight * 0.1
+      }
+    },
+
+    ready () {
+      if(Vue.android) {
+        let userPp1 = this.$androidUtil.getPreference('login_user_cache')
+        this.showauto = this.$androidUtil.getPreference('auto_login')
+        this.showauto = this.showauto ? this.showauto : '2'
+        console.log(`自动登陆标识ready：${this.showauto}`)
+        if(userPp1){
+          console.log(`1返回值是：${userPp1}`)
+          userPp1 =  userPp1.replace(/\'/g,'\"')
+          console.log(`2返回值是：${userPp1}`)
+          let userZs = JSON.parse(userPp1)
+          this.password = userZs.password
+          this.ename = userZs.username
+        }
+        this.deviceIemi = this.$androidUtil.getDeviceIEMI()
+        console.log(`手机设备码：${this.deviceIemi}`)
+        if(this.showauto == '1' && this.password){
+          this.confirm()
+        }
+      }
+
+      // if(Vue.android) {
+      //     let version = HostApp.getAppVersion().data
+      //     this.$set('version', version)
+      //   }
+    },
+      methods: {
+      // 对资源菜单进行排序
+      sortFunctions(val){
+          if(val && val.length > 0){
+            for(var i = 0;i<val.length-1;i++){
+              for(var j = 0;j<val.length-1-i;j++){
+                  if(val[j].position > val[j+1].position){
+                    var temp = val[j+1]
+                    val[j+1] = val[j]
+                    val[j] = temp;
+                  }
+              }
+            }
+            return val
+          }
+          return val
+      },
+      // 记住密码选中/未选中
+      showoff(){
+        this.showsave = false
+      },
+      showon(){
+        this.showsave = true
+      },
+      showoff1(){
+        this.showauto = '2'
+      },
+      showon1(){
+        this.showauto = '1'
+      },
+      changepass(){
+        this.showpass=this.showpass?false:true
+        if(this.showpass){
+          this.imageurl=require("../assets/mingwen.png")
+        }else{
+          this.imageurl=require("../assets/miwen.png")
+        }
+
+      },
+      async confirm() {
+        this.loaderShow=true
+        console.log('Vue.android：' + Vue.android)
+        let data = {username: this.ename, password: this.password}
+        console.log('获取登陆信息：' + data)
+        Vue.dataUrl = this.$androidUtil.getProxyUrl() + "/"
+        // rsa加密
+        let encrypt = new JSEncrypt();
+        encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB');
+        data = encrypt.encrypt(JSON.stringify(data))
+        console.log(data)
+        //try {
+        let ret={}
+        //try {
+        try{
+          ret = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/user/userLogin/手机服务`, data, {
+            resolveMsg: null,
+            rejectMsg: null
+          })
+          console.log('获取登陆信息：' + JSON.stringify(ret.data) )
+          console.log('当前登录维修员：' + ret.data.name)
+        }catch (e) {
+          this.$showMessage("登陆失败,请检查账号密码后重新登录!")
+          this.loaderShow=false
+          return
+        }
+        console.log('获取参数system以及安检参数')
+        await asyncReady(this,this.$androidUtil.getProxyUrl())
+        console.log("this.continueLogin"+this.continueLogin)
+        if(!this.continueLogin){
+          this.$showMessage("获取配置文件失败,请检查网络状况后重新登录!(如网络状况正常，请联系管理员处理)")
+          this.loaderShow=false
+          return
+        }
+        console.log('获取参数结束')
+          // 设置登录人
+          Vue.user = Util.f = ret.data
+          // 对资源菜单进行排序
+          Vue.functions = this.sortFunctions(ret.data.functions)
+          console.log('登陆人信息',JSON.stringify(Vue.user))
+          let userStr
+          if (Vue.android){
+            console.log(`Device_IEMI:${this.$androidUtil.getPreference('Device_IEMI')}`)
+            // 判断是否需要验证 设备码
+            if(this.$androidUtil.getPreference('Device_IEMI')){
+              console.log(`手机设备码：${this.deviceIemi}`)
+              let result = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`,{data: {items: '*', tablename: 't_equipment', orderitem: 'id desc', condition:`f_terminal_number = '${this.deviceIemi}' and f_state = '正常'`}},{resolveMsg: null, rejectMsg: null})
+              console.log(`检测设备码存在是否：${result.data.length}`)
+              if(result.data.length == 0){
+                HostApp.alert('设备码未绑定，请联系管理员！')
+                return
+              }
+            }
+            if(this.showsave){
+              userStr = `{'username':'${this.ename}','password':'${this.password}'}`
+            }else{
+              userStr = `{'username':'${this.ename}','password':''}`
+            }
+            console.log(this.showauto)
+            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)
+            console.log("自动登陆标识")
+            console.log(this.showauto)
+            this.$androidUtil.setPreference('auto_login',this.showauto)
+          }
+          Vue.$login = {jwt: ret.data.id}
+          // 获取参数
+          /*console.log('获取参数system以及安检参数')
+          asyncReady(this,this.$androidUtil.getProxyUrl())
+          console.log('获取参数结束')*/
+
+          // console.log('登陆验证成功时装载业务数据')
+          // asyncLoadData()
+          // console.log('装载业务数据结束')
+          this.loaderShow=false
+          this.$goto('nav-bottom')
+        /*}catch (e) {
+          if (Vue.android)
+            this.loaderShow=false
+            HostApp.alert('登录失败！')
+        }*/
+      },
+      // readConfig (url) {
+      //   let gen =
+      //   return co(gen)
+      // },
+    },
+    watch:{
+      'config'(val){
+        Vue.config = val
+      }
+    }
+  }
+</script>
+<style scoped="">
+  .devicetext {
+    font: 13px PingFang-SC-Medium;
+    position:fixed;
+    width:100%;
+    bottom:13px;
+    transform: translate(-50%, -50%);
+  }
+  /*输入框样式*/
+  /*@import url(http://fonts.useso.com/css?family=Source+Sans+Pro:200,300);*/
+  * {
+    box-sizing: border-box;
+    margin: 0;
+    padding: 0;
+    font-weight: 300;
+  }
+  .loginbg {
+    font-family: 'Source Sans Pro', sans-serif;
+    color: white;
+    font-weight: 300;
+  }
+  .loginbg ::-webkit-input-placeholder {
+    /* WebKit browsers */
+    font-family: 'Source Sans Pro', sans-serif;
+    color: white;
+    font-weight: 300;
+  }
+  .loginbg  :-moz-placeholder {
+    /* Mozilla Firefox 4 to 18 */
+    font-family: 'Source Sans Pro', sans-serif;
+    color: white;
+    opacity: 1;
+    font-weight: 300;
+  }
+  .loginbg  ::-moz-placeholder {
+    /* Mozilla Firefox 19+ */
+    font-family: 'Source Sans Pro', sans-serif;
+    color: white;
+    opacity: 1;
+    font-weight: 300;
+  }
+  .loginbg  :-ms-input-placeholder {
+    /* Internet Explorer 10+ */
+    font-family: 'Source Sans Pro', sans-serif;
+    color: white;
+    font-weight: 300;
+  }
+  .wrapper {
+    /*background: #2D83BA;
+    background: -webkit-linear-gradient(top left, #2D83BA 0%, #2D83BA 100%);
+    background: linear-gradient(to bottom right, #2D83BA 0%, #2D83BA 100%);
+    opacity: 0.8;*/
+    /*position: absolute;*/
+    /*top: 50%;
+    right: 10%;
+    width: 40%;
+    height: 350px;
+    margin-top: -150px;*/
+    overflow: hidden;
+  }
+
+  .wrapper.form-success .container h3{
+    -webkit-transform: translateY(85px);
+    -ms-transform: translateY(85px);
+    transform: translateY(85px);
+  }
+  .container {
+    /*max-width: 350px;*/
+    margin: 0 auto;
+    /*padding: 30px 100px 50px 100px;
+    height: 350px;*/
+    text-align: center;
+    /*以下增加*/
+    /*background: #2D83BA;
+    background: -webkit-linear-gradient(top left, #2D83BA 0%, #2D83BA 100%);
+    background: linear-gradient(to bottom right, #2D83BA 0%, #2D83BA 100%);*/
+    opacity: 0.8;
+  }
+  .container h3{
+    font-size: 40px;
+    -webkit-transition-duration: 1s;
+    transition-duration: 1s;
+    -webkit-transition-timing-function: ease-in-put;
+    transition-timing-function: ease-in-put;
+    font-weight: 200;
+  }
+  .form {
+    padding: 20px 0;
+    /*margin-top: 15%;*/
+    position: relative;
+    z-index: 2;
+  }
+  .form input {
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    appearance: none;
+    outline: 0;
+    border: 1px solid #50ABE6;
+    background-color: #50ABE6;
+    width: 250px;
+    border-radius: 3px;
+    padding: 10px 15px;
+    margin: 0 auto 10px auto;
+    display: block;
+    text-align: center;
+    font-size: 18px;
+    color: white;
+    -webkit-transition-duration: 0.25s;
+    transition-duration: 0.25s;
+    font-weight: 300;
+  }
+  .form input:hover {
+    background-color: rgba(255, 255, 255, 0.4);
+  }
+  .form input:focus {
+    background-color: white;
+    width: 300px;
+    color: #53e3a6;
+  }
+  .usericon {
+    background-image: url(../assets/usericon.png);
+    background-repeat: no-repeat;
+    background-size: 30px;
+    background-position-x: 8px;
+    background-position-y: 8px;
+  }
+  .psicon {
+    background-image: url(../assets/psicon.png);
+    background-repeat: no-repeat;
+    background-size: 30px;
+    background-position-x: 8px;
+    background-position-y: 8px;
+  }
+  .form button {
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    appearance: none;
+    outline: 0;
+    background-color: white;
+    border: 0;
+    padding: 10px 15px;
+    color: #253830;
+    border-radius: 3px;
+    width: 250px;
+    cursor: pointer;
+    font-size: 18px;
+    -webkit-transition-duration: 0.25s;
+    transition-duration: 0.25s;
+  }
+  .form button:hover {
+    background-color: #f5f7f9;
+  }
+
+  /*注册字体样式*/
+  .form span {
+    color: #fff;
+    display: table-footer-group;
+    position: absolute;
+    right: 10px;
+    margin-top: 10px;
+    cursor: pointer;
+  }
+  .logotitle {
+    color: #fff;
+    position: absolute;
+    top: 50px;
+    left: 50px;
+    font-size: 50px;
+  }
+  /*注册模态框界面样式*/
+  .modifystyle {
+    background: #FCFEEE;
+  }
+  .modifystyle div{
+    height: auto;
+    margin-bottom: 15px;
+    /*text-align: center;*/
+    /*margin-left: 20%;*/
+  }
+  /*bootstrap字体图标要手动调整，所以使用字体图标的span必须紧跟在input后面，负责会错位*/
+  .modifystyle div input + span{
+    top: 0!important;
+    right: 32%;
+  }
+  .modifystyle span{
+    color: red;
+  }
+
+  /* 通告区内容 */
+  .notice-board {
+    height: auto;
+    position: absolute;
+    top: 50%;
+    margin-top: -150px;
+    margin-left: 100px;
+    color: #fff;
+  }
+  /*修改密码底部按钮部分样式*/
+  .footerbtn {
+    text-align: center;
+    padding: 15px;
+  }
+  .footerbtn button {
+    width: 100px;
+    margin-left: 20px;
+  }
+  .bg-bubbles {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 1;
+  }
+  .bg-bubbles li {
+    position: absolute;
+    list-style: none;
+    display: block;
+    width: 40px;
+    height: 40px;
+    background-color: rgba(255, 255, 255, 0.15);
+    bottom: -160px;
+    -webkit-animation: square 25s infinite;
+    animation: square 25s infinite;
+    -webkit-transition-timing-function: linear;
+    transition-timing-function: linear;
+  }
+  .bg-bubbles li:nth-child(1) {
+    left: 10%;
+  }
+  .bg-bubbles li:nth-child(2) {
+    left: 20%;
+    width: 80px;
+    height: 80px;
+    -webkit-animation-delay: 2s;
+    animation-delay: 2s;
+    -webkit-animation-duration: 17s;
+    animation-duration: 17s;
+  }
+  .bg-bubbles li:nth-child(3) {
+    left: 25%;
+    -webkit-animation-delay: 4s;
+    animation-delay: 4s;
+  }
+  .bg-bubbles li:nth-child(4) {
+    left: 40%;
+    width: 60px;
+    height: 60px;
+    -webkit-animation-duration: 22s;
+    animation-duration: 22s;
+    background-color: rgba(255, 255, 255, 0.25);
+  }
+  .bg-bubbles li:nth-child(5) {
+    left: 70%;
+  }
+  .bg-bubbles li:nth-child(6) {
+    left: 80%;
+    width: 120px;
+    height: 120px;
+    -webkit-animation-delay: 3s;
+    animation-delay: 3s;
+    background-color: rgba(255, 255, 255, 0.2);
+  }
+  .bg-bubbles li:nth-child(7) {
+    left: 32%;
+    width: 160px;
+    height: 160px;
+    -webkit-animation-delay: 7s;
+    animation-delay: 7s;
+  }
+  .bg-bubbles li:nth-child(8) {
+    left: 55%;
+    width: 20px;
+    height: 20px;
+    -webkit-animation-delay: 15s;
+    animation-delay: 15s;
+    -webkit-animation-duration: 40s;
+    animation-duration: 40s;
+  }
+  .bg-bubbles li:nth-child(9) {
+    left: 25%;
+    width: 10px;
+    height: 10px;
+    -webkit-animation-delay: 2s;
+    animation-delay: 2s;
+    -webkit-animation-duration: 40s;
+    animation-duration: 40s;
+    background-color: rgba(255, 255, 255, 0.3);
+  }
+  .bg-bubbles li:nth-child(10) {
+    left: 90%;
+    width: 160px;
+    height: 160px;
+    -webkit-animation-delay: 11s;
+    animation-delay: 11s;
+  }
+  @-webkit-keyframes square {
+    0% {
+      -webkit-transform: translateY(0);
+      transform: translateY(0);
+    }
+    100% {
+      -webkit-transform: translateY(-700px) rotate(600deg);
+      transform: translateY(-700px) rotate(600deg);
+    }
+  }
+  @keyframes square {
+    0% {
+      -webkit-transform: translateY(0);
+      transform: translateY(0);
+    }
+    100% {
+      -webkit-transform: translateY(-700px) rotate(600deg);
+      transform: translateY(-700px) rotate(600deg);
+    }
+  }
+  .loading {
+    width: 36%;
+    height: 7%;
+    position: absolute;
+    top: 30%;
+    left: 32%;
+    line-height: 56px;
+    color: #fff;
+    padding-left: 60px;
+    font-size: 15px;
+    background: #000 url(../assets/loging.gif) no-repeat 10px 50%;
+    opacity: 0.7;
+    z-index: 9999;
+    -moz-border-radius: 20px;
+    -webkit-border-radius: 20px;
+    border-radius: 20px;
+    filter: progid:DXImageTransform.Microsoft.Alpha(opacity=70);
+  }
+</style>

package/src/components/ModifyPassWord.vue

@@ -1,14 +1,14 @@
 <template>
-  <div class="app-botton" @click="back()">
-    <span class="glyphicon glyphicon-menu-left">返回</span>
-  </div>
+  <!--<div class="app-botton" @click="back()">-->
+    <!--<span class="glyphicon glyphicon-menu-left">返回</span>-->
+  <!--</div>-->
   <div class="auto">
     <div class="row app-row">
       <div class="col-xs-4">
         <img src="../assets/姓名.png" style="width: 20px;margin-bottom: 5px" alt="">
         <span class="text-left font">账号</span>
       </div>
-      <div class="col-xs-8 input-font" >
+      <div class="col-xs-8 input-font">
         <input type="text" class="search_input input-font" v-model="model.ename"  readonly/>
       </div>
     </div>
@@ -27,7 +27,7 @@
         <span class="text-left font">新密码</span>
       </div>
       <div class="col-xs-8">
-        <input type="password" id="newpassword1" class="search_input input-font" v-model="model.password" placeholder="请输入新密码"/>
+        <input type="password" id="newpassword1" class="search_input input-font" v-model="model.password" :placeholder="weakPassword?'需要包含大小写字母符号数字':'请输入新密码'"/>
       </div>
     </div>
     <div class="row app-row">
@@ -68,6 +68,10 @@
       console.log(res.data)
       if(res.data){
         that.$showMessage('修改密码成功！')
+        if(that.sourse == 'login'){
+          that.$emit('success',that.model.password)
+          return
+        }
         that.$back()
       }else {
         that.$showMessage('修改密码失败，请重新输入！')
@@ -98,6 +102,10 @@
         showpass:false
       }
     },
+    props: {
+      sourse:'',
+      weakPassword:false
+    },
     ready () {
 
     },
@@ -132,6 +140,10 @@
           this.$showMessage('两次输入密码不一致！')
           return
         }
+        if(this.weakPassword && this.model.password && !(/^(?:(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(this.model.password))){
+          this.$showMessage('新密码必须包含大小写字母、数字、符号！')
+          return
+        }
         // 检验原始密码是否符合 并修改密码
         asyncCheck(this, this.$androidUtil.getProxyUrl())
         }

package/src/components/NavBottom.vue

@@ -27,7 +27,6 @@
       <check-page v-if="componentName === 'check-page'"></check-page>
       <readmeter-home v-if="componentName === 'readmeter-home'"></readmeter-home>
       <repair-send v-if="componentName === 'repair-send'"></repair-send>
-      <regulator-page v-if="componentName === 'regulator-page'"></regulator-page>
     </div>
   </div>
 </template>

package/src/components/NavBottomV.vue

@@ -2,6 +2,7 @@
   <div class="nav-bgcolor">
     <div class="auto">
       <tools-page :need-back="!isMenu" :title="titleName" @back="back()" > </tools-page>
+
       <div class="row nav-bgcolor"  v-show="isMenu" >
         <div class="col-sm-6 col-xs-6 manbiankuang" v-for="tab in tabs" @click="gotopage(tab.link,tab.name)">
           <img class="butt" :src="imgback(tab.name)">
@@ -42,7 +43,7 @@
       }
     },
     ready () {
-      this.$refs.route.init('repair-first')
+      // this.$refs.route.init('repair-first')
     },
     methods: {
       imgback(val){