From 652ec7d6dfdee121704961847fae3a3a5be3f5b6 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 01 四月 2024 15:26:15 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/taskReliability/TaskPhase.vue | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/web/src/views/modules/taskReliability/TaskPhase.vue b/web/src/views/modules/taskReliability/TaskPhase.vue
index fb6f829..38904fd 100644
--- a/web/src/views/modules/taskReliability/TaskPhase.vue
+++ b/web/src/views/modules/taskReliability/TaskPhase.vue
@@ -1,15 +1,16 @@
<template>
<div>
- <el-row :gutter="10">
+ <el-row :gutter="5">
<el-col :span="6">
- <div class="fa-card-a">
+ <div class="fa-card-a" style="margin-right: 5px;">
<task @onTaskSelected="onTaskSelected"/>
</div>
</el-col>
<el-col :span="11">
- <div class="mod-taskReliability-taskPhase}">
+ <div class="mod-taskReliability-taskPhase fa-card-a" style="margin-left: 5px;margin-right: 5px;">
<zt-table-wraper ref="tableObj" defaultNotQuery="true" query-url="/taskReliability/TaskPhase/page"
delete-url="/taskReliability/TaskPhase/"
+ @dataLoaded="dataLoaded"
:paging='false' v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
@@ -17,11 +18,12 @@
<zt-button type="delete" @click="table.deleteHandle()"/>
</el-form-item>
</el-form>
- <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:70}"
- border @row-click="selectPhase" @selection-change="table.selectionChangeHandle">
+ <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="phaseDuration" label="闃舵鏃堕暱"/>
+ <el-table-column prop="phaseDurationRate" label="闃舵鏃堕暱姣�"/>
<el-table-column prop="phaseSpeed" label="闃舵鏃堕��"/>
<el-table-column prop="phaseSort" label="闃舵椤哄簭"/>
<zt-table-column-handle :table="table"
@@ -33,9 +35,7 @@
</div>
</el-col>
<el-col :span="7">
- <div class="fa-card-a">
- <task-phase-model ref="model"/>
- </div>
+ <task-phase-model ref="model"/>
</el-col>
</el-row>
</div>
@@ -52,7 +52,9 @@
dataForm: {
taskId: '',
productId: ''
- }
+ },
+ dataList: [],
+ time: null
}
},
components: {
@@ -61,10 +63,22 @@
AddOrUpdate
},
methods: {
+ 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("褰撳墠杩愯鏃堕暱姣斿凡瓒呭嚭锛岃閲嶆柊璁剧疆")
+ }
+ },
add() {
this.$refs.AddOrUpdate.$refs.dialog.init(null, {
taskId: this.dataForm.taskId,
- productId: this.dataForm.productId
+ productId: this.dataForm.productId,
+ time: this.time
})
},
onTaskSelected(row) {
--
Gitblit v1.9.1