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 | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/console/tooling/tray-fixturePreview.vue b/src/views/console/tooling/tray-fixturePreview.vue
index 632eae7..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-16 22:33:28
+ * @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>
--
Gitblit v1.9.3