safecheck-client 3.0.39-16 → 3.0.39-17

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 (242) hide show
  1. package/.babelrc +5 -5
  2. package/.editorconfig +9 -9
  3. package/android.html +18 -18
  4. package/config/dev.env.js +6 -6
  5. package/config/index.js +38 -38
  6. package/config/prod.env.js +3 -3
  7. package/config/test.env.js +6 -6
  8. package/docs/AppBase.md +22 -22
  9. package/docs/Busy.md +14 -14
  10. package/docs/CriteriaPaged.md +47 -47
  11. package/docs/DataGrid.md +54 -54
  12. package/docs/DataModel.md +22 -22
  13. package/docs/Dynamic.md +42 -42
  14. package/docs/GetParams.md +11 -11
  15. package/docs/HttpBusy.md +13 -13
  16. package/docs/HttpStore.md +29 -29
  17. package/docs/MessageBox.md +28 -28
  18. package/docs/PagedList.md +29 -29
  19. package/docs/Pager.md +21 -21
  20. package/docs/Project.md +23 -23
  21. package/docs/Route.md +105 -105
  22. package/docs/SafetyCheck/AdjustPlan.md +13 -13
  23. package/docs/SafetyCheck/CheckerPlan.md +12 -12
  24. package/docs/Task.md +46 -46
  25. package/docs/TreeList.md +28 -28
  26. package/docs/TreeMixin.md +18 -18
  27. package/docs/all.md +10 -10
  28. package/docs/list.md +42 -42
  29. package/docs/partial.md +75 -75
  30. package/docs/selector.md +82 -82
  31. package/docs//345/274/200/345/217/221/346/226/207/346/241/243/Snippets.md +28 -28
  32. package/docs//345/274/200/345/217/221/346/226/207/346/241/243/vue-strap/345/217/230/346/233/264/350/256/260/345/275/225.md +7 -7
  33. package/docs//345/274/200/345/217/221/346/226/207/346/241/243/vue/345/217/230/346/233/264/350/256/260/345/275/225.md +13 -13
  34. package/docs//345/274/200/345/217/221/346/226/207/346/241/243//345/274/200/345/217/221/347/216/257/345/242/203/350/256/276/347/275/256.md +77 -77
  35. package/docs//347/225/214/351/235/242/345/210/266/344/275/234/350/247/204/350/214/203.md +54 -54
  36. package/examples/AddressList/App.vue +13 -13
  37. package/examples/AddressList/index.html +11 -11
  38. package/examples/DispatchList/App.vue +10 -10
  39. package/examples/DispatchList/BaseTree.vue +13 -13
  40. package/examples/DispatchList/Init.vue +22 -22
  41. package/examples/DispatchList/Test.vue +20 -20
  42. package/examples/DispatchList/index.html +11 -11
  43. package/examples/DispatchList/main.js +18 -18
  44. package/home.html +16 -16
  45. package/package.json +1 -1
  46. package/publish.bat +7 -7
  47. package/release.bat +5 -5
  48. package/src/Widget.vue +13 -13
  49. package/src/android-bootstrap/fonts/glyphicons-halflings-regular.svg +287 -287
  50. package/src/android-bootstrap/less/.csscomb.json +304 -304
  51. package/src/android-bootstrap/less/.csslintrc +19 -19
  52. package/src/android-bootstrap/less/alerts.less +73 -73
  53. package/src/android-bootstrap/less/badges.less +66 -66
  54. package/src/android-bootstrap/less/bootstrap.less +56 -56
  55. package/src/android-bootstrap/less/breadcrumbs.less +26 -26
  56. package/src/android-bootstrap/less/button-groups.less +247 -247
  57. package/src/android-bootstrap/less/buttons.less +173 -173
  58. package/src/android-bootstrap/less/carousel.less +269 -269
  59. package/src/android-bootstrap/less/close.less +34 -34
  60. package/src/android-bootstrap/less/code.less +69 -69
  61. package/src/android-bootstrap/less/component-animations.less +33 -33
  62. package/src/android-bootstrap/less/grid.less +84 -84
  63. package/src/android-bootstrap/less/input-groups.less +167 -167
  64. package/src/android-bootstrap/less/jumbotron.less +52 -52
  65. package/src/android-bootstrap/less/labels.less +64 -64
  66. package/src/android-bootstrap/less/list-group.less +141 -141
  67. package/src/android-bootstrap/less/media.less +66 -66
  68. package/src/android-bootstrap/less/mixins/alerts.less +14 -14
  69. package/src/android-bootstrap/less/mixins/background-variant.less +9 -9
  70. package/src/android-bootstrap/less/mixins/border-radius.less +18 -18
  71. package/src/android-bootstrap/less/mixins/buttons.less +69 -69
  72. package/src/android-bootstrap/less/mixins/center-block.less +7 -7
  73. package/src/android-bootstrap/less/mixins/clearfix.less +22 -22
  74. package/src/android-bootstrap/less/mixins/forms.less +90 -90
  75. package/src/android-bootstrap/less/mixins/gradients.less +59 -59
  76. package/src/android-bootstrap/less/mixins/grid-framework.less +92 -92
  77. package/src/android-bootstrap/less/mixins/grid.less +122 -122
  78. package/src/android-bootstrap/less/mixins/hide-text.less +21 -21
  79. package/src/android-bootstrap/less/mixins/image.less +33 -33
  80. package/src/android-bootstrap/less/mixins/labels.less +12 -12
  81. package/src/android-bootstrap/less/mixins/list-group.less +30 -30
  82. package/src/android-bootstrap/less/mixins/nav-divider.less +10 -10
  83. package/src/android-bootstrap/less/mixins/nav-vertical-align.less +9 -9
  84. package/src/android-bootstrap/less/mixins/opacity.less +8 -8
  85. package/src/android-bootstrap/less/mixins/pagination.less +24 -24
  86. package/src/android-bootstrap/less/mixins/panels.less +24 -24
  87. package/src/android-bootstrap/less/mixins/progress-bar.less +10 -10
  88. package/src/android-bootstrap/less/mixins/reset-filter.less +8 -8
  89. package/src/android-bootstrap/less/mixins/reset-text.less +18 -18
  90. package/src/android-bootstrap/less/mixins/resize.less +6 -6
  91. package/src/android-bootstrap/less/mixins/responsive-visibility.less +15 -15
  92. package/src/android-bootstrap/less/mixins/size.less +10 -10
  93. package/src/android-bootstrap/less/mixins/tab-focus.less +9 -9
  94. package/src/android-bootstrap/less/mixins/table-row.less +44 -44
  95. package/src/android-bootstrap/less/mixins/text-emphasis.less +9 -9
  96. package/src/android-bootstrap/less/mixins/text-overflow.less +8 -8
  97. package/src/android-bootstrap/less/mixins/vendor-prefixes.less +227 -227
  98. package/src/android-bootstrap/less/mixins.less +40 -40
  99. package/src/android-bootstrap/less/modals.less +151 -151
  100. package/src/android-bootstrap/less/navbar.less +660 -660
  101. package/src/android-bootstrap/less/navs.less +290 -290
  102. package/src/android-bootstrap/less/normalize.less +424 -424
  103. package/src/android-bootstrap/less/pager.less +76 -76
  104. package/src/android-bootstrap/less/pagination.less +89 -89
  105. package/src/android-bootstrap/less/panels.less +274 -274
  106. package/src/android-bootstrap/less/popovers.less +131 -131
  107. package/src/android-bootstrap/less/print.less +101 -101
  108. package/src/android-bootstrap/less/progress-bars.less +87 -87
  109. package/src/android-bootstrap/less/responsive-embed.less +35 -35
  110. package/src/android-bootstrap/less/responsive-utilities.less +194 -194
  111. package/src/android-bootstrap/less/scaffolding.less +161 -161
  112. package/src/android-bootstrap/less/tables.less +262 -262
  113. package/src/android-bootstrap/less/theme.less +291 -291
  114. package/src/android-bootstrap/less/thumbnails.less +36 -36
  115. package/src/android-bootstrap/less/tooltip.less +102 -102
  116. package/src/android-bootstrap/less/type.less +303 -303
  117. package/src/android-bootstrap/less/utilities.less +55 -55
  118. package/src/android-bootstrap/less/variables.less +896 -896
  119. package/src/android-bootstrap/less/wells.less +29 -29
  120. package/src/bootstrap/less/.csscomb.json +304 -304
  121. package/src/bootstrap/less/.csslintrc +19 -19
  122. package/src/bootstrap/less/alerts.less +73 -73
  123. package/src/bootstrap/less/badges.less +66 -66
  124. package/src/bootstrap/less/breadcrumbs.less +26 -26
  125. package/src/bootstrap/less/button-groups.less +247 -247
  126. package/src/bootstrap/less/buttons.less +172 -172
  127. package/src/bootstrap/less/carousel.less +269 -269
  128. package/src/bootstrap/less/close.less +34 -34
  129. package/src/bootstrap/less/code.less +69 -69
  130. package/src/bootstrap/less/component-animations.less +33 -33
  131. package/src/bootstrap/less/dropdowns.less +216 -216
  132. package/src/bootstrap/less/grid.less +84 -84
  133. package/src/bootstrap/less/input-groups.less +167 -167
  134. package/src/bootstrap/less/jumbotron.less +52 -52
  135. package/src/bootstrap/less/labels.less +64 -64
  136. package/src/bootstrap/less/list-group.less +141 -141
  137. package/src/bootstrap/less/media.less +66 -66
  138. package/src/bootstrap/less/mixins/alerts.less +14 -14
  139. package/src/bootstrap/less/mixins/background-variant.less +9 -9
  140. package/src/bootstrap/less/mixins/border-radius.less +18 -18
  141. package/src/bootstrap/less/mixins/buttons.less +69 -69
  142. package/src/bootstrap/less/mixins/center-block.less +7 -7
  143. package/src/bootstrap/less/mixins/clearfix.less +22 -22
  144. package/src/bootstrap/less/mixins/forms.less +90 -90
  145. package/src/bootstrap/less/mixins/gradients.less +59 -59
  146. package/src/bootstrap/less/mixins/grid-framework.less +92 -92
  147. package/src/bootstrap/less/mixins/grid.less +122 -122
  148. package/src/bootstrap/less/mixins/hide-text.less +21 -21
  149. package/src/bootstrap/less/mixins/image.less +33 -33
  150. package/src/bootstrap/less/mixins/labels.less +12 -12
  151. package/src/bootstrap/less/mixins/list-group.less +30 -30
  152. package/src/bootstrap/less/mixins/nav-divider.less +10 -10
  153. package/src/bootstrap/less/mixins/nav-vertical-align.less +9 -9
  154. package/src/bootstrap/less/mixins/opacity.less +8 -8
  155. package/src/bootstrap/less/mixins/pagination.less +24 -24
  156. package/src/bootstrap/less/mixins/panels.less +24 -24
  157. package/src/bootstrap/less/mixins/progress-bar.less +10 -10
  158. package/src/bootstrap/less/mixins/reset-filter.less +8 -8
  159. package/src/bootstrap/less/mixins/reset-text.less +18 -18
  160. package/src/bootstrap/less/mixins/resize.less +6 -6
  161. package/src/bootstrap/less/mixins/responsive-visibility.less +15 -15
  162. package/src/bootstrap/less/mixins/size.less +10 -10
  163. package/src/bootstrap/less/mixins/tab-focus.less +9 -9
  164. package/src/bootstrap/less/mixins/table-row.less +44 -44
  165. package/src/bootstrap/less/mixins/text-emphasis.less +9 -9
  166. package/src/bootstrap/less/mixins/text-overflow.less +8 -8
  167. package/src/bootstrap/less/mixins/vendor-prefixes.less +227 -227
  168. package/src/bootstrap/less/mixins.less +40 -40
  169. package/src/bootstrap/less/modals.less +151 -151
  170. package/src/bootstrap/less/navbar.less +660 -660
  171. package/src/bootstrap/less/normalize.less +424 -424
  172. package/src/bootstrap/less/pagination.less +89 -89
  173. package/src/bootstrap/less/panels.less +275 -275
  174. package/src/bootstrap/less/popovers.less +131 -131
  175. package/src/bootstrap/less/print.less +101 -101
  176. package/src/bootstrap/less/progress-bars.less +87 -87
  177. package/src/bootstrap/less/responsive-embed.less +35 -35
  178. package/src/bootstrap/less/responsive-utilities.less +194 -194
  179. package/src/bootstrap/less/scaffolding.less +161 -161
  180. package/src/bootstrap/less/theme.less +291 -291
  181. package/src/bootstrap/less/thumbnails.less +36 -36
  182. package/src/bootstrap/less/tooltip.less +102 -102
  183. package/src/bootstrap/less/type.less +303 -303
  184. package/src/bootstrap/less/utilities.less +55 -55
  185. package/src/bootstrap/less/wells.less +29 -29
  186. package/src/components/FileUpload.vue +696 -696
  187. package/src/components/Hello.vue +39 -39
  188. package/src/components/LeftTree.vue +27 -27
  189. package/src/components/android/AttendanceTally.vue +116 -116
  190. package/src/components/android/Blank.vue +10 -10
  191. package/src/components/android/CheckUnplanPage.vue +56 -56
  192. package/src/components/android/Checker.vue +12 -12
  193. package/src/components/android/CheckerAnnual.vue +81 -81
  194. package/src/components/android/CheckerAvarta.vue +82 -82
  195. package/src/components/android/EquipmentInspection.vue +348 -348
  196. package/src/components/android/FootprintMap.vue +120 -120
  197. package/src/components/android/HiddentroubleInvestigation.vue +192 -192
  198. package/src/components/android/MasterMain.vue +77 -77
  199. package/src/components/android/Menu.vue +132 -132
  200. package/src/components/android/PaperAlarm.vue +85 -85
  201. package/src/components/android/PaperDeviceNoncivil.vue +214 -214
  202. package/src/components/android/PlumberAnnual.vue +83 -83
  203. package/src/components/android/PlumberAnnualDetail.vue +65 -65
  204. package/src/components/android/PlumberMonthly.vue +84 -84
  205. package/src/components/android/PostMap.vue +83 -83
  206. package/src/components/android/QueryCheckHistory.vue +122 -122
  207. package/src/components/android/QueryCheckHistoryItem.vue +62 -62
  208. package/src/components/android/RepairMain.vue +60 -60
  209. package/src/components/android/Repairman.vue +12 -12
  210. package/src/components/android/StationMaster.vue +12 -12
  211. package/src/components/defects/DefectModal.vue +101 -101
  212. package/src/components/defects/DevicesAndItem.vue +39 -39
  213. package/src/components/issueplan/IssuePlanMain.vue +23 -23
  214. package/src/components/notice/NoticeForm.vue +100 -100
  215. package/src/components/notice/NoticeIssue.vue +20 -20
  216. package/src/components/paper/PicViewer.vue +18 -18
  217. package/src/components/phonestate/MonthlyTraffic.vue +66 -66
  218. package/src/components/phonestate/MonthlyTrafficRouter.vue +15 -15
  219. package/src/components/phonestate/PostMap.vue +82 -82
  220. package/src/components/querycheckpaper/PaperItem.vue +59 -59
  221. package/src/components/userfile/MeterFile.vue +145 -145
  222. package/src/components/userfile/MeterModify.vue +46 -46
  223. package/src/components/userfileaudit/MeterAuditFile.vue +129 -129
  224. package/src/filiale/hanzhong/pc/CheckHiddenDanger.vue +713 -713
  225. package/src/filiale/hanzhong/pc/CheckNumberStatistics.vue +499 -499
  226. package/src/filiale/hanzhong/pc/CheckSafeDetail.vue +578 -578
  227. package/src/filiale/hanzhong/pc/CheckSafeStatus.vue +508 -508
  228. package/src/filiale/hanzhong/pc/CheckerSafeDetail.vue +595 -595
  229. package/src/filiale/hanzhong/pc/HomeEcharts.vue +153 -153
  230. package/src/filiale/siyang/android/SafecheckDevices.vue +1302 -1302
  231. package/src/plugins/LoadData.js +10 -10
  232. package/src/plugins/LoadParams.js +24 -24
  233. package/src/stores/wxconfig.js +10 -10
  234. package/src/utils/getNowDate.js +33 -33
  235. package/test/e2e/custom-assertions/elementCount.js +26 -26
  236. package/test/e2e/nightwatch.conf.js +40 -40
  237. package/test/e2e/runner.js +30 -30
  238. package/test/e2e/specs/test.js +13 -13
  239. package/test/unit/.eslintrc +5 -5
  240. package/test/unit/TestUtil.js +62 -62
  241. package/test/unit/context.html +20 -20
  242. package/test/unit/index.js +13 -13
@@ -1,499 +1,499 @@
1
- <template lang="html">
2
- <div class="div-4">
3
- <div :style="{height:headheight,background:'#eaeff4'}">
4
- <div class="div-2">
5
- <button class="but-1" @click="barrdios" v-show="full_screen"><img src='../../../assets/echarts6.png'
6
- class="img-1"/>&nbsp;全屏显示
7
- </button>
8
- <button @click="showall" v-show="show_all" class="but-2">返回</button>
9
- </div>
10
- </div>
11
- <div class="flex-row" style="height: 90%;">
12
- <div class="span">
13
- <div class="form-inline" v-if="echartsshow" style="height: auto;margin-bottom: 5%;margin-top: 5%">
14
- <div class="form-group">
15
- <label for="endDate">截至日期:</label>
16
- <datepicker id="endDate" placeholder="结束日期"
17
- v-model="endDate"
18
- :value.sync="endDate"
19
- :disabled-days-of-Week="[]"
20
- :format="'yyyy-MM-dd'"
21
- :show-reset-button="reset">
22
- </datepicker>
23
- </div>
24
- <!-- <div class="form-group">-->
25
- <!-- <label class="control-label">组织机构</label>-->
26
- <!-- <chooser :userid.sync='f.id' resource-type="user" :width='200' :select-data.sync='chosenOrg'></chooser>-->
27
- <!-- </div>-->
28
- </div>
29
- <div id="gph"></div>
30
- </div>
31
-
32
- <!--调用子组件绘图查表-->
33
- <div v-if="echartsshow">
34
- <h4 align="center">用户及小区统计表</h4>
35
- <criteria-paged :model="model" v-ref:crip>
36
- <data-grid :model="model" partial='list' id="datagridstyle1" v-ref:grid1
37
- classname="table table-bordered table table-hover">
38
- <template partial='head'>
39
- <tr>
40
- <th>
41
- <nobr>分公司</nobr>
42
- </th>
43
- <th>
44
- <nobr>民用</nobr>
45
- </th>
46
- <th>
47
- <nobr>非民用</nobr>
48
- </th>
49
- <th>
50
- <nobr>小区</nobr>
51
- </th>
52
- </tr>
53
- </template>
54
- <template partial='body'>
55
- <tr class="tr-1">
56
- <td class="td-1" style="text-align: center;">
57
- {{row.f_filialeid}}
58
- </td>
59
- <td class="td-1" style="text-align: center;">
60
- {{row.mytype}}
61
- </td>
62
- <td class="td-1" style="text-align: center;">
63
- {{row.fmytype}}
64
- </td>
65
- <td class="td-1" style="text-align: center;">
66
- {{row.countxq}}
67
- </td>
68
- </tr>
69
- </template>
70
- <template partial='foot'>
71
- <tr>
72
- <td colspan="1" style="text-align: right">合计:</td>
73
- <td style="text-align: center"><nobr>{{$parent.$parent.$parent.count.mytype}}</nobr></td>
74
- <td style="text-align: center"><nobr>{{$parent.$parent.$parent.count.fmytype}}</nobr></td>
75
- <td style="text-align: center"><nobr>{{$parent.$parent.$parent.count.countxq}}</nobr></td>
76
- </tr>
77
- </template>
78
- </data-grid>
79
- </criteria-paged>
80
- </div>
81
-
82
- </div>
83
- </div>
84
- </template>
85
-
86
- <script>
87
- import * as Util from '../../Util'
88
- import co from 'co'
89
- import echarts from 'echarts'
90
- import {HttpResetClass } from 'vue-client'
91
- import {PagedList} from 'vue-client'
92
-
93
- let getData = function * (self) {
94
- let load = new HttpResetClass()
95
- self.set()
96
- load.load('POST', 'rs/sql/CountPeople', {data: {endDate: self.endDate, orgid: self.orgid}},
97
- {resolveMsg: null, rejectMsg: null})
98
- .then((res) => {
99
- let filialeArray = []
100
- let mytypeArray = []
101
- let fmytypeArray = []
102
- let countxqArray = []
103
- self.count.mytype = 0
104
- self.count.fmytype = 0
105
- self.count.countxq =0
106
- for (var i = 0;i < res.data.length;i++){
107
- filialeArray[i] = res.data[i].f_filialeid
108
- mytypeArray[i] = res.data[i].mytype
109
- fmytypeArray[i] = res.data[i].fmytype
110
- countxqArray[i] = res.data[i].countxq
111
- self.count.mytype += res.data[i].mytype
112
- self.count.fmytype += res.data[i].fmytype
113
- self.count.countxq += res.data[i].countxq
114
- }
115
- self.set(filialeArray, mytypeArray, fmytypeArray, countxqArray)
116
- self.settable()
117
- })
118
- }
119
- export default {
120
- title: '用户数量分布',
121
- data () {
122
- return {
123
- full_screen: true,//控制全屏按键显示状态
124
- show_all: false,//控制返回按键显示状态
125
- //控制图表的显示状态
126
- echartsshow: false,
127
- barshow: true,
128
- detailshows: true,
129
-
130
- //控制图表的style
131
- barheight: '88.37%',
132
- headheight: '11.61%',
133
- styledate: {
134
- echartsheight: '95%',
135
- echartsfloat: 'none',
136
- },
137
-
138
- echartswidth: '95%',
139
- barshowid: '1',
140
- headData: [],
141
- bodyData: [],
142
-
143
- count:{
144
- mytype:0,
145
- fmytype:0,
146
- countxq:0,
147
- },
148
-
149
- model: new PagedList('rs/sql/CountPeople', 20, {endDate: 'this.endDate', orgid: 'this.orgid'}),
150
- orgid: `('${this.$login.f.orgid}')`,
151
- f: this.$login.f,
152
- chosenOrg: {
153
- id: 0
154
- },
155
- endDate: Util.toStandardDateString(),
156
- xc: '',
157
- isView: false
158
- }
159
- },
160
- props:{
161
- f_filialeids:{
162
- type:String
163
- }
164
- },
165
- methods: {
166
- barrdios() {//全屏按键事件
167
- console.log("全屏显示事件")
168
- this.barshow = true
169
- this.echartsshow = true
170
- this.show_all = true
171
- this.full_screen = false
172
- this.buttonshow = true
173
- this.showdetail = false
174
- this.barheight = '87%'
175
- this.styledate.echartsfloat = 'left'
176
- this.styledate.echartsheight = '65%'
177
- this.echartswidth = '50%'
178
- this.headheight = '8%'
179
- this.$parent.echarts = '1'
180
- this.$emit('echarts-changed')
181
- this.newecharts = true
182
- this.searchdata()
183
- console.log(this.$parent.echarts, '主图状态')
184
- },
185
- showall() {//返回按键事件
186
- //修改显示状态
187
- this.barshow = false
188
- this.detailshows = true
189
- this.echartsshow = false
190
- this.buttonshow = false
191
- this.buttonshow1 = false
192
- this.newecharts = false
193
- this.show_all = false
194
- this.full_screen = true
195
- this.oldecharts = true
196
- this.showdetail = false
197
- this.styledate.echartsheight = '95%'
198
- this.echartswidth = '50%'
199
- this.$parent.echarts = -1
200
- this.headheight = '11.61%'
201
- this.$emit('echarts-changed', this.echarts)
202
- },
203
- settable() {
204
- this.model = new PagedList('rs/sql/CountPeople', 20, {endDate: 'this.endDate', orgid: 'this.orgid'})
205
- this.model.endDate = this.endDate
206
- this.model.orgid = this.orgid
207
- this.model.search('1=1')
208
- },
209
- set(filialeArray, mytypeArray, fmytypeArray, countxqArray) {
210
- this.xc = echarts.init(document.getElementById('gph'))
211
- this.xc.setOption({
212
- backgroundColor: 'white',
213
- title: {
214
- text: '用户及小区',
215
- x: 'left'
216
- },
217
- tooltip: {
218
- trigger: 'axis',
219
- extraCssText: 'width: auto;height: auto;',
220
- axisPointer: { // 坐标轴指示器,坐标轴触发有效
221
- type: 'shadow' // 默认为直线,可选为:'line' | 'shadow'
222
- }
223
- },
224
- grid: {
225
- left: '2%',
226
- right: '4%',
227
- bottom: '14%',
228
- top: '16%',
229
- containLabel: true
230
- },
231
- legend: {
232
- data: ['民用', '非民用', '小区'],
233
- right: 10,
234
- top: 12,
235
- textStyle: {
236
- color: "black"
237
- },
238
- itemWidth: 12,
239
- itemHeight: 10,
240
- // itemGap: 35
241
- },
242
- xAxis: {
243
- type: 'category',
244
- data: filialeArray,
245
- axisLine: {
246
- lineStyle: {
247
- color: 'black'
248
-
249
- }
250
- },
251
- axisLabel: {
252
- // interval: 0,
253
- // rotate: 40,
254
- textStyle: {
255
- fontFamily: 'Microsoft YaHei'
256
- }
257
- },
258
- },
259
- "dataZoom": [{
260
- "show": true,
261
- "height": 12,
262
- "xAxisIndex": [
263
- 0
264
- ],
265
- bottom: '8%',
266
- "start": 10,
267
- "end": 90,
268
- handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
269
- handleSize: '110%',
270
- handleStyle: {
271
- color: "#d3dee5",
272
-
273
- },
274
- textStyle: {
275
- color: "#fff"
276
- },
277
- borderColor: "#90979c"
278
- }, {
279
- "type": "inside",
280
- "show": true,
281
- "height": 15,
282
- "start": 1,
283
- "end": 35
284
- }],
285
- yAxis: {
286
- type: 'value',
287
- axisLine: {show: true, lineStyle: {color: '#999999'}},
288
- },
289
- series: [{
290
- name: '民用',
291
- type: 'bar',
292
- barWidth: '15%',
293
- itemStyle: {
294
- normal: {
295
- color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
296
- offset: 0,
297
- color: '#fccb05'
298
- }, {
299
- offset: 1,
300
- color: '#f5804d'
301
- }]),
302
- barBorderRadius: 12,
303
- },
304
- },
305
- data: mytypeArray
306
- },
307
- {
308
- name: '非民用',
309
- type: 'bar',
310
- barWidth: '15%',
311
- itemStyle: {
312
- normal: {
313
- color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
314
- offset: 0,
315
- color: '#8bd46e'
316
- }, {
317
- offset: 1,
318
- color: '#09bcb7'
319
- }]),
320
- barBorderRadius: 11,
321
- }
322
-
323
- },
324
- data: fmytypeArray
325
- },
326
- {
327
- name: '小区',
328
- type: 'bar',
329
- barWidth: '15%',
330
- itemStyle: {
331
- normal: {
332
- color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
333
- offset: 0,
334
- color: '#248ff7'
335
- }, {
336
- offset: 1,
337
- color: '#6851f1'
338
- }]),
339
- barBorderRadius: 11,
340
- }
341
- },
342
- data: countxqArray
343
- }]
344
- })
345
- },
346
- searchdata () {
347
- let getGen = getData(this)
348
- co(getGen)
349
- }
350
- },
351
- ready () {
352
- // this.orgid = `('${this.$login.f.orgid}')`
353
- // this.searchdata()
354
- },
355
- watch: {
356
- 'endDate' (val) {
357
- console.log("我是watch")
358
- this.searchdata()
359
- },
360
- // 'chosenOrg': {
361
- // deep: true,
362
- // handler(val) {
363
- // this.orgid = ''
364
- // if (typeof this.chosenOrg.fullid !== 'undefined') {
365
- // let orgarray = this.chosenOrg.fullid.split(".")
366
- // let strid = orgarray[1]
367
- // for (let i = 2; i < orgarray.length; i++) {
368
- // strid += '.' + orgarray[i]
369
- // }
370
- // this.$set('orgid', strid)
371
- // }
372
- // },
373
- // immediate: true
374
- // },
375
- 'f_filialeids'(){
376
- console.log('number改变了')
377
- this.orgid = this.f_filialeids
378
- this.searchdata()
379
- }
380
- }
381
-
382
- }
383
- </script>
384
- <style scoped>
385
- .div-1 {
386
- height: 85%;
387
- width: 10%;
388
- margin-left: 5%;
389
- float: left;
390
- margin-top: 1%;
391
- }
392
-
393
- .div-2 {
394
- float: right;
395
- width: 80%;
396
- height: 55.56%;
397
- margin-right: 1%;
398
- margin-top: 0.5%;
399
- }
400
-
401
- .div-3 {
402
- float: left;
403
- margin-left: 2%;
404
- padding-top: 2%;
405
- width: 96%;
406
- height: 99%;
407
- }
408
-
409
- .div-4 {
410
- background-color: #fafafa;
411
- overflow-y: hidden
412
- }
413
-
414
- table {
415
- height: 100%;
416
- width: 100%;
417
- font-size: 12px
418
- }
419
-
420
- tr {
421
- height: 25%;
422
- width: 100%
423
- }
424
-
425
- td {
426
- width: 11%;
427
- font-size: 12px;
428
- color: #666666;
429
- }
430
-
431
- .td-1 {
432
- width: 16%;
433
- color: #90addf;
434
- font-size: 12px
435
- }
436
-
437
- .td-2 {
438
- width: 15%;
439
- color: #90addf;
440
- font-size: 12px
441
- }
442
-
443
- span {
444
- color: #90addf;
445
- font-size: 12px
446
- }
447
-
448
- .span-1 {
449
- color: #999999;
450
- font-size: 12px
451
- }
452
-
453
- .p-1 {
454
- font-size: 15px;
455
- height: 99%;
456
- width: 99%;
457
- font-weight: bold;
458
- color: #333333;
459
- }
460
-
461
- button {
462
- width: 10%;
463
- margin-top: 0%;
464
- margin-left: 2%;
465
- float: right;
466
- background-color: #73ca73;
467
- border-radius: 4px;
468
- border: 1px solid #73ca73;
469
- color: #ffffff;
470
- font-size: 15px;
471
- height: 120%;
472
- }
473
-
474
- .but-1 {
475
- width: 17%;
476
- float: right;
477
- border-radius: 4px;
478
- font-size: 12px;
479
- height: 130%;
480
- }
481
-
482
- .but-2 {
483
- background-color: #88b5e2;
484
- border: #88b5e2;
485
- width: 6%;
486
- }
487
-
488
- img {
489
- width: 5px;
490
- height: 18px;
491
- }
492
-
493
- .img-1 {
494
- height: 12px;
495
- width: auto;
496
- }
497
-
498
- </style>
499
-
1
+ <template lang="html">
2
+ <div class="div-4">
3
+ <div :style="{height:headheight,background:'#eaeff4'}">
4
+ <div class="div-2">
5
+ <button class="but-1" @click="barrdios" v-show="full_screen"><img src='../../../assets/echarts6.png'
6
+ class="img-1"/>&nbsp;全屏显示
7
+ </button>
8
+ <button @click="showall" v-show="show_all" class="but-2">返回</button>
9
+ </div>
10
+ </div>
11
+ <div class="flex-row" style="height: 90%;">
12
+ <div class="span">
13
+ <div class="form-inline" v-if="echartsshow" style="height: auto;margin-bottom: 5%;margin-top: 5%">
14
+ <div class="form-group">
15
+ <label for="endDate">截至日期:</label>
16
+ <datepicker id="endDate" placeholder="结束日期"
17
+ v-model="endDate"
18
+ :value.sync="endDate"
19
+ :disabled-days-of-Week="[]"
20
+ :format="'yyyy-MM-dd'"
21
+ :show-reset-button="reset">
22
+ </datepicker>
23
+ </div>
24
+ <!-- <div class="form-group">-->
25
+ <!-- <label class="control-label">组织机构</label>-->
26
+ <!-- <chooser :userid.sync='f.id' resource-type="user" :width='200' :select-data.sync='chosenOrg'></chooser>-->
27
+ <!-- </div>-->
28
+ </div>
29
+ <div id="gph"></div>
30
+ </div>
31
+
32
+ <!--调用子组件绘图查表-->
33
+ <div v-if="echartsshow">
34
+ <h4 align="center">用户及小区统计表</h4>
35
+ <criteria-paged :model="model" v-ref:crip>
36
+ <data-grid :model="model" partial='list' id="datagridstyle1" v-ref:grid1
37
+ classname="table table-bordered table table-hover">
38
+ <template partial='head'>
39
+ <tr>
40
+ <th>
41
+ <nobr>分公司</nobr>
42
+ </th>
43
+ <th>
44
+ <nobr>民用</nobr>
45
+ </th>
46
+ <th>
47
+ <nobr>非民用</nobr>
48
+ </th>
49
+ <th>
50
+ <nobr>小区</nobr>
51
+ </th>
52
+ </tr>
53
+ </template>
54
+ <template partial='body'>
55
+ <tr class="tr-1">
56
+ <td class="td-1" style="text-align: center;">
57
+ {{row.f_filialeid}}
58
+ </td>
59
+ <td class="td-1" style="text-align: center;">
60
+ {{row.mytype}}
61
+ </td>
62
+ <td class="td-1" style="text-align: center;">
63
+ {{row.fmytype}}
64
+ </td>
65
+ <td class="td-1" style="text-align: center;">
66
+ {{row.countxq}}
67
+ </td>
68
+ </tr>
69
+ </template>
70
+ <template partial='foot'>
71
+ <tr>
72
+ <td colspan="1" style="text-align: right">合计:</td>
73
+ <td style="text-align: center"><nobr>{{$parent.$parent.$parent.count.mytype}}</nobr></td>
74
+ <td style="text-align: center"><nobr>{{$parent.$parent.$parent.count.fmytype}}</nobr></td>
75
+ <td style="text-align: center"><nobr>{{$parent.$parent.$parent.count.countxq}}</nobr></td>
76
+ </tr>
77
+ </template>
78
+ </data-grid>
79
+ </criteria-paged>
80
+ </div>
81
+
82
+ </div>
83
+ </div>
84
+ </template>
85
+
86
+ <script>
87
+ import * as Util from '../../Util'
88
+ import co from 'co'
89
+ import echarts from 'echarts'
90
+ import {HttpResetClass } from 'vue-client'
91
+ import {PagedList} from 'vue-client'
92
+
93
+ let getData = function * (self) {
94
+ let load = new HttpResetClass()
95
+ self.set()
96
+ load.load('POST', 'rs/sql/CountPeople', {data: {endDate: self.endDate, orgid: self.orgid}},
97
+ {resolveMsg: null, rejectMsg: null})
98
+ .then((res) => {
99
+ let filialeArray = []
100
+ let mytypeArray = []
101
+ let fmytypeArray = []
102
+ let countxqArray = []
103
+ self.count.mytype = 0
104
+ self.count.fmytype = 0
105
+ self.count.countxq =0
106
+ for (var i = 0;i < res.data.length;i++){
107
+ filialeArray[i] = res.data[i].f_filialeid
108
+ mytypeArray[i] = res.data[i].mytype
109
+ fmytypeArray[i] = res.data[i].fmytype
110
+ countxqArray[i] = res.data[i].countxq
111
+ self.count.mytype += res.data[i].mytype
112
+ self.count.fmytype += res.data[i].fmytype
113
+ self.count.countxq += res.data[i].countxq
114
+ }
115
+ self.set(filialeArray, mytypeArray, fmytypeArray, countxqArray)
116
+ self.settable()
117
+ })
118
+ }
119
+ export default {
120
+ title: '用户数量分布',
121
+ data () {
122
+ return {
123
+ full_screen: true,//控制全屏按键显示状态
124
+ show_all: false,//控制返回按键显示状态
125
+ //控制图表的显示状态
126
+ echartsshow: false,
127
+ barshow: true,
128
+ detailshows: true,
129
+
130
+ //控制图表的style
131
+ barheight: '88.37%',
132
+ headheight: '11.61%',
133
+ styledate: {
134
+ echartsheight: '95%',
135
+ echartsfloat: 'none',
136
+ },
137
+
138
+ echartswidth: '95%',
139
+ barshowid: '1',
140
+ headData: [],
141
+ bodyData: [],
142
+
143
+ count:{
144
+ mytype:0,
145
+ fmytype:0,
146
+ countxq:0,
147
+ },
148
+
149
+ model: new PagedList('rs/sql/CountPeople', 20, {endDate: 'this.endDate', orgid: 'this.orgid'}),
150
+ orgid: `('${this.$login.f.orgid}')`,
151
+ f: this.$login.f,
152
+ chosenOrg: {
153
+ id: 0
154
+ },
155
+ endDate: Util.toStandardDateString(),
156
+ xc: '',
157
+ isView: false
158
+ }
159
+ },
160
+ props:{
161
+ f_filialeids:{
162
+ type:String
163
+ }
164
+ },
165
+ methods: {
166
+ barrdios() {//全屏按键事件
167
+ console.log("全屏显示事件")
168
+ this.barshow = true
169
+ this.echartsshow = true
170
+ this.show_all = true
171
+ this.full_screen = false
172
+ this.buttonshow = true
173
+ this.showdetail = false
174
+ this.barheight = '87%'
175
+ this.styledate.echartsfloat = 'left'
176
+ this.styledate.echartsheight = '65%'
177
+ this.echartswidth = '50%'
178
+ this.headheight = '8%'
179
+ this.$parent.echarts = '1'
180
+ this.$emit('echarts-changed')
181
+ this.newecharts = true
182
+ this.searchdata()
183
+ console.log(this.$parent.echarts, '主图状态')
184
+ },
185
+ showall() {//返回按键事件
186
+ //修改显示状态
187
+ this.barshow = false
188
+ this.detailshows = true
189
+ this.echartsshow = false
190
+ this.buttonshow = false
191
+ this.buttonshow1 = false
192
+ this.newecharts = false
193
+ this.show_all = false
194
+ this.full_screen = true
195
+ this.oldecharts = true
196
+ this.showdetail = false
197
+ this.styledate.echartsheight = '95%'
198
+ this.echartswidth = '50%'
199
+ this.$parent.echarts = -1
200
+ this.headheight = '11.61%'
201
+ this.$emit('echarts-changed', this.echarts)
202
+ },
203
+ settable() {
204
+ this.model = new PagedList('rs/sql/CountPeople', 20, {endDate: 'this.endDate', orgid: 'this.orgid'})
205
+ this.model.endDate = this.endDate
206
+ this.model.orgid = this.orgid
207
+ this.model.search('1=1')
208
+ },
209
+ set(filialeArray, mytypeArray, fmytypeArray, countxqArray) {
210
+ this.xc = echarts.init(document.getElementById('gph'))
211
+ this.xc.setOption({
212
+ backgroundColor: 'white',
213
+ title: {
214
+ text: '用户及小区',
215
+ x: 'left'
216
+ },
217
+ tooltip: {
218
+ trigger: 'axis',
219
+ extraCssText: 'width: auto;height: auto;',
220
+ axisPointer: { // 坐标轴指示器,坐标轴触发有效
221
+ type: 'shadow' // 默认为直线,可选为:'line' | 'shadow'
222
+ }
223
+ },
224
+ grid: {
225
+ left: '2%',
226
+ right: '4%',
227
+ bottom: '14%',
228
+ top: '16%',
229
+ containLabel: true
230
+ },
231
+ legend: {
232
+ data: ['民用', '非民用', '小区'],
233
+ right: 10,
234
+ top: 12,
235
+ textStyle: {
236
+ color: "black"
237
+ },
238
+ itemWidth: 12,
239
+ itemHeight: 10,
240
+ // itemGap: 35
241
+ },
242
+ xAxis: {
243
+ type: 'category',
244
+ data: filialeArray,
245
+ axisLine: {
246
+ lineStyle: {
247
+ color: 'black'
248
+
249
+ }
250
+ },
251
+ axisLabel: {
252
+ // interval: 0,
253
+ // rotate: 40,
254
+ textStyle: {
255
+ fontFamily: 'Microsoft YaHei'
256
+ }
257
+ },
258
+ },
259
+ "dataZoom": [{
260
+ "show": true,
261
+ "height": 12,
262
+ "xAxisIndex": [
263
+ 0
264
+ ],
265
+ bottom: '8%',
266
+ "start": 10,
267
+ "end": 90,
268
+ handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
269
+ handleSize: '110%',
270
+ handleStyle: {
271
+ color: "#d3dee5",
272
+
273
+ },
274
+ textStyle: {
275
+ color: "#fff"
276
+ },
277
+ borderColor: "#90979c"
278
+ }, {
279
+ "type": "inside",
280
+ "show": true,
281
+ "height": 15,
282
+ "start": 1,
283
+ "end": 35
284
+ }],
285
+ yAxis: {
286
+ type: 'value',
287
+ axisLine: {show: true, lineStyle: {color: '#999999'}},
288
+ },
289
+ series: [{
290
+ name: '民用',
291
+ type: 'bar',
292
+ barWidth: '15%',
293
+ itemStyle: {
294
+ normal: {
295
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
296
+ offset: 0,
297
+ color: '#fccb05'
298
+ }, {
299
+ offset: 1,
300
+ color: '#f5804d'
301
+ }]),
302
+ barBorderRadius: 12,
303
+ },
304
+ },
305
+ data: mytypeArray
306
+ },
307
+ {
308
+ name: '非民用',
309
+ type: 'bar',
310
+ barWidth: '15%',
311
+ itemStyle: {
312
+ normal: {
313
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
314
+ offset: 0,
315
+ color: '#8bd46e'
316
+ }, {
317
+ offset: 1,
318
+ color: '#09bcb7'
319
+ }]),
320
+ barBorderRadius: 11,
321
+ }
322
+
323
+ },
324
+ data: fmytypeArray
325
+ },
326
+ {
327
+ name: '小区',
328
+ type: 'bar',
329
+ barWidth: '15%',
330
+ itemStyle: {
331
+ normal: {
332
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
333
+ offset: 0,
334
+ color: '#248ff7'
335
+ }, {
336
+ offset: 1,
337
+ color: '#6851f1'
338
+ }]),
339
+ barBorderRadius: 11,
340
+ }
341
+ },
342
+ data: countxqArray
343
+ }]
344
+ })
345
+ },
346
+ searchdata () {
347
+ let getGen = getData(this)
348
+ co(getGen)
349
+ }
350
+ },
351
+ ready () {
352
+ // this.orgid = `('${this.$login.f.orgid}')`
353
+ // this.searchdata()
354
+ },
355
+ watch: {
356
+ 'endDate' (val) {
357
+ console.log("我是watch")
358
+ this.searchdata()
359
+ },
360
+ // 'chosenOrg': {
361
+ // deep: true,
362
+ // handler(val) {
363
+ // this.orgid = ''
364
+ // if (typeof this.chosenOrg.fullid !== 'undefined') {
365
+ // let orgarray = this.chosenOrg.fullid.split(".")
366
+ // let strid = orgarray[1]
367
+ // for (let i = 2; i < orgarray.length; i++) {
368
+ // strid += '.' + orgarray[i]
369
+ // }
370
+ // this.$set('orgid', strid)
371
+ // }
372
+ // },
373
+ // immediate: true
374
+ // },
375
+ 'f_filialeids'(){
376
+ console.log('number改变了')
377
+ this.orgid = this.f_filialeids
378
+ this.searchdata()
379
+ }
380
+ }
381
+
382
+ }
383
+ </script>
384
+ <style scoped>
385
+ .div-1 {
386
+ height: 85%;
387
+ width: 10%;
388
+ margin-left: 5%;
389
+ float: left;
390
+ margin-top: 1%;
391
+ }
392
+
393
+ .div-2 {
394
+ float: right;
395
+ width: 80%;
396
+ height: 55.56%;
397
+ margin-right: 1%;
398
+ margin-top: 0.5%;
399
+ }
400
+
401
+ .div-3 {
402
+ float: left;
403
+ margin-left: 2%;
404
+ padding-top: 2%;
405
+ width: 96%;
406
+ height: 99%;
407
+ }
408
+
409
+ .div-4 {
410
+ background-color: #fafafa;
411
+ overflow-y: hidden
412
+ }
413
+
414
+ table {
415
+ height: 100%;
416
+ width: 100%;
417
+ font-size: 12px
418
+ }
419
+
420
+ tr {
421
+ height: 25%;
422
+ width: 100%
423
+ }
424
+
425
+ td {
426
+ width: 11%;
427
+ font-size: 12px;
428
+ color: #666666;
429
+ }
430
+
431
+ .td-1 {
432
+ width: 16%;
433
+ color: #90addf;
434
+ font-size: 12px
435
+ }
436
+
437
+ .td-2 {
438
+ width: 15%;
439
+ color: #90addf;
440
+ font-size: 12px
441
+ }
442
+
443
+ span {
444
+ color: #90addf;
445
+ font-size: 12px
446
+ }
447
+
448
+ .span-1 {
449
+ color: #999999;
450
+ font-size: 12px
451
+ }
452
+
453
+ .p-1 {
454
+ font-size: 15px;
455
+ height: 99%;
456
+ width: 99%;
457
+ font-weight: bold;
458
+ color: #333333;
459
+ }
460
+
461
+ button {
462
+ width: 10%;
463
+ margin-top: 0%;
464
+ margin-left: 2%;
465
+ float: right;
466
+ background-color: #73ca73;
467
+ border-radius: 4px;
468
+ border: 1px solid #73ca73;
469
+ color: #ffffff;
470
+ font-size: 15px;
471
+ height: 120%;
472
+ }
473
+
474
+ .but-1 {
475
+ width: 17%;
476
+ float: right;
477
+ border-radius: 4px;
478
+ font-size: 12px;
479
+ height: 130%;
480
+ }
481
+
482
+ .but-2 {
483
+ background-color: #88b5e2;
484
+ border: #88b5e2;
485
+ width: 6%;
486
+ }
487
+
488
+ img {
489
+ width: 5px;
490
+ height: 18px;
491
+ }
492
+
493
+ .img-1 {
494
+ height: 12px;
495
+ width: auto;
496
+ }
497
+
498
+ </style>
499
+