system-clients 3.2.5 → 3.2.6

package/src/filiale/yuchuan/system.js

@@ -0,0 +1,10 @@
+// 分公司特殊组件页面注册
+
+exports.specialComp =  {
+  'login': (resolve) => {
+    require(['./Login'], resolve)
+  },
+  'home-page': (resolve) => {
+    require(['./Main'], resolve)
+  }
+}

package/src/plugins/EncryptUtil.js

@@ -0,0 +1,53 @@
+import AesEncryptJS from "crypto-js"
+import RsaEncryptJS from 'jsencrypt'
+
+export default {
+  /**
+   * AES加密
+   * @param word
+   * @returns {*}
+   */
+  AESEncrypt(word, encryKey){
+    var key = AesEncryptJS.enc.Utf8.parse(encryKey);
+    var srcs = AesEncryptJS.enc.Utf8.parse(word);
+    var encrypted = AesEncryptJS.AES.encrypt(srcs, key, {mode:AesEncryptJS.mode.ECB,padding: AesEncryptJS.pad.Pkcs7});
+    return encrypted.toString();
+  },
+  /**
+   * AES解密
+   * @param word
+   * @returns {*}
+   */
+  AESDecrypt(word, encryKey){
+    var key = AesEncryptJS.enc.Utf8.parse(encryKey);
+    var decrypt = AesEncryptJS.AES.decrypt(word, key, {mode:AesEncryptJS.mode.ECB,padding: AesEncryptJS.pad.Pkcs7});
+    var ret = AesEncryptJS.enc.Utf8.stringify(decrypt).toString();
+    try{
+      return JSON.parse(ret) ;
+    }catch (e){
+      return ret
+    }
+  },
+  /**
+   * RSA加密
+   * @param word
+   * @returns {*}
+   */
+  RSAEncrypt(word){
+    let encrypt = new RsaEncryptJS();
+    encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB');
+    let resdata = encrypt.encrypt(word);
+    return resdata.toString();
+  },
+  /**
+   * RSA解密
+   * @param word
+   * @returns {*}
+   */
+  RSADecrypt(word){
+    let encrypt = new RsaEncryptJS();
+    encrypt.setPrivateKey('MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAKo++i9J9dzAFtbxwowKDCo2mxi7MXxE8A8VvssaydWjjgmEz/HHMPLOhi1182a1si4pWL0/MizKnquD7T2Bu4jpQbAFnkNYEMEyq/kw904Xl0JCQHYFuvnI99RE8Q3KlTP6kEUGDjV34EL6vBGJcQvArLtj1xoP8y0nIfJ2Pw5TAgMBAAECgYAGGB8IllMwxceLhjf6n1l0IWRH7FuHIUieoZ6k0p6rASHSgWiYNRMxfecbtX8zDAoG0QAWNi7rn40ygpR5gS1fWDAKhmnhKgQIT6wW0VmD4hraaeyP78iy8BLhlvblri2nCPIhDH5+l96v7D47ZZi3ZSOzcj89s1eS/k7/N4peEQJBAPEtGGJY+lBoCxQMhGyzuzDmgcS1Un1ZE2pt+XNCVl2b+T8fxWJH3tRRR8wOY5uvtPiK1HM/IjT0T5qwQeH8Yk0CQQC0tcv3d/bDb7bOe9QzUFDQkUSpTdPWAgMX2OVPxjdq3Sls9oA5+fGNYEy0OgyqTjde0b4iRzlD1O0OhLqPSUMfAkEAh5FIvqezdRU2/PsYSR4yoAdCdLdT+h/jGRVefhqQ/6eYUJJkWp15tTFHQX3pIe9/s6IeT/XyHYAjaxmevxAmlQJBAKSdhvQjf9KAjZKDEsa7vyJ/coCXuQUWSCMNHbcR5aGfXgE4e45UtUoIE1eKGcd6AM6LWhx3rR6xdFDpb9je8BkCQB0SpevGfOQkMk5i8xkEt9eeYP0fi8nv6eOUcK96EXbzs4jV2SAoQJ9oJegPtPROHbhIvVUmNQTbuP10Yjg59+8=');
+    let resdata = encrypt.decrypt(word);
+    return JSON.parse(resdata.toString()) ;
+  },
+}

package/src/plugins/GetLoginInfoService.js

@@ -1,19 +1,14 @@
 import Vue from 'vue'
-import JSEncrypt from 'jsencrypt'
 import {HttpResetClass} from 'vue-client'
-
-let loginGen = async function (name, password) {
+import cryptJS from './EncryptUtil'
+let loginGen = async function (name, password, cue) {
   let data = {name: name, password: password}
-  // rsa加密
-  let encrypt = new JSEncrypt();
-  encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB');
-  console.log(data)
-
-  let getLogin = await Vue.resetpost('/rs/logic/getLogin', data, {resolveMsg: null, rejectMsg: null}, 'RSA')
+  data = '$'+cryptJS.RSAEncrypt(JSON.stringify(data))
+  let getLogin = await Vue.resetpost('/rs/logic/getLogin', data, {resolveMsg: null, rejectMsg: null})
   if (getLogin.data.states === '登录成功') {
     // 调用远程登录服务，获取所有有权访问的功能
     data = {username: name, password: password}
-    data = encrypt.encrypt(JSON.stringify(data))
+    data = cryptJS.RSAEncrypt(JSON.stringify(data))
     let resource = await Vue.resetpost(`/rs/user/userLogin/客服系统`, data, {
       resolveMsg: null,
       rejectMsg: null
@@ -98,20 +93,20 @@ let loginGen = async function (name, password) {
         console.log('安装人模块',error)
       }
       // 获取换表员
-      try {
-        let getChangeMeterman = await Vue.resetpost('/rs/search', {
-          source: 'this.getParentByType($organization$).getChildByName($换表员$).getUsers()',
-          userid: Vue.$login.f.id
-        }, {resolveMsg: null, rejectMsg: null})
-        let changemeterman = []
-        for (let i = 0; i < getChangeMeterman.data.length; i++) {
-          changemeterman.push(getChangeMeterman.data[i])
-        }
-        Vue.$login.f.f_changemeterman = changemeterman
-      }catch (error) {
-        Vue.$login.f.f_changemeterman = []
-        console.log('换表员模块',error)
-      }
+      // try {
+      //   let getChangeMeterman = await Vue.resetpost('/rs/search', {
+      //     source: 'this.getParentByType($organization$).getChildByName($换表员$).getUsers()',
+      //     userid: Vue.$login.f.id
+      //   }, {resolveMsg: null, rejectMsg: null})
+      //   let changemeterman = []
+      //   for (let i = 0; i < getChangeMeterman.data.length; i++) {
+      //     changemeterman.push(getChangeMeterman.data[i])
+      //   }
+      //   Vue.$login.f.f_changemeterman = changemeterman
+      // }catch (error) {
+      //   Vue.$login.f.f_changemeterman = []
+      //   console.log('换表员模块',error)
+      // }
 	   // 获取资源服务权限
       try {
         let getLic = await Vue.resetpost('/rs/search', {data: {
@@ -127,37 +122,37 @@ let loginGen = async function (name, password) {
         Vue.$login.f.f_gasman = []
         console.log('资源服务权限',error)
       }
-      // 票据使用人
-      try {
-        let getPaperUseman = await Vue.resetpost('/rs/search', {
-          source: 'this.getParentByType($organization$).getChildByName($票据使用人$).getUsers()',
-          userid: Vue.$login.f.id
-        }, {resolveMsg: null, rejectMsg: null})
-        let perperuseman = []
-        for (let i = 0; i < getPaperUseman.data.length; i++) {
-          perperuseman.push(getPaperUseman.data[i])
-        }
-        Vue.$login.f.f_paperUseman = perperuseman
-      }catch (error) {
-        Vue.$login.f.f_paperUseman = []
-        console.log('票据使用人模块',error)
-
-      }
-      // 票据分配人
-      try {
-        let getPaperAllotman = await Vue.resetpost('/rs/search', {
-          source: 'this.getParentByType($organization$).getChildByName($票据分配人$).getUsers()',
-          userid: Vue.$login.f.id
-        }, {resolveMsg: null, rejectMsg: null})
-        let paperallotman = []
-        for (let i = 0; i < getPaperAllotman.data.length; i++) {
-          paperallotman.push(getPaperAllotman.data[i])
-        }
-        Vue.$login.f.f_paperAllotman = paperallotman
-      }catch (error) {
-        Vue.$login.f.f_paperAllotman = []
-        console.log('票据分配人模块',error)
-      }
+      // // 票据使用人
+      // try {
+      //   let getPaperUseman = await Vue.resetpost('/rs/search', {
+      //     source: 'this.getParentByType($organization$).getChildByName($票据使用人$).getUsers()',
+      //     userid: Vue.$login.f.id
+      //   }, {resolveMsg: null, rejectMsg: null})
+      //   let perperuseman = []
+      //   for (let i = 0; i < getPaperUseman.data.length; i++) {
+      //     perperuseman.push(getPaperUseman.data[i])
+      //   }
+      //   Vue.$login.f.f_paperUseman = perperuseman
+      // }catch (error) {
+      //   Vue.$login.f.f_paperUseman = []
+      //   console.log('票据使用人模块',error)
+      //
+      // }
+      // // 票据分配人
+      // try {
+      //   let getPaperAllotman = await Vue.resetpost('/rs/search', {
+      //     source: 'this.getParentByType($organization$).getChildByName($票据分配人$).getUsers()',
+      //     userid: Vue.$login.f.id
+      //   }, {resolveMsg: null, rejectMsg: null})
+      //   let paperallotman = []
+      //   for (let i = 0; i < getPaperAllotman.data.length; i++) {
+      //     paperallotman.push(getPaperAllotman.data[i])
+      //   }
+      //   Vue.$login.f.f_paperAllotman = paperallotman
+      // }catch (error) {
+      //   Vue.$login.f.f_paperAllotman = []
+      //   console.log('票据分配人模块',error)
+      // }
       // TODO 处理界面细节
       try {
         let viewDetails = await Vue.resetpost('rs/search', {
@@ -176,20 +171,25 @@ let loginGen = async function (name, password) {
         await proc(Vue.$login.f)
       }
       // 定时发送心跳
-      setInterval(()=> {
-        let http = new HttpResetClass()
-        http.load('POST', `rs/user/access/${Vue.$login.f.id}`, {}, {resolveMsg: null, rejectMsg: null}).then((req) => {
-          if(req.data.status==710){
-            Vue.prototype.$connectNumber = 0 //重连剩余次数
-            Vue.prototype.$socket.close() // 关闭websocket连接
-            Vue.showMessage(req.data.msg+",您将被强制退出系统", ['confirm']).then((res) => {
-              if (res === 'confirm') {
+      if (cue){
+        setInterval(()=> {
+          let http = new HttpResetClass()
+          //暂时不出现不出现异地登录校验
+          http.load('POST', `rs/user/access/${Vue.$login.f.id}`, {}, {resolveMsg: null, rejectMsg: null}).then((req) => {
+            if(req.data.forcestate && req.data.forcestate == 1){
+              Vue.showMessage("您被强制下线!", ['confirm']).then((res) => {
                 location.reload()
-              }
-            })
-          }
-        })
-      }, 2 * 60 * 1000)
+              })
+            }else if(req.data.status==710){
+              Vue.showMessage(req.data.msg+",您将被强制退出系统", ['confirm']).then((res) => {
+                if (res === 'confirm') {
+                  location.reload()
+                }
+              })
+            }
+          })
+        }, 2 * 60 * 1000)
+      }
     }
 
   } else {
@@ -204,6 +204,8 @@ let GetLoginInfoService = {
   afterLogin: [],
   //验证码开关
   Verification: true,
+  //登录信息展示开关
+  depPrompt: true,
   install (Vue, options) {
     // 给vue增添对话框显示方法
     Vue.$login = Vue.prototype.$login = GetLoginInfoService
@@ -217,9 +219,13 @@ let GetLoginInfoService = {
    * 登录
    * @param name
    * @param password
+   * @param cue true/false 是/否显示异地登录
    */
-  login (name, password) {
-    return loginGen(name, password)
+  login (name, password, cue) {
+    if (cue === undefined || cue === null || cue === ''){
+      cue = true
+    }
+    return loginGen(name, password, cue)
   },
 
   convertToIn (val) {