system-clients 3.0.46 → 3.0.47-fanxian

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (100) hide show
  1. package/.babelrc +5 -5
  2. package/.editorconfig +9 -9
  3. package/.eslintrc.js +16 -16
  4. package/.gradle/buildOutputCleanup/cache.properties +2 -2
  5. package/README.md +36 -36
  6. package/SystemClient.iml +11 -11
  7. package/build/css-loaders.js +34 -34
  8. package/build/dev-client.js +8 -8
  9. package/build/example-server.js +80 -80
  10. package/build/release.sh +28 -28
  11. package/build/utils.js +71 -71
  12. package/build/webpack.base.conf.js +75 -75
  13. package/build/webpack.dev.conf.js +31 -31
  14. package/build/webpack.example.conf.js +49 -49
  15. package/build/webpack.prod.conf.js +60 -60
  16. package/build/webpack.test.conf.js +31 -31
  17. package/build.gradle +6 -6
  18. package/config/dev.env.js +6 -6
  19. package/config/index.js +38 -38
  20. package/config/prod.env.js +3 -3
  21. package/config/test.env.js +6 -6
  22. package/doc/Login.md +7 -7
  23. package/examples/ReadCard/App.vue +23 -23
  24. package/examples/ReadCard/index.html +11 -11
  25. package/examples/ReadCard/main.js +12 -12
  26. package/index.html +21 -21
  27. package/package.json +1 -1
  28. package/release.bat +5 -5
  29. package/src/App.vue +24 -24
  30. package/src/LodopFuncs.js +123 -123
  31. package/src/assets/binding.svg +1 -1
  32. package/src/assets/unbind.svg +1 -1
  33. package/src/assets//345/205/254/345/221/212.svg +1 -1
  34. package/src/assets//347/207/203/346/260/224/347/274/264/350/264/271.eps +116 -116
  35. package/src/assets//350/201/224/347/263/273/346/210/221/344/273/254.svg +1 -1
  36. package/src/components/List.vue +51 -51
  37. package/src/components/Main.vue +632 -533
  38. package/src/components/Table.js +74 -74
  39. package/src/components/Util.js +343 -343
  40. package/src/components/equipment/EquipmentManage.vue +65 -65
  41. package/src/components/equipment/PcAdd.vue +105 -105
  42. package/src/components/equipment/PcList.vue +119 -119
  43. package/src/components/equipment/PcManage.vue +60 -60
  44. package/src/components/equipment/PhoneAdd.vue +94 -94
  45. package/src/components/equipment/PhoneList.vue +102 -102
  46. package/src/components/equipment/PhoneManage.vue +60 -60
  47. package/src/components/equipment/PosAdd.vue +137 -137
  48. package/src/components/equipment/PosList.vue +156 -156
  49. package/src/components/equipment/PosManage.vue +67 -67
  50. package/src/components/materialManage/materialData.vue +44 -44
  51. package/src/components/materialManage/materialList.vue +255 -255
  52. package/src/components/parammanage/AlarmInformation.vue +122 -0
  53. package/src/components/parammanage/ParamManage.vue +42 -42
  54. package/src/components/parammanage/ParamManages.vue +43 -43
  55. package/src/components/parammanage/ParamPage.vue +314 -314
  56. package/src/components/parammanage/ParamPages.vue +214 -222
  57. package/src/components/parammanage/SinglePage.vue +237 -235
  58. package/src/components/parammanage/SinglePages.vue +161 -167
  59. package/src/components/server/AddChangeMsg.vue +66 -66
  60. package/src/components/server/ChangeDeclare.vue +45 -45
  61. package/src/components/server/IconTree.vue +26 -26
  62. package/src/components/server/LeftTree.vue +111 -111
  63. package/src/components/server/LoadData.vue +36 -36
  64. package/src/components/server/Login.vue +625 -624
  65. package/src/components/server/Menu.vue +188 -188
  66. package/src/components/server/ModifyPw.vue +125 -106
  67. package/src/components/server/ResSelect.vue +150 -150
  68. package/src/components/server/ResSelectGroup.vue +140 -140
  69. package/src/components/server/RightTree.vue +263 -263
  70. package/src/components/server/RoleSelector.vue +88 -88
  71. package/src/components/server/TestResSelect.vue +1 -1
  72. package/src/components/server/TestResSelectGroup.vue +388 -388
  73. package/src/components/server/TestRightTree.vue +42 -42
  74. package/src/index.js +7 -7
  75. package/src/plugins/GetLoginInfoService.js +509 -513
  76. package/src/plugins/validation.js +7 -7
  77. package/src/project/ProjectPage.vue +24 -24
  78. package/src/project/State.js +17 -17
  79. package/src/stores/AppData.js +38 -38
  80. package/src/system.js +78 -76
  81. package/src/systemphone.js +11 -11
  82. package/src/util/LdapHelper.js +75 -75
  83. package/static/newStyle/alarm.mp3 +0 -0
  84. package/test/e2e/custom-assertions/elementCount.js +26 -26
  85. package/test/e2e/nightwatch.conf.js +40 -40
  86. package/test/e2e/runner.js +30 -30
  87. package/test/e2e/specs/test.js +14 -14
  88. package/test/unit/.eslintrc +5 -5
  89. package/test/unit/index.js +13 -13
  90. package/test/unit/init.js +10 -10
  91. package/test/unit/specs/base64.spec.js +5 -5
  92. package/test/unit/specs/components/parammanage/SinglePage.spec.js +20 -20
  93. package/test/unit/specs/components/server/LeftTree/App.vue +18 -18
  94. package/test/unit/specs/components/server/LoadData.spec.js +24 -24
  95. package/test/unit/specs/components/server/Login.spec.js +61 -61
  96. package/test/unit/specs/components/server/RightTree.spec.js +50 -50
  97. package/test/unit/specs/plugins/GetLoginInfoService.spec.js +55 -55
  98. package/test/unit/test.html +76 -76
  99. package/.gradle/3.5.1/file-changes/last-build.bin +0 -0
  100. package/.gradle/3.5.1/taskHistory/taskHistory.lock +0 -0
@@ -1,89 +1,89 @@
1
- <template>
2
- <div style="width: 100%;height: 100%">
3
- <div class="col-sm-6">
4
- <label class="font_normal_body">&nbsp;公&nbsp;&nbsp;&nbsp;&nbsp;司&nbsp;</label>
5
- <right-tree :width="leftWidth" @re-res="getRes"></right-tree>
6
- </div>
7
- <div class="col-sm-6 ">
8
- <label class="font_normal_body">{{roleLable}}</label>
9
- <v-select :value.sync="value" v-model='model.f_checker_id'
10
- :value-single="true"
11
- class="select_list select"
12
- :options='users' :placeholder='roleName'
13
- close-on-select
14
- :width="rightWidth">
15
- </v-select>
16
- </div>
17
- </div>
18
- </template>
19
-
20
- <script>
21
- export default {
22
- name: "RoleSelector",
23
- props: {
24
- roleName: {
25
- type: String,
26
- default: '安检员'
27
- },
28
- roleLable: {
29
- type: String,
30
- default: '安检员'
31
- },
32
- leftWidth: {
33
- type: String,
34
- default: '60%'
35
- },
36
- rightWidth: {
37
- type: String,
38
- default: '60%'
39
- },
40
- value: {
41
- type: String,
42
- default: ''
43
- }
44
- },
45
- data() {
46
- return {
47
- source: `tool.getChildrenOfResName($${this.roleName}$)`,
48
- allUsers: [],
49
- users: [],
50
- resids: []
51
- }
52
- },
53
- ready() {
54
- this.$resetpost('/rs/search', {data: {source: this.source, userid: this.$login.f.id}}, {resolveMsg: null, rejectMsg: null})
55
- .then(res => {
56
- console.log('res-->' + JSON.stringify(res))
57
- this.allUsers = res.data
58
- })
59
- },
60
- methods: {
61
- getRes(obj) {
62
- this.resids = obj.resids
63
- console.log(this.resids)
64
- this.filterUser(this.resids)
65
- this.$dispatch('re-res',obj)
66
- },
67
- filterUser(resids) {
68
- // 处理第一次进入页面值异常问题
69
- if(resids.length > 0 && typeof resids[0] == "object"){
70
- resids = resids[0]
71
- }
72
- this.users = []
73
- this.allUsers.forEach(user => {
74
- if (resids.indexOf(user.orgid) != -1) {
75
- this.users.push({label: user.name, value: user.name})
76
- }
77
- })
78
- if(this.users.length > 0){
79
- this.users = [{label: '全部', value: ''},...this.users]
80
- }
81
- console.log(this.users)
82
- }
83
- }
84
- }
85
- </script>
86
-
87
- <style scoped>
88
-
1
+ <template>
2
+ <div style="width: 100%;height: 100%">
3
+ <div class="col-sm-6">
4
+ <label class="font_normal_body">&nbsp;公&nbsp;&nbsp;&nbsp;&nbsp;司&nbsp;</label>
5
+ <right-tree :width="leftWidth" @re-res="getRes"></right-tree>
6
+ </div>
7
+ <div class="col-sm-6 ">
8
+ <label class="font_normal_body">{{roleLable}}</label>
9
+ <v-select :value.sync="value" v-model='model.f_checker_id'
10
+ :value-single="true"
11
+ class="select_list select"
12
+ :options='users' :placeholder='roleName'
13
+ close-on-select
14
+ :width="rightWidth">
15
+ </v-select>
16
+ </div>
17
+ </div>
18
+ </template>
19
+
20
+ <script>
21
+ export default {
22
+ name: "RoleSelector",
23
+ props: {
24
+ roleName: {
25
+ type: String,
26
+ default: '安检员'
27
+ },
28
+ roleLable: {
29
+ type: String,
30
+ default: '安检员'
31
+ },
32
+ leftWidth: {
33
+ type: String,
34
+ default: '60%'
35
+ },
36
+ rightWidth: {
37
+ type: String,
38
+ default: '60%'
39
+ },
40
+ value: {
41
+ type: String,
42
+ default: ''
43
+ }
44
+ },
45
+ data() {
46
+ return {
47
+ source: `tool.getChildrenOfResName($${this.roleName}$)`,
48
+ allUsers: [],
49
+ users: [],
50
+ resids: []
51
+ }
52
+ },
53
+ ready() {
54
+ this.$resetpost('/rs/search', {data: {source: this.source, userid: this.$login.f.id}}, {resolveMsg: null, rejectMsg: null})
55
+ .then(res => {
56
+ console.log('res-->' + JSON.stringify(res))
57
+ this.allUsers = res.data
58
+ })
59
+ },
60
+ methods: {
61
+ getRes(obj) {
62
+ this.resids = obj.resids
63
+ console.log(this.resids)
64
+ this.filterUser(this.resids)
65
+ this.$dispatch('re-res',obj)
66
+ },
67
+ filterUser(resids) {
68
+ // 处理第一次进入页面值异常问题
69
+ if(resids.length > 0 && typeof resids[0] == "object"){
70
+ resids = resids[0]
71
+ }
72
+ this.users = []
73
+ this.allUsers.forEach(user => {
74
+ if (resids.indexOf(user.orgid) != -1) {
75
+ this.users.push({label: user.name, value: user.name})
76
+ }
77
+ })
78
+ if(this.users.length > 0){
79
+ this.users = [{label: '全部', value: ''},...this.users]
80
+ }
81
+ console.log(this.users)
82
+ }
83
+ }
84
+ }
85
+ </script>
86
+
87
+ <style scoped>
88
+
89
89
  </style>
@@ -15,7 +15,7 @@
15
15
  <label>人员:</label>
16
16
  <res-select :restype='userrestype'
17
17
  @res-select="getuser"
18
- :parentresid="depresid"
18
+ :parentresid="userresid"
19
19
  :initresid='initresid'>
20
20
  </res-select>
21
21
  </div>