Commit 545aa40b authored by 吴卿华's avatar 吴卿华

修改设备信息添加报错bug

parent 5d5b6ea1
...@@ -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());
/** /**
* 先执行删除 在执行添加 不能删除任何一个 * 先执行删除 在执行添加 不能删除任何一个
*/ */
......
...@@ -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">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment