From eb81e51b11f3f864673dd00046bc1dbc85d1456d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 19 Nov 2024 17:37:13 +0800
Subject: [PATCH] Merge branch 'main' of http://139.196.74.78:10010/r/zhyq/bigScreen
---
src/pages/layout/components/scomponents/toolList.vue | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/pages/layout/components/scomponents/toolList.vue b/src/pages/layout/components/scomponents/toolList.vue
index d0de80f..309c0b0 100644
--- a/src/pages/layout/components/scomponents/toolList.vue
+++ b/src/pages/layout/components/scomponents/toolList.vue
@@ -4,9 +4,9 @@
* @LastEditors: shuishen 1109946754@qq.com
* @LastEditTime: 2024-11-07 16:23:56
* @FilePath: \bigScreen\src\views\layout\components\scomponents\toolList.vue
- * @Description:
- *
- * Copyright (c) 2024 by shuishen, All Rights Reserved.
+ * @Description:
+ *
+ * Copyright (c) 2024 by shuishen, All Rights Reserved.
-->
<template>
<ul v-show="moreToolShow" class="tool-list-box">
@@ -27,6 +27,8 @@
}
})
import location from './tool/location.vue'
+import curtain from './tool/curtain.vue'
+import measure from './tool/measure.vue'
import exportScene from './tool/exportScene.vue'
import component from 'element-plus/es/components/tree-select/src/tree-select-option.mjs'
const emit = defineEmits(['close'])
@@ -36,6 +38,7 @@
{
icon: 'fa fa-calculator',
title: '图上量算',
+ component: measure,
},
{
icon: 'fa fa-bar-chart',
@@ -80,6 +83,7 @@
{
icon: 'fa fa-columns',
title: '卷帘对比',
+ component: curtain
},
{
icon: 'fa fa-window-restore',
@@ -127,4 +131,4 @@
margin-top: 0;
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3