system-clients 3.1.89-20 → 3.1.89-20-rongchuang-1

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 (199) hide show
  1. package/.babelrc +5 -5
  2. package/.editorconfig +9 -9
  3. package/.eslintrc.js +16 -16
  4. package/.gradle/6.8/executionHistory/executionHistory.bin +0 -0
  5. package/.gradle/6.8/executionHistory/executionHistory.lock +0 -0
  6. package/.gradle/6.8/fileChanges/last-build.bin +0 -0
  7. package/.gradle/6.8/fileHashes/fileHashes.bin +0 -0
  8. package/.gradle/6.8/fileHashes/fileHashes.lock +0 -0
  9. package/.gradle/{buildOutputCleanup/built.bin → 6.8/gc.properties} +0 -0
  10. package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
  11. package/.gradle/buildOutputCleanup/cache.properties +2 -2
  12. package/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
  13. package/.gradle/checksums/checksums.lock +0 -0
  14. package/.gradle/configuration-cache/gc.properties +0 -0
  15. package/CHANGELOG.md +51 -51
  16. package/README.md +36 -36
  17. package/SystemClient.iml +11 -11
  18. package/build/css-loaders.js +34 -34
  19. package/build/dev-client.js +8 -8
  20. package/build/example-server.js +80 -80
  21. package/build/release.sh +28 -28
  22. package/build/utils.js +71 -71
  23. package/build/webpack.base.conf.js +75 -75
  24. package/build/webpack.dev.conf.js +31 -31
  25. package/build/webpack.example.conf.js +49 -49
  26. package/build/webpack.prod.conf.js +60 -60
  27. package/build/webpack.test.conf.js +31 -31
  28. package/build.gradle +6 -6
  29. package/config/dev.env.js +6 -6
  30. package/config/index.js +38 -38
  31. package/config/prod.env.js +3 -3
  32. package/config/test.env.js +6 -6
  33. package/doc/Login.md +7 -7
  34. package/examples/ReadCard/App.vue +23 -23
  35. package/examples/ReadCard/index.html +11 -11
  36. package/examples/ReadCard/main.js +12 -12
  37. package/gradle/wrapper/gradle-wrapper.jar +0 -0
  38. package/gradle/wrapper/gradle-wrapper.properties +5 -0
  39. package/gradlew +185 -0
  40. package/gradlew.bat +89 -0
  41. package/index.html +21 -21
  42. package/package.json +1 -1
  43. package/release.bat +5 -5
  44. package/src/App.vue +24 -24
  45. package/src/LodopFuncs.js +123 -123
  46. package/src/assets/binding.svg +1 -1
  47. package/src/assets/unbind.svg +1 -1
  48. package/src/assets//345/205/254/345/221/212.svg +1 -1
  49. package/src/assets//347/207/203/346/260/224/347/274/264/350/264/271.eps +116 -116
  50. package/src/assets//350/201/224/347/263/273/346/210/221/344/273/254.svg +1 -1
  51. package/src/components/List.vue +51 -51
  52. package/src/components/Main.vue +676 -589
  53. package/src/components/Table.js +74 -74
  54. package/src/components/Util.js +343 -343
  55. package/src/components/equipment/EquipmentManage.vue +65 -65
  56. package/src/components/equipment/PcAdd.vue +105 -105
  57. package/src/components/equipment/PcList.vue +119 -119
  58. package/src/components/equipment/PcManage.vue +60 -60
  59. package/src/components/equipment/PhoneAdd.vue +94 -94
  60. package/src/components/equipment/PhoneList.vue +102 -102
  61. package/src/components/equipment/PhoneManage.vue +60 -60
  62. package/src/components/equipment/PosAdd.vue +299 -299
  63. package/src/components/equipment/PosList.vue +254 -254
  64. package/src/components/equipment/PosManage.vue +150 -150
  65. package/src/components/materialManage/materialData.vue +44 -44
  66. package/src/components/materialManage/materialList.vue +255 -255
  67. package/src/components/parammanage/ParamManage.vue +42 -42
  68. package/src/components/parammanage/ParamManages.vue +43 -43
  69. package/src/components/parammanage/ParamPages.vue +222 -222
  70. package/src/components/parammanage/SinglePages.vue +167 -167
  71. package/src/components/server/AddChangeMsg.vue +66 -66
  72. package/src/components/server/ChangeDeclare.vue +45 -45
  73. package/src/components/server/IconTree.vue +26 -26
  74. package/src/components/server/ImageVieweTest.vue +56 -56
  75. package/src/components/server/ImageViewer.vue +350 -350
  76. package/src/components/server/LeftTree.vue +111 -111
  77. package/src/components/server/LoadData.vue +36 -36
  78. package/src/components/server/Menu.vue +188 -188
  79. package/src/components/server/ModifyPw.vue +106 -106
  80. package/src/components/server/ResSelect.vue +155 -155
  81. package/src/components/server/ResSelectGroup.vue +196 -196
  82. package/src/components/server/RightTree.vue +348 -348
  83. package/src/components/server/RoleSelector.vue +88 -88
  84. package/src/components/server/TestResSelect.vue +58 -58
  85. package/src/components/server/TestResSelectGroup.vue +388 -388
  86. package/src/components/server/TestRightTree.vue +42 -42
  87. package/src/index.js +7 -7
  88. package/src/plugins/GetLoginInfoService.js +4 -2
  89. package/src/plugins/HeatGetLoginInfoService.js +491 -491
  90. package/src/plugins/validation.js +7 -7
  91. package/src/project/ProjectPage.vue +24 -24
  92. package/src/project/State.js +17 -17
  93. package/src/stores/AppData.js +38 -38
  94. package/src/stores/HeatAppData.js +38 -38
  95. package/src/styles/fonts/glyphicons-halflings-regular.svg +287 -287
  96. package/src/styles/less/.csscomb.json +304 -304
  97. package/src/styles/less/.csslintrc +19 -19
  98. package/src/styles/less/alerts.less +73 -73
  99. package/src/styles/less/aofeng/animate.min.css +10 -10
  100. package/src/styles/less/aofeng/expandcss.less +569 -569
  101. package/src/styles/less/aofeng/themeOne/loginStyle.less +1586 -1586
  102. package/src/styles/less/aofeng/themeOne/systemStyle.less +2650 -2650
  103. package/src/styles/less/aofeng/themeOne.less +17 -17
  104. package/src/styles/less/aofeng/themeTwo/newStyle1.less +415 -415
  105. package/src/styles/less/aofeng/themeTwo.less +3 -3
  106. package/src/styles/less/badges.less +66 -66
  107. package/src/styles/less/bootstrap.less +66 -66
  108. package/src/styles/less/breadcrumbs.less +26 -26
  109. package/src/styles/less/button-groups.less +247 -247
  110. package/src/styles/less/buttons.less +172 -172
  111. package/src/styles/less/carousel.less +269 -269
  112. package/src/styles/less/close.less +34 -34
  113. package/src/styles/less/code.less +69 -69
  114. package/src/styles/less/component-animations.less +33 -33
  115. package/src/styles/less/dropdowns.less +216 -216
  116. package/src/styles/less/fonts-list.less +25 -25
  117. package/src/styles/less/forms.less +626 -626
  118. package/src/styles/less/glyphicons.less +305 -305
  119. package/src/styles/less/grid.less +84 -84
  120. package/src/styles/less/input-groups.less +167 -167
  121. package/src/styles/less/jumbotron.less +52 -52
  122. package/src/styles/less/labels.less +64 -64
  123. package/src/styles/less/list-group.less +141 -141
  124. package/src/styles/less/manageStyle/manageChile.less +180 -180
  125. package/src/styles/less/manageStyle/manageStyle.less +1102 -1102
  126. package/src/styles/less/manageStyle/safeStyle.less +498 -498
  127. package/src/styles/less/media.less +66 -66
  128. package/src/styles/less/mixins/alerts.less +14 -14
  129. package/src/styles/less/mixins/background-variant.less +9 -9
  130. package/src/styles/less/mixins/border-radius.less +18 -18
  131. package/src/styles/less/mixins/buttons.less +69 -69
  132. package/src/styles/less/mixins/center-block.less +7 -7
  133. package/src/styles/less/mixins/clearfix.less +22 -22
  134. package/src/styles/less/mixins/forms.less +90 -90
  135. package/src/styles/less/mixins/gradients.less +59 -59
  136. package/src/styles/less/mixins/grid-framework.less +92 -92
  137. package/src/styles/less/mixins/grid.less +122 -122
  138. package/src/styles/less/mixins/hide-text.less +21 -21
  139. package/src/styles/less/mixins/image.less +33 -33
  140. package/src/styles/less/mixins/labels.less +12 -12
  141. package/src/styles/less/mixins/list-group.less +30 -30
  142. package/src/styles/less/mixins/nav-divider.less +10 -10
  143. package/src/styles/less/mixins/nav-vertical-align.less +9 -9
  144. package/src/styles/less/mixins/opacity.less +8 -8
  145. package/src/styles/less/mixins/pagination.less +24 -24
  146. package/src/styles/less/mixins/panels.less +24 -24
  147. package/src/styles/less/mixins/progress-bar.less +10 -10
  148. package/src/styles/less/mixins/reset-filter.less +8 -8
  149. package/src/styles/less/mixins/reset-text.less +18 -18
  150. package/src/styles/less/mixins/resize.less +6 -6
  151. package/src/styles/less/mixins/responsive-visibility.less +15 -15
  152. package/src/styles/less/mixins/size.less +10 -10
  153. package/src/styles/less/mixins/tab-focus.less +9 -9
  154. package/src/styles/less/mixins/table-row.less +44 -44
  155. package/src/styles/less/mixins/text-emphasis.less +9 -9
  156. package/src/styles/less/mixins/text-overflow.less +8 -8
  157. package/src/styles/less/mixins/vendor-prefixes.less +227 -227
  158. package/src/styles/less/mixins.less +40 -40
  159. package/src/styles/less/modals.less +151 -151
  160. package/src/styles/less/navbar.less +660 -660
  161. package/src/styles/less/navs.less +285 -285
  162. package/src/styles/less/normalize.less +424 -424
  163. package/src/styles/less/pager.less +76 -76
  164. package/src/styles/less/pagination.less +89 -89
  165. package/src/styles/less/panels.less +275 -275
  166. package/src/styles/less/popovers.less +131 -131
  167. package/src/styles/less/print.less +101 -101
  168. package/src/styles/less/progress-bars.less +87 -87
  169. package/src/styles/less/responsive-embed.less +35 -35
  170. package/src/styles/less/responsive-utilities.less +194 -194
  171. package/src/styles/less/scaffolding.less +161 -161
  172. package/src/styles/less/stand.less +207 -207
  173. package/src/styles/less/theme.less +291 -291
  174. package/src/styles/less/thumbnails.less +36 -36
  175. package/src/styles/less/tooltip.less +102 -102
  176. package/src/styles/less/utilities.less +55 -55
  177. package/src/styles/less/wells.less +29 -29
  178. package/src/system.js +87 -87
  179. package/src/systemphone.js +11 -11
  180. package/src/util/LdapHelper.js +75 -75
  181. package/test/e2e/custom-assertions/elementCount.js +26 -26
  182. package/test/e2e/nightwatch.conf.js +40 -40
  183. package/test/e2e/runner.js +30 -30
  184. package/test/e2e/specs/test.js +14 -14
  185. package/test/unit/.eslintrc +5 -5
  186. package/test/unit/index.js +13 -13
  187. package/test/unit/init.js +10 -10
  188. package/test/unit/karma.conf.js +49 -49
  189. package/test/unit/specs/base64.spec.js +5 -5
  190. package/test/unit/specs/components/parammanage/ParamPage.spec.js +20 -20
  191. package/test/unit/specs/components/parammanage/SinglePage.spec.js +20 -20
  192. package/test/unit/specs/components/server/LeftTree/App.vue +18 -18
  193. package/test/unit/specs/components/server/LeftTree/LeftTree.spec.js +22 -22
  194. package/test/unit/specs/components/server/LoadData.spec.js +24 -24
  195. package/test/unit/specs/components/server/Login.spec.js +61 -61
  196. package/test/unit/specs/components/server/RightTree.spec.js +50 -50
  197. package/test/unit/specs/plugins/GetLoginInfoService.spec.js +55 -55
  198. package/test/unit/test.html +76 -76
  199. package/.gradle/buildOutputCleanup/cache.properties.lock +0 -1
@@ -1,254 +1,254 @@
1
- <template>
2
- <div class="flex">
3
- <criteria-paged :model="model" v-ref:paged>
4
-
5
- <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
6
- <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
7
- <div class="row">
8
- <div class="col-sm-3 form-group">
9
- <label class="font_normal_body">公&nbsp;&nbsp;&nbsp;司</label>
10
- <res-select restype='organization'
11
- is-mul="false"
12
- @res-select="$parent.$parent.getorg"
13
- :initresid="$parent.$parent.curorgid">
14
- </res-select>
15
- </div>
16
- <div class="col-sm-3 form-group">
17
- <label class="font_normal_body">设备编号</label>
18
- <input type="text" class="input_search" style="width:60%" v-model="model.f_terminal_number"
19
- condition="f_terminal_number like '%{}%'" placeholder="设备编号">
20
- </div>
21
- <div class="col-sm-3 form-group">
22
- <label class="font_normal_body">所属人员</label>
23
- <right-tree @re-res="$parent.$parent.getRes" :source="$parent.$parent.source"></right-tree>
24
- </div>
25
-
26
- <div class="span" style="float:right;">
27
- <button type="button" class="button_search" @click="search()" v-el:cx>查询</button>
28
- <button type="button" class="button_search" @click="$parent.$parent.add() " v-el:cx >新增</button>
29
- <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
30
- @click="$parent.$parent.hidden()"></div>
31
- </div>
32
- </div>
33
- <div class="row" v-show="$parent.$parent.criteriaShow">
34
- <div class="col-sm-3 form-group">
35
- <label class="font_normal_body">所在地</label>
36
- <input type="text" class="input_search" style="width:60%" v-model="model.f_address"
37
- condition="f_address like '%{}%'" placeholder="所在地">
38
- </div>
39
- <div class="col-sm-3 form-group">
40
- <label class="font_normal_body">设备名称</label>
41
- <input type="text" class="input_search" style="width:60%" v-model="model.f_terminal_name"
42
- condition="f_terminal_name like '%{}%'" placeholder="设备名称">
43
- </div>
44
- <div class="col-sm-3 form-group">
45
- <label class="font_normal_body">机器编号</label>
46
- <input type="text" class="input_search" style="width:60%" v-model="model.f_machine_number"
47
- condition="f_machine_number like '%{}%'" placeholder="机器编号">
48
- </div>
49
- <div class="col-sm-3 form-group">
50
- <label class="font_normal_body">所属银行</label>
51
- <input type="text" class="input_search" style="width:60%" v-model="model.f_bank_name"
52
- condition="f_bank_name like '%{}%'" placeholder="所属银行">
53
- </div>
54
- <div class="col-sm-3 form-group">
55
- <label class="font_normal_body">联系电话</label>
56
- <input type="text" class="input_search" style="width:60%" v-model="model.f_phone"
57
- condition="f_phone like '%{}%'" placeholder="联系电话">
58
- </div>
59
- </div>
60
- </div>
61
- </criteria>
62
- <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid >
63
- <template partial='head'>
64
- <tr>
65
- <th><input type="checkbox" name="ischeckbox_all_id" v-model="$parent.$parent.$parent.isSelAll" :value.sync="$parent.$parent.$parent.isSelAll" /></th>
66
- <th style="text-align:center;white-space:nowrap;">序号</th>
67
- <th style="text-align:center;white-space:nowrap;">设备编号</th>
68
- <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">设备类型</th>
69
- <th style="text-align:center;white-space:nowrap;">设备名称</th>
70
- <th style="text-align:center;white-space:nowrap;">所属公司</th>
71
- <th style="text-align:center;white-space:nowrap;">所属部门</th>
72
- <th style="text-align:center;white-space:nowrap;">所属人员</th>
73
- <th style="text-align:center;white-space:nowrap;">状态</th>
74
- <th style="text-align:center;white-space:nowrap;">机器编号</th>
75
- <th style="text-align:center;white-space:nowrap;">联系电话</th>
76
- <th style="text-align:center;white-space:nowrap;">所在地</th>
77
- <th style="text-align:center;white-space:nowrap;">所属银行</th>
78
- <th style="text-align:center;white-space:nowrap;">电池电量</th>
79
- <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">是否登录</th>
80
- <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">更新时间</th>
81
- <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">操作时间</th>
82
- <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">软件版本</th>
83
- <!-- <th style="text-align:center;white-space:nowrap;">使用人员</th>-->
84
- <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">操作人</th>
85
- <th style="text-align:center;white-space:nowrap;">失联状态</th>
86
- </tr>
87
- </template>
88
- <template partial='body':model="model">
89
- <tr>
90
- <td><input type="checkbox" name="checkbox_id" v-model="$parent.$parent.$parent.selPos" :value.sync="row"></td>
91
- <td style="text-align:center;white-space:nowrap;">{{$index+1}}</td>
92
- <td style="text-align:center;white-space:nowrap;"><span title="点击查看历史" @click="$parent.$parent.$parent.abcd(row)"><a>{{row.f_terminal_number}}</a></span></td>
93
- <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_equipment_type}}</td>
94
- <td style="text-align:center;white-space:nowrap;">{{row.f_terminal_name}}</td>
95
- <td style="text-align:center;white-space:nowrap;">{{row.f_user_orgname}}</td>
96
- <td style="text-align:center;white-space:nowrap;">{{row.f_depname}}</td>
97
- <td style="text-align:center;white-space:nowrap;">{{row.f_operator}}</td>
98
-
99
- <td style="text-align:center;white-space:nowrap;">{{row.f_state}}</td>
100
- <td style="text-align:center;white-space:nowrap;">{{row.f_machine_number}}</td>
101
- <td style="text-align:center;white-space:nowrap;">{{row.f_phone}}</td>
102
- <td style="text-align:center;white-space:nowrap;">{{row.f_address}}</td>
103
- <td style="text-align:center;white-space:nowrap;">{{row.f_bank_name}}</td>
104
- <td style="text-align:center;white-space:nowrap;">{{row.f_battery_level}}</td>
105
- <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_is_login}}</td>
106
- <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_hybrid_version}}</td>
107
- <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_operate_date}}</td>
108
- <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_appVer}}</td>
109
- <!-- <td style="text-align:center;white-space:nowrap;" >{{row.f_username}}</td>-->
110
- <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_operator}}</td>
111
- <td style="text-align:center;white-space:nowrap;" >{{row.isunknown}}</td>
112
- </tr>
113
- </template>
114
- </data-grid>
115
- </criteria-paged>
116
- </div>
117
- <modal v-show="infoshow" :show.sync="infoshow" v-ref:modal backdrop="false" width="800px" title="终端历史信息">
118
- <article slot="modal-body" class="modal-body">
119
- <criteria-paged :model="model2" v-ref:paged2>
120
- <data-grid :model="model2" v-ref:grid2 partial='list'>
121
- <template partial='head'>
122
- <tr>
123
- <!--<th style="padding: 0;border: 0">
124
- <input type="checkbox" id="f_operator" v-model="$parent.$parent.$parent.all[model.pageIndex-1]"
125
- @change="$parent.$parent.$parent.select()" style="width: 22px;height: 22px"/>
126
- </th>-->
127
- <th><nobr>序号</nobr></th>
128
- <th><nobr>终端号</nobr></th>
129
- <th><nobr>上次上报时间</nobr></th>
130
- <th><nobr>本次上报时间</nobr></th>
131
- <th><nobr><b>状态</b></nobr></th>
132
- </tr>
133
- </template>
134
- <template partial='body'>
135
- <td style="text-align: center;">{{$index + 1}}</td>
136
- <td style="text-align: center;">{{row.f_terminal_number}}</td>
137
- <td style="text-align: center;">{{row.f_update_date}}</td>
138
- <td style="text-align: center;">{{row.f_update_date }}</td>
139
- <td style="text-align: center;"><b>{{row.f_pos_state}}</b></td>
140
- </template>
141
- </data-grid>
142
- </criteria-paged>
143
- </article>
144
- <footer slot="modal-footer" class="modal-footer">
145
- <button type="button" class="btn btn-success" @click='infoclose'>关闭</button>
146
- </footer>
147
- </modal>
148
- </template>
149
-
150
- <script>
151
-
152
- import {PagedList} from 'vue-client'
153
-
154
- export default {
155
- title: '终端控制',
156
- components: {},
157
- data () {
158
- return {
159
- source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
160
- model: new PagedList('rs/sql/equipmentQuery', 20),
161
- model2: new PagedList('rs/sql/singleTable', 30, {tablename: '`t_poshistory`'}),
162
- curorgid: [this.f_filialeid],
163
- f_orgid: '',
164
- f_filialeids: '',
165
- criteriaShow: false,
166
- infoadd: false,
167
- selPos: [],
168
- isSelAll: false, // 默认不全选
169
- infoshow: false
170
- }
171
- },
172
- props: ['f_filialeid','isshowless'],
173
- ready () {
174
- this.search()
175
- },
176
- watch:{
177
- // 'selPos'(val){
178
- // console.log(val)
179
- // },
180
- 'isSelAll'(val){
181
- console.log('-------', val)
182
- if (val) {
183
- // 对当前页面全选
184
- this.selPos = []
185
- for (const sel of this.model.rows) {
186
- // if (this.selPos.indexOf(sel.id) < 0){
187
- this.selPos.push(sel)
188
- // }
189
- }
190
- } else {
191
- // 取消全选
192
- this.selPos = []
193
- }
194
- }
195
- },
196
- methods: {
197
- getRes(val){
198
- if (val.orgobj.length === 1 && val.orgobj[0].resourcetype === 'user'){
199
- this.$refs.paged.$refs.cri.model.f_user_operatorid=val.orgobj[0].userid
200
- this.$refs.paged.$refs.cri.model.f_user_operator=val.orgobj[0].name
201
- } else {
202
- this.$refs.paged.$refs.cri.model.f_user_operatorid=''
203
- this.$refs.paged.$refs.cri.model.f_user_operator=''
204
- }
205
- },
206
- infoclose(){
207
- this.infoshow=false
208
- },
209
- abcd (row) {
210
- console.log("chakan",row)
211
- let condition = `f_terminal_number = '${row.f_terminal_number}' order by id desc`
212
- this.model2.search(condition)
213
- this.infoshow = true
214
- },
215
- search () {
216
- console.log("111111111111111111111111111111111111")
217
- this.$refs.paged.$refs.cri.search()
218
- },
219
-
220
- selfSearch (args) {
221
- console.log(args)
222
- if (args.model.f_user_operatorid && args.model.f_user_operator){
223
- args.condition = `${args.condition} and f_user_operatorid = '${args.model.f_user_operatorid}'
224
- and f_user_operator = '${args.model.f_user_operator}'`
225
- }
226
- args.condition = `${args.condition} and f_equipment_type = 'POS' and f_orgid = '${this.f_filialeid ? this.f_orgid: this.$login.f.orgid}'`
227
- this.model.search(args.condition, this.model)
228
- this.$dispatch('research')
229
- },
230
-
231
- add () {
232
- this.infoadd=false
233
- // if (this.f_filialeid) {
234
- this.$dispatch('add', this.f_filialeid)
235
- // } else {
236
- // this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
237
- // }
238
- },
239
-
240
- getorg (val) {
241
- console.log("====================", val)
242
- this.f_orgid = val[0]
243
- this.f_filialeid = val[0]
244
- // this.search()
245
- },
246
- hidden(){
247
- this.criteriaShow = !this.criteriaShow
248
- }
249
- },
250
- computed: {
251
-
252
- }
253
- }
254
- </script>
1
+ <template>
2
+ <div class="flex">
3
+ <criteria-paged :model="model" v-ref:paged>
4
+
5
+ <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
6
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
7
+ <div class="row">
8
+ <div class="col-sm-3 form-group">
9
+ <label class="font_normal_body">公&nbsp;&nbsp;&nbsp;司</label>
10
+ <res-select restype='organization'
11
+ is-mul="false"
12
+ @res-select="$parent.$parent.getorg"
13
+ :initresid="$parent.$parent.curorgid">
14
+ </res-select>
15
+ </div>
16
+ <div class="col-sm-3 form-group">
17
+ <label class="font_normal_body">设备编号</label>
18
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_terminal_number"
19
+ condition="f_terminal_number like '%{}%'" placeholder="设备编号">
20
+ </div>
21
+ <div class="col-sm-3 form-group">
22
+ <label class="font_normal_body">所属人员</label>
23
+ <right-tree @re-res="$parent.$parent.getRes" :source="$parent.$parent.source"></right-tree>
24
+ </div>
25
+
26
+ <div class="span" style="float:right;">
27
+ <button type="button" class="button_search" @click="search()" v-el:cx>查询</button>
28
+ <button type="button" class="button_search" @click="$parent.$parent.add() " v-el:cx >新增</button>
29
+ <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
30
+ @click="$parent.$parent.hidden()"></div>
31
+ </div>
32
+ </div>
33
+ <div class="row" v-show="$parent.$parent.criteriaShow">
34
+ <div class="col-sm-3 form-group">
35
+ <label class="font_normal_body">所在地</label>
36
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_address"
37
+ condition="f_address like '%{}%'" placeholder="所在地">
38
+ </div>
39
+ <div class="col-sm-3 form-group">
40
+ <label class="font_normal_body">设备名称</label>
41
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_terminal_name"
42
+ condition="f_terminal_name like '%{}%'" placeholder="设备名称">
43
+ </div>
44
+ <div class="col-sm-3 form-group">
45
+ <label class="font_normal_body">机器编号</label>
46
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_machine_number"
47
+ condition="f_machine_number like '%{}%'" placeholder="机器编号">
48
+ </div>
49
+ <div class="col-sm-3 form-group">
50
+ <label class="font_normal_body">所属银行</label>
51
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_bank_name"
52
+ condition="f_bank_name like '%{}%'" placeholder="所属银行">
53
+ </div>
54
+ <div class="col-sm-3 form-group">
55
+ <label class="font_normal_body">联系电话</label>
56
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_phone"
57
+ condition="f_phone like '%{}%'" placeholder="联系电话">
58
+ </div>
59
+ </div>
60
+ </div>
61
+ </criteria>
62
+ <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid >
63
+ <template partial='head'>
64
+ <tr>
65
+ <th><input type="checkbox" name="ischeckbox_all_id" v-model="$parent.$parent.$parent.isSelAll" :value.sync="$parent.$parent.$parent.isSelAll" /></th>
66
+ <th style="text-align:center;white-space:nowrap;">序号</th>
67
+ <th style="text-align:center;white-space:nowrap;">设备编号</th>
68
+ <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">设备类型</th>
69
+ <th style="text-align:center;white-space:nowrap;">设备名称</th>
70
+ <th style="text-align:center;white-space:nowrap;">所属公司</th>
71
+ <th style="text-align:center;white-space:nowrap;">所属部门</th>
72
+ <th style="text-align:center;white-space:nowrap;">所属人员</th>
73
+ <th style="text-align:center;white-space:nowrap;">状态</th>
74
+ <th style="text-align:center;white-space:nowrap;">机器编号</th>
75
+ <th style="text-align:center;white-space:nowrap;">联系电话</th>
76
+ <th style="text-align:center;white-space:nowrap;">所在地</th>
77
+ <th style="text-align:center;white-space:nowrap;">所属银行</th>
78
+ <th style="text-align:center;white-space:nowrap;">电池电量</th>
79
+ <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">是否登录</th>
80
+ <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">更新时间</th>
81
+ <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">操作时间</th>
82
+ <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">软件版本</th>
83
+ <!-- <th style="text-align:center;white-space:nowrap;">使用人员</th>-->
84
+ <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">操作人</th>
85
+ <th style="text-align:center;white-space:nowrap;">失联状态</th>
86
+ </tr>
87
+ </template>
88
+ <template partial='body':model="model">
89
+ <tr>
90
+ <td><input type="checkbox" name="checkbox_id" v-model="$parent.$parent.$parent.selPos" :value.sync="row"></td>
91
+ <td style="text-align:center;white-space:nowrap;">{{$index+1}}</td>
92
+ <td style="text-align:center;white-space:nowrap;"><span title="点击查看历史" @click="$parent.$parent.$parent.abcd(row)"><a>{{row.f_terminal_number}}</a></span></td>
93
+ <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_equipment_type}}</td>
94
+ <td style="text-align:center;white-space:nowrap;">{{row.f_terminal_name}}</td>
95
+ <td style="text-align:center;white-space:nowrap;">{{row.f_user_orgname}}</td>
96
+ <td style="text-align:center;white-space:nowrap;">{{row.f_depname}}</td>
97
+ <td style="text-align:center;white-space:nowrap;">{{row.f_operator}}</td>
98
+
99
+ <td style="text-align:center;white-space:nowrap;">{{row.f_state}}</td>
100
+ <td style="text-align:center;white-space:nowrap;">{{row.f_machine_number}}</td>
101
+ <td style="text-align:center;white-space:nowrap;">{{row.f_phone}}</td>
102
+ <td style="text-align:center;white-space:nowrap;">{{row.f_address}}</td>
103
+ <td style="text-align:center;white-space:nowrap;">{{row.f_bank_name}}</td>
104
+ <td style="text-align:center;white-space:nowrap;">{{row.f_battery_level}}</td>
105
+ <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_is_login}}</td>
106
+ <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_hybrid_version}}</td>
107
+ <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_operate_date}}</td>
108
+ <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_appVer}}</td>
109
+ <!-- <td style="text-align:center;white-space:nowrap;" >{{row.f_username}}</td>-->
110
+ <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_operator}}</td>
111
+ <td style="text-align:center;white-space:nowrap;" >{{row.isunknown}}</td>
112
+ </tr>
113
+ </template>
114
+ </data-grid>
115
+ </criteria-paged>
116
+ </div>
117
+ <modal v-show="infoshow" :show.sync="infoshow" v-ref:modal backdrop="false" width="800px" title="终端历史信息">
118
+ <article slot="modal-body" class="modal-body">
119
+ <criteria-paged :model="model2" v-ref:paged2>
120
+ <data-grid :model="model2" v-ref:grid2 partial='list'>
121
+ <template partial='head'>
122
+ <tr>
123
+ <!--<th style="padding: 0;border: 0">
124
+ <input type="checkbox" id="f_operator" v-model="$parent.$parent.$parent.all[model.pageIndex-1]"
125
+ @change="$parent.$parent.$parent.select()" style="width: 22px;height: 22px"/>
126
+ </th>-->
127
+ <th><nobr>序号</nobr></th>
128
+ <th><nobr>终端号</nobr></th>
129
+ <th><nobr>上次上报时间</nobr></th>
130
+ <th><nobr>本次上报时间</nobr></th>
131
+ <th><nobr><b>状态</b></nobr></th>
132
+ </tr>
133
+ </template>
134
+ <template partial='body'>
135
+ <td style="text-align: center;">{{$index + 1}}</td>
136
+ <td style="text-align: center;">{{row.f_terminal_number}}</td>
137
+ <td style="text-align: center;">{{row.f_update_date}}</td>
138
+ <td style="text-align: center;">{{row.f_update_date }}</td>
139
+ <td style="text-align: center;"><b>{{row.f_pos_state}}</b></td>
140
+ </template>
141
+ </data-grid>
142
+ </criteria-paged>
143
+ </article>
144
+ <footer slot="modal-footer" class="modal-footer">
145
+ <button type="button" class="btn btn-success" @click='infoclose'>关闭</button>
146
+ </footer>
147
+ </modal>
148
+ </template>
149
+
150
+ <script>
151
+
152
+ import {PagedList} from 'vue-client'
153
+
154
+ export default {
155
+ title: '终端控制',
156
+ components: {},
157
+ data () {
158
+ return {
159
+ source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
160
+ model: new PagedList('rs/sql/equipmentQuery', 20),
161
+ model2: new PagedList('rs/sql/singleTable', 30, {tablename: '`t_poshistory`'}),
162
+ curorgid: [this.f_filialeid],
163
+ f_orgid: '',
164
+ f_filialeids: '',
165
+ criteriaShow: false,
166
+ infoadd: false,
167
+ selPos: [],
168
+ isSelAll: false, // 默认不全选
169
+ infoshow: false
170
+ }
171
+ },
172
+ props: ['f_filialeid','isshowless'],
173
+ ready () {
174
+ this.search()
175
+ },
176
+ watch:{
177
+ // 'selPos'(val){
178
+ // console.log(val)
179
+ // },
180
+ 'isSelAll'(val){
181
+ console.log('-------', val)
182
+ if (val) {
183
+ // 对当前页面全选
184
+ this.selPos = []
185
+ for (const sel of this.model.rows) {
186
+ // if (this.selPos.indexOf(sel.id) < 0){
187
+ this.selPos.push(sel)
188
+ // }
189
+ }
190
+ } else {
191
+ // 取消全选
192
+ this.selPos = []
193
+ }
194
+ }
195
+ },
196
+ methods: {
197
+ getRes(val){
198
+ if (val.orgobj.length === 1 && val.orgobj[0].resourcetype === 'user'){
199
+ this.$refs.paged.$refs.cri.model.f_user_operatorid=val.orgobj[0].userid
200
+ this.$refs.paged.$refs.cri.model.f_user_operator=val.orgobj[0].name
201
+ } else {
202
+ this.$refs.paged.$refs.cri.model.f_user_operatorid=''
203
+ this.$refs.paged.$refs.cri.model.f_user_operator=''
204
+ }
205
+ },
206
+ infoclose(){
207
+ this.infoshow=false
208
+ },
209
+ abcd (row) {
210
+ console.log("chakan",row)
211
+ let condition = `f_terminal_number = '${row.f_terminal_number}' order by id desc`
212
+ this.model2.search(condition)
213
+ this.infoshow = true
214
+ },
215
+ search () {
216
+ console.log("111111111111111111111111111111111111")
217
+ this.$refs.paged.$refs.cri.search()
218
+ },
219
+
220
+ selfSearch (args) {
221
+ console.log(args)
222
+ if (args.model.f_user_operatorid && args.model.f_user_operator){
223
+ args.condition = `${args.condition} and f_user_operatorid = '${args.model.f_user_operatorid}'
224
+ and f_user_operator = '${args.model.f_user_operator}'`
225
+ }
226
+ args.condition = `${args.condition} and f_equipment_type = 'POS' and f_orgid = '${this.f_filialeid ? this.f_orgid: this.$login.f.orgid}'`
227
+ this.model.search(args.condition, this.model)
228
+ this.$dispatch('research')
229
+ },
230
+
231
+ add () {
232
+ this.infoadd=false
233
+ // if (this.f_filialeid) {
234
+ this.$dispatch('add', this.f_filialeid)
235
+ // } else {
236
+ // this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
237
+ // }
238
+ },
239
+
240
+ getorg (val) {
241
+ console.log("====================", val)
242
+ this.f_orgid = val[0]
243
+ this.f_filialeid = val[0]
244
+ // this.search()
245
+ },
246
+ hidden(){
247
+ this.criteriaShow = !this.criteriaShow
248
+ }
249
+ },
250
+ computed: {
251
+
252
+ }
253
+ }
254
+ </script>