system-clients 3.1.99 → 3.1.100-aode

package/src/plugins/GetLoginInfoService.js

@@ -7,19 +7,21 @@ let loginGen = async function (name, 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')
+  const getLogin = await Vue.resetpost('/rs/logic/getLogin', data, {resolveMsg: null, rejectMsg: null}, 'RSA')
   if (getLogin.data.states === '登录成功') {
     // 调用远程登录服务，获取所有有权访问的功能
     data = {username: name, password: password}
     data = encrypt.encrypt(JSON.stringify(data))
-    let resource = await Vue.resetpost(`/rs/user/userLogin/客服系统`, data, {
-      resolveMsg: null,
-      rejectMsg: null
+    const resource = await Vue.resetpost(`/rs/user/userLogin/客服系统`, data, {
+      resolveMsg: null, rejectMsg: null
     })
-    console.log('登陆获取Util', JSON.stringify(resource.data))
-    Vue.$login.f = resource.data
+
+    if (resource.data.code !== 200) {
+      throw {status: resource.data.code, data: resource.data.msg}
+    }
+
+    console.log('登陆获取Util', resource.data)
+    Vue.$login.f = resource.data.data
     //获取jwt
     Vue.$login.jwt = getLogin.data.jwt
     // 把登录用户添加到cookie里
@@ -28,33 +30,27 @@ let loginGen = async function (name, password) {
     try {
       //获取有权限的功能树
       let hasRight = await Vue.resetpost(`/rs/search`, {
-          source: "tool.getFullTree(this.getRights().where(row.getType() == $function$))",
-          userid: Vue.$login.f.id
-        },
-        {
-          resolveMsg: null,
-          rejectMsg: null
-        })
+        source: "tool.getFullTree(this.getRights().where(row.getType() == $function$))", userid: Vue.$login.f.id
+      }, {
+        resolveMsg: null, rejectMsg: null
+      })
       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 {
         let getAllArea = await Vue.resetpost('/rs/search', {
-          source: 'this.getParentByType($organization$).getChildByName($片区$).getChildren()',
-          userid: Vue.$login.f.id
+          source: 'this.getParentByType($organization$).getChildByName($片区$).getChildren()', userid: Vue.$login.f.id
         }, {resolveMsg: null, rejectMsg: null})
 
         let areaTemp = []
@@ -62,24 +58,23 @@ let loginGen = async function (name, password) {
           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 {
         let getGasman = await Vue.resetpost('/rs/search', {
-          source: 'this.getParentByType($organization$).getChildByName($抄表员$).getUsers()',
-          userid: Vue.$login.f.id
+          source: 'this.getParentByType($organization$).getChildByName($抄表员$).getUsers()', userid: Vue.$login.f.id
         }, {resolveMsg: null, rejectMsg: null})
         let gasman = []
         for (let i = 0; i < getGasman.data.length; i++) {
           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 {
@@ -112,20 +107,22 @@ let loginGen = async function (name, password) {
       //   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 {
@@ -167,25 +164,21 @@ let loginGen = async function (name, password) {
         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)
       }
       // 定时发送心跳
-      setInterval(()=> {
+      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()
-            })
-          }else if(req.data.status==710){
-            Vue.showMessage(req.data.msg+",您将被强制退出系统", ['confirm']).then((res) => {
+          if (req.data.status == 710) {
+            Vue.showMessage(req.data.msg + ",您将被强制退出系统", ['confirm']).then((res) => {
               if (res === 'confirm') {
                 location.reload()
               }
@@ -196,36 +189,31 @@ let loginGen = async function (name, password) {
     }
 
   } else {
-    let error = {status: 401, data: getLogin.data.states}
     // 抛出错误
-    throw error
+    throw {status: 401, data: getLogin.data.states}
   }
 }
 
 let GetLoginInfoService = {
   // 登录后要处理的异步对象
-  afterLogin: [],
-  //验证码开关
-  Verification: true,
-  install (Vue, options) {
+  afterLogin: [], //验证码开关
+  Verification: true, install(Vue, options) {
     // 给vue增添对话框显示方法
     Vue.$login = Vue.prototype.$login = GetLoginInfoService
   },
 
-  f: {
-
-  },
+  f: {},
 
   /**
    * 登录
    * @param name
    * @param password
    */
-  login (name, password) {
+  login(name, password) {
     return loginGen(name, password)
   },
 
-  convertToIn (val) {
+  convertToIn(val) {
     let temp = ''
     if (val instanceof Array) {
       if (val.length >= 1) {
@@ -239,46 +227,44 @@ 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()
-    return [dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-01',
-      dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (new Date(dt.getFullYear(), month, 0).getDate())]
+    return [dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-01', dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (new Date(dt.getFullYear(), month, 0).getDate())]
     // 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()
     let hour = dt.getHours()
     let min = dt.getMinutes()
     let sec = dt.getSeconds()
-    return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date) +
-      ' ' + (hour < 10 ? '0' + hour : hour) + ':' + (min < 10 ? '0' + min : min) + ':' + (sec < 10 ? '0' + sec : sec)
+    return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date) + ' ' + (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) {
@@ -291,7 +277,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 {
@@ -310,41 +296,35 @@ let GetLoginInfoService = {
     }
   },
 
-  required (param) {
-    if (typeof param === 'number' && param == 0)
-      return false
-    if (!param)
-      return true
+  required(param) {
+    if (typeof param === 'number' && param == 0) return false
+    if (!param) return true
     param = param + ''
     param = param.trim()
-    if (!param)
-      return true
+    if (!param) return true
     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
+      if (!paper.hasOwnProperty(key)) continue
       if (typeof paper[key] == 'object' && paper[key] != null) {
         booleanFilter(paper[key])
       } else {
-        if (paper[key] === 'true' || paper[key] == 'false')
-          paper[key] = (paper[key] === 'true')
+        if (paper[key] === 'true' || paper[key] == 'false') paper[key] = (paper[key] === 'true')
       }
     }
-  },
-// recursively traverse through each path
-  ratifyPics (paper) {
+  }, // recursively traverse through each path
+  ratifyPics(paper) {
     for (let key in paper) {
       if (key.endsWith('_path')) {
         if (!paper[key]) {
@@ -359,7 +339,7 @@ let GetLoginInfoService = {
   },
 
 // load script and other stuff
-  loadscript (type, fileName) {
+  loadscript(type, fileName) {
     return new Promise((resolve, reject) => {
       let element
       if (type == 'css') {
@@ -384,13 +364,12 @@ let GetLoginInfoService = {
         document.body.appendChild(element)
       }
     })
-  },
-// 不能选择器中截取掉多余的字符
-  orgName (name) {
+  }, // 不能选择器中截取掉多余的字符
+  orgName(name) {
     return name.substring(10)
   },
 
-  getNowDate (name) {
+  getNowDate(name) {
     // 求取当前时间的工具
     let myweekday = ''
     let year = ''
@@ -405,7 +384,7 @@ let GetLoginInfoService = {
     return year + '年' + mymonth + '月' + myday + '日  ' + week[myweekday]
   },
 
-  addDate (date, days) {
+  addDate(date, days) {
     // 求取当前时间的工具
     let endDate = new Date(date)
     endDate = endDate.valueOf()
@@ -416,13 +395,12 @@ let GetLoginInfoService = {
     let hour = endDate.getHours()
     let min = endDate.getMinutes()
     let sec = endDate.getSeconds()
-    return endDate.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (day < 10 ? '0' + day : day) +
-      ' ' + (hour < 10 ? '0' + hour : hour) + ':' + (min < 10 ? '0' + min : min) + ':' + (sec < 10 ? '0' + sec : sec)
+    return endDate.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (day < 10 ? '0' + day : day) + ' ' + (hour < 10 ? '0' + hour : hour) + ':' + (min < 10 ? '0' + min : min) + ':' + (sec < 10 ? '0' + sec : sec)
     // return a
   },
 
 // 通过地址栏的参数获取参数内容
-  getUrlParames (param) {
+  getUrlParames(param) {
     var query = window.location.search
     var iLen = param.length
     var iStart = query.indexOf(param)
@@ -438,7 +416,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++) {
@@ -458,15 +436,14 @@ 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))
     }
     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++) {
@@ -475,7 +452,7 @@ let GetLoginInfoService = {
     return c
   },
 
-  dateDescripte (date) {
+  dateDescripte(date) {
     let nowTime = new Date().getTime()
     let oldTime = new Date(date).getTime()
     let timeDiff = nowTime - oldTime
@@ -508,7 +485,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'