system-clients 3.1.89-9 → 3.1.89-xianyang

package/src/components/server/RightTree.vue

@@ -1,6 +1,6 @@
 <template>
   <dropdown :model='model' class="auto" id="res-tree" v-if="!islist" v-el:dropdown :style="{width:width}">
-    <button type="button" class="btn btn-default dropdown-toggle select-style" data-toggle="dropdown">
+    <button type="button" class="btn btn-default dropdown-toggle select-style" data-toggle="dropdown" style="min-width: 100%;">
       <span class='btn-content' :style="{textOverflow:'ellipsis',overflow: 'hidden'}">{{ orgnames }}</span>
       <span class="caret"></span>
     </button>
@@ -31,156 +31,148 @@
             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;
+  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
     }
-  }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 ){
+    // 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&&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]){
         //默认加载如果已选中的和传入参数相等会取消选择，这种操作不应该被允许
         if(self.orgids==item.id){
-          self.initdataone(item);
           return;
         }
-        self.selectclick(item);
+        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(!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);
+          self.selectclick(item)
           return;
         }
       })
-    }
-  }
-  //self.selectRes()
-}
-export default {
-  title: '资源树',
-  props: {
-    searchText:'',
-    strsign:'',
-    source: {
-      type: String,
-      require: true,
-      default:`tool.getFullTree(this.getRights().where(row.getType() == $organization$))`
-    },
-    //资源初始化数据
-    initresid: {
-      type: Array,
-      default() { return [] },
-    },
-    resid: {
-    },
-    islist: {
-      type: Boolean,
-      default: false
-    },
-    //是否有查看上级的权限
-    Url:{
-      type: String,
-      default:''
-    },
-    width:{
-      type:String,
-      default:'60%'
-    }
-  },
-  data () {
-    return {
-      resobj:{res:this.$login.f.orgs, resids:this.$login.f.orgid},
-      userid: this.$login.f.id,
-      resname:[this.$login.f.orgs],
-      orgnames : "请选择",
-      //单选点击 返回所有子
-      orgids : null,
-      orgobj:null,
-      model: [
+      }
+
 
-      ],
-      childrenOptions: [],
-      childrenregionOption:[],
-      isselect: false
     }
-  },
-  methods: {
-    selectRes () {
-      let newobj={
-        "res": [this.resname],
-        "resids": [this.orgids],
-      }
-      this.$emit('re-res', newobj)
-    },
-    //树形结构变成list
-    initTreetoList(val) {
-      for (let value of val) {
-        this.initErgodicList(value)
+    self.selectRes()
+  }
+  export default {
+    title: '资源树',
+    props: {
+      searchText:'',
+      strsign:'',
+      source: {
+        type: String,
+        require: true,
+        default:`tool.getFullTree(this.getRights().where(row.getType() == $organization$))`
+      },
+      //资源初始化数据
+      initresid: {
+        type: Array,
+        default() { return [] },
+      },
+      resid: {
+      },
+      islist: {
+        type: Boolean,
+        default: false
+      },
+      //是否有查看上级的权限
+      Url:{
+        type: String,
+        default:''
+      },
+      width:{
+        type:String,
+        default:'60%'
       }
     },
-    //找到跟节点
-    initErgodicList (val) {
-      if(val.children.length > 0){
-        this.childrenOptions.push(val)
-        this.treetoList(val.children)
-      }else{
-        this.childrenOptions.push(val)
+    data () {
+      return {
+        resobj:{res:this.$login.f.orgs, resids:this.$login.f.orgid},
+        userid: this.$login.f.id,
+        resname:[this.$login.f.orgs],
+        orgnames : "请选择",
+        //单选点击 返回所有子
+        orgids : null,
+        orgobj:null,
+        model: [
+
+        ],
+        childrenOptions: [],
+        childrenregionOption:[],
+        isselect: false
       }
     },
-    initregion(val){
-      if(val ==null ) return;
-      val.forEach((item)=>{
-        if(item.name != null){
+    methods: {
+      selectRes () {
+        let newobj={
+          "res": [this.resname],
+          "resids": [this.orgids],
+        }
+        this.$emit('re-res', newobj)
+      },
+      //树形结构变成list
+      initTreetoList(val) {
+        for (let value of val) {
+          this.initErgodicList(value)
+        }
+      },
+      //找到跟节点
+      initErgodicList (val) {
+        if(val.children.length > 0){
+          this.childrenOptions.push(val)
+          this.treetoList(val.children)
+        }else{
+          this.childrenOptions.push(val)
+        }
+      },
+      initregion(val){
+        if(val ==null ) return;
+        val.forEach((item)=>{
+          if(item.name != null){
           if(item.name.includes("公司")){
             return;
           }else{
@@ -193,50 +185,29 @@ export default {
         }
       })
 
-    },
-    async buluer (val) {
-      this.strsign=val
-      await new Promise(resolve => {
-        this.$nextTick(() => {
-          resolve()
-        })
+      },
+      async buluer (val) {
+    this.strsign=val
+    await new Promise(resolve => {
+      this.$nextTick(() => {
+        resolve()
       })
-    },
-    //点击资源的方法
-    selectclick (row) {
-      if(this.orgids==row.id){
-        //取消点击
-        this.orgnames="请选择"
-        this.orgids=null
-        this.orgobj=null
-        let newobj={
-          "res": [],
-          "resids": [],
-          "orgobj": [],
-        }
-        this.$emit('re-res', newobj)
-      }else{
-        //点中点击
-        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)
+  })
+  },
+  //点击资源的方法
+  selectclick (row) {
+    if(this.orgids==row.id){
+      //取消点击
+      this.orgnames="请选择"
+      this.orgids=null
+      this.orgobj=null
+      let newobj={
+        "res": [],
+        "resids": [],
+        "orgobj": [],
       }
-    },
-    initdataone(row){
+      this.$emit('re-res', newobj)
+    }else{
       //点中点击
       this.orgnames=row.name
       this.orgids=row.id
@@ -255,54 +226,55 @@ export default {
         "orgobj": objs,
       }
       this.$emit('re-res', newobj)
-    },
-    addResChild(val,objs){
-      objs.push(val)
-      if(val.children && val.children.length>0){
-        Object.keys(val.children).forEach((key) => {
-          this.addResChild(val.children[key],objs)
-        })
-      }
-      return objs
-    },
-    //检查是否显示对勾
-    isSelect(val) {
-      if(this.orgids==val){
-        return true
-      }else{
-        return false
-      }
-    },
-    //树形结构变成list
-    treetoList(val) {
-      for (let value of val) {
-        this.ergodicList(value)
-      }
-    },
-    //找到跟节点
-    ergodicList (val) {
-      val.children.length > 0 ? this.treetoList(val.children) : this.childrenOptions.push({label: val.name, value: val})
-    },
-    //处理显示默认值
-    dealResObj (val) {
-      try{
-        var arr=val.res.split(".")
-        //截取最后一个分公司名字
-        this.resname=arr[arr.length-1].toString()
-        this.orgnames=arr[arr.length-1].toString()
-        this.resid = val.resids
-        this.orgids = val.resids
-      }catch (e){
-        this.resname='请选择组织'
-      }
-    },
-    judgBoundary(){
-      //判断是否超出边界，超出移动
-      if(document.documentElement.offsetWidth< this.$els.dropdown.getBoundingClientRect().right){
-        this.left = document.documentElement.offsetWidth - this.$els.dropdown.getBoundingClientRect().right - 25
-      }
     }
   },
+  addResChild(val,objs){
+    objs.push(val)
+    if(val.children && val.children.length>0){
+      Object.keys(val.children).forEach((key) => {
+        this.addResChild(val.children[key],objs)
+      })
+    }
+    return objs
+  },
+  //检查是否显示对勾
+  isSelect(val) {
+    if(this.orgids==val){
+      return true
+    }else{
+      return false
+    }
+  },
+  //树形结构变成list
+  treetoList(val) {
+    for (let value of val) {
+      this.ergodicList(value)
+    }
+  },
+  //找到跟节点
+  ergodicList (val) {
+    val.children.length > 0 ? this.treetoList(val.children) : this.childrenOptions.push({label: val.name, value: val})
+  },
+  //处理显示默认值
+  dealResObj (val) {
+    try{
+      var arr=val.res.split(".")
+      //截取最后一个分公司名字
+      this.resname=arr[arr.length-1].toString()
+      this.orgnames=arr[arr.length-1].toString()
+      this.resid = val.resids
+      this.orgids = val.resids
+    }catch (e){
+      this.resname='请选择组织'
+    }
+  },
+  judgBoundary(){
+    //判断是否超出边界，超出移动
+    if(document.documentElement.offsetWidth< this.$els.dropdown.getBoundingClientRect().right){
+      this.left = document.documentElement.offsetWidth - this.$els.dropdown.getBoundingClientRect().right - 25
+    }
+  }
+  },
   events: {
 
   },
@@ -313,31 +285,30 @@ export default {
   },
   watch: {
   }
-}
+  }
 </script>
 <style lang="less">
-#res-tree {
-  .list-group-item {
-    background-color: #FFF;
-    color: #000;
-    padding: 5px 10px;
-    border:0px;
-    white-space: nowrap;
+  #res-tree {
+    .list-group-item {
+      background-color: #FFF;
+      color: #000;
+      padding: 5px 10px;
+      border:0px;
+      white-space: nowrap;
+    }
+  }
+  #res-tree .list-group {
+    width: auto;
+    min-width: 100%;
+  }
+  .hide-text-overflow{
+    overflow: hidden;
+    text-overflow: ellipsis
+  }
+  .select-style {
+    /*border-bottom: 2px solid #C9CCCF;*/
+    border: 1px solid #93B2D3 !important;
+    border-radius: 0px !important;
+    color: #555;
   }
-}
-#res-tree .list-group {
-  width: auto;
-  min-width: 100%;
-}
-.hide-text-overflow{
-  overflow: hidden;
-  text-overflow: ellipsis
-}
-.select-style {
-  border: 0px;
-  /*border-bottom: 2px solid #C9CCCF;*/
-  border: 1px solid #93B2D3;
-  border-radius: 0px;
-  color: #555;
-}
 </style>

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,6 +1,7 @@
 import Vue from 'vue'
 import JSEncrypt from 'jsencrypt'
 import {HttpResetClass} from 'vue-client'
+import cryptJS from './EncryptUtil'
 
 let loginGen = async function (name, password) {
   let data = {name: name, password: password}
@@ -203,6 +204,7 @@ let GetLoginInfoService = {
   afterLogin: [],
   //验证码开关
   Verification: true,
+  SinglePageToken: {},
   install (Vue, options) {
     // 给vue增添对话框显示方法
     Vue.$login = Vue.prototype.$login = GetLoginInfoService
@@ -218,6 +220,7 @@ let GetLoginInfoService = {
    * @param password
    */
   login (name, password) {
+    Vue.$login.SinglePageToken = cryptJS.AESEncrypt(JSON.stringify({name: name, password: password}), "3KMKqvgwR8ULbR8Z")
     return loginGen(name, password)
   },
 

package/src/plugins/validation.js

@@ -3,5 +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)
+  return /^(?:(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(val)
 });

package/src/system.js

@@ -26,11 +26,15 @@ import ResSelectGroup from './components/server/ResSelectGroup'
 //资源选择测试
 import TestResSelect from './components/server/TestResSelect'
 import RoleSelector from "./components/server/RoleSelector";
-export default function (val) {
+export default function (val,version) {
   //验证码开关赋值
   if(val!=null){
     GetLoginInfoService.Verification=val
   }
+  //版本号赋值
+  if(val!=null){
+    GetLoginInfoService.version=version
+  }
   Vue.use(GetLoginInfoService)
   Vue.use(GetAppDataService)
   Vue.use(HeatGetLoginInfoService)
@@ -75,13 +79,11 @@ export default function (val) {
   Vue.component('phone-manage', (resolve) => { require(['./components/equipment/PhoneManage'], resolve) })
   // pos端控制
   Vue.component('pos-manage', (resolve) => { require(['./components/equipment/PosManage'], resolve) })
+  // pos端控制
+  Vue.component('qc-manage', (resolve) => { require(['./components/equipment/QCManage'], 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) })
 
 }

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Fri Mar 13 10:30:51 GMT+08:00 2020
-gradle.version=3.5

package/.gradle/buildOutputCleanup/cache.properties.lock

@@ -1 +0,0 @@
-