readmeter-changan 1.0.44 → 1.0.46
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.
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
<component name="ProjectCodeStyleConfiguration">
|
|
2
2
|
<code_scheme name="Project" version="173">
|
|
3
|
-
<JSCodeStyleSettings>
|
|
3
|
+
<JSCodeStyleSettings version="0">
|
|
4
4
|
<option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
|
|
5
5
|
<option name="FORCE_SEMICOLON_STYLE" value="true" />
|
|
6
6
|
<option name="SPACE_BEFORE_GENERATOR_MULT" value="true" />
|
package/.idea/workspace.xml
CHANGED
|
@@ -4,7 +4,10 @@
|
|
|
4
4
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
5
5
|
</component>
|
|
6
6
|
<component name="ChangeListManager">
|
|
7
|
-
<list default="true" id="3ff22a91-c12c-46e5-8072-9f6930fa055a" name="Default Changelist" comment="修复抄表记录界面翻页选项被遮挡"
|
|
7
|
+
<list default="true" id="3ff22a91-c12c-46e5-8072-9f6930fa055a" name="Default Changelist" comment="修复抄表记录界面翻页选项被遮挡">
|
|
8
|
+
<change beforePath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" afterDir="false" />
|
|
9
|
+
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
10
|
+
</list>
|
|
8
11
|
<option name="SHOW_DIALOG" value="false" />
|
|
9
12
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
10
13
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
@@ -174,7 +177,6 @@
|
|
|
174
177
|
<option name="height" value="698" />
|
|
175
178
|
</component>
|
|
176
179
|
<component name="ProjectId" id="2goGbz3JMT5GDNN7vCigYftnU1P" />
|
|
177
|
-
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
|
178
180
|
<component name="ProjectView">
|
|
179
181
|
<navigator proportions="" version="1">
|
|
180
182
|
<foldersAlwaysOnTop value="true" />
|
|
@@ -227,22 +229,29 @@
|
|
|
227
229
|
<option name="hideEmptyMiddlePackages" value="true" />
|
|
228
230
|
<option name="showLibraryContents" value="true" />
|
|
229
231
|
</component>
|
|
230
|
-
<component name="PropertiesComponent"
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
232
|
+
<component name="PropertiesComponent">{
|
|
233
|
+
"keyToString": {
|
|
234
|
+
"RunOnceActivity.ShowReadmeOnStart": "true",
|
|
235
|
+
"RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
|
|
236
|
+
"RunOnceActivity.git.unshallow": "true",
|
|
237
|
+
"RunOnceActivity.typescript.service.memoryLimit.init": "true",
|
|
238
|
+
"WebServerToolWindowFactoryState": "false",
|
|
239
|
+
"codeWithMe.voiceChat.enabledByDefault": "false",
|
|
240
|
+
"com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1": "true",
|
|
241
|
+
"git-widget-placeholder": "changan",
|
|
242
|
+
"junie.onboarding.icon.badge.shown": "true",
|
|
243
|
+
"kotlin-language-version-configured": "true",
|
|
244
|
+
"last_opened_file_path": "D:/WorkSpace/module/ReadMeterClient",
|
|
245
|
+
"node.js.detected.package.eslint": "true",
|
|
246
|
+
"node.js.detected.package.tslint": "true",
|
|
247
|
+
"node.js.selected.package.eslint": "(autodetect)",
|
|
248
|
+
"node.js.selected.package.tslint": "(autodetect)",
|
|
249
|
+
"nodejs_package_manager_path": "yarn",
|
|
250
|
+
"to.speed.mode.migration.done": "true",
|
|
251
|
+
"ts.external.directory.path": "C:\\Program Files\\JetBrains\\IntelliJ IDEA 2026.1\\plugins\\javascript-plugin\\jsLanguageServicesImpl\\external",
|
|
252
|
+
"vue.rearranger.settings.migration": "true"
|
|
244
253
|
}
|
|
245
|
-
}
|
|
254
|
+
}</component>
|
|
246
255
|
<component name="RecentsManager">
|
|
247
256
|
<key name="CopyFile.RECENT_KEYS">
|
|
248
257
|
<recent name="F:\WorkSpace\ReadMeterClient\src\components\server" />
|
|
@@ -289,8 +298,8 @@
|
|
|
289
298
|
<method v="2" />
|
|
290
299
|
</configuration>
|
|
291
300
|
<list>
|
|
292
|
-
<item itemvalue="npm.dev" />
|
|
293
301
|
<item itemvalue="npm.build" />
|
|
302
|
+
<item itemvalue="npm.dev" />
|
|
294
303
|
<item itemvalue="npm.make" />
|
|
295
304
|
</list>
|
|
296
305
|
<recent_temporary>
|
|
@@ -422,7 +431,11 @@
|
|
|
422
431
|
<workItem from="1768962396488" duration="1138000" />
|
|
423
432
|
<workItem from="1769756231076" duration="2285000" />
|
|
424
433
|
<workItem from="1770189687384" duration="597000" />
|
|
425
|
-
<workItem from="1770629756764" duration="
|
|
434
|
+
<workItem from="1770629756764" duration="4201000" />
|
|
435
|
+
<workItem from="1778290423528" duration="240000" />
|
|
436
|
+
<workItem from="1778657678952" duration="4775000" />
|
|
437
|
+
<workItem from="1778721613582" duration="2000" />
|
|
438
|
+
<workItem from="1778722375031" duration="1276000" />
|
|
426
439
|
</task>
|
|
427
440
|
<task id="LOCAL-00001" summary="新增卡表抄表气量核算">
|
|
428
441
|
<created>1553677761707</created>
|
package/package.json
CHANGED
|
@@ -435,7 +435,9 @@ export default {
|
|
|
435
435
|
imgName: '',
|
|
436
436
|
sumgas_moment:0,
|
|
437
437
|
f_datacomparison:0,
|
|
438
|
+
f_weekicsnapsgas:0,
|
|
438
439
|
f_weekcheckmeternum:'',
|
|
440
|
+
f_weektablesnapsgas:0,
|
|
439
441
|
f_weekchecktime:Util.toStandardTimeString(),
|
|
440
442
|
f_weekcheckicsn:'',
|
|
441
443
|
f_weekchecksn:'',
|
|
@@ -633,21 +635,12 @@ export default {
|
|
|
633
635
|
}
|
|
634
636
|
|
|
635
637
|
let postdata = Object.assign({},this.model)
|
|
636
|
-
postdata.week = '1'
|
|
637
|
-
|
|
638
|
-
this.model.f_pregas = this.model.f_pregas?this.model.f_pregas:0
|
|
639
|
-
this.model.f_sumgas_moment = this.model.f_sumgas_moment?this.model.f_sumgas_moment:0
|
|
640
|
-
let res = this.$androidUtil.bzLogic('gasComputation', postdata,{rejectMsg: null, resolve: null})
|
|
641
|
-
this.model.f_hasnotcharge = parseInt(res.hasnotCharge)
|
|
642
|
-
this.model.f_hascharge = (parseInt(this.model.f_sumgas_moment)+ parseInt(this.model.f_nogasvalue) - parseInt(this.model.f_hasnotcharge))
|
|
643
|
-
console.log('本期已充'+this.model.f_hascharge)
|
|
638
|
+
postdata.week = '1'
|
|
644
639
|
this.model.f_weekcheckicnum= this.model.f_weekcheckicnum?this.model.f_weekcheckicnum:0
|
|
645
|
-
this.model.f_weekicsnapsgas = (parseInt(this.model.f_weekcheckicnum)
|
|
640
|
+
this.model.f_weekicsnapsgas = (parseInt(this.model.f_weekcheckicnum)- parseInt(this.model.f_weekcheckicdishu))
|
|
646
641
|
console.log('IC走气'+this.model.f_icsnapsgas)
|
|
647
|
-
this.model.f_check_result_state =
|
|
642
|
+
this.model.f_check_result_state = Math.abs(parseInt(this.model.f_weekicsnapsgas)-parseInt(this.model.f_weektablesnapsgas))<=this.model.f_tablewitherrorvalue?'正常':'异常'
|
|
648
643
|
console.log('抄表状态'+this.model.f_result_state)
|
|
649
|
-
this.model.f_datacomparison = (parseInt(this.model.f_icsnapsgas)-parseInt(this.model.f_tablesnapsgas))
|
|
650
|
-
this.model.f_curbalance = parseInt(this.model.f_new_lcd * this.model.f_price)
|
|
651
644
|
console.log('剩余金额'+this.model.f_curbalance)
|
|
652
645
|
},
|
|
653
646
|
//获取基表走气量
|
|
@@ -674,9 +667,7 @@ export default {
|
|
|
674
667
|
|
|
675
668
|
//获取基表走气量
|
|
676
669
|
getWeekMeterMessage(){
|
|
677
|
-
|
|
678
|
-
// this.model.f_weekcheckdishu = this.model.f_new_tablebase
|
|
679
|
-
// }
|
|
670
|
+
console.log(1)
|
|
680
671
|
if (this.model.f_weekcheckdishu === '' || this.model.f_weekcheckdishu === undefined) {
|
|
681
672
|
this.$showMessage('请检查你录入的表底数')
|
|
682
673
|
return
|
|
@@ -687,7 +678,7 @@ export default {
|
|
|
687
678
|
}
|
|
688
679
|
this.model.f_meter_repair= this.model.f_meter_repair?this.model.f_meter_repair:0
|
|
689
680
|
this.model.f_weekchecknum= this.model.f_weekchecknum?this.model.f_weekchecknum:0
|
|
690
|
-
// this.$set(this.model.
|
|
681
|
+
// this.$set(this.model.f_weektablesnapsgas,'')
|
|
691
682
|
this.model.f_weektablesnapsgas = parseInt(this.model.f_weekcheckdishu)- parseInt(this.model.f_weekchecknum)-parseInt(this.model.f_meter_repair)
|
|
692
683
|
if (this.model.f_weekcheckicdishu ) {
|
|
693
684
|
this.getWeekCardMessage()
|