Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gassafety
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
耿迪迪
gassafety
Commits
545aa40b
Commit
545aa40b
authored
Mar 31, 2023
by
吴卿华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改设备信息添加报错bug
parent
5d5b6ea1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
TDeviceInfoController.java
...m/zehong/web/controller/device/TDeviceInfoController.java
+1
-0
index.vue
gassafety-web/src/views/dataMonitoring/alarmdetail/index.vue
+2
-2
No files found.
gassafety-admin/src/main/java/com/zehong/web/controller/device/TDeviceInfoController.java
View file @
545aa40b
...
@@ -119,6 +119,7 @@ public class TDeviceInfoController extends BaseController {
...
@@ -119,6 +119,7 @@ public class TDeviceInfoController extends BaseController {
@Log
(
title
=
"设备信息"
,
businessType
=
BusinessType
.
UPDATE
)
@Log
(
title
=
"设备信息"
,
businessType
=
BusinessType
.
UPDATE
)
@PutMapping
@PutMapping
public
AjaxResult
edit
(
@RequestBody
TDeviceInfo
tDeviceInfo
)
{
public
AjaxResult
edit
(
@RequestBody
TDeviceInfo
tDeviceInfo
)
{
System
.
out
.
println
(
tDeviceInfo
.
getEquipmentList
());
/**
/**
* 先执行删除 在执行添加 不能删除任何一个
* 先执行删除 在执行添加 不能删除任何一个
*/
*/
...
...
gassafety-web/src/views/dataMonitoring/alarmdetail/index.vue
View file @
545aa40b
...
@@ -84,7 +84,7 @@
...
@@ -84,7 +84,7 @@
<el-row
v-if=
"this.deviceType=='调压阀'||this.deviceType=='阀门井'"
>
<el-row
v-if=
"this.deviceType=='调压阀'||this.deviceType=='阀门井'"
>
<el-col
:span=
"36"
style=
"padding: 20px;width: 100%;"
>
<el-col
:span=
"36"
style=
"padding: 20px;width: 100%;"
>
<div
style=
"width: 100%;float: left;height: 100%;"
v-if=
"form.deviceType != '管道'"
>
<div
style=
"width: 100%;float: left;height: 100%;"
>
<el-table
:data=
"deviceInfoList"
style=
"width: 100%"
>
<el-table
:data=
"deviceInfoList"
style=
"width: 100%"
>
<el-table-column
label=
"设备名称"
align=
"center"
prop=
"deviceName"
/>
<el-table-column
label=
"设备名称"
align=
"center"
prop=
"deviceName"
/>
<el-table-column
label=
"设备编号"
align=
"center"
prop=
"deviceCode"
/>
<el-table-column
label=
"设备编号"
align=
"center"
prop=
"deviceCode"
/>
...
@@ -210,7 +210,7 @@
...
@@ -210,7 +210,7 @@
<
template
v-if=
"this.deviceType=='调压阀'||this.deviceType=='阀门井'"
>
<
template
v-if=
"this.deviceType=='调压阀'||this.deviceType=='阀门井'"
>
<el-row
v-if=
"form.deviceType != '压力表'"
>
<el-row>
<el-col
:span=
"12"
style=
"padding: 10px;"
>
<el-col
:span=
"12"
style=
"padding: 10px;"
>
<div
id=
"main1"
style=
"height:300px;background-color: rgb(247 247 247);padding: 5px;"
>
<div
id=
"main1"
style=
"height:300px;background-color: rgb(247 247 247);padding: 5px;"
>
<div
v-if=
"form.deviceReportDataList == null"
class=
"div-null"
>
<div
v-if=
"form.deviceReportDataList == null"
class=
"div-null"
>
...
...
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