system-phone 1.2.82-cr → 1.2.85

package/build/dev-server.js

@@ -14,9 +14,9 @@ var proxyTable = {
   // '/rs/weixin': {
   //   target: 'http://121.36.106.17:8400/'
   // },
-  // '/phone/rs/vue': {
-  //   target: 'http://121.36.106.17:8400/'
-  // },
+  '/phone/rs/vue': {
+    target: 'http://121.36.106.17:8400/'
+  },
   // '/materials': {
   //   target: 'http://121.36.106.17:8400/'
   //   // target: 'http://192.168.2.77:8081'
@@ -45,7 +45,7 @@ var proxyTable = {
   // 呼叫系统主数据服务
   '/rs': {
     // target: 'http://127.0.0.1:8082'
-    target: 'http://192.168.50.4:8400'
+    target: 'http://121.36.106.17:8400'
   },
   // 文字客服
   // '/Dual': {

package/package.json

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

package/src/App.vue

@@ -1,25 +1,26 @@
-<template>
-  <!-- <app-base> -->
-  <div id="android-app">
-    <article>
-      <route :comp="{name: 'phone-user'}"></route>
-    </article>
-    <time-out></time-out>
-    <message-box>
-    </message-box>
-  </div>
-  <!-- </app-base> -->
-</template>
-
-<script>
-  export default {
-    ready () {
-      if (!window.onerror) {
-        window.onerror = function (message, file, line, col, error) {
-          // HostApp.alert("网络故障，加载组件有误")
-          return false
-        }
-      }
-    }
-  }
-</script>
+<template>
+  <!-- <app-base> -->
+  <div id="android-app">
+    <article>
+      <!--<route :comp="{name: 'login-app'}"></route>-->
+      <route :comp="{name: 'iot-monitoring-main'}"></route>
+    </article>
+    <time-out></time-out>
+    <message-box>
+    </message-box>
+  </div>
+  <!-- </app-base> -->
+</template>
+
+<script>
+  export default {
+    ready () {
+      if (!window.onerror) {
+        window.onerror = function (message, file, line, col, error) {
+          // HostApp.alert("网络故障，加载组件有误")
+          return false
+        }
+      }
+    }
+  }
+</script>

package/src/components/LoginApp.vue

@@ -27,6 +27,15 @@
     <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>
@@ -45,11 +54,17 @@
       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
     }
   }
 
@@ -77,7 +92,10 @@
       return {
         loaderShow:false,
         config:{},
+        weakPassword:false,
+        modifyPassword:false,
         ename: '',
+        login:'login',
         password: '',
         showsave:true,
         showauto:'2',  // 1 自动登陆  2取消自动登陆
@@ -116,6 +134,11 @@
       //   }
     },
       methods: {
+        success(val){
+          // 修改密码成功
+          this.modifyPassword = false
+          this.password = val
+        },
       // 对资源菜单进行排序
       sortFunctions(val){
           if(val && val.length > 0){
@@ -166,12 +189,21 @@
         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
           // 对资源菜单进行排序
@@ -199,25 +231,36 @@
             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("自动登陆标识")
+            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)
             this.loaderShow=false
-            HostApp.alert('登录失败！')
+            this.$showMessage("登陆失败！")
         }
       },
       // readConfig (url) {