From 963a2313f4f8959715293d38f69894078150d508 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期五, 14 六月 2024 11:29:47 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/views/console/tooling/tray-fixturePreview.vue | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/src/views/console/tooling/tray-fixturePreview.vue b/src/views/console/tooling/tray-fixturePreview.vue
index 4c1a2e5..bcd0188 100644
--- a/src/views/console/tooling/tray-fixturePreview.vue
+++ b/src/views/console/tooling/tray-fixturePreview.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-05-12 20:02:31
* @LastEditors: Sneed
- * @LastEditTime: 2024-05-12 20:53:16
+ * @LastEditTime: 2024-05-16 22:38:31
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/tooling/tray-fixturePreview.vue
-->
<template>
@@ -22,7 +22,8 @@
<!-- <el-main> -->
<el-container>
<el-header>
- <import-table style="margin:0 8px" :exportUrl="exportUrl" :uploadUrl="uploadUrl"></import-table>
+ <import-table style="margin:0 8px" exportUrl="/api/blade-cps/tray-fixture/excel/template"
+ uploadUrl="/api/blade-cps/tray-fixture/excel/import"></import-table>
</el-header>
<el-main v-if="selectNode.id">
<el-row>
@@ -49,6 +50,29 @@
鎵樼洏鎻忚堪: {{ info?.description || '-' }}
</el-col>
</el-row>
+ <el-row>
+ <el-col style="margin: 20px 0">
+ <h2>鎵樼洏闈�</h2>
+ </el-col>
+ <el-col :span="24">
+ <el-collapse v-model="activeNames" style="margin-top: 20px;">
+ <el-collapse-item v-for="item in surfaceList" :key="item.id" :title="item.name"
+ :name="item.id">
+ <el-table stripe :data="item.list">
+ <el-table-column label="澶瑰叿缂栧彿" prop="fixtureCode"></el-table-column>
+ <el-table-column label="澶瑰叿鍚嶇О" prop="fixtureName"></el-table-column>
+ </el-table>
+ </el-collapse-item>
+ </el-collapse>
+ </el-col>
+ </el-row>
+
+ <el-row>
+ <el-col style="margin: 20px 0">
+ <h2>鎵樼洏宸ヨ壓鏂囦欢</h2>
+
+ </el-col>
+ </el-row>
</el-main>
<el-main class="empty" v-else>
<el-empty></el-empty>
@@ -68,7 +92,10 @@
return {
treeData: [],
info: {},
+ surfaceList: [], //鎵樼洏闈�
+ fileList: [], //闄勪欢
selectNode: {},
+ activeNames: ''
}
},
watch: {
@@ -94,10 +121,26 @@
this.treeData = res.data
})
},
- queryInfo() {
+ async queryInfo() {
this.$HTTP.get(`/api/blade-cps/tray/${this.selectNode.id}`).then(res => {
this.info = res.data
})
+
+ this.$HTTP.post(`/api/blade-cps/tray/tool-appendix?id=${this.selectNode.id}`).then(res => {
+ this.fileList = res.data
+ })
+ await this.$HTTP.get(`/api/blade-cps/tray-surface/list/${this.selectNode.id}`).then(res => {
+ this.surfaceList = res.data
+ this.activeNames = res.data?.[0]?.id
+ })
+ Promise.all(this.surfaceList.map(item => {
+ return this.$HTTP.get(`/api/blade-cps/tray-fixture/list/fixture?faceId=${item.id}`)
+ })).then(data => {
+ data.forEach((v, i) => {
+ this.surfaceList[i].list = v.data
+ })
+ })
+ console.log(this.surfaceList)
},
nodeClick(node) {
if (!node.isGroup) this.selectNode = node
--
Gitblit v1.9.3