From 7789edecff9a058e3f6337e8da1ffebfff58d1fd Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期五, 06 十二月 2024 17:56:19 +0800
Subject: [PATCH] 1
---
src/views/mdc/first-workpiece-process.vue | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/src/views/mdc/first-workpiece-process.vue b/src/views/mdc/first-workpiece-process.vue
index cfb10fc..8741dfe 100644
--- a/src/views/mdc/first-workpiece-process.vue
+++ b/src/views/mdc/first-workpiece-process.vue
@@ -9,12 +9,12 @@
<template>
<el-main style="height: 100%;" class="timeAnalysis">
<el-card body-style="height: 100%;padding: 0;" style="margin-bottom: 12px;">
- <el-table :data="tableData" border @selection-change="handleSelectionChange">
- <el-table-column prop="test" label="绋嬪簭鍚嶇О"></el-table-column>
- <el-table-column prop="test" label="寮�鏈烘椂闂�"></el-table-column>
- <el-table-column prop="test" label="缁撴潫鏃堕棿"></el-table-column>
- <el-table-column prop="test" label="鎸佺画鏃堕暱"></el-table-column>
- <el-table-column prop="test" label="鐘舵��"></el-table-column>
+ <el-table :data="tableData" border>
+ <el-table-column prop="progName" label="绋嬪簭鍚嶇О"></el-table-column>
+ <el-table-column prop="startTime" label="寮�鏈烘椂闂�"></el-table-column>
+ <el-table-column prop="endTime" label="缁撴潫鏃堕棿"></el-table-column>
+ <el-table-column prop="duration" label="鎸佺画鏃堕暱"></el-table-column>
+ <el-table-column prop="deviceStatus" label="鐘舵��"></el-table-column>
</el-table>
<el-footer>
<el-button type="primary">杈撳嚭</el-button>
@@ -40,16 +40,34 @@
}
},
created() {
- for(var i=0;i<10;i++) {
- this.tableData.push({test: 1})
- }
+
},
mounted() {
+ this.getTableData();
},
methods: {
- handleSelectionChange() {
-
- }
+ getTableData() {
+ this.$HTTP.get(`/api/workinghour/working-process`, {id: this.$route.query.id}).then(res => {
+ if (res.code === 200) {
+ this.getprocess(res);
+ }
+ })
+ },
+ getprocess(res) { //棰滆壊鐘舵��
+ this.$HTTP.get(`/api/smis/global_wcs/list?code=&name=`).then(resp => {
+ if (resp.code == 200) {
+ res.data.forEach(item=> {
+ resp.data.forEach(item1=> {
+ if(item.deviceStatus == item1.code) {
+ item.deviceStatus = item1.name;
+ }
+ })
+ })
+ this.tableData = res.data;
+ console.log(JSON.stringify(res.data),111)
+ }
+ })
+ },
}
}
</script>
--
Gitblit v1.9.3