From 2d5bfe0ce8d904025844ee55082ebc08fbfee975 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期五, 19 一月 2024 15:56:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/cfkb/Instructions/index.vue | 13 ++++++++++++-
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java | 5 ++++-
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
index 7657346..8ff0157 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
@@ -35,6 +35,8 @@
@Autowired
private ProductProcessService productProcessService;
+ private static final String ZERO = "0";
+
/**
* 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛�
*/
@@ -49,7 +51,8 @@
formulaChildInfo.setAddress(formulaChildInfo.getTechRequirement());
formulaChildInfo.setImg(formulaChildInfo.getPicture());
}
- list = list.stream().sorted(Comparator.comparing(BsFormulaChildInfo::getSort)).collect(Collectors.toList());
+ list = list.stream()
+ .filter(x -> !ZERO.equals(x.getSort())).sorted(Comparator.comparing(BsFormulaChildInfo::getSort)).collect(Collectors.toList());
return getDataTable(list);
}
diff --git a/jcdm-ui/src/views/main/cfkb/Instructions/index.vue b/jcdm-ui/src/views/main/cfkb/Instructions/index.vue
index 1001b5c..835ee13 100644
--- a/jcdm-ui/src/views/main/cfkb/Instructions/index.vue
+++ b/jcdm-ui/src/views/main/cfkb/Instructions/index.vue
@@ -149,7 +149,7 @@
mounted() {
this.getStationConf()
// this.changeProducts(this.productCode)
- this.changeProducts("2V91")
+ // this.changeProducts("2V91")
this.getNowTime()
// this.autoShow()
},
@@ -166,8 +166,12 @@
listStationConf(queryParams).then(response => {
this.locationName = response.rows[0].processesName
this.locationCode = response.rows[0].processesCode
+ console.log('llllll',this.locationCode)
+ this.changeProducts("2V91")
});
+
});
+
},
//鑾峰彇褰撳墠鏃堕棿
getNowTime () {
@@ -198,6 +202,10 @@
setImg(index) {
this.address = this.tableData[index].address
this.src = this.tableData[index].img
+ },
+ cleanImg(){
+ this.address = ''
+ this.src = ''
},
setBg() {
if (document.getElementById('outerDiv' + (this.tableData.length - 1)).style.background === 'yellow') {
@@ -238,8 +246,10 @@
},
changeProducts(val){
+
console.log("------鏇存崲鍥剧墖",val)
console.log("------鐩綍==============",this.tableData)
+ console.log("locationCode",this.locationCode)
this.productCode = val
const _this = this
@@ -249,6 +259,7 @@
this.queryParams.processesCode = this.locationCode
listFormulaChild(this.queryParams).then(response => {
this.tableData = [];
+ this.cleanImg()
this.tableData = response.rows;
this.$nextTick(() => {
clearInterval(this.intervalId);
--
Gitblit v1.9.3