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.html | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/widgets/Tool/Widget.html b/widgets/Tool/Widget.html index e642497..502fe7c 100644 --- a/widgets/Tool/Widget.html +++ b/widgets/Tool/Widget.html @@ -3,14 +3,15 @@ <div class="tool-btn"><i></i> <span>工具</span> <del></del> </div> <div class="tool-y-box"> <ul> - <li class="measure-tool"><i></i> <span >图上量算</span></li> - <li class="fly-tool"><i></i> <span >飞行路线</span></li> - <li class="sign-tool"><i></i> <span>我的标记</span></li> + <li class="measure-tool"><i></i> <span>图上量算</span></li> + <li class="plotting-tool"><i></i> <span>要素标绘</span></li> <li class="rolling-tool"><i></i> <span>卷帘对比</span></li> - <li class="location-tool"><i></i> <span>查询定位</span></li> + <li class="splitScreen-tool"><i></i> <span>分屏对比</span></li> + <li class="sign-tool"><i></i> <span>我的标记</span></li> <li class="CoorPosition-tool"><i></i> <span>坐标定位</span></li> <li class="MapPrinting-tool"><i></i> <span>地图打印</span></li> - <li class="RouteNavigate-tool"><i></i> <span>路线导航</span></li> + <li class="superposition-tool"><i></i> <span>叠加分析</span></li> + <li class="buffer-tool"><i></i> <span>缓冲分析</span></li> </ul> </div> </div> -- Gitblit v1.9.3