From f6cdad43a14ca0fc362b6b8846f7fb8e362043f0 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期四, 06 六月 2024 10:27:15 +0800
Subject: [PATCH] svgEditor
---
web/src/views/modules/taskReliability/TaskPhase.vue | 50 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/web/src/views/modules/taskReliability/TaskPhase.vue b/web/src/views/modules/taskReliability/TaskPhase.vue
index 38904fd..9abdaaf 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,33 @@
: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="闃舵椤哄簭"/>
- <zt-table-column-handle :table="table"
- delete-perm="taskReliability::delete"/>
+ <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" edit-perm="testReviewComment:update"
+ delete-perm="taskReliability::delete">
+ <template v-slot="{row}">
+ <zt-table-button type="primary" @click="openEditWin(row)">淇敼</zt-table-button>
+ </template>
+ </zt-table-column-handle>
</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 +55,7 @@
data() {
return {
dataForm: {
+ id:'',
taskId: '',
productId: ''
},
@@ -63,24 +69,34 @@
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("褰撳墠杩愯鏃堕暱姣斿凡瓒呭嚭锛岃閲嶆柊璁剧疆")
- }
+ console.log(this.time)
},
add() {
+ console.log(this.time)
this.$refs.AddOrUpdate.$refs.dialog.init(null, {
taskId: this.dataForm.taskId,
productId: this.dataForm.productId,
time: this.time
})
},
+ openEditWin(row){
+ console.log(row)
+ this.$refs.AddOrUpdate.$refs.dialog.init(row.id, {
+ taskId: this.dataForm.taskId,
+ productId: this.dataForm.productId,
+ time: this.time
+ })
+ },
onTaskSelected(row) {
this.dataForm.taskId = row.id
this.dataForm.productId = row.productId
--
Gitblit v1.9.1