From 6d8273f3405ba9364a792fd7a5a5b8497c488884 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 19 五月 2022 16:12:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/components/Tab/index.vue |   57 ++++++++++++++++++++++++++++++---------------------------
 1 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/components/Tab/index.vue b/src/components/Tab/index.vue
index 797d6b4..42ab835 100644
--- a/src/components/Tab/index.vue
+++ b/src/components/Tab/index.vue
@@ -8,35 +8,38 @@
 -->
 <template>
   <div class="tab">
-    <div class="tool-button">
-      <el-button icon="el-icon-setting" circle @click="showTab = !showTab" />
-    </div>
-    <div class="tab-content" v-show="showTab">
-      <el-tabs v-model="activeName">
-        <el-tab-pane label="模型" name="model">
-          <model-panel />
-        </el-tab-pane>
-        <!-- <el-tab-pane label="标注" name="label">
-          <label-panel />
-        </el-tab-pane> -->
-        <el-tab-pane label="电子围栏" name="plot">
-          <plot-panel :type='type' :colorMapList='colorMapList'/>
-        </el-tab-pane>
-        <el-tab-pane label="图标" name="marker">
-          <marker-panel />
-        </el-tab-pane>
-        <!-- <el-tab-pane label="波动圈" name="wave">
-          <wave-panel />
-        </el-tab-pane>
-        <el-tab-pane label="光柱" name="beam">
-          <beam-panel />
-        </el-tab-pane> -->
-        <!-- <el-tab-pane label="动画轨迹" name="line">
-          <animate-line-panel />
-        </el-tab-pane> -->
-      </el-tabs>
+      <div class="tab-content" v-show="showTab">
+          <div>
+              <el-button type="text" @click="showTab = !showTab" >隐藏菜单</el-button>
+          </div>
+          <el-tabs v-model="activeName">
+              <el-tab-pane label="模型" name="model">
+                  <model-panel />
+              </el-tab-pane>
+              <!-- <el-tab-pane label="标注" name="label">
+                <label-panel />
+              </el-tab-pane> -->
+              <el-tab-pane label="四色图" name="plot">
+                  <plot-panel :type='type' :colorMapList='colorMapList'/>
+              </el-tab-pane>
+              <el-tab-pane label="图标" name="marker">
+                  <marker-panel />
+              </el-tab-pane>
+              <!-- <el-tab-pane label="波动圈" name="wave">
+                <wave-panel />
+              </el-tab-pane>
+              <el-tab-pane label="光柱" name="beam">
+                <beam-panel />
+              </el-tab-pane> -->
+              <!-- <el-tab-pane label="动画轨迹" name="line">
+                <animate-line-panel />
+              </el-tab-pane> -->
+          </el-tabs>
       <!-- <tool-panel /> -->
     </div>
+    <div v-show="!showTab">
+        <el-button type="text" @click="showTab = !showTab" >显示菜单</el-button>
+    </div>
   </div>
 </template>
 

--
Gitblit v1.9.2