manage-client 4.0.80 → 4.0.81-fg
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.
- package/build/dev-server.js +10 -14
- package/hs_err_pid28036.log +249 -0
- package/package.json +1 -1
- package/src/filiale/fugou/RecordInfoQuery.vue +4 -3
- package/src/filiale/jiaxian/config/exportConfig.js +1 -0
- package/src/filiale/lixianV3/RecordInfoQuery.vue +26 -0
- package/src/filiale/lixianV3/config/exportConfig.js +2 -0
- package/src/filiale/rongcheng/businessquery/ChangeMeterQuery.vue +20 -0
- package/src/filiale/rongcheng/exportConfig.js +1 -0
- package/src/filiale/wuan/RecordInfoQuery.vue +1436 -0
- package/src/filiale/wuan/sale.js +4 -0
- package/src/main.js +1 -3
package/build/dev-server.js
CHANGED
|
@@ -12,16 +12,16 @@ var compiler = webpack(config)
|
|
|
12
12
|
// https://github.com/chimurai/http-proxy-middleware
|
|
13
13
|
// var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
|
|
14
14
|
var shaoguan = 'http://119.146.1.106:8300/'
|
|
15
|
-
var qtx
|
|
15
|
+
var qtx= 'http://36.103.222.144:6300/'
|
|
16
16
|
// var bendi = 'http://220.194.141.253:8600/'
|
|
17
17
|
// var bendi = 'http://203.57.101.233:9001'
|
|
18
18
|
// var bendi = 'http://172.168.1.11:9001/'
|
|
19
|
-
// var bendi = 'http://
|
|
19
|
+
// var bendi = 'http://192.168.50.4:8400/'
|
|
20
20
|
// var bendi = 'http://121.36.106.17:8400/'
|
|
21
21
|
// var fuwu = 'http://203.57.101.233:9001'
|
|
22
|
-
var bendi = 'http://
|
|
22
|
+
var bendi = 'http://61.163.123.47:30785/'
|
|
23
23
|
// var bendi = 'http://119.187.112.234:8400/'
|
|
24
|
-
var wode = 'http://
|
|
24
|
+
var wode = 'http://61.163.123.47:30785/'
|
|
25
25
|
// 192.168.
|
|
26
26
|
// var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
|
|
27
27
|
// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
|
|
@@ -29,18 +29,14 @@ var proxyTable = {
|
|
|
29
29
|
'/rs/logic/exportfile': {
|
|
30
30
|
target: bendi
|
|
31
31
|
},
|
|
32
|
-
'/
|
|
33
|
-
target: 'http://203.57.101.233:9001/'
|
|
34
|
-
|
|
35
|
-
},
|
|
36
|
-
'/api/af-revenue/sql/compreQuery': {
|
|
32
|
+
'/api/af-revenue': {
|
|
37
33
|
pathRewrite: {
|
|
38
|
-
'
|
|
34
|
+
'/api/af-revenue': '/rs'
|
|
39
35
|
},
|
|
40
|
-
target: 'http://
|
|
36
|
+
target: 'http://61.163.123.47:30785/'
|
|
41
37
|
},
|
|
42
38
|
'/api': {
|
|
43
|
-
target: 'http://
|
|
39
|
+
target: 'http://61.163.123.47:30785/'
|
|
44
40
|
|
|
45
41
|
},
|
|
46
42
|
'/rs/sql/chargeQuery_by_gasproperties': {
|
|
@@ -54,7 +50,7 @@ var proxyTable = {
|
|
|
54
50
|
},
|
|
55
51
|
// 查找资源服务数据
|
|
56
52
|
'/rs/search': {
|
|
57
|
-
target:
|
|
53
|
+
target: bendi
|
|
58
54
|
},
|
|
59
55
|
// 查找资源服务数据
|
|
60
56
|
'/rs/logic/getLogin': {
|
|
@@ -96,7 +92,7 @@ var proxyTable = {
|
|
|
96
92
|
target: bendi
|
|
97
93
|
},
|
|
98
94
|
'/rs/vue': {
|
|
99
|
-
target:
|
|
95
|
+
target: bendi
|
|
100
96
|
},
|
|
101
97
|
'/rs/file': {
|
|
102
98
|
target: bendi
|
|
@@ -0,0 +1,249 @@
|
|
|
1
|
+
#
|
|
2
|
+
# There is insufficient memory for the Java Runtime Environment to continue.
|
|
3
|
+
# Native memory allocation (mmap) failed to map 268435456 bytes for G1 virtual space
|
|
4
|
+
# Possible reasons:
|
|
5
|
+
# The system is out of physical RAM or swap space
|
|
6
|
+
# The process is running with CompressedOops enabled, and the Java Heap may be blocking the growth of the native heap
|
|
7
|
+
# Possible solutions:
|
|
8
|
+
# Reduce memory load on the system
|
|
9
|
+
# Increase physical memory or swap space
|
|
10
|
+
# Check if swap backing store is full
|
|
11
|
+
# Decrease Java heap size (-Xmx/-Xms)
|
|
12
|
+
# Decrease number of Java threads
|
|
13
|
+
# Decrease Java thread stack sizes (-Xss)
|
|
14
|
+
# Set larger code cache with -XX:ReservedCodeCacheSize=
|
|
15
|
+
# JVM is running with Zero Based Compressed Oops mode in which the Java heap is
|
|
16
|
+
# placed in the first 32GB address space. The Java Heap base address is the
|
|
17
|
+
# maximum limit for the native heap growth. Please use -XX:HeapBaseMinAddress
|
|
18
|
+
# to set the Java Heap base and to place the Java Heap above 32GB virtual address.
|
|
19
|
+
# This output file may be truncated or incomplete.
|
|
20
|
+
#
|
|
21
|
+
# Out of Memory Error (os_windows.cpp:3825), pid=28036, tid=28532
|
|
22
|
+
#
|
|
23
|
+
# JRE version: (17.0.10+1) (build )
|
|
24
|
+
# Java VM: OpenJDK 64-Bit Server VM (17.0.10+1-b1207.14, mixed mode, sharing, tiered, compressed oops, compressed class ptrs, g1 gc, windows-amd64)
|
|
25
|
+
# No core dump will be written. Minidumps are not enabled by default on client versions of Windows
|
|
26
|
+
#
|
|
27
|
+
|
|
28
|
+
--------------- S U M M A R Y ------------
|
|
29
|
+
|
|
30
|
+
Command Line: git4idea.http.GitAskPassApp Username for 'http://192.168.0.167:32573':
|
|
31
|
+
|
|
32
|
+
Host: Intel(R) Core(TM) i5-9300H CPU @ 2.40GHz, 8 cores, 15G, Windows 11 , 64 bit Build 22621 (10.0.22621.3958)
|
|
33
|
+
Time: Mon Sep 23 14:55:17 2024 Windows 11 , 64 bit Build 22621 (10.0.22621.3958) elapsed time: 0.020426 seconds (0d 0h 0m 0s)
|
|
34
|
+
|
|
35
|
+
--------------- T H R E A D ---------------
|
|
36
|
+
|
|
37
|
+
Current thread (0x000001ce9c6b4a30): JavaThread "Unknown thread" [_thread_in_vm, id=28532, stack(0x000000784b700000,0x000000784b800000)]
|
|
38
|
+
|
|
39
|
+
Stack: [0x000000784b700000,0x000000784b800000]
|
|
40
|
+
Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
|
|
41
|
+
V [jvm.dll+0x687989]
|
|
42
|
+
V [jvm.dll+0x84116a]
|
|
43
|
+
V [jvm.dll+0x842dae]
|
|
44
|
+
V [jvm.dll+0x843413]
|
|
45
|
+
V [jvm.dll+0x249ccf]
|
|
46
|
+
V [jvm.dll+0x684759]
|
|
47
|
+
V [jvm.dll+0x67900a]
|
|
48
|
+
V [jvm.dll+0x30ab0b]
|
|
49
|
+
V [jvm.dll+0x311fb6]
|
|
50
|
+
V [jvm.dll+0x361d5e]
|
|
51
|
+
V [jvm.dll+0x361f8f]
|
|
52
|
+
V [jvm.dll+0x2e07f8]
|
|
53
|
+
V [jvm.dll+0x2e1764]
|
|
54
|
+
V [jvm.dll+0x811c31]
|
|
55
|
+
V [jvm.dll+0x36fc11]
|
|
56
|
+
V [jvm.dll+0x7f0666]
|
|
57
|
+
V [jvm.dll+0x3f3daf]
|
|
58
|
+
V [jvm.dll+0x3f5a41]
|
|
59
|
+
C [jli.dll+0x528f]
|
|
60
|
+
C [ucrtbase.dll+0x29333]
|
|
61
|
+
C [KERNEL32.DLL+0x1257d]
|
|
62
|
+
C [ntdll.dll+0x5af28]
|
|
63
|
+
|
|
64
|
+
|
|
65
|
+
--------------- P R O C E S S ---------------
|
|
66
|
+
|
|
67
|
+
Threads class SMR info:
|
|
68
|
+
_java_thread_list=0x00007ffc64b1df58, length=0, elements={
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
Java Threads: ( => current thread )
|
|
72
|
+
|
|
73
|
+
Other Threads:
|
|
74
|
+
0x000001ce9c7246d0 GCTaskThread "GC Thread#0" [stack: 0x000000784b800000,0x000000784b900000] [id=17280]
|
|
75
|
+
0x000001ce9c7354f0 ConcurrentGCThread "G1 Main Marker" [stack: 0x000000784b900000,0x000000784ba00000] [id=30284]
|
|
76
|
+
0x000001ce9c735f10 ConcurrentGCThread "G1 Conc#0" [stack: 0x000000784ba00000,0x000000784bb00000] [id=26144]
|
|
77
|
+
|
|
78
|
+
[error occurred during error reporting (printing all threads), id 0xc0000005, EXCEPTION_ACCESS_VIOLATION (0xc0000005) at pc=0x00007ffc642d13c7]
|
|
79
|
+
|
|
80
|
+
VM state: not at safepoint (not fully initialized)
|
|
81
|
+
|
|
82
|
+
VM Mutex/Monitor currently owned by a thread: ([mutex/lock_event])
|
|
83
|
+
[0x000001ce9c63a8e0] Heap_lock - owner thread: 0x000001ce9c6b4a30
|
|
84
|
+
|
|
85
|
+
Heap address: 0x0000000701200000, size: 4078 MB, Compressed Oops mode: Zero based, Oop shift amount: 3
|
|
86
|
+
|
|
87
|
+
CDS archive(s) mapped at: [0x0000000000000000-0x0000000000000000-0x0000000000000000), size 0, SharedBaseAddress: 0x0000000800000000, ArchiveRelocationMode: 1.
|
|
88
|
+
Narrow klass base: 0x0000000000000000, Narrow klass shift: 0, Narrow klass range: 0x0
|
|
89
|
+
|
|
90
|
+
GC Precious Log:
|
|
91
|
+
<Empty>
|
|
92
|
+
|
|
93
|
+
Heap:
|
|
94
|
+
garbage-first heap total 0K, used 0K [0x0000000701200000, 0x0000000800000000)
|
|
95
|
+
region size 2048K, 0 young (0K), 0 survivors (0K)
|
|
96
|
+
Metaspace used 0K, committed 0K, reserved 0K
|
|
97
|
+
class space used 0K, committed 0K, reserved 0K
|
|
98
|
+
|
|
99
|
+
Heap Regions: E=young(eden), S=young(survivor), O=old, HS=humongous(starts), HC=humongous(continues), CS=collection set, F=free, OA=open archive, CA=closed archive, TAMS=top-at-mark-start (previous, next)
|
|
100
|
+
|
|
101
|
+
Card table byte_map: [0x000001ceb1880000,0x000001ceb2080000] _byte_map_base: 0x000001ceae077000
|
|
102
|
+
|
|
103
|
+
Marking Bits (Prev, Next): (CMBitMap*) 0x000001ce9c724cf0, (CMBitMap*) 0x000001ce9c724d30
|
|
104
|
+
Prev Bits: [0x000001ceb2880000, 0x000001ceb6838000)
|
|
105
|
+
Next Bits: [0x000001ceb6840000, 0x000001ceba7f8000)
|
|
106
|
+
|
|
107
|
+
GC Heap History (0 events):
|
|
108
|
+
No events
|
|
109
|
+
|
|
110
|
+
Dll operation events (1 events):
|
|
111
|
+
Event: 0.014 Loaded shared library D:\hiema\IntelliJ IDEA 2024.1.1\jbr\bin\java.dll
|
|
112
|
+
|
|
113
|
+
Deoptimization events (0 events):
|
|
114
|
+
No events
|
|
115
|
+
|
|
116
|
+
Classes unloaded (0 events):
|
|
117
|
+
No events
|
|
118
|
+
|
|
119
|
+
Classes redefined (0 events):
|
|
120
|
+
No events
|
|
121
|
+
|
|
122
|
+
Internal exceptions (0 events):
|
|
123
|
+
No events
|
|
124
|
+
|
|
125
|
+
VM Operations (0 events):
|
|
126
|
+
No events
|
|
127
|
+
|
|
128
|
+
Events (0 events):
|
|
129
|
+
No events
|
|
130
|
+
|
|
131
|
+
|
|
132
|
+
Dynamic libraries:
|
|
133
|
+
0x00007ff6b7380000 - 0x00007ff6b738a000 D:\hiema\IntelliJ IDEA 2024.1.1\jbr\bin\java.exe
|
|
134
|
+
0x00007ffce6170000 - 0x00007ffce6387000 C:\WINDOWS\SYSTEM32\ntdll.dll
|
|
135
|
+
0x00007ffce5260000 - 0x00007ffce5324000 C:\WINDOWS\System32\KERNEL32.DLL
|
|
136
|
+
0x00007ffce39d0000 - 0x00007ffce3d7d000 C:\WINDOWS\System32\KERNELBASE.dll
|
|
137
|
+
0x00007ffce3490000 - 0x00007ffce35a1000 C:\WINDOWS\System32\ucrtbase.dll
|
|
138
|
+
0x00007ffcdd930000 - 0x00007ffcdd947000 D:\hiema\IntelliJ IDEA 2024.1.1\jbr\bin\jli.dll
|
|
139
|
+
0x00007ffcc7890000 - 0x00007ffcc78ab000 D:\hiema\IntelliJ IDEA 2024.1.1\jbr\bin\VCRUNTIME140.dll
|
|
140
|
+
0x00007ffce46b0000 - 0x00007ffce485e000 C:\WINDOWS\System32\USER32.dll
|
|
141
|
+
0x00007ffce35b0000 - 0x00007ffce35d6000 C:\WINDOWS\System32\win32u.dll
|
|
142
|
+
0x00007ffce4680000 - 0x00007ffce46a9000 C:\WINDOWS\System32\GDI32.dll
|
|
143
|
+
0x00007ffce3d80000 - 0x00007ffce3e99000 C:\WINDOWS\System32\gdi32full.dll
|
|
144
|
+
0x00007ffce3710000 - 0x00007ffce37aa000 C:\WINDOWS\System32\msvcp_win.dll
|
|
145
|
+
0x00007ffcc6cf0000 - 0x00007ffcc6f83000 C:\WINDOWS\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.22621.3672_none_2713b9d173822955\COMCTL32.dll
|
|
146
|
+
0x00007ffce5650000 - 0x00007ffce56f7000 C:\WINDOWS\System32\msvcrt.dll
|
|
147
|
+
0x00007ffce4000000 - 0x00007ffce4031000 C:\WINDOWS\System32\IMM32.DLL
|
|
148
|
+
0x00007ffcdd720000 - 0x00007ffcdd72c000 D:\hiema\IntelliJ IDEA 2024.1.1\jbr\bin\vcruntime140_1.dll
|
|
149
|
+
0x00007ffc9a3e0000 - 0x00007ffc9a46d000 D:\hiema\IntelliJ IDEA 2024.1.1\jbr\bin\msvcp140.dll
|
|
150
|
+
0x00007ffc63fe0000 - 0x00007ffc64c62000 D:\hiema\IntelliJ IDEA 2024.1.1\jbr\bin\server\jvm.dll
|
|
151
|
+
0x00007ffce5700000 - 0x00007ffce57b2000 C:\WINDOWS\System32\ADVAPI32.dll
|
|
152
|
+
0x00007ffce4220000 - 0x00007ffce42c9000 C:\WINDOWS\System32\sechost.dll
|
|
153
|
+
0x00007ffce39a0000 - 0x00007ffce39c8000 C:\WINDOWS\System32\bcrypt.dll
|
|
154
|
+
0x00007ffce54a0000 - 0x00007ffce55b4000 C:\WINDOWS\System32\RPCRT4.dll
|
|
155
|
+
0x00007ffcc0010000 - 0x00007ffcc0019000 C:\WINDOWS\SYSTEM32\WSOCK32.dll
|
|
156
|
+
0x00007ffcd9d40000 - 0x00007ffcd9d74000 C:\WINDOWS\SYSTEM32\WINMM.dll
|
|
157
|
+
0x00007ffce2ae0000 - 0x00007ffce2b2d000 C:\WINDOWS\SYSTEM32\POWRPROF.dll
|
|
158
|
+
0x00007ffcdaef0000 - 0x00007ffcdaefa000 C:\WINDOWS\SYSTEM32\VERSION.dll
|
|
159
|
+
0x00007ffce5330000 - 0x00007ffce53a1000 C:\WINDOWS\System32\WS2_32.dll
|
|
160
|
+
0x00007ffce2ac0000 - 0x00007ffce2ad3000 C:\WINDOWS\SYSTEM32\UMPDC.dll
|
|
161
|
+
0x00007ffce24e0000 - 0x00007ffce24f8000 C:\WINDOWS\SYSTEM32\kernel.appcore.dll
|
|
162
|
+
0x00007ffcdeab0000 - 0x00007ffcdeaba000 D:\hiema\IntelliJ IDEA 2024.1.1\jbr\bin\jimage.dll
|
|
163
|
+
0x00007ffce0b30000 - 0x00007ffce0d62000 C:\WINDOWS\SYSTEM32\DBGHELP.DLL
|
|
164
|
+
0x00007ffce42f0000 - 0x00007ffce467e000 C:\WINDOWS\System32\combase.dll
|
|
165
|
+
0x00007ffce53c0000 - 0x00007ffce5497000 C:\WINDOWS\System32\OLEAUT32.dll
|
|
166
|
+
0x00007ffcc5070000 - 0x00007ffcc50a2000 C:\WINDOWS\SYSTEM32\dbgcore.DLL
|
|
167
|
+
0x00007ffce3920000 - 0x00007ffce399b000 C:\WINDOWS\System32\bcryptPrimitives.dll
|
|
168
|
+
0x00007ffcb9930000 - 0x00007ffcb9955000 D:\hiema\IntelliJ IDEA 2024.1.1\jbr\bin\java.dll
|
|
169
|
+
|
|
170
|
+
dbghelp: loaded successfully - version: 4.0.5 - missing functions: none
|
|
171
|
+
symbol engine: initialized successfully - sym options: 0x614 - pdb path: .;D:\hiema\IntelliJ IDEA 2024.1.1\jbr\bin;C:\WINDOWS\SYSTEM32;C:\WINDOWS\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.22621.3672_none_2713b9d173822955;D:\hiema\IntelliJ IDEA 2024.1.1\jbr\bin\server
|
|
172
|
+
|
|
173
|
+
VM Arguments:
|
|
174
|
+
java_command: git4idea.http.GitAskPassApp Username for 'http://192.168.0.167:32573':
|
|
175
|
+
java_class_path (initial): D:/hiema/IntelliJ IDEA 2024.1.1/plugins/vcs-git/lib/git4idea-rt.jar;D:/hiema/IntelliJ IDEA 2024.1.1/lib/externalProcess-rt.jar
|
|
176
|
+
Launcher Type: SUN_STANDARD
|
|
177
|
+
|
|
178
|
+
[Global flags]
|
|
179
|
+
intx CICompilerCount = 4 {product} {ergonomic}
|
|
180
|
+
uint ConcGCThreads = 2 {product} {ergonomic}
|
|
181
|
+
uint G1ConcRefinementThreads = 8 {product} {ergonomic}
|
|
182
|
+
size_t G1HeapRegionSize = 2097152 {product} {ergonomic}
|
|
183
|
+
uintx GCDrainStackTargetSize = 64 {product} {ergonomic}
|
|
184
|
+
size_t InitialHeapSize = 268435456 {product} {ergonomic}
|
|
185
|
+
size_t MarkStackSize = 4194304 {product} {ergonomic}
|
|
186
|
+
size_t MaxHeapSize = 4276092928 {product} {ergonomic}
|
|
187
|
+
size_t MinHeapDeltaBytes = 2097152 {product} {ergonomic}
|
|
188
|
+
size_t MinHeapSize = 8388608 {product} {ergonomic}
|
|
189
|
+
uintx NonNMethodCodeHeapSize = 5839372 {pd product} {ergonomic}
|
|
190
|
+
uintx NonProfiledCodeHeapSize = 122909434 {pd product} {ergonomic}
|
|
191
|
+
uintx ProfiledCodeHeapSize = 122909434 {pd product} {ergonomic}
|
|
192
|
+
uintx ReservedCodeCacheSize = 251658240 {pd product} {ergonomic}
|
|
193
|
+
bool SegmentedCodeCache = true {product} {ergonomic}
|
|
194
|
+
size_t SoftMaxHeapSize = 4276092928 {manageable} {ergonomic}
|
|
195
|
+
bool UseCompressedClassPointers = true {product lp64_product} {ergonomic}
|
|
196
|
+
bool UseCompressedOops = true {product lp64_product} {ergonomic}
|
|
197
|
+
bool UseG1GC = true {product} {ergonomic}
|
|
198
|
+
bool UseLargePagesIndividualAllocation = false {pd product} {ergonomic}
|
|
199
|
+
|
|
200
|
+
Logging:
|
|
201
|
+
Log output configuration:
|
|
202
|
+
#0: stdout all=warning uptime,level,tags
|
|
203
|
+
#1: stderr all=off uptime,level,tags
|
|
204
|
+
|
|
205
|
+
Environment Variables:
|
|
206
|
+
JAVA_HOME=D:\hiema\jdk\jdk-11
|
|
207
|
+
CLASSPATH=.;D:\hiema\jdk\jdk-11\lib\tools.jar;D:\hiema\jdk\jdk-11\lib\dt.jar;D:\hiema\jdk\jdk-11\lib;
|
|
208
|
+
PATH=D:\hiema\Git\mingw64\libexec\git-core;D:\hiema\Git\mingw64\libexec\git-core;D:\hiema\Git\mingw64\bin;D:\hiema\Git\usr\bin;C:\Users\32999\bin;D:\hiema\jdk\jdk-11\bin;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;D:\hiema\VMware\VMware Workstation\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files\NVIDIA Corporation\NVIDIA NvDLISR;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0;C:\WINDOWS\System32\OpenSSH;D:\hiema\mysql-8.0.30-winx64\bin;C:\Program Files\dotnet;D:\software\video\ffmpeg-6.0-essentials_build\bin;D:\hiema\��web�����߹���\dll;D:\hiema\Git\cmd;D:\hiema\TortoiseGit\bin;D:\hiema\apache-maven-3.9.4\bin;D:\hiema\jdk\jdk-11\jre\bi;.;D:\hiema\gradle-3.5.1\bin;C:\Program Files\OpenVPN\bin;D:\hiema\nvm;D:\hiema\nodejs;D:\hiema\Python\Python38\Scripts;D:\hiema\Python\Python38;C:\Users\32999\AppData\Local\Programs\Python\Launcher;C:\Users\32999\AppData\Local\Microsoft\WindowsApps;D:\hiema\Microsoft VS Code\bin;D:\hiema\IntelliJ IDEA 2022.3.3\bin;D:\hiema\nvm;D:\hiema\nodejs
|
|
209
|
+
USERNAME=32999
|
|
210
|
+
DISPLAY=:0.0
|
|
211
|
+
LC_ALL=en_US.UTF-8
|
|
212
|
+
TERM=xterm-256color
|
|
213
|
+
TMPDIR=C:\Users\32999\AppData\Local\Temp
|
|
214
|
+
OS=Windows_NT
|
|
215
|
+
PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 158 Stepping 10, GenuineIntel
|
|
216
|
+
TMP=C:\Users\32999\AppData\Local\Temp
|
|
217
|
+
TEMP=C:\Users\32999\AppData\Local\Temp
|
|
218
|
+
|
|
219
|
+
|
|
220
|
+
|
|
221
|
+
Periodic native trim disabled
|
|
222
|
+
|
|
223
|
+
JNI global refs:
|
|
224
|
+
JNI global refs: 0, weak refs: 0
|
|
225
|
+
|
|
226
|
+
JNI global refs memory usage: 0, weak refs: 0
|
|
227
|
+
|
|
228
|
+
OOME stack traces (most recent first):
|
|
229
|
+
Classloader memory used:
|
|
230
|
+
|
|
231
|
+
|
|
232
|
+
--------------- S Y S T E M ---------------
|
|
233
|
+
|
|
234
|
+
OS:
|
|
235
|
+
Windows 11 , 64 bit Build 22621 (10.0.22621.3958)
|
|
236
|
+
OS uptime: 4 days 5:56 hours
|
|
237
|
+
|
|
238
|
+
CPU: total 8 (initial active 8) (4 cores per cpu, 2 threads per core) family 6 model 158 stepping 10 microcode 0xde, cx8, cmov, fxsr, ht, mmx, 3dnowpref, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, lzcnt, tsc, tscinvbit, avx, avx2, aes, erms, clmul, bmi1, bmi2, adx, fma, vzeroupper, clflush, clflushopt
|
|
239
|
+
Processor Information for all 8 processors :
|
|
240
|
+
Max Mhz: 2400, Current Mhz: 2400, Mhz Limit: 2400
|
|
241
|
+
|
|
242
|
+
Memory: 4k page, system-wide physical 16304M (1001M free)
|
|
243
|
+
TotalPageFile size 35504M (AvailPageFile size 123M)
|
|
244
|
+
current process WorkingSet (physical memory assigned to process): 11M, peak: 11M
|
|
245
|
+
current process commit charge ("private bytes"): 60M, peak: 316M
|
|
246
|
+
|
|
247
|
+
vm_info: OpenJDK 64-Bit Server VM (17.0.10+1-b1207.14) for windows-amd64 JRE (17.0.10+1-b1207.14), built on 2024-04-05 by "builduser" with MS VC++ 16.10 / 16.11 (VS2019)
|
|
248
|
+
|
|
249
|
+
END.
|
package/package.json
CHANGED
|
@@ -869,8 +869,9 @@
|
|
|
869
869
|
<table class="table-hover">
|
|
870
870
|
<tr style="position: relative" class="table-bordered">
|
|
871
871
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">汇总信息</td>
|
|
872
|
-
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold"
|
|
873
|
-
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold"
|
|
872
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">卡表账户余额:{{sumsmodel.f_kb_balance}}</td>
|
|
873
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">机表账户余额:{{sumsmodel.f_jb_balance}}</td>
|
|
874
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">物联网表表上余额:{{sumsmodel.f_balance_amount}}</td>
|
|
874
875
|
</tr>
|
|
875
876
|
</table>
|
|
876
877
|
|
|
@@ -958,7 +959,7 @@
|
|
|
958
959
|
isSingleUser: null,
|
|
959
960
|
other:[],
|
|
960
961
|
footer:[],
|
|
961
|
-
model: new PagedList('api/af-revenue/sql/compreQuery', 20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_residential_area desc,f_building desc,f_unit desc,f_floor desc,f_room desc,f_userfiles_id desc'`},{
|
|
962
|
+
model: new PagedList('api/af-revenue/sql/compreQuery', 20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_residential_area desc,f_building desc,f_unit desc,f_floor desc,f_room desc,f_userfiles_id desc'`},{f_kb_balance:0,f_jb_balance:0,f_balance_amount:0}),
|
|
962
963
|
criteriaShow: false,
|
|
963
964
|
orgCondtionStr:'',
|
|
964
965
|
residentialArea: [],
|
|
@@ -505,6 +505,23 @@
|
|
|
505
505
|
close-on-select>
|
|
506
506
|
</v-select>
|
|
507
507
|
</div>
|
|
508
|
+
<div class="col-sm-2 form-group" title="参数名称：【有无铅封】">
|
|
509
|
+
<label class="font_normal_body">有无铅封</label>
|
|
510
|
+
<v-select
|
|
511
|
+
placeholder='有无铅封'
|
|
512
|
+
:value.sync="$parent.$parent.f_hasseal"
|
|
513
|
+
style="width:60%"
|
|
514
|
+
:value-single="true"
|
|
515
|
+
v-model="$parent.$parent.f_hasseal"
|
|
516
|
+
:options='$parent.$parent.hasseal'
|
|
517
|
+
close-on-select>
|
|
518
|
+
</v-select>
|
|
519
|
+
</div>
|
|
520
|
+
<div class="col-sm-2 form-group">
|
|
521
|
+
<label class="font_normal_body">铅封编号</label>
|
|
522
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_seal_number"
|
|
523
|
+
condition="f_seal_number = '{}'" placeholder='铅封编号'>
|
|
524
|
+
</div>
|
|
508
525
|
</div>
|
|
509
526
|
</div>
|
|
510
527
|
</criteria>
|
|
@@ -563,6 +580,9 @@
|
|
|
563
580
|
<th>
|
|
564
581
|
<nobr>防盗卡号</nobr>
|
|
565
582
|
</th>
|
|
583
|
+
<th>
|
|
584
|
+
<nobr>铅封编号</nobr>
|
|
585
|
+
</th>
|
|
566
586
|
<th>
|
|
567
587
|
<nobr>品牌</nobr>
|
|
568
588
|
</th>
|
|
@@ -737,6 +757,9 @@
|
|
|
737
757
|
<td style="text-align: center;"><nobr>{{row.f_gas_date}}</nobr></td>
|
|
738
758
|
<td style="text-align: center;"><nobr>{{row.f_gas_person}}</nobr></td>
|
|
739
759
|
<td style="text-align: center;"><nobr>{{row.f_defendcard}}</nobr></td>
|
|
760
|
+
|
|
761
|
+
<td style="text-align: center;"><nobr>{{row.f_seal_number}}</nobr></td>
|
|
762
|
+
|
|
740
763
|
<td style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></td>
|
|
741
764
|
<td style="text-align: center;"><nobr>{{row.f_meternumber}}</nobr></td>
|
|
742
765
|
<td style="text-align: center;"><nobr>{{row.f_meter_type}}</nobr></td>
|
|
@@ -1407,6 +1430,9 @@
|
|
|
1407
1430
|
positions() {
|
|
1408
1431
|
return [{label: '全部', value: ''}, ...this.$appdata.getParam('安装位置')]
|
|
1409
1432
|
},
|
|
1433
|
+
hasseal() {
|
|
1434
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('有无铅封')]
|
|
1435
|
+
},
|
|
1410
1436
|
// meterbooks(){
|
|
1411
1437
|
// return [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
|
|
1412
1438
|
// },
|
|
@@ -172,6 +172,17 @@
|
|
|
172
172
|
close-on-select clear-button>
|
|
173
173
|
</v-select>
|
|
174
174
|
</div>
|
|
175
|
+
<div class="col-sm-2 form-group">
|
|
176
|
+
<label class="font_normal_body">换表方式</label>
|
|
177
|
+
<v-select id="f_meter_change_type"
|
|
178
|
+
v-model="model.f_meter_change_type"
|
|
179
|
+
placeholder='请选择'
|
|
180
|
+
condition="f_meter_change_type ='{}'"
|
|
181
|
+
:value.sync="model.f_meter_change_type"
|
|
182
|
+
:options='$parent.$parent.meter_change'
|
|
183
|
+
close-on-select clear-button>
|
|
184
|
+
</v-select>
|
|
185
|
+
</div>
|
|
175
186
|
<div class="col-sm-2 form-group">
|
|
176
187
|
<label class="font_normal_body">表  号</label>
|
|
177
188
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
|
|
@@ -233,6 +244,9 @@
|
|
|
233
244
|
<th>
|
|
234
245
|
<nobr>换表类型</nobr>
|
|
235
246
|
</th>
|
|
247
|
+
<th>
|
|
248
|
+
<nobr>换表方式</nobr>
|
|
249
|
+
</th>
|
|
236
250
|
<th>
|
|
237
251
|
<nobr>换表费</nobr>
|
|
238
252
|
</th>
|
|
@@ -328,6 +342,9 @@
|
|
|
328
342
|
<td style="text-align: center;">
|
|
329
343
|
<nobr>{{row.f_type}}</nobr>
|
|
330
344
|
</td>
|
|
345
|
+
<td style="text-align: center;">
|
|
346
|
+
<nobr>{{row.f_meter_change_type}}</nobr>
|
|
347
|
+
</td>
|
|
331
348
|
<td style="text-align: center;">
|
|
332
349
|
<nobr>{{row.f_changemeter_fee}}</nobr>
|
|
333
350
|
</td>
|
|
@@ -785,6 +802,9 @@
|
|
|
785
802
|
check_state(){
|
|
786
803
|
return [{label: '通过', value: "通过"},{label: '未通过', value: '未通过'}]
|
|
787
804
|
},
|
|
805
|
+
meter_change(){
|
|
806
|
+
return [{label: '线上换表', value: "线上换表"},{label: '线下换表', value: '线下换表'}]
|
|
807
|
+
},
|
|
788
808
|
payments() {
|
|
789
809
|
return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
|
|
790
810
|
}
|