From b56a59e06e76c635e5f12931ed98852367b867d8 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 11 三月 2024 11:09:50 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelRbd.java | 2 +-
modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml | 2 +-
web/src/views/modules/taskReliability/ModelRbd.vue | 14 +++++++-------
modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/ModelLineService.java | 8 ++++----
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelRbd.java b/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelRbd.java
index 2d47bf8..bdd0552 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelRbd.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelRbd.java
@@ -25,7 +25,7 @@
private Long pid;
@ApiModelProperty(value = "")
- private Long modelId;
+ private Long modelTag;
@ApiModelProperty(value = "妯″瀷鍚嶇О")
private String modelName;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/ModelLineService.java b/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/ModelLineService.java
index 2840548..f60aa9e 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/ModelLineService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/ModelLineService.java
@@ -68,8 +68,8 @@
@Transactional(rollbackFor = Exception.class)
public void insert(ModelRbd modelRbd) {
if (modelRbd==null) return;
- if (modelRbd.getModelId()==null) return;
- Long modelId = modelRbd.getModelId();
+ if (modelRbd.getId()==null) return;
+ Long modelId = modelRbd.getId();
// 鍒犻櫎鏃㈡湁鏁版嵁
modelRbdDao.deleteByModelId(modelId);
@@ -82,8 +82,8 @@
@Transactional(rollbackFor = Exception.class)
public void update(ModelRbd modelRbd) {
if (modelRbd==null) return;
- if (modelRbd.getModelId()==null) return;
- Long modelId = modelRbd.getModelId();
+ if (modelRbd.getId()==null) return;
+ Long modelId = modelRbd.getId();
// 鍒犻櫎鏃㈡湁鏁版嵁
modelRbdDao.deleteByModelId(modelId);
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
index f8b85f9..67e8be8 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
@@ -32,6 +32,6 @@
<update id="deleteByModelId">
delete
from model_rbd
- where model_id = #{modelId}
+ where id = #{modelId}
</update>
</mapper>
diff --git a/web/src/views/modules/taskReliability/ModelRbd.vue b/web/src/views/modules/taskReliability/ModelRbd.vue
index c97c0e3..61520e2 100644
--- a/web/src/views/modules/taskReliability/ModelRbd.vue
+++ b/web/src/views/modules/taskReliability/ModelRbd.vue
@@ -8,7 +8,8 @@
</el-col>
<el-col :span="19">
<div class="mod-taskReliability-modelRbd}">
- <zt-table-wraper ref="tableObj" defaultNotQuery="true" query-url="/taskReliability/ModelRbd/page" delete-url="/taskReliability/ModelRbd"
+ <zt-table-wraper ref="tableObj" defaultNotQuery="true" query-url="/taskReliability/ModelRbd/page"
+ delete-url="/taskReliability/ModelRbd"
:paging='false'
v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
@@ -22,7 +23,7 @@
border @selection-change="table.selectionChangeHandle">
<el-table-column type="selection" width="40" align="center"/>
<el-table-column prop="modelName" label="妯″瀷鍚嶇О"/>
- <el-table-column prop="modelSign" label="妯″瀷鏍囪瘑"/>
+ <el-table-column prop="modelTag" label="妯″瀷鏍囪瘑"/>
<el-table-column prop="citedNum" label="琚紩鐢ㄦ暟"/>
<el-table-column prop="modelState" label="妯″瀷鐘舵��"/>
<el-table-column prop="modelDataState" label="妯″瀷鏁版嵁鐘舵��"/>
@@ -56,7 +57,7 @@
return {
dialogVisible2: false,
dataForm: {
- modelName:'',
+ modelName: '',
productId: '',
}
}
@@ -70,8 +71,8 @@
RBDEditImg
},
methods: {
- add(){
- this.$refs.AddOrUpdate.$refs.dialog.init(null,this.dataForm.productId)
+ add() {
+ this.$refs.AddOrUpdate.$refs.dialog.init(null, this.dataForm.productId)
},
onProductSelected(data) {
this.dataForm.productId = data.id
@@ -80,10 +81,9 @@
},
drawRBD(row) {
this.dialogVisible2 = true
- this.$nextTick(()=>{
+ this.$nextTick(() => {
this.$refs.rbdEditImg.init(row)
})
-
}
}
}
--
Gitblit v1.9.1