From 7abc95a191d2c1a9bb9ff8fd7fb05470a0d4e86b Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 八月 2024 10:04:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/baseReliability/ParamDataBasic.vue | 54 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/web/src/views/modules/baseReliability/ParamDataBasic.vue b/web/src/views/modules/baseReliability/ParamDataBasic.vue
index 1d74d4f..3de24d4 100644
--- a/web/src/views/modules/baseReliability/ParamDataBasic.vue
+++ b/web/src/views/modules/baseReliability/ParamDataBasic.vue
@@ -25,27 +25,28 @@
:expand-row-keys="defultKey"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
:header-cell-style="{'text-align':'center'}"
+ :cell-style="cellStyle"
border @selection-change="table.selectionChangeHandle">
<!--<el-table-column type="selection" width="40"/>-->
<el-table-column prop="name" label="鍚嶇О"/>
<el-table-column prop="basicMtbfRegulate" label="MTBF" align="right">
<template slot-scope="scope">
- <span>{{ scope.row.basicMtbfRegulate | keepNumber }}</span>
+ <span>{{ keepNumber(scope.row.basicMtbfRegulate) }}</span>
</template>
</el-table-column>
<el-table-column prop="repairMttcr" label="MTTR" align="right">
<template slot-scope="scope">
- <span>{{ scope.row.repairMttcr | keepNumber }}</span>
+ <span>{{ keepNumber(scope.row.repairMttcr) }}</span>
</template>
</el-table-column>
<el-table-column prop="basicMtbfOperatingRatio" label="杩愯姣�" align="right">
<template slot-scope="scope">
- <span>{{ scope.row.basicMtbfOperatingRatio | keepNumber }}</span>
+ <span>{{keepNumber(scope.row.basicMtbfOperatingRatio) }}</span>
</template>
</el-table-column>
<el-table-column prop="ai" label="鍙敤搴�" align="right">
<template slot-scope="scope">
- <span>{{ scope.row.ai | keepNumber }}</span>
+ <span>{{keepNumber(scope.row.ai)}}</span>
</template>
</el-table-column>
</el-table>
@@ -75,18 +76,17 @@
components: {
ProductModelTree,
},
- filters: {
- keepNumber(value) { //杩囨护鍣ㄤ繚鐣�4涓哄皬鏁�
- const numM = Number(value).toFixed(5);
- if (numM === "NaN") {
- return "0.0000";
+ computed: {
+ keepNumber() { //杩囨护鍣ㄤ繚鐣�4涓哄皬鏁�
+ return function (val) { // 瀵硅绠楀睘鎬ц繘琛屼紶鍙�
+ const numM = Number(val).toFixed(5);
+ return numM.substring(0, numM.length - 1);
}
- if (numM === '0.0000' && value > 0) {
-
- }
- const realVal = numM.substring(0, numM.length - 1);
- return realVal;
},
+ },
+ mounted() {
+ this.$refs.modelTree.getProductList()
+ console.log(this.pageCode, 'this.pageCode this.pageCode')
},
methods: {
onProductSelected(data) {
@@ -115,6 +115,32 @@
this.$refs.tableObj.query()
})
},
+ cellStyle({row, column, rowIndex, columnIndex}) {
+ const numM1 = Number(row.repairMttcr).toFixed(5);
+ const numM2 = Number(row.basicMtbfRegulate).toFixed(5);
+ console.log(numM1,numM2,'234')
+ if (numM1.substring(0, numM1.length - 1) === '0.0000' && row.repairMttcr > 0 && column.property ==="repairMttcr") {
+ return 'color : red'
+ } else if (numM2.substring(0, numM1.length - 1) === '0.0000' && row.basicMtbfRegulate > 0 && column.property ==="basicMtbfRegulate") {
+ return 'color : red'
+ }else {
+ return ''
+ }
+ // Object.keys(row).forEach((key, index) => {
+ // //閬嶅巻姣忚涓瘡涓暟鎹殑state
+ // if (key === "repairMttcr" || key === "basicMtbfRegulate") {
+ // //console.log(key, "row key");
+ // let val = row[key]
+ // const numM = Number(val).toFixed(5);
+ // if (numM.substring(0, numM.length - 1) === '0.0000' && val > 0) {
+ // //瀹氫綅璇ユ暟鎹殑鍧愭爣
+ // if (columnIndex === 2) {
+ // warningColor = true;
+ // }
+ // }
+ // }
+ // });
+ },
}
}
</script>
--
Gitblit v1.9.1