system-phone 1.3.11 → 3.0.1

package/src/components/LoginApp.vue

@@ -2,47 +2,40 @@
   <div class="loginbg" id="outheight">
     <!--输入框-->
     <div class="htmleaf-container">
-
-<!--      <img src="../assets/矩形2拷贝.png" style="width:auto" alt="" >-->
-<!--      图层3@2x-->
       <div class="wrapper" :class="{'form-success': login}">
-        <img src="../assets/图层3.png" style=" padding-top: 5%;float: right;margin-right: 5%" alt="" @click="golick()" >
-        <span style="padding-left: 45%;margin-top: 9%;font: 20px PingFang-SC-Medium ;display:block;">登&nbsp;录</span>
-        <img src="../assets/touxiang.png" style=" padding-top: 15%;margin-left: 35%" alt="" >
-        <div class="container" >
-          <p class="form" style="margin-top:2px">
-            <img src="../assets/图层5拷贝.png" style="height: 20px" alt="" v-if="showuid">
-            <img src="../assets/图层5.png" style="height: 20px" alt="" v-if="!showuid">
-            <input type="text" v-model="ename" class="" placeholder="请输入账号" @click="showuids()"
-            style="BORDER-TOP-STYLE: none; BORDER-RIGHT-STYLE: none; BORDER-LEFT-STYLE: none; BORDER-BOTTOM-STYLE: solid;outline:none;color: black;display:inline">
-            <br>
-            <img src="../assets/图层604.png" style="height: 20px" alt="" v-if="showpwd" >
-            <img src="../assets/图层4.png" style="height: 20px" alt=""  v-if="!showpwd">
-            <input type="text" v-model="password" class="" placeholder="请输入密码" @click="showpwds()" v-if="showeye"
-                   style="BORDER-TOP-STYLE: none; BORDER-RIGHT-STYLE: none; BORDER-LEFT-STYLE: none; BORDER-BOTTOM-STYLE: solid;outline:none;color: black;display:inline">
-            <input type="password" v-model="password" class="" placeholder="请输入密码" @click="showpwds()"v-if="!showeye"
-                   style="BORDER-TOP-STYLE: none; BORDER-RIGHT-STYLE: none; BORDER-LEFT-STYLE: none; BORDER-BOTTOM-STYLE: solid;outline:none;color: black;display:inline">
-<!--            <img src="../assets/图层10@2x.png" style="width:auto" alt="" >-->
-            <img src="../assets/图层605.png" style="position: absolute;top: 63%;right: 6%" alt="" v-if="!showeye"@click="openeyes()">
-            <img src="../assets/图层10.png" style="position: absolute;top: 63%;right: 6%" alt="" v-if="showeye"@click="beeye()">
+        <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: 15px; border-radius: 2pt;border-style:solid; border-width: 1pt" alt="" v-if="showsave"@click="showoff()">
-            <img  src="../assets/未选.png" style="width: 15px; border-radius: 2pt;border-style:solid; border-width: 1pt" alt="" v-if="!showsave" @click="showon()">
-            <span class="text-left font" style="color:#666666;">记住密码</span>
-            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-            <img src="../assets/选中.png" style="width: 15px;border-radius: 2pt;border-style:solid; border-width: 1pt" alt="" v-if="showsaves"@click="showoffs()">
-            <img  src="../assets/未选.png" style="width: 15px; border-radius: 2pt;border-style:solid; border-width: 1pt" alt="" v-if="!showsaves" @click="showons()">
-            <span class="text-left font" style="color:#666666;">自动登陆</span><br>W
-            <button  style="background-color: rgb(49,146,243);border-radius: 22px;border: #f0f0ef;width: 77%;height: 7%;margin-top: 20%" type="button" id="login-button" @click.prevent="confirm() "><strong style="font: 15px PingFang-SC-Medium ;color: white">登&nbsp录</strong></button>
-<!--            <p></p>-->
-<!--            <span class="devicetext">设备码：{{deviceIemi}}</span>-->
+            <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>
+    <modal :show.sync="modifyPassword" backdrop="false">
+      <header slot="modal-header" class="modal-header">
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <modify-pass-word  :sourse="login" :weak-password="weakPassword" v-if="modifyPassword" v-on:success="success"></modify-pass-word>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
   </div>
 </template>
 <script>
@@ -61,59 +54,53 @@
       let res = await Vue.resetget(`${url}/phone/rs/vue`,{data: {}},{resolveMsg: null, rejectMsg: null})
       that.$set('config',res.data)
       Vue.config2 = res.data
+      // 判断是否需要弱密码校验
+      if(self.config && self.config.telephone && self.config.telephone.LoginApp && "undefined" != typeof self.config.telephone.LoginApp.weakPassword){
+        self.weakPassword = self.config.telephone.LoginApp.weakPassword
+      }
       console.log("手机端获取.json文件")
       console.log(JSON.stringify(self.config))
+      return true
     } catch (error) {
       // 此处业务数据装载异常不做任何处理，理论上不会有任何异常
-      console.log(error)
+      self.$showMessage('登录系统: 获取配置文件失败，请检查网络后重新登陆！')
+      return false
     }
   }
 
   //装载业务数据
-  // let asyncLoadData = async function(self,url) {
-  //   try {
-  //     let result = HostApp.readLocalFile('workflow_apply.json')
-  //     if(!result.code || result.code == 500){
-  //       this.$showMessage('获取流程配置文件失败，请联系系统管理员')
-  //       return
-  //     }
-  //     let defnames_mobile = ''
-  //     console.log('读取文件返回数据result.data:' + JSON.stringify(result.data))
-  //     let data = JSON.parse(result.data)
-  //     for(var i=0;i<data.activitys.length;i++){
-  //       if(data.activitys[i].mobile){
-  //         defnames_mobile += `'` + data.activitys[i].title + `',`
-  //       }
-  //     }
-  //     console.log('配置文件中的defnames_mobile=>' + defnames_mobile)
-  //     if(defnames_mobile.length>1){
-  //       defnames_mobile = defnames_mobile.substring(0,defnames_mobile.length-1)
-  //     }
-  //     data.defnames_mobile = defnames_mobile
-  //     // data.put('defnames_mobile',defnames_mobile)
-  //     console.log('前台存入缓存中的data=>' + JSON.stringify(data))
-  //     Vue.workflow_vue = Vue.prototype.$workflow_vue = data
-  //   } catch (error) {
-  //     // 此处业务数据装载异常不做任何处理，理论上不会有任何异常,只有当app版本端版本较低无readlocalfile时会异常
-  //     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:{},
+        weakPassword:false,
+        modifyPassword:false,
         ename: '',
+        login:'login',
         password: '',
-        showsave:false,
-        showsaves:false,
-        showuid:false,
-        showpwd:false,
-          showeye:false,
-
-          checked: true,
-
+        showsave:true,
+        showauto:'2',  // 1 自动登陆  2取消自动登陆
+        showpass:false,
+        imageurl:require('../assets/miwen.png'),
         deviceIemi:'无法获取该设备码，请联系管理员',
         loginSafe:false,
         margintop: document.documentElement.clientHeight * 0.1
@@ -121,9 +108,11 @@
     },
 
     ready () {
-        this.getCookie();
       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,'\"')
@@ -134,6 +123,9 @@
         }
         this.deviceIemi = this.$androidUtil.getDeviceIEMI()
         console.log(`手机设备码：${this.deviceIemi}`)
+        if(this.showauto == '1' && this.password){
+          this.confirm()
+        }
       }
 
       // if(Vue.android) {
@@ -141,74 +133,28 @@
       //     this.$set('version', version)
       //   }
     },
-
-
       methods: {
-          //设置cookie
-          setCookie(c_name, c_pwd, exdays) {
-              var exdate = new Date(); //获取时间
-              exdate.setTime(exdate.getTime() + 24 * 60 * 60 * 1000 * exdays); //保存的天数
-              //字符串拼接cookie
-              window.document.cookie =
-                  "userName" + "=" + c_name + ";path=/;expires=" + exdate.toGMTString();
-              window.document.cookie =
-                  "userPwd" + "=" + c_pwd + ";path=/;expires=" + exdate.toGMTString();
-              console.log(exdate.getTime()+'我是哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈')
-          },
-          getCookie: function() {
-              if (document.cookie.length > 0) {
-                  var arr = document.cookie.split("; "); //这里显示的格式需要切割一下自己可输出看下
-                  for (var i = 0; i < arr.length; i++) {
-                      var arr2 = arr[i].split("="); //再次切割
-                      //判断查找相对应的值
-                      if (arr2[0] == "userName") {
-                          this.userInfo.user = arr2[1]; //保存到保存数据的地方
-                      } else if (arr2[0] == "userPwd") {
-                          this.userInfo.pass = arr2[1];
-                      }
+        success(val){
+          // 修改密码成功
+          this.modifyPassword = false
+          this.password = val
+        },
+      // 对资源菜单进行排序
+      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;
                   }
               }
-          },
-          //清除cookie
-          clearCookie: function() {
-              this.setCookie("", "", -1); //修改2值都为空，天数为负1天就好了
-          },
-
-
-
-
-
-
-          //系统设置
-          golick(){
-              this.$goto('system-setup')
-          },
-
-        //密码图片点击/未点击
-        showpwds(){
-            this.showpwd=true
-            this.showuid=false
-            console.log('wocao')
-        },
-          //眼睛图片点击/未点击
-          openeyes(){
-            this.showeye=true
-
-          },
-          beeye(){
-            this.showeye=false
-
-          },
-
-        //账号图标点击/未点击
-        showuids(){
-            this.showuid=true
-            this.showpwd=false
-            console.log('wocao')
-        },
-        unshowuids(){
-            this.showuids=false
-        },
+            }
+            return val
+          }
+          return val
+      },
       // 记住密码选中/未选中
       showoff(){
         this.showsave = false
@@ -216,33 +162,24 @@
       showon(){
         this.showsave = true
       },
-          showoffs(){
-              this.showsaves = false
-          },
-          showons(){
-              this.showsaves = true
-          },
-      async confirm() {
-        //测试用
-        this.$goto('nav-bottom')
-        return
-
-          if (this.showsave == true) {
-              // console.log("checked == true");
-              //传入账号名，密码，和保存天数3个参数
-             this.setCookie(this.ename, this.password, 7);
-              console.log("按时的技术开发好看的时间发贺卡收到回复")
-          } else {
-              // console.log("清空Cookie");
-              //清空Cookie
-              this.clearCookie();
-          }
-
-
-
-
+      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")
+        }
 
-          console.log('Vue.android：' + Vue.android)
+      },
+      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() + "/"
@@ -252,15 +189,39 @@
         data = encrypt.encrypt(JSON.stringify(data))
         console.log(data)
         try {
-          let ret = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/user/userLogin/手机服务`, data, {
-            resolveMsg: null,
-            rejectMsg: '资源服务数据获取异常'
-          })
-          console.log('获取登陆信息：' + JSON.stringify(ret.data) )
-          console.log('当前登录维修员：' + ret.data.name)
+          let ret={}
+          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) {
+            if (Vue.android){
+              this.loaderShow=false
+              this.$showMessage("登陆失败,请检查账号密码是否有误,如多次失败请联系管理员核对账号密码！")
+            }
+            return
+          }
           // 设置登录人
           Vue.user = Util.f = ret.data
-          console.log('Util.f：' +JSON.stringify(Util.f) )
+          if (ret.data.state != '在职') {
+            this.loaderShow=false
+            return this.$showMessage("登陆失败,该账号已被注销！")
+          }
+          // 对资源菜单进行排序
+          let viewDetails = await Vue.resetpost(`${this.$androidUtil.getProxyUrl()}/rs/search`, {
+            source: 'this.getRights().where(row.getType()==$function$ && row.getPath($name$).indexOf($功能权限$) != -1)',
+            userid: Vue.user.id
+          }, {resolveMsg: null, rejectMsg: null})
+          let r = viewDetails.data
+          Vue.user.r = []
+          r.forEach(x => Vue.user.r.push(x.name))
+
+
+          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')}`)
@@ -279,25 +240,40 @@
             }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)
-            this.$androidUtil.setPreference('f_subcompany', Util.f.f_fengongsi)
+            this.$androidUtil.setPreference('f_role_name', Util.f.f_role_name || '')
+            console.log("自动登陆标识"+Util.f.f_role_name)
+            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())
+          var flag =   await asyncReady(this,this.$androidUtil.getProxyUrl())
+          if(!flag){
+            this.loaderShow=false
+            console.log('获取参数异常')
+            return
+          }
           console.log('获取参数结束')
-
           // console.log('登陆验证成功时装载业务数据')
           // asyncLoadData()
           // console.log('装载业务数据结束')
-
+          this.loaderShow=false
+          // 弱口令验证
+          if (this.weakPassword && !(/^(?:(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(this.password))) {
+              await this.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm'])
+              this.modifyPassword = true
+              return
+          }
           this.$goto('nav-bottom')
         }catch (e) {
           if (Vue.android)
-            HostApp.alert('登录失败！')
+            this.loaderShow=false
+            this.$showMessage("登陆失败！")
         }
       },
       // readConfig (url) {
@@ -332,10 +308,6 @@
     font-family: 'Source Sans Pro', sans-serif;
     color: white;
     font-weight: 300;
-    background-image: url("../assets/矩形2拷贝.png") ;
-    background-position:top;
-
-    background-repeat: no-repeat;
   }
   .loginbg ::-webkit-input-placeholder {
     /* WebKit browsers */
@@ -413,8 +385,10 @@
     -moz-appearance: none;
     appearance: none;
     outline: 0;
-    border: 1px solid #666666;
+    border: 1px solid #50ABE6;
+    background-color: #50ABE6;
     width: 250px;
+    border-radius: 3px;
     padding: 10px 15px;
     margin: 0 auto 10px auto;
     display: block;
@@ -424,16 +398,15 @@
     -webkit-transition-duration: 0.25s;
     transition-duration: 0.25s;
     font-weight: 300;
-    background-color: white;
   }
   .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;
@@ -441,21 +414,13 @@
     background-position-x: 8px;
     background-position-y: 8px;
   }
-  .psicond {
-    background-image: url(../assets/psicon.png); /*,url(../assets/图层10@2x.png)*/
+  .psicon {
+    background-image: url(../assets/psicon.png);
     background-repeat: no-repeat;
     background-size: 30px;
     background-position-x: 8px;
     background-position-y: 8px;
-    background-color: white;
-    color: white;
-    BORDER-TOP-STYLE: none;
-    BORDER-RIGHT-STYLE: none;
-    BORDER-LEFT-STYLE: none;
-    BORDER-BOTTOM-STYLE: solid
   }
-
-
   .form button {
     -webkit-appearance: none;
     -moz-appearance: none;
@@ -638,17 +603,23 @@
       -webkit-transform: translateY(-700px) rotate(600deg);
       transform: translateY(-700px) rotate(600deg);
     }
-    body {
-      display: block;
-      margin: 0;
-    }
-
-    input {
-      background: none;
-      outline: none;
-      border: 0px;
-    }
-    input,img{vertical-align:middle;}
-    }
-
+  }
+  .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>