system-clients 3.2.54-test-1 → 3.2.55-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.2.54-test-1",
+  "version": "3.2.55-1",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {
@@ -79,7 +79,7 @@
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.70",
+    "vue-client": "1.24.79",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/plugins/GetLoginInfoService.js

@@ -1,15 +1,19 @@
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
 import cryptJS from './EncryptUtil'
+
 let loginGen = async function (name, password, cue) {
   let data = {name: name, password: password}
-  data = '$'+cryptJS.RSAEncrypt(JSON.stringify(data))
+  data = '$' + cryptJS.RSAEncrypt(JSON.stringify(data))
   let getLogin = await Vue.resetpost('/rs/logic/getLogin', data, {resolveMsg: null, rejectMsg: null})
   if (getLogin.data.states === '登录成功') {
+    //获取jwt
+    Vue.$login.jwt = getLogin.data.jwt
+    Vue.$login.jwtNew = getLogin.data.jwtNew
     // 调用远程登录服务，获取所有有权访问的功能
     data = {username: name, password: password}
     data = cryptJS.RSAEncrypt(JSON.stringify(data))
-    let resource = await Vue.resetpost(`/rs/user/userLogin/客服系统`, data, {
+    const resource = await Vue.resetpost(`/rs/user/userLogin/客服系统`, data, {
       resolveMsg: null,
       rejectMsg: null
     })
@@ -22,11 +26,11 @@ let loginGen = async function (name, password, cue) {
     console.log('登陆获取Util', JSON.stringify(resourceResult))
 
     Vue.$login.f = resourceResult.data.data
-    //获取jwt
-    Vue.$login.jwt = getLogin.data.jwt
     // 把登录用户添加到cookie里
     Vue.cookie.set('loginId', Vue.$login.f.id)
 
+    console.log("当前登录信息Vue.$login.f", Vue.$login.f)
+
     try {
       //获取有权限的功能树
       let hasRight = await Vue.resetpost(`/rs/search`, {
@@ -39,18 +43,16 @@ let loginGen = async function (name, password, cue) {
         })
       console.log('有权限功能返回数据', JSON.stringify(hasRight.data))
       //准备替换功能树
-      var fun=[]
+      var fun = []
       hasRight.data[0].children[0].children.forEach((item) => {
-        if(item.name=='客服系统'){
+        if (item.name === '客服系统') {
           item.children.forEach((item1) => {
             fun.push(item1)
           })
         }
       })
-      // console.log('替换前', JSON.stringify(Vue.$login.f.functions))
-      // console.log('替换后', JSON.stringify(fun))
-      Vue.$login.f.functions=fun
-    }catch (error) {
+      Vue.$login.f.functions = fun
+    } catch (error) {
     }
     if (Vue.$login.f.id !== '11') {
       try {
@@ -64,9 +66,9 @@ let loginGen = async function (name, password, cue) {
           areaTemp.push({label: getAllArea.data[i].name, value: getAllArea.data[i]})
         }
         Vue.$login.f.f_allArea = areaTemp
-      }catch (error) {
-        Vue.$login.f.f_allArea =[]
-        console.log('获取区县',error)
+      } catch (error) {
+        Vue.$login.f.f_allArea = []
+        console.log('获取区县', error)
       }
       // 获取抄表员
       try {
@@ -79,9 +81,9 @@ let loginGen = async function (name, password, cue) {
           gasman.push(getGasman.data[i])
         }
         Vue.$login.f.f_gasman = gasman
-      }catch (error) {
+      } catch (error) {
         Vue.$login.f.f_gasman = []
-        console.log('抄表员模块',error)
+        console.log('抄表员模块', error)
       }
       // 获取安装人
       try {
@@ -95,9 +97,9 @@ let loginGen = async function (name, password, cue) {
           installman.push(getInstallman.data[i])
         }
         Vue.$login.f.f_installman = installman
-      }catch (error) {
-        Vue.$login.f.f_installman =[]
-        console.log('安装人模块',error)
+      } catch (error) {
+        Vue.$login.f.f_installman = []
+        console.log('安装人模块', error)
       }
       // 获取换表员
       // try {
@@ -114,20 +116,22 @@ let loginGen = async function (name, password, cue) {
       //   Vue.$login.f.f_changemeterman = []
       //   console.log('换表员模块',error)
       // }
-	   // 获取资源服务权限
+      // 获取资源服务权限
       try {
-        let getLic = await Vue.resetpost('/rs/search', {data: {
-		  source: 'this.getRights().where(row.getType()==$function$ && row.getPath($name$).indexOf($资源操作$) != -1)',
-		  userid: Vue.$login.f.id
-		}}, {resolveMsg: null, rejectMsg: null})
-		let arry=[]
-		getLic.data.forEach((item) => {
-		  arry.push(item.name)
-		})
-		Vue.$login.f.lics=arry
-      }catch (error) {
+        let getLic = await Vue.resetpost('/rs/search', {
+          data: {
+            source: 'this.getRights().where(row.getType()==$function$ && row.getPath($name$).indexOf($资源操作$) != -1)',
+            userid: Vue.$login.f.id
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+        let arry = []
+        getLic.data.forEach((item) => {
+          arry.push(item.name)
+        })
+        Vue.$login.f.lics = arry
+      } catch (error) {
         Vue.$login.f.f_gasman = []
-        console.log('资源服务权限',error)
+        console.log('资源服务权限', error)
       }
       // // 票据使用人
       // try {
@@ -169,26 +173,29 @@ let loginGen = async function (name, password, cue) {
         let r = viewDetails.data
         Vue.$login.r = []
         r.forEach(x => Vue.$login.r.push(x.name))
-      }catch (error) {
+      } catch (error) {
         Vue.$login.r = []
-        console.log('加载模块失败',error)
+        console.log('加载模块失败', error)
       }
       // 调用登录后处理
-      for(let proc of Vue.$login.afterLogin) {
+      for (let proc of Vue.$login.afterLogin) {
         await proc(Vue.$login.f)
       }
       // 定时发送心跳
-      if (cue){
-        setInterval(()=> {
+      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){
+          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()
               })
-            }else if(req.data.status==710){
-              Vue.showMessage(req.data.msg+",您将被强制退出系统", ['confirm']).then((res) => {
+            } else if (req.data.status == 710) {
+              Vue.showMessage(req.data.msg + ",您将被强制退出系统", ['confirm']).then((res) => {
                 if (res === 'confirm') {
                   location.reload()
                 }
@@ -213,14 +220,12 @@ let GetLoginInfoService = {
   Verification: true,
   //登录信息展示开关
   depPrompt: true,
-  install (Vue, options) {
+  install(Vue, options) {
     // 给vue增添对话框显示方法
     Vue.$login = Vue.prototype.$login = GetLoginInfoService
   },
 
-  f: {
-
-  },
+  f: {},
 
   /**
    * 登录
@@ -228,14 +233,14 @@ let GetLoginInfoService = {
    * @param password
    * @param cue true/false 是/否显示异地登录
    */
-  login (name, password, cue) {
-    if (cue === undefined || cue === null || cue === ''){
+  login(name, password, cue) {
+    if (cue === undefined || cue === null || cue === '') {
       cue = true
     }
     return loginGen(name, password, cue)
   },
 
-  convertToIn (val) {
+  convertToIn(val) {
     let temp = ''
     if (val instanceof Array) {
       if (val.length >= 1) {
@@ -249,26 +254,26 @@ let GetLoginInfoService = {
     return temp
   },
 
-  toStandardYearMonth () {
+  toStandardYearMonth() {
     let dt = new Date()
     let month = dt.getMonth() + 1
     return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month)
   },
 
-  toStandardYearMonth1 () {
+  toStandardYearMonth1() {
     let dt = new Date()
     let month = dt.getMonth() + 1
     return dt.getFullYear() + (month < 10 ? '0' + month : month)
   },
 
-  toStandardDateString () {
+  toStandardDateString() {
     let dt = new Date()
     let month = dt.getMonth() + 1
     let date = dt.getDate()
     return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
   },
 
-  toStartAndEndDateString () {
+  toStartAndEndDateString() {
     let dt = new Date()
     let month = dt.getMonth() + 1
     // let date = dt.getDate()
@@ -277,7 +282,7 @@ let GetLoginInfoService = {
     // return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
   },
 
-  toStandardTimeString () {
+  toStandardTimeString() {
     let dt = new Date()
     let month = dt.getMonth() + 1
     let date = dt.getDate()
@@ -288,7 +293,7 @@ let GetLoginInfoService = {
       ' ' + (hour < 10 ? '0' + hour : hour) + ':' + (min < 10 ? '0' + min : min) + ':' + (sec < 10 ? '0' + sec : sec)
   },
 
-  guid () {
+  guid() {
     let buf = new Uint16Array(8)
     window.crypto.getRandomValues(buf)
     let S4 = function (num) {
@@ -301,7 +306,7 @@ let GetLoginInfoService = {
     return (S4(buf[0]) + S4(buf[1]) + S4(buf[2]) + S4(buf[3]) + S4(buf[4]) + S4(buf[5]) + S4(buf[6]) + S4(buf[7]))
   },
 
-  choices (role, param, hasBlank = false, blankHint = '请选择') {
+  choices(role, param, hasBlank = false, blankHint = '请选择') {
     if (role == 'view') {
       Vue.getParams(param, [null])
     } else {
@@ -320,7 +325,7 @@ let GetLoginInfoService = {
     }
   },
 
-  required (param) {
+  required(param) {
     if (typeof param === 'number' && param == 0)
       return false
     if (!param)
@@ -332,16 +337,16 @@ let GetLoginInfoService = {
     return false
   },
 
-  isInt (n) {
+  isInt(n) {
     return !window.isNaN(n) && n % 1 === 0
   },
 
-  isFloat (n) {
+  isFloat(n) {
     return !window.isNaN(n)
   },
 
 // this will convert all true/false to boolean
-  booleanFilter (paper) {
+  booleanFilter(paper) {
     for (let key in paper) {
       if (!paper.hasOwnProperty(key))
         continue
@@ -354,7 +359,7 @@ let GetLoginInfoService = {
     }
   },
 // recursively traverse through each path
-  ratifyPics (paper) {
+  ratifyPics(paper) {
     for (let key in paper) {
       if (key.endsWith('_path')) {
         if (!paper[key]) {
@@ -369,7 +374,7 @@ let GetLoginInfoService = {
   },
 
 // load script and other stuff
-  loadscript (type, fileName) {
+  loadscript(type, fileName) {
     return new Promise((resolve, reject) => {
       let element
       if (type == 'css') {
@@ -396,11 +401,11 @@ let GetLoginInfoService = {
     })
   },
 // 不能选择器中截取掉多余的字符
-  orgName (name) {
+  orgName(name) {
     return name.substring(10)
   },
 
-  getNowDate (name) {
+  getNowDate(name) {
     // 求取当前时间的工具
     let myweekday = ''
     let year = ''
@@ -415,7 +420,7 @@ let GetLoginInfoService = {
     return year + '年' + mymonth + '月' + myday + '日  ' + week[myweekday]
   },
 
-  addDate (date, days) {
+  addDate(date, days) {
     // 求取当前时间的工具
     let endDate = new Date(date)
     endDate = endDate.valueOf()
@@ -432,7 +437,7 @@ let GetLoginInfoService = {
   },
 
 // 通过地址栏的参数获取参数内容
-  getUrlParames (param) {
+  getUrlParames(param) {
     var query = window.location.search
     var iLen = param.length
     var iStart = query.indexOf(param)
@@ -448,7 +453,7 @@ let GetLoginInfoService = {
   },
 
 // 从地址栏获取加密的参数
-  getUrlCompileParames (param) {
+  getUrlCompileParames(param) {
     let code = unescape(window.location.search.slice(1, window.location.search.length))
     let query = String.fromCharCode(code.charCodeAt(0) - code.length)
     for (var i = 1; i < code.length; i++) {
@@ -468,7 +473,7 @@ let GetLoginInfoService = {
   },
 
 // 对字符串进行加密
-  compileStr (code) {
+  compileStr(code) {
     let c = String.fromCharCode(code.charCodeAt(0) + code.length)
     for (let i = 1; i < code.length; i++) {
       c += String.fromCharCode(code.charCodeAt(i) + code.charCodeAt(i - 1))
@@ -476,7 +481,7 @@ let GetLoginInfoService = {
     return escape(c)
   },
 // 字符串进行解密
-  uncompileStr (code) {
+  uncompileStr(code) {
     code = unescape(code)
     let c = String.fromCharCode(code.charCodeAt(0) - code.length)
     for (var i = 1; i < code.length; i++) {
@@ -485,7 +490,7 @@ let GetLoginInfoService = {
     return c
   },
 
-  dateDescripte (date) {
+  dateDescripte(date) {
     let nowTime = new Date().getTime()
     let oldTime = new Date(date).getTime()
     let timeDiff = nowTime - oldTime
@@ -518,7 +523,7 @@ let GetLoginInfoService = {
     return des
   },
 
-  nextMonth20 (date) {
+  nextMonth20(date) {
     let ds = date.split('-')
     let nextMonth = ds[1] - 0 + 1
     return ds[0] + '-' + (nextMonth < 10 ? '0' + nextMonth : nextMonth) + '-20 00:00:00'