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/basicInfo/ParamData.vue | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/web/src/views/modules/basicInfo/ParamData.vue b/web/src/views/modules/basicInfo/ParamData.vue
index eb245a4..646faae 100644
--- a/web/src/views/modules/basicInfo/ParamData.vue
+++ b/web/src/views/modules/basicInfo/ParamData.vue
@@ -32,7 +32,7 @@
<el-form-item>
<zt-button v-if="dataForm.srcId" type="warning" @click="handleSaveRows">淇濆瓨</zt-button>
<zt-button v-if="dataForm.srcId" type="query" @click="table.query()"/>
- <zt-button type="add" v-if="dataForm.productType==='3'" @click="add()"/>
+ <!-- <zt-button type="add" v-if="dataForm.productType==='3'" @click="add()"/>-->
<zt-button v-if="dataForm.srcId" type="delete" @click="table.deleteHandle()"/>
</el-form-item>
</el-form>
@@ -108,7 +108,7 @@
<span v-else v-text="scope.row.basicMtbfAccept"></span>
</template>
</el-table-column>-->
- <el-table-column prop="basicMtbfRegulSuccRate" :key="9" label="MTBF鎴愬姛鐜�" align="right">
+ <el-table-column prop="basicMtbfRegulSuccRate" :key="9" label="鎴愬姛鐜�" align="right">
<template slot-scope="scope">
<el-input v-if="scope.row.isEdit" v-model="scope.row.basicMtbfRegulSuccRate"></el-input>
<span v-else v-text="scope.row.basicMtbfRegulSuccRate"></span>
@@ -132,7 +132,7 @@
<span v-else v-text="scope.row.basicRunsNum"></span>
</template>
</el-table-column>
- <el-table-column prop="basicMtbfOperatingRatio" :key="13" label="MTBF杩愯姣�" align="right">
+ <el-table-column prop="basicMtbfOperatingRatio" :key="13" label="杩愯姣�" align="right">
<template slot-scope="scope">
<el-input v-if="scope.row.isEdit" v-model="scope.row.basicMtbfOperatingRatio"></el-input>
<span v-else v-text="scope.row.basicMtbfOperatingRatio"></span>
@@ -180,7 +180,7 @@
<span v-else v-text="scope.row.taskMtbcfAccept"></span>
</template>
</el-table-column>-->
- <el-table-column prop="taskMtbcfRegulSuccRate" :key="18" label="MTBCF鎴愬姛鐜�" align="right">
+ <el-table-column prop="taskMtbcfRegulSuccRate" :key="18" label="鎴愬姛鐜�" align="right">
<template slot-scope="scope">
<el-input v-if="scope.row.isEdit" v-model="scope.row.taskMtbcfRegulSuccRate"></el-input>
<span v-else v-text="scope.row.taskMtbcfRegulSuccRate"></span>
@@ -192,19 +192,19 @@
<span v-else v-text="scope.row.taskMtbcfAcceptSuccRate"></span>
</template>
</el-table-column>-->
- <el-table-column prop="taskMtbcfOperatingRatio" :key="20" label="MTBCF杩愯姣�" align="right">
+ <el-table-column prop="taskMtbcfOperatingRatio" :key="20" label="杩愯姣�" align="right">
<template slot-scope="scope">
<el-input v-if="scope.row.isEdit" v-model="scope.row.taskMtbcfOperatingRatio"></el-input>
<span v-else v-text="scope.row.taskMtbcfOperatingRatio"></span>
</template>
</el-table-column>
- <el-table-column prop="taskMtbcfOtherParams2" :key="21" label="MTBCF鍏朵粬鍙傛暟2" align="right">
+ <el-table-column prop="taskMtbcfOtherParams2" :key="21" label="鍏朵粬鍙傛暟2" align="right">
<template slot-scope="scope">
<el-input v-if="scope.row.isEdit" v-model="scope.row.taskMtbcfOtherParams2"></el-input>
<span v-else v-text="scope.row.taskMtbcfOtherParams2"></span>
</template>
</el-table-column>
- <el-table-column prop="taskMtbcfOtherParams3" :key="30" label="MTBCF鍏朵粬鍙傛暟3" align="right">
+ <el-table-column prop="taskMtbcfOtherParams3" :key="30" label="鍏朵粬鍙傛暟3" align="right">
<template slot-scope="scope">
<el-input v-if="scope.row.isEdit" v-model="scope.row.taskMtbcfOtherParams3"></el-input>
<span v-else v-text="scope.row.taskMtbcfOtherParams3"></span>
@@ -251,13 +251,13 @@
<span v-else>{{scope.row.repairMttcr | keepNumber}}</span>
</template>
</el-table-column>
- <el-table-column prop="repairMttcrOtherParams2" :key="26" label="MTTCR鍏朵粬鍙傛暟2" align="right">
+ <el-table-column prop="repairMttcrOtherParams2" :key="26" label="鍏朵粬鍙傛暟2" align="right">
<template slot-scope="scope">
<el-input v-if="scope.row.isEdit" v-model="scope.row.repairMttcrOtherParams2"></el-input>
<span v-else v-text="scope.row.repairMttcrOtherParams2"></span>
</template>
</el-table-column>
- <el-table-column prop="repairMttcrOtherParams3" :key="27" label="MTTCR鍏朵粬鍙傛暟3" align="right">
+ <el-table-column prop="repairMttcrOtherParams3" :key="27" label="鍏朵粬鍙傛暟3" align="right">
<template slot-scope="scope">
<el-input v-if="scope.row.isEdit" v-model="scope.row.repairMttcrOtherParams3"></el-input>
<span v-else v-text="scope.row.repairMttcrOtherParams3"></span>
@@ -304,7 +304,6 @@
effect: '',
hit: false,
dataForm: {
- pageCode: this.$route.query.pageCode,
id: '',
pid: '',
srcId: '',
@@ -317,6 +316,9 @@
reliabDistribType: ''
},
isOrNot: [{
+ value: 0,
+ label: '鍚�'
+ },{
value: 1,
label: '鏄�'
}],
@@ -333,14 +335,15 @@
{
value: 1,
label: '鎸囨暟鍒嗗竷'
- }, {
+ },
+ {
value: 2,
- label: '浜岄」鍒嗗竷'
+ label: '濞佸竷灏斿垎甯�'
},
{
value: 3,
- label: '濞佸竷灏斿垎甯�'
- },
+ label: '浜岄」鍒嗗竷'
+ }
],
// editingCell:null,
dataList: [],
@@ -382,16 +385,13 @@
},
mounted() {
this.$refs.modelTree.getProductList()
- this.pageCode = this.$route.query.pageCode
- this.dataForm.pageCode = this.$route.query.pageCode
- console.log(this.pageCode, 'this.pageCode this.pageCode')
},
methods: {
add() {
this.$refs.SelectTyModel.$refs.dialog.init(null, {
type: this.dataForm.productType + 1,
id: this.dataForm.srcId,
- pageCode: this.pageCode
+ pageCode: 'expect'
})
console.log(this.dataForm.srcId, 'add')
},
@@ -449,9 +449,11 @@
},
onDefault(defaultId) {
this.dataForm.srcId = defaultId
- this.dataForm.productType = 2
+ this.dataForm.productType = '1'
this.activeName = 'first'
- this.$refs.tableObj.query()
+ this.$nextTick(() => {
+ this.$refs.tableObj.query()
+ })
},
dataLoaded(data) {
this.dataList = data
--
Gitblit v1.9.1