From d9461a1740bbc5d8d03258e4db0722aa9655d712 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期日, 07 四月 2024 08:34:00 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/taskReliability/TaskPhase.vue | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/web/src/views/modules/taskReliability/TaskPhase.vue b/web/src/views/modules/taskReliability/TaskPhase.vue
index 38904fd..3886fa4 100644
--- a/web/src/views/modules/taskReliability/TaskPhase.vue
+++ b/web/src/views/modules/taskReliability/TaskPhase.vue
@@ -1,9 +1,9 @@
<template>
<div>
<el-row :gutter="5">
- <el-col :span="6">
+ <el-col :span="7">
<div class="fa-card-a" style="margin-right: 5px;">
- <task @onTaskSelected="onTaskSelected"/>
+ <task @onTaskSelected="onTaskSelected" ref="task"/>
</div>
</el-col>
<el-col :span="11">
@@ -14,28 +14,29 @@
:paging='false' v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
- <zt-button type="add" @click="add()"/>
- <zt-button type="delete" @click="table.deleteHandle()"/>
+ <zt-button v-if="dataForm.taskId" type="add" @click="add()"/>
+ <zt-button v-if="dataForm.taskId" type="delete" @click="table.deleteHandle()"/>
</el-form-item>
</el-form>
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:30}"
@row-click="selectPhase" @selection-change="table.selectionChangeHandle">
<el-table-column type="selection" width="40" align="center"/>
- <el-table-column prop="phaseName" label="浠诲姟闃舵鍚嶇О"/>
- <el-table-column prop="phaseDurationRate" label="闃舵鏃堕暱姣�"/>
- <el-table-column prop="phaseSpeed" label="闃舵鏃堕��"/>
- <el-table-column prop="phaseSort" label="闃舵椤哄簭"/>
+ <el-table-column prop="phaseName" label="闃舵鍚嶇О" align="center"/>
+ <el-table-column prop="phaseDurationRate" label="闃舵鏃堕暱姣�" align="right"/>
+ <el-table-column prop="phaseSpeed" label="闃舵鏃堕��" align="right"/>
+ <!--<el-table-column prop="phaseSort" label="闃舵椤哄簭" align="center"/>-->
+ <el-table-column prop="operatConditDuration" label="宸ュ喌鏃堕暱鍒嗛厤" align="center"/>
<zt-table-column-handle :table="table"
delete-perm="taskReliability::delete"/>
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
- <add-or-update @refreshDataList="table.query" ref="AddOrUpdate"/>
+ <add-or-update @refreshDataList="refreshData" ref="AddOrUpdate"/>
</zt-table-wraper>
</div>
</el-col>
- <el-col :span="7">
- <task-phase-model ref="model"/>
+ <el-col :span="6">
+ <task-phase-model @getList="refreshData" ref="model"/>
</el-col>
</el-row>
</div>
@@ -50,6 +51,7 @@
data() {
return {
dataForm: {
+ id:'',
taskId: '',
productId: ''
},
@@ -63,13 +65,16 @@
AddOrUpdate
},
methods: {
+ refreshData(){
+ this.$refs.tableObj.query()
+ this.$refs.task.$refs.tableObj.query()
+ },
dataLoaded(data) {
this.time = null
this.dataList = data
for (let i = 0; i < this.dataList.length; i++) {
this.time = this.time + Number(this.dataList[i].phaseDurationRate)
}
- console.log( this.time,'dataLoaded')
if (this.time>1){
this.$alert("褰撳墠杩愯鏃堕暱姣斿凡瓒呭嚭锛岃閲嶆柊璁剧疆")
}
--
Gitblit v1.9.1