From cccb1f0822ca3883c13cac0338638c2a7bd7094a Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 18 七月 2024 08:49:00 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/basicInfo/XhProductModel.vue | 6 +-
web/src/views/modules/taskReliability/ModelRbd.vue | 3 +
web/src/views/modules/basicInfo/TyProductModel.vue | 2
web/src/views/modules/taskReliability/TaskBinoParam.vue | 5 +-
web/src/views/modules/baseReliability/ParamDataBasic.vue | 1
web/src/views/modules/basicInfo/ParamData.vue | 51 +++++++++++++------------
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhaseModel.java | 2
7 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhaseModel.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhaseModel.java
index 323c781..defaef1 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhaseModel.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhaseModel.java
@@ -37,7 +37,7 @@
private String operatConditName;
@ApiModelProperty(value = "宸ュ喌杩愯姣�")
- private String operatConditDurationRate;
+ private double operatConditDurationRate;
@ApiModelProperty(value = "澶囨敞")
private String remark;
diff --git a/web/src/views/modules/baseReliability/ParamDataBasic.vue b/web/src/views/modules/baseReliability/ParamDataBasic.vue
index d95e480..1d74d4f 100644
--- a/web/src/views/modules/baseReliability/ParamDataBasic.vue
+++ b/web/src/views/modules/baseReliability/ParamDataBasic.vue
@@ -24,6 +24,7 @@
row-key="id"
:expand-row-keys="defultKey"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+ :header-cell-style="{'text-align':'center'}"
border @selection-change="table.selectionChangeHandle">
<!--<el-table-column type="selection" width="40"/>-->
<el-table-column prop="name" label="鍚嶇О"/>
diff --git a/web/src/views/modules/basicInfo/ParamData.vue b/web/src/views/modules/basicInfo/ParamData.vue
index 786a7ba..90f1f30 100644
--- a/web/src/views/modules/basicInfo/ParamData.vue
+++ b/web/src/views/modules/basicInfo/ParamData.vue
@@ -12,7 +12,8 @@
delete-url="/basicInfo/ParamData/"
@dataLoaded="dataLoaded"
v-slot="{ table }"
- :paging='false'>
+ :paging='false'
+ >
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
<zt-dict v-model="dataForm.basicJoinCompute" dict="is_or_not" placeholder="鏄惁鍙備笌璁＄畻" clearable></zt-dict>
@@ -36,9 +37,10 @@
</el-form-item>
</el-form>
<el-tabs v-model="activeName" @tab-click="handleClick">
- <el-tab-pane label="鍩烘湰鍙潬鎬�" name="first">
+ <el-tab-pane label="鍩烘湰鍙潬鎬�" name="first" >
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px"
v-adaptive="{bottomOffset:30}"
+ :header-cell-style="{'text-align':'center'}"
class="paramsDataTable"
@selection-change="table.selectionChangeHandle">
<el-table-column type="selection" :key="1" width="40" align="center"/>
@@ -46,7 +48,7 @@
<el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='4'"
prop="reliabDistribType"
label="鍙潬鎬у垎甯冪被鍨�" :key="27"
- >
+ align="center">
<template v-slot="{ row }">
<el-select v-if="row.isEdit" v-model="row.reliabDistribType"
placeholder="璇烽�夋嫨">
@@ -61,7 +63,7 @@
:hit="hit"/>
</template>
</el-table-column>
- <el-table-column v-if="dataForm.productType==='2'" :key="3" prop="baseOperatRatio" label="鍩烘湰鍙潬鎬ц繍琛屾瘮">
+ <el-table-column v-if="dataForm.productType==='2'" :key="3" prop="baseOperatRatio" label="鍩烘湰鍙潬鎬ц繍琛屾瘮" align="right">
<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>
@@ -69,7 +71,7 @@
</el-table-column>
<el-table-column v-if="dataForm.productType==='1'||dataForm.productType==='2'" :key="4"
prop="actualRunTime"
- label="瀹為檯杩愯鏃堕棿">
+ label="瀹為檯杩愯鏃堕棿" align="right">
<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>
@@ -78,7 +80,7 @@
<el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='4'" :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" width="100" align="center">
<template v-slot="{ row }">
<el-select v-if="row.isEdit" v-model="row.basicJoinCompute"
placeholder="鍙傚姞璁＄畻">
@@ -93,7 +95,7 @@
:typeColor="typeColor" :size="size" :effect="effect" :hit="hit"/>
</template>
</el-table-column>
- <el-table-column prop="basicMtbfRegulate" :key="7" label="MTBF">
+ <el-table-column prop="basicMtbfRegulate" :key="7" label="MTBF" align="right" width="100">
<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>
@@ -105,7 +107,7 @@
<span v-else v-text="scope.row.basicMtbfAccept"></span>
</template>
</el-table-column>-->
- <el-table-column prop="basicMtbfRegulSuccRate" :key="9" label="MTBF鎴愬姛鐜�" >
+ <el-table-column prop="basicMtbfRegulSuccRate" :key="9" label="MTBF鎴愬姛鐜�" 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>
@@ -117,25 +119,25 @@
<span v-else v-text="scope.row.basicMtbfAcceptSuccRate"></span>
</template>
</el-table-column>-->
- <el-table-column prop="basicUnitNum" label="鍗曞厓鏁伴噺" :key="11" width="100">
+ <el-table-column prop="basicUnitNum" label="鍗曞厓鏁伴噺" :key="11" width="100" align="center">
<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">
+ <el-table-column prop="basicRunsNum" label="杩愯娆℃暟" :key="12" width="100" align="center">
<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杩愯姣�" >
+ <el-table-column prop="basicMtbfOperatingRatio" :key="13" label="MTBF杩愯姣�" 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>
</template>
</el-table-column>
- <el-table-column prop="basicSingleRunTime" :key="14" label="杩愯鏃堕棿" >
+ <el-table-column prop="basicSingleRunTime" :key="14" label="杩愯鏃堕棿" align="right" 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>
@@ -158,13 +160,14 @@
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px"
v-adaptive="{bottomOffset:30}"
class="paramsDataTable"
- @selection-change="table.selectionChangeHandle">
+ @selection-change="table.selectionChangeHandle"
+ :header-cell-style="{'text-align':'center'}">
<el-table-column type="selection" :key="1" width="40" align="center"/>
<el-table-column prop="name" :key="2" label="鍚嶇О" fixed="left" width="120"/>
<el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='4'" :key="15"
label="浠诲姟鍙潬鎬ц绠�">
- <el-table-column prop="taskMtbcfRegulate" :key="16" label="MTBCF" width="100">
+ <el-table-column prop="taskMtbcfRegulate" :key="16" label="MTBCF" width="100" align="right">
<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>
@@ -176,7 +179,7 @@
<span v-else v-text="scope.row.taskMtbcfAccept"></span>
</template>
</el-table-column>-->
- <el-table-column prop="taskMtbcfRegulSuccRate" :key="18" label="MTBCF鎴愬姛鐜�" >
+ <el-table-column prop="taskMtbcfRegulSuccRate" :key="18" label="MTBCF鎴愬姛鐜�" 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>
@@ -188,28 +191,28 @@
<span v-else v-text="scope.row.taskMtbcfAcceptSuccRate"></span>
</template>
</el-table-column>-->
- <el-table-column prop="taskMtbcfOperatingRatio" :key="20" label="MTBCF杩愯姣�">
+ <el-table-column prop="taskMtbcfOperatingRatio" :key="20" label="MTBCF杩愯姣�" 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" >
+ <el-table-column prop="taskMtbcfOtherParams2" :key="21" label="MTBCF鍏朵粬鍙傛暟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" >
+ <el-table-column prop="taskMtbcfOtherParams3" :key="30" label="MTBCF鍏朵粬鍙傛暟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>
</template>
</el-table-column>
</el-table-column>
- <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='4'" :key="22" label="缁翠慨鍒嗗竷">
+ <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='4'" :key="22" label="缁翠慨鍒嗗竷" align="center">
<!-- <zt-table-column-dict prop="repairable" :keys="23" label="鍙淮淇�" dict="is_or_not"/>-->
- <el-table-column prop="repairable" label="鍙淮淇�" :key="23" width="80">
+ <el-table-column prop="repairable" label="鍙淮淇�" :key="23" width="80" align="center">
<template v-slot="{ row }">
<el-select v-if="row.isEdit" v-model="row.repairable"
placeholder="璇烽�夋嫨">
@@ -225,7 +228,7 @@
</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="130">
+ <el-table-column prop="repairDistribType" label="缁翠慨鍒嗗竷绫诲瀷" :key="24" width="130" align="center">
<template v-slot="{ row }">
<el-select v-if="row.isEdit" v-model="row.repairDistribType"
placeholder="璇烽�夋嫨">
@@ -240,19 +243,19 @@
: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">
+ <el-table-column prop="repairMttcr" label="MTTCR" :key="25" width="100" align="right">
<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="repairMttcrOtherParams2" :key="26" label="MTTCR鍏朵粬鍙傛暟2" >
+ <el-table-column prop="repairMttcrOtherParams2" :key="26" label="MTTCR鍏朵粬鍙傛暟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" >
+ <el-table-column prop="repairMttcrOtherParams3" :key="27" label="MTTCR鍏朵粬鍙傛暟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>
diff --git a/web/src/views/modules/basicInfo/TyProductModel.vue b/web/src/views/modules/basicInfo/TyProductModel.vue
index 6ac117c..7c0fc07 100644
--- a/web/src/views/modules/basicInfo/TyProductModel.vue
+++ b/web/src/views/modules/basicInfo/TyProductModel.vue
@@ -34,7 +34,7 @@
<el-image v-if="row.operatImg" :src="url+row.operatImg" style="height: 50px;width: 50px"></el-image>
</template>
</el-table-column>
- <el-table-column prop="sort" label="鎺掑簭"/>
+ <el-table-column prop="sort" label="鎺掑簭" align="center"/>
<zt-table-column-handle :table="table" width="150" />
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
diff --git a/web/src/views/modules/basicInfo/XhProductModel.vue b/web/src/views/modules/basicInfo/XhProductModel.vue
index 50d38ae..c0a06ae 100644
--- a/web/src/views/modules/basicInfo/XhProductModel.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel.vue
@@ -26,15 +26,15 @@
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:30}"
row-key="id"
@selection-change="table.selectionChangeHandle"
- >
- <el-table-column prop="name" label="鍚嶇О"/>
+ :header-cell-style="{'text-align':'center'}">
+ <el-table-column prop="name" label="鍚嶇О" />
<zt-table-column-dict prop="productType" label="鑺傜偣绫诲瀷" dict="product"/>
<el-table-column prop="operatImg" label="杩愯鍥剧墖" align="center">
<template v-slot="{ row }">
<el-image v-if="row.operatImg" :src="url+row.operatImg" style="height: 50px;width: 50px"></el-image>
</template>
</el-table-column>
- <el-table-column prop="sort" label="鎺掑簭" width="100px"/>
+ <el-table-column prop="sort" label="鎺掑簭" width="100px" align="center"/>
<zt-table-column-handle :table="table" width="180px">
<template v-slot="{ row }">
<zt-table-button v-if="productType==='1'" size="small" type="primary"
diff --git a/web/src/views/modules/taskReliability/ModelRbd.vue b/web/src/views/modules/taskReliability/ModelRbd.vue
index 5b849a0..61fde75 100644
--- a/web/src/views/modules/taskReliability/ModelRbd.vue
+++ b/web/src/views/modules/taskReliability/ModelRbd.vue
@@ -26,7 +26,8 @@
</el-form-item>
</el-form>
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:30}"
- border @selection-change="table.selectionChangeHandle">
+ border @selection-change="table.selectionChangeHandle"
+ :header-cell-style="{'text-align':'center'}">
<el-table-column type="selection" width="40" align="center"/>
<el-table-column prop="modelName" label="妯″瀷鍚嶇О"/>
<el-table-column prop="modelTag" label="妯″瀷鏍囪瘑"/>
diff --git a/web/src/views/modules/taskReliability/TaskBinoParam.vue b/web/src/views/modules/taskReliability/TaskBinoParam.vue
index bdb7316..f058098 100644
--- a/web/src/views/modules/taskReliability/TaskBinoParam.vue
+++ b/web/src/views/modules/taskReliability/TaskBinoParam.vue
@@ -12,12 +12,13 @@
</el-form>
<el-table v-loading="table.dataLoading" :data="table.dataList"
height="600px"
- border @selection-change="table.selectionChangeHandle" @cell-click="handleCellClick">
+ border @selection-change="table.selectionChangeHandle" @cell-click="handleCellClick"
+ :header-cell-style="{'text-align':'center'}">
<!-- <el-table-column type="selection" width="40"/>-->
<el-table-column prop="phaseName" label="闃舵" align="center" />
<el-table-column prop="operatConditName" label="宸ュ喌" align="center"/>
<el-table-column prop="productName" label="浜岄」鍒嗗竷璁惧" align="center"/>
- <el-table-column prop="successRate" label="鎴愬姛鐜�" width="100">
+ <el-table-column prop="successRate" label="鎴愬姛鐜�" width="100" align="right">
<template slot-scope="scope" >
<span
v-if="editingCell && editingCell.row === scope.row && editingCell.column.property === scope.column.property">
--
Gitblit v1.9.1