From c1c99506314644355c105de2a525ea3a248fd91f Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 11 六月 2024 08:56:55 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/taskReliability/OperatCondit.vue | 15 +
web/src/views/modules/basicInfo/ParamData.vue | 307 ++++++++-------------------------------------------
web/src/views/modules/taskReliability/OperatConditModel.vue | 10 +
3 files changed, 67 insertions(+), 265 deletions(-)
diff --git a/web/src/views/modules/basicInfo/ParamData.vue b/web/src/views/modules/basicInfo/ParamData.vue
index b16371a..ecf9669 100644
--- a/web/src/views/modules/basicInfo/ParamData.vue
+++ b/web/src/views/modules/basicInfo/ParamData.vue
@@ -37,11 +37,30 @@
</el-form>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="鍩烘湰鍙潬鎬�" name="first">
- <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:30}"
+ <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px"
+ v-adaptive="{bottomOffset:30}"
class="paramsDataTable"
@selection-change="table.selectionChangeHandle">
<el-table-column type="selection" :key="1" width="40" align="center"/>
- <el-table-column prop="name" :key="2" label="鍚嶇О" fixed="left" width="140"/>
+ <el-table-column prop="name" :key="2" label="鍚嶇О" fixed="left" width="120"/>
+ <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'"
+ prop="reliabDistribType"
+ label="鍙潬鎬у垎甯冪被鍨�" :key="27"
+ width="100">
+ <template v-slot="{ row }">
+ <el-select v-if="row.isEdit" v-model="row.reliabDistribType"
+ placeholder="璇烽�夋嫨">
+ <el-option v-for="item in reliabDistribType"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ <zt-dict-tag v-else dict="ReliabDistribType" :value="row.reliabDistribType" :typeS="typeS"
+ :typeI="typeI" :typeD="typeD" :typeColor="typeColor" :size="size" :effect="effect"
+ :hit="hit"/>
+ </template>
+ </el-table-column>
<el-table-column v-if="dataForm.productType==='4'" :key="3" prop="baseOperatRatio" label="鍩烘湰鍙潬鎬ц繍琛屾瘮">
<template slot-scope="scope">
<el-input v-if="scope.row.isEdit" v-model="scope.row.baseOperatRatio"></el-input>
@@ -51,20 +70,15 @@
<el-table-column v-if="dataForm.productType==='5'||dataForm.productType==='4'" :key="4"
prop="actualRunTime"
label="瀹為檯杩愯鏃堕棿">
- <!-- <template slot-scope="scope">
- <span v-if="editingCell && editingCell.row === scope.row && editingCell.column.property === scope.column.property">
- <el-input ref="editInput" v-model="scope.row.actualRunTime" placeholder="瀹為檯杩愯鏃堕棿"></el-input>
- </span>
- <span v-else>{{scope.row.actualRunTime}}</span>
- </template>-->
<template slot-scope="scope">
<el-input v-if="scope.row.isEdit" v-model="scope.row.actualRunTime"></el-input>
<span v-else v-text="scope.row.actualRunTime"></span>
</template>
</el-table-column>
- <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'" :key="5" label="鍩烘湰鍙潬鎬ц绠�">
+ <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'" :key="5"
+ label="鍩烘湰鍙潬鎬ц绠�">
<!-- <zt-table-column-dict prop="joinCompute" :keys="6" label="鍙傚姞璁＄畻" width="100" dict="is_or_not"/>-->
- <el-table-column prop="basicJoinCompute" label="鍙傚姞璁＄畻" :key="6" width="100">
+ <el-table-column prop="basicJoinCompute" label="鍙傚姞璁＄畻" :key="6">
<template v-slot="{ row }">
<el-select v-if="row.isEdit" v-model="row.basicJoinCompute"
placeholder="鍙傚姞璁＄畻">
@@ -79,25 +93,25 @@
:typeColor="typeColor" :size="size" :effect="effect" :hit="hit"/>
</template>
</el-table-column>
- <el-table-column prop="basicMtbfRegulate" :key="7" label="瑙勫畾MTBF" width="120">
+ <el-table-column prop="basicMtbfRegulate" :key="7" label="瑙勫畾MTBF">
<template slot-scope="scope">
<el-input v-if="scope.row.isEdit" v-model="scope.row.basicMtbfRegulate"></el-input>
<span v-else v-text="scope.row.basicMtbfRegulate"></span>
</template>
</el-table-column>
- <el-table-column prop="basicMtbfAccept" :key="8" label="鍙帴鍙楃殑MTBF" width="160">
+ <el-table-column prop="basicMtbfAccept" :key="8" label="鍙帴鍙楃殑MTBF" width="100">
<template slot-scope="scope">
<el-input v-if="scope.row.isEdit" v-model="scope.row.basicMtbfAccept"></el-input>
<span v-else v-text="scope.row.basicMtbfAccept"></span>
</template>
</el-table-column>
- <el-table-column prop="basicMtbfRegulSuccRate" :key="9" label="MTBF瑙勫畾鎴愬姛鐜�" width="180">
+ <el-table-column prop="basicMtbfRegulSuccRate" :key="9" label="MTBF瑙勫畾鎴愬姛鐜�">
<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>
</template>
</el-table-column>
- <el-table-column prop="basicMtbfAcceptSuccRate" :key="10" label="MTBF鍙帴鍙楁垚鍔熺巼" width="180">
+ <el-table-column prop="basicMtbfAcceptSuccRate" :key="10" label="MTBF鍙帴鍙楁垚鍔熺巼" width="140">
<template slot-scope="scope">
<el-input v-if="scope.row.isEdit" v-model="scope.row.basicMtbfAcceptSuccRate"></el-input>
<span v-else v-text="scope.row.basicMtbfAcceptSuccRate"></span>
@@ -115,133 +129,20 @@
<span v-else v-text="scope.row.basicRunsNum"></span>
</template>
</el-table-column>
- <el-table-column prop="basicMtbfOperatingRatio" :key="13" label="MTBF杩愯姣�" width="140">
+ <el-table-column prop="basicMtbfOperatingRatio" :key="13" label="MTBF杩愯姣�" width="80">
<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>
</template>
</el-table-column>
- <el-table-column prop="basicSingleRunTime" :key="14" label="鍗曟杩愯鏃堕棿" width="140">
+ <el-table-column prop="basicSingleRunTime" :key="14" label="杩愯鏃堕棿" width="100">
<template slot-scope="scope">
<el-input v-if="scope.row.isEdit" v-model="scope.row.basicSingleRunTime"></el-input>
<span v-else v-text="scope.row.basicSingleRunTime"></span>
</template>
</el-table-column>
</el-table-column>
-
- <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'" :key="15" label="浠诲姟鍙潬鎬ц绠�">
- <el-table-column prop="taskMtbcfRegulate" :key="16" label="瑙勫畾MTBCF" width="120">
- <template slot-scope="scope">
- <el-input v-if="scope.row.isEdit" v-model="scope.row.taskMtbcfRegulate"></el-input>
- <span v-else v-text="scope.row.taskMtbcfRegulate"></span>
- </template>
- </el-table-column>
- <el-table-column prop="taskMtbcfAccept" :key="17" label="鍙帴鍙楃殑MTBCF" width="160">
- <template slot-scope="scope">
- <el-input v-if="scope.row.isEdit" v-model="scope.row.taskMtbcfAccept"></el-input>
- <span v-else v-text="scope.row.taskMtbcfAccept"></span>
- </template>
- </el-table-column>
- <el-table-column prop="taskMtbcfRegulSuccRate" :key="18" label="MTBCF瑙勫畾鎴愬姛鐜�" width="180">
- <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>
- </template>
- </el-table-column>
- <el-table-column prop="taskMtbcfAcceptSuccRate" :key="19" label="MTBCF鍙帴鍙楁垚鍔熺巼" width="200">
- <template slot-scope="scope">
- <el-input v-if="scope.row.isEdit" v-model="scope.row.taskMtbcfAcceptSuccRate"></el-input>
- <span v-else v-text="scope.row.taskMtbcfAcceptSuccRate"></span>
- </template>
- </el-table-column>
- <el-table-column prop="taskMtbcfOperatingRatio" :key="20" label="MTBCF杩愯姣�" width="140">
- <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="taskMtbcfOtherParams" :key="21" label="MTBCF鍏朵粬鍙傛暟" width="160">
- <template slot-scope="scope">
- <el-input v-if="scope.row.isEdit" v-model="scope.row.taskMtbcfOtherParams"></el-input>
- <span v-else v-text="scope.row.taskMtbcfOtherParams"></span>
- </template>
- </el-table-column>
- </el-table-column>
-
- <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'" :key="22" label="缁翠慨鍒嗗竷">
- <!-- <zt-table-column-dict prop="repairable" :keys="23" label="鍙淮淇�" dict="is_or_not"/>-->
- <el-table-column prop="repairable" label="鍙淮淇�" :key="23">
- <template v-slot="{ row }">
- <el-select v-if="row.isEdit" v-model="row.repairable"
- placeholder="璇烽�夋嫨">
- <el-option v-for="item in isOrNot"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- <zt-dict-tag v-else dict="is_or_not" :value="row.repairable" :typeS="typeS" :typeI="typeI"
- :typeD="typeD"
- :typeColor="typeColor" :size="size" :effect="effect" :hit="hit"/>
- </template>
- </el-table-column>
- <!-- <zt-table-column-dict prop="repairDistribType" :keys="24" label="缁翠慨鍒嗗竷绫诲瀷" width="140" dict="RepairDistribType"/>-->
- <el-table-column prop="repairDistribType" label="缁翠慨鍒嗗竷绫诲瀷" :key="24" width="140">
- <template v-slot="{ row }">
- <el-select v-if="row.isEdit" v-model="row.repairDistribType"
- placeholder="璇烽�夋嫨">
- <el-option v-for="item in repairDistribType"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- <zt-dict-tag v-else dict="RepairDistribType" :value="row.repairDistribType" :typeS="typeS"
- :typeI="typeI"
- :typeD="typeD" :typeColor="typeColor" :size="size" :effect="effect" :hit="hit"/>
- </template>
- </el-table-column>
- <el-table-column prop="repairMttcr" label="MTTCR" :key="25" width="100">
- <template slot-scope="scope">
- <el-input v-if="scope.row.isEdit" v-model="scope.row.repairMttcr"></el-input>
- <span v-else v-text="scope.row.repairMttcr"></span>
- </template>
- </el-table-column>
- <el-table-column prop="repairMttcrOtherParams" :key="26" label="MTTCR鍏朵粬鍙傛暟" width="180">
- <template slot-scope="scope">
- <el-input v-if="scope.row.isEdit" v-model="scope.row.repairMttcrOtherParams"></el-input>
- <span v-else v-text="scope.row.repairMttcrOtherParams"></span>
- </template>
- </el-table-column>
- </el-table-column>
-
- <!-- <zt-table-column-dict v-if="dataForm.productType==='3'" :key="27" prop="reliabDistribType" label="鍙潬鎬у垎甯冪被鍨�"
- width="160"/>-->
- <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'" prop="reliabDistribType"
- label="鍙潬鎬у垎甯冪被鍨�" :key="27"
- width="160">
- <template v-slot="{ row }">
- <el-select v-if="row.isEdit" v-model="row.reliabDistribType"
- placeholder="璇烽�夋嫨">
- <el-option v-for="item in reliabDistribType"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- <zt-dict-tag v-else dict="ReliabDistribType" :value="row.reliabDistribType" :typeS="typeS"
- :typeI="typeI" :typeD="typeD" :typeColor="typeColor" :size="size" :effect="effect"
- :hit="hit"/>
- </template>
- </el-table-column>
- <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'" :key="28" prop="runTime"
- label="杩愯鏃堕棿" width="100">
- <template slot-scope="scope">
- <el-input v-if="scope.row.isEdit" v-model="scope.row.runTime"></el-input>
- <span v-else v-text="scope.row.runTime"></span>
- </template>
- </el-table-column>
- <el-table-column fixed="right" align="center" label="鎿嶄綔" width="150">
+ <el-table-column fixed="right" align="center" label="鎿嶄綔" width="100">
<template slot-scope="scope">
<zt-table-button size="small" type="primary" @click="edit(scope.row)">淇敼
</zt-table-button>
@@ -249,141 +150,57 @@
</zt-table-button>
</template>
</el-table-column>
-
</el-table>
</el-tab-pane>
- <el-tab-pane label="浠诲姟鍙潬鎬�" name="second">
- <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:30}"
+
+
+ <el-tab-pane label="浠诲姟鍙潬鎬�" name="second" v-if="dataForm.productType==='3'||dataForm.productType==='2'">
+ <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px"
+ v-adaptive="{bottomOffset:30}"
class="paramsDataTable"
@selection-change="table.selectionChangeHandle">
<el-table-column type="selection" :key="1" width="40" align="center"/>
- <el-table-column prop="name" :key="2" label="鍚嶇О" fixed="left" width="140"/>
- <el-table-column v-if="dataForm.productType==='4'" :key="3" prop="baseOperatRatio" label="鍩烘湰鍙潬鎬ц繍琛屾瘮">
- <template slot-scope="scope">
- <el-input v-if="scope.row.isEdit" v-model="scope.row.baseOperatRatio"></el-input>
- <span v-else v-text="scope.row.baseOperatRatio"></span>
- </template>
- </el-table-column>
- <el-table-column v-if="dataForm.productType==='5'||dataForm.productType==='4'" :key="4"
- prop="actualRunTime"
- label="瀹為檯杩愯鏃堕棿">
- <!-- <template slot-scope="scope">
- <span v-if="editingCell && editingCell.row === scope.row && editingCell.column.property === scope.column.property">
- <el-input ref="editInput" v-model="scope.row.actualRunTime" placeholder="瀹為檯杩愯鏃堕棿"></el-input>
- </span>
- <span v-else>{{scope.row.actualRunTime}}</span>
- </template>-->
- <template slot-scope="scope">
- <el-input v-if="scope.row.isEdit" v-model="scope.row.actualRunTime"></el-input>
- <span v-else v-text="scope.row.actualRunTime"></span>
- </template>
- </el-table-column>
- <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'" :key="5" label="鍩烘湰鍙潬鎬ц绠�">
- <!-- <zt-table-column-dict prop="joinCompute" :keys="6" label="鍙傚姞璁＄畻" width="100" dict="is_or_not"/>-->
- <el-table-column prop="basicJoinCompute" label="鍙傚姞璁＄畻" :key="6" width="100">
- <template v-slot="{ row }">
- <el-select v-if="row.isEdit" v-model="row.basicJoinCompute"
- placeholder="鍙傚姞璁＄畻">
- <el-option v-for="item in isOrNot"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- <zt-dict-tag v-else dict="is_or_not" :value="row.basicJoinCompute" :typeS="typeS" :typeI="typeI"
- :typeD="typeD"
- :typeColor="typeColor" :size="size" :effect="effect" :hit="hit"/>
- </template>
- </el-table-column>
- <el-table-column prop="basicMtbfRegulate" :key="7" label="瑙勫畾MTBF" width="120">
- <template slot-scope="scope">
- <el-input v-if="scope.row.isEdit" v-model="scope.row.basicMtbfRegulate"></el-input>
- <span v-else v-text="scope.row.basicMtbfRegulate"></span>
- </template>
- </el-table-column>
- <el-table-column prop="basicMtbfAccept" :key="8" label="鍙帴鍙楃殑MTBF" width="160">
- <template slot-scope="scope">
- <el-input v-if="scope.row.isEdit" v-model="scope.row.basicMtbfAccept"></el-input>
- <span v-else v-text="scope.row.basicMtbfAccept"></span>
- </template>
- </el-table-column>
- <el-table-column prop="basicMtbfRegulSuccRate" :key="9" label="MTBF瑙勫畾鎴愬姛鐜�" width="180">
- <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>
- </template>
- </el-table-column>
- <el-table-column prop="basicMtbfAcceptSuccRate" :key="10" label="MTBF鍙帴鍙楁垚鍔熺巼" width="180">
- <template slot-scope="scope">
- <el-input v-if="scope.row.isEdit" v-model="scope.row.basicMtbfAcceptSuccRate"></el-input>
- <span v-else v-text="scope.row.basicMtbfAcceptSuccRate"></span>
- </template>
- </el-table-column>
- <el-table-column prop="basicUnitNum" label="鍗曞厓鏁伴噺" :key="11" width="100">
- <template slot-scope="scope">
- <el-input v-if="scope.row.isEdit" v-model="scope.row.basicUnitNum"></el-input>
- <span v-else v-text="scope.row.basicUnitNum"></span>
- </template>
- </el-table-column>
- <el-table-column prop="basicRunsNum" label="杩愯娆℃暟" :key="12" width="100">
- <template slot-scope="scope">
- <el-input v-if="scope.row.isEdit" v-model="scope.row.basicRunsNum"></el-input>
- <span v-else v-text="scope.row.basicRunsNum"></span>
- </template>
- </el-table-column>
- <el-table-column prop="basicMtbfOperatingRatio" :key="13" label="MTBF杩愯姣�" width="140">
- <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>
- </template>
- </el-table-column>
- <el-table-column prop="basicSingleRunTime" :key="14" label="鍗曟杩愯鏃堕棿" width="140">
- <template slot-scope="scope">
- <el-input v-if="scope.row.isEdit" v-model="scope.row.basicSingleRunTime"></el-input>
- <span v-else v-text="scope.row.basicSingleRunTime"></span>
- </template>
- </el-table-column>
- </el-table-column>
+ <el-table-column prop="name" :key="2" label="鍚嶇О" fixed="left" width="120"/>
- <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'" :key="15" label="浠诲姟鍙潬鎬ц绠�">
- <el-table-column prop="taskMtbcfRegulate" :key="16" label="瑙勫畾MTBCF" width="120">
+ <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'" :key="15"
+ label="浠诲姟鍙潬鎬ц绠�">
+ <el-table-column prop="taskMtbcfRegulate" :key="16" label="瑙勫畾MTBCF" width="100">
<template slot-scope="scope">
<el-input v-if="scope.row.isEdit" v-model="scope.row.taskMtbcfRegulate"></el-input>
<span v-else v-text="scope.row.taskMtbcfRegulate"></span>
</template>
</el-table-column>
- <el-table-column prop="taskMtbcfAccept" :key="17" label="鍙帴鍙楃殑MTBCF" width="160">
+ <el-table-column prop="taskMtbcfAccept" :key="17" label="鍙帴鍙楃殑MTBCF" width="100">
<template slot-scope="scope">
<el-input v-if="scope.row.isEdit" v-model="scope.row.taskMtbcfAccept"></el-input>
<span v-else v-text="scope.row.taskMtbcfAccept"></span>
</template>
</el-table-column>
- <el-table-column prop="taskMtbcfRegulSuccRate" :key="18" label="MTBCF瑙勫畾鎴愬姛鐜�" width="180">
+ <el-table-column prop="taskMtbcfRegulSuccRate" :key="18" label="MTBCF瑙勫畾鎴愬姛鐜�" width="120">
<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>
</template>
</el-table-column>
- <el-table-column prop="taskMtbcfAcceptSuccRate" :key="19" label="MTBCF鍙帴鍙楁垚鍔熺巼" width="200">
+ <el-table-column prop="taskMtbcfAcceptSuccRate" :key="19" label="MTBCF鍙帴鍙楁垚鍔熺巼" width="140">
<template slot-scope="scope">
<el-input v-if="scope.row.isEdit" v-model="scope.row.taskMtbcfAcceptSuccRate"></el-input>
<span v-else v-text="scope.row.taskMtbcfAcceptSuccRate"></span>
</template>
</el-table-column>
- <el-table-column prop="taskMtbcfOperatingRatio" :key="20" label="MTBCF杩愯姣�" width="140">
+ <el-table-column prop="taskMtbcfOperatingRatio" :key="20" label="MTBCF杩愯姣�" width="100">
<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="taskMtbcfOtherParams" :key="21" label="MTBCF鍏朵粬鍙傛暟" width="160">
+ <el-table-column prop="taskMtbcfOtherParams" :key="21" label="MTBCF鍏朵粬鍙傛暟">
<template slot-scope="scope">
<el-input v-if="scope.row.isEdit" v-model="scope.row.taskMtbcfOtherParams"></el-input>
<span v-else v-text="scope.row.taskMtbcfOtherParams"></span>
</template>
</el-table-column>
</el-table-column>
-
<el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'" :key="22" label="缁翠慨鍒嗗竷">
<!-- <zt-table-column-dict prop="repairable" :keys="23" label="鍙淮淇�" dict="is_or_not"/>-->
<el-table-column prop="repairable" label="鍙淮淇�" :key="23">
@@ -430,34 +247,7 @@
</template>
</el-table-column>
</el-table-column>
-
- <!-- <zt-table-column-dict v-if="dataForm.productType==='3'" :key="27" prop="reliabDistribType" label="鍙潬鎬у垎甯冪被鍨�"
- width="160"/>-->
- <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'" prop="reliabDistribType"
- label="鍙潬鎬у垎甯冪被鍨�" :key="27"
- width="160">
- <template v-slot="{ row }">
- <el-select v-if="row.isEdit" v-model="row.reliabDistribType"
- placeholder="璇烽�夋嫨">
- <el-option v-for="item in reliabDistribType"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- <zt-dict-tag v-else dict="ReliabDistribType" :value="row.reliabDistribType" :typeS="typeS"
- :typeI="typeI" :typeD="typeD" :typeColor="typeColor" :size="size" :effect="effect"
- :hit="hit"/>
- </template>
- </el-table-column>
- <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'" :key="28" prop="runTime"
- label="杩愯鏃堕棿" width="100">
- <template slot-scope="scope">
- <el-input v-if="scope.row.isEdit" v-model="scope.row.runTime"></el-input>
- <span v-else v-text="scope.row.runTime"></span>
- </template>
- </el-table-column>
- <el-table-column fixed="right" align="center" label="鎿嶄綔" width="150">
+ <el-table-column fixed="right" align="center" label="鎿嶄綔" width="100">
<template slot-scope="scope">
<zt-table-button size="small" type="primary" @click="edit(scope.row)">淇敼
</zt-table-button>
@@ -485,7 +275,7 @@
export default {
data() {
return {
- activeName:'first',
+ activeName: 'first',
pageCode: '',
key: '',
typeS: '',
@@ -569,7 +359,7 @@
console.log(this.pageCode, 'this.pageCode this.pageCode')
},
methods: {
- handleClick(){
+ handleClick() {
},
add() {
@@ -626,6 +416,7 @@
onProductSelected(data) {
this.dataForm.srcId = data.id
this.dataForm.productType = data.productType
+ this.activeName = 'first'
console.log(data, 'onProductSelected(data)')
this.$nextTick(() => {
this.$refs.tableObj.query()
diff --git a/web/src/views/modules/taskReliability/OperatCondit.vue b/web/src/views/modules/taskReliability/OperatCondit.vue
index 73f3ee5..4bd53e3 100644
--- a/web/src/views/modules/taskReliability/OperatCondit.vue
+++ b/web/src/views/modules/taskReliability/OperatCondit.vue
@@ -5,9 +5,11 @@
<div class="mod-taskReliability-operatCondit}">
<div class="fa-card-a">
<div style="margin-top: 10px">
- <zt-select v-model="dataForm.productId" placeholder="璇烽�夋嫨浜у搧鑺傜偣" :datas="productList" @change="onProductSelected"/>
+ <zt-select v-model="dataForm.productId" placeholder="璇烽�夋嫨浜у搧鑺傜偣" :datas="productList"
+ @change="onProductSelected"/>
</div>
- <zt-table-wraper ref="tableObj" query-url="/taskReliability/OperatCondit/page" defaultNotQuery="true" delete-url="/taskReliability/OperatCondit"
+ <zt-table-wraper ref="tableObj" query-url="/taskReliability/OperatCondit/page" defaultNotQuery="true"
+ delete-url="/taskReliability/OperatCondit"
v-slot="{ table }" :paging='false'>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
@@ -17,11 +19,13 @@
</el-form-item>
</el-form>
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px"
+ :highlight-current-row="isSelect"
v-adaptive="{bottomOffset:70}"
border @row-click="selectOperatCondit" @selection-change="table.selectionChangeHandle">
<el-table-column type="selection" width="40" align="center"/>
<el-table-column prop="name" label="宸ュ喌鍚嶇О"/>
- <el-table-column prop="remark" label="澶囨敞"/>
+ <el-table-column prop="remark" label="澶囨敞"
+ /
<zt-table-column-handle :table="table"
delete-perm="taskReliability::delete"/>
</el-table>
@@ -50,7 +54,8 @@
productList: [],
dataForm: {
productId: '',
- }
+ },
+ isSelect: false,
}
},
mounted() {
@@ -63,7 +68,7 @@
methods: {
add() {
- this.$refs.AddOrUpdate.$refs.dialog.init(null,{productId: this.dataForm.productId})
+ this.$refs.AddOrUpdate.$refs.dialog.init(null, {productId: this.dataForm.productId})
},
onProductSelected(data) {
this.dataForm.productId = data.id
diff --git a/web/src/views/modules/taskReliability/OperatConditModel.vue b/web/src/views/modules/taskReliability/OperatConditModel.vue
index ef311e4..a14565b 100644
--- a/web/src/views/modules/taskReliability/OperatConditModel.vue
+++ b/web/src/views/modules/taskReliability/OperatConditModel.vue
@@ -53,6 +53,7 @@
},
mapModelNodes: {},
dialogVisible2: false,
+ isChange: false,
}
},
components: {
@@ -74,12 +75,13 @@
console.log(dataList[0].modelList[0].id, ' dataList[0].modelList[0].modelId')
dataList[0].modelId = dataList[0].modelList[0].id
console.log(dataList[0], 'dataLoaded(dataList)')
- this.modelChanged(dataList[0])
+ this.modelChangedProess(dataList[0])
}
},
async save() {
let res = await this.$http.post('/taskReliability/OperatConditModel/', this.$refs.tableObj.dataList[0])
if (res.success) {
+ this.isChange = false
this.$refs.tableObj.query()
}
},
@@ -92,7 +94,11 @@
}
},
- modelChanged(row) {
+ modelChanged(row){
+ this.isChange = true
+ this.modelChangedProess(row)
+ },
+ modelChangedProess(row) {
let modelId = row.modelId
let modelNodes = this.mapModelNodes[modelId]
console.log(modelId, 'modelChanged modelId')
--
Gitblit v1.9.1