system-clients 3.2.5 → 3.2.6-aodeToV4

package/src/components/server/ResSelectGroup.vue

@@ -1,10 +1,10 @@
 <template>
-  <div :class="style">
+  <div :class="style" v-show="companyshow">
     <label class="font_normal_body">公&emsp;&emsp;司</label>
     <right-tree @re-res="getorg"
                 :initresid='initres.org'></right-tree>
   </div>
-  <div :class="style">
+  <div :class="style" v-show="departmentshow">
     <label class="font_normal_body">部&emsp;&emsp;门</label>
     <res-select restype='department'
                 @res-select="getdep"
@@ -13,7 +13,7 @@
                 :is-mul="mul">
     </res-select>
   </div>
-  <div :class="style">
+  <div :class="style" v-show="operatorshow">
     <label class="font_normal_body">人&emsp;&emsp;员</label>
     <res-select restype='user'
                 @res-select="getuser"
@@ -22,7 +22,7 @@
                 :is-mul="mul">
     </res-select>
   </div>
-  <div :class="style " >
+  <div :class="style " v-show="sliceareashow" >
     <label class="font_normal_body">片&emsp;&emsp;区</label>
     <v-select :value.sync="slice_area" v-model="slice_area"  @change='getarea'
               :options='sliceArea' placeholder='片区/管理站' filer-key="name"
@@ -49,6 +49,9 @@
         type: Object,
         default: null,
       },
+      showComponent:{
+        default:['company','department','operator','slicearea']
+      }
     },
     data () {
       return {
@@ -57,7 +60,10 @@
         userresid:[],
         sliceArea: [],
         slice_area:[],
-
+        companyshow:false,
+        departmentshow:false,
+        operatorshow:false,
+        sliceareashow:false,
         obj:{
           orgnames:[],
           depnames:[],
@@ -67,10 +73,21 @@
     },
     ready () {
       console.log('开始获取组织结构。。。')
+      this.initComponent();
       this.initAreas(this.$login.f.orgid)
     },
     methods:{
-
+      initComponent(){
+        let self=this;
+        this.showComponent.find((item)=>{
+          switch(item){
+            case 'company': self.companyshow=true; break;
+            case 'department': self.departmentshow=true; break;
+            case 'operator': self.operatorshow=true; break;
+            case 'slicearea': self.sliceareashow=true; break;
+          }
+        })
+      },
       // 初始化片区
       async initAreas (val) {
         if (val) {

package/src/components/server/RightTree.vue

@@ -31,39 +31,80 @@
             close-on-select></v-select>
 </template>
 <script>
+  import Vue from 'vue';
   import co from 'co'
   import { PagedList, HttpResetClass } from 'vue-client'
   import * as ldapHelper from '../../util/LdapHelper'
-
   let saveGen = function * (self) {
     //获取分公司树
     let data = {
       source: self.source,
       userid: self.userid
     }
+    // if(self.$treeorg==null || (self.$treeorg!=null&&self.$treeorg.length==0)){
     let http = new HttpResetClass()
     let ret = yield http.load('POST', `${self.Url}/rs/search`, data, {resolveMsg: null, rejectMsg: null})
     // 去掉前面的两层节点
     ret.data[0].children[0].children.forEach((item) => {
       self.model.push(item)
     })
+    Vue.$treeorg = Vue.prototype.$treeorg = self.model;
+    // }
+    //if(self.$treeorg!=null){
+    //  self.model = self.$treeorg;
+    //}
     // 给资源添加父关系
     ldapHelper.procParent(self.model)
     // 树转列
     if (self.islist) {
       self.treetoList(self.model)
     }
+    if(self.initresid.length>0){
+      if(self.initresid[0] == ''){
+        self.initresid[0] = self.$login.f.orgid;
+      }
+    }else{
+      self.initresid = [];
+      self.initresid[0] = self.$login.f.orgid;
+    }
     if(self.initresid&&self.initresid.length>0){
+      self.isselect = false;
       self.initTreetoList(self.model)
+      self.initregion(self.childrenOptions)
       self.childrenOptions.forEach((item) => {
+        if(item.id == null && item.value !=null ){
+          item = item.value
+        }
         if(item.id==self.initresid[0]){
-          self.model=[]
-          self.model.push(item)
-          self.selectclick(item)
+          //默认加载如果已选中的和传入参数相等会取消选择，这种操作不应该被允许
+          if(self.orgids==item.id){
+            self.initdataone(item);
+            return;
+          }
+          self.selectclick(item);
+          self.isselect = true;
+          return;
         }
       })
+      //如果没有找到公司，说明是选择的是大区
+      if(!self.isselect){
+        self.childrenregionOption.forEach((item) => {
+          if(item.id == null && item.value !=null ){
+            item = item.value;
+          }
+          if(item.id==self.initresid[0]){
+            //默认加载如果已选中的和传入参数相等会取消选择，这种操作不应该被允许
+            if(self.orgids==item.id){
+              self.initdataone(item);
+              return;
+            }
+            self.selectclick(item);
+            return;
+          }
+        })
+      }
     }
-    self.selectRes()
+    //self.selectRes()
   }
   export default {
     title: '资源树',
@@ -108,7 +149,9 @@
         model: [
 
         ],
-        childrenOptions: []
+        childrenOptions: [],
+        childrenregionOption:[],
+        isselect: false
       }
     },
     methods: {
@@ -134,6 +177,23 @@
           this.childrenOptions.push(val)
         }
       },
+      initregion(val){
+        if(val ==null ) return;
+        val.forEach((item)=>{
+          if(item.name != null){
+            if(item.name.includes("公司")){
+              return;
+            }else{
+              this.initregion(item.children)
+              this.childrenregionOption.push({label:"",value:item})
+              //return item;
+            }
+          }else{
+            return;
+          }
+        })
+
+      },
       async buluer (val) {
         this.strsign=val
         await new Promise(resolve => {
@@ -176,6 +236,26 @@
           this.$emit('re-res', newobj)
         }
       },
+      initdataone(row){
+        //点中点击
+        this.orgnames=row.name
+        this.orgids=row.id
+        this.orgobj=row
+        let objs=[]
+        let objids=[]
+        let objnames=[]
+        this.addResChild(row,objs)
+        objs.forEach((item) => {
+          objids.push(item.id)
+          objnames.push(item.name)
+        })
+        let newobj={
+          "res": objnames,
+          "resids": objids,
+          "orgobj": objs,
+        }
+        this.$emit('re-res', newobj)
+      },
       addResChild(val,objs){
         objs.push(val)
         if(val.children && val.children.length>0){

package/src/components/server/RoleSelector.vue

@@ -55,6 +55,7 @@
         .then(res => {
           console.log('res-->' + JSON.stringify(res))
           this.allUsers = res.data
+          this.filterUser([this.$login.f.orgid])
         })
     },
     methods: {
@@ -65,9 +66,9 @@
         this.$dispatch('re-res',obj)
       },
       filterUser(resids) {
-        // 处理第一次进入页面值异常问题 
+        // 处理第一次进入页面值异常问题
         if(resids.length > 0 && typeof resids[0] == "object"){
-          resids = resids[0]
+            resids = resids[0]
         }
         this.users = []
         this.allUsers.forEach(user => {
@@ -86,4 +87,4 @@
 
 <style scoped>
 
-</style>
+</style>

package/src/components/server/TestResSelectGroup.vue

@@ -42,7 +42,7 @@
 
                   <export-excel :data="$parent.$parent.getCondition"
                                 :field="$parent.$parent.getfield"
-                                sqlurl="rs/logic/exportfile" sql-name="chargeQuery" template-name='收费查询导出'
+                                sqlurl="api/af-revenue/logic/exportfile" sql-name="chargeQuery" template-name='收费查询导出'
                                 :choose-col="true"></export-excel>
 
                   <print-data :model="$parent.model" :field="$parent.$parent.getfield"
@@ -342,7 +342,7 @@
         gasproperties:[],
         showinfo: false,
         data: {},
-        model: new PagedList('rs/sql/chargeQuery', 20, {}, {
+        model: new PagedList('api/af-system/sql/chargeQuery', 20, {}, {
           f_pregas: 0,
           f_preamount: 0,
           f_delaypay: 0,

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,41 +1,29 @@
 import Vue from 'vue'
-import JSEncrypt from 'jsencrypt'
 import {HttpResetClass} from 'vue-client'
 
-let loginGen = async function (name, password) {
-  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')
-  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
-    })
-    console.log('登陆获取Util', JSON.stringify(resource.data))
-    Vue.$login.f = resource.data
-    //获取jwt
-    Vue.$login.jwt = getLogin.data.jwt
-    // 把登录用户添加到cookie里
-    Vue.cookie.set('loginId', Vue.$login.f.id)
-
-    try {
-      //获取有权限的功能树
-      let hasRight = await Vue.resetpost(`/rs/search`, {
+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) {
+      //获取jwt
+      if (getLogin.data.resources.data && getLogin.data.resources.data.id){
+        Vue.$login.jwt = getLogin.data.resources.data.id
+        Vue.$login.f =  getLogin.data.resources.data
+      }else {
+        Vue.$login.jwt = getLogin.data.resources.id
+        Vue.$login.f =  getLogin.data.resources
+      }
+      Vue.$login.jwtNew = getLogin.data.access_token
+      // 把登录用户添加到cookie里
+      Vue.cookie.set('loginId', Vue.$login.f.id)
+      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
-        })
-      console.log('有权限功能返回数据', JSON.stringify(hasRight.data))
+        }, { resolveMsg: null, rejectMsg: null })
       //准备替换功能树
       var fun=[]
       hasRight.data[0].children[0].children.forEach((item) => {
@@ -45,8 +33,6 @@ let loginGen = async function (name, password) {
           })
         }
       })
-      // console.log('替换前', JSON.stringify(Vue.$login.f.functions))
-      // console.log('替换后', JSON.stringify(fun))
       Vue.$login.f.functions=fun
     }catch (error) {
     }
@@ -81,37 +67,37 @@ let loginGen = async function (name, password) {
         Vue.$login.f.f_gasman = []
         console.log('抄表员模块',error)
       }
-      // 获取安装人
-      try {
-        let getInstallman = await Vue.resetpost('/rs/search', {
-          source: 'this.getParentByType($organization$).getChildByName($安装员$).getUsers()',
-          userid: Vue.$login.f.id
-        }, {resolveMsg: null, rejectMsg: null})
-        console.log('获取安装员', getInstallman)
-        let installman = []
-        for (let i = 0; i < getInstallman.data.length; i++) {
-          installman.push(getInstallman.data[i])
-        }
-        Vue.$login.f.f_installman = installman
-      }catch (error) {
-        Vue.$login.f.f_installman =[]
-        console.log('安装人模块',error)
-      }
+      // // 获取安装人
+      // try {
+      //   let getInstallman = await Vue.resetpost('/rs/search', {
+      //     source: 'this.getParentByType($organization$).getChildByName($安装员$).getUsers()',
+      //     userid: Vue.$login.f.id
+      //   }, {resolveMsg: null, rejectMsg: null})
+      //   console.log('获取安装员', getInstallman)
+      //   let installman = []
+      //   for (let i = 0; i < getInstallman.data.length; i++) {
+      //     installman.push(getInstallman.data[i])
+      //   }
+      //   Vue.$login.f.f_installman = installman
+      // }catch (error) {
+      //   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 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 +113,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', {
@@ -178,15 +164,14 @@ let loginGen = async function (name, password) {
       // 定时发送心跳
       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()
-              }
-            })
+            // Vue.showMessage(req.data.msg+",您将被强制退出系统", ['confirm']).then((res) => {
+            //   if (res === 'confirm') {
+            //     location.reload()
+            //   }
+            // })
           }
         })
       }, 2 * 60 * 1000)
@@ -511,5 +496,4 @@ let GetLoginInfoService = {
     return ds[0] + '-' + (nextMonth < 10 ? '0' + nextMonth : nextMonth) + '-20 00:00:00'
   }
 }
-
 export default GetLoginInfoService