From a856b0db283f46b6b48086e371393d375eece1a3 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 15 八月 2024 16:15:43 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java | 11 ++++-
web/src/views/modules/taskReliability/SimulatHistory.vue | 1
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java | 18 +--------
web/src/views/modules/taskReliability/TimeDiagram.vue | 3 +
web/src/views/modules/taskReliability/SchemeCompar.vue | 35 +++++++++++------
web/src/views/modules/taskReliability/ReliabilityWeakness.vue | 1
6 files changed, 37 insertions(+), 32 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java
index 811745c..6b5e710 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java
@@ -62,20 +62,6 @@
@Autowired
private SimulatAssessService simulatAssessService;
-
- /* @GetMapping("page")
- @ApiOperation("鍒嗛〉")
- @ApiImplicitParams({
- @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
- @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
- @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
- })
- public PageResult<SimulatAssess> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
-
- return PageResult.ok(simulatAssessService.page(queryFilter));
- }*/
-
@GetMapping("{id}")
@ApiOperation("淇℃伅")
public Result<SimulatAssess> get(@PathVariable("id") Long id) {
@@ -168,8 +154,8 @@
}
@GetMapping("SchemeCompar")
- public Result<SchemeComparDto> SchemeCompar(@RequestParam("taskList[]") String[] taskList) {
- SchemeComparDto data = simulatAssessService.SchemeCompar(taskList);
+ public Result<SchemeComparDto> SchemeCompar(@RequestParam("taskList[]") String[] taskList,Long showProductId) {
+ SchemeComparDto data = simulatAssessService.SchemeCompar(taskList,showProductId);
return Result.ok(data);
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
index b85272a..ce8118e 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
@@ -1216,7 +1216,7 @@
}
}
- public SchemeComparDto SchemeCompar(String[] taskList) {
+ public SchemeComparDto SchemeCompar(String[] taskList, Long showProductId) {
SchemeComparDto dto = new SchemeComparDto();
List<SimulaDataDto> dataDtoList = new ArrayList<>();
List<SchemeComparCurve> curveList = new ArrayList<>();
@@ -1229,7 +1229,14 @@
Long taskModelId = Long.parseLong(taskId);
task = taskService.get(taskModelId);
simulatAssess = this.getByTaskId(taskModelId);
- SimulaDataDto resultData = this.getResultXML(simulatAssess);
+ SimulaDataDto resultData;
+ if (showProductId!=null){
+ simulatAssess.setShowProductId(showProductId);
+ resultData =this.getResultData(simulatAssess);
+ }else{
+ resultData = this.getResultXML(simulatAssess);
+ }
+
data = resultData;
data.setName(task.getTaskName());
dataDtoList.add(data);
diff --git a/web/src/views/modules/taskReliability/ReliabilityWeakness.vue b/web/src/views/modules/taskReliability/ReliabilityWeakness.vue
index 81942b2..12f09fa 100644
--- a/web/src/views/modules/taskReliability/ReliabilityWeakness.vue
+++ b/web/src/views/modules/taskReliability/ReliabilityWeakness.vue
@@ -44,7 +44,6 @@
</el-table>
</zt-table-wraper>
</div>
-
</div>
</template>
<script>
diff --git a/web/src/views/modules/taskReliability/SchemeCompar.vue b/web/src/views/modules/taskReliability/SchemeCompar.vue
index 8a4c96f..b317412 100644
--- a/web/src/views/modules/taskReliability/SchemeCompar.vue
+++ b/web/src/views/modules/taskReliability/SchemeCompar.vue
@@ -38,7 +38,7 @@
<el-table-column
prop="mtbf"
label="MTBF"
- width="90px"
+ width="100px"
align="right">
<template slot-scope="scope">
<span>{{ keepNumber(scope.row.mtbf) }}</span>
@@ -47,7 +47,7 @@
<el-table-column
prop="mttr"
label="MTTR"
- width="90px"
+ width="100px"
align="right">
<template slot-scope="scope">
<span>{{ keepNumber(scope.row.mttr) }}</span>
@@ -56,7 +56,7 @@
<el-table-column
prop="msr"
label="MSR"
- width="90px"
+ width="100px"
align="right">
<template slot-scope="scope">
<span>{{ keepNumber(scope.row.mttr) }}</span>
@@ -119,11 +119,21 @@
},
methods: {
- onTreeSelected(data) {
- if (this.dataForm.id) {
+ async onTreeSelected(data) {
+ if (this.dataForm.taskModelId) {
console.log(data, 'onProductSelected')
this.dataForm.showProductId = data.id
- this.$refs.SimulatCurve.getProductEcharts(this.dataForm);
+ let params = {
+ taskList: this.dataForm.taskModelId,
+ showProductId: this.dataForm.showProductId
+ }
+ console.log(this.dataForm.taskModelId, 'this.dataForm.taskModelId')
+ let res = await this.$http.get('/taskReliability/SimulatAssess/SchemeCompar', {params: params})
+ console.log(res.data, "res")
+ this.xDataList = res.data.xdataList
+ this.seriesList = res.data.curveList
+ this.tableData = res.data.dataList
+
}
},
// 鑾峰彇淇℃伅
@@ -136,9 +146,9 @@
this.$refs.ProductModelTree.getProductList()
})
},
- onTaskSelected(data){
- console.log(data,'onTaskSelected(data)')
- for (let item of data){
+ onTaskSelected(data) {
+ console.log(data, 'onTaskSelected(data)')
+ for (let item of data) {
this.taskList.push(item.name)
}
},
@@ -160,12 +170,13 @@
},
async compair() {
let params = {
- taskList: this.dataForm.taskModelId
+ taskList: this.dataForm.taskModelId,
+ showProductId: null
}
- console.log(this.dataForm.taskModelId,'this.dataForm.taskModelId')
+ console.log(this.dataForm.taskModelId, 'this.dataForm.taskModelId')
let res = await this.$http.get('/taskReliability/SimulatAssess/SchemeCompar', {params: params})
console.log(res.data, "res")
- this.xDataList =res.data.xdataList
+ this.xDataList = res.data.xdataList
this.seriesList = res.data.curveList
this.tableData = res.data.dataList
diff --git a/web/src/views/modules/taskReliability/SimulatHistory.vue b/web/src/views/modules/taskReliability/SimulatHistory.vue
index 52613d6..f4c6bbd 100644
--- a/web/src/views/modules/taskReliability/SimulatHistory.vue
+++ b/web/src/views/modules/taskReliability/SimulatHistory.vue
@@ -14,6 +14,7 @@
</zt-form-item>
<zt-form-item label="鏃堕棿鍒嗙墖" prop="samplPeriod">
<el-input v-model="dataForm.samplPeriod" readonly="false">
+ <template slot="append">鍒嗛挓</template>
</el-input>
</zt-form-item>
<zt-form-item label="浠跨湡娆℃暟" prop="simulatFrequency">
diff --git a/web/src/views/modules/taskReliability/TimeDiagram.vue b/web/src/views/modules/taskReliability/TimeDiagram.vue
index 9fce2f7..666a4e6 100644
--- a/web/src/views/modules/taskReliability/TimeDiagram.vue
+++ b/web/src/views/modules/taskReliability/TimeDiagram.vue
@@ -2,7 +2,7 @@
<div class="fa-card-a">
<el-row :gutter="5">
<div class="mod-taskReliability-simulatAssess">
- <el-form :inline="true" :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="80px">
+ <el-form :inline="true" :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" >
<zt-form-item label="浜у搧鑺傜偣" prop="productId">
<zt-select v-model="dataForm.productId" :datas="productList" @change="onProductSelected"/>
</zt-form-item>
@@ -14,6 +14,7 @@
</zt-form-item>
<zt-form-item label="鏃堕棿鍒嗙墖" prop="samplPeriod">
<el-input v-model="dataForm.samplPeriod" readonly="false">
+ <template slot="append">鍒嗛挓</template>
</el-input>
</zt-form-item>
<zt-form-item label="浠跨湡娆℃暟" prop="simulatFrequency">
--
Gitblit v1.9.1