From 2d3634a3925d9f4cfc04499ce9f0994c6b12b018 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 12 三月 2024 11:02:43 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/taskReliability/RBD-edit-img.vue | 5 +++--
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java | 2 +-
modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
index 583c14f..c35142f 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
@@ -46,7 +46,7 @@
public List<XhProductModel> getAllTree() {
List<XhProductModel> productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
- Constant.Bool.NO) .gt("node_type", 1).orderByAsc(Constant.TableColumn.SORT));
+ Constant.Bool.NO) .gt("product_type", 1).orderByAsc(Constant.TableColumn.SORT));
return TreeUtils.build(productList);
}
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index 9a7b443..46684f6 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -53,7 +53,7 @@
'' as statusImg,
d.dict_code as productType
FROM product_model a
- left join sys_dict_data d on d.DICT_VALUE = a.node_type and dict_type_id = '1728965873022050306' --
+ left join sys_dict_data d on d.DICT_VALUE = a.product_type and dict_type_id = '1728965873022050306' --
WHERE a.is_delete = 0
AND a.PID = ${productId}
diff --git a/web/src/views/modules/taskReliability/RBD-edit-img.vue b/web/src/views/modules/taskReliability/RBD-edit-img.vue
index 27fad49..e1ba1be 100644
--- a/web/src/views/modules/taskReliability/RBD-edit-img.vue
+++ b/web/src/views/modules/taskReliability/RBD-edit-img.vue
@@ -307,14 +307,15 @@
// this.getProduct(row.productId)
this.initDigram(row.productId)
this.getDiagram(modelId)
- console.log(row,'init(row){')
+ console.log(this.dataForm,'init(row){')
},
async getDiagram(modelId) {
let params = {
modelId : modelId
}
let res = await this.$http.get(`/taskReliability/ModelLine/getDiagram`, {params: params})
- if (res.data !== null && res.data.content != null) {
+ console.log(res,'async getDiagram( res')
+ if (res.data !== null && res.data.content != null) {
this.dataForm = res.data
console.log(this.dataForm, 'this.dataForm in getDiagram')
this.diagramJson = JSON.parse(this.dataForm.content)
--
Gitblit v1.9.1