system-clients 3.2.6-1 → 3.2.6-rongcheng

package/src/plugins/GetLoginInfoService.js

@@ -1,14 +1,19 @@
 import Vue from 'vue'
+import JSEncrypt from 'jsencrypt'
 import {HttpResetClass} from 'vue-client'
-import cryptJS from './EncryptUtil'
-let loginGen = async function (name, password, cue) {
+
+let loginGen = async function (name, password) {
   let data = {name: name, password: password}
-  data = '$'+cryptJS.RSAEncrypt(JSON.stringify(data))
-  let getLogin = await Vue.resetpost('/rs/logic/getLogin', data, {resolveMsg: null, rejectMsg: null})
+  // 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')
   if (getLogin.data.states === '登录成功') {
     // 调用远程登录服务，获取所有有权访问的功能
     data = {username: name, password: password}
-    data = cryptJS.RSAEncrypt(JSON.stringify(data))
+    data = encrypt.encrypt(JSON.stringify(data))
     let resource = await Vue.resetpost(`/rs/user/userLogin/客服系统`, data, {
       resolveMsg: null,
       rejectMsg: null
@@ -93,20 +98,20 @@ let loginGen = async function (name, password, cue) {
         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: {
@@ -122,37 +127,37 @@ let loginGen = async function (name, password, cue) {
         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', {
@@ -171,25 +176,20 @@ let loginGen = async function (name, password, cue) {
         await proc(Vue.$login.f)
       }
       // 定时发送心跳
-      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) => {
+      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') {
                 location.reload()
-              })
-            }else if(req.data.status==710){
-              Vue.showMessage(req.data.msg+",您将被强制退出系统", ['confirm']).then((res) => {
-                if (res === 'confirm') {
-                  location.reload()
-                }
-              })
-            }
-          })
-        }, 2 * 60 * 1000)
-      }
+              }
+            })
+          }
+        })
+      }, 2 * 60 * 1000)
     }
 
   } else {
@@ -204,8 +204,6 @@ let GetLoginInfoService = {
   afterLogin: [],
   //验证码开关
   Verification: true,
-  //登录信息展示开关
-  depPrompt: true,
   install (Vue, options) {
     // 给vue增添对话框显示方法
     Vue.$login = Vue.prototype.$login = GetLoginInfoService
@@ -219,13 +217,9 @@ let GetLoginInfoService = {
    * 登录
    * @param name
    * @param password
-   * @param cue true/false 是/否显示异地登录
    */
-  login (name, password, cue) {
-    if (cue === undefined || cue === null || cue === ''){
-      cue = true
-    }
-    return loginGen(name, password, cue)
+  login (name, password) {
+    return loginGen(name, password)
   },
 
   convertToIn (val) {

package/src/plugins/validation.js

@@ -3,13 +3,5 @@ import Validator from 'vue-validator'
 Vue.use(Validator)
 //密码强度验证器(必须为为大小写字母、阿拉伯数字、字符)
 Vue.validator('strongpassword', function (val) {
-  return /^(?:(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(val)
-});
-Vue.validator('chinesePassword', function (val) {
-  var testBealoon=/.*?[\u4E00-\u9FFF]+.*$/.test(val)
-  return !(/.*?[\u4E00-\u9FFF]+.*$/.test(val))
-});
-// 潜能要求8~16位数字字母组合；
-Vue.validator('numbersAndLetter8to16', function (val) {
-  return /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(val)
+  return /^(?:(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(val)
 });

package/src/system.js

@@ -1,11 +1,6 @@
 import Vue from 'vue'
 import GetLoginInfoService from './plugins/GetLoginInfoService'
 import GetAppDataService from './stores/AppData'
-// 热力
-import HeatGetLoginInfoService from './plugins/HeatGetLoginInfoService'
-import HeatGetAppDataService from './stores/HeatAppData'
-// 热力登陆控制
-Vue.$heatCompatibility  = Vue.prototype.$heatCompatibility = false
 
 // /** **************************登录与主界面相关******************************/
 
@@ -26,24 +21,13 @@ import ResSelectGroup from './components/server/ResSelectGroup'
 //资源选择测试
 import TestResSelect from './components/server/TestResSelect'
 import RoleSelector from "./components/server/RoleSelector";
-
-// BAinformation备案信息展示(空不展示, 传入什么展示什么,可以传标签)
-export default function (val,filiale, {showLogin = false, show_daiBan = false, BAinformation = null} = {}) {
-  console.log(val,filiale,showLogin)
+export default function (val) {
   //验证码开关赋值
   if(val!=null){
     GetLoginInfoService.Verification=val
   }
-  //登录提示赋值
-  GetLoginInfoService.depPrompt=showLogin
-  //展示待办赋值
-  GetLoginInfoService.showDaiBan=show_daiBan
-  // 备案信息复制
-  GetLoginInfoService.BAinformation = BAinformation
   Vue.use(GetLoginInfoService)
   Vue.use(GetAppDataService)
-  Vue.use(HeatGetLoginInfoService)
-  Vue.use(HeatGetAppDataService)
 
   Vue.component('login', login)
   Vue.component('change-declare', changeDeclare)
@@ -84,26 +68,9 @@ export default function (val,filiale, {showLogin = false, show_daiBan = false, B
   Vue.component('phone-manage', (resolve) => { require(['./components/equipment/PhoneManage'], resolve) })
   // pos端控制
   Vue.component('pos-manage', (resolve) => { require(['./components/equipment/PosManage'], resolve) })
-  // pos管理
-  Vue.component('pos-manage-both', (resolve) => { require(['./components/equipment/PosManageBoth'], resolve) })
-  // pos参数管理
-  Vue.component('pos-param-manage', (resolve) => { require(['./components/equipment/PosParamManage'], resolve) })
 
   // 材料字典
   Vue.component('material-data', (resolve) => { require(['./components/materialManage/materialData.vue'], resolve) })
   Vue.component('material-data-list', (resolve) => { require(['./components/materialManage/materialList.vue'], resolve) })
-  // 图片查看器
-  Vue.component('image-viewer', (resolve) => { require(['./components/server/ImageViewer'], resolve) })
-  // 测试图片查看器
-  Vue.component('image-viewer-test', (resolve) => { require(['./components/server/ImageVieweTest'], resolve) })
-
-  //省市区、街道、小区、楼栋级联查询
-  Vue.component('pcd-building-select', (resolve) => { require(['./components/server/PcdBuildingSelect'], resolve) })
 
-  if (filiale) {
-    let filialeComp = require(`./filiale/${filiale}/system`).specialComp
-    for (let key in filialeComp) {
-      Vue.component(key, filialeComp[key])
-    }
-  }
 }

package/.npmignore

@@ -1,10 +0,0 @@
-src/bootstrap
-.idea/
-.DS_Store
-node_modules/
-dist/static/*.map
-npm-debug.log
-selenium-debug.log
-test/unit/coverage
-test/e2e/reports
-yarn.lock

package/build/.npmignore

@@ -1 +0,0 @@
-/dev-server.js