readmeter-changan 1.0.33 → 1.0.35

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.
@@ -2,428 +2,13 @@
2
2
  <project version="4">
3
3
  <component name="ChangeListManager">
4
4
  <list default="true" id="3ff22a91-c12c-46e5-8072-9f6930fa055a" name="Default Changelist" comment="修复抄表记录界面翻页选项被遮挡">
5
- <change afterPath="$PROJECT_DIR$/src/components/readingmeter/HandMessage.vue" afterDir="false" />
6
- <change afterPath="$PROJECT_DIR$/src/components/readingmeter/SellHistory.vue" afterDir="false" />
7
- <change afterPath="$PROJECT_DIR$/src/components/readingmeter/SellInfo.vue" afterDir="false" />
8
- <change afterPath="$PROJECT_DIR$/src/components/server/AppHeader.vue" afterDir="false" />
9
5
  <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
10
- <change beforePath="$PROJECT_DIR$/build/dev-server.js" beforeDir="false" afterPath="$PROJECT_DIR$/build/dev-server.js" afterDir="false" />
11
- <change beforePath="$PROJECT_DIR$/build/webpack.base.conf.js" beforeDir="false" afterPath="$PROJECT_DIR$/build/webpack.base.conf.js" afterDir="false" />
12
- <change beforePath="$PROJECT_DIR$/dist/index.html" beforeDir="false" />
13
- <change beforePath="$PROJECT_DIR$/dist/static/.gitkeep" beforeDir="false" />
14
- <change beforePath="$PROJECT_DIR$/dist/static/1.83c4cd3840a4db445675.js" beforeDir="false" />
15
- <change beforePath="$PROJECT_DIR$/dist/static/1.e1beb90017520fc8dda9.js" beforeDir="false" />
16
- <change beforePath="$PROJECT_DIR$/dist/static/10.c20b92118c59466e4e5c.js" beforeDir="false" />
17
- <change beforePath="$PROJECT_DIR$/dist/static/10.d3afbd85d8c1356d5fe6.js" beforeDir="false" />
18
- <change beforePath="$PROJECT_DIR$/dist/static/11.2d26b55901f000e3ae61.js" beforeDir="false" />
19
- <change beforePath="$PROJECT_DIR$/dist/static/11.f00c447b4c28cc7435d4.js" beforeDir="false" />
20
- <change beforePath="$PROJECT_DIR$/dist/static/12.4001286b1128a63365f6.js" beforeDir="false" />
21
- <change beforePath="$PROJECT_DIR$/dist/static/12.4637d58058f136503919.js" beforeDir="false" />
22
- <change beforePath="$PROJECT_DIR$/dist/static/13.0a18891c5739e6d20d9a.js" beforeDir="false" />
23
- <change beforePath="$PROJECT_DIR$/dist/static/2.8637a43d6329e0c300cb.js" beforeDir="false" />
24
- <change beforePath="$PROJECT_DIR$/dist/static/2.901d8012f67b12a231a8.js" beforeDir="false" />
25
- <change beforePath="$PROJECT_DIR$/dist/static/3.35090eeed352609c92a3.js" beforeDir="false" />
26
- <change beforePath="$PROJECT_DIR$/dist/static/3.ae6b064567ab1ea14abb.js" beforeDir="false" />
27
- <change beforePath="$PROJECT_DIR$/dist/static/4.39b0d418cf889e253caa.js" beforeDir="false" />
28
- <change beforePath="$PROJECT_DIR$/dist/static/4.89690424cb47a1b09b0c.js" beforeDir="false" />
29
- <change beforePath="$PROJECT_DIR$/dist/static/5.b088833c332516d703bc.js" beforeDir="false" />
30
- <change beforePath="$PROJECT_DIR$/dist/static/5.e9c373e2c7b5a5445aea.js" beforeDir="false" />
31
- <change beforePath="$PROJECT_DIR$/dist/static/6.24c516b556355f5e1fba.js" beforeDir="false" />
32
- <change beforePath="$PROJECT_DIR$/dist/static/6.e798f8f8b86e6f09bca9.js" beforeDir="false" />
33
- <change beforePath="$PROJECT_DIR$/dist/static/7.09026f9b4f11ebce61e8.js" beforeDir="false" />
34
- <change beforePath="$PROJECT_DIR$/dist/static/7.4becaac2281e8d0f7090.js" beforeDir="false" />
35
- <change beforePath="$PROJECT_DIR$/dist/static/8.1c538ceecb8c7637278d.js" beforeDir="false" />
36
- <change beforePath="$PROJECT_DIR$/dist/static/8.66894aac44e16755250c.js" beforeDir="false" />
37
- <change beforePath="$PROJECT_DIR$/dist/static/9.36b9351351591cca669c.js" beforeDir="false" />
38
- <change beforePath="$PROJECT_DIR$/dist/static/9.5f113794978da1e6ed9b.js" beforeDir="false" />
39
- <change beforePath="$PROJECT_DIR$/dist/static/abnormal.svg" beforeDir="false" />
40
- <change beforePath="$PROJECT_DIR$/dist/static/alarm-big.svg" beforeDir="false" />
41
- <change beforePath="$PROJECT_DIR$/dist/static/alarm.svg" beforeDir="false" />
42
- <change beforePath="$PROJECT_DIR$/dist/static/app.0f7b7f2c1754d7cd95c4.js" beforeDir="false" />
43
- <change beforePath="$PROJECT_DIR$/dist/static/app.5f92c8aa4957dc412159.js" beforeDir="false" />
44
- <change beforePath="$PROJECT_DIR$/dist/static/app.css" beforeDir="false" />
45
- <change beforePath="$PROJECT_DIR$/dist/static/avilable.svg" beforeDir="false" />
46
- <change beforePath="$PROJECT_DIR$/dist/static/batchleft.png" beforeDir="false" />
47
- <change beforePath="$PROJECT_DIR$/dist/static/batchright.png" beforeDir="false" />
48
- <change beforePath="$PROJECT_DIR$/dist/static/bind.svg" beforeDir="false" />
49
- <change beforePath="$PROJECT_DIR$/dist/static/black-hole.svg" beforeDir="false" />
50
- <change beforePath="$PROJECT_DIR$/dist/static/bluemainbg.jpg" beforeDir="false" />
51
- <change beforePath="$PROJECT_DIR$/dist/static/cancel.svg" beforeDir="false" />
52
- <change beforePath="$PROJECT_DIR$/dist/static/creating.svg" beforeDir="false" />
53
- <change beforePath="$PROJECT_DIR$/dist/static/deleted.svg" beforeDir="false" />
54
- <change beforePath="$PROJECT_DIR$/dist/static/domain-certification.svg" beforeDir="false" />
55
- <change beforePath="$PROJECT_DIR$/dist/static/failure-big.svg" beforeDir="false" />
56
- <change beforePath="$PROJECT_DIR$/dist/static/failure.svg" beforeDir="false" />
57
- <change beforePath="$PROJECT_DIR$/dist/static/freed.svg" beforeDir="false" />
58
- <change beforePath="$PROJECT_DIR$/dist/static/freeze.svg" beforeDir="false" />
59
- <change beforePath="$PROJECT_DIR$/dist/static/glyphicons-halflings-regular.eot" beforeDir="false" />
60
- <change beforePath="$PROJECT_DIR$/dist/static/glyphicons-halflings-regular.svg" beforeDir="false" />
61
- <change beforePath="$PROJECT_DIR$/dist/static/glyphicons-halflings-regular.ttf" beforeDir="false" />
62
- <change beforePath="$PROJECT_DIR$/dist/static/glyphicons-halflings-regular.woff" beforeDir="false" />
63
- <change beforePath="$PROJECT_DIR$/dist/static/glyphicons-halflings-regular.woff2" beforeDir="false" />
64
- <change beforePath="$PROJECT_DIR$/dist/static/huangtengbiaozhi.png" beforeDir="false" />
65
- <change beforePath="$PROJECT_DIR$/dist/static/login_bg.jpg" beforeDir="false" />
66
- <change beforePath="$PROJECT_DIR$/dist/static/login_title.png" beforeDir="false" />
67
- <change beforePath="$PROJECT_DIR$/dist/static/login_title1.png" beforeDir="false" />
68
- <change beforePath="$PROJECT_DIR$/dist/static/loginbg.jpg" beforeDir="false" />
69
- <change beforePath="$PROJECT_DIR$/dist/static/loginlogo.png" beforeDir="false" />
70
- <change beforePath="$PROJECT_DIR$/dist/static/main_logo.png" beforeDir="false" />
71
- <change beforePath="$PROJECT_DIR$/dist/static/mainbg.jpg" beforeDir="false" />
72
- <change beforePath="$PROJECT_DIR$/dist/static/malfunction.svg" beforeDir="false" />
73
- <change beforePath="$PROJECT_DIR$/dist/static/menulogo.png" beforeDir="false" />
74
- <change beforePath="$PROJECT_DIR$/dist/static/mounted.svg" beforeDir="false" />
75
- <change beforePath="$PROJECT_DIR$/dist/static/newmainbg.jpg" beforeDir="false" />
76
- <change beforePath="$PROJECT_DIR$/dist/static/not-mounted.svg" beforeDir="false" />
77
- <change beforePath="$PROJECT_DIR$/dist/static/prompt-big.svg" beforeDir="false" />
78
- <change beforePath="$PROJECT_DIR$/dist/static/prompt.svg" beforeDir="false" />
79
- <change beforePath="$PROJECT_DIR$/dist/static/psicon.png" beforeDir="false" />
80
- <change beforePath="$PROJECT_DIR$/dist/static/reboot.svg" beforeDir="false" />
81
- <change beforePath="$PROJECT_DIR$/dist/static/reconstruction.svg" beforeDir="false" />
82
- <change beforePath="$PROJECT_DIR$/dist/static/run.svg" beforeDir="false" />
83
- <change beforePath="$PROJECT_DIR$/dist/static/shut-down.svg" beforeDir="false" />
84
- <change beforePath="$PROJECT_DIR$/dist/static/singleleft.png" beforeDir="false" />
85
- <change beforePath="$PROJECT_DIR$/dist/static/singleright.png" beforeDir="false" />
86
- <change beforePath="$PROJECT_DIR$/dist/static/sleep.svg" beforeDir="false" />
87
- <change beforePath="$PROJECT_DIR$/dist/static/specifications-change.svg" beforeDir="false" />
88
- <change beforePath="$PROJECT_DIR$/dist/static/star-state.svg" beforeDir="false" />
89
- <change beforePath="$PROJECT_DIR$/dist/static/stop.svg" beforeDir="false" />
90
- <change beforePath="$PROJECT_DIR$/dist/static/success-big.svg" beforeDir="false" />
91
- <change beforePath="$PROJECT_DIR$/dist/static/success.svg" beforeDir="false" />
92
- <change beforePath="$PROJECT_DIR$/dist/static/time-out.svg" beforeDir="false" />
93
- <change beforePath="$PROJECT_DIR$/dist/static/treeopen.png" beforeDir="false" />
94
- <change beforePath="$PROJECT_DIR$/dist/static/treeout.png" beforeDir="false" />
95
- <change beforePath="$PROJECT_DIR$/dist/static/treeset.png" beforeDir="false" />
96
- <change beforePath="$PROJECT_DIR$/dist/static/unbounded.svg" beforeDir="false" />
97
- <change beforePath="$PROJECT_DIR$/dist/static/usericon.png" beforeDir="false" />
98
- <change beforePath="$PROJECT_DIR$/dist/static/xinxi.png" beforeDir="false" />
99
- <change beforePath="$PROJECT_DIR$/dist/static/上传 (1).png" beforeDir="false" />
100
- <change beforePath="$PROJECT_DIR$/dist/static/上传 (2).png" beforeDir="false" />
101
- <change beforePath="$PROJECT_DIR$/dist/static/上传 (3).png" beforeDir="false" />
102
- <change beforePath="$PROJECT_DIR$/dist/static/上传 (4).png" beforeDir="false" />
103
- <change beforePath="$PROJECT_DIR$/dist/static/上传.png" beforeDir="false" />
104
- <change beforePath="$PROJECT_DIR$/dist/static/下载 (1).png" beforeDir="false" />
105
- <change beforePath="$PROJECT_DIR$/dist/static/下载 (2).png" beforeDir="false" />
106
- <change beforePath="$PROJECT_DIR$/dist/static/下载.png" beforeDir="false" />
107
- <change beforePath="$PROJECT_DIR$/dist/static/代收抄表.png" beforeDir="false" />
108
- <change beforePath="$PROJECT_DIR$/dist/static/历史 (1).png" beforeDir="false" />
109
- <change beforePath="$PROJECT_DIR$/dist/static/历史 (2).png" beforeDir="false" />
110
- <change beforePath="$PROJECT_DIR$/dist/static/历史.png" beforeDir="false" />
111
- <change beforePath="$PROJECT_DIR$/dist/static/历史接单.png" beforeDir="false" />
112
- <change beforePath="$PROJECT_DIR$/dist/static/历史查询-hover.png" beforeDir="false" />
113
- <change beforePath="$PROJECT_DIR$/dist/static/历史查询.png" beforeDir="false" />
114
- <change beforePath="$PROJECT_DIR$/dist/static/历史订单 2.png" beforeDir="false" />
115
- <change beforePath="$PROJECT_DIR$/dist/static/历史订单.png" beforeDir="false" />
116
- <change beforePath="$PROJECT_DIR$/dist/static/历史调仓.png" beforeDir="false" />
117
- <change beforePath="$PROJECT_DIR$/dist/static/形状-2.png" beforeDir="false" />
118
- <change beforePath="$PROJECT_DIR$/dist/static/形状-6.png" beforeDir="false" />
119
- <change beforePath="$PROJECT_DIR$/dist/static/抄表.png" beforeDir="false" />
120
- <change beforePath="$PROJECT_DIR$/dist/static/抄表任务-hover.png" beforeDir="false" />
121
- <change beforePath="$PROJECT_DIR$/dist/static/抄表任务.png" beforeDir="false" />
122
- <change beforePath="$PROJECT_DIR$/dist/static/报表.png" beforeDir="false" />
123
- <change beforePath="$PROJECT_DIR$/dist/static/用户查询-hover.png" beforeDir="false" />
124
- <change beforePath="$PROJECT_DIR$/dist/static/用户查询.png" beforeDir="false" />
125
- <change beforePath="$PROJECT_DIR$/dist/static/计划下载.png" beforeDir="false" />
126
- <change beforePath="$PROJECT_DIR$/dist/static/设置-hover.png" beforeDir="false" />
127
- <change beforePath="$PROJECT_DIR$/dist/static/设置.png" beforeDir="false" />
128
- <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
129
- <change beforePath="$PROJECT_DIR$/src/components/readingmeter/CheckInfo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/readingmeter/CheckInfo.vue" afterDir="false" />
130
- <change beforePath="$PROJECT_DIR$/src/components/readingmeter/FinishHandInfo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/readingmeter/FinishHandInfo.vue" afterDir="false" />
131
- <change beforePath="$PROJECT_DIR$/src/components/readingmeter/HandInfo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/readingmeter/HandInfo.vue" afterDir="false" />
132
- <change beforePath="$PROJECT_DIR$/src/components/readingmeter/HandplanInfo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/readingmeter/HandplanInfo.vue" afterDir="false" />
133
- <change beforePath="$PROJECT_DIR$/src/components/readingmeter/HistoryHandInfo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/readingmeter/HistoryHandInfo.vue" afterDir="false" />
134
- <change beforePath="$PROJECT_DIR$/src/components/readingmeter/MeterInfo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/readingmeter/MeterInfo.vue" afterDir="false" />
135
- <change beforePath="$PROJECT_DIR$/src/components/readingmeter/PhoneHand.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/readingmeter/PhoneHand.vue" afterDir="false" />
136
- <change beforePath="$PROJECT_DIR$/src/components/readingmeter/PhoneHandHome.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/readingmeter/PhoneHandHome.vue" afterDir="false" />
137
- <change beforePath="$PROJECT_DIR$/src/components/readingmeter/PictureArea.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/readingmeter/PictureArea.vue" afterDir="false" />
138
- <change beforePath="$PROJECT_DIR$/src/components/readingmeter/PlanDown.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/readingmeter/PlanDown.vue" afterDir="false" />
139
- <change beforePath="$PROJECT_DIR$/src/components/readingmeter/PlanUpdate.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/readingmeter/PlanUpdate.vue" afterDir="false" />
140
- <change beforePath="$PROJECT_DIR$/src/components/readingmeter/ReadMeterCenter.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/readingmeter/ReadMeterCenter.vue" afterDir="false" />
141
- <change beforePath="$PROJECT_DIR$/src/components/readingmeter/ReadMeterInfo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/readingmeter/ReadMeterInfo.vue" afterDir="false" />
142
- <change beforePath="$PROJECT_DIR$/src/components/readingmeter/ReadMeterInfoChangan.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/readingmeter/ReadMeterInfoChangan.vue" afterDir="false" />
143
- <change beforePath="$PROJECT_DIR$/src/components/readingmeter/UserInfo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/readingmeter/UserInfo.vue" afterDir="false" />
144
- <change beforePath="$PROJECT_DIR$/src/components/server/ReadMeterHome.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/server/ReadMeterHome.vue" afterDir="false" />
145
- <change beforePath="$PROJECT_DIR$/src/components/server/ReadMeterLogin.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/server/ReadMeterLogin.vue" afterDir="false" />
146
- <change beforePath="$PROJECT_DIR$/src/components/server/ReadMeterNavBottom.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/server/ReadMeterNavBottom.vue" afterDir="false" />
147
- <change beforePath="$PROJECT_DIR$/src/components/server/ReadMeterTop.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/server/ReadMeterTop.vue" afterDir="false" />
148
- <change beforePath="$PROJECT_DIR$/src/expandcss.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/expandcss.less" afterDir="false" />
149
- <change beforePath="$PROJECT_DIR$/src/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main.js" afterDir="false" />
150
- <change beforePath="$PROJECT_DIR$/src/readmeter-android.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/readmeter-android.js" afterDir="false" />
151
- <change beforePath="$PROJECT_DIR$/src/readmeter.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/readmeter.js" afterDir="false" />
152
6
  </list>
153
- <ignored path="$PROJECT_DIR$/.tmp/" />
154
- <ignored path="$PROJECT_DIR$/temp/" />
155
- <ignored path="$PROJECT_DIR$/tmp/" />
156
- <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
157
7
  <option name="SHOW_DIALOG" value="false" />
158
8
  <option name="HIGHLIGHT_CONFLICTS" value="true" />
159
9
  <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
160
10
  <option name="LAST_RESOLUTION" value="IGNORE" />
161
11
  </component>
162
- <component name="FUSProjectUsageTrigger">
163
- <session id="500249684">
164
- <usages-collector id="statistics.lifecycle.project">
165
- <counts>
166
- <entry key="project.closed" value="2" />
167
- <entry key="project.open.time.17" value="1" />
168
- <entry key="project.open.time.7" value="1" />
169
- <entry key="project.opened" value="2" />
170
- </counts>
171
- </usages-collector>
172
- <usages-collector id="statistics.js.language.service.starts">
173
- <counts>
174
- <entry key="ESLintLanguageService" value="2" />
175
- </counts>
176
- </usages-collector>
177
- <usages-collector id="statistics.file.extensions.open">
178
- <counts>
179
- <entry key="js" value="3" />
180
- <entry key="vue" value="7" />
181
- </counts>
182
- </usages-collector>
183
- <usages-collector id="statistics.file.types.open">
184
- <counts>
185
- <entry key="JavaScript" value="3" />
186
- <entry key="Vue.js" value="7" />
187
- </counts>
188
- </usages-collector>
189
- <usages-collector id="statistics.file.extensions.edit">
190
- <counts>
191
- <entry key="js" value="30" />
192
- <entry key="vue" value="2" />
193
- </counts>
194
- </usages-collector>
195
- <usages-collector id="statistics.file.types.edit">
196
- <counts>
197
- <entry key="JavaScript" value="30" />
198
- <entry key="Vue.js" value="2" />
199
- </counts>
200
- </usages-collector>
201
- </session>
202
- <session id="-1377520200">
203
- <usages-collector id="statistics.lifecycle.project">
204
- <counts>
205
- <entry key="project.closed" value="10" />
206
- <entry key="project.open.time.1" value="7" />
207
- <entry key="project.open.time.2" value="3" />
208
- <entry key="project.opened" value="10" />
209
- </counts>
210
- </usages-collector>
211
- <usages-collector id="statistics.file.extensions.edit">
212
- <counts>
213
- <entry key="dummy" value="5" />
214
- <entry key="js" value="319" />
215
- <entry key="json" value="56" />
216
- <entry key="vue" value="43" />
217
- </counts>
218
- </usages-collector>
219
- <usages-collector id="statistics.file.types.edit">
220
- <counts>
221
- <entry key="JSON" value="56" />
222
- <entry key="JavaScript" value="319" />
223
- <entry key="PLAIN_TEXT" value="5" />
224
- <entry key="Vue.js" value="43" />
225
- </counts>
226
- </usages-collector>
227
- <usages-collector id="statistics.file.extensions.open">
228
- <counts>
229
- <entry key="js" value="24" />
230
- <entry key="json" value="6" />
231
- <entry key="vue" value="25" />
232
- </counts>
233
- </usages-collector>
234
- <usages-collector id="statistics.file.types.open">
235
- <counts>
236
- <entry key="JSON" value="6" />
237
- <entry key="JavaScript" value="24" />
238
- <entry key="Vue.js" value="25" />
239
- </counts>
240
- </usages-collector>
241
- </session>
242
- <session id="1483365692">
243
- <usages-collector id="statistics.lifecycle.project">
244
- <counts>
245
- <entry key="project.closed" value="8" />
246
- <entry key="project.open.time.10" value="3" />
247
- <entry key="project.open.time.11" value="2" />
248
- <entry key="project.open.time.12" value="1" />
249
- <entry key="project.open.time.15" value="2" />
250
- <entry key="project.open.time.17" value="2" />
251
- <entry key="project.open.time.18" value="1" />
252
- <entry key="project.open.time.19" value="1" />
253
- <entry key="project.open.time.2" value="3" />
254
- <entry key="project.open.time.22" value="1" />
255
- <entry key="project.open.time.24" value="1" />
256
- <entry key="project.open.time.26" value="2" />
257
- <entry key="project.open.time.28" value="1" />
258
- <entry key="project.open.time.29" value="1" />
259
- <entry key="project.open.time.3" value="2" />
260
- <entry key="project.open.time.30" value="1" />
261
- <entry key="project.open.time.32" value="1" />
262
- <entry key="project.open.time.33" value="2" />
263
- <entry key="project.open.time.39" value="1" />
264
- <entry key="project.open.time.4" value="1" />
265
- <entry key="project.open.time.48" value="1" />
266
- <entry key="project.open.time.52" value="1" />
267
- <entry key="project.open.time.53" value="1" />
268
- <entry key="project.open.time.60" value="1" />
269
- <entry key="project.open.time.65" value="1" />
270
- <entry key="project.open.time.72" value="1" />
271
- <entry key="project.open.time.78" value="1" />
272
- <entry key="project.open.time.9" value="1" />
273
- <entry key="project.opened" value="37" />
274
- </counts>
275
- </usages-collector>
276
- <usages-collector id="statistics.file.extensions.open">
277
- <counts>
278
- <entry key="js" value="94" />
279
- <entry key="json" value="4" />
280
- <entry key="less" value="20" />
281
- <entry key="md" value="1" />
282
- <entry key="png" value="5" />
283
- <entry key="rnc" value="1" />
284
- <entry key="ts" value="3" />
285
- <entry key="vue" value="285" />
286
- </counts>
287
- </usages-collector>
288
- <usages-collector id="statistics.file.types.open">
289
- <counts>
290
- <entry key="Image" value="5" />
291
- <entry key="JSON" value="4" />
292
- <entry key="JavaScript" value="94" />
293
- <entry key="Less" value="20" />
294
- <entry key="PLAIN_TEXT" value="1" />
295
- <entry key="RNG Compact" value="1" />
296
- <entry key="TypeScript" value="3" />
297
- <entry key="Vue.js" value="285" />
298
- </counts>
299
- </usages-collector>
300
- <usages-collector id="statistics.file.extensions.edit">
301
- <counts>
302
- <entry key="js" value="470" />
303
- <entry key="json" value="32" />
304
- <entry key="less" value="141" />
305
- <entry key="vue" value="12025" />
306
- </counts>
307
- </usages-collector>
308
- <usages-collector id="statistics.file.types.edit">
309
- <counts>
310
- <entry key="JSON" value="32" />
311
- <entry key="JavaScript" value="470" />
312
- <entry key="Less" value="141" />
313
- <entry key="Vue.js" value="12025" />
314
- </counts>
315
- </usages-collector>
316
- </session>
317
- </component>
318
- <component name="FileEditorManager">
319
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
320
- <file pinned="false" current-in-tab="false">
321
- <entry file="file://$PROJECT_DIR$/src/components/server/ReadMeterTop.vue">
322
- <provider selected="true" editor-type-id="text-editor">
323
- <state relative-caret-position="1269">
324
- <caret line="47" column="16" selection-start-line="47" selection-start-column="16" selection-end-line="47" selection-end-column="16" />
325
- </state>
326
- </provider>
327
- </entry>
328
- </file>
329
- <file pinned="false" current-in-tab="false">
330
- <entry file="file://$PROJECT_DIR$/src/components/server/ReadMeterHome.vue">
331
- <provider selected="true" editor-type-id="text-editor">
332
- <state relative-caret-position="54">
333
- <caret line="2" column="38" selection-start-line="2" selection-start-column="38" selection-end-line="2" selection-end-column="38" />
334
- <folding>
335
- <element signature="n#style#0;n#div#0;n#template#0;n#!!top" expanded="true" />
336
- <element signature="n#style#0;n#div#1;n#div#0;n#template#0;n#!!top" expanded="true" />
337
- </folding>
338
- </state>
339
- </provider>
340
- </entry>
341
- </file>
342
- <file pinned="false" current-in-tab="false">
343
- <entry file="file://$PROJECT_DIR$/build/dev-server.js">
344
- <provider selected="true" editor-type-id="text-editor">
345
- <state relative-caret-position="554">
346
- <caret line="31" column="10" lean-forward="true" selection-start-line="31" selection-start-column="10" selection-end-line="31" selection-end-column="10" />
347
- </state>
348
- </provider>
349
- </entry>
350
- </file>
351
- <file pinned="false" current-in-tab="true">
352
- <entry file="file://$PROJECT_DIR$/package.json">
353
- <provider selected="true" editor-type-id="text-editor">
354
- <state relative-caret-position="6">
355
- <caret line="2" column="20" selection-start-line="2" selection-start-column="20" selection-end-line="2" selection-end-column="20" />
356
- </state>
357
- </provider>
358
- </entry>
359
- </file>
360
- <file pinned="false" current-in-tab="false">
361
- <entry file="file://$PROJECT_DIR$/src/components/readingmeter/FinishHandInfo.vue">
362
- <provider selected="true" editor-type-id="text-editor">
363
- <state relative-caret-position="-146" />
364
- </provider>
365
- </entry>
366
- </file>
367
- <file pinned="false" current-in-tab="false">
368
- <entry file="file://$PROJECT_DIR$/src/components/readingmeter/HistoryHandInfo.vue">
369
- <provider selected="true" editor-type-id="text-editor">
370
- <state relative-caret-position="54">
371
- <caret line="2" column="30" selection-start-line="2" selection-start-column="30" selection-end-line="2" selection-end-column="30" />
372
- <folding>
373
- <element signature="n#style#0;n#div#0;n#div#0;n#template#0;n#!!top" expanded="true" />
374
- </folding>
375
- </state>
376
- </provider>
377
- </entry>
378
- </file>
379
- <file pinned="false" current-in-tab="false">
380
- <entry file="file://$PROJECT_DIR$/src/components/readingmeter/ReadMeterInfoChangan.vue">
381
- <provider selected="true" editor-type-id="text-editor">
382
- <state relative-caret-position="-3988">
383
- <caret line="2" selection-start-line="2" selection-end-line="10" selection-end-column="10" />
384
- </state>
385
- </provider>
386
- </entry>
387
- </file>
388
- <file pinned="false" current-in-tab="false">
389
- <entry file="file://$PROJECT_DIR$/src/components/readingmeter/UserInfo.vue">
390
- <provider selected="true" editor-type-id="text-editor">
391
- <state relative-caret-position="395">
392
- <caret line="171" column="36" lean-forward="true" selection-start-line="171" selection-start-column="36" selection-end-line="171" selection-end-column="58" />
393
- <folding>
394
- <element signature="e#7155#7186#0" expanded="true" />
395
- </folding>
396
- </state>
397
- </provider>
398
- </entry>
399
- </file>
400
- <file pinned="false" current-in-tab="false">
401
- <entry file="file://$PROJECT_DIR$/src/components/readingmeter/ReadMeterCenter.vue">
402
- <provider selected="true" editor-type-id="text-editor">
403
- <state relative-caret-position="-5922">
404
- <caret line="9" column="14" selection-start-line="9" selection-start-column="14" selection-end-line="9" selection-end-column="14" />
405
- <folding>
406
- <element signature="n#style#0;n#div#0;n#template#0;n#!!top" expanded="true" />
407
- <element signature="n#style#0;n#div#0;n#div#0;n#template#0;n#!!top" expanded="true" />
408
- <element signature="n#style#0;n#div#1;n#div#0;n#template#0;n#!!top" expanded="true" />
409
- <element signature="n#style#0;n#div#3;n#div#1;n#div#0;n#template#0;n#!!top" expanded="true" />
410
- <element signature="n#style#0;n#div#5;n#div#1;n#div#0;n#template#0;n#!!top" expanded="true" />
411
- </folding>
412
- </state>
413
- </provider>
414
- </entry>
415
- </file>
416
- <file pinned="false" current-in-tab="false">
417
- <entry file="file://$PROJECT_DIR$/src/readmeter.js">
418
- <provider selected="true" editor-type-id="text-editor">
419
- <state relative-caret-position="108">
420
- <caret line="4" column="17" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="32" />
421
- </state>
422
- </provider>
423
- </entry>
424
- </file>
425
- </leaf>
426
- </component>
427
12
  <component name="FindInProjectRecents">
428
13
  <findStrings>
429
14
  <find>换表</find>
@@ -567,6 +152,9 @@
567
152
  <detection-done>true</detection-done>
568
153
  <sorting>DEFINITION_ORDER</sorting>
569
154
  </component>
155
+ <component name="MarkdownSettingsMigration">
156
+ <option name="stateVersion" value="1" />
157
+ </component>
570
158
  <component name="NodeModulesDirectoryManager">
571
159
  <handled-path value="$PROJECT_DIR$/node_modules" />
572
160
  </component>
@@ -581,6 +169,7 @@
581
169
  <option name="width" value="1346" />
582
170
  <option name="height" value="698" />
583
171
  </component>
172
+ <component name="ProjectId" id="2goGbz3JMT5GDNN7vCigYftnU1P" />
584
173
  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
585
174
  <component name="ProjectView">
586
175
  <navigator proportions="" version="1">
@@ -630,17 +219,18 @@
630
219
  <pane id="Scope" />
631
220
  </panes>
632
221
  </component>
633
- <component name="PropertiesComponent">
634
- <property name="WebServerToolWindowFactoryState" value="false" />
635
- <property name="last_opened_file_path" value="$PROJECT_DIR$" />
636
- <property name="node.js.detected.package.eslint" value="true" />
637
- <property name="node.js.path.for.package.eslint" value="project" />
638
- <property name="node.js.selected.package.eslint" value="D:\work\MobileReadMeter\android\chaobiao\phonehand\node_modules\eslint" />
639
- <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
640
- <property name="nodejs_npm_path_reset_for_default_project" value="true" />
641
- <property name="nodejs_package_manager_path" value="npm" />
642
- <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
222
+ <component name="ProjectViewState">
223
+ <option name="hideEmptyMiddlePackages" value="true" />
224
+ <option name="showLibraryContents" value="true" />
643
225
  </component>
226
+ <component name="PropertiesComponent">{
227
+ &quot;keyToString&quot;: {
228
+ &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
229
+ &quot;last_opened_file_path&quot;: &quot;D:/WorkSpace/module/ReadMeterClient&quot;,
230
+ &quot;nodejs_package_manager_path&quot;: &quot;yarn&quot;,
231
+ &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
232
+ }
233
+ }</component>
644
234
  <component name="RecentsManager">
645
235
  <key name="CopyFile.RECENT_KEYS">
646
236
  <recent name="F:\WorkSpace\ReadMeterClient\src\components\server" />
@@ -655,20 +245,8 @@
655
245
  <recent name="D:\work\readmeter-client\src" />
656
246
  </key>
657
247
  </component>
658
- <component name="RunDashboard">
659
- <option name="ruleStates">
660
- <list>
661
- <RuleState>
662
- <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
663
- </RuleState>
664
- <RuleState>
665
- <option name="name" value="StatusDashboardGroupingRule" />
666
- </RuleState>
667
- </list>
668
- </option>
669
- </component>
670
248
  <component name="RunManager" selected="npm.build">
671
- <configuration name="build" type="js.build_tools.npm" factoryName="npm" temporary="true" nameIsGenerated="true">
249
+ <configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
672
250
  <package-json value="$PROJECT_DIR$/package.json" />
673
251
  <command value="run" />
674
252
  <scripts>
@@ -678,7 +256,7 @@
678
256
  <envs />
679
257
  <method v="2" />
680
258
  </configuration>
681
- <configuration name="dev" type="js.build_tools.npm" factoryName="npm" temporary="true" nameIsGenerated="true">
259
+ <configuration name="dev" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
682
260
  <package-json value="$PROJECT_DIR$/package.json" />
683
261
  <command value="run" />
684
262
  <scripts>
@@ -688,7 +266,7 @@
688
266
  <envs />
689
267
  <method v="2" />
690
268
  </configuration>
691
- <configuration name="make" type="js.build_tools.npm" factoryName="npm" temporary="true" nameIsGenerated="true">
269
+ <configuration name="make" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
692
270
  <package-json value="$PROJECT_DIR$/package.json" />
693
271
  <command value="run" />
694
272
  <scripts>
@@ -713,6 +291,7 @@
713
291
  </list>
714
292
  </recent_temporary>
715
293
  </component>
294
+ <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
716
295
  <component name="SvnConfiguration">
717
296
  <configuration />
718
297
  </component>
@@ -807,6 +386,10 @@
807
386
  <workItem from="1559695441761" duration="30755000" />
808
387
  <workItem from="1560127507511" duration="6282000" />
809
388
  <workItem from="1560213914628" duration="7098000" />
389
+ <workItem from="1716356594000" duration="1657000" />
390
+ <workItem from="1716450078610" duration="20000" />
391
+ <workItem from="1716544621445" duration="650000" />
392
+ <workItem from="1716774878936" duration="1241000" />
810
393
  </task>
811
394
  <task id="LOCAL-00001" summary="新增卡表抄表气量核算">
812
395
  <created>1553677761707</created>
@@ -900,14 +483,49 @@
900
483
  </layout>
901
484
  </component>
902
485
  <component name="TypeScriptGeneratedFilesManager">
903
- <option name="version" value="1" />
486
+ <option name="version" value="3" />
904
487
  </component>
905
- <component name="VcsContentAnnotationSettings">
906
- <option name="myLimit" value="2678400000" />
488
+ <component name="Vcs.Log.Tabs.Properties">
489
+ <option name="TAB_STATES">
490
+ <map>
491
+ <entry key="MAIN">
492
+ <value>
493
+ <State>
494
+ <option name="FILTERS">
495
+ <map>
496
+ <entry key="branch">
497
+ <value>
498
+ <list>
499
+ <option value="origin/changan" />
500
+ </list>
501
+ </value>
502
+ </entry>
503
+ </map>
504
+ </option>
505
+ </State>
506
+ </value>
507
+ </entry>
508
+ </map>
509
+ </option>
510
+ <option name="RECENT_FILTERS">
511
+ <map>
512
+ <entry key="Branch">
513
+ <value>
514
+ <list>
515
+ <RecentGroup>
516
+ <option name="FILTER_VALUES">
517
+ <option value="origin/changan" />
518
+ </option>
519
+ </RecentGroup>
520
+ </list>
521
+ </value>
522
+ </entry>
523
+ </map>
524
+ </option>
907
525
  </component>
908
526
  <component name="VcsManagerConfiguration">
909
527
  <ignored-roots>
910
- <path value="D:/.." />
528
+ <path value="$PROJECT_DIR$/../../../.." />
911
529
  </ignored-roots>
912
530
  <MESSAGE value="新增卡表抄表气量核算" />
913
531
  <MESSAGE value="临时提交" />
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "readmeter-changan",
3
- "version": "1.0.33",
3
+ "version": "1.0.35",
4
4
  "description": "手机抄表客户端",
5
5
  "author": "15529257852@163.com",
6
6
  "private": false,
@@ -107,9 +107,15 @@
107
107
  <p class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">抄表状态</p>
108
108
  <!--<p class="panel-title col-xs-8 col-sm-6 col-md-6 text-left font">{{ model.f_result_state}}</p>-->
109
109
  <div class="col-xs-8 col-sm-6 col-md-6 ">
110
- <input type="number" id="f_datacomparison" class="form-control font " v-model="model.f_result_state" readonly>
110
+ <input type="text" id="f_datacomparison" class="form-control font " v-model="model.f_result_state" readonly>
111
111
  </div>
112
112
  </div>
113
+ <div class="row auto bg-white app-row col-xs-12 col-sm-12 col-md-12" v-if="showic1">
114
+ <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">IC卡累计</p>
115
+ <div class="col-xs-8 col-sm-8 col-md-8 ">
116
+ <input type="text" id="" class="form-control font " v-model="model.f_checkic1" @blur="checkbyic1()">
117
+ </div>
118
+ </div>
113
119
  </div>
114
120
  <div class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
115
121
  <label for="f_insflow" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">瞬时流量</label>
@@ -167,7 +173,12 @@
167
173
  <input type="number" id="f_weekchecknum" class="form-control font " v-el:f_weekchecknum v-model="model.f_weekchecknum" v-next-el="f_weekcheckicnum">
168
174
  </div>
169
175
  </div>
170
-
176
+ <!-- <div v-if="!model.f_check_unstall && model.f_check_install " class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">-->
177
+ <!-- <label for="f_weekchecknum" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表IC卡累计底数</label>-->
178
+ <!-- <div class="col-xs-8 col-sm-8 col-md-8 ">-->
179
+ <!-- <input type="number" id="f_weekcheckcardnum" class="form-control font " v-el:f_weekchecknum v-model="model.f_weekcheckcardnum" v-next-el="f_weekcheckicnum">-->
180
+ <!-- </div>-->
181
+ <!-- </div>-->
171
182
  <div v-if="!model.f_check_unstall && model.f_check_install " class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
172
183
  <label for="f_weekcheckicnum" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表安装时剩余气量</label>
173
184
  <div class="col-xs-8 col-sm-8 col-md-8 ">
@@ -176,16 +187,38 @@
176
187
 
177
188
  </div>
178
189
 
190
+ <div v-if="!model.f_check_unstall && model.f_check_install " class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
191
+ <label for="f_weekcheckicsn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表安装时间</label>
192
+ <div class="col-xs-8 col-sm-8 col-md-8 ">
193
+ <datepicker
194
+ :value.sync="model.f_weekchecktime"
195
+ :format="'yyyy-MM-dd HH:mm:ss'"
196
+ v-model="model.f_weekchecktime"
197
+ :show-reset-button="reset" placeholder="替换表安装时间" style="margin-bottom: 8px">
198
+ </datepicker>
199
+ </div>
200
+ </div>
201
+ <div v-if="!model.f_check_unstall && model.f_check_install " class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
179
202
 
203
+ <label for="f_weekcheckicsn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表卡号</label>
204
+ <div class="col-xs-8 col-sm-8 col-md-8 ">
205
+ <input type="text" id="f_weekchecksn" class="form-control font" v-el:f_weekcheckicsn v-model="model.f_weekcheckicsn" @blur="getWeekByCard(model.f_weekcheckicsn)" >
206
+ </div>
207
+ </div>
208
+ <div v-if="!model.f_check_unstall && model.f_check_install " class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
209
+
210
+ <label for="f_weekchecksn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表基表表号</label>
211
+ <div class="col-xs-8 col-sm-8 col-md-8 ">
212
+ <input type="text" id="f_weekcheckmeternum" class="form-control font" v-el:f_weekcheckmeternum v-model="model.f_weekcheckmeternum" >
213
+ </div>
214
+ </div>
215
+ <div v-if="!model.f_check_unstall && model.f_check_install " class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
180
216
 
181
- <div v-if="!model.f_check_unstall && model.f_check_install " class="auto col-xs-12 col-sm-12 col-md-12 bg-white ">
182
- <div class="col-xs-12 col-sm-6 col-md-6">
183
217
  <label for="f_weekchecksn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表表号</label>
184
218
  <div class="col-xs-8 col-sm-8 col-md-8 ">
185
219
  <input type="text" id="f_weekchecksn" class="form-control font" v-el:f_weekchecksn v-model="model.f_weekchecksn" >
186
220
  </div>
187
221
  </div>
188
- </div>
189
222
  <div class="auto row bg-white col-sm-12 col-xs-12 col-md-12">
190
223
  <div class="auto col-sm-6 col-xs-6 col-md-6">
191
224
  <input class="magic-checkbox" type="checkbox" id="f_check_unstall" :true-value="'是'" :false-value="''"
@@ -193,6 +226,39 @@
193
226
  <label class="text-left font" for="f_check_unstall">替换表卸载信息</label>
194
227
  </div>
195
228
  </div>
229
+ <div v-if="model.f_check_unstall && !model.f_check_install " class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
230
+ <label for="f_weekcheckicsn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表拆卸时间</label>
231
+ <div class="col-xs-8 col-sm-8 col-md-8 ">
232
+ <datepicker
233
+ :value.sync="model.f_weekchecktime"
234
+ :format="'yyyy-MM-dd HH:mm:ss'"
235
+ v-model="model.f_weekchecktime"
236
+ :show-reset-button="reset" placeholder="替换表拆卸时间" style="margin-bottom: 8px">
237
+ </datepicker>
238
+ </div>
239
+ </div>
240
+ <div v-if="model.f_check_unstall && !model.f_check_install " class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
241
+
242
+ <label for="f_weekcheckicsn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表卡号</label>
243
+ <div class="col-xs-8 col-sm-8 col-md-8 ">
244
+ <input type="text" id="f_weekchecksn" class="form-control font" v-el:f_weekcheckicsn v-model="model.f_weekcheckicsn" readonly >
245
+ </div>
246
+
247
+ </div>
248
+ <div v-if="model.f_check_unstall && !model.f_check_install" class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
249
+
250
+ <label for="f_weekchecksn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表基表表号</label>
251
+ <div class="col-xs-8 col-sm-8 col-md-8 ">
252
+ <input type="text" id="f_weekcheckmeternum" class="form-control font" v-el:f_weekcheckmeternum v-model="model.f_weekcheckmeternum" readonly>
253
+ </div>
254
+ </div>
255
+ <div v-if="model.f_check_unstall && !model.f_check_install " class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
256
+
257
+ <label for="f_weekchecksn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表表号</label>
258
+ <div class="col-xs-8 col-sm-8 col-md-8 ">
259
+ <input type="text" id="f_weekchecksn" class="form-control font" v-el:f_weekchecksn v-model="model.f_weekchecksn" readonly>
260
+ </div>
261
+ </div>
196
262
  <div v-if="model.f_check_unstall && !model.f_check_install " class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
197
263
  <label for="f_weekchecknum" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表上次读数</label>
198
264
  <div class="col-xs-8 col-sm-8 col-md-8 ">
@@ -236,7 +302,13 @@
236
302
  <div class="row auto bg-white app-row col-xs-12 col-sm-12 col-md-12" v-if="model.f_check_unstall && !model.f_check_install">
237
303
  <p class="panel-title col-xs-2 col-sm-2 col-md-2 text-left font">抄表状态</p>
238
304
  <div class="col-xs-4 col-sm-4 col-md-4 ">
239
- <input type="text" id="f_result_state" class="form-control font " v-model="model.f_result_state" readonly>
305
+ <input type="text" id="f_result_state" class="form-control font " v-model="model.f_check_result_state" readonly>
306
+ </div>
307
+ </div>
308
+ <div class="row auto bg-white app-row col-xs-12 col-sm-12 col-md-12" v-if="model.f_check_unstall && !model.f_check_install && showic">
309
+ <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">周检表IC卡累计</p>
310
+ <div class="col-xs-8 col-sm-8 col-md-8 ">
311
+ <input type="text" id="" class="form-control font " v-model="model.f_checkic" @blur="checkbyic()">
240
312
  </div>
241
313
  </div>
242
314
  <div class="row auto col-xs-12 col-sm-12 col-md-12 mt-20">
@@ -258,6 +330,21 @@
258
330
  <script>
259
331
  import * as Util from './../Util'
260
332
  import Vue from 'vue'
333
+ import co from 'co'
334
+ let getDataGen = function * (self, val) {
335
+
336
+ yield self.$resetpost(Vue.handdataUrl + 'rs/sql/getUserInfo', {data:{
337
+ condition:`card_id = '${self.model.f_weekcheckicsn}'`
338
+ }}, {resolveMsg: null, rejectMsg: null})
339
+ .then((res) =>{
340
+ console.log(JSON.stringify(res.data));
341
+ if(res.data.length>0){
342
+ self.model.f_weekcheckmeternum = res.data[0].f_jb_table_code
343
+ self.model.f_weekchecksn = res.data[0].f_meternumber
344
+ }
345
+
346
+ })
347
+ }
261
348
  export default {
262
349
  title: '手机单户抄表',
263
350
  data () {
@@ -267,14 +354,17 @@
267
354
  f_condition:'',
268
355
  f_pressure:'',
269
356
  f_temperature:'',
357
+ f_result_state:'',
358
+ f_check_result_state:'',
270
359
  f_check_install:'',
271
360
  f_check_unstall:'',
272
361
  imgInfo: '',
273
362
  imgName: '',
274
363
  sumgas_moment:0,
275
364
  f_datacomparison:0,
276
- f_weekcheckicnum:'',
277
- f_weekchecknum:'',
365
+ f_weekcheckmeternum:'',
366
+ f_weekchecktime:'',
367
+ f_weekcheckicsn:'',
278
368
  f_weekchecksn:'',
279
369
  f_weekchecknum:'',
280
370
  f_weekcheckicnum:'',
@@ -282,7 +372,6 @@
282
372
  f_insflow:0,
283
373
  f_weekcheckicdishu:'',
284
374
  f_oughtamount: 0,
285
- f_new_tablebase: 0,
286
375
  f_new_lcd:0,
287
376
  f_curbalance:0,
288
377
  f_meter_repair:0,
@@ -292,6 +381,8 @@
292
381
  f_icsnapsgas:0,
293
382
  imgs:[]
294
383
  },
384
+ showic:false,
385
+ showic1:false,
295
386
  imgurl:'',
296
387
  system:'',
297
388
  flag: false
@@ -312,6 +403,16 @@
312
403
  }
313
404
  },
314
405
  watch:{
406
+ 'model.f_result_state'(val){
407
+ if(val && val==='异常'){
408
+ this.showic1 = true
409
+ }
410
+ },
411
+ 'model.f_check_result_state'(val){
412
+ if(val && val==='异常'){
413
+ this.showic = true
414
+ }
415
+ },
315
416
  'model.f_check_install'(val){
316
417
  if(val){
317
418
  this.model.f_check_unstall = ''
@@ -336,11 +437,38 @@
336
437
  }
337
438
  },
338
439
  ready () {
440
+ // Vue.handdataUrl = ''
441
+ // this.$resetpost( 'rs/sql/getUserInfo', {data:{
442
+ // condition:`card_id = '9999999014'`
443
+ // }}, {resolveMsg: null, rejectMsg: null})
444
+ // .then((res) =>{
445
+ // console.log(JSON.stringify(res.data));
446
+ // if(res.data.length>0){
447
+ // this.data = Object.assign(this.data,res.data[0])
448
+ // this.model = Object.assign(this.model,res.data[0])
449
+ // this.model.f_result_state = '异常'
450
+ // }
451
+ //
452
+ // this.flag = true
453
+ // this.updatedata()
454
+ // this.model.f_result_state = '异常'
455
+ // })
456
+
339
457
  // 抄表按钮可以点击
340
458
  this.flag = true
341
459
  this.updatedata()
342
460
  },
343
461
  methods: {
462
+ checkbyic(){
463
+ this.model.f_check_result_state = Math.abs(parseInt(this.model.f_checkic)-parseInt(this.model.f_weekcheckdishu))<=this.model.f_tablewitherrorvalue?'正常':'异常'
464
+ },
465
+ checkbyic1(){
466
+ this.model.f_result_state = Math.abs(parseInt(this.model.f_checkic1)-parseInt(this.model.f_new_tablebase))<=this.model.f_tablewitherrorvalue?'正常':'异常'
467
+ },
468
+ getWeekByCard(){
469
+ let gen = getDataGen(this)
470
+ co(gen)
471
+ },
344
472
  updatedata(){
345
473
  this.model = Object.assign({}, this.model, this.data)
346
474
  if(this.type === 'save'){
@@ -427,7 +555,7 @@
427
555
  this.model.f_weekcheckicnum= this.model.f_weekcheckicnum?this.model.f_weekcheckicnum:0
428
556
  this.model.f_weekicsnapsgas = (parseInt(this.model.f_weekcheckicnum)+ parseInt(this.model.f_hascharge)+parseInt(this.model.f_card_repair)- parseInt(this.model.f_weekcheckicdishu))
429
557
  console.log('IC走气'+this.model.f_icsnapsgas)
430
- this.model.f_result_state = res.f_result_state
558
+ this.model.f_check_result_state = res.f_result_state
431
559
  console.log('抄表状态'+this.model.f_result_state)
432
560
  this.model.f_datacomparison = (parseInt(this.model.f_icsnapsgas)-parseInt(this.model.f_tablesnapsgas))
433
561
  this.model.f_curbalance = parseInt(this.model.f_new_lcd * this.model.f_price)
@@ -110,6 +110,12 @@
110
110
  <input type="text" id="f_datacomparison" class="form-control font " v-model="model.f_result_state" readonly>
111
111
  </div>
112
112
  </div>
113
+ <div class="row auto bg-white app-row col-xs-12 col-sm-12 col-md-12" v-if="showic1">
114
+ <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">IC卡累计</p>
115
+ <div class="col-xs-8 col-sm-8 col-md-8 ">
116
+ <input type="text" id="" class="form-control font " v-model="model.f_checkic1" @blur="checkbyic1()">
117
+ </div>
118
+ </div>
113
119
  </div>
114
120
  <div class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
115
121
  <label for="f_insflow" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">瞬时流量</label>
@@ -202,7 +208,13 @@
202
208
  </div>
203
209
  <div class="row auto bg-white app-row col-xs-12 col-sm-4 col-md-4" v-if="model.f_meter_classify!=='机表'">
204
210
  <p class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">抄表状态</p>
205
- <p class="panel-title col-xs-8 col-sm-6 col-md-6 text-left font">{{ model.f_result_state}}</p>
211
+ <p class="panel-title col-xs-8 col-sm-6 col-md-6 text-left font">{{ model.f_check_result_state}}</p>
212
+ </div>
213
+ <div class="row auto bg-white app-row col-xs-12 col-sm-12 col-md-12" v-if="showic">
214
+ <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">周检表IC卡累计</p>
215
+ <div class="col-xs-8 col-sm-8 col-md-8 ">
216
+ <input type="text" id="" class="form-control font " v-model="model.f_checkic" @blur="checkbyic()">
217
+ </div>
206
218
  </div>
207
219
  </div>
208
220
 
@@ -258,6 +270,8 @@
258
270
  title: '手机单户抄表',
259
271
  data () {
260
272
  return {
273
+ showic1:false,
274
+ showic:false,
261
275
  model: {
262
276
  failure:'[{"f_failure_type":"卡表故障","failurecase":["气量不符"]}]',
263
277
  f_operator_name:'',
@@ -265,20 +279,20 @@
265
279
  f_workorder_type:'维修单',
266
280
  f_issue:'否',
267
281
  f_if_change:'否',
282
+ f_check_result_state:'',
268
283
  imgInfo: '',
269
284
  imgName: '',
270
285
  f_result_state:'',
271
286
  f_weekcheckicnum:'',
287
+ f_checkic:'',
288
+ f_checkic1:'',
272
289
  f_real_balance:'',
273
- f_weekchecknum:'',
274
290
  f_weekchecksn:'',
275
291
  f_weekchecknum:'',
276
- f_weekcheckicnum:'',
277
292
  f_weekcheckdishu:'',
278
293
  f_insflow:'',
279
294
  f_weekcheckicdishu:'',
280
295
  f_oughtamount: 0,
281
- f_new_tablebase: 0,
282
296
  f_new_lcd:0,
283
297
  f_curbalance:0,
284
298
  f_meter_repair:0,
@@ -305,6 +319,16 @@
305
319
  }
306
320
  },
307
321
  watch:{
322
+ 'model.f_result_state'(val){
323
+ if(val && val==='异常'){
324
+ this.showic1 = true
325
+ }
326
+ },
327
+ 'model.f_check_result_state'(val){
328
+ if(val && val==='异常'){
329
+ this.showic = true
330
+ }
331
+ },
308
332
  'data.f_download'(val){
309
333
  // console.log('变化' + JSON.stringify(data))
310
334
  // window.alert(123)
@@ -329,6 +353,12 @@
329
353
  this.updatedata()
330
354
  },
331
355
  methods: {
356
+ checkbyic(){
357
+ this.model.f_check_result_state = Math.abs(parseInt(this.model.f_checkic)-parseInt(this.model.f_weekcheckdishu))<=this.model.f_tablewitherrorvalue?'正常':'异常'
358
+ },
359
+ checkbyic1(){
360
+ this.model.f_result_state = Math.abs(parseInt(this.model.f_checkic1)-parseInt(this.model.f_new_tablebase))<=this.model.f_tablewitherrorvalue?'正常':'异常'
361
+ },
332
362
  updatedata(){
333
363
  this.model = Object.assign({}, this.model, this.data)
334
364
  if(this.type === 'save') {
@@ -416,7 +446,7 @@
416
446
  this.model.f_weekcheckicnum= this.model.f_weekcheckicnum?this.model.f_weekcheckicnum:0
417
447
  this.model.f_weekicsnapsgas = (parseInt(this.model.f_weekcheckicnum)+ parseInt(this.model.f_hascharge)+parseInt(this.model.f_card_repair)- parseInt(this.model.f_weekcheckicdishu))
418
448
  console.log('IC走气'+this.model.f_icsnapsgas)
419
- this.model.f_result_state = res.f_result_state
449
+ this.model.f_check_result_state = res.f_result_state
420
450
  console.log('抄表状态'+this.model.f_result_state)
421
451
  this.model.f_datacomparison = (parseInt(this.model.f_icsnapsgas)-parseInt(this.model.f_tablesnapsgas))
422
452
  this.model.f_curbalance = parseInt(this.model.f_new_lcd * this.model.f_price)
@@ -179,6 +179,7 @@
179
179
  console.log('2'+ this.isbusy)
180
180
  const fun = downloadHand(this, condition)
181
181
  co(fun)
182
+
182
183
  // let result = this.$androidUtil.bzLogic('downHandMeterInfo', {startDate: `${this.model.startDate}`, endDate: `${this.model.endDate}`, condition: condition, f_inputtor: `${this.userInfo.name}`})
183
184
  // console.log('点击3'+ this.flag)
184
185
  // //安卓端