From a52ce4c9a594e78b5931d487e05d0dd54ac8cd36 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 07 十月 2024 22:38:28 +0800
Subject: [PATCH] Merge branch 'release' of http://122.9.151.159:9090/r/smart-web into release
---
src/views/console/tooling/tray-fixturePreview.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/console/tooling/tray-fixturePreview.vue b/src/views/console/tooling/tray-fixturePreview.vue
index 632eae7..5b07fcd 100644
--- a/src/views/console/tooling/tray-fixturePreview.vue
+++ b/src/views/console/tooling/tray-fixturePreview.vue
@@ -1,13 +1,13 @@
<!--
* @Date: 2024-05-12 20:02:31
* @LastEditors: Sneed
- * @LastEditTime: 2024-05-16 22:33:28
+ * @LastEditTime: 2024-06-16 16:18:09
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/tooling/tray-fixturePreview.vue
-->
<template>
<el-container>
<el-aside width="200px">
- <el-tree default-expand-all ref="group" node-key="id" :data="treeData" :props="{
+ <el-tree :expand-on-click-node="false" default-expand-all ref="group" node-key="id" :data="treeData" :props="{
label: 'name',
disabled: 'isGroup'
}" @node-click="nodeClick">
@@ -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