system-clients 3.2.97 → 3.2.98-weinan

package/src/filiale/zhoukou/system.js

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

package/src/plugins/EncryptUtil.js

@@ -48,6 +48,6 @@ export default {
     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()) ;
+    return resdata.toString();
   },
 }

package/src/plugins/GetLoginInfoService.js

@@ -2,17 +2,36 @@ import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
 import cryptJS from './EncryptUtil'
 
-let loginGen = async function (username, password, cue) {
-  let data = {username, password,resourceName:'客服系统'}
-  const getLogin = await Vue.resetpost('/api/af-auth/login', data,
-    {resolveMsg: null, rejectMsg: null,headerConfig:{'Content-type': "application/json"}
-  })
-  if (getLogin.data) {
+let loginGen = async function (name, password, cue) {
+  let data = {name: name, password: password}
+  data = '$' + cryptJS.RSAEncrypt(JSON.stringify(data))
+  const getLogin = await Vue.resetpost('/rs/logic/getLogin', data, {resolveMsg: null, rejectMsg: null})
+  if (getLogin.data.states === '登录成功') {
     //获取jwt
-    Vue.$login.jwt = getLogin.data.resources.data.id
-    Vue.$login.jwtNew = getLogin.data.access_token
+    Vue.$login.jwt = getLogin.data.jwt
+    Vue.$login.jwtNew = getLogin.data.jwtNew
+    if (getLogin.data.s) {
+      Vue.$login['v3-session-key'] = cryptJS.RSADecrypt(getLogin.data.s)
+    }
     // 调用远程登录服务，获取所有有权访问的功能
-    Vue.$login.f =  getLogin.data.resources.data
+    data = {username: name, password: password}
+    data = cryptJS.RSAEncrypt(JSON.stringify(data))
+    const resource = await Vue.resetpost(`/rs/user/userLogin/客服系统`, data, {
+      resolveMsg: null,
+      rejectMsg: null
+    })
+    // 兼容旧版ldao
+    if ((JSON.stringify(resource.data).startsWith("{") || JSON.stringify(resource.data).startsWith("[")) && resource.data.code && resource.data.msg && resource.data.code !== 200) {
+      throw {status: 555, data: resource.data.msg}
+    }
+    console.log('登陆获取Util', JSON.stringify(resource.data))
+
+    // 兼容旧版ldao，旧版不返回code
+    if ((JSON.stringify(resource.data).startsWith("{") || JSON.stringify(resource.data).startsWith("[")) && resource.data.code && resource.data.msg) {
+      Vue.$login.f = resource.data.data
+    } else {
+      Vue.$login.f = resource.data
+    }
     // 把登录用户添加到cookie里
     Vue.cookie.set('loginId', Vue.$login.f.id)
     try {
@@ -21,6 +40,7 @@ let loginGen = async function (username, password, cue) {
         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 = []
       hasRight.data[0].children[0].children.forEach((item) => {
@@ -30,6 +50,8 @@ let loginGen = async function (username, password, cue) {
           })
         }
       })
+      // console.log('替换前', JSON.stringify(Vue.$login.f.functions))
+      // console.log('替换后', JSON.stringify(fun))
       Vue.$login.f.functions = fun
     } catch (error) {
     }
@@ -80,6 +102,21 @@ let loginGen = async function (username, password, cue) {
         Vue.$login.f.f_installman = []
         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', {
@@ -97,6 +134,37 @@ let loginGen = async function (username, 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)
+      // }
       // TODO 处理界面细节
       try {
         let viewDetails = await Vue.resetpost('rs/search', {
@@ -110,10 +178,62 @@ let loginGen = async function (username, password, cue) {
         Vue.$login.r = []
         console.log('加载模块失败', error)
       }
+      // 检查用户是否为话务员角色
+      try {
+        let http = new HttpResetClass()
+        // 先查询所有包含"话务员"的角色
+        let operatorRoles = await http.load('POST', '/rs/sql/singleTable', {
+          data: {
+            tablename: 't_role',
+            condition: `name LIKE '%话务员%'`
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+        // 如果找到话务员角色，再查询用户是否有这些角色
+        if (operatorRoles.data && operatorRoles.data.length > 0) {
+          // 查询用户信息，检查用户的roles字段是否包含话务员角色的id
+          let userInfo = await http.load('POST', '/rs/sql/singleTable', {
+            data: {
+              tablename: 't_user',
+              condition: `id = '${Vue.$login.f.id}'`
+            }
+          }, {resolveMsg: null, rejectMsg: null})
+          if (userInfo.data && userInfo.data.length > 0) {
+            let userRoles = userInfo.data[0].roles || ''
+            // 将用户角色字符串转换为数组（处理逗号分隔的情况）
+            let userRoleArray = String(userRoles).split(',').map(r => String(r).trim())
+            // 检查用户的roles字段是否包含任何话务员角色的id
+            Vue.$login.f.isOperator = operatorRoles.data.some(role => {
+              return userRoleArray.includes(String(role.id))
+            })
+          } else {
+            Vue.$login.f.isOperator = false
+          }
+        } else {
+          Vue.$login.f.isOperator = false
+        }
+        console.log('话务员角色检查', Vue.$login.f.isOperator)
+      } catch (error) {
+        // 如果查询失败，默认不是话务员
+        Vue.$login.f.isOperator = false
+        console.log('检查话务员角色失败', error)
+      }
       // 调用登录后处理
       for (let proc of Vue.$login.afterLogin) {
         await proc(Vue.$login.f)
       }
+      // 启动未操作下线计时器（30分钟），话务员不受限制
+      if(Vue.$login.autoLoginout && !Vue.$login.f.isOperator){
+        console.log('启动自动登出计时器，超时时间:', Vue.$login.autoLoginTimeOut, '秒')
+        Vue.$login.startInactivityTimer(Vue.$login.autoLoginTimeOut)
+      } else {
+        if (!Vue.$login.autoLoginout) {
+          console.log('自动登出功能未启用 (autoLoginout = false)')
+        }
+        if (Vue.$login.f.isOperator) {
+          console.log('话务员账号，跳过自动登出计时器')
+        }
+      }
+
       // 定时发送心跳
       if (cue) {
         setInterval(() => {
@@ -128,6 +248,11 @@ let loginGen = async function (username, password, cue) {
                 location.reload()
               })
             } else if (req.data.status == 710) {
+              // 如果是话务员角色，不受30分钟超时限制，不执行退出操作
+              if (Vue.$login.f.isOperator) {
+                console.log('话务员账号，忽略30分钟超时限制')
+                return
+              }
               Vue.showMessage(req.data.msg + ",您将被强制退出系统", ['confirm']).then((res) => {
                 if (res === 'confirm') {
                   location.reload()
@@ -140,10 +265,7 @@ let loginGen = async function (username, password, cue) {
     }
 
   } else {
-    let error = {status: 401, data: "登录失败，请稍后重试"}
-    if (getLogin.data.code !== 500) {
-      error = {status: getLogin.data.code, data: getLogin.data.msg}
-    }
+    let error = {status: 401, data: getLogin.data.states}
     // 抛出错误
     throw error
   }
@@ -156,6 +278,9 @@ let GetLoginInfoService = {
   Verification: true,
   //构建时间开关
   versionTime: true,
+  //长时间未操作退出开关
+  autoLoginout: false,
+  autoLoginTimeOut:30*60*1000,
   //
   SinglePageToken : {},
   //登录信息展示开关
@@ -468,6 +593,41 @@ let GetLoginInfoService = {
     let ds = date.split('-')
     let nextMonth = ds[1] - 0 + 1
     return ds[0] + '-' + (nextMonth < 10 ? '0' + nextMonth : nextMonth) + '-20 00:00:00'
+  },
+  /**
+   * 启动未操作强制下线计时器
+   * @param timeout 超时时间（毫秒），默认30分钟
+   */
+  startInactivityTimer(timeout) {
+    console.log('startInactivityTimer 被调用，超时时间:', timeout, '秒')
+    // 清除已有的定时器
+    if (this._inactivityTimer) {
+      clearTimeout(this._inactivityTimer);
+    }
+    // 事件处理函数
+    const resetTimer = () => {
+      clearTimeout(this._inactivityTimer);
+      this._inactivityTimer = setTimeout(() => {
+        console.log('自动登出计时器触发，执行强制下线')
+        // 强制下线逻辑
+        // Vue.cookie.delete('loginId');
+        Vue.$login.f = {};
+        Vue.showMessage("长时间未操作，您已被强制下线", ['confirm']).then(() => {
+          location.reload();
+        });
+      }, timeout);
+    };
+    // 需要监听的事件
+    const events = ['mousemove', 'keydown', 'mousedown', 'scroll', 'touchstart'];
+    // 只绑定一次
+    if (!this._inactivityListenerAdded) {
+      events.forEach(event => {
+        window.addEventListener(event, resetTimer, true);
+      });
+      this._inactivityListenerAdded = true;
+    }
+    // 初始化计时器
+    resetTimer();
   }
 }