Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
U
unify_api2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chaonan
unify_api2
Commits
794264b8
Commit
794264b8
authored
Jun 04, 2024
by
ZZH
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix cid switch 2024-06-04
parent
fa34ba33
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
list_alarm_service.py
...y_api/modules/alarm_manager/service/list_alarm_service.py
+3
-2
count_info_pds.py
unify_api/modules/home_page/procedures/count_info_pds.py
+1
-1
hardware_pds.py
unify_api/modules/product_info/procedures/hardware_pds.py
+1
-1
No files found.
unify_api/modules/alarm_manager/service/list_alarm_service.py
View file @
794264b8
...
@@ -277,8 +277,9 @@ async def pack_alarm_records(records, pid, lang):
...
@@ -277,8 +277,9 @@ async def pack_alarm_records(records, pid, lang):
event_msg
=
r
.
get
(
"message"
)
event_msg
=
r
.
get
(
"message"
)
phase_line
=
load_phase_line
(
mtr_name
,
lang
)
phase_line
=
load_phase_line
(
mtr_name
,
lang
)
name
=
mtr_names
[
r
[
"mtid"
]]
name
=
mtr_names
.
get
([
r
[
"mtid"
]])
mtr_name
=
f
"{name}{phase_line}"
if
phase_line
else
name
if
name
:
mtr_name
=
f
"{name}{phase_line}"
if
phase_line
else
name
alarm
=
Alarm
(
alarm
=
Alarm
(
name
=
mtr_name
,
name
=
mtr_name
,
...
...
unify_api/modules/home_page/procedures/count_info_pds.py
View file @
794264b8
...
@@ -252,7 +252,7 @@ async def load_aiao_max(user_id, cid, s_dts, e_dts, filed):
...
@@ -252,7 +252,7 @@ async def load_aiao_max(user_id, cid, s_dts, e_dts, filed):
mtid
=
datas
[
"mtid"
]
mtid
=
datas
[
"mtid"
]
if
lang
!=
"zh_CN"
:
if
lang
!=
"zh_CN"
:
mtr_names
=
await
load_monitor_names
([
mtid
],
lang
)
mtr_names
=
await
load_monitor_names
([
mtid
],
lang
)
mtr_name
=
mtr_names
[
mtid
]
mtr_name
=
mtr_names
.
get
(
mtid
)
or
datas
[
"name"
]
else
:
else
:
mtr_name
=
datas
[
"name"
]
mtr_name
=
datas
[
"name"
]
...
...
unify_api/modules/product_info/procedures/hardware_pds.py
View file @
794264b8
...
@@ -199,7 +199,7 @@ async def load_hardware_info(cid, pg, pg_size, user_id):
...
@@ -199,7 +199,7 @@ async def load_hardware_info(cid, pg, pg_size, user_id):
)
)
wiring_type
=
"两表法"
if
data
[
"ctnum"
]
==
2
else
"三表法"
wiring_type
=
"两表法"
if
data
[
"ctnum"
]
==
2
else
"三表法"
name
=
data
.
get
(
"name"
)
or
''
name
=
data
.
get
(
"name"
)
or
''
mtr_name
=
name
if
lang
==
"zh_CN"
else
mtr_names
.
get
(
mtid
,
""
)
mtr_name
=
name
if
lang
==
"zh_CN"
else
mtr_names
.
get
(
mtid
,
name
)
results
.
append
({
results
.
append
({
"installed_location"
:
mtr_name
,
"installed_location"
:
mtr_name
,
"device_number"
:
data
.
get
(
"sid"
)
or
''
,
"device_number"
:
data
.
get
(
"sid"
)
or
''
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment