From a2441175073f8b09a7eff29effd7e3e617de2f7d Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期四, 06 六月 2024 18:23:01 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/views/console/tooling/tray-fixture.vue | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/src/views/console/tooling/tray-fixture.vue b/src/views/console/tooling/tray-fixture.vue
index 114adee..928e73f 100644
--- a/src/views/console/tooling/tray-fixture.vue
+++ b/src/views/console/tooling/tray-fixture.vue
@@ -1,19 +1,55 @@
<!--
* @Date: 2024-05-07 22:48:00
* @LastEditors: Sneed
- * @LastEditTime: 2024-05-07 22:48:29
+ * @LastEditTime: 2024-05-16 22:28:23
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/tooling/tray-fixture.vue
-->
<template>
- <div>
- 鎵樼洏澶瑰叿
- </div>
+ <el-main style="height: 100%;">
+ <el-card shadow="never" style="height: 100%;" body-style="height: 100%">
+ <el-tabs tab-position="top" class="custom-tabs" v-model="activeName">
+ <el-tab-pane label="鎵樼洏-澶瑰叿" name="1">
+ <trayFixturePreviewVue style="height: 100%" v-if="activeName === '1'"></trayFixturePreviewVue>
+ </el-tab-pane>
+ <el-tab-pane label="鎵樼洏" name="2">
+ <Tray style="height: 100%" v-if="activeName === '2'" />
+ </el-tab-pane>
+ <el-tab-pane label="澶瑰叿" name="3">
+ <Fixture style="height: 100%" v-if="activeName === '3'" />
+ </el-tab-pane>
+ </el-tabs>
+ </el-card>
+ </el-main>
</template>
<script>
+import trayFixturePreviewVue from './tray-fixturePreview.vue'
+import Tray from './Tray.vue'
+import Fixture from './fixture.vue'
export default {
-
+ components: {
+ trayFixturePreviewVue,
+ Tray,
+ Fixture
+ },
+ data() {
+ return {
+ activeName: '1'
+ }
+ },
}
</script>
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style lang="scss">
+.custom-tabs {
+ height: 100%;
+}
+
+.custom-tabs .el-tabs__content {
+ height: calc(100% - 40px);
+}
+
+.custom-tabs .el-tab-pane {
+ height: 100%;
+}
+</style>
\ No newline at end of file
--
Gitblit v1.9.3