From 48dcf2c7f01de5078f6a7f94dbc59400100e9ab6 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 23 十月 2024 11:05:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/baseReliability/ParamDataBasic.vue | 68 ++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 24 deletions(-)
diff --git a/web/src/views/modules/baseReliability/ParamDataBasic.vue b/web/src/views/modules/baseReliability/ParamDataBasic.vue
index cab88f5..81726fd 100644
--- a/web/src/views/modules/baseReliability/ParamDataBasic.vue
+++ b/web/src/views/modules/baseReliability/ParamDataBasic.vue
@@ -39,6 +39,16 @@
<span>{{ keepNumber(scope.row.repairMttcr) }}</span>
</template>
</el-table-column>
+ <el-table-column prop="basicMtbfRegulSuccRate" label="鎴愬姛鐜�" align="right">
+ <template slot-scope="scope">
+ <span>{{keepNumber(scope.row.basicMtbfRegulSuccRate) }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="basicRunsNum" label="杩愯娆℃暟" align="right">
+ <template slot-scope="scope">
+ <span>{{scope.row.basicRunsNum}}</span>
+ </template>
+ </el-table-column>
<el-table-column prop="basicMtbfOperatingRatio" label="杩愯姣�" align="right">
<template slot-scope="scope">
<span>{{keepNumber(scope.row.basicMtbfOperatingRatio) }}</span>
@@ -68,7 +78,9 @@
basicMtbfRegulate: '',
repairMttcr: '',
basicMtbfOperatingRatio: '',
- ai: ''
+ ai: '',
+ basicMtbfRegulSuccRate:'',
+ basicRunsNum:''
},
defultKey: []
}
@@ -79,10 +91,17 @@
computed: {
keepNumber() { //杩囨护鍣ㄤ繚鐣�4涓哄皬鏁�
return function (val) { // 瀵硅绠楀睘鎬ц繘琛屼紶鍙�
- const numM = Number(val).toFixed(5);
- return numM.substring(0, numM.length - 1);
+ let numM = 0.0
+ if (val){
+ numM = Number(val).toFixed(4);
+ numM.substring(0, numM.length - 1)
+ }
+ return numM;
}
},
+ },
+ mounted() {
+ this.$refs.modelTree.getProductList()
},
methods: {
onProductSelected(data) {
@@ -112,29 +131,30 @@
})
},
cellStyle({row, column, rowIndex, columnIndex}) {
- let warningColor = false;
- // console.log(row, column, rowIndex, columnIndex);
- //console.log(row, "row");
- 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;
- }
- }
- }
- });
-
- if (warningColor) {
- // red涓烘兂鍙樻垚鐨勫崟鍏冩牸鏍峰紡
+ 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 ''
}
- 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;
+ // }
+ // }
+ // }
+ // });
},
}
}
--
Gitblit v1.9.1