From cd411e7b3ade23951e8935924252f7059cc096d5 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 03 Jun 2021 11:23:05 +0800
Subject: [PATCH] 合并冲突
---
widgets/Tool/Widget.js | 85 +++++++++++++++++++++---------------------
1 files changed, 43 insertions(+), 42 deletions(-)
diff --git a/widgets/Tool/Widget.js b/widgets/Tool/Widget.js
index b0f63d1..c6f1600 100644
--- a/widgets/Tool/Widget.js
+++ b/widgets/Tool/Widget.js
@@ -37,18 +37,6 @@
$('.tool-y-box').toggle();
})
-
- // 查询定位
- $('.location-tool').click(function () {
- $('.jimu-widget-Location').show();
- $('.jimu-widget-FlyRoute').hide();
- $('.jimu-widget-Sign').hide();
- $('.jimu-widget-DynamicRiver').hide();
- $('.jimu-widget-Measurement').hide();
- $('.tool-y-box').toggle()
- })
-
-
// 图上量算
$('.measure-tool').click(function () {
$('.jimu-widget-Location').hide();
@@ -59,16 +47,7 @@
$('.tool-y-box').toggle()
})
- // 我的标记
- $('.sign-tool').click(function () {
- topic.publish('openSign', 'Sign');
- $('.jimu-widget-Location').hide();
- $('.jimu-widget-Sign').show();
- $('.jimu-widget-Measurement').hide();
- $('.jimu-widget-FlyRoute').hide();
- $('.jimu-widget-DynamicRiver').hide();
- $('.tool-y-box').toggle()
- })
+
// 卷帘对比
$('.rolling-tool').click(function () {
@@ -82,6 +61,17 @@
$('.tool-y-box').toggle();
})
+ // 我的标记
+ $('.sign-tool').click(function () {
+ topic.publish('openSign', 'Sign');
+ $('.jimu-widget-Location').hide();
+ $('.jimu-widget-Sign').show();
+ $('.jimu-widget-Measurement').hide();
+ $('.jimu-widget-FlyRoute').hide();
+ $('.jimu-widget-DynamicRiver').hide();
+ $('.tool-y-box').toggle()
+ })
+
// 坐标定位
$('.CoorPosition-tool').click(function () {
$('.jimu-widget-CoorPosition').show();
@@ -93,29 +83,40 @@
$('.tool-y-box').toggle()
})
+ // 查询定位
+ // $('.location-tool').click(function () {
+ // $('.jimu-widget-Location').show();
+
+ // $('.jimu-widget-FlyRoute').hide();
+ // $('.jimu-widget-Sign').hide();
+ // $('.jimu-widget-DynamicRiver').hide();
+ // $('.jimu-widget-Measurement').hide();
+ // $('.tool-y-box').toggle()
+ // })
+
// 地图打印
- $('.MapPrinting-tool').click(function () {
- $('.jimu-widget-Location').hide();
- $('.jimu-widget-MapPrinting').show();
- $('.jimu-widget-CoorPosition').hide();
- $('.jimu-widget-Measurement').hide();
- $('.jimu-widget-Sign').hide();
- $('.jimu-widget-FlyRoute').hide();
- $('.jimu-widget-DynamicRiver').hide();
- $('.tool-y-box').toggle()
- })
+ // $('.MapPrinting-tool').click(function () {
+ // $('.jimu-widget-Location').hide();
+ // $('.jimu-widget-MapPrinting').show();
+ // $('.jimu-widget-CoorPosition').hide();
+ // $('.jimu-widget-Measurement').hide();
+ // $('.jimu-widget-Sign').hide();
+ // $('.jimu-widget-FlyRoute').hide();
+ // $('.jimu-widget-DynamicRiver').hide();
+ // $('.tool-y-box').toggle()
+ // })
// 路线导航
- $('.RouteNavigate-tool').click(function () {
- $('.jimu-widget-RouteNavigate').show();
- $('.jimu-widget-MapPrinting').hide();
- $('.jimu-widget-CoorPosition').hide();
- $('.jimu-widget-Measurement').hide();
- $('.jimu-widget-Sign').hide();
- $('.jimu-widget-FlyRoute').hide();
- $('.jimu-widget-DynamicRiver').hide();
- $('.tool-y-box').toggle()
- })
+ // $('.RouteNavigate-tool').click(function () {
+ // $('.jimu-widget-RouteNavigate').show();
+ // $('.jimu-widget-MapPrinting').hide();
+ // $('.jimu-widget-CoorPosition').hide();
+ // $('.jimu-widget-Measurement').hide();
+ // $('.jimu-widget-Sign').hide();
+ // $('.jimu-widget-FlyRoute').hide();
+ // $('.jimu-widget-DynamicRiver').hide();
+ // $('.tool-y-box').toggle()
+ // })
},
closeToolBox: function (item) {
--
Gitblit v1.9.3