From c8c42a473eb1269d8c9eed26b90975340850b0ea Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 08 一月 2025 10:19:18 +0800
Subject: [PATCH] 修改bug：无法新增总体
---
web/src/views/modules/taskReliability/ReliabilityAssess.vue | 63 ++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 14 deletions(-)
diff --git a/web/src/views/modules/taskReliability/ReliabilityAssess.vue b/web/src/views/modules/taskReliability/ReliabilityAssess.vue
index 6516b3e..1a45d62 100644
--- a/web/src/views/modules/taskReliability/ReliabilityAssess.vue
+++ b/web/src/views/modules/taskReliability/ReliabilityAssess.vue
@@ -17,7 +17,7 @@
<el-input v-model="dataForm.confidence" placeholder="缃俊搴�" clearable></el-input>
</zt-form-item>
<el-button type="primary" @click="assess()">璇勫畾</el-button>
- <el-button type="primary" @click="add()">鏂板璇勫畾鏁版嵁</el-button>
+ <el-button type="primary" @click="assessData()">璇勫畾鏁版嵁绠＄悊</el-button>
<el-button type="primary" @click="handleExpand()">{{expandText}}</el-button>
<el-dropdown style="margin-left: 10px" @command="download">
<el-button type="primary">
@@ -45,15 +45,33 @@
<el-table-column prop="assessResult" label="璇勫畾缁撴灉" align="right">
</el-table-column>
</el-table>
- <add-or-update @refreshDataList="refreshData" ref="AddOrUpdate"/>
+ <assess-manage @refreshDataList="refreshData" ref="AssessManage"/>
</zt-table-wraper>
+ <el-dialog v-dialogDrag :close-on-click-modal="false" top="8vh" :visible.sync="dialogVisible" title="妯″瀷妫�鏌�"
+ width="60%" @close="dialogVisible = false">
+ <el-tag type="danger" style="margin-bottom: 10px">妯″瀷瀹氫箟/鍙傛暟閰嶇疆/璇勫畾鏁版嵁閲屽瓨鍦ㄤ互涓嬮棶棰橈細</el-tag>
+ <el-table :data="modelCheckResult" height="350"
+ :header-cell-style="{'text-align':'center'}">
+ <el-table-column prop="category" label="妫�鏌ョ粨鏋�" align="center" width="150"/>
+ <el-table-column prop="taskName" label="浠诲姟鍚嶇О" align="center"/>
+ <el-table-column prop="taskPhaseName" label="浠诲姟闃舵鍚嶇О" align="center"/>
+ <el-table-column prop="gkName" label="宸ュ喌鍚嶇О" align="center"/>
+ <el-table-column prop="nodeName" label="鑺傜偣鍚嶇О" align="center"/>
+ <el-table-column prop="modelName" label="妯″瀷鍚嶇О" align="center"/>
+ <el-table-column prop="deviceName" label="璁惧鍚嶇О" align="center"/>
+ <el-table-column prop="paramName" label="鍙傛暟鍚嶇О" align="center"/>
+ </el-table>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="dialogVisible = false">鍏� 闂�</el-button>
+ </div>
+ </el-dialog>
</div>
</div>
</template>
<script>
- import AddOrUpdate from './RelisbilityAssess-AddOrUpdate'
import qs from "qs";
import Cookies from "js-cookie";
+ import AssessManage from "./RelisbilityAssess-Manage";
export default {
data() {
@@ -78,11 +96,13 @@
flag2: false,
defultKey: [],
isExpand:false,
- expandText:"涓�閿睍寮�"
+ expandText:"涓�閿睍寮�",
+ dialogVisible: false,
+ modelCheckResult: [],
}
},
components: {
- AddOrUpdate
+ AssessManage,
},
mounted() {
this.getProductList()
@@ -108,6 +128,9 @@
}
})
},
+ refreshData(){
+ this.getAssessDataList()
+ },
async zhixin() {
await this.getTaskList()
await this.getAssessDataList()
@@ -129,9 +152,6 @@
this.page()
}
},
- refreshData() {
- this.getAssessDataList();
- },
async getAssessDataList() {
let params = {
productId: this.dataForm.productId
@@ -145,20 +165,35 @@
}
this.flag2 = true
},
- add() {
- this.$refs.AddOrUpdate.$refs.dialog.init(null, {
+ assessData(){
+ this.$refs.AssessManage.$refs.dialog.init(null, {
productId: this.dataForm.productId,
shipName: this.dataForm.shipName
- })
+ })
},
async assess() {
+ this.dialogVisible = false
+ this.modelCheckResult = []
if (!this.dataForm.productId || !this.dataForm.taskId || !this.dataForm.itemId || !this.dataForm.confidence) {
this.$tip.alert("鏈夋湭濉啓鐨勬暟鎹�")
return
}
- let res = await this.$http.post('/taskReliability/ReliabilityAssess/assess', this.dataForm)
- console.log(res.data)
- this.dataList = res.data
+ let res = await this.$http.post('/taskReliability/ReliabilityAssess/assessCheck', this.dataForm)
+ if (res.success) {
+ if (res.data && res.data.length > 0) {
+ this.modelCheckResult = res.data
+ this.dialogVisible = true
+ } else {
+ let res = await this.$http.post('/taskReliability/ReliabilityAssess/assess', this.dataForm)
+ if (res.success) {
+ console.log(res.data)
+ this.dataList = res.data
+ this.$alert('璇勫畾鎴愬姛', '鎻愮ず', {
+ confirmButtonText: '纭畾'
+ })
+ }
+ }
+ }
},
async getProductList() {
let res = await this.$http.get('/basicInfo/XhProductModel/getTaskProductList')
--
Gitblit v1.9.1