system-clients 3.2.6 → 3.2.7-rongcheng

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 (166) hide show
  1. package/.eslintrc.js +16 -16
  2. package/.gradle/3.5/file-changes/last-build.bin +0 -0
  3. package/.gradle/3.5/taskHistory/taskHistory.lock +0 -0
  4. package/.gradle/3.5.1/file-changes/last-build.bin +0 -0
  5. package/.gradle/3.5.1/taskHistory/taskHistory.lock +0 -0
  6. package/.gradle/buildOutputCleanup/built.bin +0 -0
  7. package/.gradle/buildOutputCleanup/cache.properties +2 -0
  8. package/.gradle/buildOutputCleanup/cache.properties.lock +1 -0
  9. package/SystemClient.iml +5 -2
  10. package/build/webpack.base.conf.js +11 -21
  11. package/package.json +4 -6
  12. package/src/App.vue +24 -24
  13. package/src/components/Main.vue +476 -626
  14. package/src/components/equipment/EquipmentManage.vue +1 -1
  15. package/src/components/equipment/PcAdd.vue +5 -5
  16. package/src/components/equipment/PcList.vue +5 -5
  17. package/src/components/equipment/PhoneAdd.vue +13 -26
  18. package/src/components/equipment/PhoneList.vue +21 -31
  19. package/src/components/equipment/PosAdd.vue +45 -231
  20. package/src/components/equipment/PosList.vue +68 -198
  21. package/src/components/equipment/PosManage.vue +9 -80
  22. package/src/components/parammanage/ParamManage.vue +2 -2
  23. package/src/components/parammanage/ParamPage.vue +8 -30
  24. package/src/components/parammanage/SinglePage.vue +4 -4
  25. package/src/components/server/LoadData.vue +2 -21
  26. package/src/components/server/Login.vue +638 -889
  27. package/src/components/server/ModifyPw.vue +7 -12
  28. package/src/components/server/ResSelect.vue +0 -5
  29. package/src/components/server/RightTree.vue +204 -289
  30. package/src/plugins/GetLoginInfoService.js +515 -521
  31. package/src/plugins/validation.js +1 -9
  32. package/src/system.js +1 -34
  33. package/src/components/TabButton.vue +0 -201
  34. package/src/components/Tabs.vue +0 -67
  35. package/src/components/addressManage/AddressCascadingMenu.vue +0 -145
  36. package/src/components/equipment/PosManageBoth.vue +0 -125
  37. package/src/components/equipment/PosParamAdd.vue +0 -236
  38. package/src/components/equipment/PosParamList.vue +0 -121
  39. package/src/components/equipment/PosParamManage.vue +0 -51
  40. package/src/components/server/ImageVieweTest.vue +0 -56
  41. package/src/components/server/ImageViewer.vue +0 -350
  42. package/src/components/server/PcdBuildingSelect.vue +0 -241
  43. package/src/filiale/dongguan/Main.vue +0 -715
  44. package/src/filiale/dongguan/system.js +0 -5
  45. package/src/filiale/konggang/Login.vue +0 -840
  46. package/src/filiale/konggang/system.js +0 -7
  47. package/src/filiale/qianneng/ModifyPw.vue +0 -107
  48. package/src/filiale/qianneng/system.js +0 -7
  49. package/src/filiale/rizhao/LeftTree.vue +0 -111
  50. package/src/filiale/rizhao/Login.vue +0 -791
  51. package/src/filiale/rizhao/Main.vue +0 -606
  52. package/src/filiale/rizhao/system.js +0 -14
  53. package/src/filiale/yuchuan/Login.vue +0 -889
  54. package/src/filiale/yuchuan/Main.vue +0 -773
  55. package/src/filiale/yuchuan/system.js +0 -10
  56. package/src/plugins/EncryptUtil.js +0 -53
  57. package/src/plugins/HeatGetLoginInfoService.js +0 -491
  58. package/src/stores/HeatAppData.js +0 -38
  59. package/src/styles/fonts/PINGFANG LIGHT.TTF +0 -0
  60. package/src/styles/fonts/PingFangSC-Regular.ttf +0 -0
  61. package/src/styles/fonts/glyphicons-halflings-regular.eot +0 -0
  62. package/src/styles/fonts/glyphicons-halflings-regular.svg +0 -288
  63. package/src/styles/fonts/glyphicons-halflings-regular.ttf +0 -0
  64. package/src/styles/fonts/glyphicons-halflings-regular.woff +0 -0
  65. package/src/styles/fonts/glyphicons-halflings-regular.woff2 +0 -0
  66. package/src/styles/fonts/pingfang-bold.ttf +0 -0
  67. package/src/styles/fonts/pingfang-medium.ttf +0 -0
  68. package/src/styles/fonts/pingfang-regular.ttf +0 -0
  69. package/src/styles/fonts/trendstrends.ttf +0 -0
  70. package/src/styles/fonts//346/261/211/344/273/252/350/217/261/345/277/203/344/275/223/347/256/200.ttf +0 -0
  71. package/src/styles/less/.csscomb.json +0 -304
  72. package/src/styles/less/.csslintrc +0 -19
  73. package/src/styles/less/alerts.less +0 -73
  74. package/src/styles/less/aofeng/animate.min.css +0 -11
  75. package/src/styles/less/aofeng/expandcss.less +0 -569
  76. package/src/styles/less/aofeng/standard.less +0 -2507
  77. package/src/styles/less/aofeng/themeOne/BinaryTemplate.less +0 -686
  78. package/src/styles/less/aofeng/themeOne/loginStyle.less +0 -1586
  79. package/src/styles/less/aofeng/themeOne/systemStyle.less +0 -2650
  80. package/src/styles/less/aofeng/themeOne.less +0 -17
  81. package/src/styles/less/aofeng/themeTwo/newStyle1.less +0 -415
  82. package/src/styles/less/aofeng/themeTwo.less +0 -3
  83. package/src/styles/less/badges.less +0 -66
  84. package/src/styles/less/bootstrap.less +0 -66
  85. package/src/styles/less/breadcrumbs.less +0 -26
  86. package/src/styles/less/button-groups.less +0 -247
  87. package/src/styles/less/buttons.less +0 -172
  88. package/src/styles/less/carousel.less +0 -269
  89. package/src/styles/less/close.less +0 -34
  90. package/src/styles/less/code.less +0 -69
  91. package/src/styles/less/component-animations.less +0 -33
  92. package/src/styles/less/dropdowns.less +0 -216
  93. package/src/styles/less/fonts-list.less +0 -25
  94. package/src/styles/less/forms.less +0 -626
  95. package/src/styles/less/glyphicons.less +0 -305
  96. package/src/styles/less/grid.less +0 -84
  97. package/src/styles/less/input-groups.less +0 -167
  98. package/src/styles/less/jumbotron.less +0 -52
  99. package/src/styles/less/labels.less +0 -64
  100. package/src/styles/less/list-group.less +0 -141
  101. package/src/styles/less/manageStyle/manageChile.less +0 -180
  102. package/src/styles/less/manageStyle/manageStyle/manageChile.less +0 -180
  103. package/src/styles/less/manageStyle/manageStyle/manageStyle.less +0 -1102
  104. package/src/styles/less/manageStyle/manageStyle/safeStyle.less +0 -498
  105. package/src/styles/less/manageStyle/manageStyle.less +0 -1102
  106. package/src/styles/less/manageStyle/safeStyle.less +0 -498
  107. package/src/styles/less/media.less +0 -66
  108. package/src/styles/less/mixins/alerts.less +0 -14
  109. package/src/styles/less/mixins/background-variant.less +0 -9
  110. package/src/styles/less/mixins/border-radius.less +0 -18
  111. package/src/styles/less/mixins/buttons.less +0 -69
  112. package/src/styles/less/mixins/center-block.less +0 -7
  113. package/src/styles/less/mixins/clearfix.less +0 -22
  114. package/src/styles/less/mixins/forms.less +0 -90
  115. package/src/styles/less/mixins/gradients.less +0 -59
  116. package/src/styles/less/mixins/grid-framework.less +0 -92
  117. package/src/styles/less/mixins/grid.less +0 -122
  118. package/src/styles/less/mixins/hide-text.less +0 -21
  119. package/src/styles/less/mixins/image.less +0 -33
  120. package/src/styles/less/mixins/labels.less +0 -12
  121. package/src/styles/less/mixins/list-group.less +0 -30
  122. package/src/styles/less/mixins/nav-divider.less +0 -10
  123. package/src/styles/less/mixins/nav-vertical-align.less +0 -9
  124. package/src/styles/less/mixins/opacity.less +0 -8
  125. package/src/styles/less/mixins/pagination.less +0 -24
  126. package/src/styles/less/mixins/panels.less +0 -24
  127. package/src/styles/less/mixins/progress-bar.less +0 -10
  128. package/src/styles/less/mixins/reset-filter.less +0 -8
  129. package/src/styles/less/mixins/reset-text.less +0 -18
  130. package/src/styles/less/mixins/resize.less +0 -6
  131. package/src/styles/less/mixins/responsive-visibility.less +0 -15
  132. package/src/styles/less/mixins/size.less +0 -10
  133. package/src/styles/less/mixins/tab-focus.less +0 -9
  134. package/src/styles/less/mixins/table-row.less +0 -44
  135. package/src/styles/less/mixins/text-emphasis.less +0 -9
  136. package/src/styles/less/mixins/text-overflow.less +0 -8
  137. package/src/styles/less/mixins/vendor-prefixes.less +0 -227
  138. package/src/styles/less/mixins.less +0 -40
  139. package/src/styles/less/modals.less +0 -151
  140. package/src/styles/less/navbar.less +0 -660
  141. package/src/styles/less/navs.less +0 -285
  142. package/src/styles/less/normalize.less +0 -424
  143. package/src/styles/less/pager.less +0 -76
  144. package/src/styles/less/pagination.less +0 -89
  145. package/src/styles/less/panels.less +0 -275
  146. package/src/styles/less/popovers.less +0 -131
  147. package/src/styles/less/print.less +0 -101
  148. package/src/styles/less/progress-bars.less +0 -87
  149. package/src/styles/less/responsive-embed.less +0 -35
  150. package/src/styles/less/responsive-utilities.less +0 -194
  151. package/src/styles/less/scaffolding.less +0 -161
  152. package/src/styles/less/stand.less +0 -207
  153. package/src/styles/less/tables.less +0 -312
  154. package/src/styles/less/theme.less +0 -291
  155. package/src/styles/less/thumbnails.less +0 -36
  156. package/src/styles/less/tooltip.less +0 -102
  157. package/src/styles/less/type.less +0 -316
  158. package/src/styles/less/utilities.less +0 -55
  159. package/src/styles/less/variables.less +0 -899
  160. package/src/styles/less/wells.less +0 -29
  161. package/src/util/Daiban.json +0 -12
  162. package/static/images/lefticon//345/220/210/345/220/214/347/256/241/347/220/206.png +0 -0
  163. package/static/logo.png +0 -0
  164. package/static/newStyle/about-us.png +0 -0
  165. package/static/rizhao.png +0 -0
  166. package/yarn-error.log +0 -6896
@@ -2,286 +2,156 @@
2
2
  <div class="flex">
3
3
  <criteria-paged :model="model" v-ref:paged>
4
4
 
5
- <criteria partial='criteria' style="background-color: white;" @condition-changed='$parent.selfSearch' v-ref:cri>
5
+ <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
6
6
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
7
7
  <div class="row">
8
- <div class="col-sm-3 form-group">
9
- <label class="font_normal_body">公&nbsp;&nbsp;&nbsp;司</label>
8
+ <div class="col-sm-3">
9
+ <label class="font_normal_body">使用公司</label>
10
10
  <res-select restype='organization'
11
11
  is-mul="false"
12
12
  @res-select="$parent.$parent.getorg"
13
13
  :initresid="$parent.$parent.curorgid">
14
14
  </res-select>
15
15
  </div>
16
- <div class="col-sm-3 form-group">
16
+ <div class="col-sm-3">
17
17
  <label class="font_normal_body">设备编号</label>
18
18
  <input type="text" class="input_search" style="width:60%" v-model="model.f_terminal_number"
19
19
  condition="f_terminal_number like '%{}%'" placeholder="设备编号">
20
20
  </div>
21
+ <div class="col-sm-3">
22
+ <label class="font_normal_body">联系电话</label>
23
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_phone"
24
+ condition="f_phone like '%{}%'" placeholder="联系电话">
25
+ </div>
21
26
 
22
-
23
- <div class="span" style="float:right;margin-top: 6px">
24
- <button type="button" class="btn-success btn " style="border-radius: 4px"
25
- @click="$parent.$parent.batchRoot('1')">批量启用
26
- </button>
27
- <button type="button" class="btn-danger btn " style="border-radius: 4px"
28
- @click="$parent.$parent.batchRoot('0')">批量停用
29
- </button>
30
- <button type="button" class="button_search btn" @click="search()" v-el:cx>查询</button>
31
- <button type="button" class="button_search btn" @click="$parent.$parent.add() " v-el:cx>新增</button>
32
- <div style="float: right" class="button_spacing"
33
- :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
27
+ <div class="span" style="float:right;">
28
+ <button type="button" class="button_search" @click="search()" v-el:cx>查询</button>
29
+ <button type="button" class="button_search" @click="$parent.$parent.add()" v-el:cx>新增</button>
30
+ <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
34
31
  @click="$parent.$parent.hidden()"></div>
35
32
  </div>
36
33
  </div>
37
34
  <div class="row" v-show="$parent.$parent.criteriaShow">
38
- <div class="col-sm-3 form-group">
39
- <label class="font_normal_body">所属人员</label>
40
- <right-tree @re-res="$parent.$parent.getRes" :source="$parent.$parent.source"></right-tree>
41
- </div>
42
- <div class="col-sm-3 form-group">
43
- <label class="font_normal_body">所在地</label>
35
+ <div class="col-sm-3">
36
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;所在地</label>
44
37
  <input type="text" class="input_search" style="width:60%" v-model="model.f_address"
45
38
  condition="f_address like '%{}%'" placeholder="所在地">
46
39
  </div>
47
- <div class="col-sm-3 form-group">
40
+ <div class="col-sm-3">
48
41
  <label class="font_normal_body">设备名称</label>
49
42
  <input type="text" class="input_search" style="width:60%" v-model="model.f_terminal_name"
50
43
  condition="f_terminal_name like '%{}%'" placeholder="设备名称">
51
44
  </div>
52
- <div class="col-sm-3 form-group">
45
+ <div class="col-sm-3">
53
46
  <label class="font_normal_body">机器编号</label>
54
47
  <input type="text" class="input_search" style="width:60%" v-model="model.f_machine_number"
55
48
  condition="f_machine_number like '%{}%'" placeholder="机器编号">
56
49
  </div>
57
- <div class="col-sm-3 form-group">
50
+ <div class="col-sm-3">
58
51
  <label class="font_normal_body">所属银行</label>
59
52
  <input type="text" class="input_search" style="width:60%" v-model="model.f_bank_name"
60
53
  condition="f_bank_name like '%{}%'" placeholder="所属银行">
61
54
  </div>
62
- <div class="col-sm-3 form-group">
63
- <label class="font_normal_body">联系电话</label>
64
- <input type="text" class="input_search" style="width:60%" v-model="model.f_phone"
65
- condition="f_phone like '%{}%'" placeholder="联系电话">
66
- </div>
67
55
  </div>
68
56
  </div>
69
57
  </criteria>
70
58
  <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid >
71
59
  <template partial='head'>
72
60
  <tr>
73
- <th><input type="checkbox" name="ischeckbox_all_id" v-model="$parent.$parent.$parent.isSelAll" :value.sync="$parent.$parent.$parent.isSelAll" /></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;" v-show="!$parent.$parent.$parent.isshowless">设备类型</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;">所属部门</th>
80
- <th style="text-align:center;white-space:nowrap;">所属人员</th>
81
- <th style="text-align:center;white-space:nowrap;">状态</th>
82
- <th style="text-align:center;white-space:nowrap;">机器编号</th>
83
- <th style="text-align:center;white-space:nowrap;">联系电话</th>
84
- <th style="text-align:center;white-space:nowrap;">所在地</th>
85
- <th style="text-align:center;white-space:nowrap;">所属银行</th>
86
- <th style="text-align:center;white-space:nowrap;">电池电量</th>
87
- <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">是否登录</th>
88
- <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">更新时间</th>
89
- <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">操作时间</th>
90
- <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">软件版本</th>
91
- <!-- <th style="text-align:center;white-space:nowrap;">使用人员</th>-->
92
- <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">操作人</th>
93
- <th style="text-align:center;white-space:nowrap;">失联状态</th>
61
+ <th>序号</th>
62
+ <th>设备编号</th>
63
+ <th>设备名称</th>
64
+ <th>机器编号</th>
65
+ <th>联系电话</th>
66
+ <th>所在地</th>
67
+ <th>所属银行</th>
68
+ <th>电池电量</th>
69
+ <th>是否登录</th>
70
+ <th>更新时间</th>
71
+ <th>软件版本</th>
72
+ <th>操作</th>
94
73
  </tr>
95
74
  </template>
96
75
  <template partial='body':model="model">
97
76
  <tr>
98
- <td><input type="checkbox" name="checkbox_id" v-model="$parent.$parent.$parent.selPos" :value.sync="row"></td>
99
- <td style="text-align:center;white-space:nowrap;">{{$index+1}}</td>
100
- <td style="text-align:center;white-space:nowrap;"><span title="点击查看历史" @click="$parent.$parent.$parent.abcd(row)"><a>{{row.f_terminal_number}}</a></span></td>
101
- <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_equipment_type}}</td>
102
- <td style="text-align:center;white-space:nowrap;">{{row.f_terminal_name}}</td>
103
- <td style="text-align:center;white-space:nowrap;">{{row.f_user_orgname}}</td>
104
- <td style="text-align:center;white-space:nowrap;">{{row.f_depname}}</td>
105
- <td style="text-align:center;white-space:nowrap;">{{row.f_operator}}</td>
106
-
107
- <td style="text-align:center;white-space:nowrap;">{{row.f_state}}</td>
108
- <td style="text-align:center;white-space:nowrap;">{{row.f_machine_number}}</td>
109
- <td style="text-align:center;white-space:nowrap;">{{row.f_phone}}</td>
110
- <td style="text-align:center;white-space:nowrap;">{{row.f_address}}</td>
111
- <td style="text-align:center;white-space:nowrap;">{{row.f_bank_name}}</td>
112
- <td style="text-align:center;white-space:nowrap;">{{row.f_battery_level}}</td>
113
- <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_is_login}}</td>
114
- <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_hybrid_version}}</td>
115
- <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_operate_date}}</td>
116
- <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_appVer}}</td>
117
- <!-- <td style="text-align:center;white-space:nowrap;" >{{row.f_username}}</td>-->
118
- <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_operator}}</td>
119
- <td style="text-align:center;white-space:nowrap;" >{{row.isunknown}}</td>
77
+ <td style="text-align:center">{{$index+1}}</td>
78
+ <td style="text-align:center">{{row.f_terminal_number}}</td>
79
+ <td style="text-align:center">{{row.f_terminal_name}}</td>
80
+ <td style="text-align:center">{{row.f_machine_number}}</td>
81
+ <td style="text-align:center">{{row.f_phone}}</td>
82
+ <td style="text-align:center">{{row.f_address}}</td>
83
+ <td style="text-align:center">{{row.f_bank_name}}</td>
84
+ <td style="text-align:center">{{row.f_battery_level}}</td>
85
+ <td style="text-align:center">{{row.f_is_login}}</td>
86
+ <td style="text-align:center">{{row.f_hybrid_version}}</td>
87
+ <td style="text-align:center">{{row.f_appVer}}</td>
88
+ <td style="text-align:center">
89
+ <button class="btn btn-link" @click.stop="$parent.$parent.$parent.del(row)">删除</button>
90
+ </td>
120
91
  </tr>
121
92
  </template>
122
93
  </data-grid>
123
94
  </criteria-paged>
124
95
  </div>
125
- <modal v-show="infoshow" :show.sync="infoshow" v-ref:modal backdrop="false" width="800px" title="终端历史信息">
126
- <article slot="modal-body" class="modal-body">
127
- <criteria-paged :model="model2" v-ref:paged2>
128
- <data-grid :model="model2" v-ref:grid2 partial='list'>
129
- <template partial='head'>
130
- <tr>
131
- <!--<th style="padding: 0;border: 0">
132
- <input type="checkbox" id="f_operator" v-model="$parent.$parent.$parent.all[model.pageIndex-1]"
133
- @change="$parent.$parent.$parent.select()" style="width: 22px;height: 22px"/>
134
- </th>-->
135
- <th><nobr>序号</nobr></th>
136
- <th><nobr>终端号</nobr></th>
137
- <th><nobr>上次上报时间</nobr></th>
138
- <th><nobr>本次上报时间</nobr></th>
139
- <th><nobr><b>状态</b></nobr></th>
140
- </tr>
141
- </template>
142
- <template partial='body'>
143
- <td style="text-align: center;">{{$index + 1}}</td>
144
- <td style="text-align: center;">{{row.f_terminal_number}}</td>
145
- <td style="text-align: center;">{{row.f_update_date}}</td>
146
- <td style="text-align: center;">{{row.f_update_date }}</td>
147
- <td style="text-align: center;"><b>{{row.f_pos_state}}</b></td>
148
- </template>
149
- </data-grid>
150
- </criteria-paged>
151
- </article>
152
- <footer slot="modal-footer" class="modal-footer">
153
- <button type="button" class="btn btn-success" @click='infoclose'>关闭</button>
154
- </footer>
155
- </modal>
156
96
  </template>
157
97
 
158
98
  <script>
159
99
 
160
- import {PagedList} from 'vue-client'
100
+ import { PagedList } from 'vue-client'
161
101
 
162
102
  export default {
163
103
  title: '终端控制',
164
104
  components: {},
165
105
  data () {
166
106
  return {
167
- source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
168
107
  model: new PagedList('rs/sql/equipmentQuery', 20),
169
- model2: new PagedList('rs/sql/singleTable', 30, {tablename: '`t_poshistory`'}),
170
108
  curorgid: [this.f_filialeid],
171
109
  f_orgid: '',
172
- f_filialeids: '',
173
- criteriaShow: false,
174
- infoadd: false,
175
- selPos: [],
176
- isSelAll: false, // 默认不全选
177
- infoshow: false
110
+ f_filialeids:'',
111
+ criteriaShow: false
178
112
  }
179
113
  },
180
- props: ['f_filialeid','isshowless'],
114
+ props: ['f_filialeid'],
181
115
  ready () {
182
116
  this.search()
183
117
  },
184
- watch:{
185
- // 'selPos'(val){
186
- // console.log(val)
187
- // },
188
- 'isSelAll'(val){
189
- console.log('-------', val)
190
- if (val) {
191
- // 对当前页面全选
192
- this.selPos = []
193
- for (const sel of this.model.rows) {
194
- // if (this.selPos.indexOf(sel.id) < 0){
195
- this.selPos.push(sel)
196
- // }
197
- }
198
- } else {
199
- // 取消全选
200
- this.selPos = []
201
- }
202
- }
203
- },
204
118
  methods: {
205
- getRes(val){
206
- if (val.orgobj.length === 1 && val.orgobj[0].resourcetype === 'user'){
207
- this.$refs.paged.$refs.cri.model.f_user_operatorid=val.orgobj[0].userid
208
- this.$refs.paged.$refs.cri.model.f_user_operator=val.orgobj[0].name
209
- } else {
210
- this.$refs.paged.$refs.cri.model.f_user_operatorid=''
211
- this.$refs.paged.$refs.cri.model.f_user_operator=''
212
- }
213
- },
214
- infoclose(){
215
- this.infoshow=false
216
- },
217
- // 批量操作
218
- async batchRoot(val) {
219
- let arrs = []
220
- let alertMessage = ''
221
- let selPos = this.selPos
222
- if (val === '0') {
223
- alertMessage = '停用'
224
- for (const tmp of selPos) {
225
- if (tmp.f_state === '正常') arrs.push(tmp)
226
- }
227
- } else if (val === '1') {
228
- alertMessage = '启用'
229
- for (const tmp of selPos) {
230
- if (tmp.f_state === '停用') arrs.push(tmp)
231
- }
232
- } else if (val === '2') {
233
- alertMessage = '升级'
234
- for (const tmp of selPos) {
235
- if (tmp.f_state === '正常') arrs.push(tmp)
236
- }
237
- } else {
238
- this.showAlert('出现异常,请重新进操作')
239
- return
240
- }
241
- await this.$resetpost('rs/logic/batchPos', {data: {tasks: arrs, taskState: val}}, {
242
- rejectMsg: null,
243
- resolveMsg: null
244
- })
245
- // 需要提示
246
- this.$showAlert(`已经开始批量${alertMessage},选择${selPos.length},其中${arrs.length}台可以正常${alertMessage},具体请留意设备情况,并刷新列表查看执行结果!`,'success', 2500)
247
- this.$dispatch('close')
248
- },
249
- abcd (row) {
250
- console.log("chakan",row)
251
- let condition = `f_terminal_number = '${row.f_terminal_number}' order by id desc`
252
- this.model2.search(condition)
253
- this.infoshow = true
254
- },
119
+
255
120
  search () {
256
121
  console.log("111111111111111111111111111111111111")
257
122
  this.$refs.paged.$refs.cri.search()
258
123
  },
259
124
 
260
125
  selfSearch (args) {
261
- console.log(args)
262
- if (args.model.f_user_operatorid && args.model.f_user_operator){
263
- args.condition = `${args.condition} and f_user_operatorid = '${args.model.f_user_operatorid}'
264
- and f_user_operator = '${args.model.f_user_operator}'`
265
- }
266
- args.condition = `${args.condition} and f_equipment_type = 'POS' and f_orgid = '${this.f_filialeid ? this.f_orgid: this.$login.f.orgid}'`
126
+ args.condition = `${args.condition} and f_equipment_type = 'POS' and f_state = '正常' and f_filialeids = '${this.f_filialeid ? this.f_orgid: this.$login.f.orgid}'`
267
127
  this.model.search(args.condition, this.model)
268
128
  this.$dispatch('research')
269
129
  },
270
130
 
271
131
  add () {
272
- this.infoadd=false
273
- // if (this.f_filialeid) {
274
- this.$dispatch('add', this.f_filialeid)
275
- // } else {
276
- // this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
277
- // }
132
+ if (this.f_filialeid) {
133
+ this.$parent.f_filialeid=this.f_filialeid
134
+ this.$dispatch('add')
135
+ } else {
136
+ this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
137
+ }
138
+
139
+ },
140
+
141
+ del (row) {
142
+ console.log('要删除了', row)
143
+ row.f_state = '已删除'
144
+ this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗?', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
145
+ this.$dispatch('refresh')
146
+ }).catch((error) => {
147
+ this.$dispatch('refresh')
148
+ })
278
149
  },
279
150
 
280
151
  getorg (val) {
281
- console.log("====================", val)
282
152
  this.f_orgid = val[0]
283
153
  this.f_filialeid = val[0]
284
- // this.search()
154
+ this.search()
285
155
  },
286
156
  hidden(){
287
157
  this.criteriaShow = !this.criteriaShow
@@ -1,36 +1,11 @@
1
1
  <template>
2
2
  <div class="flex-row">
3
3
  <div :class="{'basic-main':!isChange,'binary-left':isChange}">
4
- <pos-list :row="row" @dblclick="selected" style="width:auto;" :f_filialeid.sync="f_filialeids" :isshowless="isChange" v-ref:list ></pos-list>
4
+ <pos-list :row="row" @select-changed="selected" style="width:auto;" :f_filialeid.sync="f_filialeids" v-ref:list ></pos-list>
5
5
  </div>
6
- <div class="binary-right" style="margin-left: 10px; width: 40%;" v-if="isChange">
7
- <pos-add :data="row" :info="infoadd" :f_filialeids.sync="f_filialeids" v-ref:addbox></pos-add>
6
+ <div class="binary-right" style="margin-left: 10px; width: 50%;" v-if="isChange">
7
+ <pos-add :data="row" :f_filialeids.sync="f_filialeids" v-ref:addbox></pos-add>
8
8
  </div>
9
-
10
- <!-- <modal v-if="batchPos" :show.sync="batchPos" backdrop="false" >-->
11
- <!-- <header slot="modal-header" class="modal-header">-->
12
- <!-- <button type="button" class="close" @click="close"><span>&times;</span></button>-->
13
- <!-- <h4 class="modal-title">批量操作</h4>-->
14
- <!-- </header>-->
15
- <!-- <article slot="modal-body" class="modal-body">-->
16
- <!-- <form class="form-horizontal">-->
17
- <!-- <div class="row">-->
18
- <!-- <div>-->
19
- <!-- <h4>注意事项</h4>-->
20
- <!-- <p>1.如果需要对POS设备进行升级,批量选择的POS设备包含非正常状态,则只会对状态为正常的设备进行升级。</p>-->
21
- <!-- <p>2.如果POS设备处于停用状态,则可以进行启用操作。如果设备处于启用状态,则可以进行停用和升级操作。</p>-->
22
- <!-- <p>3.批量操作可能耗时较长,请刷新列表查看结果。</p>-->
23
- <!-- </div>-->
24
- <!-- </div>-->
25
- <!-- </form>-->
26
- <!-- </article>-->
27
- <!-- <footer slot="modal-footer" class="modal-footer">-->
28
- <!--&lt;!&ndash; <button type="button" class="button_search button_spacing" @click="batchRoot('2')">批量升级</button>&ndash;&gt;-->
29
- <!-- <button type="button" class="button_search button_spacing" @click="batchRoot('1')">批量启用</button>-->
30
- <!-- <button type="button" class="button_search button_spacing" @click="batchRoot('0')">批量停用</button>-->
31
- <!-- <button type="button" class="button_clear button_spacing" @click='close'>退出</button>-->
32
- <!-- </footer>-->
33
- <!-- </modal>-->
34
9
  </div>
35
10
  </template>
36
11
  <script>
@@ -47,61 +22,18 @@
47
22
  return {
48
23
  isChange: false,
49
24
  row: null,
50
- infoadd: true, // 判断是否显示 升级 等按钮(true/false)
51
- batchPos: false,
25
+
52
26
  f_filialeids: ''
53
27
  }
54
28
  },
55
29
  methods: {
56
- // 批量操作
57
- // async batchRoot(val){
58
- // let arrs = []
59
- // let alertMessage=''
60
- // let selPos = this.$refs.list.selPos
61
- // if (val==='0'){
62
- // alertMessage='停用'
63
- // for (const tmp of selPos) {
64
- // if (tmp.f_state==='正常') arrs.push(tmp)
65
- // }
66
- // } else if (val==='1'){
67
- // alertMessage='启用'
68
- // for (const tmp of selPos) {
69
- // if (tmp.f_state==='停用') arrs.push(tmp)
70
- // }
71
- // } else if(val==='2'){
72
- // alertMessage='升级'
73
- // for (const tmp of selPos) {
74
- // if (tmp.f_state==='正常') arrs.push(tmp)
75
- // }
76
- // } else {
77
- // this.showAlert('出现异常,请重新进操作')
78
- // return
79
- // }
80
- //
81
- // await this.$resetpost('rs/logic/batchPos',{data: {tasks: arrs, taskState: val}}, {rejectMsg: null, resolveMsg: null})
82
- //
83
- // // 需要提示
84
- // this.$showAlert(`已经开始批量${alertMessage},选择${selPos.length},其中${arrs.length}台可以正常${alertMessage},具体请留意设备情况,并刷新列表查看执行结果!`)
85
- // this.isChange = false
86
- // this.close()
87
- // },
88
- close(){
89
- this.batchPos = false
90
- },
91
- selected(obj, idx) {
92
- console.log(obj)
93
- if (!(obj instanceof MouseEvent)) {
94
- this.isChange = true
95
- this.infoadd = true
96
- this.row = obj
97
- } else {
98
- this.$showAlert('如需新增,请点击增加按钮!', 'info', 1000)
99
- }
30
+ selected (obj) {
31
+ this.isChange = true
32
+ this.row = obj.val
100
33
  }
101
34
  },
102
35
  events: {
103
36
  'search' () {
104
- this.infoadd=true
105
37
  this.isChange = false
106
38
  this.row = null
107
39
  this.$refs.list.$refs.paged.$refs.cri.search()
@@ -123,12 +55,9 @@
123
55
  'close' () {
124
56
  this.isChange = false
125
57
  this.row = null
126
-
127
- // this.$refs.list.search()
58
+ this.$refs.list.search()
128
59
  },
129
- 'add' (val) {
130
- this.f_filialeids = val
131
- this.infoadd=false
60
+ 'add' () {
132
61
  this.row = null
133
62
  this.isChange = true
134
63
  this.$refs.list.$refs.paged.$refs.grid.selectStore.selected = null
@@ -1,9 +1,9 @@
1
1
  <template>
2
- <div id="unit" class="flex-row" :style="{width: messlist==='mess' ? '50%' : '100%'}">
2
+ <div id="unit" class="flex-row">
3
3
  <div class="binary-left">
4
4
  <param-page></param-page>
5
5
  </div>
6
- <div class="binary-right" :style="{width: messlist==='mess' ? '50%' : '60%'}">
6
+ <div class="binary-right">
7
7
  <single-page></single-page>
8
8
  </div>
9
9
  </div>
@@ -1,7 +1,7 @@
1
1
  <template>
2
2
  <div class="flex">
3
3
  <p class="bg-info text-center" style="padding: 8px;">参数管理
4
- <button type="button" name="button" class="button_search button_spacing width-60" @click="add('t_parameter')" style="float:right">新增</button>
4
+ <span class="btn btn-link add-postition" @click="add('t_parameter')">新增</span>
5
5
  </p>
6
6
  <div class="auto">
7
7
  <form class="form-horizontal" style="margin-bottom: 5px;">
@@ -25,7 +25,7 @@
25
25
  </form>
26
26
  </div>
27
27
  <div class="span">
28
- <data-grid :model="model" v-ref:params @select-changed="selected">
28
+ <data-grid :model="model" v-ref:params @select-changed="selected" class="list_area table_sy">
29
29
  <template partial='head'>
30
30
  <tr>
31
31
  <th>序号</th>
@@ -39,9 +39,9 @@
39
39
  <td style="text-align:center">{{row.name}}</td>
40
40
  <td style="text-align:center">{{row.orgname ? row.orgname + '专用' : '全局'}}</td>
41
41
  <td class="flex-around">
42
- <button type="button" name="button" class="button_search button_spacing width-60"
42
+ <button type="button" name="button" class="btn btn-link"
43
43
  @click.stop="$parent.$parent.modifyParam(row, 't_parameter')">修改</button>
44
- <button type="button" name="button" class="btn btn-danger"
44
+ <button type="button" name="button" class="btn btn-link"
45
45
  @click.stop="$parent.$parent.deleteParam(row, 't_parameter')">删除</button>
46
46
  </td>
47
47
  </template>
@@ -50,7 +50,7 @@
50
50
 
51
51
  <p v-if="selectItem" class="bg-info text-center" style="padding: 8px;margin: 8px 0px;">
52
52
  {{selectItem.name}}
53
- <button type="button" name="button" class="button_search button_spacing width-60" @click="add('t_paramvalue')" style="float:right">新增</button>
53
+ <span class="btn btn-link add-postition" @click="add('t_paramvalue')">新增</span>
54
54
  </p>
55
55
  <div v-if="selectItem" class="span">
56
56
  <data-grid :model="params" v-ref:selects >
@@ -64,10 +64,9 @@
64
64
  <template partial='body'>
65
65
  <td style="text-align:center">{{$index+1}}</td>
66
66
  <td style="text-align:center">{{row.name}}</td>
67
- <td class="flex-around col-sm-3">
68
- <button type="button" name="button" class="button_search" @click.stop="$parent.$parent.modifyParam(row, 't_paramvalue')">修改</button>
69
- <button type="button" name="button" class="button_search" v-if="$index!=0" @click.stop="$parent.$parent.move(row,$index)">上移</button>
70
- <button type="button" name="button" class="btn btn-danger" @click.stop="$parent.$parent.deleteParam(row, 't_paramvalue')">删除</button>
67
+ <td class="flex-around">
68
+ <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.modifyParam(row, 't_paramvalue')">修改</button>
69
+ <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.deleteParam(row, 't_paramvalue')">删除</button>
71
70
  </td>
72
71
  </template>
73
72
  </data-grid>
@@ -165,27 +164,6 @@
165
164
  }
166
165
  },
167
166
  methods: {
168
- async move(row,index){
169
- var temp=Object.assign({}, row)
170
- row.name=this.params.rows[index-1].name
171
- row.code=this.params.rows[index-1].code
172
- row.processid=this.params.rows[index-1].processid
173
- var param1=row
174
-
175
- this.params.rows[index-1].name=temp.name
176
- this.params.rows[index-1].code=temp.code
177
- this.params.rows[index-1].processid=temp.processid
178
- var param2=this.params.rows[index-1]
179
- let http = new HttpResetClass()
180
- try {
181
- await http.load('POST', 'rs/entity/t_paramvalue', param1, {resolveMsg: null, rejectMsg: null})
182
- await http.load('POST', 'rs/entity/t_paramvalue', param2, {resolveMsg: null, rejectMsg: null})
183
- this.$showAlert('上移成功', 'success', 2000)
184
- }catch (e) {
185
- console.log(e)
186
- this.$showAlert('上移失败', 'warning', 2000)
187
- }
188
- },
189
167
  // 加载全部参数
190
168
  loadParams () {
191
169
  let param = {
@@ -2,7 +2,7 @@
2
2
  <div class="flex">
3
3
  <p class="bg-info text-center" style="padding: 8px;">
4
4
  单值管理
5
- <button type="button" name="button" class="button_search button_spacing width-60 " @click="add()" style="float:right">新增</button>
5
+ <span class="btn btn-link add-postition" @click="add()">新增</span>
6
6
  </p>
7
7
  <div class="auto">
8
8
  <form class="form-horizontal" style="margin-bottom: 5px;">
@@ -27,7 +27,7 @@
27
27
  </div>
28
28
  <div class="span">
29
29
  <partial-view v-ref:single-load>
30
- <data-grid :model="model" v-ref:grid >
30
+ <data-grid :model="model" v-ref:grid class="list_area table_sy">
31
31
  <template partial='head'>
32
32
  <tr>
33
33
  <th>序号</th>
@@ -43,9 +43,9 @@
43
43
  <td style="text-align:center">{{row.value}}</td>
44
44
  <td style="text-align:center">{{row.orgname ? row.orgname + '专用' : '全局'}}</td>
45
45
  <td class="flex-around">
46
- <button type="button" name="button" class="button_search button_spacing width-60"
46
+ <button type="button" name="button" class="btn btn-link"
47
47
  @click.stop="$parent.$parent.$parent.modifyParam(row)">修改</button>
48
- <button type="button" name="button" class="btn btn-danger"
48
+ <button type="button" name="button" class="btn btn-link"
49
49
  @click.stop="$parent.$parent.$parent.deleteItem(row)">删除</button>
50
50
  </td>
51
51
  </template>
@@ -14,27 +14,8 @@
14
14
  show: false
15
15
  }
16
16
  },
17
- props: {
18
- componentName: {}
19
- },
20
- async ready () {
21
- this.$nextTick(() => {
22
- window.addEventListener('message', messageEvent => {
23
- try {
24
- const data = messageEvent.data
25
- console.log('接收到数据', data)
26
- this.$login = Object.assign(this.$login, data.login)
27
- this.$appdata = Object.assign(this.$appdata, data.appdata)
28
- if (!data.page) {
29
- this.$showMessage('没有功能连接, 请配置!')
30
- return
31
- }
32
- this.$goto(data.page)
33
- } catch (e) {
34
- console.log('登陆异常', e)
35
- }
36
- })
37
- })
17
+ ready () {
18
+ this.$appdata.load()
38
19
  }
39
20
  }
40
21
  </script>